Merge "Openstack API check improvements"
diff --git a/ironic/files/grafana_dashboards/ironic_prometheus.json b/ironic/files/grafana_dashboards/ironic_prometheus.json
index e863fe7..4c116a0 100644
--- a/ironic/files/grafana_dashboards/ironic_prometheus.json
+++ b/ironic/files/grafana_dashboards/ironic_prometheus.json
@@ -95,14 +95,14 @@
"tableColumn": "",
"targets": [
{
- "expr": "max(openstack_api_check_status{name=~\"ironic.*\"})",
+ "expr": "openstack_api_check_status{interface=\"public\",service_name=\"ironic\"}",
"format": "time_series",
"intervalFactor": 2,
"refId": "A"
}
],
"thresholds": "0.5,0.5",
- "title": "VIP API availability",
+ "title": "Public VIP API Availability",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
diff --git a/ironic/meta/prometheus.yml b/ironic/meta/prometheus.yml
index 390314c..06f837b 100644
--- a/ironic/meta/prometheus.yml
+++ b/ironic/meta/prometheus.yml
@@ -102,17 +102,6 @@
annotations:
summary: "{{ $labels.name }} endpoints outage"
description: All available {{ $labels.name }} endpoints are not accessible for 2 minutes.
- IronicApiOutage:
- if: >-
- max(openstack_api_check_status{name="ironic"}) == 0
- for: 2m
- labels:
- severity: critical
- service: ironic
- annotations:
- summary: Ironic API outage
- description: >-
- Ironic API is not accessible for all available Ironic endpoints in the OpenStack service catalog for 2 minutes.
{%- endraw %}
{%- endif %}
{%- endif %}