improve prometheus deploy

Author: JuArce

grafana/provisioning/datasources/datasource.yaml

@@ -63,7 +63,7 @@ datasources:
     database: "${MONITOR_DB_DB}"
     user: "${MONITOR_DB_USER}"
     secureJsonData:
-      password: ""
+      password: ${MONITOR_DB_PASSWORD}
     basicAuth: false
     isDefault: false
     editable: true

infra/aggregation_mode/ansible/playbooks/grafana_agg_mode.yaml

@@ -22,6 +22,9 @@
         grafana_postgres_db: "{{ lookup('ini', 'grafana_postgres_db', file=config_file) }}"
         grafana_postgres_user: "{{ lookup('ini', 'grafana_postgres_user', file=config_file) }}"
         grafana_postgres_password: "{{ lookup('ini', 'grafana_postgres_password', file=config_file) }}"
+        grafana_monitor_host: "{{ lookup('ini', 'grafana_monitor_host', file=config_file) }}"
+        grafana_monitor_port: "{{ lookup('ini', 'grafana_monitor_port', file=config_file, default='5432') }}"
+        grafana_monitor_db: "{{ lookup('ini', 'grafana_monitor_db', file=config_file, default='pg_auto_failover') }}"
       no_log: true
 
     - name: Install required packages

infra/aggregation_mode/ansible/playbooks/ini/config-hoodi.ini

@@ -84,6 +84,10 @@ grafana_postgres_host=agg-mode-hoodi-postgres-1
 grafana_postgres_port=5432
 grafana_postgres_db=agg_mode
 grafana_postgres_user=grafana
+# Monitor datasource (uses same user/password as postgres datasource)
+grafana_monitor_host=agg-mode-hoodi-postgres-monitor
+grafana_monitor_port=5432
+grafana_monitor_db=pg_auto_failover
 
 # ============================================
 # Task Sender Configuration

infra/aggregation_mode/ansible/playbooks/ini/config-mainnet.ini

@@ -84,6 +84,10 @@ grafana_postgres_host=agg-mode-mainnet-postgres-1
 grafana_postgres_port=5432
 grafana_postgres_db=agg_mode
 grafana_postgres_user=grafana
+# Monitor datasource (uses same user/password as postgres datasource)
+grafana_monitor_host=agg-mode-mainnet-postgres-monitor
+grafana_monitor_port=5432
+grafana_monitor_db=pg_auto_failover
 
 # ============================================
 # Task Sender Configuration

infra/aggregation_mode/ansible/playbooks/prometheus_agg_mode.yaml

@@ -73,10 +73,10 @@
         owner: "{{ ansible_user }}"
         group: "{{ ansible_user }}"
 
-    - name: Enable and start Prometheus service
+    - name: Enable and restart Prometheus service
       systemd_service:
         name: prometheus
-        state: started
+        state: restarted
         enabled: true
         scope: user
         daemon_reload: true

infra/aggregation_mode/ansible/playbooks/templates/grafana/grafana_env.j2

@@ -7,3 +7,8 @@ POSTGRES_PORT={{ grafana_postgres_port }}
 POSTGRES_DB={{ grafana_postgres_db }}
 POSTGRES_USER={{ grafana_postgres_user }}
 POSTGRES_PASSWORD={{ grafana_postgres_password }}
+MONITOR_DB_HOST={{ grafana_monitor_host }}
+MONITOR_DB_PORT={{ grafana_monitor_port }}
+MONITOR_DB_DB={{ grafana_monitor_db }}
+MONITOR_DB_USER={{ grafana_postgres_user }}
+MONITOR_DB_PASSWORD={{ grafana_postgres_password }}

infra/aggregation_mode/ansible/playbooks/templates/prometheus/prometheus_agg_mode.yaml.j2

@@ -7,15 +7,15 @@ scrape_configs:
   static_configs:
     - targets: ["{{ gateway_primary_hostname }}:8080"]
       labels:
-        service: "gateway"
+        service: "gateway-http"
         instance: "primary"
 
 - job_name: "gateway-secondary-http"
   scrape_interval: 60s
   static_configs:
     - targets: ["{{ gateway_secondary_hostname }}:8080"]
       labels:
-        service: "gateway"
+        service: "gateway-http"
         instance: "secondary"
 
 - job_name: "gateway-primary"