diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json
index 061f4fee..a9862233 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Apache.json
@@ -109,7 +109,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -238,7 +237,6 @@
                   }
                 ]
               ],
-              "series": "$server.apache.requests",
               "tags": [
                 {
                   "key": "hostname",
@@ -353,7 +351,6 @@
                   }
                 ]
               ],
-              "series": "$server.apache.bytes",
               "tags": [
                 {
                   "key": "hostname",
@@ -468,7 +465,6 @@
                   }
                 ]
               ],
-              "series": "$server.apache.connections",
               "tags": [
                 {
                   "key": "hostname",
@@ -583,7 +579,6 @@
                   }
                 ]
               ],
-              "series": "$server.apache.connections",
               "tags": [
                 {
                   "key": "hostname",
@@ -685,7 +680,6 @@
                   }
                 ]
               ],
-              "series": "/$server.apache.workers/",
               "tags": [
                 {
                   "key": "hostname",
@@ -801,7 +795,6 @@
                   }
                 ]
               ],
-              "series": "$server.apache.idle_workers",
               "tags": [
                 {
                   "key": "hostname",
@@ -902,4 +895,4 @@
   "timezone": "browser",
   "title": "Apache",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json
index 49ebf9fb..2584415d 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph.json
@@ -105,7 +105,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.health/",
               "tags": [
                 {
                   "key": "hostname",
@@ -219,7 +218,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.quorum/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -319,7 +317,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.monitor/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -717,7 +714,6 @@
                   }
                 ]
               ],
-              "series": "/ceph.*.pool.total_bytes/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -766,7 +762,6 @@
                   }
                 ]
               ],
-              "series": "/ceph.*.pool.total_bytes/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -891,7 +886,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.pg.state/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1023,7 +1017,6 @@
                   }
                 ]
               ],
