From e5fb3ee5a58362bd2985f92452aecc9a5d3a0530 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Thu, 2 Feb 2023 21:27:18 +0200
Subject: [PATCH] Update grafana stack

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 grafana/docker-compose.yml | 92 +++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 51 deletions(-)

diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
index e6075dc..c186943 100644
--- a/grafana/docker-compose.yml
+++ b/grafana/docker-compose.yml
@@ -5,27 +5,27 @@ services:
         image: grafana/grafana:8.4.5
         restart: unless-stopped
         volumes:
-            - '/home/nick/configs/grafana/grafana:/var/lib/grafana'
+            - /home/nick/configs/grafana/grafana:/var/lib/grafana
         environment:
-            - 'GF_SECURITY_ALLOW_EMBEDDING=true'
-            - 'GF_SMTP_ENABLED=true'
-            - 'GF_SMTP_HOST=${SMTP_HOST}'
-            - 'GF_SMTP_USER=${SMTP_USER}'
-            - 'GF_SMTP_PASSWORD=${SMTP_PASSWORD}'
-            - 'GF_SMTP_FROM_ADDRESS=${SMTP_FROM}'
-            - 'GF_RENDERING_SERVER_URL=http://image-renderer:8081/render'
-            - 'GF_RENDERING_CALLBACK_URL=http://grafana:3000'
-            - 'GF_LOG_FILTERS=rendering:debug'
-            - 'GF_SERVER_ROOT_URL=${GF_ROOT}'
-            - 'GF_SERVER_DOMAIN=${GF_DOMAIN}'
-            - 'GF_INSTALL_PLUGINS=grafana-clock-panel,grafana-worldmap-panel'
-            - 'GF_AUTH_PROXY_ENABLED=true'
-            - 'GF_AUTH_PROXY_HEADER_NAME=Remote-User'
-            - 'GF_AUTH_PROXY_HEADERS=Name:Remote-Name Email:Remote-Email'
+            GF_SECURITY_ALLOW_EMBEDDING: true
+            GF_SMTP_ENABLED: true
+            GF_SMTP_HOST: ${SMTP_HOST}
+            GF_SMTP_USER: ${SMTP_USER}
+            GF_SMTP_PASSWORD: ${SMTP_PASSWORD}
+            GF_SMTP_FROM_ADDRESS: ${SMTP_FROM}
+            GF_RENDERING_SERVER_URL: http://image-renderer:8081/render
+            GF_RENDERING_CALLBACK_URL: http://grafana:3000
+            GF_LOG_FILTERS: rendering:debug
+            GF_SERVER_ROOT_URL: ${GF_ROOT}
+            GF_SERVER_DOMAIN: ${GF_DOMAIN}
+            GF_INSTALL_PLUGINS: grafana-clock-panel,grafana-worldmap-panel
+            GF_AUTH_PROXY_ENABLED: true
+            GF_AUTH_PROXY_HEADER_NAME: Remote-User
+            GF_AUTH_PROXY_HEADERS: Name:Remote-Name Email:Remote-Email
         networks:
             - default
             - routing
-        user: "1000:1000"
+        user: 1000:1000
         depends_on:
             - image-renderer
 
@@ -37,36 +37,36 @@ services:
         image: influxdb:1.8
         restart: unless-stopped
         volumes:
-            - '/home/nick/configs/grafana/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf'
-            - '/home/nick/configs/grafana/influxdb/db:/var/lib/influxdb'
+            - /home/nick/configs/grafana/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf
+            - /home/nick/configs/grafana/influxdb/db:/var/lib/influxdb
         environment:
-            - PUID=1000
-            - PGID=1000
+            PUID: 1000
+            PGID: 1000
 
     telegraf:
         image: telegraf:1.20.4
         restart: unless-stopped
         volumes:
-            - '/:/hostfs:ro'
-            - '/etc:/hostfs/etc:ro'
-            - '/proc:/hostfs/proc:ro'
-            - '/sys:/hostfs/sys:ro'
-            - '/var:/hostfs/var:ro'
-            - '/run:/hostfs/run:ro'
-            - '/var/run/docker.sock:/var/run/docker.sock'
-            - '/home/nick/configs/grafana/telegraf/telegraf.conf:/etc/telegraf/telegraf.conf:ro'
-            - '/home/nick/configs/grafana/telegraf/hostnet.sh:/etc/telegraf/hostnet.sh'
+            - /:/hostfs:ro
+            - /etc:/hostfs/etc:ro
+            - /proc:/hostfs/proc:ro
+            - /sys:/hostfs/sys:ro
+            - /var:/hostfs/var:ro
+            - /run:/hostfs/run:ro
+            - /var/run/docker.sock:/var/run/docker.sock
+            - /home/nick/configs/grafana/telegraf/telegraf.conf:/etc/telegraf/telegraf.conf:ro
+            - /home/nick/configs/grafana/telegraf/hostnet.sh:/etc/telegraf/hostnet.sh
         environment:
-            - HOST_ETC=/hostfs/etc
-            - HOST_PROC=/hostfs/proc
-            - HOST_SYS=/hostfs/sys
-            - HOST_VAR=/hostfs/var
-            - HOST_RUN=/hostfs/run
-            - HOST_MOUNT_PREFIX=/hostfs
+            HOST_ETC: /hostfs/etc
+            HOST_PROC: /hostfs/proc
+            HOST_SYS: /hostfs/sys
+            HOST_VAR: /hostfs/var
+            HOST_RUN: /hostfs/run
+            HOST_MOUNT_PREFIX: /hostfs
         networks:
             - default
             - routing
-        user: "1000:975"
+        user: 1000:975
         depends_on:
             - influxdb
 
@@ -74,24 +74,14 @@ services:
         image: atribe/speedtest-for-influxdb-and-grafana
         restart: unless-stopped
         volumes:
-            - '/home/nick/configs/grafana/speedtest/config.ini:/src/config.ini'
-            - '/home/nick/configs/grafana/speedtest/speedtest.py:/usr/local/lib/python3.7/site-packages/speedtest.py'
+            - /home/nick/configs/grafana/speedtest/config.ini:/src/config.ini
+            - /home/nick/configs/grafana/speedtest/speedtest.py:/usr/local/lib/python3.7/site-packages/speedtest.py
         environment:
-            - PGID=1000
-            - PUID=1000
+            PGID: 1000
+            PUID: 1000
         depends_on:
             - influxdb
 
-    speedport-smart-reconnect:
-        image: registry.karaolidis.com/nikas36/speedport-smart-reconnect
-        restart: unless-stopped
-        environment:
-            - 'ROUTER_USERNAME=${ROUTER_USERNAME}'
-            - 'ROUTER_PASSWORD=${ROUTER_PASSWORD}'
-        depends_on:
-            - grafana
-            - speedtest
-
 networks:
     routing:
         external: true