From a611681957df230f5d71958c57438e1996dd50d0 Mon Sep 17 00:00:00 2001
From: Divya Priya Muthuvel <dpriyamuthuvel4@gmail.com>
Date: Fri, 11 Sep 2026 19:34:22 +0530
Subject: [PATCH] Fix and update PG monitoring stack configuration

---
 compose/observability/pg.yml                  |  2 +-
 workload/grafana/12.3.0/conf/supervisor.ini   |  2 +-
 workload/prometheus/3.8.1/conf/server.conf    | 22 ++++++++++++++++---
 workload/prometheus/3.8.1/conf/supervisor.ini |  2 +-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/compose/observability/pg.yml b/compose/observability/pg.yml
index c6beedd..9fcda03 100644
--- a/compose/observability/pg.yml
+++ b/compose/observability/pg.yml
@@ -16,7 +16,7 @@ services:
       - common
   grafana:
     image: sloopstash/grafana:v${OBSERVABILITY_GRAFANA_VERSION}
-    entrypoint: /usr/local/bin/supervisord
+    entrypoint: /usr/bin/supervisord
     command: "-c /etc/supervisord.conf"
     ports:
       - "${OBSERVABILITY_PG_GRAFANA_PORT}:3000"
diff --git a/workload/grafana/12.3.0/conf/supervisor.ini b/workload/grafana/12.3.0/conf/supervisor.ini
index 4185e1a..f48e629 100644
--- a/workload/grafana/12.3.0/conf/supervisor.ini
+++ b/workload/grafana/12.3.0/conf/supervisor.ini
@@ -1,5 +1,5 @@
 [program:grafana]
-command=bash -c "/usr/local/lib/grafana/bin/grafana server --config /opt/grafana/conf/server.ini"
+command=bash -c "/usr/local/lib/grafana/bin/grafana server --config /opt/grafana/conf/server.ini --homepath=/usr/local/lib/grafana"
 process_name=%(program_name)s
 pidfile=/opt/grafana/system/server.pid
 autorestart=false
diff --git a/workload/prometheus/3.8.1/conf/server.conf b/workload/prometheus/3.8.1/conf/server.conf
index 44fd255..3094637 100644
--- a/workload/prometheus/3.8.1/conf/server.conf
+++ b/workload/prometheus/3.8.1/conf/server.conf
@@ -1,11 +1,27 @@
+# my global config
 global:
   scrape_interval: 15s
   evaluation_interval: 15s
   query_log_file: /opt/prometheus/log/query.log
-storage:
-  tsdb:
-    path: /opt/prometheus/data
+
+# Alertmanager configuration
+alerting:
+  alertmanagers:
+    - static_configs:
+        - targets: []
+          # - alertmanager:9093
+
+# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
+rule_files:
+  # - "first_rules.yml"
+  # - "second_rules.yml"
+
+# A scrape configuration containing exactly one endpoint to scrape:
+# Here it's Prometheus itself.
 scrape_configs:
   - job_name: "prometheus"
     static_configs:
       - targets: ["localhost:9090"]
+        labels:
+          app: "prometheus"
+    scrape_native_histograms: true
\ No newline at end of file
diff --git a/workload/prometheus/3.8.1/conf/supervisor.ini b/workload/prometheus/3.8.1/conf/supervisor.ini
index a66b774..ef5fdb1 100644
--- a/workload/prometheus/3.8.1/conf/supervisor.ini
+++ b/workload/prometheus/3.8.1/conf/supervisor.ini
@@ -1,5 +1,5 @@
 [program:prometheus]
-command=bash -c "prometheus --config.file=/opt/prometheus/conf/server.conf"
+command=bash -c "prometheus --config.file=/opt/prometheus/conf/server.conf --storage.tsdb.path=/opt/prometheus/data"
 process_name=%(program_name)s
 pidfile=/opt/prometheus/system/server.pid
 autorestart=false