-              "series": "/ceph.*.pool.total_number/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1131,7 +1124,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.*\\.pool.$pool.bytes_used/",
               "tags": [
                 {
                   "key": "pool",
@@ -1189,7 +1181,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.*.pool.$pool.max_avail/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1315,7 +1306,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.pool.$pool.objects/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1454,7 +1444,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.pool.$pool.objects/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1572,7 +1561,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.pool.$pool.read_bytes_sec/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1630,7 +1618,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.pool.$pool.read_bytes_sec/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1757,7 +1744,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.pool.$pool.op_per_sec/",
               "tags": [
                 {
                   "key": "pool",
@@ -1896,7 +1882,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.pool.$pool.size/",
               "tags": [
                 {
                   "key": "cluster",
@@ -2005,7 +1990,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.pool.$pool.pg_num/",
               "tags": [
                 {
                   "key": "cluster",
@@ -2139,7 +2123,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.osd.up/",
               "tags": [
                 {
                   "key": "cluster",
@@ -2243,7 +2226,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.osd.down/",
               "tags": [
                 {
                   "key": "cluster",
@@ -2348,7 +2330,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.osd.up/",
               "tags": [
                 {
                   "key": "cluster",
@@ -2401,7 +2382,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.osd.up/",
               "tags": [
                 {
                   "key": "cluster",
@@ -2454,7 +2434,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.osd.up/",
               "tags": [
                 {
                   "key": "cluster",
@@ -2507,7 +2486,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-$cluster.osd.up/",
               "tags": [
                 {
                   "key": "cluster",
@@ -2621,7 +2599,6 @@
                   }
                 ]
               ],
-              "series": "merge(/ceph.cluster-$cluster.osd.$osd.used/)",
               "tags": [
                 {
                   "key": "cluster",
@@ -2676,7 +2653,6 @@
                   }
                 ]
               ],
-              "series": "merge(/ceph.cluster-$cluster.osd.$osd.used/)",
               "tags": [
                 {
                   "key": "cluster",
@@ -2804,7 +2780,6 @@
                   }
                 ]
               ],
-              "series": "merge(/ceph.cluster-$cluster.osd.$osd.apply_latency/)",
               "tags": [
                 {
                   "key": "cluster",
@@ -2929,7 +2904,6 @@
                   }
                 ]
               ],
-              "series": "merge(/ceph.cluster-$cluster.osd.$osd.commit_latency/)",
               "tags": [
                 {
                   "key": "cluster",
@@ -3106,4 +3080,4 @@
   "timezone": "browser",
   "title": "Ceph",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json
index 9cb1e20b..9bd2924e 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json
@@ -90,7 +90,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_wip/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -210,7 +209,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op$/",
               "tags": [
                 {
                   "key": "cluster",
@@ -329,7 +327,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_in_bytes/",
               "tags": [
                 {
                   "key": "cluster",
@@ -379,7 +376,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_out_bytes/",
               "tags": [
                 {
                   "key": "cluster",
@@ -501,7 +497,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_latency$/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -635,7 +630,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_r_out_bytes$/",
               "tags": [
                 {
                   "key": "cluster",
@@ -685,7 +679,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_r$/",
               "tags": [
                 {
                   "key": "cluster",
@@ -807,7 +800,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_r_latency$/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -864,7 +856,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_r_process_latency$/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -988,7 +979,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_w_in_bytes$/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1037,7 +1027,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_w_in_bytes$/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1086,7 +1075,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_w_in_bytes$/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1208,7 +1196,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_w_latency$/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1265,7 +1252,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_w_process_latency$/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1398,7 +1384,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_rw_in_bytes$/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1447,7 +1432,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_rw$/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1496,7 +1480,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_rw_rlat$/",
               "tags": [
                 {
                   "key": "cluster",
@@ -1618,7 +1601,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_rw_latency$/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1675,7 +1657,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.osd.op_rw_process_latency$/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1807,7 +1788,6 @@
                   }
                 ]
               ],
-              "series": "/$osd.*osd.recovery_ops/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1949,4 +1929,4 @@
   "timezone": "browser",
   "title": "Ceph OSD",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json
index c21ea109..d5058ac3 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Cinder.json
@@ -103,7 +103,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -236,7 +235,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -343,7 +341,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.GET.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -398,7 +395,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.POST.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -453,7 +449,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.PUT.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -508,7 +503,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.DELETE.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -630,7 +624,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.check_api/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -756,7 +749,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.2\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -812,7 +804,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.1\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -868,7 +859,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.3\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -924,7 +914,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.4\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -980,7 +969,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -1116,7 +1104,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.cinder-api.servers.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1242,7 +1229,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.cinder-api.servers.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1384,7 +1370,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1495,7 +1480,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1606,7 +1590,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1814,7 +1797,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1925,7 +1907,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2036,7 +2017,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2244,7 +2224,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2355,7 +2334,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2466,7 +2444,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2664,7 +2641,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.available/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2763,7 +2739,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.in-use/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2862,7 +2837,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.error/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2967,7 +2941,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.available/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3019,7 +2992,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.in-use/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3073,7 +3045,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.error/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3187,7 +3158,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.available/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3285,7 +3255,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.in-use/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3383,7 +3352,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.error/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3486,7 +3454,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.available/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3539,7 +3506,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.in-use/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3592,7 +3558,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.error/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3706,7 +3671,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volume_creation_time/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3823,7 +3787,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volume_creation_time/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3873,7 +3836,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volume_creation_time/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3923,7 +3885,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volume_creation_time/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4041,7 +4002,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.available/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4139,7 +4099,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.in-use/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4237,7 +4196,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.error/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4342,7 +4300,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.available/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4394,7 +4351,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.in-use/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4448,7 +4404,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes.error/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4562,7 +4517,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.available/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4660,7 +4614,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.in-use/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4758,7 +4711,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.error/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4861,7 +4813,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.available/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4913,7 +4864,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.in-user/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4965,7 +4915,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.volumes_size.error/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -5088,4 +5037,4 @@
   "timezone": "browser",
   "title": "Cinder",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json
index 4ce506a2..0a1b099d 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Elasticsearch.json
@@ -1592,4 +1592,4 @@
   "timezone": "browser",
   "title": "Elasticsearch",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json
index 41c239db..8f6c616a 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Glance.json
@@ -110,7 +110,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -244,7 +243,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -353,7 +351,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.GET.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -410,7 +407,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.POST.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -467,7 +463,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.PUT.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -524,7 +519,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.DELETE.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -581,7 +575,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.DELETE.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -704,7 +697,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.check_api/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -831,7 +823,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.2\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -888,7 +879,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.1\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -945,7 +935,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.3\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -1002,7 +991,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.4\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -1059,7 +1047,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -1202,7 +1189,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.glance-api.servers.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1311,7 +1297,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.glance-registry-api.servers.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1444,7 +1429,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.glance-api.servers.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1553,7 +1537,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.glance-registry-api.servers.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1684,7 +1667,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.images.public.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1794,7 +1776,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.images.private.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1905,7 +1886,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.images.public.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1963,7 +1943,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.images.private.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2091,7 +2070,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.images_size.public.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2201,7 +2179,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.images_size.private.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2310,7 +2287,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.images_size.public.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2368,7 +2344,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.images_size.private.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2496,7 +2471,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.snapshots.public.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2606,7 +2580,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.snapshots.private.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2716,7 +2689,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.snapshots.public.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2769,7 +2741,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.snapshots.private.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2891,7 +2862,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.snapshots_size.public.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3001,7 +2971,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.snapshots_size.private.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3110,7 +3079,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.snapshots_size.public.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3168,7 +3136,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.snapshots_size.private.active$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3297,4 +3264,4 @@
   "timezone": "browser",
   "title": "Glance",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json
index fa8134f8..7c4a10a4 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/HAProxy.json
@@ -103,7 +103,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -227,7 +226,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.pacemaker.resource.vip__public.active$/",
               "tags": [
                 {
                   "key": "hostname",
@@ -335,7 +333,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.pacemaker.resource.vip__public.active$/",
               "tags": [
                 {
                   "key": "hostname",
@@ -443,7 +440,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.haproxy.backend.$service.status/",
               "tags": [
                 {
                   "key": "hostname",
@@ -558,7 +554,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.haproxy.uptime_seconds/",
               "tags": [
                 {
                   "key": "hostname",
@@ -656,7 +651,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.connections",
               "tags": [
                 {
                   "key": "hostname",
@@ -704,7 +698,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.pipes_free",
               "tags": [
                 {
                   "key": "hostname",
@@ -754,7 +747,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.pipes_used",
               "tags": [
                 {
                   "key": "hostname",
@@ -803,7 +795,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.tasks",
               "tags": [
                 {
                   "key": "hostname",
@@ -925,7 +916,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.$frontback.$service.bytes_in/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -976,7 +966,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.$frontback.$service.bytes_out/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -1094,7 +1083,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_1xx",
               "tags": [
                 {
                   "key": "hostname",
@@ -1143,7 +1131,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_2xx",
               "tags": [
                 {
                   "key": "hostname",
@@ -1192,7 +1179,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_3xx",
               "tags": [
                 {
                   "key": "hostname",
@@ -1241,7 +1227,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_4xx",
               "tags": [
                 {
                   "key": "hostname",
@@ -1290,7 +1275,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_5xx",
               "tags": [
                 {
                   "key": "hostname",
@@ -1339,7 +1323,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_other",
               "tags": [
                 {
                   "key": "hostname",
@@ -1462,7 +1445,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.session_current",
               "tags": [
                 {
                   "key": "hostname",
@@ -1516,7 +1498,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.session_current",
               "tags": [
                 {
                   "key": "hostname",
@@ -1569,7 +1550,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.session_current",
               "tags": [
                 {
                   "key": "hostname",
@@ -1684,7 +1664,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.haproxy.$frontback.$service.error_/",
               "tags": [
                 {
                   "key": "hostname",
@@ -1733,7 +1712,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.haproxy.$frontback.$service.denied_/",
               "tags": [
                 {
                   "key": "hostname",
@@ -1783,7 +1761,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.haproxy.$frontback.$service.denied_/",
               "tags": [
                 {
                   "key": "hostname",
@@ -1913,7 +1890,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.$frontback.$service.bytes_in/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -1964,7 +1940,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.$frontback.$service.bytes_out/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -2082,7 +2057,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_1xx",
               "tags": [
                 {
                   "key": "hostname",
@@ -2131,7 +2105,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_2xx",
               "tags": [
                 {
                   "key": "hostname",
@@ -2180,7 +2153,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_3xx",
               "tags": [
                 {
                   "key": "hostname",
@@ -2229,7 +2201,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_4xx",
               "tags": [
                 {
                   "key": "hostname",
@@ -2278,7 +2249,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_5xx",
               "tags": [
                 {
                   "key": "hostname",
@@ -2327,7 +2297,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.response_other",
               "tags": [
                 {
                   "key": "hostname",
@@ -2450,7 +2419,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.session_current",
               "tags": [
                 {
                   "key": "hostname",
@@ -2504,7 +2472,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.session_current",
               "tags": [
                 {
                   "key": "hostname",
@@ -2557,7 +2524,6 @@
                   }
                 ]
               ],
-              "series": "$controller.haproxy.$frontback.$service.session_current",
               "tags": [
                 {
                   "key": "hostname",
@@ -2767,7 +2733,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.haproxy.backend.*.denied_/",
               "tags": [
                 {
                   "key": "hostname",
@@ -2818,7 +2783,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.haproxy.backend.*.denied_/",
               "tags": [
                 {
                   "key": "hostname",
@@ -2959,4 +2923,4 @@
   "timezone": "browser",
   "title": "HAProxy",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json
index 40613ba3..917c5364 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Heat.json
@@ -110,7 +110,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -244,7 +243,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -346,7 +344,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.GET.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -396,7 +393,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.POST.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -446,7 +442,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.PUT.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -496,7 +491,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.DELETE.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -619,7 +613,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.check_api/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -746,7 +739,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.2\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -803,7 +795,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.1\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -860,7 +851,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.3\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -917,7 +907,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.4\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -974,7 +963,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -1118,7 +1106,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.heat-api.servers.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1228,7 +1215,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.heat-cfn-api.servers.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1362,7 +1348,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.heat-api.servers.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1472,7 +1457,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.heat-api.servers.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1596,4 +1580,4 @@
   "timezone": "browser",
   "title": "Heat",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json
index bd915641..974584b4 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Hypervisor.json
@@ -97,7 +97,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.user/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -152,7 +151,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.idle/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -208,7 +206,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.interrupt/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -264,7 +261,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.nice/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -320,7 +316,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.system/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -376,7 +371,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.steal/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -432,7 +426,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.wait/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -566,7 +559,6 @@
                   }
                 ]
               ],
-              "series": "$hostname.memory.used",
               "tags": [
                 {
                   "key": "hostname",
@@ -623,7 +615,6 @@
                   }
                 ]
               ],
-              "series": "$hostname.memory.buffered",
               "tags": [
                 {
                   "key": "hostname",
@@ -680,7 +671,6 @@
                   }
                 ]
               ],
-              "series": "$hostname.memory.cached",
               "tags": [
                 {
                   "key": "hostname",
@@ -737,7 +727,6 @@
                   }
                 ]
               ],
-              "series": "$hostname.memory.free",
               "tags": [
                 {
                   "key": "hostname",
@@ -863,7 +852,6 @@
                   }
                 ]
               ],
-              "series": "select last(100.0*avail.value/(used.value + free.value)) from \"$server.fs.$mount.space.free\" as free inner join \"$server.fs.$mount.space.used\" as used where $timeFilter group by time($interval) order asc",
               "tags": [
                 {
                   "key": "hostname",
@@ -2277,4 +2265,4 @@
   "timezone": "browser",
   "title": "Hypervisor",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/InfluxDB.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/InfluxDB.json
index 0e64c8b2..e7c065b5 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/InfluxDB.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/InfluxDB.json
@@ -2528,4 +2528,4 @@
   "timezone": "browser",
   "title": "InfluxDB",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json
index b565e972..2c0073e5 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Keystone.json
@@ -110,7 +110,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -239,7 +238,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -349,7 +347,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.GET.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -406,7 +403,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.POST.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -457,7 +453,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.PUT.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -514,7 +509,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.DELETE.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -637,7 +631,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.check_api/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -758,7 +751,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.2\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -809,7 +801,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.1\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -860,7 +851,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.3\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -911,7 +901,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.4\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -962,7 +951,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -1105,7 +1093,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.keystone-public-api.servers.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1214,7 +1201,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.keystone-admin-api.servers.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1347,7 +1333,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.keystone-public-api.servers.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1456,7 +1441,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.keystone-admin-api.servers.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1586,7 +1570,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.keystone.users.enabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1685,7 +1668,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.keystone.users.enabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1807,7 +1789,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.keystone.tenants.enabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1912,7 +1893,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.keystone.tenants.enabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2036,4 +2016,4 @@
   "timezone": "browser",
   "title": "Keystone",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json
index 587f9472..1ac01b5f 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json
@@ -2235,4 +2235,4 @@
   "timezone": "browser",
   "title": "LMA self-monitoring",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json
index a17cb374..9be1ca23 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Main.json
@@ -102,7 +102,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -243,7 +242,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.keystone.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -384,7 +382,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.glance.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -525,7 +522,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.heat.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -666,7 +662,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -807,7 +802,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -958,7 +952,6 @@
                   }
                 ]
               ],
-              "series": "merge(/\\.rabbitmq.status$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1097,7 +1090,6 @@
                   }
                 ]
               ],
-              "series": "merge(/mysql.status$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1237,7 +1229,6 @@
                   }
                 ]
               ],
-              "series": "merge(/mysql.status$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1377,7 +1368,6 @@
                   }
                 ]
               ],
-              "series": "merge(/mysql.status$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1517,7 +1507,6 @@
                   }
                 ]
               ],
-              "series": "merge(/mysql.status$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1656,7 +1645,6 @@
                   }
                 ]
               ],
-              "series": "merge(/.*.openstack.nova.total_free_vcpus/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1705,7 +1693,6 @@
                   }
                 ]
               ],
-              "series": "merge(/.*.openstack.nova.total_used_vcpus/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1821,7 +1808,6 @@
                   }
                 ]
               ],
-              "series": "$server.openstack.nova.free_ram",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1870,7 +1856,6 @@
                   }
                 ]
               ],
-              "series": "$server.openstack.nova.used_ram",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1987,7 +1972,6 @@
                   }
                 ]
               ],
-              "series": "$server.openstack.nova.free_disk",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2036,7 +2020,6 @@
                   }
                 ]
               ],
-              "series": "$server.openstack.nova.used_disk",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2161,7 +2144,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.user/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -2209,7 +2191,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.idle/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -2258,7 +2239,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.interrupt/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -2307,7 +2287,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.nice/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -2356,7 +2335,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.system/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -2405,7 +2383,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.steal/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -2454,7 +2431,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.wait/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -2580,7 +2556,6 @@
                   }
                 ]
               ],
-              "series": "$controller.memory.used",
               "tags": [
                 {
                   "key": "hostname",
@@ -2630,7 +2605,6 @@
                   }
                 ]
               ],
-              "series": "$controller.memory.buffered",
               "tags": [
                 {
                   "key": "hostname",
@@ -2680,7 +2654,6 @@
                   }
                 ]
               ],
-              "series": "$controller.memory.cached",
               "tags": [
                 {
                   "key": "hostname",
@@ -2730,7 +2703,6 @@
                   }
                 ]
               ],
-              "series": "$controller.memory.free",
               "tags": [
                 {
                   "key": "hostname",
@@ -2849,7 +2821,6 @@
                   }
                 ]
               ],
-              "series": "select last(100.0*avail.value/(used.value + free.value)) from \"$server.fs.$mount.space.free\" as free inner join \"$server.fs.$mount.space.used\" as used where $timeFilter group by time($interval) order asc",
               "tags": [
                 {
                   "key": "hostname",
@@ -2970,7 +2941,6 @@
                   }
                 ]
               ],
-              "series": "merge(/ceph.cluster-ceph.health/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3087,7 +3057,6 @@
                   }
                 ]
               ],
-              "series": "",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3187,7 +3156,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$controller.ceph.cluster-ceph.pool.*.objects/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3287,7 +3255,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-ceph.osd.up/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3387,7 +3354,6 @@
                   }
                 ]
               ],
-              "series": "/$controller.ceph.cluster-ceph.osd.down/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3490,4 +3456,4 @@
   "timezone": "browser",
   "title": "Main",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json
index b9b7ee3b..a184deaf 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Memcached.json
@@ -109,7 +109,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -249,7 +248,6 @@
                   }
                 ]
               ],
-              "series": "/memcached.items.current/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -372,7 +370,6 @@
                   }
                 ]
               ],
-              "series": "/memcached.df.cache.used/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -502,7 +499,6 @@
                   }
                 ]
               ],
-              "series": "merge(/memcached.command.get/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -558,7 +554,6 @@
                   }
                 ]
               ],
-              "series": "merge(/memcached.command.set/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -681,7 +676,6 @@
                   }
                 ]
               ],
-              "series": "/memcached.df.cache.free/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -830,7 +824,6 @@
                   }
                 ]
               ],
-              "series": "/memcached.percent.hitratio/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -963,7 +956,6 @@
                   }
                 ]
               ],
-              "series": "merge(/memcached.ops.hits/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1020,7 +1012,6 @@
                   }
                 ]
               ],
-              "series": "merge(/memcached.ops.misses/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1075,7 +1066,6 @@
                   }
                 ]
               ],
-              "series": "merge(/memcached.ops.evictions/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1219,7 +1209,6 @@
                   }
                 ]
               ],
-              "series": "/memcached.octets.rx/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1275,7 +1264,6 @@
                   }
                 ]
               ],
