diff --git a/apps/grafana/10.0.1/.env.sample b/apps/grafana/10.0.1/.env.sample index f17f47fb..a95e878a 100644 --- a/apps/grafana/10.0.1/.env.sample +++ b/apps/grafana/10.0.1/.env.sample @@ -1,3 +1,2 @@ CONTAINER_NAME="grafana" -PANEL_APP_PORT_HTTP="40038" -DATA_PATH="./data" \ No newline at end of file +PANEL_APP_PORT_HTTP="40038" \ No newline at end of file diff --git a/apps/grafana/10.0.1/data.yml b/apps/grafana/10.0.1/data.yml index dbc9b776..255192ec 100644 --- a/apps/grafana/10.0.1/data.yml +++ b/apps/grafana/10.0.1/data.yml @@ -8,10 +8,4 @@ additionalProperties: 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 index 0d8d1a74..fca1817a 100644 --- a/apps/grafana/10.0.1/docker-compose.yml +++ b/apps/grafana/10.0.1/docker-compose.yml @@ -8,11 +8,15 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:3000" volumes: - - "${DATA_PATH}:/var/lib/grafana" + - grafana_data:/var/lib/grafana image: grafana/grafana:10.0.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 282292d9..ea491a87 100644 --- a/apps/grafana/README.md +++ b/apps/grafana/README.md @@ -1,3 +1,22 @@ +# 使用说明 + +默认账户与密码 +``` +username:admin +password:admin +``` + +注意:应用部署前需要先创建存储卷, + +终端运行 +``` +docker volume create grafana_data +``` + +假如需要完全删除数据,除了删除容器还需要删除存储卷`grafana_data`。 + +# 原始相关 + ![Grafana](https://raw.githubusercontent.com/grafana/grafana/main/docs/logo-horizontal.png) The open-source platform for monitoring and observability diff --git a/apps/grafana/data.yml.bak b/apps/grafana/data.yml similarity index 100% rename from apps/grafana/data.yml.bak rename to apps/grafana/data.yml diff --git a/apps/grafana/latest/.env.sample b/apps/grafana/latest/.env.sample index f17f47fb..a95e878a 100644 --- a/apps/grafana/latest/.env.sample +++ b/apps/grafana/latest/.env.sample @@ -1,3 +1,2 @@ CONTAINER_NAME="grafana" -PANEL_APP_PORT_HTTP="40038" -DATA_PATH="./data" \ No newline at end of file +PANEL_APP_PORT_HTTP="40038" \ No newline at end of file diff --git a/apps/grafana/latest/data.yml b/apps/grafana/latest/data.yml index dbc9b776..255192ec 100644 --- a/apps/grafana/latest/data.yml +++ b/apps/grafana/latest/data.yml @@ -8,10 +8,4 @@ additionalProperties: 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 index d3dcc3a0..fbe8821d 100644 --- a/apps/grafana/latest/docker-compose.yml +++ b/apps/grafana/latest/docker-compose.yml @@ -8,11 +8,15 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:3000" volumes: - - "${DATA_PATH}:/var/lib/grafana" + - grafana_data:/var/lib/grafana image: grafana/grafana:latest labels: createdBy: "Apps" +volumes: + grafana_data: + external: true + networks: 1panel-network: external: true