diff --git a/nova/files/grafana_dashboards/nova_top_instances_prometheus.json b/nova/files/grafana_dashboards/nova_top_instances_prometheus.json
index 1af4166..fe3720c 100644
--- a/nova/files/grafana_dashboards/nova_top_instances_prometheus.json
+++ b/nova/files/grafana_dashboards/nova_top_instances_prometheus.json
@@ -18,7 +18,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1574162155704,
+  "iteration": 1575030056499,
   "links": [],
   "panels": [
     {
@@ -232,6 +232,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those request most RAM in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
@@ -322,6 +323,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those use most RAM in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
@@ -426,6 +428,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those consume most read throughput from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
@@ -475,7 +478,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Read Throughput",
+          "title": "File Disk Device Read Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -517,6 +520,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those consume most write throughput from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
@@ -565,7 +569,112 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Write Throughput",
+          "title": "File Disk Device Write Throughput",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "Bps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "File Disk Throughput",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 276,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N instances those consume most read throughput from block disk devices (libvirt disk type = \"block\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 32
+          },
+          "id": 271,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(libvirt_domain_block_stats_read_bytes:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Read Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -607,13 +716,119 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N instances those consume most write throughput from block disk devices (libvirt disk type = \"block\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 39
+          },
+          "id": 272,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(libvirt_domain_block_stats_write_bytes:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Write Throughput",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "Bps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Block Disk Throughput",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 4
+      },
+      "id": 274,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those consume most read throughput from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 17
+            "y": 5
           },
           "id": 250,
           "legend": {
@@ -655,7 +870,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Read Throughput",
+          "title": "Network Disk Device Read Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -697,13 +912,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those consume most write throughput from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 24
+            "y": 12
           },
           "id": 252,
           "legend": {
@@ -745,7 +961,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Write Throughput",
+          "title": "Network Disk Device Write Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -783,7 +999,7 @@
           }
         }
       ],
-      "title": "Disk Throughput",
+      "title": "Network Disk Throughput",
       "type": "row"
     },
     {
@@ -792,7 +1008,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 3
+        "y": 5
       },
       "id": 261,
       "panels": [
@@ -801,13 +1017,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those consume most read IO from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 4
+            "y": 6
           },
           "id": 262,
           "legend": {
@@ -850,7 +1067,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Reads",
+          "title": "File Disk Device Reads",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -892,13 +1109,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those consume most write IO from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 11
+            "y": 13
           },
           "id": 263,
           "legend": {
@@ -940,7 +1158,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Writes",
+          "title": "File Disk Device Writes",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -976,21 +1194,36 @@
             "align": false,
             "alignLevel": null
           }
-        },
+        }
+      ],
+      "title": "File Disk IOPS",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 6
+      },
+      "id": 280,
+      "panels": [
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "description": "Shows Top N instances those consume most read IO from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
+          "datasource": null,
+          "description": "Shows Top N instances those consume most read IO from block disk devices (libvirt disk type = \"block\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 18
+            "y": 35
           },
-          "id": 264,
+          "id": 282,
           "legend": {
             "alignAsTable": true,
             "avg": true,
@@ -1019,7 +1252,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "topk($topx,sum(libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
+              "expr": "topk($topx,sum(libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(source_file,target_device))",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
@@ -1030,7 +1263,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Reads",
+          "title": "Block Disk Device Reads",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1072,13 +1305,210 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N instances those consume most write IO from block disk devices (libvirt disk type = \"block\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 42
+          },
+          "id": 281,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(libvirt_domain_block_stats_write_requests:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Writes",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "wps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Block Disk IOPS",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 7
+      },
+      "id": 278,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N instances those consume most read IO from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 22
+          },
+          "id": 264,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Network Disk Device Reads",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "rps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those consume most write IO from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 25
+            "y": 29
           },
           "id": 265,
           "legend": {
@@ -1120,7 +1550,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Writes",
+          "title": "Network Disk Device Writes",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1158,7 +1588,7 @@
           }
         }
       ],
