From 838eb49351253af80b6b9ae861fc7af9a1e6de7e Mon Sep 17 00:00:00 2001
From: okxlin <okxlin@gmail.com>
Date: Wed, 3 Apr 2024 13:54:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0grafana=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/grafana/10.4.1/data.yml           | 1 -
 apps/grafana/10.4.1/docker-compose.yml | 7 ++-----
 apps/grafana/README.md                 | 9 ---------
 apps/grafana/latest/data.yml           | 1 -
 apps/grafana/latest/docker-compose.yml | 7 ++-----
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/apps/grafana/10.4.1/data.yml b/apps/grafana/10.4.1/data.yml
index 255192ec..93225d4f 100644
--- a/apps/grafana/10.4.1/data.yml
+++ b/apps/grafana/10.4.1/data.yml
@@ -8,4 +8,3 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-
diff --git a/apps/grafana/10.4.1/docker-compose.yml b/apps/grafana/10.4.1/docker-compose.yml
index e8b5f7fc..a923b29e 100644
--- a/apps/grafana/10.4.1/docker-compose.yml
+++ b/apps/grafana/10.4.1/docker-compose.yml
@@ -8,15 +8,12 @@ services:
     ports:
       - "${PANEL_APP_PORT_HTTP}:3000"
     volumes:
-      - grafana_data:/var/lib/grafana
+      - ./data:/var/lib/grafana
+    user: '0'
     image: grafana/grafana:10.4.1
     labels:  
       createdBy: "Apps"
 
-volumes:
-  grafana_data:
-    external: true
-
 networks:  
   1panel-network:  
     external: true
diff --git a/apps/grafana/README.md b/apps/grafana/README.md
index ea491a87..9de75ac9 100644
--- a/apps/grafana/README.md
+++ b/apps/grafana/README.md
@@ -6,15 +6,6 @@ username:admin
 password:admin
 ```
 
-注意：应用部署前需要先创建存储卷，
-
-终端运行
-```
-docker volume create grafana_data
-```
-
-假如需要完全删除数据，除了删除容器还需要删除存储卷`grafana_data`。
-
 # 原始相关
 
 ![Grafana](https://raw.githubusercontent.com/grafana/grafana/main/docs/logo-horizontal.png)
diff --git a/apps/grafana/latest/data.yml b/apps/grafana/latest/data.yml
index 255192ec..93225d4f 100644
--- a/apps/grafana/latest/data.yml
+++ b/apps/grafana/latest/data.yml
@@ -8,4 +8,3 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-
diff --git a/apps/grafana/latest/docker-compose.yml b/apps/grafana/latest/docker-compose.yml
index fbe8821d..05a6697a 100644
--- a/apps/grafana/latest/docker-compose.yml
+++ b/apps/grafana/latest/docker-compose.yml
@@ -8,15 +8,12 @@ services:
     ports:
       - "${PANEL_APP_PORT_HTTP}:3000"
     volumes:
-      - grafana_data:/var/lib/grafana
+      - ./data:/var/lib/grafana
+    user: '0'
     image: grafana/grafana:latest
     labels:  
       createdBy: "Apps"
 
-volumes:
-  grafana_data:
-    external: true
-
 networks:  
   1panel-network:  
     external: true