-              "series": "/memcached.octets.rx/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1402,7 +1390,6 @@
                   }
                 ]
               ],
-              "series": "/memcached.connections/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1505,4 +1492,4 @@
   "timezone": "browser",
   "title": "Memcached",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json
index c7fa8255..fe06ec6f 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/MySQL.json
@@ -110,7 +110,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -240,7 +239,6 @@
                   }
                 ]
               ],
-              "series": "/$server.mysql_octets/",
               "tags": [
                 {
                   "key": "hostname",
@@ -288,7 +286,6 @@
                   }
                 ]
               ],
-              "series": "/$server.mysql_octets/",
               "tags": [
                 {
                   "key": "hostname",
@@ -404,7 +401,6 @@
                   }
                 ]
               ],
-              "series": "/$server.mysql_locks/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -457,7 +453,6 @@
                   }
                 ]
               ],
-              "series": "/$server.mysql_locks/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -578,7 +573,6 @@
                   }
                 ]
               ],
-              "series": "/$server.mysql_threads/",
               "tags": [
                 {
                   "key": "hostname",
@@ -626,7 +620,6 @@
                   }
                 ]
               ],
-              "series": "/$server.mysql_threads/",
               "tags": [
                 {
                   "key": "hostname",
@@ -674,7 +667,6 @@
                   }
                 ]
               ],