-      "title": "Disk IOPS",
+      "title": "Network Disk IOPS",
       "type": "row"
     },
     {
@@ -1167,7 +1597,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 4
+        "y": 8
       },
       "id": 254,
       "panels": [
@@ -1176,13 +1606,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those request most space from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 5
+            "y": 9
           },
           "id": 249,
           "legend": {
@@ -1224,7 +1655,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Local Disk Allocation",
+          "title": "File Disk Device Allocation",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1266,13 +1697,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those use most space from file disk devices (libvirt disk type = \"file\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 12
+            "y": 16
           },
           "id": 257,
           "legend": {
@@ -1314,7 +1746,112 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Local Disk Usage",
+          "title": "File Disk Device Usage",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "bytes",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "File Disk Space",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 9
+      },
+      "id": 286,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N instances those request most space from block disk devices (libvirt disk type = \"block\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 38
+          },
+          "id": 288,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(libvirt_domain_block_stats_capacity{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Allocation",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1356,13 +1893,119 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N instances those use most space from block disk devices (libvirt disk type = \"block\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 45
+          },
+          "id": 287,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(libvirt_domain_block_stats_physical{host=~\"$host\",$ident=~\"$instance_ident\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "{{host}} / {{project_name}} / {{user_name}} / {{$ident}} ({{flavor}})",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Usage",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "bytes",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Block Disk Space",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 10
+      },
+      "id": 284,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those request most space from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 19
+            "y": 25
           },
           "id": 259,
           "legend": {
@@ -1404,7 +2047,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Allocation",
+          "title": "Network Disk Device Allocation",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1446,13 +2089,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those use most space from network disk devices (libvirt disk type = \"network\") in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 26
+            "y": 32
           },
           "id": 258,
           "legend": {
@@ -1494,7 +2138,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Usage",
+          "title": "Network Disk Device Usage",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1532,7 +2176,7 @@
           }
         }
       ],
-      "title": "Disk Space",
+      "title": "Network Disk Space",
       "type": "row"
     },
     {
@@ -1541,7 +2185,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 5
+        "y": 11
       },
       "id": 267,
       "panels": [
@@ -1550,13 +2194,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those consume most network receiver bandwidth in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 34
+            "y": 12
           },
           "id": 269,
           "legend": {
@@ -1640,13 +2285,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N instances those consume most network transmitter bandwidth in the following format: Host / Tenant Name / User Name / Instance Name or UUID (Flavor Name)",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 41
+            "y": 19
           },
           "id": 270,
           "legend": {
diff --git a/nova/files/grafana_dashboards/nova_top_tenants_prometheus.json b/nova/files/grafana_dashboards/nova_top_tenants_prometheus.json
index fdb37a6..4432358 100644
--- a/nova/files/grafana_dashboards/nova_top_tenants_prometheus.json
+++ b/nova/files/grafana_dashboards/nova_top_tenants_prometheus.json
@@ -18,7 +18,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1574333028330,
+  "iteration": 1575032526525,
   "links": [],
   "panels": [
     {
@@ -428,6 +428,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N tenants those consume most read throughput from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
@@ -477,7 +478,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Read Throughput",
+          "title": "File Disk Device Read Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -519,6 +520,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N tenants those consume most write throughput from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
@@ -567,7 +569,112 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Write Throughput",
+          "title": "File Disk Device Write Throughput",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "Bps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "File Disk Throughput",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 274,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N tenants those consume most read throughput from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 32
+          },
+          "id": 275,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_project:libvirt_domain_block_stats_read_bytes:rate5m{host=~\"$host\",project_name=~\"$project_name\",type=\"block\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Read Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -609,13 +716,119 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N tenants those consume most write throughput from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 39
+          },
+          "id": 276,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_project:libvirt_domain_block_stats_write_bytes:rate5m{host=~\"$host\",project_name=~\"$project_name\",type=\"block\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Write Throughput",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "Bps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Block Disk Throughput",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 4
+      },
+      "id": 272,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
           "description": "Shows Top N tenants those consume most read throughput from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 17
+            "y": 19
           },
           "id": 250,
           "legend": {
@@ -657,7 +870,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Read Throughput",
+          "title": "Network Disk Device Read Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -699,13 +912,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N tenants those consume most write throughput from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 24
+            "y": 26
           },
           "id": 252,
           "legend": {
@@ -747,7 +961,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Write Throughput",
+          "title": "Network Disk Device Write Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -785,7 +999,7 @@
           }
         }
       ],
