diff --git a/apps/grafana/10.0.1/.env.sample b/apps/grafana/10.0.1/.env.sample
new file mode 100644
index 00000000..f17f47fb
--- /dev/null
+++ b/apps/grafana/10.0.1/.env.sample
@@ -0,0 +1,3 @@
+CONTAINER_NAME="grafana"
+PANEL_APP_PORT_HTTP="40038"
+DATA_PATH="./data"
\ No newline at end of file
diff --git a/apps/grafana/10.0.1/data.yml b/apps/grafana/10.0.1/data.yml
new file mode 100644
index 00000000..dbc9b776
--- /dev/null
+++ b/apps/grafana/10.0.1/data.yml
@@ -0,0 +1,17 @@
+additionalProperties:
+    formFields:
+        - default: 40038
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: Port
+          labelZh: 端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: ./data
+          edit: true
+          envKey: DATA_PATH
+          labelEn: Data folder path
+          labelZh: 数据文件夹路径
+          required: true
+          type: text
diff --git a/apps/grafana/10.0.1/docker-compose.yml b/apps/grafana/10.0.1/docker-compose.yml
new file mode 100644
index 00000000..0d8d1a74
--- /dev/null
+++ b/apps/grafana/10.0.1/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '3'
+services:
+  grafana:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:3000"
+    volumes:
+      - "${DATA_PATH}:/var/lib/grafana"
+    image: grafana/grafana:10.0.1
+    labels:  
+      createdBy: "Apps"
+
+networks:  
+  1panel-network:  
+    external: true
diff --git a/apps/grafana/README.md b/apps/grafana/README.md
new file mode 100644
index 00000000..282292d9
--- /dev/null
+++ b/apps/grafana/README.md
@@ -0,0 +1,49 @@
+![Grafana](https://raw.githubusercontent.com/grafana/grafana/main/docs/logo-horizontal.png)
+
+The open-source platform for monitoring and observability
+
+[![License](https://img.shields.io/github/license/grafana/grafana)](LICENSE)
+[![Drone](https://drone.grafana.net/api/badges/grafana/grafana/status.svg)](https://drone.grafana.net/grafana/grafana)
+[![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana)
+
+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.
+
+## Get started
+
+- [Get Grafana](https://grafana.com/get)
+- [Installation guides](https://grafana.com/docs/grafana/latest/setup-grafana/installation/)
+
+Unsure if Grafana is for you? Watch Grafana in action on [play.grafana.org](https://play.grafana.org/)!
+
+## Documentation
+
+The Grafana documentation is available at [grafana.com/docs](https://grafana.com/docs/).
+
+## Contributing
+
+If you're interested in contributing to the Grafana project:
+
+- Start by reading the [Contributing guide](https://github.com/grafana/grafana/blob/HEAD/CONTRIBUTING.md).
+- Learn how to set up your local environment, in our [Developer guide](https://github.com/grafana/grafana/blob/HEAD/contribute/developer-guide.md).
+- Explore our [beginner-friendly issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22).
+- Look through our [style guide and Storybook](https://developers.grafana.com/ui/latest/index.html).
+
+## Get involved
+
+- Follow [@grafana on Twitter](https://twitter.com/grafana/).
+- Read and subscribe to the [Grafana blog](https://grafana.com/blog/).
+- If you have a specific question, check out our [discussion forums](https://community.grafana.com/).
+- For general discussions, join us on the [official Slack](https://slack.grafana.com) team.
+
+This project is tested with [BrowserStack](https://www.browserstack.com/)
+
+## License
+
+Grafana is distributed under [AGPL-3.0-only](LICENSE). For Apache-2.0 exceptions, see [LICENSING.md](https://github.com/grafana/grafana/blob/HEAD/LICENSING.md).
diff --git a/apps/grafana/data.yml.bak b/apps/grafana/data.yml.bak
new file mode 100644
index 00000000..abf44d71
--- /dev/null
+++ b/apps/grafana/data.yml.bak
@@ -0,0 +1,20 @@
+name: Grafana
+tags:
+    - 工具
+title: 用于监控和可观察性的开源平台
+type: 工具
+description: 用于监控和可观察性的开源平台
+additionalProperties:
+    key: grafana
+    name: Grafana
+    tags:
+        - Tool
+    shortDescZh: 用于监控和可观察性的开源平台
+    shortDescEn: The open-source platform for monitoring and observability
+    type: tool
+    crossVersionUpdate: true
+    limit: 0
+    recommend: 0
+    website: https://grafana.com/
+    github: https://github.com/grafana/grafana
+    document: https://grafana.com/docs/grafana
\ No newline at end of file
diff --git a/apps/grafana/latest/.env.sample b/apps/grafana/latest/.env.sample
new file mode 100644
index 00000000..f17f47fb
--- /dev/null
+++ b/apps/grafana/latest/.env.sample
@@ -0,0 +1,3 @@
+CONTAINER_NAME="grafana"
+PANEL_APP_PORT_HTTP="40038"
+DATA_PATH="./data"
\ No newline at end of file
diff --git a/apps/grafana/latest/data.yml b/apps/grafana/latest/data.yml
new file mode 100644
index 00000000..dbc9b776
--- /dev/null
+++ b/apps/grafana/latest/data.yml
@@ -0,0 +1,17 @@
+additionalProperties:
+    formFields:
+        - default: 40038
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: Port
+          labelZh: 端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: ./data
+          edit: true
+          envKey: DATA_PATH
+          labelEn: Data folder path
+          labelZh: 数据文件夹路径
+          required: true
+          type: text
diff --git a/apps/grafana/latest/docker-compose.yml b/apps/grafana/latest/docker-compose.yml
new file mode 100644
index 00000000..d3dcc3a0
--- /dev/null
+++ b/apps/grafana/latest/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '3'
+services:
+  grafana:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:3000"
+    volumes:
+      - "${DATA_PATH}:/var/lib/grafana"
+    image: grafana/grafana:latest
+    labels:  
+      createdBy: "Apps"
+
+networks:  
+  1panel-network:  
+    external: true
diff --git a/apps/grafana/logo.png b/apps/grafana/logo.png
new file mode 100644
index 00000000..e4ebe351
Binary files /dev/null and b/apps/grafana/logo.png differ