From: Boris Ranto <branto@redhat.com>
Date: Wed, 25 Jul 2018 16:16:02 +0000 (+0200)
Subject: osd-node-detail: Fix value repetition
X-Git-Tag: v2.0~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F209%2Fhead;p=cephmetrics.git

osd-node-detail: Fix value repetition

We did not sum the values for RAM usage so we ended up with a couple of
entries being shown for each RAM usage query.

Signed-off-by: Boris Ranto <branto@redhat.com>
---

diff --git a/dashboards/mgr-prometheus/osd-node-detail.json b/dashboards/mgr-prometheus/osd-node-detail.json
index 2e7baaf..2dc231b 100644
--- a/dashboards/mgr-prometheus/osd-node-detail.json
+++ b/dashboards/mgr-prometheus/osd-node-detail.json
@@ -883,28 +883,28 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "node_memory_MemTotal{instance=~\"[[osd_servers]].*\"} - (\n  node_memory_MemFree{instance=~\"[[osd_servers]].*\"}  + \n  node_memory_Cached{instance=~\"[[osd_servers]].*\"} + \n  node_memory_Buffers{instance=~\"[[osd_servers]].*\"} +\n  node_memory_Slab{instance=~\"[[osd_servers]].*\"}\n  )\n  \n",
+          "expr": "sum(node_memory_MemTotal{instance=~\"[[osd_servers]].*\"}) - (\n  sum(node_memory_MemFree{instance=~\"[[osd_servers]].*\"})  + \n  sum(node_memory_Cached{instance=~\"[[osd_servers]].*\"}) + \n  sum(node_memory_Buffers{instance=~\"[[osd_servers]].*\"}) +\n  sum(node_memory_Slab{instance=~\"[[osd_servers]].*\"})\n  )\n  \n",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "used",
           "refId": "D"
         },
         {
-          "expr": "node_memory_MemFree{instance=~\"[[osd_servers]].*\"} ",
+          "expr": "sum(node_memory_MemFree{instance=~\"[[osd_servers]].*\"}) ",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Free",
           "refId": "A"
         },
         {
-          "expr": "node_memory_Cached{instance=~\"[[osd_servers]].*\"} + \nnode_memory_Buffers{instance=~\"[[osd_servers]].*\"} +\nnode_memory_Slab{instance=~\"[[osd_servers]].*\"} \n",
+          "expr": "sum(node_memory_Cached{instance=~\"[[osd_servers]].*\"}) + \nsum(node_memory_Buffers{instance=~\"[[osd_servers]].*\"}) +\nsum(node_memory_Slab{instance=~\"[[osd_servers]].*\"}) \n",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "buffers/cache",
           "refId": "C"
         },
         {
-          "expr": "node_memory_MemTotal{instance=~\"[[osd_servers]].*\"}",
+          "expr": "sum(node_memory_MemTotal{instance=~\"[[osd_servers]].*\"})",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 1,