-      "title": "Disk Throughput",
+      "title": "Network Disk Throughput",
       "type": "row"
     },
     {
@@ -794,7 +1008,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 3
+        "y": 5
       },
       "id": 261,
       "panels": [
@@ -803,13 +1017,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N tenants those consume most read IO from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 4
+            "y": 6
           },
           "id": 262,
           "legend": {
@@ -852,7 +1067,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Reads",
+          "title": "File Disk Device Reads",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -894,13 +1109,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N tenants those consume most write IO from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 11
+            "y": 13
           },
           "id": 263,
           "legend": {
@@ -942,7 +1158,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Writes",
+          "title": "File Disk Device Writes",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -978,21 +1194,36 @@
             "align": false,
             "alignLevel": null
           }
-        },
+        }
+      ],
+      "title": "File Disk IOPS",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 6
+      },
+      "id": 280,
+      "panels": [
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "description": "Shows Top N tenants those consume most read IO from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
+          "datasource": null,
+          "description": "Shows Top N tenants those consume most read IO from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 18
+            "y": 35
           },
-          "id": 264,
+          "id": 282,
           "legend": {
             "alignAsTable": true,
             "avg": true,
@@ -1021,7 +1252,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "topk($topx,sum(host_project:libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",project_name=~\"$project_name\",type=\"network\"}) without(host,source_file,target_device))",
+              "expr": "topk($topx,sum(host_project:libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",project_name=~\"$project_name\",type=\"block\"}) without(host,source_file,target_device))",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "${host_aggregate:csv} / {{project_name}}",
@@ -1032,7 +1263,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Reads",
+          "title": "Block Disk Device Reads",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1074,13 +1305,210 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N tenants those consume most write IO from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 42
+          },
+          "id": 281,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_project:libvirt_domain_block_stats_write_requests:rate5m{host=~\"$host\",project_name=~\"$project_name\",type=\"block\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Writes",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "wps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Block Disk IOPS",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 7
+      },
+      "id": 278,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N tenants those consume most read IO from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 22
+          },
+          "id": 264,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_project:libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",project_name=~\"$project_name\",type=\"network\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Network Disk Device Reads",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "rps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
           "description": "Shows Top N tenants those consume most write IO from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 25
+            "y": 29
           },
           "id": 265,
           "legend": {
@@ -1122,7 +1550,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Writes",
+          "title": "Network Disk Device Writes",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1160,7 +1588,7 @@
           }
         }
       ],
-      "title": "Disk IOPS",
+      "title": "Network Disk IOPS",
       "type": "row"
     },
     {
@@ -1169,7 +1597,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 4
+        "y": 8
       },
       "id": 254,
       "panels": [
@@ -1178,13 +1606,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N tenants those request most space from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 5
+            "y": 9
           },
           "id": 249,
           "legend": {
@@ -1226,7 +1655,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Local Disk Allocation",
+          "title": "File Disk Device Allocation",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1268,13 +1697,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N tenants those use most space from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 12
+            "y": 16
           },
           "id": 257,
           "legend": {
@@ -1316,7 +1746,112 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Local Disk Usage",
+          "title": "File Disk Device Usage",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "bytes",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "File Disk Space",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 9
+      },
+      "id": 286,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N tenants those request most space from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 38
+          },
+          "id": 288,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_project:libvirt_domain_block_stats_capacity{host=~\"$host\",project_name=~\"$project_name\",type=\"block\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Allocation",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1358,13 +1893,119 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N tenants those use most space from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 45
+          },
+          "id": 287,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_project:libvirt_domain_block_stats_physical{host=~\"$host\",project_name=~\"$project_name\",type=\"block\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Usage",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "bytes",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Block Disk Space",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 10
+      },
+      "id": 284,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
           "description": "Shows Top N tenants those request most space from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 19
