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 90a048f76a7174f4d41d4f3e8118e80ad6552f63..47df2dd4e06f36f5a1f742044f62822e340a76c1 100644 (file)
--- 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 718aaa3ac644d80471fdc40cd7da024dc9fbc978..5ccf55a780056d3be749022e915d49ba1c6562a6 100644 (file)
--- 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 219250d2f5a0720891f4748e9fdafaef42a8c288..7e1aa38a82bb5b15eddced2ef4cc40949c6d5763 100644 (file)
--- 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>