From d31f8f49f99397a676aa35b1f368339dc49fe54f Mon Sep 17 00:00:00 2001
From: Ahmed Abdelhalim <pm@a14m.dev>
Date: Wed, 17 Sep 2025 14:01:03 +0200
Subject: Fix prometheus/node-exporter starting on configured port

---
 roles/prometheus/defaults/main.yml |  2 +-
 roles/prometheus/handlers/main.yml |  6 ++++++
 roles/prometheus/tasks/main.yml    | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml
index a9f9213c..48e9cfeb 100644
--- a/roles/prometheus/defaults/main.yml
+++ b/roles/prometheus/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
 prometheus_port: 9090
 prometheus_retention: "15d"
-prometheus_scrape_interval: "30s"
+prometheus_scrape_interval: "15s"
 prometheus_node_exporter_port: 9100
diff --git a/roles/prometheus/handlers/main.yml b/roles/prometheus/handlers/main.yml
index d35a8531..6006956e 100644
--- a/roles/prometheus/handlers/main.yml
+++ b/roles/prometheus/handlers/main.yml
@@ -4,3 +4,9 @@
   ansible.builtin.systemd_service:
     name: "prometheus"
     state: "restarted"
+
+- name: "Restart node-exporter"
+  become: true
+  ansible.builtin.systemd_service:
+    name: "prometheus-node-exporter"
+    state: "restarted"
diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml
index 9feeacaf..7b713581 100644
--- a/roles/prometheus/tasks/main.yml
+++ b/roles/prometheus/tasks/main.yml
@@ -44,6 +44,26 @@
     mode: "0644"
   notify: "Restart prometheus"
 
+# NOTE: show systemd configurations using: systemctl cat prometheus
+- name: "Configure prometheus port via environment file"
+  become: true
+  ansible.builtin.copy:
+    content: |
+      PROMETHEUS_ARGS="--web.listen-address=0.0.0.0:{{ prometheus_port }}"
+    dest: "/etc/conf.d/prometheus"
+    mode: "0644"
+  notify: "Restart prometheus"
+
+# NOTE: show systemd configurations using: systemctl cat prometheus-node-exporter
+- name: "Configure node-exporter port via environment file"
+  become: true
+  ansible.builtin.copy:
+    content: |
+      NODE_EXPORTER_ARGS="--web.listen-address=:{{ prometheus_node_exporter_port }}"
+    dest: "/etc/conf.d/prometheus-node-exporter"
+    mode: "0644"
+  notify: "Restart node-exporter"
+
 - name: "Start and enable prometheus services"
   become: true
   ansible.builtin.systemd_service:
-- 
cgit v1.2.3