Skip to content

Commit de39aa1

Browse files
committed
Fix ceph-rgw blackbox endpoint enabling
When using the Ceph ingress for balancing RGW traffic, we disable the KA loadbalancing of this traffic. Therefore, we do not need to monitor the ``ceph-rgw`` endpoints when ``enable_ceph_rgw_loadbalancer=false``.
1 parent 9f6c4ef commit de39aa1

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ prometheus_blackbox_exporter_endpoints_default:
3737
- endpoints:
3838
- "ceph_rgw:http_2xx:{{ ceph_rgw_public_base_endpoint }}"
3939
- "{{ ('ceph_rgw_internal:http_2xx:' + ceph_rgw_internal_base_endpoint) if not kolla_same_external_internal_vip | bool }}"
40-
enabled: "{{ enable_ceph_rgw | bool }}"
40+
enabled: "{{ enable_ceph_rgw | bool and enable_ceph_rgw_loadbalancer | bool }}"
4141
- endpoints:
4242
- "cinder:os_endpoint:{{ cinder_public_base_endpoint }}"
4343
- "{{ ('cinder_internal:os_endpoint:' + cinder_internal_base_endpoint) if not kolla_same_external_internal_vip | bool }}"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue where the ``ceph-rgw`` endpoints were added to the
5+
Prometheus blackbox exporter when the Kolla loadbalancer was not in use for
6+
RGWs.

0 commit comments

Comments
 (0)