From: Zack Cerza Date: Thu, 13 Dec 2018 18:18:20 +0000 (-0700) Subject: osd-node-detail.json: Don't ignore duplicate devs X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F227%2Fhead;p=cephmetrics.git 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 --- diff --git a/dashboards/mgr-prometheus/osd-node-detail.json b/dashboards/mgr-prometheus/osd-node-detail.json index 3081374..34aea62 100644 --- 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}}",