podman: update monitoring compose

[dotfiles.git] / podman / monitoring / compose.yml

diff --git a/podman/monitoring/compose.yml b/podman/monitoring/compose.yml
index c232eb69f6f14a63cadf458601958984a520eb9d..2633089c6a64c9ed519097c2b848682fa6ffc1f9 100644 (file)
--- a/podman/monitoring/compose.yml
+++ b/podman/monitoring/compose.yml
@@ -1,24 +1,44 @@
 services:
   grafana:
 services:
   grafana:

-    image: docker.io/grafana/grafana-oss:8.4.4
+    image: docker.io/grafana/grafana
+    user: 1000

     ports:
       - 3000:3000
     volumes:
     ports:
       - 3000:3000
     volumes:

-      - ./grafana/grafana.ini:/etc/grafana/grafana.ini
-      - /var/lib/grafana
-    links:
-      - influxdb
-      - loki
+      - ./grafana.ini:/etc/grafana/grafana.ini
+      - graf-data:/var/lib/grafana

   loki:
   loki:

-    image: docker.io/grafana/loki:2.4.2
+    image: docker.io/grafana/loki
+    user: 1000

     ports:
       - 3100:3100
     volumes:
     ports:
       - 3100:3100
     volumes:

-      - ./loki/loki.yaml:/etc/loki/loki.yaml
-    command: -log-config-reverse-order
+      - ./loki.yaml:/etc/loki/loki.yaml
+      - loki-data:/loki
+    command:
+      - '-config.file=/etc/loki/loki.yaml'
+      - '-log.format=json'
+      - '-log.level=warn'  # systemd thinks everything is an error, let's at least disable the verbose info messages
+      - '-log-config-reverse-order'

   prometheus:
   prometheus:

-    image: docker.io/prom/prometheus:v2.34.0
+    image: docker.io/prom/prometheus
+    # network_mode: host

     ports:
     ports:

-      - 3001:3001
+      - 9001:9001
+      - 9090:9090

     volumes:
     volumes:

-      - ./prometheus:/etc/prometheus
+      - ./prometheus.yml:/prometheus.yml
+      - prom-data:/data
+    command:
+      - '--config.file=/prometheus.yml'
+      - '--storage.tsdb.path=/data'
+      - '--web.enable-lifecycle'
+      - '--web.enable-admin-api'
+
+volumes:
+  graf-data:
+    external: true
+  loki-data:
+    external: true
+  prom-data:
+    external: true