From: Zack Cerza <zack@redhat.com>
Date: Thu, 31 May 2018 18:27:12 +0000 (-0600)
Subject: dashboards: Remove cruft
X-Git-Tag: v2.0~23^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6c5481b5b890ecf965b2036923e579f1c8d43f3;p=cephmetrics.git

dashboards: Remove cruft

Specifically, references to collectd, influxdb,
and hostnames.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/dashboards/mgr-prometheus/ceph-at-a-glance.json b/dashboards/mgr-prometheus/ceph-at-a-glance.json
index e249a85..4ee267e 100644
--- a/dashboards/mgr-prometheus/ceph-at-a-glance.json
+++ b/dashboards/mgr-prometheus/ceph-at-a-glance.json
@@ -154,8 +154,7 @@
           "expr": "",
           "format": "time_series",
           "intervalFactor": 2,
-          "refId": "A",
-          "target": ""
+          "refId": "A"
         }
       ],
       "thresholds": "",
@@ -248,8 +247,7 @@
           "expr": "",
           "format": "time_series",
           "intervalFactor": 2,
-          "refId": "A",
-          "target": ""
+          "refId": "A"
         }
       ],
       "thresholds": "",
@@ -342,8 +340,7 @@
           "expr": "",
           "format": "time_series",
           "intervalFactor": 2,
-          "refId": "A",
-          "target": ""
+          "refId": "A"
         }
       ],
       "thresholds": "",
@@ -436,8 +433,7 @@
           "expr": "",
           "format": "time_series",
           "intervalFactor": 2,
-          "refId": "A",
-          "target": ""
+          "refId": "A"
         }
       ],
       "thresholds": "",
@@ -530,8 +526,7 @@
           "expr": "",
           "format": "time_series",
           "intervalFactor": 2,
-          "refId": "A",
-          "target": ""
+          "refId": "A"
         }
       ],
       "thresholds": "",
@@ -624,8 +619,7 @@
           "expr": "",
           "format": "time_series",
           "intervalFactor": 2,
-          "refId": "A",
-          "target": ""
+          "refId": "A"
         }
       ],
       "thresholds": "",
@@ -777,7 +771,6 @@
           "format": "time_series",
           "intervalFactor": 2,
           "refId": "A",
-          "target": "consolidateBy(maxSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.health),\"max\")",
           "textEditor": true
         }
       ],
@@ -847,7 +840,6 @@
           "intervalFactor": 1,
           "legendFormat": "total",
           "refId": "D",
-          "target": "alias(keepLastValue(consolidateBy(maxSeries(collectd.$mon_servers.$domain.cephmetrics.gauge.$cluster_name.mon.num_mon), \"max\")),\"total\")",
           "textEditor": true,
           "valueHandler": "Text Only"
         },
@@ -863,7 +855,6 @@
           "intervalFactor": 1,
           "legendFormat": "quorum",
           "refId": "E",
-          "target": "alias(keepLastValue(consolidateBy(maxSeries(collectd.$mon_servers.$domain.cephmetrics.gauge.$cluster_name.mon.num_mon_quorum), \"max\")),\"quorum\")",
           "textEditor": true,
           "valueHandler": "String Threshold",
           "warn": "1"
@@ -883,8 +874,6 @@
           "intervalFactor": 1,
           "legendFormat": "down",
           "refId": "A",
-          "target": "alias(diffSeries(#D,#E), \"down\")",
-          "targetFull": "alias(diffSeries(alias(keepLastValue(consolidateBy(maxSeries(collectd.$mon_servers.$domain.cephmetrics.gauge.$cluster_name.mon.num_mon), \"max\")),\"total\"),alias(keepLastValue(consolidateBy(maxSeries(collectd.$mon_servers.$domain.cephmetrics.gauge.$cluster_name.mon.num_mon_quorum), \"max\")),\"quorum\")), \"down\")",
           "textEditor": true,
           "units": "none",
           "valueHandler": "Number Threshold",
@@ -945,7 +934,6 @@
           "intervalFactor": 2,
           "legendFormat": "total",
           "refId": "E",
-          "target": "alias(keepLastValue(consolidateBy(maxSeries(collectd.$mon_servers.$domain.cephmetrics.gauge.$cluster_name.mon.num_osd), \"max\")),\"total\")",
           "textEditor": true,
           "valueHandler": "Text Only"
         },
@@ -959,7 +947,6 @@
           "intervalFactor": 2,
           "legendFormat": "up",
           "refId": "F",
-          "target": "alias(keepLastValue(consolidateBy(maxSeries(collectd.$mon_servers.$domain.cephmetrics.gauge.$cluster_name.mon.num_osd_up), \"max\")),\"up\")",
           "textEditor": true,
           "valueHandler": "Text Only"
         },
@@ -973,7 +960,6 @@
           "intervalFactor": 2,
           "legendFormat": "in",
           "refId": "A",
-          "target": "alias(keepLastValue(consolidateBy(maxSeries(collectd.$mon_servers.$domain.cephmetrics.gauge.$cluster_name.mon.num_osd_in), \"max\")),\"in\")",
           "textEditor": true,
           "valueHandler": "Text Only"
         },
@@ -986,7 +972,6 @@
           "intervalFactor": 2,
           "legendFormat": "out",
           "refId": "C",
-          "target": "alias(countSeries(currentBelow(groupByNode(transformNull(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.osd_state.*.in,99),-2,\"maxSeries\"),0.5)),\"out\")",
           "textEditor": true,
           "valueHandler": "Text Only"
         },
