From 117146393ef269fd3290408f9de4269463f702bc Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Thu, 15 Oct 2026 20:02:23 +0200 Subject: [PATCH] kolla: default the ceilometer Prometheus exporter Add the defaults for the carried kolla-ansible patch that lets ceilometer's polling agents serve their samples to the Prometheus OSISM deploys: - enable_ceilometer_prometheus_exporter follows enable_ceilometer and enable_prometheus, so the export comes with ceilometer without making ceilometer itself any less opt-in. - ceilometer_prometheus_exporter_port is 9181, the port the Prometheus default port allocations list for an OpenStack Ceilometer exporter. The agents' own default, 9101, is taken by HAProxy's exporter endpoint on hosts that run HAProxy, and neither kolla-ansible nor OSISM uses 9181. - ceilometer_central_prometheus_exporter_port and ceilometer_compute_prometheus_exporter_port default to that shared port. They exist for the rare host that runs both agents, where one of them has to move; the deploy refuses the clash on such a host. All four are OSISM-invented variables with no upstream counterpart, hence the Custom features section of 099-kolla.yml. Releases whose kolla-ansible image does not carry the patch do not read them. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Roger Luethi --- all/099-kolla.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/all/099-kolla.yml b/all/099-kolla.yml index 8a5b35d..58f658a 100644 --- a/all/099-kolla.yml +++ b/all/099-kolla.yml @@ -230,6 +230,18 @@ grafana_custom_dashboards_paths: "{{ [node_custom_config + '/grafana/dashboards'] }}" +# Ceilometer's polling agents serve their samples to the Prometheus scrape job +# on this port when both services are enabled (carried kolla-ansible patch +# "ceilometer: export polled metrics to Prometheus"). 9181 is the port the +# Prometheus default port allocations list for an OpenStack Ceilometer +# exporter; the agents' own default, 9101, is taken by HAProxy's exporter. +enable_ceilometer_prometheus_exporter: "{{ enable_ceilometer | bool and enable_prometheus | bool }}" +ceilometer_prometheus_exporter_port: "9181" +# A host that runs both the central and the compute agent needs one of them +# on another port, set for that host; the deploy refuses the clash. +ceilometer_central_prometheus_exporter_port: "{{ ceilometer_prometheus_exporter_port }}" +ceilometer_compute_prometheus_exporter_port: "{{ ceilometer_prometheus_exporter_port }}" + ########################################################## # Backward compability