Skip to content

Commit d9187c4

Browse files
Alex-WelshAlex-Welsh
committed
Add generic blackbox monitoring configuration
1 parent ee07cd3 commit d9187c4

File tree

2 files changed

+131
-1
lines changed

2 files changed

+131
-1
lines changed

‎etc/kayobe/environments/ci-aio/stackhpc-ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,7 @@ stackhpc_include_os_minor_version_in_repo_url: true
7979
stackhpc_docker_registry: "{{ stackhpc_repo_mirror_url | regex_replace('^https?://', '') }}"
8080
stackhpc_docker_registry_username: "{{ stackhpc_repo_mirror_username }}"
8181
stackhpc_docker_registry_password: "{{ stackhpc_repo_mirror_password }}"
82+
83+
# Ensure BlackBox monitoring configuration is generated correctly
84+
seed_pulp_container_enabled: false
85+
pulp_url: ""

‎etc/kayobe/kolla/globals.yml

Lines changed: 127 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,131 @@ prometheus_ceph_mgr_exporter_endpoints:
6969
{% endfor %}
7070
{% endif %}
7171

72-
#############################################################################
72+
73+
########################################
74+
# Prometheus blackbox monitoring options
75+
########################################
76+
{% raw %}
77+
kolla_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}"
78+
kolla_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}"
79+
80+
prometheus_blackbox_exporter_endpoints: "{{ prometheus_blackbox_exporter_endpoints_default | selectattr('enabled', 'true') | map(attribute='endpoints') | flatten | union(prometheus_blackbox_exporter_endpoints_custom) | unique | select }}"
81+
82+
prometheus_blackbox_exporter_endpoints_custom: []
83+
84+
prometheus_blackbox_exporter_endpoints_default:
85+
# OpenStack endpoints
86+
- endpoints:
87+
- "barbican:os_endpoint:{{ kolla_public_endpoint }}:{{ barbican_api_public_port }}"
88+
- "{{ ('barbican_internal:os_endpoint:' + kolla_internal_endpoint + ':' + barbican_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
89+
enabled: "{{ enable_barbican | bool }}"
90+
- endpoints:
91+
- "blazar:os_endpoint:{{ kolla_public_endpoint }}:{{ blazar_api_public_port }}"
92+
- "{{ ('blazar_internal:os_endpoint:' + kolla_internal_endpoint + ':' + blazar_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
93+
enabled: "{{ enable_blazar | bool }}"
94+
- endpoints:
95+
- "ceph_rgw:os_endpoint:{{ kolla_public_endpoint }}:{{ ceph_rgw_public_port }}"
96+
- "{{ ('ceph_rgw_internal:os_endpoint:' + kolla_internal_endpoint + ':' + ceph_rgw_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
97+
enabled: "{{ enable_ceph_rgw | bool }}"
98+
- endpoints:
99+
- "cinder:os_endpoint:{{ kolla_public_endpoint }}:{{ cinder_api_public_port }}"
100+
- "{{ ('cinder_internal:os_endpoint:' + kolla_internal_endpoint + ':' + cinder_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
101+
enabled: "{{ enable_cinder | bool }}"
102+
- endpoints:
103+
- "cloudkitty:os_endpoint:{{ kolla_public_endpoint }}:{{ cloudkitty_api_public_port }}"
104+
- "{{ ('cloudkitty_internal:os_endpoint:' + kolla_internal_endpoint + ':' + cloudkitty_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
105+
enabled: "{{ enable_cloudkitty | bool }}"
106+
- endpoints:
107+
- "designate:os_endpoint:{{ kolla_public_endpoint }}:{{ designate_api_public_port }}"
108+
- "{{ ('designate_internal:os_endpoint:' + kolla_internal_endpoint + ':' + designate_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
109+
enabled: "{{ enable_designate | bool }}"
110+
- endpoints:
111+
- "glance:os_endpoint:{{ kolla_public_endpoint }}:{{ glance_api_public_port }}"
112+
- "{{ ('glance_internal:os_endpoint:' + kolla_internal_endpoint + ':' + glance_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
113+
enabled: "{{ enable_glance | bool }}"
114+
- endpoints:
115+
- "heat:os_endpoint:{{ kolla_public_endpoint }}:{{ heat_api_public_port }}"
116+
- "{{ ('heat_internal:os_endpoint:' + kolla_internal_endpoint + ':' + heat_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
117+
- "heat_cfn:os_endpoint:{{ kolla_public_endpoint }}:{{ heat_api_cfn_public_port }}"
118+
- "{{ ('heat_cfn_internal:os_endpoint:' + kolla_internal_endpoint + ':' + heat_api_cfn_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
119+
enabled: "{{ enable_heat | bool }}"
120+
- endpoints:
121+
- "horizon:http_2xx:{{ kolla_public_endpoint }}:{{ horizon_listen_port }}"
122+
- "{{ ('horizon_internal:http_2xx:' + kolla_internal_endpoint + ':' + horizon_listen_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
123+
enabled: "{{ enable_horizon | bool }}"
124+
- endpoints:
125+
- "ironic:os_endpoint:{{ kolla_public_endpoint }}:{{ ironic_api_public_port }}"
126+
- "{{ ('ironic_internal:os_endpoint:' + kolla_internal_endpoint + ':' + ironic_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
127+
- "ironic_inspector:os_endpoint:{{ kolla_public_endpoint }}:{{ ironic_inspector_public_port }}"
128+
- "{{ ('ironic_inspector_internal:os_endpoint:' + kolla_internal_endpoint + ':' + ironic_inspector_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
129+
enabled: "{{ enable_ironic | bool }}"
130+
- endpoints:
131+
- "keystone:os_endpoint:{{ keystone_public_url }}"
132+
- "{{ ('keystone_internal:os_endpoint:' + keystone_internal_url) if keystone_internal_url != keystone_public_url }}"
133+
enabled: "{{ enable_keystone | bool }}"
134+
- endpoints:
135+
- "magnum:os_endpoint:{{ kolla_public_endpoint }}:{{ magnum_api_public_port }}"
136+
- "{{ ('magnum_internal:os_endpoint:' + kolla_internal_endpoint + ':' + magnum_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
137+
enabled: "{{ enable_magnum | bool }}"
138+
- endpoints:
139+
- "manila:os_endpoint:{{ kolla_public_endpoint }}:{{ manila_api_public_port }}"
140+
- "{{ ('manila_internal:os_endpoint:' + kolla_internal_endpoint + ':' + manila_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
141+
- "manila_v2:os_endpoint:{{ kolla_public_endpoint }}:{{ manila_api_public_port }}"
142+
- "{{ ('manila_v2_internal:os_endpoint:' + kolla_internal_endpoint + ':' + manila_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
143+
enabled: "{{ enable_manila | bool }}"
144+
- endpoints:
145+
- "neutron:os_endpoint:{{ kolla_public_endpoint }}:{{ neutron_server_public_port }}"
146+
- "{{ ('neutron_internal:os_endpoint:' + kolla_internal_endpoint + ':' + neutron_server_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
147+
enabled: "{{ enable_neutron | bool }}"
148+
- endpoints:
149+
- "nova:os_endpoint:{{ kolla_public_endpoint }}:{{ nova_api_public_port }}"
150+
- "{{ ('nova_internal:os_endpoint:' + kolla_internal_endpoint + ':' + nova_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
151+
enabled: "{{ enable_nova | bool }}"
152+
- endpoints:
153+
- "octavia:os_endpoint:{{ kolla_public_endpoint }}:{{ octavia_api_public_port }}"
154+
- "{{ ('octavia_internal:os_endpoint:' + kolla_internal_endpoint + ':' + octavia_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
155+
enabled: "{{ enable_octavia | bool }}"
156+
- endpoints:
157+
- "placement:os_endpoint:{{ kolla_public_endpoint }}:{{ placement_api_public_port }}"
158+
- "{{ ('placement_internal:os_endpoint:' + kolla_internal_endpoint + ':' + placement_api_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
159+
enabled: "{{ enable_placement | bool }}"
160+
- endpoints:
161+
- "swift:os_endpoint:{{ kolla_public_endpoint }}:{{ swift_proxy_server_port }}"
162+
- "{{ ('swift_internal:os_endpoint:' + kolla_internal_endpoint + ':' + swift_proxy_server_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
163+
enabled: "{{ enable_swift | bool }}"
164+
# Additional service endpoints
165+
- endpoints: "{% set etcd_endpoints = [] %}{% for host in groups.get('etcd', []) %}{{ etcd_endpoints.append('etcd_' + host + ':http_2xx:' + etcd_protocol + '://' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['etcd_client_port'] + '/metrics')}}{% endfor %}{{ etcd_endpoints }}"
166+
enabled: "{{ enable_etcd | bool }}"
167+
- endpoints:
168+
- "grafana:http_2xx:{{ kolla_public_endpoint }}:{{ grafana_server_port }}"
169+
- "{{ ('grafana_internal:http_2xx:' + kolla_internal_endpoint + ':' + grafana_public_server_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
170+
enabled: "{{ enable_grafana | bool }}"
171+
- endpoints:
172+
- "elasticsearch:http_2xx:{{ internal_protocol }}://{{ elasticsearch_address | put_address_in_context('url') }}:{{ elasticsearch_port }}"
173+
enabled: "{{ enable_elasticsearch | bool }}"
174+
- endpoints:
175+
- "opensearch:http_2xx:{{ internal_protocol }}://{{ opensearch_address | put_address_in_context('url') }}:{{ opensearch_port }}"
176+
enabled: "{{ enable_opensearch | bool }}"
177+
- endpoints:
178+
- "kibana:http_2xx_kibana:{{ kolla_public_endpoint }}:{{ kibana_server_port }}/api/status"
179+
enabled: "{{ enable_kibana | bool }}"
180+
- endpoints:
181+
- "os_dashboards:http_2xx_os_dashboards:{{ kolla_public_endpoint }}:{{ opensearch_dashboards_port }}/api/status"
182+
enabled: "{{ enable_opensearch_dashboards | bool }}"
183+
- endpoints:
184+
- "prometheus:http_2xx_prometheus:{{ kolla_public_endpoint }}:{{ prometheus_port }}/-/healthy"
185+
- "{{ ('prometheus_internal:http_2xx_prometheus:' + kolla_internal_endpoint + ':' + prometheus_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
186+
enabled: "{{ enable_prometheus | bool }}"
187+
- endpoints:
188+
- "prometheus_alertmanager:http_2xx_alertmanager:{{ kolla_public_endpoint }}:{{ prometheus_alertmanager_port }}"
189+
- "{{ ('prometheus_alertmanager_internal:http_2xx_alertmanager:' + kolla_internal_endpoint + ':' + prometheus_alertmanager_port) if kolla_public_endpoint != kolla_internal_endpoint }}"
190+
enabled: "{{ enable_prometheus_alertmanager | bool }}"
191+
- endpoints: "{% set rabbitmq_endpoints = [] %}{% for host in groups.get('rabbitmq', []) %}{{ rabbitmq_endpoints.append('rabbitmq_' + host + ':tcp_connect:' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['rabbitmq_port'] ) }}{% endfor %}{{ rabbitmq_endpoints }}"
192+
enabled: "{{ enable_rabbitmq | bool }}"
193+
- endpoints: "{% set redis_endpoints = [] %}{% for host in groups.get('redis', []) %}{{ redis_endpoints.append('redis_' + host + ':tcp_connect:' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['redis_port']) }}{% endfor %}{{ redis_endpoints }}"
194+
enabled: "{{ enable_redis | bool }}"
195+
{% endraw %}
196+
- endpoints:
197+
- "pulp:http_2xx:{{ pulp_url }}/pulp/api/v3/status/"
198+
enabled: "{{ seed_pulp_container_enabled | bool }}"
73199

0 commit comments

Comments
 (0)