allow multiple targets for prometheus and promtail

metal-stack · Dec 4, 2024 · b29d172 · b29d172
1 parent 6466817
commit b29d172
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/partition/roles/monitoring/prometheus/templates/prometheus.yaml.j2 b/partition/roles/monitoring/prometheus/templates/prometheus.yaml.j2
@@ -31,14 +31,9 @@ alerting:
         - targets: [{{ prometheus_alertmanager_target }}]
 {% endif %}
 
-{% if prometheus_remote_write_url %}
+{% if prometheus_remote_write %}
 remote_write:
-- url: {{ prometheus_remote_write_url }}
-  {% if prometheus_remote_write_basic_auth_username is defined and prometheus_remote_write_basic_auth_password is defined %}
-  basic_auth:
-    username: {{ prometheus_remote_write_basic_auth_username }}
-    password: {{ prometheus_remote_write_basic_auth_password }}
-  {% endif %}
+{{ prometheus_remote_write | to_yaml(indent=2) }}
 {% endif %}
 
 # Load rules once and periodically evaluate them according to the global 'evaluation_interval'.

diff --git a/partition/roles/promtail/defaults/main/main.yaml b/partition/roles/promtail/defaults/main/main.yaml
@@ -1,5 +1,5 @@
 ---
 promtail_config_host_dir: "/etc/promtail"
 
-promtail_loki_push_endpoint:
+promtail_clients: []
 promtail_scrape_configs: []
diff --git a/partition/roles/promtail/tasks/main.yaml b/partition/roles/promtail/tasks/main.yaml
@@ -7,9 +7,9 @@
     fail_msg: "not all mandatory variables given, check role documentation"
     quiet: yes
     that:
+      - promtail_clients
       - promtail_image_tag is defined
       - promtail_image_name is defined
-      - promtail_loki_push_endpoint is not none
       - promtail_scrape_configs is defined and (promtail_scrape_configs|length>0)
 
 - name: Create promtail config directory

diff --git a/partition/roles/promtail/templates/promtail.yaml.j2 b/partition/roles/promtail/templates/promtail.yaml.j2
@@ -6,13 +6,7 @@ positions:
   filename: /var/log/promtail-positions.yaml
 
 clients:
-  - url: {{ promtail_loki_push_endpoint }}
-    timeout: 60s
-    {% if promtail_loki_basic_auth_username is defined and promtail_loki_basic_auth_password is defined %}
-    basic_auth:
-      username: {{ promtail_loki_basic_auth_username }}
-      password: {{ promtail_loki_basic_auth_password }}
-    {% endif %}
+{{ promtail_clients | to_yaml(indent=2) }}
 
 scrape_configs:
-{{ promtail_scrape_configs|to_yaml(indent=2) }}
+{{ promtail_scrape_configs | to_yaml(indent=2) }}