-              "series": "/$server.mysql_threads/",
               "tags": [
                 {
                   "key": "hostname",
@@ -790,7 +782,6 @@
                   }
                 ]
               ],
-              "series": "$server.mysql_commands.commit",
               "tags": [
                 {
                   "key": "hostname",
@@ -843,7 +834,6 @@
                   }
                 ]
               ],
-              "series": "$server.mysql_commands.delete",
               "tags": [
                 {
                   "key": "hostname",
@@ -896,7 +886,6 @@
                   }
                 ]
               ],
-              "series": "$server.mysql_commands.insert",
               "tags": [
                 {
                   "key": "hostname",
@@ -949,7 +938,6 @@
                   }
                 ]
               ],
-              "series": "$server.mysql_commands.select",
               "tags": [
                 {
                   "key": "hostname",
@@ -1002,7 +990,6 @@
                   }
                 ]
               ],
-              "series": "$server.mysql_commands.rollback",
               "tags": [
                 {
                   "key": "hostname",
@@ -1055,7 +1042,6 @@
                   }
                 ]
               ],
-              "series": "$server.mysql_commands.update",
               "tags": [
                 {
                   "key": "hostname",
@@ -1182,7 +1168,6 @@
                   }
                 ]
               ],
-              "series": "/$server.mysql_handler/",
               "tags": [
                 {
                   "key": "hostname",
@@ -1301,4 +1286,4 @@
   "timezone": "browser",
   "title": "MySQL",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json
index 725c1bcb..0221f89a 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json
@@ -110,7 +110,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -244,7 +243,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -352,7 +350,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.GET.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -408,7 +405,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.POST.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -464,7 +460,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.PUT.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -520,7 +515,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.DELETE.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -643,7 +637,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.check_api/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -770,7 +763,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.2\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -827,7 +819,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.1\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -884,7 +875,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.3\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -941,7 +931,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.4\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -998,7 +987,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -1141,7 +1129,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.neutron-api.servers.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1274,7 +1261,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.neutron-api.servers.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1417,7 +1403,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1529,7 +1514,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1641,7 +1625,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1850,7 +1833,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1962,7 +1944,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2074,7 +2055,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2283,7 +2263,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2395,7 +2374,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2507,7 +2485,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2716,7 +2693,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2828,7 +2804,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2940,7 +2915,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.agents.dhcp.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3147,7 +3121,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.networks$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3254,7 +3227,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.networks$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3371,7 +3343,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.subnets$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3472,7 +3443,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.subnets$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3589,7 +3559,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.ports$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3701,7 +3670,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.ports$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3819,7 +3787,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.routers$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3926,7 +3893,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.routers$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4043,7 +4009,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.floatingips$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4149,7 +4114,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.neutron.floatingips$/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4269,4 +4233,4 @@
   "timezone": "browser",
   "title": "Neutron",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json
index cf1dfe2e..8d042263 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Nova.json
@@ -110,7 +110,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -243,7 +242,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -352,7 +350,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.GET.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -409,7 +406,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.POST.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -466,7 +462,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.PUT.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -523,7 +518,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.DELETE.*/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -646,7 +640,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.check_api/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -773,7 +766,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.2\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -830,7 +822,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.1\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -887,7 +878,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.3\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -944,7 +934,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.4\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -1001,7 +990,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.openstack.cinder.http.*.5\\d\\d/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -1145,7 +1133,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.nova-api.servers.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1255,7 +1242,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.nova-metadata-api.servers.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1365,7 +1351,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.nova-novncproxy-websocket.servers.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1499,7 +1484,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.nova-api.servers.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1609,7 +1593,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.nova-metadata-api.servers.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1719,7 +1702,6 @@
                   }
                 ]
               ],