@@ -1003,7 +988,6 @@
           "intervalFactor": 2,
           "legendFormat": "down",
           "refId": "B",
-          "target": "alias(countSeries(currentBelow(groupByNode(transformNull(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.osd_state.*.up,99),-2,\"maxSeries\"),0.5)),\"down\")",
           "textEditor": true,
           "units": "none",
           "valueHandler": "Number Threshold",
@@ -1063,7 +1047,6 @@
           "intervalFactor": 1,
           "legendFormat": "total",
           "refId": "A",
-          "target": "alias(countSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.osd.num_osds),\"total\")",
           "textEditor": true,
           "valueHandler": "Text Only"
         },
@@ -1077,7 +1060,6 @@
           "intervalFactor": 1,
           "legendFormat": "up",
           "refId": "B",
-          "target": "alias(countSeries(currentAbove(collectd.*.$domain.cephmetrics.gauge.$cluster_name.osd.num_osds,0)),\"up\")",
           "textEditor": true,
           "valueHandler": "Text Only"
         },
@@ -1096,8 +1078,6 @@
           "intervalFactor": 1,
           "legendFormat": "down",
           "refId": "C",
-          "target": "alias(diffSeries(#A, #B), \"down\")",
-          "targetFull": "alias(diffSeries(alias(countSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.osd.num_osds),\"total\"), alias(countSeries(currentAbove(collectd.*.$domain.cephmetrics.gauge.$cluster_name.osd.num_osds,0)),\"up\")), \"down\")",
           "textEditor": true,
           "units": "none",
           "url": "dashboard/db/ceph-health",
@@ -1369,7 +1349,6 @@
           "instant": true,
           "intervalFactor": 2,
           "refId": "A",
-          "target": "alias(maxSeries(groupByNode(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.osd_bytes, 1,\"maxSeries\")), \"raw capacity\")",
           "textEditor": true
         }
       ],
@@ -1546,7 +1525,6 @@
           "instant": true,
           "intervalFactor": 1,
           "refId": "A",
-          "target": "alias(consolidateBy(maxSeries(timeShift(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.osd_bytes_used,\"7d\")), \"max\"),\"-$growth_window ago\")",
           "textEditor": true
         }
       ],
@@ -1621,7 +1599,6 @@
           "intervalFactor": 1,
           "legendFormat": "Active",
           "refId": "B",
-          "target": "alias(keepLastValue(consolidateBy(maxSeries(collectd.$mon_servers.$domain.cephmetrics.gauge.$cluster_name.mon.num_pg_active), \"max\")),\"active\")",
           "textEditor": true
         },
         {
@@ -1632,8 +1609,6 @@
           "intervalFactor": 1,
           "legendFormat": "Degraded",
           "refId": "C",
-          "target": "alias(diffSeries(#B,#A),\"active + degraded\")",
-          "targetFull": "alias(diffSeries(alias(keepLastValue(consolidateBy(maxSeries(collectd.$mon_servers.$domain.cephmetrics.gauge.$cluster_name.mon.num_pg_active), \"max\")),\"active\"),alias(keepLastValue(consolidateBy(maxSeries(collectd.$mon_servers.$domain.cephmetrics.gauge.$cluster_name.mon.num_pg_active_clean), \"max\")),\"active + clean\")),\"active + degraded\")",
           "textEditor": true
         },
         {
@@ -1644,7 +1619,6 @@
           "intervalFactor": 1,
           "legendFormat": "Peering",
           "refId": "D",
-          "target": "alias(consolidateBy(maxSeries(collectd.$mon_servers.$domain.cephmetrics.gauge.$cluster_name.mon.num_pg_peering), \"max\"),\"peering\")",
           "textEditor": true
         },
         {
@@ -1747,7 +1721,6 @@
           "format": "time_series",
           "intervalFactor": 2,
           "refId": "A",
-          "target": "sumSeries(groupByNode(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.*.recovering_bytes_per_sec,-2,\"avg\"))",
           "textEditor": true
         }
       ],
@@ -1847,7 +1820,6 @@
           "hide": false,
           "intervalFactor": 2,
           "refId": "A",
-          "target": "consolidateBy(maxSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.features.deep_scrub),\"max\")",
           "textEditor": true
         }
       ],
@@ -1952,16 +1924,13 @@
       "tableColumn": "",
       "targets": [
         {
-          "dsType": "influxdb",
           "expr": "sum(\n  rate(ceph_pool_wr[$__interval])\n)\n+ \nsum(\n  rate(ceph_pool_rd[$__interval])\n)",
           "format": "time_series",
           "groupBy": [],
           "hide": false,
           "intervalFactor": 1,
           "legendFormat": "IOPS",
-          "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.pools._all_.read_op_per_sec",
           "policy": "default",
-          "query": "SELECT mean(\"value\") FROM \"measurement\" WHERE $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "A",
           "resultFormat": "time_series",
@@ -1976,7 +1945,6 @@
             ]
           ],
           "tags": [],
-          "target": "sumSeries(groupByNode(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.*.op_per_sec,-2,\"maxSeries\"))",
           "textEditor": true
         }
       ],
@@ -2066,15 +2034,12 @@
       "tableColumn": "",
       "targets": [
         {
-          "dsType": "influxdb",
           "expr": "sum(rate(ceph_pool_wr_bytes[$__interval]) + rate(ceph_pool_rd_bytes[$__interval]))",
           "format": "time_series",
           "groupBy": [],
           "hide": false,
           "intervalFactor": 1,
-          "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.pools._all_.read_op_per_sec",
           "policy": "default",
-          "query": "SELECT \"value\" FROM \"collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.pools._all_.read_bytes_sec\" WHERE $timeFilter",
           "rawQuery": true,
           "refId": "A",
           "resultFormat": "time_series",
@@ -2089,7 +2054,6 @@
             ]
           ],
           "tags": [],
