From a37cf380adeae1e7c68b02978cc1a01cc5f3d59e Mon Sep 17 00:00:00 2001
From: Aleksei Zakharov <zaharov@selectel.ru>
Date: Thu, 23 Jan 2020 19:29:57 +0300
Subject: [PATCH] mgr/grafana: sum pg states for cluster

Also, revert table formatting.

Signed-off-by: Aleksei Zakharov <zaharov@selectel.ru>
---
 .../grafana/dashboards/ceph-cluster.json      | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/monitoring/grafana/dashboards/ceph-cluster.json b/monitoring/grafana/dashboards/ceph-cluster.json
index 93fe3372c6c50..549bb1ea2f428 100644
--- a/monitoring/grafana/dashboards/ceph-cluster.json
+++ b/monitoring/grafana/dashboards/ceph-cluster.json
@@ -346,7 +346,6 @@
       },
       "id": 53,
       "legend": {
-        "alignAsTable": true,
         "avg": false,
         "current": false,
         "max": false,
@@ -403,52 +402,52 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "ceph_pool_metadata * on(pool_id,instance) group_left() (ceph_pg_total)",
+          "expr": "sum(ceph_pg_total)",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "{{name}} Total",
+          "legendFormat": "Total",
           "refId": "A"
         },
         {
-          "expr": "ceph_pool_metadata * on(pool_id,instance) group_left() (ceph_pg_active)",
+          "expr": "sum(ceph_pg_active)",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "{{name}} Active",
+          "legendFormat": "Active",
           "refId": "B"
         },
         {
-          "expr": "ceph_pool_metadata * on(pool_id,instance) group_left() (ceph_pg_total - ceph_pg_active)",
+          "expr": "sum(ceph_pg_total - ceph_pg_active)",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "{{name}} Inactive",
+          "legendFormat": "Inactive",
           "refId": "G"
         },
         {
-          "expr": "ceph_pool_metadata * on(pool_id,instance) group_left() (ceph_pg_undersized)",
+          "expr": "sum(ceph_pg_undersized)",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "{{name}} Undersized",
+          "legendFormat": "Undersized",
           "refId": "F"
         },
         {
-          "expr": "ceph_pool_metadata * on(pool_id,instance) group_left() (ceph_pg_degraded)",
+          "expr": "sum(ceph_pg_degraded)",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "{{name}} Degraded",
+          "legendFormat": "Degraded",
           "refId": "C"
         },
         {
-          "expr": "ceph_pool_metadata * on(pool_id,instance) group_left() (ceph_pg_inconsistent)",
+          "expr": "sum(ceph_pg_inconsistent)",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "{{name}} Inconsistent",
+          "legendFormat": "Inconsistent",
           "refId": "D"
         },
         {
-          "expr": "ceph_pool_metadata * on(pool_id,instance) group_left() (ceph_pg_down)",
+          "expr": "sum(ceph_pg_down)",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "{{name}} Down",
+          "legendFormat": "Down",
           "refId": "E"
         }
       ],
-- 
2.47.3