-              "series": "merge(/haproxy.backend.nova-novncproxy-websocket.servers.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1862,7 +1844,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.compute.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1974,7 +1955,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.compute.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2086,7 +2066,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.compute.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2295,7 +2274,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2407,7 +2385,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2519,7 +2496,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2728,7 +2704,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2840,7 +2815,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -2952,7 +2926,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3161,7 +3134,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3273,7 +3245,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3385,7 +3356,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3594,7 +3564,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.disabled/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3706,7 +3675,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.up/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -3818,7 +3786,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.services.scheduler.down/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4024,7 +3991,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.instances.active/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4129,7 +4095,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.instances.active/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4251,7 +4216,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.instances.error/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4355,7 +4319,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.instances.error/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4477,7 +4440,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.instance_creation_time/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4580,7 +4542,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.instance_creation_time/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4630,7 +4591,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.instance_creation_time/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4680,7 +4640,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.instance_creation_time/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4819,7 +4778,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.total_used_vcpus/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -4920,7 +4878,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.total_used_disk/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -5021,7 +4978,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.total_used_ram/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -5146,7 +5102,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.total_free_vcpus/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -5247,7 +5202,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.total_free_disk/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -5348,7 +5302,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.nova.total_free_ram/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -5463,4 +5416,4 @@
   "timezone": "browser",
   "title": "Nova",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json