-          "target": "sumSeries(groupByNode(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.*.bytes_sec,-2,\"maxSeries\"))",
           "textEditor": true
         }
       ],
@@ -2169,12 +2133,10 @@
       "tableColumn": "",
       "targets": [
         {
-          "dsType": "influxdb",
           "expr": "count(ceph_pool_metadata)",
           "format": "time_series",
           "groupBy": [],
           "intervalFactor": 2,
-          "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.num_pool",
           "policy": "default",
           "refId": "A",
           "resultFormat": "time_series",
@@ -2189,7 +2151,6 @@
             ]
           ],
           "tags": [],
-          "target": "maxSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.num_pool)",
           "textEditor": true
         }
       ],
@@ -2249,7 +2210,6 @@
           "intervalFactor": 2,
           "legendFormat": "reads",
           "refId": "A",
-          "target": "alias(sumSeries(groupByNode(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.*.read_op_per_sec,-2,\"maxSeries\")), \"Reads\")",
           "textEditor": true
         },
         {
@@ -2258,7 +2218,6 @@
           "intervalFactor": 2,
           "legendFormat": "writes",
           "refId": "B",
-          "target": "alias(sumSeries(groupByNode(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.*.write_op_per_sec,-2,\"maxSeries\")), \"Writes\")",
           "textEditor": true
         }
       ],
@@ -2329,7 +2288,6 @@
           "intervalFactor": 1,
           "legendFormat": "commit",
           "refId": "A",
-          "target": "alias(percentileOfSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.osd.*.apply_latency,$percentile), \"Apply Latency\")",
           "textEditor": true
         },
         {
@@ -2338,7 +2296,6 @@
           "intervalFactor": 1,
           "legendFormat": "apply",
           "refId": "B",
-          "target": "alias(percentileOfSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.osd.*.commitcycle_latency, $percentile), \"Commit Latency\")",
           "textEditor": true
         }
       ],
@@ -2447,7 +2404,6 @@
           "hide": false,
           "intervalFactor": 1,
           "refId": "A",
-          "target": "percentileOfSeries(groupByNode(collectd.$osd_servers.$domain.cpu.percent.{system,user,wait},1,\"sumSeries\"),$percentile)",
           "textEditor": true
         }
       ],
@@ -2538,15 +2494,12 @@
       "tableColumn": "",
       "targets": [
         {
-          "dsType": "influxdb",
           "expr": "quantile(\n  $percentile/100, \n  (\n    node_memory_MemTotal{job='node'} - node_memory_MemFree{job='node'} - node_memory_Buffers{job='node'} - node_memory_Cached{job='node'}\n  ) / node_memory_MemTotal{job='node'} * 100\n)",
           "format": "time_series",
           "groupBy": [],
           "hide": false,
           "intervalFactor": 2,
-          "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.pools._all_.read_op_per_sec",
           "policy": "default",
-          "query": "SELECT \"value\" FROM \"collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.pools._all_.read_bytes_sec\" WHERE $timeFilter",
           "rawQuery": true,
           "refId": "A",
           "resultFormat": "time_series",
@@ -2561,7 +2514,6 @@
             ]
           ],
           "tags": [],
-          "target": "percentileOfSeries(collectd.$osd_servers.$domain.memory.percent.used,$percentile)",
           "textEditor": true
         }
       ],
@@ -2652,15 +2604,12 @@
       "tableColumn": "",
       "targets": [
         {
-          "dsType": "influxdb",
           "expr": "sum(\n  sum(\n    rate(\n      node_disk_reads_completed[$__interval]\n    )\n  ) by (instance,device)\n   + ignoring(ceph_daemon,job) group_right(instance) ceph_disk_occupation\n)\n+\nsum(\n  sum(\n    rate(\n      node_disk_writes_completed[$__interval]\n    )\n  ) by (instance,device)\n   + ignoring(ceph_daemon,job) group_right(instance) ceph_disk_occupation\n)",
           "format": "time_series",
           "groupBy": [],
           "hide": false,
           "intervalFactor": 1,
-          "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.pools._all_.read_op_per_sec",
           "policy": "default",
-          "query": "SELECT \"value\" FROM \"collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.pools._all_.read_bytes_sec\" WHERE $timeFilter",
           "rawQuery": true,
           "refId": "A",
           "resultFormat": "time_series",
@@ -2675,7 +2624,6 @@
             ]
           ],
           "tags": [],
-          "target": "alias(sumSeries(collectd.$osd_servers.$domain.cephmetrics.gauge.$cluster_name.osd.*.perf.iops),\"IOPS\")",
           "textEditor": true
         }
       ],
@@ -2765,15 +2713,12 @@
       "tableColumn": "",
       "targets": [
         {
-          "dsType": "influxdb",
           "expr": "# should only include OSD hosts\nsum(\n  sum(\n    rate(\n      node_disk_bytes_read[$__interval]\n    )\n  ) by (instance,device)\n  + ignoring(ceph_daemon,job) group_right(instance) ceph_disk_occupation\n)\n+\nsum(\n  sum(\n    rate(\n      node_disk_bytes_written[$__interval]\n    )\n  ) by (instance,device)\n  + ignoring(ceph_daemon,job) group_right(instance) ceph_disk_occupation\n)",
           "format": "time_series",
           "groupBy": [],
           "hide": false,
           "intervalFactor": 1,
-          "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.pools._all_.read_op_per_sec",
           "policy": "default",
-          "query": "SELECT \"value\" FROM \"collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.pools._all_.read_bytes_sec\" WHERE $timeFilter",
           "rawQuery": true,
           "refId": "A",
           "resultFormat": "time_series",
@@ -2788,19 +2733,15 @@
             ]
           ],
           "tags": [],
