From eb6faa9e465d36e84d1c303848dd1e39665c8272 Mon Sep 17 00:00:00 2001
From: Stefan Ostermann <stefan@ostermail.de>
Date: Tue, 4 Feb 2025 14:49:00 +0000
Subject: [PATCH] grafana

---
 grafana/docker-compose.yml            | 57 ++++++++++-----------------
 hass/homeassistant/configuration.yaml |  4 +-
 wikimd/wiki/Matthias Seite.md         | 12 ------
 wikimd/wiki/homepage.md               |  6 +++
 4 files changed, 29 insertions(+), 50 deletions(-)
 delete mode 100644 wikimd/wiki/Matthias Seite.md

diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
index 99d7c97..de55fff 100644
--- a/grafana/docker-compose.yml
+++ b/grafana/docker-compose.yml
@@ -1,41 +1,26 @@
-version: '2'
 services:
   influxdb:
-    image: influxdb:latest
-    ports:
-      - '8086:8086'
+    container_name: influxdb
+    image: influxdb:2.0
+    restart: unless-stopped
     volumes:
-      - influxdb-storage:/var/lib/influxdb
-    environment:
-      - INFLUXDB_DB=db0
-      - INFLUXDB_ADMIN_USER=${INFLUXDB_USERNAME}
-      - INFLUXDB_ADMIN_PASSWORD=${INFLUXDB_PASSWORD}
-  chronograf:
-    image: chronograf:latest
+      - ./influxdb:/var/lib/influxdb2
     ports:
-      - '8888:8888'
-    volumes:
-      - chronograf-storage:/var/lib/chronograf
-    depends_on:
-      - influxdb
-    environment:
-      - INFLUXDB_URL=http://influxdb:8086
-      - INFLUXDB_USERNAME=${INFLUXDB_USERNAME}
-      - INFLUXDB_PASSWORD=${INFLUXDB_PASSWORD}
-  grafana:
-    image: grafana/grafana:latest
-    ports:
-      - '3003:3000'
-    volumes:
-      - grafana-storage:/var/lib/grafana
-      - ./grafana-provisioning:/etc/grafana/provisioning
-    depends_on:
-      - influxdb
-    environment:
-      - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME}
-      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
-volumes:
-  influxdb-storage:
-  chronograf-storage:
-  grafana-storage:
+      - 8086:8086
 
+  grafana:
+    container_name: grafana
+    image: grafana/grafana:latest
+    restart: unless-stopped
+    volumes:
+      - ./grafana:/var/lib/grafana # NOTE: must run "chown -R 472:472 /volume1/docker/grafana"
+    depends_on:
+      - influxdb
+    ports:
+      - 3003:3000
+    environment:
+      # for embedding in HA
+      - GF_AUTH_DISABLE_LOGIN_FORM=true
+      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+      - GF_SECURITY_ALLOW_EMBEDDING=true
diff --git a/hass/homeassistant/configuration.yaml b/hass/homeassistant/configuration.yaml
index c90b68e..79ab84b 100644
--- a/hass/homeassistant/configuration.yaml
+++ b/hass/homeassistant/configuration.yaml
@@ -85,10 +85,10 @@ influxdb:
   host: ubuntu
   port: 8086
   ssl: false
-  token: "Lmyu3GBe84Uz-V5fNcLzJbvrItP2-7WtgbLjzlgdD_WlDWM3AF56AznH6EXpPZs1l-8pBp99s4Ugl0LEK5Jvgg=="
+  token: "MjGXMQ8jLgHIZO9XnsvNS2PcmHGPpBv8Sw4bOQ3zHlPXWqho7XdB2noCJTCvrLeyUutlzeVFGessITIohVGJsg=="
   api_version: 2
   max_retries: 3
-  organization: 6fdc5094c8d82263
+  organization: 2d63e573ec9147ee
   bucket: homeassistant
   tags:
     source: HA
diff --git a/wikimd/wiki/Matthias Seite.md b/wikimd/wiki/Matthias Seite.md
deleted file mode 100644
index 0469421..0000000
--- a/wikimd/wiki/Matthias Seite.md	
+++ /dev/null
@@ -1,12 +0,0 @@
-## Content
-### Ich bin noch ein Content
-
-Ich bin ein lustiger Fließtext und mache *nicht* **viel** Sinn!
-
-Aber es geht einiges.
-
-* Aufzählung
-* Zwei
-* Drei
-
-`Und eine Codezeile.`
\ No newline at end of file
diff --git a/wikimd/wiki/homepage.md b/wikimd/wiki/homepage.md
index d4dd72d..719d9b9 100644
--- a/wikimd/wiki/homepage.md
+++ b/wikimd/wiki/homepage.md
@@ -20,5 +20,11 @@
 
 [Pihole](http://192.168.178.119/admin)
 
+[Grafana](http://ubuntu.fritz.box:3003/)
+
+[Influx](http://ubuntu.fritz.box:8086)
+
+https://www.reddit.com/r/homeassistant/comments/oje65v/home_assitant_with_grafana_and_influxdb_2x_basic/
+
 ### Probleme / TODOs
 * Nach dem Neustart des Servers funktioniert der zigbee stick nicht! In Proxmox entfernen und wieder hinzufügen.