openstack/kolla-ansible
Code Issues Proposed changes

Merge "Configure CloudKitty with Prometheus basic auth"

Browse Source
This commit is contained in:
Zuul 2023-11-22 11:24:45 +00:00 committed by Gerrit Code Review
commit 449683c5aa
2 changed files with 9 additions and 0 deletions
ansible/roles/cloudkitty/templates
cloudkitty.conf.j2
releasenotes/notes
cloudkitty-prometheus-basic-auth-baa441852d57d121.yaml

4
ansible/roles/cloudkitty/templates/cloudkitty.conf.j2

@ -69,6 +69,8 @@ region_name = {{ openstack_region_name }}
{% if cloudkitty_collector_backend == "prometheus" %} {% if cloudkitty_collector_backend == "prometheus" %}
[collector_prometheus] [collector_prometheus]
prometheus_url = {{ cloudkitty_prometheus_url }} prometheus_url = {{ cloudkitty_prometheus_url }}
prometheus_user = admin
prometheus_password = {{ prometheus_password }}
{% if cloudkitty_prometheus_cafile is defined %} {% if cloudkitty_prometheus_cafile is defined %}
cafile = {{ cloudkitty_prometheus_cafile }} cafile = {{ cloudkitty_prometheus_cafile }}
@ -93,6 +95,8 @@ region_name = {{ openstack_region_name }}
metric = openstack_identity_project_info metric = openstack_identity_project_info
scope_attribute = id scope_attribute = id
prometheus_url = {{ cloudkitty_prometheus_url }} prometheus_url = {{ cloudkitty_prometheus_url }}
prometheus_user = admin
prometheus_password = {{ prometheus_password }}
{% if cloudkitty_prometheus_cafile is defined %} {% if cloudkitty_prometheus_cafile is defined %}
cafile = {{ cloudkitty_prometheus_cafile }} cafile = {{ cloudkitty_prometheus_cafile }}

5
releasenotes/notes/cloudkitty-prometheus-basic-auth-baa441852d57d121.yaml Normal file

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes CloudKitty failing to query Prometheus now that basic authentication
is required.