index 0522b6d3..b12bd0f1 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/RabbitMQ.json
@@ -109,7 +109,6 @@
                   }
                 ]
               ],
-              "series": "merge(/openstack.cinder.status/)",
               "tags": [
                 {
                   "key": "environment_label",
@@ -240,7 +239,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.rabbitmq.running_nodes/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -347,7 +345,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.rabbitmq.connections/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -454,7 +451,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.rabbitmq.queues/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -580,7 +576,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.rabbitmq.consumers/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -686,7 +681,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.rabbitmq.exchanges/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -792,7 +786,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.rabbitmq.exchanges/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -904,7 +897,6 @@
                   }
                 ]
               ],
-              "series": "/$server.rabbitmq.messages/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1027,7 +1019,6 @@
                   }
                 ]
               ],
-              "series": "/$server.rabbitmq.memory/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1149,7 +1140,6 @@
                   }
                 ]
               ],
-              "series": "/$server.rabbitmq.memory/",
               "tags": [
                 {
                   "key": "environment_label",
@@ -1268,4 +1258,4 @@
   "timezone": "browser",
   "title": "RabbitMQ",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json
index 04122f86..478504a5 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/System.json
@@ -91,7 +91,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.user/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -139,7 +138,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.idle/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -188,7 +186,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.interrupt/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -237,7 +234,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.nice/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -286,7 +282,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.system/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -335,7 +330,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.steal/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -384,7 +378,6 @@
                   }
                 ]
               ],