+            "y": 25
           },
           "id": 259,
           "legend": {
@@ -1406,7 +2047,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Allocation",
+          "title": "Network Disk Device Allocation",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1448,13 +2089,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N tenants those use most space from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 26
+            "y": 32
           },
           "id": 258,
           "legend": {
@@ -1496,7 +2138,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Usage",
+          "title": "Network Disk Device Usage",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1534,7 +2176,7 @@
           }
         }
       ],
-      "title": "Disk Space",
+      "title": "Network Disk Space",
       "type": "row"
     },
     {
@@ -1543,7 +2185,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 5
+        "y": 11
       },
       "id": 267,
       "panels": [
diff --git a/nova/files/grafana_dashboards/nova_top_users_prometheus.json b/nova/files/grafana_dashboards/nova_top_users_prometheus.json
index 9f127d2..3e7d647 100644
--- a/nova/files/grafana_dashboards/nova_top_users_prometheus.json
+++ b/nova/files/grafana_dashboards/nova_top_users_prometheus.json
@@ -18,7 +18,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1574333201267,
+  "iteration": 1575044677824,
   "links": [],
   "panels": [
     {
@@ -234,6 +234,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those request most RAM in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
@@ -324,6 +325,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those use most RAM in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
@@ -428,6 +430,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those consume most read throughput from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
@@ -477,7 +480,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Read Throughput",
+          "title": "File Disk Device Read Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -519,6 +522,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those consume most write throughput from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
@@ -567,7 +571,112 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Write Throughput",
+          "title": "File Disk Device Write Throughput",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "Bps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "File Disk Throughput",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 274,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N users those consume most read throughput from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 18
+          },
+          "id": 284,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_user:libvirt_domain_block_stats_read_bytes:rate5m{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}} / {{user_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Read Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -609,13 +718,119 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N users those consume most write throughput from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 25
+          },
+          "id": 283,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_user:libvirt_domain_block_stats_write_bytes:rate5m{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}} / {{user_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Write Throughput",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "Bps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Block Disk Throughput",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 4
+      },
+      "id": 272,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those consume most read throughput from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 17
+            "y": 19
           },
           "id": 250,
           "legend": {
@@ -657,7 +872,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Read Throughput",
+          "title": "Network Disk Device Read Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -699,13 +914,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those consume most write throughput from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 24
+            "y": 26
           },
           "id": 252,
           "legend": {
@@ -747,7 +963,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Write Throughput",
+          "title": "Network Disk Device Write Throughput",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -785,7 +1001,7 @@
           }
         }
       ],
-      "title": "Disk Throughput",
+      "title": "Network Disk Throughput",
       "type": "row"
     },
     {
@@ -794,7 +1010,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 3
+        "y": 5
       },
       "id": 261,
       "panels": [
@@ -803,13 +1019,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those consume most read IO from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 4
+            "y": 6
           },
           "id": 262,
           "legend": {
@@ -852,7 +1069,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Reads",
+          "title": "File Disk Device Reads",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -894,13 +1111,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those consume most write IO from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 11
+            "y": 13
           },
           "id": 263,
           "legend": {
@@ -942,7 +1160,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "File Disk Writes",
+          "title": "File Disk Device Writes",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -978,21 +1196,36 @@
             "align": false,
             "alignLevel": null
           }
-        },
+        }
+      ],
+      "title": "File Disk IOPS",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 6
+      },
+      "id": 276,
+      "panels": [
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "description": "Shows Top N users those consume most read IO from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
+          "datasource": null,
+          "description": "Shows Top N users those consume most read IO from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 18
+            "y": 35
           },
