diff --git a/ceph/files/grafana_dashboards/luminous-ceph-cluster_prometheus.json b/ceph/files/grafana_dashboards/luminous-ceph-cluster_prometheus.json
index ea4a298..8fbc7ba 100644
--- a/ceph/files/grafana_dashboards/luminous-ceph-cluster_prometheus.json
+++ b/ceph/files/grafana_dashboards/luminous-ceph-cluster_prometheus.json
@@ -201,7 +201,7 @@
           "displayAliasType": "Always",
           "displayType": "Regular",
           "displayValueWithAlias": "When Alias Displayed",
-          "expr": "sum(ceph_osds_in)",
+          "expr": "sum(ceph_osd_in)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "In",
diff --git a/ceph/files/grafana_dashboards/luminous-osds-detail_prometheus.json b/ceph/files/grafana_dashboards/luminous-osds-detail_prometheus.json
index 121b026..b9cde63 100644
--- a/ceph/files/grafana_dashboards/luminous-osds-detail_prometheus.json
+++ b/ceph/files/grafana_dashboards/luminous-osds-detail_prometheus.json
@@ -391,14 +391,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "label_replace(label_replace(rate(diskio_read_time[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") / label_replace(label_replace(rate(diskio_reads[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"/dev/(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
+          "expr": "label_replace(label_replace(rate(diskio_read_time[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") / label_replace(label_replace(rate(diskio_reads[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{instance}}/{{device}} Reads",
           "refId": "A"
         },
         {
-          "expr": "label_replace(label_replace(rate(diskio_write_time[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") / label_replace(label_replace(rate(diskio_writes[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"/dev/(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
+          "expr": "label_replace(label_replace(rate(diskio_write_time[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") / label_replace(label_replace(rate(diskio_writes[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{instance}}/{{device}} Writes",
@@ -487,14 +487,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "label_replace(label_replace(rate(diskio_reads[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"/dev/(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
+          "expr": "label_replace(label_replace(rate(diskio_reads[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{device}} on {{instance}} Writes",
           "refId": "A"
         },
         {
-          "expr": "label_replace(label_replace(rate(diskio_writes[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"/dev/(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
+          "expr": "label_replace(label_replace(rate(diskio_writes[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{device}} on {{instance}} Reads",
@@ -583,14 +583,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "label_replace(label_replace(rate(diskio_read_bytes[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"/dev/(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
+          "expr": "label_replace(label_replace(rate(diskio_read_bytes[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{instance}} {{device}} Reads",
           "refId": "A"
         },
         {
-          "expr": "label_replace(label_replace(rate(diskio_write_bytes[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"/dev/(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
+          "expr": "label_replace(label_replace(rate(diskio_write_bytes[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.+)\"), \"device\", \"$1\", \"name\", \"(.+)\") and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{instance}} {{device}} Writes",
@@ -674,7 +674,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "label_replace(rate(diskio_io_time[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.*)\") / 1000 and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"/dev/(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
+          "expr": "label_replace(rate(diskio_io_time[$rate_interval]), \"instance\", \"$1\", \"host\", \"(.*)\") / 1000 and on (name,instance) label_replace(label_replace(ceph_disk_occupation{ceph_daemon=~\"osd.$osd_id\"}, \"name\", \"$1\", \"device\", \"(.*)\"), \"instance\", \"$1\", \"instance\", \"(.*)\")",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{device}} on {{instance}}",
diff --git a/ceph/files/grafana_dashboards/nautilus-ceph-cluster_prometheus.json b/ceph/files/grafana_dashboards/nautilus-ceph-cluster_prometheus.json
index 03486ed..47ed517 100644
--- a/ceph/files/grafana_dashboards/nautilus-ceph-cluster_prometheus.json
+++ b/ceph/files/grafana_dashboards/nautilus-ceph-cluster_prometheus.json
@@ -201,7 +201,7 @@
           "displayAliasType": "Always",
           "displayType": "Regular",
           "displayValueWithAlias": "When Alias Displayed",
-          "expr": "sum(ceph_osds_in)",
+          "expr": "sum(ceph_osd_in)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "In",