From: Kristoffer Grönlund Date: Thu, 26 Mar 2020 18:12:55 +0000 (+0100) Subject: dashboard: Use exported_instance to identify OSDs X-Git-Tag: v15.2.2~70^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bfac83889a4920df8390b013e01456edf40d63fa;p=ceph.git dashboard: Use exported_instance to identify OSDs When moving to LVM-based ceph-volume setups, several grafana dashboards stopped working. The problem is that (device, instance) no longer results in unique labels which causes errors like: "many-to-many matching not allowed: matching labels must be unique on one side" Fixes: https://tracker.ceph.com/issues/44784 Signed-off-by: Kristoffer Grönlund (cherry picked from commit 8b61b8d3d781b9d762098cf45b41b596a32509ab) --- diff --git a/monitoring/grafana/dashboards/hosts-overview.json b/monitoring/grafana/dashboards/hosts-overview.json index ed6c4c15bf2b..0ad122f831a4 100644 --- a/monitoring/grafana/dashboards/hosts-overview.json +++ b/monitoring/grafana/dashboards/hosts-overview.json @@ -740,7 +740,7 @@ "multi": false, "name": "osd_hosts", "options": [], - "query": "label_values(ceph_disk_occupation, instance)", + "query": "label_values(ceph_disk_occupation, exported_instance)", "refresh": 1, "regex": "([^.]*).*", "skipUrlSync": false,