From b0661baf8a313ba0b23e778db3989f2994abf9a3 Mon Sep 17 00:00:00 2001 From: manasa Date: Wed, 23 Oct 2024 14:55:35 +0530 Subject: [PATCH 1/2] Updated mon-stack.yaml and config.yaml --- .../grafana/conf/provisioning/dashboards/config.yaml | 2 +- .../single-node/monitoring-stack/mon-stack.yaml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Docker-Swarm-deployment/single-node/monitoring-stack/grafana/conf/provisioning/dashboards/config.yaml b/Docker-Swarm-deployment/single-node/monitoring-stack/grafana/conf/provisioning/dashboards/config.yaml index 369c46b20..f4d7cb87b 100644 --- a/Docker-Swarm-deployment/single-node/monitoring-stack/grafana/conf/provisioning/dashboards/config.yaml +++ b/Docker-Swarm-deployment/single-node/monitoring-stack/grafana/conf/provisioning/dashboards/config.yaml @@ -15,6 +15,6 @@ providers: allowUiUpdates: true options: # path to dashboard files on disk. Required when using the 'file' type - path: /usr/share/grafana-conf/dashboards + path: /usr/share/grafana-conf/provisioning/dashboards # use folder names from filesystem to create folders in Grafana foldersFromFilesStructure: true diff --git a/Docker-Swarm-deployment/single-node/monitoring-stack/mon-stack.yaml b/Docker-Swarm-deployment/single-node/monitoring-stack/mon-stack.yaml index 3b364b8ee..2492e9139 100644 --- a/Docker-Swarm-deployment/single-node/monitoring-stack/mon-stack.yaml +++ b/Docker-Swarm-deployment/single-node/monitoring-stack/mon-stack.yaml @@ -104,7 +104,7 @@ services: tag: "{\"name\":\"{{.Name}}\",\"id\":\"{{.ID}}\"}" grafana: - image: ghcr.io/datakaveri/grafana:10.2.3 + image: test-grafana:11.2.0 read_only: true volumes: - type: volume @@ -112,6 +112,9 @@ services: target: /var/lib/grafana volume: nocopy: true + - type: bind + source: "./grafana/conf/provisioning/dashboards/" + target: "/usr/share/grafana-conf/provisioning/dashboards/" secrets: - grafana-super-admin-passwd - grafana-super-admin-username @@ -285,4 +288,3 @@ secrets: file: secrets/passwords/grafana-super-admin-username blackbox-targets: file: secrets/configs/blackbox-targets.yaml - From 85eb79431cc6b20d5877b30fa3dc3d55362149ef Mon Sep 17 00:00:00 2001 From: manasa Date: Wed, 23 Oct 2024 15:02:01 +0530 Subject: [PATCH 2/2] Created Dockerfile --- Docker-Swarm-deployment/single-node/monitoring-stack/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Docker-Swarm-deployment/single-node/monitoring-stack/Dockerfile diff --git a/Docker-Swarm-deployment/single-node/monitoring-stack/Dockerfile b/Docker-Swarm-deployment/single-node/monitoring-stack/Dockerfile new file mode 100644 index 000000000..2c1ce1b01 --- /dev/null +++ b/Docker-Swarm-deployment/single-node/monitoring-stack/Dockerfile @@ -0,0 +1,2 @@ +# Using the official Grafana image for version 11.2.0 +FROM grafana/grafana:11.2.0