[*] Prometheus Grafana v11 dashboard updates (#626)

* Prometheus Grafana v11 dashboard fixes

Somethings seems has changed in how Grafana handles things, some panels
failed to load. Adjusted on latest Grafana v11.4.0

* Remove a few fixed DS uids

* update docker compose related files

---------

Co-authored-by: Pavlo Golub <[email protected]>

Author: kmoppel

docker/bootstrap/prometheus.yml

@@ -8,7 +8,7 @@ alerting:
     - targets: []
     scheme: http
     timeout: 10s
-    api_version: v1
+    api_version: v2
 scrape_configs:
 - job_name: prometheus
   honor_timestamps: true
@@ -27,4 +27,4 @@ scrape_configs:
   scheme: http
   static_configs:
   - targets:
-    - localhost:9187
+    - pgwatch:9187

docker/compose.grafana.yml

@@ -18,11 +18,15 @@ services:
       - "3000:3000"
     restart: unless-stopped
     volumes:
-      - "../grafana/postgres_datasource.yml:/etc/grafana/provisioning/datasources/pg_ds.yml"
-      - "../grafana/postgres_dashboard.yml:/etc/grafana/provisioning/dashboards/pg_db.yml"
+      - "../grafana/dashboards.yml:/etc/grafana/provisioning/dashboards/pgwatch_dashboards.yml"
+      # Uncomment the datasource version you want to use
+      - "../grafana/postgres_datasource.yml:/etc/grafana/provisioning/datasources/postgres_datasource.yml"
+      # - "../grafana/prometheus_datasource.yml:/etc/grafana/provisioning/datasources/prometheus_datasource.yml"
       # Uncomment the dashboard version you want to use and comment out the other one.
       - "../grafana/postgres/v10:/var/lib/grafana/dashboards"
-      # - "./grafana/postgres/v11:/var/lib/grafana/dashboards"
+      # - "../grafana/postgres/v11:/var/lib/grafana/dashboards"
+      # - "../grafana/prometheus/v10:/var/lib/grafana/dashboards"
+      # - "../grafana/prometheus/v11:/var/lib/grafana/dashboards"
     depends_on:
       postgres:
         condition: service_healthy

docker/compose.pgwatch.yml

@@ -7,11 +7,12 @@ services:
     image: cybertecpostgresql/pgwatch:latest
     environment:
       PW_SOURCES: postgresql://pgwatch@postgres:5432/pgwatch
-      PW_SINK: postgresql://pgwatch@postgres:5432/pgwatch_metrics
-    # command:
-    #   - "--log-level=debug"
+    command:
+      - "--sink=postgresql://pgwatch@postgres:5432/pgwatch_metrics"
+      - "--sink=prometheus://pgwatch:9187/pgwatch"
     ports:
       - "8080:8080"
+      - "9187:9187"
     depends_on:
       postgres:
         condition: service_healthy

docker/compose.prometheus.yml

@@ -8,5 +8,6 @@ services:
     restart: unless-stopped
     volumes:
       - "./bootstrap/prometheus.yml:/etc/prometheus/prometheus.yml"
-    profiles:
-      - prometheus
+    depends_on:
+      postgres:
+        condition: service_healthy

grafana/postgres_dashboard.yml renamed to grafana/dashboards.yml

@@ -4,7 +4,7 @@ providers:
 - name: 'default'
   orgId: 1
   folder: ''
-  type: file
+  type: 'file'
   disableDeletion: false
   updateIntervalSeconds: 10 #how often Grafana will scan for changed dashboards
   options: