Deprecate v1 Cinder api - query v{2,3} for alerts/dashboards

Change-Id: I71f8faa678488ff938db74eabf2db311d48bc86d
Related-Bug: PROD-18351
diff --git a/cinder/files/grafana_dashboards/cinder_prometheus.json b/cinder/files/grafana_dashboards/cinder_prometheus.json
index 0995705..3f93455 100644
--- a/cinder/files/grafana_dashboards/cinder_prometheus.json
+++ b/cinder/files/grafana_dashboards/cinder_prometheus.json
@@ -72,7 +72,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "min(openstack_api_check_status{service=~\"cinder.*\"})",
+              "expr": "max(openstack_api_check_status{service=~\"cinder.*\"})",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{ service }}",
diff --git a/cinder/files/grafana_dashboards/cinder_prometheus_fluentd.json b/cinder/files/grafana_dashboards/cinder_prometheus_fluentd.json
index 1146795..be49dd6 100644
--- a/cinder/files/grafana_dashboards/cinder_prometheus_fluentd.json
+++ b/cinder/files/grafana_dashboards/cinder_prometheus_fluentd.json
@@ -72,7 +72,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "min(openstack_api_check_status{service=~\"cinder.*\"})",
+              "expr": "max(openstack_api_check_status{service=~\"cinder.*\"})",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{ service }}",
diff --git a/cinder/meta/prometheus.yml b/cinder/meta/prometheus.yml
index e3392b0..2b72ae4 100644
--- a/cinder/meta/prometheus.yml
+++ b/cinder/meta/prometheus.yml
@@ -9,7 +9,7 @@
 {%- raw %}
     CinderAPIDown:
       if: >-
-        max(openstack_api_check_status{service=~"cinder.*"}) by (service) == 0
+        max(openstack_api_check_status{service=~"cinder.*"}) == 0
       for: 2m
       labels:
         severity: down