Merge "Change some default values for Rabbit driver"
diff --git a/cinder/files/grafana_dashboards/cinder_prometheus.json b/cinder/files/grafana_dashboards/cinder_prometheus.json
index 51e3de7..322ed2d 100644
--- a/cinder/files/grafana_dashboards/cinder_prometheus.json
+++ b/cinder/files/grafana_dashboards/cinder_prometheus.json
@@ -72,16 +72,15 @@
"tableColumn": "",
"targets": [
{
- "expr": "max(openstack_api_check_status{service=~\"cinder.*\"})",
+ "expr": "min(openstack_api_check_status{interface=\"public\",service_name=~\"cinder.*\"})",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "{{ service }}",
"refId": "A",
"step": 60
}
],
"thresholds": "0.5,1.5",
- "title": "API Availability",
+ "title": "Public VIP API Availability",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
diff --git a/cinder/files/grafana_dashboards/cinder_prometheus_fluentd.json b/cinder/files/grafana_dashboards/cinder_prometheus_fluentd.json
index 866a90e..2608247 100644
--- a/cinder/files/grafana_dashboards/cinder_prometheus_fluentd.json
+++ b/cinder/files/grafana_dashboards/cinder_prometheus_fluentd.json
@@ -97,14 +97,14 @@
"tableColumn": "",
"targets": [
{
- "expr": "max(openstack_api_check_status{name=~\"cinder.*\"})",
+ "expr": "min(openstack_api_check_status{interface=\"public\",service_name=~\"cinder.*\"})",
"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/cinder/meta/grafana.yml b/cinder/meta/grafana.yml
index fadfad4..809b133 100644
--- a/cinder/meta/grafana.yml
+++ b/cinder/meta/grafana.yml
@@ -119,4 +119,4 @@
type: dashboard
target:
cluster_status:
- expr: avg(openstack_api_check_status{service=~"cinder.*"})
+ expr: min(openstack_api_check_status{interface="public",service_name=~"cinder.*"})
diff --git a/cinder/meta/prometheus.yml b/cinder/meta/prometheus.yml
index b9d548c..e393071 100644
--- a/cinder/meta/prometheus.yml
+++ b/cinder/meta/prometheus.yml
@@ -10,26 +10,6 @@
alert:
{%- if is_controller %}
{%- raw %}
- CinderApiOutage:
- if: >-
- max(openstack_api_check_status{name=~"cinder.*"}) == 0
- labels:
- severity: critical
- service: cinder
- annotations:
- summary: "Cinder API outage"
- description: >-
- Cinder API is not accessible for all available Cinder endpoints in the OpenStack service catalog.
- CinderApiDown:
- if: >-
- openstack_api_check_status{name=~"cinder.*"} == 0
- labels:
- severity: major
- service: cinder
- annotations:
- summary: "{{ $labels.name }} endpoint is not accessible"
- description: >-
- Cinder API is not accessible for the {{ $labels.name }} endpoint.
CinderApiEndpointDown:
if: >-
http_response_status{name=~"cinder-api"} == 0
@@ -112,6 +92,7 @@
if: >-
procstat_running{process_name="cinder-volume"} == 0
{% raw %}
+ for: 2m
labels:
severity: minor
service: cinder
@@ -123,6 +104,7 @@
if: >-
count(procstat_running{process_name="cinder-volume"} == 0) >= count(procstat_running{process_name="cinder-volume"}) * {{ minor_threshold }}
{% raw %}
+ for: 2m
labels:
severity: minor
service: cinder
@@ -134,6 +116,7 @@
if: >-
count(procstat_running{process_name="cinder-volume"} == 0) >= count(procstat_running{process_name="cinder-volume"}) * {{ major_threshold }}
{% raw %}
+ for: 2m
labels:
severity: major
service: cinder
@@ -145,6 +128,7 @@
if: >-
count(procstat_running{process_name="cinder-volume"} == 0) == count(procstat_running{process_name="cinder-volume"})
{% raw %}
+ for: 2m
labels:
severity: critical
service: cinder