Merge "Support setting Nova API microversion for openstack-exporter"

This commit is contained in:
Zuul 2022-06-24 08:48:43 +00:00 committed by Gerrit Code Review
commit 5865b0e9a8
5 changed files with 12 additions and 0 deletions

View File

@ -1118,6 +1118,7 @@ prometheus_elasticsearch_exporter_interval: "{{ prometheus_scrape_interval }}"
prometheus_cmdline_extras:
prometheus_ceph_mgr_exporter_endpoints: []
prometheus_openstack_exporter_endpoint_type: "internal"
prometheus_openstack_exporter_compute_api_version: "latest"
prometheus_libvirt_exporter_interval: "60s"
############

View File

@ -76,6 +76,8 @@ prometheus_services:
container_name: "prometheus_openstack_exporter"
group: "prometheus-openstack-exporter"
enabled: "{{ enable_prometheus_openstack_exporter | bool }}"
environment:
OS_COMPUTE_API_VERSION: "{{ prometheus_openstack_exporter_compute_api_version }}"
image: "{{ prometheus_openstack_exporter_image_full }}"
volumes: "{{ prometheus_openstack_exporter_default_volumes + prometheus_openstack_exporter_extra_volumes }}"
dimensions: "{{ prometheus_openstack_exporter_dimensions }}"

View File

@ -117,6 +117,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
environment: "{{ service.environment|default(omit) }}"
when:
- kolla_action != "config"

View File

@ -9,6 +9,7 @@
pid_mode: "{{ item.value.pid_mode|default('') }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
environment: "{{ item.value.environment|default(omit) }}"
when:
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool

View File

@ -0,0 +1,7 @@
---
features:
- |
Adds support for configuring the Openstack Compute API microversion used by
the OpenStack exporter for Prometheus using the
``prometheus_openstack_exporter_compute_api_version`` variable. The default
value is ``latest``, matching the default behaviour of the exporter.