-          "target": "sumSeries(collectd.$osd_servers.$domain.cephmetrics.gauge.$cluster_name.osd.*.perf.bytes_per_sec)",
           "textEditor": true
         },
         {
-          "dsType": "influxdb",
           "expr": "# will include non-OSD hosts\nsum(\n  rate(\n    node_disk_bytes_read[$__interval]\n  ) + \n  rate(\n    node_disk_bytes_written[$__interval]\n  )\n)",
           "format": "time_series",
           "groupBy": [],
           "hide": true,
           "intervalFactor": 1,
-          "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.pools._all_.read_op_per_sec",
           "policy": "default",
-          "query": "SELECT \"value\" FROM \"collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.pools._all_.read_bytes_sec\" WHERE $timeFilter",
           "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
@@ -2815,7 +2756,6 @@
             ]
           ],
           "tags": [],
-          "target": "sumSeries(collectd.$osd_servers.$domain.cephmetrics.gauge.$cluster_name.osd.*.perf.bytes_per_sec)",
           "textEditor": true
         }
       ],
@@ -2910,7 +2850,6 @@
           "format": "time_series",
           "intervalFactor": 2,
           "refId": "A",
-          "target": "countSeries(currentAbove(transformNull(keepLastValue(collectd.*.$domain.cephmetrics.gauge.$cluster_name.osd.*.osd_percent_used),0),$disk_full_threshold))",
           "textEditor": true
         }
       ],
@@ -3096,7 +3035,6 @@
           "intervalFactor": 1,
           "legendFormat": "average",
           "refId": "A",
-          "target": "alias(averageSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.osd.*.perf.util), 'average %util')",
           "textEditor": false
         },
         {
@@ -3104,8 +3042,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "$percentile%ile",
-          "refId": "B",
-          "target": "alias(percentileOfSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.osd.*.perf.util, $percentile, 'false'), '%util @ $percentile%ile')"
+          "refId": "B"
         }
       ],
       "thresholds": [],
