Merge pull request #596 from stackhpc/upstream/2024.1-2024-08-27

Synchronise 2024.1 with upstream
stackhpc · Aug 27, 2024 · aed005a · aed005a
2 parents d1a0584 + dc601de
commit aed005a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ansible/roles/prometheus/templates/prometheus.yml.j2 b/ansible/roles/prometheus/templates/prometheus.yml.j2
@@ -247,9 +247,9 @@ scrape_configs:
 
 alerting:
   alertmanagers:
-  - static_configs:
-    - targets:
+    - static_configs:
 {% for host in groups["prometheus-alertmanager"] %}
+      - targets:
         - '{{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ hostvars[host]['prometheus_alertmanager_port'] }}'
 {% if hostvars[host].prometheus_instance_label | default(false, true) %}
         labels:

diff --git a/releasenotes/notes/prometheus-template-fix-b971aad477a8fdc9.yaml b/releasenotes/notes/prometheus-template-fix-b971aad477a8fdc9.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed an issue with the ``prometheus.yml`` template which would break when
+    deploying alertmanager.