diff --git a/templates/ddash/dash_container.j2 b/templates/ddash/dash_container.j2
index 08f47426a04f064b44d9d00a9b5e0bd052de55d4..303d047b6fad70d51777c9d0db1e33cf10fa783b 100644
--- a/templates/ddash/dash_container.j2
+++ b/templates/ddash/dash_container.j2
@@ -1,5 +1,5 @@
 {
-  "id": "4622e57f-a3f2-4d1e-bd97-90c4566733fa",
+  "id": 2315521122522621,
   "title": "{% set comma = joiner(" ") -%}{% for o in container_path %}{{ comma() }}{{ o.name }}{% endfor %}",
   "tags": ["{{pool}}"],
   "style": "dark",
diff --git a/templates/ddash/dash_ipsla.j2 b/templates/ddash/dash_ipsla.j2
index 18e89e18477e44b4693dcf8c3928efeb1ac58b26..48821f2338ffb17dc17b22e644a699ab86b70ee1 100644
--- a/templates/ddash/dash_ipsla.j2
+++ b/templates/ddash/dash_ipsla.j2
@@ -1,6 +1,6 @@
 {% set comma = joiner(",") -%}
 {
-  "id": "239c4cd2-7cf6-41a5-91f8-9f6bd9218361",
+  "id": 9615018713449143,
   "title": "IP SLA Monitor",
   "tags": [],
   "style": "dark",
diff --git a/templates/ddash/dash_link.j2 b/templates/ddash/dash_link.j2
index 73dff6c1e65afd1913f1f9e0fbc59b5e1673a7b6..f12d245cd8ea005a794961dbef790a9c65efbe80 100644
--- a/templates/ddash/dash_link.j2
+++ b/templates/ddash/dash_link.j2
@@ -1,5 +1,5 @@
 {
-  "id": "e3be24d6-8d7e-4b91-9d0a-3a7254bc0d27",
+  "id": 2067720114824024,
   "title": "Link {{device_a}} - {{device_b}}",
   "tags": ["{{pool}}"],
   "style": "dark",
diff --git a/templates/ddash/dash_mo.j2 b/templates/ddash/dash_mo.j2
index 07885baa8d34c98305b4a7a53e441f9115faa24e..9abec714c582f1663bfd9db9bc01da26cfb5a4c5 100644
--- a/templates/ddash/dash_mo.j2
+++ b/templates/ddash/dash_mo.j2
@@ -1,5 +1,5 @@
 {
-  "id": "dca571a2-2018-432e-b6a5-101670b395ca",
+  "id": 1811561422823611,
   "title": "{{device}}",
   "tags": ["{{pool}}"],
   "style": "dark",
diff --git a/templates/ddash/graph_cpu_load_1min.j2 b/templates/ddash/graph_cpu_load_1min.j2
index 2dc2263591dabe22bb4799b38acf0585080094e2..56f8292af276a5e6530f3c9f8776b0b3e6d71f85 100644
--- a/templates/ddash/graph_cpu_load_1min.j2
+++ b/templates/ddash/graph_cpu_load_1min.j2
@@ -31,7 +31,7 @@
     "value_type": "cumulative",
     "msResolution": false
   },
-  "id": "b485a632-cd74-429e-8f69-9839e451ee83",
+  "id": 1391774823725701,
   "points": false,
   "xaxis": {
     "values": [],
diff --git a/templates/ddash/graph_cpu_load_5min.j2 b/templates/ddash/graph_cpu_load_5min.j2
index 5b09b75c18d66e70e6870965c5ca816b134408f2..d077c8a4a802a3f6e9a78a3deca22c161689bfea 100644
--- a/templates/ddash/graph_cpu_load_5min.j2
+++ b/templates/ddash/graph_cpu_load_5min.j2
@@ -4,7 +4,7 @@
   "links": [],
   "nullPointMode": "connected",
   "renderer": "flot",
-  "id": "c20c71b5-c555-46b1-b177-646aa0da7bbc",
+  "id": 9120621811818619,
   "linewidth": 2,
   "steppedLine": false,
   "targets": [
diff --git a/templates/ddash/graph_cpu_usage.j2 b/templates/ddash/graph_cpu_usage.j2
index 509e3ad2fa7de56bd44cd791546cbacf57ee715e..692a7f619c29d161e63f85b89ea8f9418c246d5a 100644
--- a/templates/ddash/graph_cpu_usage.j2
+++ b/templates/ddash/graph_cpu_usage.j2
@@ -10,7 +10,7 @@
     "threshold2": null,
     "threshold2Color": "rgba(234, 112, 112, 0.22)"
   },
-  "id": "11ad2d11-4cee-49ff-a1d6-72146265907e",
+  "id": 1151904820716512,
   "legend": {
     "alignAsTable": true,
     "avg": true,
diff --git a/templates/ddash/graph_cpu_usage_5sec.j2 b/templates/ddash/graph_cpu_usage_5sec.j2
index 959648c104522063b60d8be8c4c11a268b37437c..e473efff60ed45e7afab7dd0ff64835fe7564740 100644
--- a/templates/ddash/graph_cpu_usage_5sec.j2
+++ b/templates/ddash/graph_cpu_usage_5sec.j2
@@ -4,7 +4,7 @@
   "links": [],
   "nullPointMode": "connected",
   "renderer": "flot",
-  "id": "b485a632-cd74-429e-8f69-9839e453ee83",
+  "id": 1242216921441885,
   "linewidth": 2,
   "steppedLine": false,
   "targets": [
diff --git a/templates/ddash/graph_disk_errorcount.j2 b/templates/ddash/graph_disk_errorcount.j2
index 5c2305ba2063a51379ccc684d5bda4fc6c6327aa..03478daedd83803512d8df2cef1e734533b51c08 100644
--- a/templates/ddash/graph_disk_errorcount.j2
+++ b/templates/ddash/graph_disk_errorcount.j2
@@ -4,7 +4,7 @@
   "links": [],
   "nullPointMode": "connected",
   "renderer": "flot",
-  "id": "1bb67ee3-9513-47c7-b848-10cd3886bc42",
+  "id": 2452004898891381,
   "linewidth": 2,
   "steppedLine": false,
   "targets": [
diff --git a/templates/ddash/graph_disk_free.j2 b/templates/ddash/graph_disk_free.j2
index 4c7a91e34f2059e8084a4e517feca573f90a96e5..ac3eb6e16c476b3ecf87f0984ac760929b1ad678 100644
--- a/templates/ddash/graph_disk_free.j2
+++ b/templates/ddash/graph_disk_free.j2
@@ -1,5 +1,5 @@
 {
-  "id": "caff7ea9-320a-443d-87a5-610be03710b1",
+  "id": 2385317751581721,
   "title": "Disk | Free",
   "span": 6,
   "type": "graph",
diff --git a/templates/ddash/graph_disk_problem.j2 b/templates/ddash/graph_disk_problem.j2
index 9e803071f8afb6c0098cbef61a9de07d48f53d4e..85a146e99c82985a035bda406aa4a866305c7cbb 100644
--- a/templates/ddash/graph_disk_problem.j2
+++ b/templates/ddash/graph_disk_problem.j2
@@ -32,7 +32,7 @@
   ],
   "showLegend": true,
   "legendSortBy": "-ms",
-  "id": "3cba42e1-7be5-4f7c-b565-48231c3ac918",
+  "id": 3621889165142154,
   "writeLastValue": true,
   "span": 6,
   "title": "Disk status",
diff --git a/templates/ddash/graph_disk_usage.j2 b/templates/ddash/graph_disk_usage.j2
index db536691cc94c3f6bfa00db36398a7be57c84ffb..c673c8f441455fc2ad5cf606d7d9e129ec3ffce2 100644
--- a/templates/ddash/graph_disk_usage.j2
+++ b/templates/ddash/graph_disk_usage.j2
@@ -8,7 +8,7 @@
   "renderer": "flot",
   "linewidth": 1,
   "steppedLine": false,
-  "id": "9d647f97-a2c8-4cb5-9521-20aa106d39c1",
+  "id": 1537534184362283,
   "fill": 1,
   "title": "Disk | Usage",
   "tooltip": {
diff --git a/templates/ddash/graph_disk_usagepercent.j2 b/templates/ddash/graph_disk_usagepercent.j2
index 2643fd24be9670aa65a4736e4fedbcf9a55500ea..4b42d109d9cfaf720ac02afc96b1dfe8e9aa82ae 100644
--- a/templates/ddash/graph_disk_usagepercent.j2
+++ b/templates/ddash/graph_disk_usagepercent.j2
@@ -7,7 +7,7 @@
   "dashes": false,
   "datasource": null,
   "fill": 1,
-  "id": "dd6b846f-690d-4292-915a-d52bb9e2b4cd",
+  "id": 7725424320425220,
   "legend": {
     "alignAsTable": true,
     "avg": true,
diff --git a/templates/ddash/graph_environment_electriccurrent.j2 b/templates/ddash/graph_environment_electriccurrent.j2
index f90794ed6422cd5252bae87c2dcb52e0babc4570..d20927997a24799fc258a9c8170bef73f8b1ff2c 100644
--- a/templates/ddash/graph_environment_electriccurrent.j2
+++ b/templates/ddash/graph_environment_electriccurrent.j2
@@ -4,7 +4,7 @@
   "links": [],
   "nullPointMode": "connected",
   "renderer": "flot",
-  "id": "31fb8cf1-4115-4dd8-945e-0bdeaa4adea7",
+  "id": 1636812223912512,
   "linewidth": 2,
   "steppedLine": false,
   "targets": [
diff --git a/templates/ddash/graph_environment_sensorstatus.j2 b/templates/ddash/graph_environment_sensorstatus.j2
index 063e4c8aa6dd7f44c325b25a6aeab7e06be8146d..c458f2eff87565dce9203c0920a91f639f42cddd 100644
--- a/templates/ddash/graph_environment_sensorstatus.j2
+++ b/templates/ddash/graph_environment_sensorstatus.j2
@@ -1,5 +1,5 @@
 {
-  "id": "522c7444-a116-4df6-80bd-e34e831ff695",
+  "id": 1491244323262631,
   "title": "Environment | Sensor Status",
   "span": 6,
   "type": "natel-discrete-panel",
diff --git a/templates/ddash/graph_environment_temperature.j2 b/templates/ddash/graph_environment_temperature.j2
index 5320e58e1dc50802b98373d67bdec995c3fe7023..3a084373124ab6c9c857cceaf79f51add22eb4b7 100644
--- a/templates/ddash/graph_environment_temperature.j2
+++ b/templates/ddash/graph_environment_temperature.j2
@@ -4,7 +4,7 @@
   "links": [],
   "nullPointMode": "connected",
   "renderer": "flot",
-  "id": "4d2b3163-b0a8-4859-84d8-409285c32680",
+  "id": 2102099622138831,
   "linewidth": 2,
   "steppedLine": false,
   "targets": [
diff --git a/templates/ddash/graph_environment_voltage.j2 b/templates/ddash/graph_environment_voltage.j2
index 30c93d4ae3f4df28834e96a30b20edc638381f0a..2bc5ccd424d7799f3a0ba15b2881334a2dcd5761 100644
--- a/templates/ddash/graph_environment_voltage.j2
+++ b/templates/ddash/graph_environment_voltage.j2
@@ -4,7 +4,7 @@
   "links": [],
   "nullPointMode": "connected",
   "renderer": "flot",
-  "id": "e4c8ff93-406f-4823-bd07-d46a0bbc3d36",
+  "id": 9322821011122156,
   "linewidth": 2,
   "steppedLine": false,
   "targets": [
diff --git a/templates/ddash/graph_interface_errors_crc.j2 b/templates/ddash/graph_interface_errors_crc.j2
index 0a788c132624ee8fd3eaa7a3087db60c00a85969..0c2538cc855f01e0e3bdbb800cd21a2c0957d454 100644
--- a/templates/ddash/graph_interface_errors_crc.j2
+++ b/templates/ddash/graph_interface_errors_crc.j2
@@ -7,7 +7,7 @@
   "dashes": false,
   "datasource": null,
   "fill": 1,
-  "id": "ad3c1e71-6869-457d-b0e9-950e056d0f65",
+  "id": 8012221091731545,
   "legend": {
     "alignAsTable": true,
     "avg": true,
diff --git a/templates/ddash/graph_memory_load_1min.j2 b/templates/ddash/graph_memory_load_1min.j2
index 44f367e01e07165df60b8b83aebae777b865e48f..e36eff088fafb0a06921661c6592fdd46e6f71a6 100644
--- a/templates/ddash/graph_memory_load_1min.j2
+++ b/templates/ddash/graph_memory_load_1min.j2
@@ -4,7 +4,7 @@
   "links": [],
   "nullPointMode": "connected",
   "renderer": "flot",
-  "id": "55143917-4453-48d7-aff4-765688a06565",
+  "id": 2051881921122066,
   "linewidth": 2,
   "steppedLine": false,
   "targets": [
diff --git a/templates/ddash/graph_memory_usage.j2 b/templates/ddash/graph_memory_usage.j2
index 8ec71907d8d2e668cad99a36f27035480a3601c6..76708a682fa2dee0301c1a00b097bbaf0d146dd7 100644
--- a/templates/ddash/graph_memory_usage.j2
+++ b/templates/ddash/graph_memory_usage.j2
@@ -10,7 +10,7 @@
     "threshold2": null,
     "threshold2Color": "rgba(234, 112, 112, 0.22)"
   },
-  "id": "be3ec24e-c0e0-4b19-a4b2-25c7638c6046",
+  "id": 1552414413515610,
   "legend": {
     "alignAsTable": true,
     "avg": true,
diff --git a/templates/ddash/graph_memory_usage_5sec.j2 b/templates/ddash/graph_memory_usage_5sec.j2
index 9e5ee5b2ff139bf93287547f7b6d839f0cca3d9d..8ebdd3ee9eb8703c5968b8c177edfaefaef0dedd 100644
--- a/templates/ddash/graph_memory_usage_5sec.j2
+++ b/templates/ddash/graph_memory_usage_5sec.j2
@@ -4,7 +4,7 @@
   "links": [],
   "nullPointMode": "connected",
   "renderer": "flot",
-  "id": "14dc48c0-5d5e-44df-9fe1-f56973ef2e68",
+  "id": 1861181915957310,
   "linewidth": 2,
   "steppedLine": false,
   "targets": [
diff --git a/templates/ddash/graph_network_stp_topologychanges.j2 b/templates/ddash/graph_network_stp_topologychanges.j2
index 4e2fb4831002037b5a2d1f653a7056b579b9cecc..b26a16bdb8aef2dbb91d666b304ab99e5f9a2382 100644
--- a/templates/ddash/graph_network_stp_topologychanges.j2
+++ b/templates/ddash/graph_network_stp_topologychanges.j2
@@ -4,7 +4,7 @@
   "links": [],
   "nullPointMode": "connected",
   "renderer": "flot",
-  "id": "4d2b3163-b0a8-4859-84d8-409285c32681",
+  "id": 8361031091312081,
   "linewidth": 2,
   "steppedLine": false,
   "targets": [
diff --git a/templates/ddash/graph_radio_cinr.j2 b/templates/ddash/graph_radio_cinr.j2
deleted file mode 100644
index eebbd90e7092452c377ce5055cc9af28a2859f27..0000000000000000000000000000000000000000
--- a/templates/ddash/graph_radio_cinr.j2
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "title": "Radio | CINR",
-  "aliasColors": {},
-  "bars": false,
-  "datasource": null,
-  "fill": 1,
-  "grid": {
-    "threshold1": null,
-    "threshold1Color": "rgba(216, 200, 27, 0.27)",
-    "threshold2": null,
-    "threshold2Color": "rgba(234, 112, 112, 0.22)"
-  },
-  "id": "4fcca442-a11f-44af-903f-d0fb50570e36",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 2,
-  "links": [],
-  "nullPointMode": "connected",
-  "percentage": false,
-  "pointradius": 5,
-  "points": false,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "span": 6,
-  "stack": false,
-  "steppedLine": false,
-  "targets": [
-    {
-      "dateTimeColDataType": "ts",
-      "datetimeLoading": false,
-      "database": "noc",
-      "dateLoading": false,
-      "tableLoading": false,
-      "dateColDataType": "date",
-      "table": "interface",
-      "intervalFactor": 1,
-      "query": "SELECT \n    t, \n    groupArray((iface, CINR)) AS groupArr \nFROM (\n    SELECT $timeSeries as t, \n        arrayStringConcat(path,'.') as iface, \n        avg(cinr) as `CINR` \n    FROM \n        $table \n    WHERE \n        managed_object=$bi_id \n        and $timeFilter \n    GROUP BY arrayStringConcat(path,'.'), t ORDER BY t) \nGROUP BY t \nORDER BY t ASC",
-      "refId": "A",
-      "resultFormat": "time_series"
-    }
-  ],
-  "timeFrom": null,
-  "timeShift": null,
-  "tooltip": {
-    "msResolution": false,
-    "shared": true,
-    "sort": 0,
-    "value_type": "cumulative"
-  },
-  "type": "graph",
-  "x-axis": true,
-  "xaxis": {
-    "show": true
-  },
-  "y-axis": true,
-  "yaxes": [
-    {
-      "format": "dB",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ]
-}
diff --git a/templates/ddash/graph_radio_rssi.j2 b/templates/ddash/graph_radio_rssi.j2
deleted file mode 100644
index 75e117b61e56f43d2c62840cc4a0edeb592898e3..0000000000000000000000000000000000000000
--- a/templates/ddash/graph_radio_rssi.j2
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "title": "Radio | RSSI",
-  "aliasColors": {},
-  "bars": false,
-  "datasource": null,
-  "fill": 1,
-  "grid": {
-    "threshold1": null,
-    "threshold1Color": "rgba(216, 200, 27, 0.27)",
-    "threshold2": null,
-    "threshold2Color": "rgba(234, 112, 112, 0.22)"
-  },
-  "id": "97bc1951-7466-43a8-b91d-22c470082d8d",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 2,
-  "links": [],
-  "nullPointMode": "connected",
-  "percentage": false,
-  "pointradius": 5,
-  "points": false,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "span": 6,
-  "stack": false,
-  "steppedLine": false,
-  "targets": [
-    {
-      "dateTimeColDataType": "ts",
-      "datetimeLoading": false,
-      "database": "noc",
-      "dateLoading": false,
-      "tableLoading": false,
-      "dateColDataType": "date",
-      "table": "interface",
-      "intervalFactor": 1,
-      "query": "SELECT \n    t, \n    groupArray((iface, RSSI)) AS groupArr \nFROM (\n    SELECT $timeSeries as t, \n        arrayStringConcat(path,'.') as iface, \n        avg(rssi) as `RSSI` \n    FROM \n        $table \n    WHERE \n        managed_object=$bi_id \n        and $timeFilter \n    GROUP BY arrayStringConcat(path,'.'), t ORDER BY t) \nGROUP BY t \nORDER BY t ASC",
-      "refId": "A",
-      "resultFormat": "time_series"
-    }
-  ],
-  "timeFrom": null,
-  "timeShift": null,
-  "tooltip": {
-    "msResolution": false,
-    "shared": true,
-    "sort": 0,
-    "value_type": "cumulative"
-  },
-  "type": "graph",
-  "x-axis": true,
-  "xaxis": {
-    "show": true
-  },
-  "y-axis": true,
-  "yaxes": [
-    {
-      "format": "dBm",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ]
-}
diff --git a/templates/ddash/graph_radio_rssi_cinr.j2 b/templates/ddash/graph_radio_rssi_cinr.j2
deleted file mode 100644
index afbe1677d4b7adaf8ac6f7c0e2e402281856558f..0000000000000000000000000000000000000000
--- a/templates/ddash/graph_radio_rssi_cinr.j2
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "title": "Radio | RSSI and CINR",
-  "aliasColors": {},
-  "bars": false,
-  "datasource": null,
-  "fill": 1,
-  "grid": {
-    "threshold1": null,
-    "threshold1Color": "rgba(216, 200, 27, 0.27)",
-    "threshold2": null,
-    "threshold2Color": "rgba(234, 112, 112, 0.22)"
-  },
-  "id": "4fcca442-a11f-44af-903f-d0fb50570eaf",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 2,
-  "links": [],
-  "nullPointMode": "connected",
-  "percentage": false,
-  "pointradius": 5,
-  "points": false,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "span": 6,
-  "stack": false,
-  "steppedLine": false,
-  "targets": [
-    {
-      "dateTimeColDataType": "ts",
-      "datetimeLoading": false,
-      "database": "noc",
-      "dateLoading": false,
-      "tableLoading": false,
-      "dateColDataType": "date",
-      "table": "interface",
-      "intervalFactor": 1,
-      "query": "SELECT \n    t, \n    groupArray((iface, RSSI)) AS groupArr \nFROM (\n    SELECT $timeSeries as t, \n        arrayStringConcat(path,'.') as iface, \n        avg(rssi) as `RSSI` \n    FROM \n        $table \n    WHERE \n        managed_object=$bi_id \n        and $timeFilter \n        and rssi != -32555 \n        GROUP BY arrayStringConcat(path,'.'), t ORDER BY t) \nGROUP BY t \nORDER BY t ASC",
-      "refId": "A",
-      "resultFormat": "time_series"
-    },
-    {
-      "dateTimeColDataType": "ts",
-      "datetimeLoading": false,
-      "database": "noc",
-      "dateLoading": false,
-      "tableLoading": false,
-      "dateColDataType": "date",
-      "table": "interface",
-      "intervalFactor": 1,
-      "query": "SELECT \n    t, \n    groupArray((iface, CINR)) AS groupArr \nFROM (\n    SELECT $timeSeries as t, \n        arrayStringConcat(path,'.') as iface, \n        avg(cinr) as `CINR` \n    FROM \n        $table \n    WHERE \n        managed_object=$bi_id \n        and $timeFilter \n        and cinr != -32555 \n        GROUP BY arrayStringConcat(path,'.'), t ORDER BY t) \nGROUP BY t \nORDER BY t ASC",
-      "refId": "A",
-      "resultFormat": "time_series"
-    }
-  ],
-  "timeFrom": null,
-  "timeShift": null,
-  "tooltip": {
-    "msResolution": false,
-    "shared": true,
-    "sort": 0,
-    "value_type": "cumulative"
-  },
-  "type": "graph",
-  "x-axis": true,
-  "xaxis": {
-    "show": true
-  },
-  "y-axis": true,
-  "yaxes": [
-    {
-      "format": "dB",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ]
-}
diff --git a/templates/ddash/graph_radio_txrxpower.j2 b/templates/ddash/graph_radio_txrxpower.j2
deleted file mode 100644
index e5c685076e9c0f31b92f3a8c2b470249023dfb5d..0000000000000000000000000000000000000000
--- a/templates/ddash/graph_radio_txrxpower.j2
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "title": "Radio | RX/TX Power",
-  "aliasColors": {},
-  "bars": false,
-  "datasource": null,
-  "fill": 1,
-  "grid": {
-    "threshold1": null,
-    "threshold1Color": "rgba(216, 200, 27, 0.27)",
-    "threshold2": null,
-    "threshold2Color": "rgba(234, 112, 112, 0.22)"
-  },
-  "id": "97bc1951-7466-43a8-b91d-22c470082dad",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "sortDesc": true,
-    "total": false,
-    "values": true,
-    "rightSide": true
-  },
-  "lines": true,
-  "linewidth": 2,
-  "links": [],
-  "nullPointMode": "connected",
-  "percentage": false,
-  "pointradius": 5,
-  "points": false,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "span": 6,
-  "stack": false,
-  "steppedLine": false,
-  "targets": [
-    {
-      "dateTimeColDataType": "ts",
-      "datetimeLoading": false,
-      "database": "noc",
-      "dateLoading": false,
-      "tableLoading": false,
-      "dateColDataType": "date",
-      "table": "interface",
-      "intervalFactor": 1,
-      "query": "SELECT \n    t, \n    groupArray((iface, \"TX Power\")) AS groupArr \nFROM (\n    SELECT $timeSeries as t, \n        arrayStringConcat(path,'.') as iface, \n        avg(tx_power) as `TX Power` \n    FROM \n        $table \n    WHERE \n        managed_object=$bi_id \n        and $timeFilter \n        and tx_power != -32555 \n        GROUP BY arrayStringConcat(path,'.'), t ORDER BY t) \nGROUP BY t \nORDER BY t ASC",
-      "refId": "A",
-      "resultFormat": "time_series"
-    },
-    {
-      "dateTimeColDataType": "ts",
-      "datetimeLoading": false,
-      "database": "noc",
-      "dateLoading": false,
-      "tableLoading": false,
-      "dateColDataType": "date",
-      "table": "interface",
-      "intervalFactor": 1,
-      "query": "SELECT \n    t, \n    groupArray((iface, \"RX Power\")) AS groupArr \nFROM (\n    SELECT $timeSeries as t, \n        arrayStringConcat(path,'.') as iface, \n        avg(rx_power) as `RX Power` \n    FROM \n        $table \n    WHERE \n        managed_object=$bi_id \n        and $timeFilter \n        and rx_power != -32555 \n        GROUP BY arrayStringConcat(path,'.'), t ORDER BY t) \nGROUP BY t \nORDER BY t ASC",
-      "refId": "A",
-      "resultFormat": "time_series"
-    }
-
-  ],
-  "timeFrom": null,
-  "timeShift": null,
-  "tooltip": {
-    "msResolution": false,
-    "shared": true,
-    "sort": 0,
-    "value_type": "cumulative"
-  },
-  "type": "graph",
-  "x-axis": true,
-  "xaxis": {
-    "show": true
-  },
-  "y-axis": true,
-  "yaxes": [
-    {
-      "format": "dBm",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ]
-}
diff --git a/templates/ddash/graph_rtt.j2 b/templates/ddash/graph_rtt.j2
index 70cca28d470e61b6f79c630010d417f60d0d4426..3403450c466c90fd62d75a2afb1a8faf45f6d072 100644
--- a/templates/ddash/graph_rtt.j2
+++ b/templates/ddash/graph_rtt.j2
@@ -8,7 +8,7 @@
   "renderer": "flot",
   "linewidth": 2,
   "steppedLine": false,
-  "id": "c406b161-14be-411b-8455-91c1c155e5bd",
+  "id": 1832359767154601,
   "fill": 1,
   "span": 6,
   "title": "Ping | RTT",
diff --git a/templates/ddash/graph_subscribers_ipoe.j2 b/templates/ddash/graph_subscribers_ipoe.j2
index 143184b20979ae443402f0ea71079d26e44f7c98..a7f0b6ba07c01a7cf16bc1ee6f8529a07bd07b6f 100644
--- a/templates/ddash/graph_subscribers_ipoe.j2
+++ b/templates/ddash/graph_subscribers_ipoe.j2
@@ -5,7 +5,7 @@
   "editable": true,
   "type": "graph",
   "isNew": true,
-  "id": "c92a3b61-4019-47d3-bec1-8a7d34b853af",
+  "id": 9823553137210257,
   "targets": [
     {
       "policy": "default",
diff --git a/templates/ddash/graph_subscribers_l2tp.j2 b/templates/ddash/graph_subscribers_l2tp.j2
index 3cee42a259bd81c5910ca8cc81c1950b887c5223..20ff15ff6b4f03c4e4f9a8254aaf838c5abb05a8 100644
--- a/templates/ddash/graph_subscribers_l2tp.j2
+++ b/templates/ddash/graph_subscribers_l2tp.j2
@@ -5,7 +5,7 @@
   "editable": true,
   "type": "graph",
   "isNew": true,
-  "id": "4a345d89-facd-4475-be61-4e9ebc9c14c6",
+  "id": 2272337617823215,
   "targets": [
     {
       "policy": "default",
diff --git a/templates/ddash/graph_subscribers_ppp.j2 b/templates/ddash/graph_subscribers_ppp.j2
index a479fdb195523b4602aa7d0a3c29a4f60766fd93..e5327c6b0b54e4fff929d2e9ffc6ac262427da2b 100644
--- a/templates/ddash/graph_subscribers_ppp.j2
+++ b/templates/ddash/graph_subscribers_ppp.j2
@@ -5,7 +5,7 @@
   "editable": true,
   "type": "graph",
   "isNew": true,
-  "id": "f8b38b89-497c-45c0-9222-1a4237ec06f7",
+  "id": 1021861001826413,
   "targets": [
     {
       "policy": "default",
diff --git a/templates/ddash/graph_subscribers_summary.j2 b/templates/ddash/graph_subscribers_summary.j2
index b6ca37cce24d62d959662805389f7eafe6a02424..d58748f9df40273045e75730e5898f8ce881a5fd 100644
--- a/templates/ddash/graph_subscribers_summary.j2
+++ b/templates/ddash/graph_subscribers_summary.j2
@@ -8,7 +8,7 @@
   "error": false,
   "fill": 1,
   "grid": {},
-  "id": "03fae50b-87a6-4de0-88ab-bb6f13565541",
+  "id": 1231781424785171,
   "legend": {
     "alignAsTable": true,
     "avg": true,
diff --git a/templates/ddash/graph_video_broadcast.j2 b/templates/ddash/graph_video_broadcast.j2
index 52fba78057b95477fec89be6ad7198cdec93e043..464b90d1afea0aa573cafc908258fcc92ae81760 100644
--- a/templates/ddash/graph_video_broadcast.j2
+++ b/templates/ddash/graph_video_broadcast.j2
@@ -19,7 +19,7 @@
   "expandFromQueryS": 600,
   "extendLastValue": true,
   "highlightOnMouseover": true,
-  "id": "9c8319ce-0616-400f-9c13-20e67c6291fc",
+  "id": 1947814524723819,
   "legendSortBy": "-ms",
   "lineColor": "rgba(128, 128, 128, 1.0)",
   "links": [],
diff --git a/templates/ddash/graph_video_record.j2 b/templates/ddash/graph_video_record.j2
index 1e48a85eace0c09c207ed55e28ced7f662f0b1bc..b2bfb58788de3f8034e24ca0f5e58b9348d61ea3 100644
--- a/templates/ddash/graph_video_record.j2
+++ b/templates/ddash/graph_video_record.j2
@@ -32,7 +32,7 @@
   ],
   "showLegend": true,
   "legendSortBy": "-ms",
-  "id": "9ff96872-0cf1-4758-8f20-ea6443cc7bf8",
+  "id": 1894159459612922,
   "writeLastValue": true,
   "span": 6,
   "title": "Video | Record",
diff --git a/templates/ddash/graph_video_record_drops.j2 b/templates/ddash/graph_video_record_drops.j2
index 3fa179d1361569a7d70143d1211a370158b888c2..d08ed386714ff775417f5f9ba75da43ed3a0b230 100644
--- a/templates/ddash/graph_video_record_drops.j2
+++ b/templates/ddash/graph_video_record_drops.j2
@@ -7,7 +7,7 @@
   "dashes": false,
   "datasource": null,
   "fill": 1,
-  "id": "98c53ac6-c22b-48de-9e96-048a5e0f9511",
+  "id": 1941723603313522,
   "legend": {
     "alignAsTable": true,
     "avg": true,
diff --git a/templates/ddash/graph_video_record_status.j2 b/templates/ddash/graph_video_record_status.j2
index 256413e9459865c2ee3f3ca87de903ebb7ef24cb..c9aca45cbd4c2d31ef0d23437cee571eb8e9c923 100644
--- a/templates/ddash/graph_video_record_status.j2
+++ b/templates/ddash/graph_video_record_status.j2
@@ -19,7 +19,7 @@
   "expandFromQueryS": 600,
   "extendLastValue": true,
   "highlightOnMouseover": true,
-  "id": "9ff96872-0cf1-4758-8f20-ea6443cc7bf8",
+  "id": 1631614619222519,
   "legendSortBy": "-ms",
   "lineColor": "rgba(128, 128, 128, 1.0)",
   "links": [],
diff --git a/templates/ddash/graph_video_recordingdrops.j2 b/templates/ddash/graph_video_recordingdrops.j2
index bb210a6423a236ae4460f14c1e7aee7d1e3960f1..8ceed3f234cab936681149c19426f97e93c3aeff 100644
--- a/templates/ddash/graph_video_recordingdrops.j2
+++ b/templates/ddash/graph_video_recordingdrops.j2
@@ -1,5 +1,5 @@
 {
-  "id": "dcefa995-9101-438e-b162-a7bf5728b8c5",
+  "id": 4521971148198018,
   "title": "Video | Recording Drops",
   "span": 6,
   "type": "graph",
diff --git a/templates/ddash/graph_video_upstreamconnected.j2 b/templates/ddash/graph_video_upstreamconnected.j2
index 7e077d139879e5d980a1b8141445c37959244878..0430fd60d097fa6b606ec506b9e69045ced14561 100644
--- a/templates/ddash/graph_video_upstreamconnected.j2
+++ b/templates/ddash/graph_video_upstreamconnected.j2
@@ -32,7 +32,7 @@
   ],
   "showLegend": true,
   "legendSortBy": "-ms",
-  "id": "fc04d1a6-a6d8-4fb2-835a-e1c220e9b072",
+  "id": 1699315114251220,
   "writeLastValue": true,
   "span": 6,
   "title": "Upstream status",
diff --git a/templates/ddash/panel_empty_container.j2 b/templates/ddash/panel_empty_container.j2
index 48f891ab2f009ac19aa89cbccd2b67e8fb62cd8f..c7ba898c4071e67b181816de647f3f619a58d895 100644
--- a/templates/ddash/panel_empty_container.j2
+++ b/templates/ddash/panel_empty_container.j2
@@ -1,5 +1,5 @@
 {
-  "id": "8a639eaa-a49c-4243-8742-f9c00fc44a57",
+  "id": 1262102282471817,
   "title": "",
   "span": 12,
   "type": "text",