-              "series": "merge(/$server.cpu.\\d+.wait/)",
               "tags": [
                 {
                   "key": "hostname",
@@ -510,7 +503,6 @@
                   }
                 ]
               ],
-              "series": "$server.memory.used",
               "tags": [
                 {
                   "key": "hostname",
@@ -560,7 +552,6 @@
                   }
                 ]
               ],
-              "series": "$server.memory.buffered",
               "tags": [
                 {
                   "key": "hostname",
@@ -610,7 +601,6 @@
                   }
                 ]
               ],
-              "series": "$server.memory.cached",
               "tags": [
                 {
                   "key": "hostname",
@@ -660,7 +650,6 @@
                   }
                 ]
               ],
-              "series": "$server.memory.free",
               "tags": [
                 {
                   "key": "hostname",
@@ -779,7 +768,6 @@
                   }
                 ]
               ],
-              "series": "$server.load.shortterm",
               "tags": [
                 {
                   "key": "hostname",
@@ -827,7 +815,6 @@
                   }
                 ]
               ],
-              "series": "$server.load.midterm",
               "tags": [
                 {
                   "key": "hostname",
@@ -875,7 +862,6 @@
                   }
                 ]
               ],
-              "series": "$server.load.longterm",
               "tags": [
                 {
                   "key": "hostname",
@@ -997,7 +983,6 @@
                   }
                 ]
               ],
-              "series": "$server.processes.state.blocked",
               "tags": [
                 {
                   "key": "hostname",
@@ -1050,7 +1035,6 @@
                   }
                 ]
               ],
-              "series": "$server.processes.state.paging",
               "tags": [
                 {
                   "key": "hostname",
@@ -1103,7 +1087,6 @@
                   }
                 ]
               ],
-              "series": "$server.processes.state.paging",
               "tags": [
                 {
                   "key": "hostname",
@@ -1156,7 +1139,6 @@
                   }
                 ]
               ],
-              "series": "$server.processes.state.paging",
               "tags": [
                 {
                   "key": "hostname",
@@ -1209,7 +1191,6 @@
                   }
                 ]
               ],
-              "series": "$server.processes.state.paging",
               "tags": [
                 {
                   "key": "hostname",
@@ -1262,7 +1243,6 @@
                   }
                 ]
               ],
-              "series": "$server.processes.state.paging",
               "tags": [
                 {
                   "key": "hostname",
@@ -1382,7 +1362,6 @@
                   }
                 ]
               ],
-              "series": "$server.processes.fork_rate",
               "tags": [
                 {
                   "key": "hostname",
@@ -1498,7 +1477,6 @@
                   }
                 ]
               ],
-              "series": "$server.users",
               "tags": [
                 {
                   "key": "hostname",
@@ -1606,7 +1584,6 @@
                   }
                 ]
               ],
-              "series": "select last(100.0*avail.value/(used.value + free.value)) from \"$server.fs.$mount.space.free\" as free inner join \"$server.fs.$mount.space.used\" as used where $timeFilter group by time($interval) order asc",
               "tags": [
                 {
                   "key": "hostname",
@@ -1720,7 +1697,6 @@
                   }
                 ]
               ],