diff --git a/dashboards/mgr-prometheus/ceph-cluster.json b/dashboards/mgr-prometheus/ceph-cluster.json
index 7bd5814..88f90bb 100644
--- a/dashboards/mgr-prometheus/ceph-cluster.json
+++ b/dashboards/mgr-prometheus/ceph-cluster.json
@@ -150,13 +150,11 @@
       "tableColumn": "",
       "targets": [
         {
-          "dsType": "influxdb",
           "expr": "count(ceph_mon_metadata)",
           "format": "time_series",
           "groupBy": [],
           "instant": true,
           "intervalFactor": 1,
-          "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.num_pool",
           "policy": "default",
           "refId": "A",
           "resultFormat": "time_series",
@@ -335,13 +333,11 @@
       "tableColumn": "",
       "targets": [
         {
-          "dsType": "influxdb",
           "expr": "count(ceph_mds_metadata)",
           "format": "time_series",
           "groupBy": [],
           "instant": true,
           "intervalFactor": 1,
-          "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.num_pool",
           "policy": "default",
           "refId": "A",
           "resultFormat": "time_series",
@@ -597,13 +593,11 @@
       "tableColumn": "",
       "targets": [
         {
-          "dsType": "influxdb",
           "expr": "count(max by (id) (ceph_osd_metadata))",
           "format": "time_series",
           "groupBy": [],
           "intervalFactor": 2,
           "legendFormat": "",
-          "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.num_pool",
           "policy": "default",
           "refId": "A",
           "resultFormat": "time_series",
@@ -697,12 +691,10 @@
       "tableColumn": "",
       "targets": [
         {
-          "dsType": "influxdb",
           "expr": "count(ceph_pool_metadata)",
           "format": "time_series",
           "groupBy": [],
           "intervalFactor": 2,
-          "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.num_pool",
           "policy": "default",
           "refId": "A",
           "resultFormat": "time_series",
@@ -1674,13 +1666,11 @@
           "targets": [
             {
               "alias": "Used",
-              "dsType": "influxdb",
               "expr": "scalar(ceph_cluster_total_used_bytes)",
               "format": "time_series",
               "groupBy": [],
               "intervalFactor": 2,
               "legendFormat": "Used",
-              "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.osd_bytes_used",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -1700,13 +1690,11 @@
             },
             {
               "alias": "Raw Capacity",
-              "dsType": "influxdb",
               "expr": "scalar(ceph_cluster_total_bytes)",
               "format": "time_series",
               "groupBy": [],
               "intervalFactor": 2,
               "legendFormat": "Raw",
-              "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.osd_bytes",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -1807,7 +1795,6 @@
           "targets": [
             {
               "alias": "Used",
-              "dsType": "influxdb",
               "expr": "max by (name) (\n  ceph_pool_bytes_used / (ceph_pool_bytes_used + ceph_pool_max_avail) * 100 + on (pool_id) group_left (name) ceph_pool_metadata\n)",
               "format": "time_series",
               "groupBy": [],
@@ -1912,13 +1899,11 @@
           "targets": [
             {
               "alias": "Used",
-              "dsType": "influxdb",
               "expr": "scalar(ceph_cluster_total_objects)",
               "format": "time_series",
               "groupBy": [],
               "intervalFactor": 2,
               "legendFormat": "RADOS Objects",
-              "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.osd_bytes_used",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
diff --git a/dashboards/mgr-prometheus/ceph-health.json b/dashboards/mgr-prometheus/ceph-health.json
index bacff6a..a427978 100644
--- a/dashboards/mgr-prometheus/ceph-health.json
+++ b/dashboards/mgr-prometheus/ceph-health.json
@@ -375,13 +375,6 @@
           ],
           "repeat": "mon_servers",
           "repeatDirection": "v",
-          "scopedVars": {
-            "mon_servers": {
-              "selected": false,
-              "text": "mon.rhs-cli-04",
-              "value": "mon.rhs-cli-04"
-            }
-          },
           "sparkline": {
             "fillColor": "rgba(31, 118, 189, 0.18)",
             "full": false,
@@ -1249,13 +1242,6 @@
           "repeatDirection": "v",
           "repeatIteration": 1526963039202,
           "repeatPanelId": 28,
-          "scopedVars": {
-            "mon_servers": {
-              "selected": false,
-              "text": "mon.rhs-cli-05",
-              "value": "mon.rhs-cli-05"
-            }
-          },
           "sparkline": {
             "fillColor": "rgba(31, 118, 189, 0.18)",
             "full": false,
@@ -1454,13 +1440,6 @@
           "repeatDirection": "v",
           "repeatIteration": 1526963039202,
           "repeatPanelId": 28,
-          "scopedVars": {
-            "mon_servers": {
-              "selected": false,
-              "text": "mon.rhs-cli-06",
-              "value": "mon.rhs-cli-06"
-            }
-          },
           "sparkline": {
             "fillColor": "rgba(31, 118, 189, 0.18)",
             "full": false,
@@ -1594,7 +1573,6 @@
           "targets": [
             {
               "alias": "Objects",
-              "dsType": "influxdb",
               "expr": "ceph_cluster_total_objects",
               "format": "time_series",
               "groupBy": [
@@ -1613,7 +1591,6 @@
               ],
               "intervalFactor": 1,
               "legendFormat": "Total Objects",
-              "measurement": "collectd.obj-mon-1.storage.lab.cephmetrics.gauge.ceph.mon.num_object",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
diff --git a/dashboards/mgr-prometheus/ceph-pools.json b/dashboards/mgr-prometheus/ceph-pools.json
index 50fb0bb..65d3277 100644
--- a/dashboards/mgr-prometheus/ceph-pools.json
+++ b/dashboards/mgr-prometheus/ceph-pools.json
@@ -184,7 +184,6 @@
           "intervalFactor": 1,
           "legendFormat": "{{name}}",
           "refId": "A",
-          "target": "groupByNode(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.$pool_name.bytes_sec,-2,\"maxSeries\")",
           "textEditor": true
         }
       ],
@@ -377,7 +376,6 @@
           "instant": true,
           "intervalFactor": 2,
           "refId": "A",
-          "target": "limit(sortByMaxima(groupByNode(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.*.op_per_sec,-2,\"maxSeries\")),5)",
           "textEditor": true
         }
       ],
@@ -515,7 +513,6 @@
           "instant": true,
           "intervalFactor": 2,
           "refId": "A",
-          "target": "limit(sortByMaxima(groupByNode(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.*.bytes_sec,-2,\"maxSeries\")),5)",
           "textEditor": true
         }
       ],
@@ -698,13 +695,6 @@
           "pointradius": 5,
           "points": false,
           "renderer": "flot",
-          "scopedVars": {
-            "pool_name": {
-              "selected": false,
-              "text": ".rgw.root",
-              "value": ".rgw.root"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "stack": true,
@@ -715,16 +705,14 @@
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "reads",
-              "refId": "B",
-              "target": "aliasByNode(maxSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.$pool_name.write_op_per_sec), -1)"
+              "refId": "B"
             },
             {
               "expr": "(label_replace(irate(ceph_pool_wr[1m]),\"id\",\"$1\",\"pool_id\",\"(.*)\") * on(pool_id) group_left(instance,name) ceph_pool_metadata{name=~\"[[pool_name]]\"})",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "writes",
-              "refId": "C",
-              "target": "aliasByNode(maxSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.$pool_name.write_op_per_sec), -1)"
+              "refId": "C"
             }
           ],
           "thresholds": [],
@@ -798,13 +786,6 @@
           "pointradius": 5,
           "points": false,
           "renderer": "flot",
-          "scopedVars": {
-            "pool_name": {
-              "selected": false,
-              "text": ".rgw.root",
-              "value": ".rgw.root"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "stack": true,
@@ -815,16 +796,14 @@
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "reads",
-              "refId": "A",
-              "target": "aliasByNode(maxSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.$pool_name.read_bytes_sec), -1)"
+              "refId": "A"
             },
             {
               "expr": "(label_replace(irate(ceph_pool_wr_bytes[1m]),\"id\",\"$1\",\"pool_id\",\"(.*)\") + on(pool_id) group_left(instance,name) ceph_pool_metadata{name=~\"[[pool_name]]\"})",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "writes",
-              "refId": "C",
-              "target": "aliasByNode(maxSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.pools.$pool_name.read_bytes_sec), -1)"
+              "refId": "C"
             }
           ],
           "thresholds": [],
diff --git a/dashboards/mgr-prometheus/ceph-rgw-workload.json b/dashboards/mgr-prometheus/ceph-rgw-workload.json
index 7ff2a4c..9784269 100644
--- a/dashboards/mgr-prometheus/ceph-rgw-workload.json
+++ b/dashboards/mgr-prometheus/ceph-rgw-workload.json
@@ -516,13 +516,6 @@
           "pointradius": 5,
           "points": false,
           "renderer": "flot",
-          "scopedVars": {
-            "rgw_servers": {
-              "selected": false,
-              "text": "rgw.rhs-srv-01",
-              "value": "rgw.rhs-srv-01"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "stack": true,
@@ -624,13 +617,6 @@
           "pointradius": 5,
           "points": false,
           "renderer": "flot",
-          "scopedVars": {
-            "rgw_servers": {
-              "selected": false,
-              "text": "rgw.rhs-srv-01",
-              "value": "rgw.rhs-srv-01"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "stack": true,
@@ -721,13 +707,6 @@
           "maxDataPoints": 3,
           "nullPointMode": "connected",
           "pieType": "pie",
-          "scopedVars": {
-            "rgw_servers": {
-              "selected": false,
-              "text": "rgw.rhs-srv-01",
-              "value": "rgw.rhs-srv-01"
-            }
-          },
           "strokeWidth": 1,
           "targets": [
             {
diff --git a/dashboards/mgr-prometheus/disk-busy-by-server.json b/dashboards/mgr-prometheus/disk-busy-by-server.json
index 6f00c19..aeee70c 100644
--- a/dashboards/mgr-prometheus/disk-busy-by-server.json
+++ b/dashboards/mgr-prometheus/disk-busy-by-server.json
@@ -64,7 +64,6 @@
               "intervalFactor": 1,
               "legendFormat": "{{host}}",
               "refId": "A",
-              "target": "groupByNode(collectd.$osd_servers.$domain.cephmetrics.gauge.$ceph_cluster.osd.*.perf.util,1,\"maxSeries\")",
               "textEditor": true
             }
           ],
@@ -143,13 +142,6 @@
           "points": false,
           "renderer": "flot",
           "repeat": "osd_servers",
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "apama002",
-              "value": "apama002"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -230,13 +222,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira019",
-              "value": "mira019"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -317,13 +302,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira021",
-              "value": "mira021"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -404,13 +382,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira031",
-              "value": "mira031"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -491,13 +462,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira049",
-              "value": "mira049"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -578,13 +542,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira055",
-              "value": "mira055"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -665,13 +622,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira060",
-              "value": "mira060"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -752,13 +702,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira070",
-              "value": "mira070"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -839,13 +782,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira076",
-              "value": "mira076"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -926,13 +862,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira087",
-              "value": "mira087"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -1013,13 +942,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira093",
-              "value": "mira093"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -1100,13 +1022,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira099",
-              "value": "mira099"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -1187,13 +1102,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira116",
-              "value": "mira116"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -1274,13 +1182,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira120",
-              "value": "mira120"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -1361,13 +1262,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "mira122",
-              "value": "mira122"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -1448,13 +1342,6 @@
           "repeat": null,
           "repeatIteration": 1519090074308,
           "repeatPanelId": 4,
-          "scopedVars": {
-            "osd_servers": {
-              "selected": false,
-              "text": "reesi001",
-              "value": "reesi001"
-            }
-          },
           "seriesOverrides": [],
           "spaceLength": 10,
           "span": 2,
@@ -1630,4 +1517,4 @@
   },
   "timezone": "",
   "title": "Disk Busy By Server"
-}
\ No newline at end of file
+}
diff --git a/dashboards/mgr-prometheus/iops-by-server.json b/dashboards/mgr-prometheus/iops-by-server.json
index 6a07730..b446cf1 100644
--- a/dashboards/mgr-prometheus/iops-by-server.json
+++ b/dashboards/mgr-prometheus/iops-by-server.json
@@ -1,295 +1,295 @@
 {
   "__requires": [
     {
-      "type": "grafana", 
-      "id": "grafana", 
-      "name": "Grafana", 
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
       "version": "4.6.3"
-    }, 
+    },
     {
-      "type": "panel", 
-      "id": "graph", 
-      "name": "Graph", 
+      "type": "panel",
+      "id": "graph",
+      "name": "Graph",
       "version": ""
-    }, 
+    },
     {
-      "type": "datasource", 
-      "id": "prometheus", 
-      "name": "Local", 
+      "type": "datasource",
+      "id": "prometheus",
+      "name": "Local",
       "version": "1.0.0"
     }
-  ], 
+  ],
   "annotations": {
     "list": [
       {
-        "builtIn": 1, 
-        "datasource": "-- Grafana --", 
-        "enable": true, 
-        "hide": true, 
-        "iconColor": "rgba(0, 211, 255, 1)", 
-        "name": "Annotations & Alerts", 
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
         "type": "dashboard"
       }
     ]
-  }, 
-  "editable": true, 
-  "gnetId": null, 
-  "graphTooltip": 0, 
-  "hideControls": false, 
-  "id": null, 
-  "links": [], 
-  "refresh": "15s", 
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "hideControls": false,
+  "id": null,
+  "links": [],
+  "refresh": "15s",
   "rows": [
     {
-      "collapse": false, 
-      "height": "250px", 
+      "collapse": false,
+      "height": "250px",
       "panels": [
         {
-          "aliasColors": {}, 
-          "bars": false, 
-          "dashLength": 10, 
-          "dashes": false, 
-          "datasource": null, 
-          "fill": 1, 
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "fill": 1,
           "gridPos": {
-            "h": 10, 
-            "w": 24, 
-            "x": 0, 
+            "h": 10,
+            "w": 24,
+            "x": 0,
             "y": 0
-          }, 
-          "height": "400", 
-          "id": 1, 
+          },
+          "height": "400",
+          "id": 1,
           "legend": {
-            "avg": false, 
-            "current": false, 
-            "max": false, 
-            "min": false, 
-            "show": true, 
-            "total": false, 
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
             "values": false
-          }, 
-          "lines": true, 
-          "linewidth": 1, 
-          "links": [], 
-          "minSpan": 12, 
-          "nullPointMode": "connected", 
-          "percentage": false, 
-          "pointradius": 5, 
-          "points": false, 
-          "renderer": "flot", 
-          "repeat": null, 
-          "seriesOverrides": [], 
-          "spaceLength": 10, 
-          "span": 12, 
-          "stack": true, 
-          "steppedLine": false, 
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "minSpan": 12,
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 12,
+          "stack": true,
+          "steppedLine": false,
           "targets": [
             {
-              "expr": "label_replace(irate(node_disk_reads_completed[1m]) + irate(node_disk_writes_completed{instance=~\"[[osd_servers]].*\"}[1m]),\"host\",\"$1\",\"instance\",\"([^.]*).*\")", 
-              "format": "time_series", 
-              "hide": true, 
-              "intervalFactor": 1, 
-              "legendFormat": "{{host}}", 
+              "expr": "label_replace(irate(node_disk_reads_completed[1m]) + irate(node_disk_writes_completed{instance=~\"[[osd_servers]].*\"}[1m]),\"host\",\"$1\",\"instance\",\"([^.]*).*\")",
+              "format": "time_series",
+              "hide": true,
+              "intervalFactor": 1,
+              "legendFormat": "{{host}}",
               "refId": "B"
-            }, 
+            },
             {
-              "expr": "sum(\n  sum(\n    irate(node_disk_reads_completed{job=\"node\" }[1m]) + \n    irate(node_disk_writes_completed{job=\"node\"}[1m]))\n  by(instance, device) + ignoring(ceph_daemon,job) group_right(instance) ceph_disk_occupation)\n  by(instance)", 
-              "format": "time_series", 
-              "intervalFactor": 1, 
-              "legendFormat": "{{instance}}", 
+              "expr": "sum(\n  sum(\n    irate(node_disk_reads_completed{job=\"node\" }[1m]) + \n    irate(node_disk_writes_completed{job=\"node\"}[1m]))\n  by(instance, device) + ignoring(ceph_daemon,job) group_right(instance) ceph_disk_occupation)\n  by(instance)",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "{{instance}}",
               "refId": "A"
             }
-          ], 
-          "thresholds": [], 
-          "timeFrom": null, 
-          "timeShift": null, 
-          "title": "Disk IOPS Across All OSD Hosts", 
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Disk IOPS Across All OSD Hosts",
           "tooltip": {
-            "shared": true, 
-            "sort": 0, 
+            "shared": true,
+            "sort": 0,
             "value_type": "individual"
-          }, 
-          "type": "graph", 
+          },
+          "type": "graph",
           "xaxis": {
-            "buckets": null, 
-            "mode": "time", 
-            "name": null, 
-            "show": true, 
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
             "values": []
-          }, 
+          },
           "yaxes": [
             {
-              "format": "none", 
-              "label": "", 
-              "logBase": 1, 
-              "max": null, 
-              "min": "0", 
+              "format": "none",
+              "label": "",
+              "logBase": 1,
+              "max": null,
+              "min": "0",
               "show": true
-            }, 
+            },
             {
-              "format": "short", 
-              "label": null, 
-              "logBase": 1, 
-              "max": null, 
-              "min": null, 
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
               "show": true
             }
           ]
         }
-      ], 
-      "repeat": null, 
-      "repeatIteration": null, 
-      "repeatRowId": null, 
-      "showTitle": true, 
-      "title": "All Servers by IOPS", 
+      ],
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": true,
+      "title": "All Servers by IOPS",
       "titleSize": "h6"
-    }, 
+    },
     {
-      "collapse": false, 
-      "height": 250, 
+      "collapse": false,
+      "height": 250,
       "panels": [
         {
-          "aliasColors": {}, 
-          "bars": false, 
-          "dashLength": 10, 
-          "dashes": false, 
-          "datasource": null, 
-          "fill": 1, 
-          "id": 2, 
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "fill": 1,
+          "id": 2,
           "legend": {
-            "avg": false, 
-            "current": false, 
-            "max": false, 
-            "min": false, 
-            "show": false, 
-            "total": false, 
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": false,
+            "total": false,
             "values": false
-          }, 
-          "lines": true, 
-          "linewidth": 1, 
-          "links": [], 
-          "nullPointMode": "null", 
-          "percentage": false, 
-          "pointradius": 5, 
-          "points": false, 
-          "renderer": "flot", 
-          "repeat": "osd_servers", 
-          "seriesOverrides": [], 
-          "spaceLength": 10, 
-          "span": 4, 
-          "stack": false, 
-          "steppedLine": false, 
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": "osd_servers",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 4,
+          "stack": false,
+          "steppedLine": false,
           "targets": [
             {
-              "expr": "sum(\n  sum(\n    irate(node_disk_reads_completed{instance=~\"[[osd_servers]].*\"}[1m]) + irate(node_disk_writes_completed[1m]))\n  by(instance,device) +\n  ignoring(ceph_daemon,job) group_right(instance) ceph_disk_occupation)\n    \n  \n", 
-              "format": "time_series", 
-              "intervalFactor": 2, 
+              "expr": "sum(\n  sum(\n    irate(node_disk_reads_completed{instance=~\"[[osd_servers]].*\"}[1m]) + irate(node_disk_writes_completed[1m]))\n  by(instance,device) +\n  ignoring(ceph_daemon,job) group_right(instance) ceph_disk_occupation)\n    \n  \n",
+              "format": "time_series",
+              "intervalFactor": 2,
               "refId": "A"
             }
-          ], 
-          "thresholds": [], 
-          "timeFrom": null, 
-          "timeShift": null, 
-          "title": "Total IOPS for $osd_servers", 
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Total IOPS for $osd_servers",
           "tooltip": {
-            "shared": true, 
-            "sort": 0, 
+            "shared": true,
+            "sort": 0,
             "value_type": "individual"
-          }, 
-          "type": "graph", 
+          },
+          "type": "graph",
           "xaxis": {
-            "buckets": null, 
-            "mode": "time", 
-            "name": null, 
-            "show": true, 
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
             "values": []
-          }, 
+          },
           "yaxes": [
             {
-              "format": "none", 
-              "label": null, 
-              "logBase": 1, 
-              "max": null, 
-              "min": null, 
+              "format": "none",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
               "show": true
-            }, 
+            },
             {
-              "format": "short", 
-              "label": null, 
-              "logBase": 1, 
-              "max": null, 
-              "min": null, 
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
               "show": true
             }
           ]
         }
-      ], 
-      "repeat": null, 
-      "repeatIteration": null, 
-      "repeatRowId": null, 
-      "showTitle": true, 
-      "title": "IOPS Load by Server", 
+      ],
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": true,
+      "title": "IOPS Load by Server",
       "titleSize": "h6"
     }
-  ], 
-  "schemaVersion": 14, 
-  "style": "dark", 
-  "tags": [], 
+  ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [],
   "templating": {
     "list": [
       {
-        "allValue": "", 
-        "current": {}, 
-        "datasource": null, 
-        "hide": 2, 
-        "includeAll": true, 
-        "label": "OSD Host", 
-        "multi": false, 
-        "name": "osd_servers", 
-        "options": [], 
-        "query": "label_values(ceph_disk_occupation, instance)", 
-        "refresh": 1, 
-        "regex": "([^.]*).*", 
-        "sort": 1, 
-        "tagValuesQuery": "", 
-        "tags": [], 
-        "tagsQuery": "", 
-        "type": "query", 
+        "allValue": "",
+        "current": {},
+        "datasource": null,
+        "hide": 2,
+        "includeAll": true,
+        "label": "OSD Host",
+        "multi": false,
+        "name": "osd_servers",
+        "options": [],
+        "query": "label_values(ceph_disk_occupation, instance)",
+        "refresh": 1,
+        "regex": "([^.]*).*",
+        "sort": 1,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
         "useTags": false
       }
     ]
-  }, 
+  },
   "time": {
-    "from": "now-1h", 
+    "from": "now-1h",
     "to": "now"
-  }, 
+  },
   "timepicker": {
     "refresh_intervals": [
-      "5s", 
-      "10s", 
-      "15s", 
-      "30s", 
-      "1m", 
-      "5m", 
-      "15m", 
-      "30m", 
-      "1h", 
-      "2h", 
+      "5s",
+      "10s",
+      "15s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
       "1d"
-    ], 
+    ],
     "time_options": [
-      "5m", 
-      "15m", 
-      "1h", 
-      "6h", 
-      "12h", 
-      "24h", 
-      "2d", 
-      "7d", 
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
       "30d"
     ]
