diff options
| author | Zuul <zuul@review.opendev.org> | 2026-04-24 10:37:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-04-24 10:37:58 +0000 |
| commit | f06775d720a97fa3df2331a1c4ee044886eeaf1f (patch) | |
| tree | 25d29b3d99b59e09e5d311ad944aca292b5bee36 | |
| parent | fcc21812c4f720ed38eb574ca6144499d32c3013 (diff) | |
| parent | 23c420a55d678269930e80bc1f1afc052e061189 (diff) | |
| download | kolla-ansible-f06775d720a97fa3df2331a1c4ee044886eeaf1f.tar.gz kolla-ansible-f06775d720a97fa3df2331a1c4ee044886eeaf1f.zip | |
Merge "Fix Prometheus scraping for ProxySQL and Valkey"
| -rw-r--r-- | ansible/roles/prometheus/templates/prometheus.yml.j2 | 40 | ||||
| -rw-r--r-- | releasenotes/notes/bug-2148279-2ec0852b8bee0971.yaml | 8 |
2 files changed, 28 insertions, 20 deletions
diff --git a/ansible/roles/prometheus/templates/prometheus.yml.j2 b/ansible/roles/prometheus/templates/prometheus.yml.j2 index e6d95467e..94dc84ac2 100644 --- a/ansible/roles/prometheus/templates/prometheus.yml.j2 +++ b/ansible/roles/prometheus/templates/prometheus.yml.j2 @@ -256,43 +256,43 @@ scrape_configs: {% endfor %} {% endif %} -{% if enable_prometheus_alertmanager | bool %} - - job_name: alertmanager +{% if enable_prometheus_proxysql_exporter | bool %} + - job_name: proxysql static_configs: -{% for host in groups['prometheus-alertmanager'] %} +{% for host in groups["loadbalancer"] %} - targets: - - '{{ 'api' | kolla_address(host, override_var='prometheus_target_address') | put_address_in_context('url') }}:{{ hostvars[host]['prometheus_alertmanager_port'] }}' + - '{{ 'api' | kolla_address(host, override_var='prometheus_target_address') | put_address_in_context('url') }}:{{ hostvars[host]['proxysql_prometheus_exporter_port'] }}' {% if hostvars[host].prometheus_instance_label | default(false, true) %} labels: instance: "{{ hostvars[host].prometheus_instance_label }}" {% endif %} {% endfor %} +{% endif %} -{% if enable_prometheus_proxysql_exporter | bool %} - - job_name: proxysql +{% if enable_prometheus_valkey_exporter | bool %} + - job_name: valkey_exporter static_configs: -{% for host in groups["loadbalancer"] %} +{% for host in groups["prometheus-valkey-exporter"] %} - targets: - - '{{ 'api' | kolla_address(host, override_var='prometheus_target_address') | put_address_in_context('url') }}:{{ hostvars[host]['proxysql_prometheus_exporter_port'] }}' -{% if hostvars[host].prometheus_instance_label | default(false, true) %} + - '{{ 'api' | kolla_address(host, override_var='prometheus_target_address') | put_address_in_context('url') }}:{{ hostvars[host]['prometheus_valkey_exporter_port'] }}' +{% if hostvars[host].prometheus_instance_label | default(false, true) %} labels: instance: "{{ hostvars[host].prometheus_instance_label }}" -{% endif %} -{% endfor %} -{% endif %} +{% endif %} +{% endfor %} +{% endif %} -{% if enable_prometheus_valkey_exporter | bool %} - - job_name: valkey_exporter +{% if enable_prometheus_alertmanager | bool %} + - job_name: alertmanager static_configs: -{% for host in groups["prometheus-valkey-exporter"] %} +{% for host in groups['prometheus-alertmanager'] %} - targets: - - '{{ 'api' | kolla_address(host, override_var='prometheus_target_address') | put_address_in_context('url') }}:{{ hostvars[host]['prometheus_valkey_exporter_port'] }}' -{% if hostvars[host].prometheus_instance_label | default(false, true) %} + - '{{ 'api' | kolla_address(host, override_var='prometheus_target_address') | put_address_in_context('url') }}:{{ hostvars[host]['prometheus_alertmanager_port'] }}' +{% if hostvars[host].prometheus_instance_label | default(false, true) %} labels: instance: "{{ hostvars[host].prometheus_instance_label }}" -{% endif %} -{% endfor %} -{% endif %} +{% endif %} +{% endfor %} alerting: alertmanagers: diff --git a/releasenotes/notes/bug-2148279-2ec0852b8bee0971.yaml b/releasenotes/notes/bug-2148279-2ec0852b8bee0971.yaml new file mode 100644 index 000000000..3e5d9c9e4 --- /dev/null +++ b/releasenotes/notes/bug-2148279-2ec0852b8bee0971.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + Fixes an issue where Prometheus would not scrape ProxySQL or + Valkey metrics if Alertmanager was disabled. The configuration + blocks for these exporters were incorrectly nested within the + Alertmanager conditional block. + `LP#2148279 <https://launchpad.net/bugs/2148279>`__ |