-              "series": "$server.fs.$mount.space.used",
               "tags": [
                 {
                   "key": "hostname",
@@ -1775,7 +1751,6 @@
                   }
                 ]
               ],
-              "series": "$server.fs.$mount.space.reserved",
               "tags": [
                 {
                   "key": "hostname",
@@ -1830,7 +1805,6 @@
                   }
                 ]
               ],
-              "series": "$server.fs.$mount.space.free",
               "tags": [
                 {
                   "key": "hostname",
@@ -1954,7 +1928,6 @@
                   }
                 ]
               ],
-              "series": "select last(100.0*avail.value/(used.value + free.value)) from \"$server.fs.$mount.space.free\" as free inner join \"$server.fs.$mount.space.used\" as used where $timeFilter group by time($interval) order asc",
               "tags": [
                 {
                   "key": "hostname",
@@ -2068,7 +2041,6 @@
                   }
                 ]
               ],
-              "series": "$server.fs.$mount.inodes.used",
               "tags": [
                 {
                   "key": "hostname",
@@ -2123,7 +2095,6 @@
                   }
                 ]
               ],
-              "series": "$server.fs.$mount.inodes.reserved",
               "tags": [
                 {
                   "key": "hostname",
@@ -2178,7 +2149,6 @@
                   }
                 ]
               ],
-              "series": "$server.fs.$mount.inodes.free",
               "tags": [
                 {
                   "key": "hostname",
@@ -2311,7 +2281,6 @@
                   }
                 ]
               ],
-              "series": "$server.disk.$disk.disk_merged.read",
               "tags": [
                 {
                   "key": "hostname",
@@ -2364,7 +2333,6 @@
                   }
                 ]
               ],
-              "series": "$server.disk.$disk.disk_merged.write",
               "tags": [
                 {
                   "key": "hostname",
@@ -2485,7 +2453,6 @@
                   }
                 ]
               ],
-              "series": "$server.disk.$disk.disk_ops.read",
               "tags": [
                 {
                   "key": "hostname",
@@ -2538,7 +2505,6 @@
                   }
                 ]
               ],
-              "series": "$server.disk.$disk.disk_ops.write",
               "tags": [
                 {
                   "key": "hostname",
@@ -2659,7 +2625,6 @@
                   }
                 ]
               ],
-              "series": "$server.disk.$disk.disk_octets.read",
               "tags": [
                 {
                   "key": "hostname",
@@ -2712,7 +2677,6 @@
                   }
                 ]
               ],
-              "series": "$server.disk.$disk.disk_octets.write",
               "tags": [
                 {
                   "key": "hostname",
@@ -2842,7 +2806,6 @@
                   }
                 ]
               ],
-              "series": "/$server.net.$interface.if_octets.rx/",
               "tags": [
                 {
                   "key": "hostname",
@@ -2895,7 +2858,6 @@
                   }
                 ]
               ],
-              "series": "/$server.net.$interface.if_octets.tx/",
               "tags": [
                 {
                   "key": "hostname",
@@ -3016,7 +2978,6 @@
                   }
                 ]
               ],
-              "series": "/$server.net.$interface.if_packets.rx/",
               "tags": [
                 {
                   "key": "hostname",
@@ -3069,7 +3030,6 @@
                   }
                 ]
               ],
-              "series": "/$server.net.$interface.if_packets.tx/",
               "tags": [
                 {
                   "key": "hostname",
@@ -3190,7 +3150,6 @@
                   }
                 ]
               ],
-              "series": "/$server.net.$interface.if_errors.rx/",
               "tags": [
                 {
                   "key": "hostname",
@@ -3243,7 +3202,6 @@
                   }
                 ]
               ],
-              "series": "/$server.net.$interface.if_errors.tx/",
               "tags": [
                 {
                   "key": "hostname",
@@ -3373,7 +3331,6 @@
                   }
                 ]
               ],
-              "series": "$server.swap.used",
               "tags": [
                 {
                   "key": "hostname",
@@ -3421,7 +3378,6 @@
                   }
                 ]
               ],
-              "series": "$server.swap.cached",
               "tags": [
                 {
                   "key": "hostname",
@@ -3469,7 +3425,6 @@
                   }
                 ]
               ],
-              "series": "$server.swap.free",
               "tags": [
                 {
                   "key": "hostname",
@@ -3584,7 +3539,6 @@
                   }
                 ]
               ],
-              "series": "$server.swap_io.out",
               "tags": [
                 {
                   "key": "hostname",
@@ -3633,7 +3587,6 @@
                   }
                 ]
               ],
-              "series": "$server.swap_io.in",
               "tags": [
                 {
                   "key": "hostname",
@@ -3795,4 +3748,4 @@
   "timezone": "browser",
   "title": "System",
   "version": 3
-}
\ No newline at end of file
+}