-  }, 
-  "timezone": "", 
-  "title": "IOPS by Server", 
+  },
+  "timezone": "",
+  "title": "IOPS by Server",
   "version": 6
-}
\ No newline at end of file
+}
diff --git a/dashboards/mgr-prometheus/network-usage-by-node.json b/dashboards/mgr-prometheus/network-usage-by-node.json
index cd58e69..801aff3 100644
--- a/dashboards/mgr-prometheus/network-usage-by-node.json
+++ b/dashboards/mgr-prometheus/network-usage-by-node.json
@@ -373,24 +373,9 @@
             "selected": true,
             "text": "All",
             "value": "$__all"
-          },
-          {
-            "selected": false,
-            "text": "rhs-cli-04.ceph-dev.lab.eng.rdu2.redhat.com",
-            "value": "rhs-cli-04.ceph-dev.lab.eng.rdu2.redhat.com"
-          },
-          {
-            "selected": false,
-            "text": "rhs-cli-05.ceph-dev.lab.eng.rdu2.redhat.com",
-            "value": "rhs-cli-05.ceph-dev.lab.eng.rdu2.redhat.com"
-          },
-          {
-            "selected": false,
-            "text": "rhs-cli-06.ceph-dev.lab.eng.rdu2.redhat.com",
-            "value": "rhs-cli-06.ceph-dev.lab.eng.rdu2.redhat.com"
           }
         ],
-        "query": "rhs-cli-04.ceph-dev.lab.eng.rdu2.redhat.com,rhs-cli-05.ceph-dev.lab.eng.rdu2.redhat.com,rhs-cli-06.ceph-dev.lab.eng.rdu2.redhat.com",
+        "query": "",
         "type": "custom"
       },
       {