From 791410e945c11017cf3c75e270f40e0ecb2e812f Mon Sep 17 00:00:00 2001 From: technowhizz <7688823+technowhizz@users.noreply.github.com> Date: Fri, 14 Feb 2025 23:35:19 +0000 Subject: [PATCH 1/2] Add reminder to remove custom blackbox endpoints --- doc/source/operations/upgrading-openstack.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/doc/source/operations/upgrading-openstack.rst b/doc/source/operations/upgrading-openstack.rst index 891829e05..e407db1d7 100644 --- a/doc/source/operations/upgrading-openstack.rst +++ b/doc/source/operations/upgrading-openstack.rst @@ -106,6 +106,25 @@ the following in ``kayobe-config/etc/kayobe/stackhpc-monitoring.yml``: # targets being templated during deployment. stackhpc_enable_os_capacity: false +Prometheus blackbox exporter endpoints +-------------------------------------- + +Endpoints for the blackbox exporter are now templated in the kolla-ansible +group vars for the cloud. This means that the +``prometheus_blackbox_exporter_endpoints`` variable can be removed from the +environment's ``kolla/globals.yml`` file (if applicable) and the endpoints will +fallback to the ones templated in the group vars. Additional endpoints may be +added through the ``prometheus_blackbox_exporter_endpoints_kayobe`` variable. +For example: + +.. code-block:: yaml + :caption: ``kolla/globals.yml`` + + prometheus_blackbox_exporter_endpoints_kayobe: + - endpoints: + - "pulp:http_2xx:{{ pulp_url }}/pulp/api/v3/status/" + enabled: "{{ seed_pulp_container_enabled | bool }}" + Known issues ============ From 381b4f3dd2179bf8a242dc5ca9eb404543a23c46 Mon Sep 17 00:00:00 2001 From: Alex-Welsh <112560678+Alex-Welsh@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:53:43 +0100 Subject: [PATCH 2/2] Update doc/source/operations/upgrading-openstack.rst --- doc/source/operations/upgrading-openstack.rst | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/doc/source/operations/upgrading-openstack.rst b/doc/source/operations/upgrading-openstack.rst index e407db1d7..1b2b76fc9 100644 --- a/doc/source/operations/upgrading-openstack.rst +++ b/doc/source/operations/upgrading-openstack.rst @@ -109,12 +109,26 @@ the following in ``kayobe-config/etc/kayobe/stackhpc-monitoring.yml``: Prometheus blackbox exporter endpoints -------------------------------------- -Endpoints for the blackbox exporter are now templated in the kolla-ansible +Many endpoints for the Blackbox exporter are now templated in the Kolla-Ansible group vars for the cloud. This means that the ``prometheus_blackbox_exporter_endpoints`` variable can be removed from the environment's ``kolla/globals.yml`` file (if applicable) and the endpoints will -fallback to the ones templated in the group vars. Additional endpoints may be -added through the ``prometheus_blackbox_exporter_endpoints_kayobe`` variable. +fallback to the ones templated in the group vars. Backend endpoints such as +`these `__ +are not yet templated by Kolla-Ansible. + +Additional endpoints may still be added. + +For Kolla-Ansible templating, use ``stackhpc_prometheus_blackbox_exporter_endpoints_custom``. +For example: + +.. code-block:: yaml + :caption: ``etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter`` + + stackhpc_prometheus_blackbox_exporter_endpoints_custom: + - 'custom_service:http_2xx:{{ public_protocol }}://{{ external_fqdn | put_address_in_context('url') }}:{{ custom_serivce_port }}' + +Alternatively, for Kayobe templating, use the ``prometheus_blackbox_exporter_endpoints_kayobe`` variable. For example: .. code-block:: yaml