commit 4ffafacd3f6d1e3aa8a4f5495517f7f9e5cbf355
author Vladimir Khlyunev <vkhlyunev@mirantis.com> Mon Sep 07 09:53:44 2020 +0000
committer Gerrit Code Review <mail@domain.com> Mon Sep 07 09:53:44 2020 +0000
tree 96d2bb4ef5fc0207e393c65e5b981a7c98725332
parent 3151e8ae8c7e7ee220e56fb4eabc79516bc5843d
parent aaf3c0c47b2fbcf54ea03057f189bbadcb0a0da4

Merge "Fix confusion between `state` and `status` in overview dashboard."

nova/files/grafana_dashboards/nova_overview_prometheus.json

diff --git a/nova/files/grafana_dashboards/nova_overview_prometheus.json b/nova/files/grafana_dashboards/nova_overview_prometheus.json
index f6bb024..d326567 100644
--- a/nova/files/grafana_dashboards/nova_overview_prometheus.json
+++ b/nova/files/grafana_dashboards/nova_overview_prometheus.json
@@ -956,14 +956,14 @@
           "refId": "A"
         },
         {
-          "expr": "max(count(openstack_nova_service_state{binary=\"nova-conductor\"} == 1 and openstack_nova_service_status{binary=\"nova-conductor\"} == 0) by (instance))",
+          "expr": "max(count(openstack_nova_service_state{binary=\"nova-conductor\"} == 0 and openstack_nova_service_status{binary=\"nova-conductor\"} == 1) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "enabled/down",
           "refId": "B"
         },
         {
-          "expr": "max(count(openstack_nova_service_state{binary=\"nova-conductor\"} == 0 and openstack_nova_service_status{binary=\"nova-conductor\"} == 1) by (instance))",
+          "expr": "max(count(openstack_nova_service_state{binary=\"nova-conductor\"} == 1 and openstack_nova_service_status{binary=\"nova-conductor\"} == 0) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "disabled/up",
@@ -1066,14 +1066,14 @@
           "refId": "A"
         },
         {
-          "expr": "max(count(openstack_nova_service_state{binary=\"nova-consoleauth\"} == 1 and openstack_nova_service_status{binary=\"nova-consoleauth\"} == 0) by (instance))",
+          "expr": "max(count(openstack_nova_service_state{binary=\"nova-consoleauth\"} == 0 and openstack_nova_service_status{binary=\"nova-consoleauth\"} == 1) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "enabled/down",
           "refId": "B"
         },
         {
-          "expr": "max(count(openstack_nova_service_state{binary=\"nova-consoleauth\"} == 0 and openstack_nova_service_status{binary=\"nova-consoleauth\"} == 1) by (instance))",
+          "expr": "max(count(openstack_nova_service_state{binary=\"nova-consoleauth\"} == 1 and openstack_nova_service_status{binary=\"nova-consoleauth\"} == 0) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "disabled/up",
@@ -1176,14 +1176,14 @@
           "refId": "A"
         },
         {
-          "expr": "max(count(openstack_nova_service_state{binary=\"nova-scheduler\"} == 1 and openstack_nova_service_status{binary=\"nova-scheduler\"} == 0) by (instance))",
+          "expr": "max(count(openstack_nova_service_state{binary=\"nova-scheduler\"} == 0 and openstack_nova_service_status{binary=\"nova-scheduler\"} == 1) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "enabled/down",
           "refId": "B"
         },
         {
-          "expr": "max(count(openstack_nova_service_state{binary=\"nova-scheduler\"} == 0 and openstack_nova_service_status{binary=\"nova-scheduler\"} == 1) by (instance))",
+          "expr": "max(count(openstack_nova_service_state{binary=\"nova-scheduler\"} == 1 and openstack_nova_service_status{binary=\"nova-scheduler\"} == 0) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "disabled/up",
@@ -1292,14 +1292,14 @@
           "refId": "A"
         },
         {
-          "expr": "max(count(openstack_nova_service_state{binary=\"nova-cert\"} == 1 and openstack_nova_service_status{binary=\"nova-cert\"} == 0) by (instance))",
+          "expr": "max(count(openstack_nova_service_state{binary=\"nova-cert\"} == 0 and openstack_nova_service_status{binary=\"nova-cert\"} == 1) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "enabled/down",
           "refId": "B"
         },
         {
-          "expr": "max(count(openstack_nova_service_state{binary=\"nova-cert\"} == 0 and openstack_nova_service_status{binary=\"nova-cert\"} == 1) by (instance))",
+          "expr": "max(count(openstack_nova_service_state{binary=\"nova-cert\"} == 1 and openstack_nova_service_status{binary=\"nova-cert\"} == 0) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "disabled/up",
@@ -1407,14 +1407,14 @@
           "refId": "A"
         },
         {
-          "expr": "max(count(openstack_nova_service_state{service=\"nova-compute\"} == 1 and openstack_nova_service_status{service=\"nova-compute\"} == 0) by (instance))",
+          "expr": "max(count(openstack_nova_service_state{service=\"nova-compute\"} == 0 and openstack_nova_service_status{service=\"nova-compute\"} == 1) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "enabled/down",
           "refId": "B"
         },
         {
-          "expr": "max(count(openstack_nova_service_state{service=\"nova-compute\"} == 0 and openstack_nova_service_status{service=\"nova-compute\"} == 1) by (instance))",
+          "expr": "max(count(openstack_nova_service_state{service=\"nova-compute\"} == 1 and openstack_nova_service_status{service=\"nova-compute\"} == 0) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "disabled/up",