diff --git a/README.md b/README.md
index a6fecbfe..4a933378 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Ghost](https://github.com/TryGhost/Ghost) - Ghost - Turn your audience into a business
 - [Gitea](https://github.com/go-gitea/gitea) - Gitea - A painless self-hosted Git service
 - [Gotify](https://github.com/gotify/server) - Gotify - Simple server for sending and receiving notification messages
+- [Grafana](https://github.com/grafana/grafana) - The open and composable observability and data visualization platform
 - [Grocy](https://github.com/grocy/grocy) - Grocy - ERP beyond your fridge
 - [Haven](https://github.com/havenweb/haven) - Haven is a self-hosted private blog and feedreader you can use instead of Facebook
 - [Headscale](https://github.com/juanfont/headscale) - An open source, self-hosted implementation of the Tailscale control server
diff --git a/apps/grafana/config.json b/apps/grafana/config.json
new file mode 100644
index 00000000..00579492
--- /dev/null
+++ b/apps/grafana/config.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "../schema.json",
+  "name": "Grafana",
+  "port": 8160,
+  "available": true,
+  "exposable": true,
+  "id": "grafana",
+  "tipi_version": 1,
+  "version": "9.4.3",
+  "categories": ["data"],
+  "description": "The open and composable observability and data visualization platform",
+  "short_desc": "The open and composable observability and data visualization platform",
+  "author": "Grafana Labs",
+  "source": "https://github.com/grafana/grafana",
+  "form_fields": []
+}
diff --git a/apps/grafana/docker-compose.yml b/apps/grafana/docker-compose.yml
new file mode 100644
index 00000000..66d3238f
--- /dev/null
+++ b/apps/grafana/docker-compose.yml
@@ -0,0 +1,19 @@
+version: "3"
+
+services:
+  grafana:
+    container_name: grafana
+    image: grafana/grafana-oss:9.4.3
+    ports:
+      - ${APP_PORT}:3000
+    volumes:
+      - ${APP_DATA_DIR}/data/grafana:/var/lib/grafana
+    networks:
+      - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.grafana.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.grafana.entrypoints: websecure
+      traefik.http.routers.grafana.service: grafana
+      traefik.http.routers.grafana.tls.certresolver: myresolver
+      traefik.http.services.grafana.loadbalancer.server.port: 3000
diff --git a/apps/grafana/metadata/description.md b/apps/grafana/metadata/description.md
new file mode 100644
index 00000000..6926f970
--- /dev/null
+++ b/apps/grafana/metadata/description.md
@@ -0,0 +1,23 @@
+# Defualt Login
+Default Login is admin:admin
+
+--- 
+
+[![Grafana](https://github.com/grafana/grafana/raw/main/docs/logo-horizontal.png)](https://github.com/grafana/grafana/blob/main/docs/logo-horizontal.png)
+
+The open-source platform for monitoring and observability
+
+Grafana allows you to query, visualize, alert on and understand your metrics no matter where they are stored. Create, explore, and share dashboards with your team and foster a data-driven culture:
+
+-   **Visualizations:** Fast and flexible client side graphs with a multitude of options. Panel plugins offer many different ways to visualize metrics and logs.
+-   **Dynamic Dashboards:** Create dynamic & reusable dashboards with template variables that appear as dropdowns at the top of the dashboard.
+-   **Explore Metrics:** Explore your data through ad-hoc queries and dynamic drilldown. Split view and compare different time ranges, queries and data sources side by side.
+-   **Explore Logs:** Experience the magic of switching from metrics to logs with preserved label filters. Quickly search through all your logs or streaming them live.
+-   **Alerting:** Visually define alert rules for your most important metrics. Grafana will continuously evaluate and send notifications to systems like Slack, PagerDuty, VictorOps, OpsGenie.
+-   **Mixed Data Sources:** Mix different data sources in the same graph! You can specify a data source on a per-query basis. This works for even custom datasources.
+
+## [](https://github.com/grafana/grafana#documentation)Documentation
+
+The Grafana documentation is available at [grafana.com/docs](https://grafana.com/docs/).
+
+## [](https://github.com/grafana/grafana#contributing)
\ No newline at end of file
diff --git a/apps/grafana/metadata/logo.jpg b/apps/grafana/metadata/logo.jpg
new file mode 100644
index 00000000..fa95ed1d
Binary files /dev/null and b/apps/grafana/metadata/logo.jpg differ