osd-node-detail.json: Don't ignore duplicate devs

Looks like in the "Disk IOPS" panel we were inadvertently assuming that
different instances would never use the same device names for OSDs. Fix
that.

Fixes: rhbz#1659036
Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/dashboards/mgr-prometheus/osd-node-detail.json b/dashboards/mgr-prometheus/osd-node-detail.json
index 30813744af34aa09edbcaa882bd2c0916ec90dd3..34aea624e8f9ef6d656266fa7a806d689c87164b 100644 (file)
--- a/dashboards/mgr-prometheus/osd-node-detail.json
+++ b/dashboards/mgr-prometheus/osd-node-detail.json
@@ -526,7 +526,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "max by (device) (\n  irate(node_disk_reads_completed{device=~\"($device_id)\", instance=~\"($osd_servers).*\"}[5m]) +\n  irate(node_disk_writes_completed{device=~\"($device_id)\", instance=~\"($osd_servers).*\"}[5m])\n)",
+          "expr": "max by (instance, device) (\n  irate(node_disk_reads_completed{device=~\"($device_id)\", instance=~\"($osd_servers).*\"}[5m]) +\n  irate(node_disk_writes_completed{device=~\"($device_id)\", instance=~\"($osd_servers).*\"}[5m])\n) + on (instance, device) group_left (ceph_daemon) ceph_disk_occupation",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{device}}",