-          "id": 264,
+          "id": 286,
           "legend": {
             "alignAsTable": true,
             "avg": true,
@@ -1021,7 +1254,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "topk($topx,sum(host_user:libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(host,source_file,target_device))",
+              "expr": "topk($topx,sum(host_user:libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(host,source_file,target_device))",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "${host_aggregate:csv} / {{project_name}} / {{user_name}}",
@@ -1032,7 +1265,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Reads",
+          "title": "Block Disk Device Reads",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1074,13 +1307,210 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N users those consume most write IO from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 42
+          },
+          "id": 285,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_user:libvirt_domain_block_stats_write_requests:rate5m{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}} / {{user_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Writes",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "wps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Block Disk IOPS",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 7
+      },
+      "id": 278,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N users those consume most read IO from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 22
+          },
+          "id": 264,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_user:libvirt_domain_block_stats_read_requests:rate5m{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"network\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}} / {{user_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Network Disk Device Reads",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "rps",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those consume most write IO from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 25
+            "y": 29
           },
           "id": 265,
           "legend": {
@@ -1122,7 +1552,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Writes",
+          "title": "Network Disk Device Writes",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1160,7 +1590,7 @@
           }
         }
       ],
-      "title": "Disk IOPS",
+      "title": "Network Disk IOPS",
       "type": "row"
     },
     {
@@ -1169,7 +1599,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 4
+        "y": 8
       },
       "id": 254,
       "panels": [
@@ -1178,13 +1608,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those request most space from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 5
+            "y": 9
           },
           "id": 249,
           "legend": {
@@ -1226,7 +1657,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Local Disk Allocation",
+          "title": "File Disk Device Allocation",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1268,13 +1699,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those use most space from file disk devices (libvirt disk type = \"file\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 12
+            "y": 16
           },
           "id": 257,
           "legend": {
@@ -1316,7 +1748,112 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Local Disk Usage",
+          "title": "File Disk Device Usage",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "bytes",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "File Disk Space",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 9
+      },
+      "id": 282,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N users those request most space from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 10
+          },
+          "id": 287,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_user:libvirt_domain_block_stats_capacity{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}} / {{user_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Allocation",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1358,13 +1895,119 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
+          "description": "Shows Top N users those use most space from block disk devices (libvirt disk type = \"block\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
+          "fill": 1,
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 17
+          },
+          "id": 288,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "topk($topx,sum(host_user:libvirt_domain_block_stats_physical{host=~\"$host\",project_name=~\"$project_name\",user_name=~\"$user_name\",type=\"block\"}) without(host,source_file,target_device))",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "${host_aggregate:csv} / {{project_name}} / {{user_name}}",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "Block Disk Device Usage",
+          "tooltip": {
+            "shared": true,
+            "sort": 2,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "bytes",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "title": "Block Disk Space",
+      "type": "row"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 10
+      },
+      "id": 280,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those request most space from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 19
+            "y": 11
           },
           "id": 259,
           "legend": {
@@ -1406,7 +2049,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Allocation",
+          "title": "Network Disk Device Allocation",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1448,13 +2091,14 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
+          "datasource": null,
           "description": "Shows Top N users those use most space from network disk devices (libvirt disk type = \"network\") in the following format: Host Aggregate(s) (across selected Host(s)) / Tenant Name / User Name",
           "fill": 1,
           "gridPos": {
             "h": 7,
             "w": 24,
             "x": 0,
-            "y": 26
+            "y": 18
           },
           "id": 258,
           "legend": {
@@ -1496,7 +2140,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Network Disk Usage",
+          "title": "Network Disk Device Usage",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1534,7 +2178,7 @@
           }
         }
       ],
-      "title": "Disk Space",
+      "title": "Network Disk Space",
       "type": "row"
     },
     {
@@ -1543,7 +2187,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 5
+        "y": 11
       },
       "id": 267,
       "panels": [