From: Neha Gupta <gnehapk@gmail.com>
Date: Fri, 18 Jan 2019 04:36:41 +0000 (+0900)
Subject: mgr/dashboard: Fixed performance details context for host list row selection
X-Git-Tag: v14.1.0~316^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26020%2Fhead;p=ceph.git

mgr/dashboard: Fixed performance details context for host list row selection
               Fixes: http://tracker.ceph.com/issues/37854

Signed-off-by: Neha Gupta <gnehapk@gmail.com>
---

diff --git a/monitoring/grafana/dashboards/host-details.json b/monitoring/grafana/dashboards/host-details.json
index 90a048f76a71..47df2dd4e06f 100644
--- a/monitoring/grafana/dashboards/host-details.json
+++ b/monitoring/grafana/dashboards/host-details.json
@@ -123,7 +123,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "count(ceph_disk_occupation{instance=~\"($ceph_hosts).*\"})",
+          "expr": "count(sum by (ceph_daemon) (ceph_osd_metadata{hostname='$ceph_hosts'}))",
           "format": "time_series",
           "intervalFactor": 2,
           "refId": "A",
diff --git a/monitoring/grafana/dashboards/hosts-overview.json b/monitoring/grafana/dashboards/hosts-overview.json
index 718aaa3ac644..5ccf55a78005 100644
--- a/monitoring/grafana/dashboards/hosts-overview.json
+++ b/monitoring/grafana/dashboards/hosts-overview.json
@@ -100,7 +100,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "count(sum by (instance) (ceph_disk_occupation))",
+          "expr": "count(sum by (hostname) (ceph_osd_metadata))",
           "format": "time_series",
           "instant": true,
           "intervalFactor": 1,
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.html
index 219250d2f5a0..7e1aa38a82bb 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.html
@@ -1,7 +1,7 @@
 <tabset *ngIf="selection.hasSingleSelection && grafanaPermission.read">
   <tab i18n-heading
        heading="Performance Details">
-    <cd-grafana [grafanaPath]="'host-details?'"
+    <cd-grafana [grafanaPath]="'host-details?var-ceph_hosts=' + host['hostname']"
                 uid="7IGu2Ttmz"
                 grafanaStyle="three">
     </cd-grafana>