Merge pull request #1574 from stackhpc/fix-ceph-rgw-lb-blackbox-endpoint

MoteHue · web-flow · commit 58a3f5af27f7 · 2025-03-20T11:11:22.000Z
Fix ceph-rgw blackbox endpoint enabling
diff --git a/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter b/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter
@@ -37,7 +37,7 @@ prometheus_blackbox_exporter_endpoints_default:
   - endpoints:
       - "ceph_rgw:http_2xx:{{ ceph_rgw_public_base_endpoint }}"
       - "{{ ('ceph_rgw_internal:http_2xx:' + ceph_rgw_internal_base_endpoint) if not kolla_same_external_internal_vip | bool }}"
-    enabled: "{{ enable_ceph_rgw | bool }}"
+    enabled: "{{ enable_ceph_rgw | bool and enable_ceph_rgw_loadbalancer | bool }}"
   - endpoints:
       - "cinder:os_endpoint:{{ cinder_public_base_endpoint }}"
       - "{{ ('cinder_internal:os_endpoint:' + cinder_internal_base_endpoint) if not kolla_same_external_internal_vip | bool }}"
diff --git a/releasenotes/notes/fix-ceph-rgw-blackbox-endpoint-7af02679b3fd093d.yaml b/releasenotes/notes/fix-ceph-rgw-blackbox-endpoint-7af02679b3fd093d.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue where the ``ceph-rgw`` endpoints were added to the
+    Prometheus blackbox exporter when the Kolla loadbalancer was not in use for
+    RGWs.

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +---
 +fixes:
 +  - |
 +    Fixes an issue where the ``ceph-rgw`` endpoints were added to the
 +    Prometheus blackbox exporter when the Kolla loadbalancer was not in use for
 +    RGWs.