openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix Prometheus template generation"

Browse Source
This commit is contained in:
Zuul 2019-12-16 11:19:27 +00:00 committed by Gerrit Code Review
commit 4307e2447e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ global:
external_labels: external_labels:
monitor: 'kolla' monitor: 'kolla'
{% if prometheus_alert_rules is defined and prometheus_alert_rules.files | length > 0 %} {% if prometheus_alert_rules.files is defined and prometheus_alert_rules.files | length > 0 %}
rule_files: rule_files:
{% for rule in prometheus_alert_rules.files %} {% for rule in prometheus_alert_rules.files %}
- "/etc/prometheus/{{ rule.path | basename }}" - "/etc/prometheus/{{ rule.path | basename }}"

8
releasenotes/notes/prometheus-config-when-alertmanager-disabled-0090c1570ff4e632.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
Fixes templating of Prometheus configuration when Alertmanager is disabled.
In a deployment where Prometheus is enabled and Alertmanager is disabled the
configuration for the Prometheus will fail when templating as the variable
`prometheus_alert_rules` does not contain the key `files`. For details
please see <https://bugs.launchpad.net/kolla-ansible/+bug/1854540>`__.