From 64320b3677fb6e7232d0a3ba1aae27e445a7c221 Mon Sep 17 00:00:00 2001
From: admin <christian@shoshin-aikido.de>
Date: Mon, 20 Apr 2026 16:06:14 +0200
Subject: [PATCH] monitoring

---
 compose/logging/docker-compose.yml | 112 +++++++++++++----------------
 1 file changed, 48 insertions(+), 64 deletions(-)

diff --git a/compose/logging/docker-compose.yml b/compose/logging/docker-compose.yml
index ee5154a..09083ea 100644
--- a/compose/logging/docker-compose.yml
+++ b/compose/logging/docker-compose.yml
@@ -1,74 +1,58 @@
-version: "3.8"
-
 services:
-  loki:
-    image: grafana/loki:2.9.8
-    container_name: loki
-    command: -config.file=/etc/loki/config.yaml
-    volumes:
-      - /srv/docker/daten/loki/config/loki-config.yaml:/etc/loki/config.yaml
-      - /srv/docker/daten/loki/data:/loki
-    ports:
-      - "3100:3100"
-    restart: unless-stopped
-    networks:
-      - monitoring  
-
-  promtail:
-    image: grafana/promtail:2.9.8
-    container_name: promtail
-    volumes:
-      - /srv/docker/daten/promtail/config/promtail-config.yaml:/etc/promtail/config.yaml
-      - /var/lib/docker/containers:/var/lib/docker/containers:ro
-      - /var/run/docker.sock:/var/run/docker.sock
-    command: -config.file=/etc/promtail/config.yaml
-    restart: unless-stopped
-    networks:
-      - monitoring  
-
-  grafana:
-    image: grafana/grafana:10.4.2
-    container_name: grafana
-    ports:
-      - "3003:3000"
-    volumes:
-      - /srv/docker/daten/grafana/data:/var/lib/grafana
-    restart: unless-stopped
-    networks:
-      - monitoring  
-
   prometheus:
-    image: prom/prometheus:v2.52.0
+    image: prom/prometheus:latest
     container_name: prometheus
+    restart: unless-stopped
     volumes:
-      - /srv/docker/daten/prometheus/config/prometheus.yml:/etc/prometheus/prometheus.yml
-      - /srv/docker/daten/prometheus/data:/prometheus
+      - /srv/docker/daten/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+      - /srv/docker/daten/prometheus:/prometheus
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus'
     ports:
       - "9090:9090"
-    restart: unless-stopped
-    networks:
-      - monitoring  
 
-  pve-exporter:
-    image: ghcr.io/prometheus-pve/prometheus-pve-exporter:latest
-    #  image: prompve/prometheus-pve-exporter:latest
-    container_name: pve-exporter
+  grafana:
+    image: grafana/grafana:latest
+    container_name: grafana
+    restart: unless-stopped
+    environment:
+      - GF_SECURITY_ADMIN_PASSWORD=admin
     volumes:
-      - /srv/docker/daten/pve-exporter/config.yaml:/etc/pve_exporter/config.yaml:ro
-    command:
-      - "--config.file=/etc/pve_exporter/config.yaml"
-#      - "--collector.status"
-#      - "--collector.resources"
-
-#    command:
-#      - "--config.file=/etc/pve_exporter/config.yaml"
-#      - "pve=192.168.178.200"  
+      - /srv/docker/daten/grafana:/var/lib/grafana
     ports:
-      - "9221:9221"
-    restart: unless-stopped
-    networks:
-      - monitoring  
+      - "3000:3000"
 
-networks:
-  monitoring:
-    driver: bridge
\ No newline at end of file
+  node-exporter:
+    image: prom/node-exporter:latest
+    container_name: node-exporter
+    restart: unless-stopped
+    volumes:
+      - /proc:/host/proc:ro
+      - /sys:/host/sys:ro
+      - /:/rootfs:ro
+    command:
+      - '--path.procfs=/host/proc'
+      - '--path.rootfs=/rootfs'
+      - '--path.sysfs=/host/sys'
+
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:latest
+    container_name: cadvisor
+    restart: unless-stopped
+    privileged: true
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:ro
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+      - /dev/disk/:/dev/disk:ro
+
+  proxmox-exporter:
+    image: prompve/prometheus-proxmox-exporter:latest
+    container_name: proxmox-exporter
+    restart: unless-stopped
+    volumes:
+      - /srv/docker/daten/proxmox-exporter/proxmox.yml:/etc/prometheus-proxmox-exporter/proxmox.yml
+    ports:
+      - "9221:9221"
\ No newline at end of file