Skip to content

prometheus: Fix Grafana blackbox endpoint checks #887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
claudia-lola wants to merge 1 commit into
base: feature/vast-on-epoxy
Choose a base branch
from
Open

prometheus: Fix Grafana blackbox endpoint checks #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ansible/roles/prometheus/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,10 @@ prometheus_blackbox_exporter_endpoints_default:
enabled: "{{ enable_etcd | bool }}"
- endpoints:
- "grafana:http_2xx:{{ grafana_public_endpoint }}"
- "{{ ('grafana_internal:http_2xx:' + grafana_internal_endpoint) if not kolla_same_external_internal_vip | bool }}"
enabled: "{{ enable_grafana | bool }}"
enabled: "{{ enable_grafana | bool and enable_grafana_external | bool }}"
- endpoints:
- "grafana_internal:http_2xx:{{ grafana_internal_endpoint }}"
enabled: "{{ enable_grafana | bool and ((not enable_grafana_external | bool) or (not kolla_same_external_internal_vip | bool)) }}"
- endpoints:
- "opensearch:http_2xx:{{ opensearch_internal_endpoint }}"
enabled: "{{ enable_opensearch | bool }}"
Expand Down
7 changes: 7 additions & 0 deletions releasenotes/notes/fix-grafana-external-blackbox-check-c1b97a2406ad3b15.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
fixes:
- |
Fixes Prometheus blackbox exporter checks for Grafana when external
Grafana access is disabled. The public Grafana endpoint is now only
monitored when ``enable_grafana_external`` is enabled, while the internal
endpoint continues to be monitored when appropriate.