openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix prometheus.yml templating"

Browse Source
This commit is contained in:
Zuul 2024-08-20 11:26:37 +00:00 committed by Gerrit Code Review
commit 4615f247fc
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/prometheus/templates/prometheus.yml.j2
View File

@ -254,9 +254,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:

5
releasenotes/notes/prometheus-template-fix-b971aad477a8fdc9.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixed an issue with the ``prometheus.yml`` template which would break when
deploying alertmanager.