diff --git a/README.rst b/README.rst
index 7bb9581..4a3b7ac 100644
--- a/README.rst
+++ b/README.rst
@@ -1231,6 +1231,18 @@
 You can read more about it here:
     https://docs.openstack.org/security-guide/databases/database-access-control.html
 
+Define config option which allows to use nova-api service behind proxy.(Only Mitaka)
+---------------------
+The HTTP Header that will be used to determine what the original request protocol
+scheme was, even if it was hidden by a SSL termination proxy.
+
+  nova:
+    controller:
+      secure_proxy_ssl_header: HTTP_X_FORWARDED_PROTO
+
+You can read more about it here:
+    https://docs.openstack.org/mitaka/config-reference/compute/config-options.html
+
 Nova database connection setup:
 ========
 
@@ -1278,8 +1290,6 @@
          username: nova
          password: pswd
 
-
-
 Upgrades
 ========
 
diff --git a/nova/files/grafana_dashboards/nova_utilization_prometheus.json b/nova/files/grafana_dashboards/nova_utilization_prometheus.json
index 957dc6f..2fbf7fd 100644
--- a/nova/files/grafana_dashboards/nova_utilization_prometheus.json
+++ b/nova/files/grafana_dashboards/nova_utilization_prometheus.json
@@ -3,7 +3,6 @@
   "annotations": {
     "list": [
       {
-        "$$hashKey": "object:32922",
         "builtIn": 1,
         "datasource": "prometheus",
         "enable": true,
@@ -20,7 +19,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1529670945678,
+  "iteration": 1553780251562,
   "links": [],
   "panels": [
     {
@@ -37,84 +36,115 @@
       "type": "row"
     },
     {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
       "datasource": null,
-      "format": "percentunit",
-      "gauge": {
-        "maxValue": 1,
-        "minValue": 0,
-        "show": true,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
+      "fill": 4,
       "gridPos": {
         "h": 5,
         "w": 5,
         "x": 0,
         "y": 1
       },
-      "id": 12,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
+      "id": 8,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": false,
+        "hideEmpty": false,
+        "hideZero": false,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "sort": "current",
+        "sortDesc": true,
+        "total": false,
+        "values": false
       },
-      "tableColumn": "",
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(system_load15 and on (host) label_replace(openstack_nova_vcpus, \"host\", \"$1\", \"hostname\", \"(.*)\")) / max(sum(openstack_nova_vcpus) by (instance))",
+          "expr": "max(sum(openstack_nova_vcpus and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
+          "legendFormat": "enabled/up",
           "refId": "A"
-        }
-      ],
-      "thresholds": "0.85,0.95",
-      "title": "CPU Usage",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
+        },
         {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
+          "expr": "max(sum(openstack_nova_vcpus and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 0)) by (instance))",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "enabled/down",
+          "refId": "B"
+        },
+        {
+          "expr": "max(sum(openstack_nova_vcpus and on (hostname) (openstack_nova_service_status == 0 and openstack_nova_service_state == 1)) by (instance))",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "disabled/up",
+          "refId": "C"
+        },
+        {
+          "expr": "max(sum(openstack_nova_vcpus and on (hostname) (openstack_nova_service_status == 0 and openstack_nova_service_state == 0)) by (instance))",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "disabled/down",
+          "refId": "D"
         }
       ],
-      "valueName": "current"
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Total CPU Number",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "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": {},
@@ -125,11 +155,11 @@
       "fill": 1,
       "gridPos": {
         "h": 5,
-        "w": 14,
+        "w": 13,
         "x": 5,
         "y": 1
       },
-      "id": 8,
+      "id": 51,
       "legend": {
         "alignAsTable": false,
         "avg": false,
@@ -158,24 +188,21 @@
       "steppedLine": false,
       "targets": [
         {
-          "$$hashKey": "object:33652",
-          "expr": "max(sum(openstack_nova_vcpus) by (instance))",
+          "expr": "max(sum(openstack_nova_vcpus and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "total",
           "refId": "A"
         },
         {
-          "$$hashKey": "object:33653",
-          "expr": "sum(system_load15 and on (host) label_replace(openstack_nova_vcpus, \"host\", \"$1\", \"hostname\", \"(.*)\"))",
+          "expr": "sum(system_load15 and on (host) label_replace(openstack_nova_vcpus and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1), \"host\", \"$1\", \"hostname\", \"(.*)\"))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "used",
           "refId": "B"
         },
         {
-          "$$hashKey": "object:33654",
-          "expr": "max(sum(openstack_nova_used_vcpus) by (instance))",
+          "expr": "max(sum(openstack_nova_used_vcpus and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "allocated",
@@ -185,7 +212,7 @@
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "CPU",
+      "title": "CPU (enabled/up hypervisors)",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -201,7 +228,6 @@
       },
       "yaxes": [
         {
-          "$$hashKey": "object:33724",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -210,7 +236,6 @@
           "show": true
         },
         {
-          "$$hashKey": "object:33725",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -234,10 +259,9 @@
         "#d44a3a"
       ],
       "datasource": null,
-      "decimals": 2,
-      "format": "none",
+      "format": "percentunit",
       "gauge": {
-        "maxValue": 32,
+        "maxValue": 1,
         "minValue": 0,
         "show": true,
         "thresholdLabels": false,
@@ -245,11 +269,11 @@
       },
       "gridPos": {
         "h": 5,
-        "w": 5,
-        "x": 19,
+        "w": 3,
+        "x": 18,
         "y": 1
       },
-      "id": 13,
+      "id": 58,
       "interval": null,
       "links": [],
       "mappingType": 1,
@@ -286,14 +310,14 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "max(sum(openstack_nova_used_vcpus) by (instance)) / max(sum(openstack_nova_vcpus) by (instance))",
+          "expr": "sum(system_load15 and on (host) label_replace(openstack_nova_vcpus and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1), \"host\", \"$1\", \"hostname\", \"(.*)\")) / max(sum(openstack_nova_vcpus and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "refId": "A"
         }
       ],
-      "thresholds": "12,16",
-      "title": "Current CPU Allocation Ratio",
+      "thresholds": "0.85,0.95",
+      "title": "CPU Usage %",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
@@ -315,9 +339,10 @@
         "#d44a3a"
       ],
       "datasource": null,
+      "decimals": 2,
       "format": "percentunit",
       "gauge": {
-        "maxValue": 1,
+        "maxValue": 12,
         "minValue": 0,
         "show": true,
         "thresholdLabels": false,
@@ -325,11 +350,11 @@
       },
       "gridPos": {
         "h": 5,
-        "w": 5,
-        "x": 0,
-        "y": 6
+        "w": 3,
+        "x": 21,
+        "y": 1
       },
-      "id": 14,
+      "id": 59,
       "interval": null,
       "links": [],
       "mappingType": 1,
@@ -366,14 +391,14 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "max(sum(openstack_nova_used_ram) by (instance)) / max(sum(openstack_nova_ram) by (instance))",
+          "expr": "max(sum(openstack_nova_used_vcpus and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance)) / max(sum(openstack_nova_vcpus and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "refId": "A"
         }
       ],
-      "thresholds": "0.85,0.95",
-      "title": "RAM Usage",
+      "thresholds": "4,8",
+      "title": "CPU Allocated %",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
@@ -391,11 +416,11 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fill": 1,
+      "fill": 4,
       "gridPos": {
         "h": 5,
-        "w": 14,
-        "x": 5,
+        "w": 5,
+        "x": 0,
         "y": 6
       },
       "id": 9,
@@ -420,38 +445,42 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": false,
+      "stack": true,
       "steppedLine": false,
       "targets": [
         {
-          "$$hashKey": "object:33887",
-          "expr": "max(sum(openstack_nova_ram) by (instance))",
+          "expr": "max(sum(openstack_nova_ram and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
-          "legendFormat": "total",
+          "legendFormat": "enabled/up",
           "refId": "A"
         },
         {
-          "$$hashKey": "object:33888",
-          "expr": "max(sum(openstack_nova_used_ram) by (instance))",
+          "expr": "max(sum(openstack_nova_ram and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 0)) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
-          "legendFormat": "used",
+          "legendFormat": "enabled/down",
           "refId": "B"
         },
         {
-          "$$hashKey": "object:33889",
-          "expr": "max(sum(openstack_nova_ram - openstack_nova_free_ram) by (instance))",
+          "expr": "max(sum(openstack_nova_ram and on (hostname) (openstack_nova_service_status == 0 and openstack_nova_service_state == 1)) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
-          "legendFormat": "allocated",
+          "legendFormat": "disabled/up",
           "refId": "C"
+        },
+        {
+          "expr": "max(sum(openstack_nova_ram and on (hostname) (openstack_nova_service_status == 0 and openstack_nova_service_state == 0)) by (instance))",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "disabled/down",
+          "refId": "D"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "RAM",
+      "title": "Total RAM",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -467,8 +496,7 @@
       },
       "yaxes": [
         {
-          "$$hashKey": "object:33959",
-          "format": "decmbytes",
+          "format": "mbytes",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -476,7 +504,6 @@
           "show": true
         },
         {
-          "$$hashKey": "object:33960",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -491,173 +518,6 @@
       }
     },
     {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": null,
-      "decimals": 2,
-      "format": "none",
-      "gauge": {
-        "maxValue": 3,
-        "minValue": 0,
-        "show": true,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 5,
-        "w": 5,
-        "x": 19,
-        "y": 6
-      },
-      "id": 15,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "max(sum(openstack_nova_ram - openstack_nova_free_ram) by (instance)) / max(sum(openstack_nova_ram) by (instance))",
-          "format": "time_series",
-          "intervalFactor": 2,
-          "refId": "A"
-        }
-      ],
-      "thresholds": "1,1.5",
-      "title": "Current RAM Allocation Ratio",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "current"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": null,
-      "format": "percentunit",
-      "gauge": {
-        "maxValue": 1,
-        "minValue": 0,
-        "show": true,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 5,
-        "w": 5,
-        "x": 0,
-        "y": 11
-      },
-      "id": 16,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          {%- endraw %}
-          {%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
-          "expr": "max(avg(openstack_nova_used_disk) by (instance)) / max(avg(openstack_nova_disk) by (instance))",
-          {%- else %}
-          "expr": "max(sum(openstack_nova_used_disk) by (instance)) / max(sum(openstack_nova_disk) by (instance))",
-          {%- endif %}
-          {%- raw %}
-          "format": "time_series",
-          "intervalFactor": 2,
-          "refId": "A"
-        }
-      ],
-      "thresholds": "0.85,0.95",
-      "title": "Disk Usage",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "current"
-    },
-    {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
@@ -666,11 +526,11 @@
       "fill": 1,
       "gridPos": {
         "h": 5,
-        "w": 14,
+        "w": 13,
         "x": 5,
-        "y": 11
+        "y": 6
       },
-      "id": 10,
+      "id": 53,
       "legend": {
         "alignAsTable": false,
         "avg": false,
@@ -696,42 +556,21 @@
       "steppedLine": false,
       "targets": [
         {
-          "$$hashKey": "object:33000",
-          {%- endraw %}
-          {%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
-          "expr": "max(avg(openstack_nova_disk) by (instance))",
-          {%- else %}
-          "expr": "max(sum(openstack_nova_disk) by (instance))",
-          {%- endif %}
-          {%- raw %}
+          "expr": "max(sum(openstack_nova_ram and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "total",
           "refId": "A"
         },
         {
-          "$$hashKey": "object:33001",
-          {%- endraw %}
-          {%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
-          "expr": "max(avg(openstack_nova_used_disk) by (instance))",
-          {%- else %}
-          "expr": "max(sum(openstack_nova_used_disk) by (instance))",
-          {%- endif %}
-          {%- raw %}
+          "expr": "sum(mem_used and on (host) label_replace(openstack_nova_ram and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1), \"host\", \"$1\", \"hostname\", \"(.*)\"))/1024/1024",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "used",
           "refId": "B"
         },
         {
-          "$$hashKey": "object:33002",
-          {%- endraw %}
-          {%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
-          "expr": "max(avg(openstack_nova_used_disk) by (instance))",
-          {%- else %}
-          "expr": "max(sum(openstack_nova_disk - openstack_nova_disk_available) by (instance))",
-          {%- endif %}
-          {%- raw %}
+          "expr": "max(sum((openstack_nova_ram - openstack_nova_free_ram) and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "allocated",
@@ -741,7 +580,7 @@
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Disk",
+      "title": "RAM (enabled/up hypervisors)",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -757,7 +596,7 @@
       },
       "yaxes": [
         {
-          "format": "decgbytes",
+          "format": "mbytes",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -788,10 +627,9 @@
         "#d44a3a"
       ],
       "datasource": null,
-      "decimals": 2,
-      "format": "none",
+      "format": "percentunit",
       "gauge": {
-        "maxValue": 2,
+        "maxValue": 1,
         "minValue": 0,
         "show": true,
         "thresholdLabels": false,
@@ -799,11 +637,11 @@
       },
       "gridPos": {
         "h": 5,
-        "w": 5,
-        "x": 19,
-        "y": 11
+        "w": 3,
+        "x": 18,
+        "y": 6
       },
-      "id": 17,
+      "id": 54,
       "interval": null,
       "links": [],
       "mappingType": 1,
@@ -840,21 +678,517 @@
       "tableColumn": "",
       "targets": [
         {
-          "$$hashKey": "object:33092",
-          {%- endraw %}
-          {%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
-          "expr": "max(avg(openstack_nova_used_disk) by (instance)) / max(avg(openstack_nova_disk) by (instance))",
-          {%- else %}
-          "expr": "max(sum(openstack_nova_disk - openstack_nova_disk_available) by (instance)) / max(sum(openstack_nova_disk) by (instance))",
-          {%- endif %}
-          {%- raw %}
+          "expr": "sum(mem_used and on (host) label_replace(openstack_nova_ram and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1), \"host\", \"$1\", \"hostname\", \"(.*)\"))/1024/1024 / max(sum(openstack_nova_ram and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "refId": "A"
         }
       ],
-      "thresholds": "0.9,1",
-      "title": "Current Disk Allocation Ratio",
+      "thresholds": "0.85,0.95",
+      "title": "RAM Usage %",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": null,
+      "decimals": 2,
+      "format": "percentunit",
+      "gauge": {
+        "maxValue": 2,
+        "minValue": 0,
+        "show": true,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 3,
+        "x": 21,
+        "y": 6
+      },
+      "id": 49,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "max(sum((openstack_nova_ram - openstack_nova_free_ram) and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance)) / max(sum(openstack_nova_ram and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "1,1.5",
+      "title": "RAM Allocated %",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 4,
+      "gridPos": {
+        "h": 5,
+        "w": 5,
+        "x": 0,
+        "y": 11
+      },
+      "id": 10,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+{%- endraw %}
+{%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
+          "expr": "max(avg(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- else %}
+          "expr": "max(sum(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- endif %}
+{%- raw %}
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "enabled/up",
+          "refId": "A"
+        },
+        {
+{%- endraw %}
+{%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
+          "expr": "max(avg(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 0)) by (instance))",
+{%- else %}
+          "expr": "max(sum(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 0)) by (instance))",
+{%- endif %}
+{%- raw %}
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "enabled/down",
+          "refId": "B"
+        },
+        {
+{%- endraw %}
+{%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
+          "expr": "max(avg(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 0 and openstack_nova_service_state == 1)) by (instance))",
+{%- else %}
+          "expr": "max(sum(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 0 and openstack_nova_service_state == 1)) by (instance))",
+{%- endif %}
+{%- raw %}
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "disabled/up",
+          "refId": "C"
+        },
+        {
+{%- endraw %}
+{%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
+          "expr": "max(avg(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 0 and openstack_nova_service_state == 0)) by (instance))",
+{%- else %}
+          "expr": "max(sum(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 0 and openstack_nova_service_state == 0)) by (instance))",
+{%- endif %}
+{%- raw %}
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "disabled/down",
+          "refId": "D"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Total Disk",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "gbytes",
+          "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,
+      "fill": 1,
+      "gridPos": {
+        "h": 5,
+        "w": 13,
+        "x": 5,
+        "y": 11
+      },
+      "id": 57,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+{%- endraw %}
+{%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
+          "expr": "max(avg(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- else %}
+          "expr": "max(sum(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- endif %}
+{%- raw %}
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "total",
+          "refId": "A"
+        },
+        {
+{%- endraw %}
+{%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
+          "expr": "max(avg(openstack_nova_used_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- else %}
+          "expr": "max(sum(openstack_nova_used_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- endif %}
+{%- raw %}
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "refId": "B"
+        },
+        {
+{%- endraw %}
+{%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
+          "expr": "max(avg((openstack_nova_disk - openstack_nova_disk_available) and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- else %}
+          "expr": "max(sum((openstack_nova_disk - openstack_nova_disk_available) and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- endif %}
+{%- raw %}
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "allocated",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Disk (enabled/up hypervisors)",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "gbytes",
+          "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
+      }
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": null,
+      "format": "percentunit",
+      "gauge": {
+        "maxValue": 1,
+        "minValue": 0,
+        "show": true,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 3,
+        "x": 18,
+        "y": 11
+      },
+      "id": 47,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+{%- endraw %}
+{%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
+          "expr": "max(avg(openstack_nova_used_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance)) / max(avg(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- else %}
+          "expr": "max(sum(openstack_nova_used_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance)) / max(sum(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- endif %}
+{%- raw %}
+          "format": "time_series",
+          "intervalFactor": 2,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "0.85,0.95",
+      "title": "Disk Usage %",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": null,
+      "decimals": 2,
+      "format": "percentunit",
+      "gauge": {
+        "maxValue": 6,
+        "minValue": 0,
+        "show": true,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 3,
+        "x": 21,
+        "y": 11
+      },
+      "id": 55,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+{%- endraw %}
+{%- if parameters is defined and parameters.get('nova_compute_ceph_ephemeral', False) == True %}
+          "expr": "max(avg((openstack_nova_disk - openstack_nova_disk_available) and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance)) / max(avg(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- else %}
+          "expr": "max(sum((openstack_nova_disk - openstack_nova_disk_available) and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance)) / max(sum(openstack_nova_disk and on (hostname) (openstack_nova_service_status == 1 and openstack_nova_service_state == 1)) by (instance))",
+{%- endif %}
+{%- raw %}
+          "format": "time_series",
+          "intervalFactor": 2,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "2,4",
+      "title": "Disk Allocated %",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
@@ -898,7 +1232,7 @@
             "h": 5,
             "w": 5,
             "x": 0,
-            "y": 17
+            "y": 2
           },
           "id": 18,
           "interval": null,
@@ -930,9 +1264,10 @@
           ],
           "scopedVars": {
             "aggregate": {
+              "isNone": true,
               "selected": true,
-              "text": "infra-dev",
-              "value": "infra-dev"
+              "text": "None",
+              "value": ""
             }
           },
           "sparkline": {
@@ -974,7 +1309,7 @@
             "h": 5,
             "w": 14,
             "x": 5,
-            "y": 17
+            "y": 2
           },
           "id": 19,
           "legend": {
@@ -1001,9 +1336,10 @@
           "renderer": "flot",
           "scopedVars": {
             "aggregate": {
+              "isNone": true,
               "selected": true,
-              "text": "infra-dev",
-              "value": "infra-dev"
+              "text": "None",
+              "value": ""
             }
           },
           "seriesOverrides": [],
@@ -1012,7 +1348,6 @@
           "steppedLine": false,
           "targets": [
             {
-              "$$hashKey": "object:34227",
               "expr": "max(openstack_nova_aggregate_vcpus{aggregate=\"$aggregate\"})",
               "format": "time_series",
               "instant": false,
@@ -1021,7 +1356,6 @@
               "refId": "A"
             },
             {
-              "$$hashKey": "object:34228",
               "expr": "max(openstack_nova_aggregate_used_vcpus{aggregate=\"$aggregate\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -1092,7 +1426,7 @@
             "h": 5,
             "w": 5,
             "x": 19,
-            "y": 17
+            "y": 2
           },
           "id": 21,
           "interval": null,
@@ -1124,9 +1458,10 @@
           ],
           "scopedVars": {
             "aggregate": {
+              "isNone": true,
               "selected": true,
-              "text": "infra-dev",
-              "value": "infra-dev"
+              "text": "None",
+              "value": ""
             }
           },
           "sparkline": {
@@ -1179,7 +1514,7 @@
             "h": 5,
             "w": 5,
             "x": 0,
-            "y": 22
+            "y": 7
           },
           "id": 23,
           "interval": null,
@@ -1211,9 +1546,10 @@
           ],
           "scopedVars": {
             "aggregate": {
+              "isNone": true,
               "selected": true,
-              "text": "infra-dev",
-              "value": "infra-dev"
+              "text": "None",
+              "value": ""
             }
           },
           "sparkline": {
@@ -1255,7 +1591,7 @@
             "h": 5,
             "w": 14,
             "x": 5,
-            "y": 22
+            "y": 7
           },
           "id": 22,
           "legend": {
@@ -1279,9 +1615,10 @@
           "renderer": "flot",
           "scopedVars": {
             "aggregate": {
+              "isNone": true,
               "selected": true,
-              "text": "infra-dev",
-              "value": "infra-dev"
+              "text": "None",
+              "value": ""
             }
           },
           "seriesOverrides": [],
@@ -1290,7 +1627,6 @@
           "steppedLine": false,
           "targets": [
             {
-              "$$hashKey": "object:34328",
               "expr": "max(openstack_nova_aggregate_ram{aggregate=\"$aggregate\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -1298,7 +1634,6 @@
               "refId": "A"
             },
             {
-              "$$hashKey": "object:34329",
               "expr": "max(openstack_nova_aggregate_used_ram{aggregate=\"$aggregate\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -1306,7 +1641,6 @@
               "refId": "B"
             },
             {
-              "$$hashKey": "object:34330",
               "expr": "max(openstack_nova_aggregate_ram{aggregate=\"$aggregate\"} - openstack_nova_aggregate_free_ram{aggregate=\"$aggregate\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -1377,7 +1711,7 @@
             "h": 5,
             "w": 5,
             "x": 19,
-            "y": 22
+            "y": 7
           },
           "id": 24,
           "interval": null,
@@ -1409,9 +1743,10 @@
           ],
           "scopedVars": {
             "aggregate": {
+              "isNone": true,
               "selected": true,
-              "text": "infra-dev",
-              "value": "infra-dev"
+              "text": "None",
+              "value": ""
             }
           },
           "sparkline": {
@@ -1464,7 +1799,7 @@
             "h": 5,
             "w": 5,
             "x": 0,
-            "y": 27
+            "y": 12
           },
           "id": 26,
           "interval": null,
@@ -1496,9 +1831,10 @@
           ],
           "scopedVars": {
             "aggregate": {
+              "isNone": true,
               "selected": true,
-              "text": "infra-dev",
-              "value": "infra-dev"
+              "text": "None",
+              "value": ""
             }
           },
           "sparkline": {
@@ -1540,7 +1876,7 @@
             "h": 5,
             "w": 14,
             "x": 5,
-            "y": 27
+            "y": 12
           },
           "id": 25,
           "legend": {
@@ -1564,9 +1900,10 @@
           "renderer": "flot",
           "scopedVars": {
             "aggregate": {
+              "isNone": true,
               "selected": true,
-              "text": "infra-dev",
-              "value": "infra-dev"
+              "text": "None",
+              "value": ""
             }
           },
           "seriesOverrides": [],
@@ -1575,7 +1912,6 @@
           "steppedLine": false,
           "targets": [
             {
-              "$$hashKey": "object:33182",
               "expr": "max(openstack_nova_aggregate_disk{aggregate=\"$aggregate\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -1583,7 +1919,6 @@
               "refId": "A"
             },
             {
-              "$$hashKey": "object:33183",
               "expr": "max(openstack_nova_aggregate_used_disk{aggregate=\"$aggregate\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -1591,7 +1926,6 @@
               "refId": "B"
             },
             {
-              "$$hashKey": "object:33184",
               "expr": "max(openstack_nova_aggregate_disk{aggregate=\"$aggregate\"} - openstack_nova_aggregate_disk_available{aggregate=\"$aggregate\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -1662,7 +1996,7 @@
             "h": 5,
             "w": 5,
             "x": 19,
-            "y": 27
+            "y": 12
           },
           "id": 27,
           "interval": null,
@@ -1694,9 +2028,10 @@
           ],
           "scopedVars": {
             "aggregate": {
+              "isNone": true,
               "selected": true,
-              "text": "infra-dev",
-              "value": "infra-dev"
+              "text": "None",
+              "value": ""
             }
           },
           "sparkline": {
@@ -1708,7 +2043,6 @@
           "tableColumn": "",
           "targets": [
             {
-              "$$hashKey": "object:33274",
               "expr": "max((openstack_nova_aggregate_disk{aggregate=\"$aggregate\"} - openstack_nova_aggregate_disk_available{aggregate=\"$aggregate\"}) / openstack_nova_aggregate_disk{aggregate=\"$aggregate\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -1732,10 +2066,10 @@
       "repeat": "aggregate",
       "scopedVars": {
         "aggregate": {
-          "$$hashKey": "object:33592",
+          "isNone": true,
           "selected": true,
-          "text": "infra-dev",
-          "value": "infra-dev"
+          "text": "None",
+          "value": ""
         }
       },
       "title": "Aggregate Utilization @$aggregate",
@@ -1747,7 +2081,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 17
+        "y": 33
       },
       "id": 2,
       "panels": [
@@ -1773,7 +2107,7 @@
             "h": 5,
             "w": 5,
             "x": 0,
-            "y": 33
+            "y": 3
           },
           "id": 28,
           "interval": null,
@@ -1806,8 +2140,8 @@
           "scopedVars": {
             "host": {
               "selected": true,
-              "text": "cmp002",
-              "value": "cmp002"
+              "text": "cmp1",
+              "value": "cmp1"
             }
           },
           "sparkline": {
@@ -1849,7 +2183,7 @@
             "h": 5,
             "w": 14,
             "x": 5,
-            "y": 33
+            "y": 3
           },
           "id": 29,
           "legend": {
@@ -1877,8 +2211,8 @@
           "scopedVars": {
             "host": {
               "selected": true,
-              "text": "cmp002",
-              "value": "cmp002"
+              "text": "cmp1",
+              "value": "cmp1"
             }
           },
           "seriesOverrides": [],
@@ -1887,7 +2221,6 @@
           "steppedLine": false,
           "targets": [
             {
-              "$$hashKey": "object:34607",
               "expr": "max(openstack_nova_vcpus{hostname=\"$host\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -1895,7 +2228,6 @@
               "refId": "A"
             },
             {
-              "$$hashKey": "object:34608",
               "expr": "scalar(system_load15{host=\"$host\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -1903,7 +2235,6 @@
               "refId": "B"
             },
             {
-              "$$hashKey": "object:34609",
               "expr": "max(openstack_nova_used_vcpus{hostname=\"$host\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -1974,9 +2305,9 @@
             "h": 5,
             "w": 5,
             "x": 19,
-            "y": 33
+            "y": 3
           },
-          "id": 30,
+          "id": 61,
           "interval": null,
           "links": [],
           "mappingType": 1,
@@ -2007,8 +2338,8 @@
           "scopedVars": {
             "host": {
               "selected": true,
-              "text": "cmp002",
-              "value": "cmp002"
+              "text": "cmp1",
+              "value": "cmp1"
             }
           },
           "sparkline": {
@@ -2061,7 +2392,7 @@
             "h": 5,
             "w": 5,
             "x": 0,
-            "y": 38
+            "y": 8
           },
           "id": 31,
           "interval": null,
@@ -2094,8 +2425,8 @@
           "scopedVars": {
             "host": {
               "selected": true,
-              "text": "cmp002",
-              "value": "cmp002"
+              "text": "cmp1",
+              "value": "cmp1"
             }
           },
           "sparkline": {
@@ -2137,7 +2468,7 @@
             "h": 5,
             "w": 14,
             "x": 5,
-            "y": 38
+            "y": 8
           },
           "id": 32,
           "legend": {
@@ -2162,8 +2493,8 @@
           "scopedVars": {
             "host": {
               "selected": true,
-              "text": "cmp002",
-              "value": "cmp002"
+              "text": "cmp1",
+              "value": "cmp1"
             }
           },
           "seriesOverrides": [],
@@ -2172,7 +2503,6 @@
           "steppedLine": false,
           "targets": [
             {
-              "$$hashKey": "object:34730",
               "expr": "max(openstack_nova_ram{hostname=\"$host\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -2180,7 +2510,6 @@
               "refId": "A"
             },
             {
-              "$$hashKey": "object:34731",
               "expr": "max(openstack_nova_used_ram{hostname=\"$host\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -2188,7 +2517,6 @@
               "refId": "B"
             },
             {
-              "$$hashKey": "object:34732",
               "expr": "max(openstack_nova_ram{hostname=\"$host\"} - openstack_nova_free_ram{hostname=\"$host\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -2259,7 +2587,7 @@
             "h": 5,
             "w": 5,
             "x": 19,
-            "y": 38
+            "y": 8
           },
           "id": 33,
           "interval": null,
@@ -2292,8 +2620,8 @@
           "scopedVars": {
             "host": {
               "selected": true,
-              "text": "cmp002",
-              "value": "cmp002"
+              "text": "cmp1",
+              "value": "cmp1"
             }
           },
           "sparkline": {
@@ -2346,7 +2674,7 @@
             "h": 5,
             "w": 5,
             "x": 0,
-            "y": 43
+            "y": 13
           },
           "id": 34,
           "interval": null,
@@ -2379,8 +2707,8 @@
           "scopedVars": {
             "host": {
               "selected": true,
-              "text": "cmp002",
-              "value": "cmp002"
+              "text": "cmp1",
+              "value": "cmp1"
             }
           },
           "sparkline": {
@@ -2422,7 +2750,7 @@
             "h": 5,
             "w": 14,
             "x": 5,
-            "y": 43
+            "y": 13
           },
           "id": 35,
           "legend": {
@@ -2447,8 +2775,8 @@
           "scopedVars": {
             "host": {
               "selected": true,
-              "text": "cmp002",
-              "value": "cmp002"
+              "text": "cmp1",
+              "value": "cmp1"
             }
           },
           "seriesOverrides": [],
@@ -2457,7 +2785,6 @@
           "steppedLine": false,
           "targets": [
             {
-              "$$hashKey": "object:33364",
               "expr": "max(openstack_nova_disk{hostname=\"$host\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -2465,7 +2792,6 @@
               "refId": "A"
             },
             {
-              "$$hashKey": "object:33365",
               "expr": "max(openstack_nova_used_disk{hostname=\"$host\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -2473,7 +2799,6 @@
               "refId": "B"
             },
             {
-              "$$hashKey": "object:33366",
               "expr": "max(openstack_nova_disk{hostname=\"$host\"} - openstack_nova_disk_available{hostname=\"$host\"})",
               "format": "time_series",
               "intervalFactor": 2,
@@ -2544,7 +2869,7 @@
             "h": 5,
             "w": 5,
             "x": 19,
-            "y": 43
+            "y": 13
           },
           "id": 36,
           "interval": null,
@@ -2577,8 +2902,8 @@
           "scopedVars": {
             "host": {
               "selected": true,
-              "text": "cmp002",
-              "value": "cmp002"
+              "text": "cmp1",
+              "value": "cmp1"
             }
           },
           "sparkline": {
@@ -2613,10 +2938,9 @@
       "repeat": "host",
       "scopedVars": {
         "host": {
-          "$$hashKey": "object:33433",
           "selected": true,
-          "text": "cmp002",
-          "value": "cmp002"
+          "text": "cmp1",
+          "value": "cmp1"
         }
       },
       "title": "Hypervisors Utilization @$host",
@@ -2634,10 +2958,9 @@
       {
         "allValue": null,
         "current": {
-          "text": "infra-dev",
-          "value": [
-            "infra-dev"
-          ]
+          "isNone": true,
+          "text": "None",
+          "value": ""
         },
         "datasource": "prometheus",
         "hide": 0,
@@ -2649,6 +2972,7 @@
         "query": "label_values(openstack_nova_aggregate_running_instances,aggregate)",
         "refresh": 1,
         "regex": "",
+        "skipUrlSync": false,
         "sort": 1,
         "tagValuesQuery": "",
         "tags": [],
@@ -2659,9 +2983,10 @@
       {
         "allValue": null,
         "current": {
-          "text": "cmp002",
+          "tags": [],
+          "text": "cmp1",
           "value": [
-            "cmp002"
+            "cmp1"
           ]
         },
         "datasource": "prometheus",
@@ -2674,6 +2999,7 @@
         "query": "label_values(openstack_nova_running_instances,hostname)",
         "refresh": 1,
         "regex": "",
+        "skipUrlSync": false,
         "sort": 1,
         "tagValuesQuery": "",
         "tags": [],
@@ -2715,6 +3041,6 @@
   "timezone": "",
   "title": "Nova - Utilization",
   "uid": null,
-  "version": 1
+  "version": 2
 }
 {%- endraw %}
diff --git a/nova/files/mitaka/nova-controller.conf.Debian b/nova/files/mitaka/nova-controller.conf.Debian
index fb95af9..e42449e 100644
--- a/nova/files/mitaka/nova-controller.conf.Debian
+++ b/nova/files/mitaka/nova-controller.conf.Debian
@@ -1,5 +1,6 @@
 {%- from "nova/map.jinja" import controller with context %}
 [DEFAULT]
+secure_proxy_ssl_header = {{ controller.get('secure_proxy_ssl_header', 'HTTP_X_FORWARDED_PROTO') }}
 verbose = True
 log-dir = /var/log/nova
 {%- if controller.debug %}
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index cc88269..beccee3 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -13,6 +13,7 @@
     disk_allocation_ratio: 1.0
     workers: 8
     instance_build_timeout: 600
+    secure_proxy_ssl_header: HTTP_X_FORWARDED_PROTO
     bind:
       private_address: 127.0.0.1
       public_address: 127.0.0.1
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 467d4b0..42300f4 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -26,6 +26,7 @@
     disk_allocation_ratio: 1.0
     workers: 8
     nfs_mount_options: 'vers=3,lookupcache=pos'
+    secure_proxy_ssl_header: HTTP_X_FORWARDED_PROTO
     bind:
       private_address: 127.0.0.1
       public_address: 127.0.0.1