Add CPU/RAM measurements collection

Add mechanism for CPU/RAM measurements collection from k8s nodes and from JMeter VM

Issue-ID: DCAEGEN2-608
Signed-off-by: Pawel <pawel.kasperkiewicz@nokia.com>
Change-Id: I78af2906254a19da383c7bae9ec919eadd326873

14 files changed, 6156 insertions, 3612 deletions

diff --git a/performanceTests/k8s/Makefile b/performanceTests/k8s/Makefile
index 86399cf0..bb9f061b 100644
--- a/performanceTests/k8s/Makefile
+++ b/performanceTests/k8s/Makefile
@@ -15,6 +15,10 @@ DASHBOARD_CONFIGMAP = dashboard.yaml
 #INFLUXDB configuration
 INFLUXDB_DIRECTORY = ./influxdb
 INFLUXDB_DEPLOYMENT = deployment.yaml
+INFLUXDB_CONFIGMAP = configmap.yaml
+
+#Node exporter configuration
+NODE_EXPORTER = node-exporter.yaml
 
 clear:
 	@echo "\n##### Delete configmaps and $(GRAFANA_DEPLOYMENT)(grafana, prometheus)#####"
@@ -25,6 +29,8 @@ clear:
 	kubectl delete -f $(PROMETHEUS_DIRECTORY)/$(PROMETHEUS_DEPLOYMENT) || true
 	kubectl delete -f $(PROMETHEUS_DIRECTORY)/$(PROMETHEUS_CONFIGMAP) || true
 	kubectl delete -f $(INFLUXDB_DIRECTORY)/$(INFLUXDB_DEPLOYMENT) || true
+	kubectl delete -f $(INFLUXDB_DIRECTORY)/$(INFLUXDB_CONFIGMAP) || true
+	kubectl delete -f $(NODE_EXPORTER) || true
 	@echo "##### DONE #####"
 
 create-configmaps:
@@ -32,6 +38,8 @@ create-configmaps:
 	kubectl apply -f $(PROMETHEUS_DIRECTORY)/$(PROMETHEUS_CONFIGMAP)
 	kubectl apply -f $(GRAFANA_DIRECTORY)/$(DATASOURCE_CONFIGMAP)
 	kubectl apply -f $(GRAFANA_DIRECTORY)/$(DASHBOARD_PROVIDER_CONFIGMAP)
+	kubectl apply -f $(INFLUXDB_DIRECTORY)/$(INFLUXDB_CONFIGMAP)
+	kubectl apply -f $(NODE_EXPORTER)
 	kubectl create configmap ves-grafana-dashboards -n onap --from-file grafana/dashboards/
 	@echo "##### DONE #####"
 
diff --git a/performanceTests/k8s/collectd/Makefile b/performanceTests/k8s/collectd/Makefile
new file mode 100644
index 00000000..38f2ebf8
--- /dev/null
+++ b/performanceTests/k8s/collectd/Makefile
@@ -0,0 +1,5 @@
+
+install-collectd:
+	@echo "\n##### Install collectd #####"
+	@bash config/install_collectd.sh
+	@echo "##### DONE #####"
diff --git a/performanceTests/k8s/collectd/config/collectd.conf b/performanceTests/k8s/collectd/config/collectd.conf
new file mode 100644
index 00000000..62ec70d5
--- /dev/null
+++ b/performanceTests/k8s/collectd/config/collectd.conf
@@ -0,0 +1,30 @@
+FQDNLookup true
+
+LoadPlugin syslog
+LoadPlugin cpu
+LoadPlugin memory
+LoadPlugin network
+
+<Plugin syslog>
+   LogLevel info
+</Plugin>
+
+<Plugin cpu>
+   ReportByCpu false
+   ReportByState false
+   ValuesPercentage true
+   Interval 5
+</Plugin>
+
+<Plugin memory>
+   ValuesAbsolute false
+   ValuesPercentage true
+</Plugin>
+
+<Plugin network>
+   Server "10.183.39.145" "30003"
+</Plugin>
+
+<Include "/etc/collectd/collectd.conf.d">
+   Filter "*.conf"
+</Include>
diff --git a/performanceTests/k8s/collectd/config/install_collectd.sh b/performanceTests/k8s/collectd/config/install_collectd.sh
new file mode 100755
index 00000000..dbc35fed
--- /dev/null
+++ b/performanceTests/k8s/collectd/config/install_collectd.sh
@@ -0,0 +1,6 @@
+#! /bin/bash
+
+sudo apt-get update && sudo apt-get install collectd -y
+sudo cp config/collectd.conf /etc/collectd/collectd.conf
+sudo service collectd restart
+
diff --git a/performanceTests/k8s/grafana/dashboards/dashboard.json b/performanceTests/k8s/grafana/dashboards/dashboard.json
index 91007b3b..f1a1ec03 100644
--- a/performanceTests/k8s/grafana/dashboards/dashboard.json
+++ b/performanceTests/k8s/grafana/dashboards/dashboard.json
@@ -1,80 +1,53 @@
 {
-  "__inputs": [
-  {
-    "name": "DS_PROMETHEUS",
-    "label": "Prometheus",
-    "description": "",
-    "type": "datasource",
-    "pluginId": "prometheus",
-    "pluginName": "Prometheus"
-  }
-  ],
-  "__requires": [
-  {
-    "type": "grafana",
-    "id": "grafana",
-    "name": "Grafana",
-    "version": "4.6.1"
-  },
-  {
-    "type": "panel",
-    "id": "graph",
-    "name": "Graph",
-    "version": ""
-  },
-  {
-    "type": "datasource",
-    "id": "prometheus",
-    "name": "Prometheus",
-    "version": "1.0.0"
-  },
-  {
-    "type": "panel",
-    "id": "singlestat",
-    "name": "Singlestat",
-    "version": ""
-  }
-  ],
   "annotations": {
     "list": [
-    {
-      "builtIn": 1,
-      "datasource": "-- Grafana --",
-      "enable": true,
-      "hide": true,
-      "iconColor": "rgba(0, 211, 255, 1)",
-      "limit": 100,
-      "name": "Annotations & Alerts",
-      "showIn": 0,
-      "type": "dashboard"
-    },
-    {
-      "datasource": "Prometheus",
-      "enable": true,
-      "expr": "resets(process_uptime_seconds{application=\"$application\", instance=\"$instance\"}[1m]) > 0",
-      "iconColor": "rgba(255, 96, 96, 1)",
-      "name": "Restart Detection",
-      "showIn": 0,
-      "step": "1m",
-      "tagKeys": "restart-tag",
-      "textFormat": "uptime reset",
-      "titleFormat": "Restart"
-    }
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "limit": 100,
+        "name": "Annotations & Alerts",
+        "showIn": 0,
+        "type": "dashboard"
+      },
+      {
+        "datasource": "Prometheus",
+        "enable": true,
+        "expr": "resets(process_uptime_seconds{application=\"$application\", instance=\"$instance\"}[1m]) > 0",
+        "iconColor": "rgba(255, 96, 96, 1)",
+        "name": "Restart Detection",
+        "showIn": 0,
+        "step": "1m",
+        "tagKeys": "restart-tag",
+        "textFormat": "uptime reset",
+        "titleFormat": "Restart"
+      }
     ]
   },
   "description": "Dashboard for Micrometer instrumented applications (Java, Spring Boot, Micronaut)",
   "editable": true,
   "gnetId": 4701,
   "graphTooltip": 1,
-  "hideControls": false,
-  "id": null,
+  "iteration": 1591286065121,
   "links": [],
-  "refresh": "30s",
-  "rows": [
-  {
-    "collapse": false,
-    "height": "100px",
-    "panels": [
+  "panels": [
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 125,
+      "panels": [],
+      "repeat": null,
+      "title": "Quick Facts",
+      "type": "row"
+    },
     {
       "cacheTimeout": null,
       "colorBackground": false,
@@ -88,6 +61,12 @@
       "decimals": 1,
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "s",
       "gauge": {
         "maxValue": 100,
@@ -96,20 +75,26 @@
         "thresholdLabels": false,
         "thresholdMarkers": true
       },
+      "gridPos": {
+        "h": 3,
+        "w": 6,
+        "x": 0,
+        "y": 1
+      },
       "height": "",
       "id": 63,
       "interval": null,
       "links": [],
       "mappingType": 1,
       "mappingTypes": [
-      {
-        "name": "value to text",
-        "value": 1
-      },
-      {
-        "name": "range to text",
-        "value": 2
-      }
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
       ],
       "maxDataPoints": 100,
       "nullPointMode": "connected",
@@ -119,42 +104,40 @@
       "prefix": "",
       "prefixFontSize": "70%",
       "rangeMaps": [
-      {
-        "from": "null",
-        "text": "N/A",
-        "to": "null"
-      }
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
       ],
-      "span": 3,
       "sparkline": {
         "fillColor": "rgba(31, 118, 189, 0.18)",
         "full": false,
         "lineColor": "rgb(31, 120, 193)",
         "show": false
       },
-      "tableColumn": "",
+      "tableColumn": "process_uptime_seconds{instance=\"dcae-ves-collector.onap:8443\", job=\"ves-collector\"}",
       "targets": [
-      {
-        "expr": "process_uptime_seconds{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "",
-        "metric": "",
-        "refId": "A",
-        "step": 14400
-      }
+        {
+          "expr": "process_uptime_seconds{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "metric": "",
+          "refId": "A",
+          "step": 14400
+        }
       ],
       "thresholds": "",
       "title": "Uptime",
-      "transparent": false,
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
-      {
-        "op": "=",
-        "text": "N/A",
-        "value": "null"
-      }
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
       ],
       "valueName": "current"
     },
@@ -171,6 +154,12 @@
       "decimals": null,
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "dateTimeAsIso",
       "gauge": {
         "maxValue": 100,
@@ -179,20 +168,26 @@
         "thresholdLabels": false,
         "thresholdMarkers": true
       },
+      "gridPos": {
+        "h": 3,
+        "w": 6,
+        "x": 6,
+        "y": 1
+      },
       "height": "",
       "id": 92,
       "interval": null,
       "links": [],
       "mappingType": 1,
       "mappingTypes": [
-      {
-        "name": "value to text",
-        "value": 1
-      },
-      {
-        "name": "range to text",
-        "value": 2
-      }
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
       ],
       "maxDataPoints": 100,
       "nullPointMode": "connected",
@@ -202,42 +197,40 @@
       "prefix": "",
       "prefixFontSize": "70%",
       "rangeMaps": [
-      {
-        "from": "null",
-        "text": "N/A",
-        "to": "null"
-      }
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
       ],
-      "span": 3,
       "sparkline": {
         "fillColor": "rgba(31, 118, 189, 0.18)",
         "full": false,
         "lineColor": "rgb(31, 120, 193)",
         "show": false
       },
-      "tableColumn": "",
+      "tableColumn": "{instance=\"dcae-ves-collector.onap:8443\", job=\"ves-collector\"}",
       "targets": [
-      {
-        "expr": "process_start_time_seconds{application=\"$application\", instance=\"$instance\"}*1000",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "",
-        "metric": "",
-        "refId": "A",
-        "step": 14400
-      }
+        {
+          "expr": "process_start_time_seconds{application=\"$application\", instance=\"$instance\"}*1000",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "metric": "",
+          "refId": "A",
+          "step": 14400
+        }
       ],
       "thresholds": "",
       "title": "Start time",
-      "transparent": false,
       "type": "singlestat",
       "valueFontSize": "70%",
       "valueMaps": [
-      {
-        "op": "=",
-        "text": "N/A",
-        "value": "null"
-      }
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
       ],
       "valueName": "current"
     },
@@ -254,6 +247,12 @@
       "decimals": 2,
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "percent",
       "gauge": {
         "maxValue": 100,
@@ -262,19 +261,25 @@
         "thresholdLabels": false,
         "thresholdMarkers": true
       },
+      "gridPos": {
+        "h": 3,
+        "w": 6,
+        "x": 12,
+        "y": 1
+      },
       "id": 65,
       "interval": null,
       "links": [],
       "mappingType": 1,
       "mappingTypes": [
-      {
-        "name": "value to text",
-        "value": 1
-      },
-      {
-        "name": "range to text",
-        "value": 2
-      }
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
       ],
       "maxDataPoints": 100,
       "nullPointMode": "connected",
@@ -284,13 +289,12 @@
       "prefix": "",
       "prefixFontSize": "70%",
       "rangeMaps": [
-      {
-        "from": "null",
-        "text": "N/A",
-        "to": "null"
-      }
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
       ],
-      "span": 3,
       "sparkline": {
         "fillColor": "rgba(31, 118, 189, 0.18)",
         "full": false,
@@ -299,25 +303,25 @@
       },
       "tableColumn": "",
       "targets": [
-      {
-        "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\",instance=\"$instance\", area=\"heap\"})",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "",
-        "refId": "A",
-        "step": 14400
-      }
+        {
+          "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\",instance=\"$instance\", area=\"heap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "refId": "A",
+          "step": 14400
+        }
       ],
       "thresholds": "70,90",
       "title": "Heap used",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
-      {
-        "op": "=",
-        "text": "N/A",
-        "value": "null"
-      }
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
       ],
       "valueName": "current"
     },
@@ -334,6 +338,12 @@
       "decimals": 2,
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "format": "percent",
       "gauge": {
         "maxValue": 100,
@@ -342,19 +352,25 @@
         "thresholdLabels": false,
         "thresholdMarkers": true
       },
+      "gridPos": {
+        "h": 3,
+        "w": 6,
+        "x": 18,
+        "y": 1
+      },
       "id": 75,
       "interval": null,
       "links": [],
       "mappingType": 2,
       "mappingTypes": [
-      {
-        "name": "value to text",
-        "value": 1
-      },
-      {
-        "name": "range to text",
-        "value": 2
-      }
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
       ],
       "maxDataPoints": 100,
       "nullPointMode": "connected",
@@ -364,18 +380,17 @@
       "prefix": "",
       "prefixFontSize": "70%",
       "rangeMaps": [
-      {
-        "from": "null",
-        "text": "N/A",
-        "to": "null"
-      },
-      {
-        "from": "-99999999999999999999999999999999",
-        "text": "N/A",
-        "to": "0"
-      }
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        },
+        {
+          "from": "-99999999999999999999999999999999",
+          "text": "N/A",
+          "to": "0"
+        }
       ],
-      "span": 3,
       "sparkline": {
         "fillColor": "rgba(31, 118, 189, 0.18)",
         "full": false,
@@ -384,52 +399,69 @@
       },
       "tableColumn": "",
       "targets": [
-      {
-        "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\",instance=\"$instance\", area=\"nonheap\"})",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "",
-        "refId": "A",
-        "step": 14400
-      }
+        {
+          "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\",instance=\"$instance\", area=\"nonheap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "refId": "A",
+          "step": 14400
+        }
       ],
       "thresholds": "70,90",
       "title": "Non-Heap used",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
-      {
-        "op": "=",
-        "text": "N/A",
-        "value": "null"
-      },
-      {
-        "op": "=",
-        "text": "x",
-        "value": ""
-      }
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        },
+        {
+          "op": "=",
+          "text": "x",
+          "value": ""
+        }
       ],
       "valueName": "current"
-    }
-    ],
-    "repeat": null,
-    "repeatIteration": null,
-    "repeatRowId": null,
-    "showTitle": true,
-    "title": "Quick Facts",
-    "titleSize": "h6"
-  },
-  {
-    "collapse": false,
-    "height": 250,
-    "panels": [
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 4
+      },
+      "id": 126,
+      "panels": [],
+      "repeat": null,
+      "title": "I/O Overview",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 0,
+        "y": 5
+      },
+      "hiddenSeries": false,
       "id": 111,
       "legend": {
         "avg": false,
@@ -444,26 +476,29 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\"}[1m]))",
-        "format": "time_series",
-        "intervalFactor": 1,
-        "legendFormat": "HTTP",
-        "refId": "A"
-      }
+        {
+          "expr": "sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\"}[1m]))",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "HTTP",
+          "refId": "A"
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Rate",
       "tooltip": {
@@ -480,24 +515,28 @@
         "values": []
       },
       "yaxes": [
-      {
-        "decimals": null,
-        "format": "ops",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": "0",
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "decimals": null,
+          "format": "ops",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
       "aliasColors": {
@@ -508,7 +547,21 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 6,
+        "y": 5
+      },
+      "hiddenSeries": false,
       "id": 112,
       "legend": {
         "avg": false,
@@ -523,26 +576,29 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\", status=~\"5..\"}[1m]))",
-        "format": "time_series",
-        "intervalFactor": 1,
-        "legendFormat": "HTTP - 5xx",
-        "refId": "A"
-      }
+        {
+          "expr": "sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\", status=~\"5..\"}[1m]))",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "HTTP - 5xx",
+          "refId": "A"
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Errors",
       "tooltip": {
@@ -559,24 +615,28 @@
         "values": []
       },
       "yaxes": [
-      {
-        "decimals": null,
-        "format": "ops",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": "0",
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "decimals": null,
+          "format": "ops",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
       "aliasColors": {},
@@ -584,7 +644,21 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 12,
+        "y": 5
+      },
+      "hiddenSeries": false,
       "id": 113,
       "legend": {
         "avg": false,
@@ -599,35 +673,38 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "sum(rate(http_server_requests_seconds_sum{application=\"$application\", instance=\"$instance\", status!~\"5..\"}[1m]))/sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\", status!~\"5..\"}[1m]))",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 1,
-        "legendFormat": "HTTP - AVG",
-        "refId": "A"
-      },
-      {
-        "expr": "max(http_server_requests_seconds_max{application=\"$application\", instance=\"$instance\", status!~\"5..\"})",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 1,
-        "legendFormat": "HTTP - MAX",
-        "refId": "B"
-      }
+        {
+          "expr": "sum(rate(http_server_requests_seconds_sum{application=\"$application\", instance=\"$instance\", status!~\"5..\"}[1m]))/sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\", status!~\"5..\"}[1m]))",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 1,
+          "legendFormat": "HTTP - AVG",
+          "refId": "A"
+        },
+        {
+          "expr": "max(http_server_requests_seconds_max{application=\"$application\", instance=\"$instance\", status!~\"5..\"})",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 1,
+          "legendFormat": "HTTP - MAX",
+          "refId": "B"
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Duration",
       "tooltip": {
@@ -644,23 +721,27 @@
         "values": []
       },
       "yaxes": [
-      {
-        "format": "s",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": "0",
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "format": "s",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
       "aliasColors": {},
@@ -669,7 +750,21 @@
       "dashes": false,
       "datasource": "Prometheus",
       "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 5
+      },
+      "hiddenSeries": false,
       "id": 119,
       "legend": {
         "alignAsTable": false,
@@ -685,67 +780,70 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "tomcat_threads_busy_threads{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 2,
-        "legendFormat": "TOMCAT - BSY",
-        "refId": "A"
-      },
-      {
-        "expr": "tomcat_threads_current_threads{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 2,
-        "legendFormat": "TOMCAT - CUR",
-        "refId": "B"
-      },
-      {
-        "expr": "tomcat_threads_config_max_threads{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 2,
-        "legendFormat": "TOMCAT - MAX",
-        "refId": "C"
-      },
-      {
-        "expr": "jetty_threads_busy{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 2,
-        "legendFormat": "JETTY - BSY",
-        "refId": "D"
-      },
-      {
-        "expr": "jetty_threads_current{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 2,
-        "legendFormat": "JETTY - CUR",
-        "refId": "E"
-      },
-      {
-        "expr": "jetty_threads_config_max{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 2,
-        "legendFormat": "JETTY - MAX",
-        "refId": "F"
-      }
+        {
+          "expr": "tomcat_threads_busy_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "TOMCAT - BSY",
+          "refId": "A"
+        },
+        {
+          "expr": "tomcat_threads_current_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "TOMCAT - CUR",
+          "refId": "B"
+        },
+        {
+          "expr": "tomcat_threads_config_max_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "TOMCAT - MAX",
+          "refId": "C"
+        },
+        {
+          "expr": "jetty_threads_busy{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "JETTY - BSY",
+          "refId": "D"
+        },
+        {
+          "expr": "jetty_threads_current{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "JETTY - CUR",
+          "refId": "E"
+        },
+        {
+          "expr": "jetty_threads_config_max{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "JETTY - MAX",
+          "refId": "F"
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Utilisation",
       "tooltip": {
@@ -762,36 +860,43 @@
         "values": []
       },
       "yaxes": [
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": "0",
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
-    }
-    ],
-    "repeat": null,
-    "repeatIteration": null,
-    "repeatRowId": null,
-    "showTitle": true,
-    "title": "I/O Overview",
-    "titleSize": "h6"
-  },
-  {
-    "collapse": false,
-    "height": "250px",
-    "panels": [
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 12
+      },
+      "id": 127,
+      "panels": [],
+      "repeat": null,
+      "title": "JVM Memory",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
@@ -800,7 +905,14 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
       "grid": {
         "leftLogBase": 1,
         "leftMax": null,
@@ -809,6 +921,13 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 0,
+        "y": 13
+      },
+      "hiddenSeries": false,
       "id": 24,
       "legend": {
         "avg": false,
@@ -823,44 +942,47 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "used",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      },
-      {
-        "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "committed",
-        "refId": "B",
-        "step": 2400
-      },
-      {
-        "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "max",
-        "refId": "C",
-        "step": 2400
-      }
+        {
+          "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "committed",
+          "refId": "B",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "refId": "C",
+          "step": 2400
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "JVM Heap",
       "tooltip": {
@@ -884,23 +1006,27 @@
         "short"
       ],
       "yaxes": [
-      {
-        "format": "bytes",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
       "aliasColors": {},
@@ -910,7 +1036,14 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
       "grid": {
         "leftLogBase": 1,
         "leftMax": null,
@@ -919,6 +1052,13 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 6,
+        "y": 13
+      },
+      "hiddenSeries": false,
       "id": 25,
       "legend": {
         "avg": false,
@@ -933,45 +1073,48 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
-        "format": "time_series",
-        "interval": "",
-        "intervalFactor": 2,
-        "legendFormat": "used",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      },
-      {
-        "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "committed",
-        "refId": "B",
-        "step": 2400
-      },
-      {
-        "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "max",
-        "refId": "C",
-        "step": 2400
-      }
+        {
+          "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "committed",
+          "refId": "B",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "refId": "C",
+          "step": 2400
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "JVM Non-Heap",
       "tooltip": {
@@ -995,23 +1138,27 @@
         "short"
       ],
       "yaxes": [
-      {
-        "format": "bytes",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
       "aliasColors": {},
@@ -1021,7 +1168,14 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
       "grid": {
         "leftLogBase": 1,
         "leftMax": null,
@@ -1030,6 +1184,13 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 12,
+        "y": 13
+      },
+      "hiddenSeries": false,
       "id": 26,
       "legend": {
         "alignAsTable": false,
@@ -1045,44 +1206,47 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\"})",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "used",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      },
-      {
-        "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\"})",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "committed",
-        "refId": "B",
-        "step": 2400
-      },
-      {
-        "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\"})",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "max",
-        "refId": "C",
-        "step": 2400
-      }
+        {
+          "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "committed",
+          "refId": "B",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "refId": "C",
+          "step": 2400
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "JVM Total",
       "tooltip": {
@@ -1106,23 +1270,27 @@
         "short"
       ],
       "yaxes": [
-      {
-        "format": "bytes",
-        "label": "",
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "format": "bytes",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
       "aliasColors": {},
@@ -1132,7 +1300,14 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
       "grid": {
         "leftLogBase": 1,
         "leftMax": null,
@@ -1141,6 +1316,13 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 13
+      },
+      "hiddenSeries": false,
       "id": 86,
       "legend": {
         "avg": false,
@@ -1155,50 +1337,53 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "process_memory_vss_bytes{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": true,
-        "intervalFactor": 2,
-        "legendFormat": "vss",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      },
-      {
-        "expr": "process_memory_rss_bytes{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "rss",
-        "refId": "B"
-      },
-      {
-        "expr": "process_memory_swap_bytes{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "swap",
-        "refId": "C"
-      },
-      {
-        "expr": "process_memory_rss_bytes{application=\"$application\", instance=\"$instance\"} + process_memory_swap_bytes{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "total",
-        "refId": "D"
-      }
+        {
+          "expr": "process_memory_vss_bytes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": true,
+          "intervalFactor": 2,
+          "legendFormat": "vss",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "process_memory_rss_bytes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "rss",
+          "refId": "B"
+        },
+        {
+          "expr": "process_memory_swap_bytes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "swap",
+          "refId": "C"
+        },
+        {
+          "expr": "process_memory_rss_bytes{application=\"$application\", instance=\"$instance\"} + process_memory_swap_bytes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "total",
+          "refId": "D"
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "JVM Process Memory",
       "tooltip": {
@@ -1222,36 +1407,43 @@
         "short"
       ],
       "yaxes": [
-      {
-        "format": "bytes",
-        "label": "",
-        "logBase": 1,
-        "max": null,
-        "min": "0",
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "format": "bytes",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
-    }
-    ],
-    "repeat": null,
-    "repeatIteration": null,
-    "repeatRowId": null,
-    "showTitle": true,
-    "title": "JVM Memory",
-    "titleSize": "h6"
-  },
-  {
-    "collapse": false,
-    "height": 250,
-    "panels": [
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 20
+      },
+      "id": 128,
+      "panels": [],
+      "repeat": null,
+      "title": "JVM Misc",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
@@ -1260,7 +1452,14 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
       "grid": {
         "leftLogBase": 1,
         "leftMax": null,
@@ -1269,6 +1468,13 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 0,
+        "y": 21
+      },
+      "hiddenSeries": false,
       "id": 106,
       "legend": {
         "avg": false,
@@ -1283,45 +1489,48 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "system_cpu_usage{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 1,
-        "legendFormat": "system",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      },
-      {
-        "expr": "process_cpu_usage{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 1,
-        "legendFormat": "process",
-        "refId": "B"
-      },
-      {
-        "expr": "avg_over_time(process_cpu_usage{application=\"$application\", instance=\"$instance\"}[1h])",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 1,
-        "legendFormat": "process-1h",
-        "refId": "C"
-      }
+        {
+          "expr": "system_cpu_usage{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 1,
+          "legendFormat": "system",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "process_cpu_usage{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 1,
+          "legendFormat": "process",
+          "refId": "B"
+        },
+        {
+          "expr": "avg_over_time(process_cpu_usage{application=\"$application\", instance=\"$instance\"}[1h])",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 1,
+          "legendFormat": "process-1h",
+          "refId": "C"
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "CPU Usage",
       "tooltip": {
@@ -1345,24 +1554,28 @@
         "short"
       ],
       "yaxes": [
-      {
-        "decimals": 1,
-        "format": "percentunit",
-        "label": "",
-        "logBase": 1,
-        "max": "1",
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "decimals": 1,
+          "format": "percentunit",
+          "label": "",
+          "logBase": 1,
+          "max": "1",
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
       "aliasColors": {},
@@ -1372,7 +1585,14 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
       "grid": {
         "leftLogBase": 1,
         "leftMax": null,
@@ -1381,6 +1601,13 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 6,
+        "y": 21
+      },
+      "hiddenSeries": false,
       "id": 93,
       "legend": {
         "avg": false,
@@ -1395,35 +1622,38 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "system_load_average_1m{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "system-1m",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      },
-      {
-        "expr": "system_cpu_count{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "cpus",
-        "refId": "B"
-      }
+        {
+          "expr": "system_load_average_1m{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "system-1m",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "system_cpu_count{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "cpus",
+          "refId": "B"
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Load",
       "tooltip": {
@@ -1447,24 +1677,28 @@
         "short"
       ],
       "yaxes": [
-      {
-        "decimals": 1,
-        "format": "short",
-        "label": "",
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "decimals": 1,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
       "aliasColors": {},
@@ -1474,7 +1708,14 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
       "grid": {
         "leftLogBase": 1,
         "leftMax": null,
@@ -1483,6 +1724,13 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 12,
+        "y": 21
+      },
+      "hiddenSeries": false,
       "id": 32,
       "legend": {
         "avg": false,
@@ -1497,54 +1745,57 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "jvm_threads_live_threads{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "live",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      },
-      {
-        "expr": "jvm_threads_daemon_threads{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "daemon",
-        "metric": "",
-        "refId": "B",
-        "step": 2400
-      },
-      {
-        "expr": "jvm_threads_peak_threads{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "peak",
-        "refId": "C",
-        "step": 2400
-      },
-      {
-        "expr": "process_threads{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "interval": "",
-        "intervalFactor": 2,
-        "legendFormat": "process",
-        "refId": "D",
-        "step": 2400
-      }
+        {
+          "expr": "jvm_threads_live_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "live",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "jvm_threads_daemon_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "daemon",
+          "metric": "",
+          "refId": "B",
+          "step": 2400
+        },
+        {
+          "expr": "jvm_threads_peak_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "peak",
+          "refId": "C",
+          "step": 2400
+        },
+        {
+          "expr": "process_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "process",
+          "refId": "D",
+          "step": 2400
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Threads",
       "tooltip": {
@@ -1568,24 +1819,28 @@
         "short"
       ],
       "yaxes": [
-      {
-        "decimals": 0,
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
       "aliasColors": {
@@ -1600,7 +1855,21 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 21
+      },
+      "hiddenSeries": false,
       "id": 124,
       "legend": {
         "alignAsTable": false,
@@ -1617,26 +1886,29 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "jvm_threads_states_threads{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "{{state}}",
-        "refId": "A"
-      }
+        {
+          "expr": "jvm_threads_states_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "{{state}}",
+          "refId": "A"
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Thread States",
       "tooltip": {
@@ -1653,23 +1925,27 @@
         "values": []
       },
       "yaxes": [
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
       "aliasColors": {
@@ -1685,7 +1961,14 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
       "grid": {
         "leftLogBase": 1,
         "leftMax": null,
@@ -1694,7 +1977,14 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 18,
+        "x": 0,
+        "y": 28
+      },
       "height": "",
+      "hiddenSeries": false,
       "id": 91,
       "legend": {
         "alignAsTable": false,
@@ -1713,38 +2003,41 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": true,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [
-      {
-        "alias": "error",
-        "yaxis": 1
-      },
-      {
-        "alias": "warn",
-        "yaxis": 1
-      }
+        {
+          "alias": "error",
+          "yaxis": 1
+        },
+        {
+          "alias": "warn",
+          "yaxis": 1
+        }
       ],
       "spaceLength": 10,
-      "span": 9,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "increase(logback_events_total{application=\"$application\", instance=\"$instance\"}[1m])",
-        "format": "time_series",
-        "interval": "",
-        "intervalFactor": 2,
-        "legendFormat": "{{level}}",
-        "metric": "",
-        "refId": "A",
-        "step": 1200
-      }
+        {
+          "expr": "increase(logback_events_total{application=\"$application\", instance=\"$instance\"}[1m])",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "{{level}}",
+          "metric": "",
+          "refId": "A",
+          "step": 1200
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Log Events",
       "tooltip": {
@@ -1753,7 +2046,6 @@
         "sort": 0,
         "value_type": "individual"
       },
-      "transparent": false,
       "type": "graph",
       "x-axis": true,
       "xaxis": {
@@ -1769,24 +2061,28 @@
         "short"
       ],
       "yaxes": [
-      {
-        "decimals": 0,
-        "format": "opm",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": "0",
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "decimals": 0,
+          "format": "opm",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
       "aliasColors": {},
@@ -1796,7 +2092,14 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "fillGradient": 0,
       "grid": {
         "leftLogBase": 1,
         "leftMax": null,
@@ -1805,6 +2108,13 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 28
+      },
+      "hiddenSeries": false,
       "id": 61,
       "legend": {
         "avg": false,
@@ -1819,39 +2129,42 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "process_files_open_files{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 2,
-        "legendFormat": "open",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      },
-      {
-        "expr": "process_files_max_files{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 2,
-        "legendFormat": "max",
-        "metric": "",
-        "refId": "B",
-        "step": 2400
-      }
+        {
+          "expr": "process_files_open_files{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "open",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "process_files_max_files{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "B",
+          "step": 2400
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "File Descriptors",
       "tooltip": {
@@ -1875,37 +2188,44 @@
         "short"
       ],
       "yaxes": [
-      {
-        "decimals": 0,
-        "format": "short",
-        "label": null,
-        "logBase": 10,
-        "max": null,
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 10,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
-    }
-    ],
-    "repeat": null,
-    "repeatIteration": null,
-    "repeatRowId": null,
-    "showTitle": true,
-    "title": "JVM Misc",
-    "titleSize": "h6"
-  },
-  {
-    "collapse": false,
-    "height": "250px",
-    "panels": [
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 35
+      },
+      "id": 129,
+      "panels": [],
+      "repeat": "persistence_counts",
+      "title": "JVM Memory Pools (Heap)",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
@@ -1914,6 +2234,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "grid": {
         "leftLogBase": 1,
@@ -1923,6 +2249,12 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 36
+      },
       "id": 3,
       "legend": {
         "alignAsTable": false,
@@ -1938,52 +2270,200 @@
       "lines": true,
       "linewidth": 1,
       "links": [],
-      "minSpan": 4,
+      "maxPerRow": 3,
       "nullPointMode": "null",
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "repeat": "jvm_memory_pool_heap",
+      "scopedVars": {
+        "jvm_memory_pool_heap": {
+          "selected": false,
+          "text": "Eden Space",
+          "value": "Eden Space"
+        }
+      },
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 4,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
-        "format": "time_series",
-        "hide": false,
-        "interval": "",
-        "intervalFactor": 2,
-        "legendFormat": "used",
-        "metric": "",
-        "refId": "A",
-        "step": 1800
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "$jvm_memory_pool_heap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
       },
-      {
-        "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
-        "format": "time_series",
-        "hide": false,
-        "interval": "",
-        "intervalFactor": 2,
-        "legendFormat": "commited",
-        "metric": "",
-        "refId": "B",
-        "step": 1800
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
       },
-      {
-        "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
-        "format": "time_series",
-        "hide": false,
-        "interval": "",
-        "intervalFactor": 2,
-        "legendFormat": "max",
-        "metric": "",
-        "refId": "C",
-        "step": 1800
-      }
+      "y-axis": true,
+      "y_formats": [
+        "mbytes",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ]
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 36
+      },
+      "id": 134,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatIteration": 1591286065121,
+      "repeatPanelId": 3,
+      "scopedVars": {
+        "jvm_memory_pool_heap": {
+          "selected": false,
+          "text": "Survivor Space",
+          "value": "Survivor Space"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
@@ -2010,36 +2490,181 @@
         "short"
       ],
       "yaxes": [
-      {
-        "format": "bytes",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ]
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      }
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 16,
+        "y": 36
+      },
+      "id": 135,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatIteration": 1591286065121,
+      "repeatPanelId": 3,
+      "scopedVars": {
+        "jvm_memory_pool_heap": {
+          "selected": false,
+          "text": "Tenured Gen",
+          "value": "Tenured Gen"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "$jvm_memory_pool_heap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "mbytes",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
       ]
-    }
-    ],
-    "repeat": "persistence_counts",
-    "repeatIteration": null,
-    "repeatRowId": null,
-    "showTitle": true,
-    "title": "JVM Memory Pools (Heap)",
-    "titleSize": "h6"
-  },
-  {
-    "collapse": false,
-    "height": 250,
-    "panels": [
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 43
+      },
+      "id": 130,
+      "panels": [],
+      "repeat": null,
+      "title": "JVM Memory Pools (Non-Heap)",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
@@ -2048,6 +2673,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "grid": {
         "leftLogBase": 1,
@@ -2057,6 +2688,12 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 44
+      },
       "id": 78,
       "legend": {
         "alignAsTable": false,
@@ -2072,52 +2709,200 @@
       "lines": true,
       "linewidth": 1,
       "links": [],
-      "minSpan": 4,
+      "maxPerRow": 3,
       "nullPointMode": "null",
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
       "repeat": "jvm_memory_pool_nonheap",
+      "scopedVars": {
+        "jvm_memory_pool_nonheap": {
+          "selected": false,
+          "text": "Metaspace",
+          "value": "Metaspace"
+        }
+      },
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 4,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
-        "format": "time_series",
-        "hide": false,
-        "interval": "",
-        "intervalFactor": 2,
-        "legendFormat": "used",
-        "metric": "",
-        "refId": "A",
-        "step": 1800
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "$jvm_memory_pool_nonheap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
       },
-      {
-        "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
-        "format": "time_series",
-        "hide": false,
-        "interval": "",
-        "intervalFactor": 2,
-        "legendFormat": "commited",
-        "metric": "",
-        "refId": "B",
-        "step": 1800
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
       },
-      {
-        "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
-        "format": "time_series",
-        "hide": false,
-        "interval": "",
-        "intervalFactor": 2,
-        "legendFormat": "max",
-        "metric": "",
-        "refId": "C",
-        "step": 1800
-      }
+      "y-axis": true,
+      "y_formats": [
+        "mbytes",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ]
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 44
+      },
+      "id": 136,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatIteration": 1591286065121,
+      "repeatPanelId": 78,
+      "scopedVars": {
+        "jvm_memory_pool_nonheap": {
+          "selected": false,
+          "text": "Compressed Class Space",
+          "value": "Compressed Class Space"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
@@ -2144,43 +2929,484 @@
         "short"
       ],
       "yaxes": [
-      {
-        "format": "bytes",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ]
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      }
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 16,
+        "y": 44
+      },
+      "id": 137,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatIteration": 1591286065121,
+      "repeatPanelId": 78,
+      "scopedVars": {
+        "jvm_memory_pool_nonheap": {
+          "selected": false,
+          "text": "CodeHeap 'profiled nmethods'",
+          "value": "CodeHeap 'profiled nmethods'"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "$jvm_memory_pool_nonheap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "mbytes",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
       ]
-    }
-    ],
-    "repeat": null,
-    "repeatIteration": null,
-    "repeatRowId": null,
-    "showTitle": true,
-    "title": "JVM Memory Pools (Non-Heap)",
-    "titleSize": "h6"
-  },
-  {
-    "collapse": false,
-    "height": 250,
-    "panels": [
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 51
+      },
+      "id": 138,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatIteration": 1591286065121,
+      "repeatPanelId": 78,
+      "scopedVars": {
+        "jvm_memory_pool_nonheap": {
+          "selected": false,
+          "text": "CodeHeap 'non-profiled nmethods'",
+          "value": "CodeHeap 'non-profiled nmethods'"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "$jvm_memory_pool_nonheap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "mbytes",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ]
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 51
+      },
+      "id": 139,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatIteration": 1591286065121,
+      "repeatPanelId": 78,
+      "scopedVars": {
+        "jvm_memory_pool_nonheap": {
+          "selected": false,
+          "text": "CodeHeap 'non-nmethods'",
+          "value": "CodeHeap 'non-nmethods'"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=~\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "$jvm_memory_pool_nonheap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "mbytes",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ]
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 58
+      },
+      "id": 131,
+      "panels": [],
+      "repeat": null,
+      "title": "Garbage Collection",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 59
+      },
       "id": 98,
       "legend": {
         "avg": false,
@@ -2201,18 +3427,17 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 4,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "rate(jvm_gc_pause_seconds_count{application=\"$application\", instance=\"$instance\"}[1m])",
-        "format": "time_series",
-        "hide": false,
-        "intervalFactor": 1,
-        "legendFormat": "{{action}} ({{cause}})",
-        "refId": "A"
-      }
+        {
+          "expr": "rate(jvm_gc_pause_seconds_count{application=\"$application\", instance=\"$instance\"}[1m])",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 1,
+          "legendFormat": "{{action}} ({{cause}})",
+          "refId": "A"
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
@@ -2232,22 +3457,22 @@
         "values": []
       },
       "yaxes": [
-      {
-        "format": "ops",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": "0",
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": "",
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      }
+        {
+          "format": "ops",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
       ]
     },
     {
@@ -2256,7 +3481,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 59
+      },
       "id": 101,
       "legend": {
         "avg": false,
@@ -2277,28 +3514,27 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 4,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "rate(jvm_gc_pause_seconds_sum{application=\"$application\", instance=\"$instance\"}[1m])/rate(jvm_gc_pause_seconds_count{application=\"$application\", instance=\"$instance\"}[1m])",
-        "format": "time_series",
-        "hide": false,
-        "instant": false,
-        "intervalFactor": 1,
-        "legendFormat": "avg {{action}} ({{cause}})",
-        "refId": "A"
-      },
-      {
-        "expr": "jvm_gc_pause_seconds_max{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "hide": false,
-        "instant": false,
-        "intervalFactor": 1,
-        "legendFormat": "max {{action}} ({{cause}})",
-        "refId": "B"
-      }
+        {
+          "expr": "rate(jvm_gc_pause_seconds_sum{application=\"$application\", instance=\"$instance\"}[1m])/rate(jvm_gc_pause_seconds_count{application=\"$application\", instance=\"$instance\"}[1m])",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "intervalFactor": 1,
+          "legendFormat": "avg {{action}} ({{cause}})",
+          "refId": "A"
+        },
+        {
+          "expr": "jvm_gc_pause_seconds_max{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "intervalFactor": 1,
+          "legendFormat": "max {{action}} ({{cause}})",
+          "refId": "B"
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
@@ -2318,22 +3554,22 @@
         "values": []
       },
       "yaxes": [
-      {
-        "format": "s",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": "0",
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": "",
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      }
+        {
+          "format": "s",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
       ]
     },
     {
@@ -2342,7 +3578,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "Prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 16,
+        "y": 59
+      },
       "id": 99,
       "legend": {
         "avg": false,
@@ -2363,26 +3611,25 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 4,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "rate(jvm_gc_memory_allocated_bytes_total{application=\"$application\", instance=\"$instance\"}[1m])",
-        "format": "time_series",
-        "interval": "",
-        "intervalFactor": 1,
-        "legendFormat": "allocated",
-        "refId": "A"
-      },
-      {
-        "expr": "rate(jvm_gc_memory_promoted_bytes_total{application=\"$application\", instance=\"$instance\"}[1m])",
-        "format": "time_series",
-        "interval": "",
-        "intervalFactor": 1,
-        "legendFormat": "promoted",
-        "refId": "B"
-      }
+        {
+          "expr": "rate(jvm_gc_memory_allocated_bytes_total{application=\"$application\", instance=\"$instance\"}[1m])",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "allocated",
+          "refId": "A"
+        },
+        {
+          "expr": "rate(jvm_gc_memory_promoted_bytes_total{application=\"$application\", instance=\"$instance\"}[1m])",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "promoted",
+          "refId": "B"
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
@@ -2402,36 +3649,39 @@
         "values": []
       },
       "yaxes": [
-      {
-        "format": "Bps",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": "0",
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      }
+        {
+          "format": "Bps",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
       ]
-    }
-    ],
-    "repeat": null,
-    "repeatIteration": null,
-    "repeatRowId": null,
-    "showTitle": true,
-    "title": "Garbage Collection",
-    "titleSize": "h6"
-  },
-  {
-    "collapse": false,
-    "height": "250px",
-    "panels": [
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 66
+      },
+      "id": 132,
+      "panels": [],
+      "repeat": null,
+      "title": "Classloading",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
@@ -2440,6 +3690,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "grid": {
         "leftLogBase": 1,
@@ -2449,6 +3705,12 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 0,
+        "y": 67
+      },
       "id": 37,
       "legend": {
         "avg": false,
@@ -2469,19 +3731,18 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 6,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "jvm_classes_loaded_classes{application=\"$application\", instance=\"$instance\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "loaded",
-        "metric": "",
-        "refId": "A",
-        "step": 1200
-      }
+        {
+          "expr": "jvm_classes_loaded_classes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "loaded",
+          "metric": "",
+          "refId": "A",
+          "step": 1200
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
@@ -2508,22 +3769,22 @@
         "short"
       ],
       "yaxes": [
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      }
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
       ]
     },
     {
@@ -2534,6 +3795,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "grid": {
         "leftLogBase": 1,
@@ -2543,6 +3810,12 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 12,
+        "y": 67
+      },
       "id": 38,
       "legend": {
         "avg": false,
@@ -2563,21 +3836,20 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 6,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "delta(jvm_classes_loaded_classes{application=\"$application\",instance=\"$instance\"}[1m])",
-        "format": "time_series",
-        "hide": false,
-        "interval": "",
-        "intervalFactor": 1,
-        "legendFormat": "delta-1m",
-        "metric": "",
-        "refId": "A",
-        "step": 1200
-      }
+        {
+          "expr": "delta(jvm_classes_loaded_classes{application=\"$application\",instance=\"$instance\"}[1m])",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "delta-1m",
+          "metric": "",
+          "refId": "A",
+          "step": 1200
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
@@ -2604,37 +3876,40 @@
         "short"
       ],
       "yaxes": [
-      {
-        "decimals": null,
-        "format": "short",
-        "label": "",
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      }
+        {
+          "decimals": null,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
       ]
-    }
-    ],
-    "repeat": null,
-    "repeatIteration": null,
-    "repeatRowId": null,
-    "showTitle": true,
-    "title": "Classloading",
-    "titleSize": "h6"
-  },
-  {
-    "collapse": false,
-    "height": "250px",
-    "panels": [
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 74
+      },
+      "id": 133,
+      "panels": [],
+      "repeat": null,
+      "title": "Buffer Pools",
+      "type": "row"
+    },
     {
       "aliasColors": {},
       "bars": false,
@@ -2643,6 +3918,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "grid": {
         "leftLogBase": 1,
@@ -2652,6 +3933,12 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 0,
+        "y": 75
+      },
       "id": 33,
       "legend": {
         "avg": false,
@@ -2672,28 +3959,27 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "jvm_buffer_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "used",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      },
-      {
-        "expr": "jvm_buffer_total_capacity_bytes{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "capacity",
-        "metric": "",
-        "refId": "B",
-        "step": 2400
-      }
+        {
+          "expr": "jvm_buffer_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "jvm_buffer_total_capacity_bytes{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "capacity",
+          "metric": "",
+          "refId": "B",
+          "step": 2400
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
@@ -2720,22 +4006,22 @@
         "short"
       ],
       "yaxes": [
-      {
-        "format": "bytes",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      }
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
       ]
     },
     {
@@ -2746,6 +4032,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "grid": {
         "leftLogBase": 1,
@@ -2755,6 +4047,12 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 6,
+        "y": 75
+      },
       "id": 83,
       "legend": {
         "avg": false,
@@ -2775,19 +4073,18 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "jvm_buffer_count_buffers{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "count",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      }
+        {
+          "expr": "jvm_buffer_count_buffers{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "count",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
@@ -2814,23 +4111,23 @@
         "short"
       ],
       "yaxes": [
-      {
-        "decimals": 0,
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      }
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
       ]
     },
     {
@@ -2841,6 +4138,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "grid": {
         "leftLogBase": 1,
@@ -2850,6 +4153,12 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 12,
+        "y": 75
+      },
       "id": 85,
       "legend": {
         "avg": false,
@@ -2870,28 +4179,27 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "jvm_buffer_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "used",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      },
-      {
-        "expr": "jvm_buffer_total_capacity_bytes{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "capacity",
-        "metric": "",
-        "refId": "B",
-        "step": 2400
-      }
+        {
+          "expr": "jvm_buffer_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "jvm_buffer_total_capacity_bytes{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "capacity",
+          "metric": "",
+          "refId": "B",
+          "step": 2400
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
@@ -2918,22 +4226,22 @@
         "short"
       ],
       "yaxes": [
-      {
-        "format": "bytes",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      }
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
       ]
     },
     {
@@ -2944,6 +4252,12 @@
       "datasource": "Prometheus",
       "editable": true,
       "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "grid": {
         "leftLogBase": 1,
@@ -2953,6 +4267,12 @@
         "rightMax": null,
         "rightMin": null
       },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 75
+      },
       "id": 84,
       "legend": {
         "avg": false,
@@ -2973,19 +4293,18 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "span": 3,
       "stack": false,
       "steppedLine": false,
       "targets": [
-      {
-        "expr": "jvm_buffer_count_buffers{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
-        "format": "time_series",
-        "intervalFactor": 2,
-        "legendFormat": "count",
-        "metric": "",
-        "refId": "A",
-        "step": 2400
-      }
+        {
+          "expr": "jvm_buffer_count_buffers{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "count",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        }
       ],
       "thresholds": [],
       "timeFrom": null,
@@ -3012,129 +4331,147 @@
         "short"
       ],
       "yaxes": [
-      {
-        "decimals": 0,
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": 0,
-        "show": true
-      },
-      {
-        "format": "short",
-        "label": null,
-        "logBase": 1,
-        "max": null,
-        "min": null,
-        "show": true
-      }
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
       ]
     }
-    ],
-    "repeat": null,
-    "repeatIteration": null,
-    "repeatRowId": null,
-    "showTitle": true,
-    "title": "Buffer Pools",
-    "titleSize": "h6"
-  }
   ],
-  "schemaVersion": 14,
+  "refresh": "5s",
+  "schemaVersion": 25,
   "style": "dark",
   "tags": [],
   "templating": {
     "list": [
-    {
-      "allValue": null,
-      "current": {},
-      "datasource": "Prometheus",
-      "hide": 0,
-      "includeAll": false,
-      "label": "Application",
-      "multi": false,
-      "name": "application",
-      "options": [],
-      "query": "label_values(application)",
-      "refresh": 2,
-      "regex": "",
-      "sort": 0,
-      "tagValuesQuery": "",
-      "tags": [],
-      "tagsQuery": "",
-      "type": "query",
-      "useTags": false
-    },
-    {
-      "allFormat": "glob",
-      "allValue": null,
-      "current": {},
-      "datasource": "Prometheus",
-      "hide": 0,
-      "includeAll": false,
-      "label": "Instance",
-      "multi": false,
-      "multiFormat": "glob",
-      "name": "instance",
-      "options": [],
-      "query": "label_values(jvm_memory_used_bytes{application=\"$application\"}, instance)",
-      "refresh": 2,
-      "regex": "",
-      "sort": 0,
-      "tagValuesQuery": "",
-      "tags": [],
-      "tagsQuery": "",
-      "type": "query",
-      "useTags": false
-    },
-    {
-      "allFormat": "glob",
-      "allValue": null,
-      "current": {},
-      "datasource": "Prometheus",
-      "hide": 0,
-      "includeAll": true,
-      "label": "JVM Memory Pools Heap",
-      "multi": false,
-      "multiFormat": "glob",
-      "name": "jvm_memory_pool_heap",
-      "options": [],
-      "query": "label_values(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"},id)",
-      "refresh": 1,
-      "regex": "",
-      "sort": 1,
-      "tagValuesQuery": "",
-      "tags": [],
-      "tagsQuery": "",
-      "type": "query",
-      "useTags": false
-    },
-    {
-      "allFormat": "glob",
-      "allValue": null,
-      "current": {},
-      "datasource": "Prometheus",
-      "hide": 0,
-      "includeAll": true,
-      "label": "JVM Memory Pools Non-Heap",
-      "multi": false,
-      "multiFormat": "glob",
-      "name": "jvm_memory_pool_nonheap",
-      "options": [],
-      "query": "label_values(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"},id)",
-      "refresh": 1,
-      "regex": "",
-      "sort": 2,
-      "tagValuesQuery": "",
-      "tags": [],
-      "tagsQuery": "",
-      "type": "query",
-      "useTags": false
-    }
+      {
+        "allValue": null,
+        "current": {
+          "isNone": true,
+          "selected": false,
+          "text": "None",
+          "value": ""
+        },
+        "datasource": "Prometheus",
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Application",
+        "multi": false,
+        "name": "application",
+        "options": [],
+        "query": "label_values(application)",
+        "refresh": 2,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allFormat": "glob",
+        "allValue": null,
+        "current": {
+          "selected": false,
+          "text": "dcae-ves-collector.onap:8443",
+          "value": "dcae-ves-collector.onap:8443"
+        },
+        "datasource": "Prometheus",
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Instance",
+        "multi": false,
+        "multiFormat": "glob",
+        "name": "instance",
+        "options": [],
+        "query": "label_values(jvm_memory_used_bytes{application=\"$application\"}, instance)",
+        "refresh": 2,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allFormat": "glob",
+        "allValue": null,
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "Prometheus",
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "JVM Memory Pools Heap",
+        "multi": false,
+        "multiFormat": "glob",
+        "name": "jvm_memory_pool_heap",
+        "options": [],
+        "query": "label_values(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"},id)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 1,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allFormat": "glob",
+        "allValue": null,
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "Prometheus",
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "JVM Memory Pools Non-Heap",
+        "multi": false,
+        "multiFormat": "glob",
+        "name": "jvm_memory_pool_nonheap",
+        "options": [],
+        "query": "label_values(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"},id)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 2,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      }
     ]
   },
   "time": {
-    "from": "now-24h",
+    "from": "now-15m",
     "to": "now"
   },
   "timepicker": {
@@ -3165,5 +4502,6 @@
   },
   "timezone": "browser",
   "title": "JVM (Ves dashboard)",
-  "version": 24
+  "uid": "UnTwUiiGz",
+  "version": 1
 }
\ No newline at end of file
diff --git a/performanceTests/k8s/grafana/dashboards/jMeterDashboard.json b/performanceTests/k8s/grafana/dashboards/jMeterDashboard.json
index 7dbb0243..b205b18c 100644
--- a/performanceTests/k8s/grafana/dashboards/jMeterDashboard.json
+++ b/performanceTests/k8s/grafana/dashboards/jMeterDashboard.json
@@ -1,2337 +1,2356 @@
 {
   "annotations": {
     "list": [
-    {
-      "builtIn": 1,
-      "datasource": "jmeter",
-      "enable": false,
-      "hide": false,
-      "iconColor": "rgba(0, 211, 255, 1)",
-      "limit": 100,
-      "name": "Start/stop marker",
-      "query": "select text from events where $timeFilter",
-      "showIn": 0,
-      "textColumn": "",
-      "type": "dashboard"
-    }
+      {
+        "builtIn": 1,
+        "datasource": "jmeter",
+        "enable": false,
+        "hide": false,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "limit": 100,
+        "name": "Start/stop marker",
+        "query": "select text from events where $timeFilter",
+        "showIn": 0,
+        "textColumn": "",
+        "type": "dashboard"
+      }
     ]
   },
   "description": "Monitor your JMeter load test in real time with InfluxDB and Grafana.",
   "editable": true,
   "gnetId": 4026,
   "graphTooltip": 0,
-  "id": 2,
-  "iteration": 1590743584322,
+  "iteration": 1591286038841,
   "links": [],
   "panels": [
-  {
-    "collapsed": false,
-    "datasource": null,
-    "gridPos": {
-      "h": 1,
-      "w": 24,
-      "x": 0,
-      "y": 0
-    },
-    "id": 33,
-    "panels": [],
-    "repeat": null,
-    "title": "Summary",
-    "type": "row"
-  },
-  {
-    "cacheTimeout": null,
-    "colorBackground": false,
-    "colorValue": true,
-    "colors": [
-      "#299c46",
-      "#e5ac0e",
-      "#d44a3a"
-    ],
-    "datasource": "jmeter",
-    "decimals": 0,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
-      },
-      "overrides": []
-    },
-    "format": "none",
-    "gauge": {
-      "maxValue": 100,
-      "minValue": 0,
-      "show": false,
-      "thresholdLabels": false,
-      "thresholdMarkers": true
-    },
-    "gridPos": {
-      "h": 7,
-      "w": 8,
-      "x": 0,
-      "y": 1
-    },
-    "height": "",
-    "id": 26,
-    "interval": "[[send_interval]]s",
-    "links": [],
-    "mappingType": 1,
-    "mappingTypes": [
-    {
-      "name": "value to text",
-      "value": 1
-    },
     {
-      "name": "range to text",
-      "value": 2
-    }
-    ],
-    "maxDataPoints": 100,
-    "nullPointMode": "connected",
-    "nullText": null,
-    "postfix": " Requests",
-    "postfixFontSize": "50%",
-    "prefix": "",
-    "prefixFontSize": "50%",
-    "rangeMaps": [
-    {
-      "from": "null",
-      "text": "N/A",
-      "to": "null"
-    }
-    ],
-    "sparkline": {
-      "fillColor": "rgba(31, 118, 189, 0.18)",
-      "full": false,
-      "lineColor": "#e5ac0e",
-      "show": false
-    },
-    "tableColumn": "",
-    "targets": [
-    {
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$__interval"
-        ],
-        "type": "time"
-      },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 33,
+      "panels": [],
+      "repeat": null,
+      "title": "Summary",
+      "type": "row"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "#e5ac0e",
+        "#d44a3a"
       ],
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT sum(\"count\")  FROM \"$measurement_name\" WHERE (\"application\" =~ /^$application$/ AND \"transaction\" = 'all') AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "value"
-        ],
-        "type": "field"
+      "datasource": "jmeter",
+      "decimals": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "params": [],
-        "type": "mean"
-      }
-      ]
-      ],
-      "tags": []
-    }
-    ],
-    "thresholds": "",
-    "title": "Total Requests",
-    "type": "singlestat",
-    "valueFontSize": "80%",
-    "valueMaps": [
-    {
-      "op": "=",
-      "text": "0",
-      "value": "null"
-    }
-    ],
-    "valueName": "total"
-  },
-  {
-    "cacheTimeout": null,
-    "colorBackground": false,
-    "colorValue": true,
-    "colors": [
-      "#299c46",
-      "#e24d42",
-      "#d44a3a"
-    ],
-    "datasource": "jmeter",
-    "decimals": 0,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
       },
-      "overrides": []
-    },
-    "format": "none",
-    "gauge": {
-      "maxValue": 100,
-      "minValue": 0,
-      "show": false,
-      "thresholdLabels": false,
-      "thresholdMarkers": true
-    },
-    "gridPos": {
-      "h": 7,
-      "w": 8,
-      "x": 8,
-      "y": 1
-    },
-    "height": "",
-    "id": 28,
-    "interval": "[[send_interval]]s",
-    "links": [],
-    "mappingType": 1,
-    "mappingTypes": [
-    {
-      "name": "value to text",
-      "value": 1
-    },
-    {
-      "name": "range to text",
-      "value": 2
-    }
-    ],
-    "maxDataPoints": 100,
-    "nullPointMode": "connected",
-    "nullText": null,
-    "postfix": " Failed",
-    "postfixFontSize": "50%",
-    "prefix": "",
-    "prefixFontSize": "50%",
-    "rangeMaps": [
-    {
-      "from": "null",
-      "text": "N/A",
-      "to": "null"
-    }
-    ],
-    "sparkline": {
-      "fillColor": "rgba(31, 118, 189, 0.18)",
-      "full": false,
-      "lineColor": "#bf1b00",
-      "show": false
-    },
-    "tableColumn": "",
-    "targets": [
-    {
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$__interval"
-        ],
-        "type": "time"
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 1
       },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
+      "height": "",
+      "id": 26,
+      "interval": "[[send_interval]]s",
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
       ],
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT sum(\"countError\") FROM \"$measurement_name\" WHERE (\"transaction\" = 'all' AND \"application\" =~ /^$application$/) AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "value"
-        ],
-        "type": "field"
-      },
-      {
-        "params": [],
-        "type": "mean"
-      }
-      ]
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": " Requests",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
       ],
-      "tags": []
-    }
-    ],
-    "thresholds": "",
-    "title": "Failed Requests",
-    "type": "singlestat",
-    "valueFontSize": "80%",
-    "valueMaps": [
-    {
-      "op": "=",
-      "text": "0",
-      "value": "null"
-    }
-    ],
-    "valueName": "total"
-  },
-  {
-    "cacheTimeout": null,
-    "colorBackground": false,
-    "colorValue": true,
-    "colors": [
-      "#299c46",
-      "#ef843c",
-      "#e24d42"
-    ],
-    "datasource": "jmeter",
-    "decimals": 2,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "#e5ac0e",
+        "show": false
       },
-      "overrides": []
-    },
-    "format": "percentunit",
-    "gauge": {
-      "maxValue": 1,
-      "minValue": 0,
-      "show": true,
-      "thresholdLabels": false,
-      "thresholdMarkers": true
-    },
-    "gridPos": {
-      "h": 7,
-      "w": 8,
-      "x": 16,
-      "y": 1
-    },
-    "id": 29,
-    "interval": "[[send_interval]]s",
-    "links": [],
-    "mappingType": 1,
-    "mappingTypes": [
-    {
-      "name": "value to text",
-      "value": 1
-    },
-    {
-      "name": "range to text",
-      "value": 2
-    }
-    ],
-    "maxDataPoints": 100,
-    "nullPointMode": "connected",
-    "nullText": null,
-    "postfix": "",
-    "postfixFontSize": "50%",
-    "prefix": "",
-    "prefixFontSize": "50%",
-    "rangeMaps": [
-    {
-      "from": "null",
-      "text": "N/A",
-      "to": "null"
-    }
-    ],
-    "sparkline": {
-      "fillColor": "rgba(31, 118, 189, 0.18)",
-      "full": false,
-      "lineColor": "rgb(31, 120, 193)",
-      "show": false
+      "tableColumn": "",
+      "targets": [
+        {
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT sum(\"count\")  FROM \"$measurement_name\" WHERE (\"application\" =~ /^$application$/ AND \"transaction\" = 'all') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "value"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "mean"
+              }
+            ]
+          ],
+          "tags": []
+        }
+      ],
+      "thresholds": "",
+      "title": "Total Requests",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "0",
+          "value": "null"
+        }
+      ],
+      "valueName": "total"
     },
-    "tableColumn": "",
-    "targets": [
     {
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$__interval"
-        ],
-        "type": "time"
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "#e24d42",
+        "#d44a3a"
+      ],
+      "datasource": "jmeter",
+      "decimals": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 1
+      },
+      "height": "",
+      "id": 28,
+      "interval": "[[send_interval]]s",
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
       ],
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT sum(\"error\") / sum(\"all\") FROM (SELECT sum(\"count\") AS \"all\" FROM \"$measurement_name\" WHERE \"transaction\" = 'all' AND \"application\" =~ /^$application$/ AND $timeFilter GROUP BY time($__interval) fill(null)), (SELECT sum(\"countError\") AS \"error\" FROM \"$measurement_name\" WHERE \"transaction\" = 'all' AND \"application\" =~ /^$application$/ AND $timeFilter GROUP BY time($__interval) fill(null))",
-      "rawQuery": true,
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "value"
-        ],
-        "type": "field"
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": " Failed",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "#bf1b00",
+        "show": false
       },
-      {
-        "params": [],
-        "type": "mean"
-      }
-      ]
+      "tableColumn": "",
+      "targets": [
+        {
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT sum(\"countError\") FROM \"$measurement_name\" WHERE (\"transaction\" = 'all' AND \"application\" =~ /^$application$/) AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "value"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "mean"
+              }
+            ]
+          ],
+          "tags": []
+        }
       ],
-      "tags": []
-    }
-    ],
-    "thresholds": "0,0.01",
-    "title": "Error Rate %",
-    "type": "singlestat",
-    "valueFontSize": "50%",
-    "valueMaps": [
-    {
-      "op": "=",
-      "text": "0",
-      "value": "null"
-    }
-    ],
-    "valueName": "total"
-  },
-  {
-    "aliasColors": {
-      "No of Errors": "#6ED0E0",
-      "Req / s": "#6ed0e0",
-      "Req / sec": "#65c5db"
-    },
-    "bars": false,
-    "dashLength": 10,
-    "dashes": false,
-    "datasource": "jmeter",
-    "decimals": 2,
-    "editable": true,
-    "error": false,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
-      },
-      "overrides": []
-    },
-    "fill": 7,
-    "fillGradient": 0,
-    "gridPos": {
-      "h": 7,
-      "w": 8,
-      "x": 0,
-      "y": 8
-    },
-    "hiddenSeries": false,
-    "id": 4,
-    "interval": "[[send_interval]]s",
-    "legend": {
-      "alignAsTable": true,
-      "avg": true,
-      "current": false,
-      "max": true,
-      "min": true,
-      "rightSide": false,
-      "show": true,
-      "sort": null,
-      "sortDesc": null,
-      "total": false,
-      "values": true
-    },
-    "lines": true,
-    "linewidth": 1,
-    "links": [],
-    "nullPointMode": "null",
-    "options": {
-      "dataLinks": []
+      "thresholds": "",
+      "title": "Failed Requests",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "0",
+          "value": "null"
+        }
+      ],
+      "valueName": "total"
     },
-    "percentage": false,
-    "pointradius": 1,
-    "points": false,
-    "renderer": "flot",
-    "seriesOverrides": [],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [
     {
-      "alias": "Req / s",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$__interval"
-        ],
-        "type": "time"
-      }
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "#299c46",
+        "#ef843c",
+        "#e24d42"
       ],
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT mean(\"count\") / $send_interval FROM \"$measurement_name\" WHERE (\"transaction\" = 'all' AND \"application\" =~ /^$application$/) AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "B",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "count"
-        ],
-        "type": "field"
+      "datasource": "jmeter",
+      "decimals": 2,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "params": [],
-        "type": "last"
-      }
-      ]
-      ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=",
-        "value": "all"
+      "format": "percentunit",
+      "gauge": {
+        "maxValue": 1,
+        "minValue": 0,
+        "show": true,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
       },
-      {
-        "condition": "AND",
-        "key": "application",
-        "operator": "=~",
-        "value": "/^$application$/"
-      }
-      ]
-    }
-    ],
-    "thresholds": [],
-    "timeFrom": null,
-    "timeRegions": [],
-    "timeShift": null,
-    "title": "Total Throughput",
-    "tooltip": {
-      "msResolution": false,
-      "shared": true,
-      "sort": 0,
-      "value_type": "individual"
-    },
-    "type": "graph",
-    "xaxis": {
-      "buckets": null,
-      "mode": "time",
-      "name": null,
-      "show": true,
-      "values": []
-    },
-    "yaxes": [
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
-    }
-    ],
-    "yaxis": {
-      "align": false,
-      "alignLevel": null
-    }
-  },
-  {
-    "aliasColors": {
-      "No of Errors": "#BF1B00",
-      "Num of Errors": "#bf1b00"
-    },
-    "bars": false,
-    "dashLength": 10,
-    "dashes": false,
-    "datasource": "jmeter",
-    "decimals": 0,
-    "editable": true,
-    "error": false,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
-      },
-      "overrides": []
-    },
-    "fill": 7,
-    "fillGradient": 0,
-    "gridPos": {
-      "h": 7,
-      "w": 8,
-      "x": 8,
-      "y": 8
-    },
-    "hiddenSeries": false,
-    "id": 2,
-    "interval": "[[send_interval]]s",
-    "legend": {
-      "alignAsTable": true,
-      "avg": false,
-      "current": false,
-      "max": false,
-      "min": false,
-      "rightSide": false,
-      "show": true,
-      "total": true,
-      "values": true
-    },
-    "lines": true,
-    "linewidth": 1,
-    "links": [],
-    "nullPointMode": "null",
-    "options": {
-      "dataLinks": []
-    },
-    "percentage": false,
-    "pointradius": 1,
-    "points": false,
-    "renderer": "flot",
-    "seriesOverrides": [],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [
-    {
-      "alias": "Num of Errors",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$aggregation"
-        ],
-        "type": "time"
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 16,
+        "y": 1
       },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
+      "id": 29,
+      "interval": "[[send_interval]]s",
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
       ],
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT sum(\"countError\") FROM \"$measurement_name\" WHERE (\"transaction\" = 'all' AND \"application\" =~ /^$application$/) AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "B",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "countError"
-        ],
-        "type": "field"
-      },
-      {
-        "params": [],
-        "type": "sum"
-      }
-      ]
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
       ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=",
-        "value": "all"
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
       },
-      {
-        "condition": "AND",
-        "key": "application",
-        "operator": "=~",
-        "value": "/^$application$/"
-      }
-      ]
-    }
-    ],
-    "thresholds": [],
-    "timeFrom": null,
-    "timeRegions": [],
-    "timeShift": null,
-    "title": "Total Errors",
-    "tooltip": {
-      "msResolution": false,
-      "shared": true,
-      "sort": 0,
-      "value_type": "individual"
-    },
-    "type": "graph",
-    "xaxis": {
-      "buckets": null,
-      "mode": "time",
-      "name": null,
-      "show": true,
-      "values": []
-    },
-    "yaxes": [
-    {
-      "decimals": 0,
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
-    }
-    ],
-    "yaxis": {
-      "align": false,
-      "alignLevel": null
-    }
-  },
-  {
-    "aliasColors": {
-      "Threads": "#614d93",
-      "threads": "#614d93"
-    },
-    "bars": false,
-    "dashLength": 10,
-    "dashes": false,
-    "datasource": "jmeter",
-    "decimals": 0,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
-      },
-      "overrides": []
-    },
-    "fill": 7,
-    "fillGradient": 0,
-    "gridPos": {
-      "h": 7,
-      "w": 8,
-      "x": 16,
-      "y": 8
-    },
-    "hiddenSeries": false,
-    "id": 31,
-    "interval": "[[send_interval]]s",
-    "legend": {
-      "alignAsTable": true,
-      "avg": false,
-      "current": true,
-      "max": false,
-      "min": false,
-      "show": true,
-      "total": false,
-      "values": true
-    },
-    "lines": true,
-    "linewidth": 1,
-    "links": [],
-    "nullPointMode": "null",
-    "options": {
-      "dataLinks": []
+      "tableColumn": "",
+      "targets": [
+        {
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT sum(\"error\") / sum(\"all\") FROM (SELECT sum(\"count\") AS \"all\" FROM \"$measurement_name\" WHERE \"transaction\" = 'all' AND \"application\" =~ /^$application$/ AND $timeFilter GROUP BY time($__interval) fill(null)), (SELECT sum(\"countError\") AS \"error\" FROM \"$measurement_name\" WHERE \"transaction\" = 'all' AND \"application\" =~ /^$application$/ AND $timeFilter GROUP BY time($__interval) fill(null))",
+          "rawQuery": true,
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "value"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "mean"
+              }
+            ]
+          ],
+          "tags": []
+        }
+      ],
+      "thresholds": "0,0.01",
+      "title": "Error Rate %",
+      "type": "singlestat",
+      "valueFontSize": "50%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "0",
+          "value": "null"
+        }
+      ],
+      "valueName": "total"
     },
-    "percentage": false,
-    "pointradius": 5,
-    "points": false,
-    "renderer": "flot",
-    "seriesOverrides": [],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [
     {
-      "alias": "Threads",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$__interval"
-        ],
-        "type": "time"
+      "aliasColors": {
+        "No of Errors": "#6ED0E0",
+        "Req / s": "#6ed0e0",
+        "Req / sec": "#65c5db"
       },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
-      ],
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT last(\"maxAT\") FROM \"$measurement_name\" WHERE (\"transaction\" = 'internal' AND \"application\" =~ /^$application$/) AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "value"
-        ],
-        "type": "field"
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "jmeter",
+      "decimals": 2,
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "params": [],
-        "type": "mean"
-      }
-      ]
+      "fill": 7,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "interval": "[[send_interval]]s",
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "rightSide": false,
+        "show": true,
+        "sort": null,
+        "sortDesc": null,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 1,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "alias": "Req / s",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            }
+          ],
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT mean(\"count\") / $send_interval FROM \"$measurement_name\" WHERE (\"transaction\" = 'all' AND \"application\" =~ /^$application$/) AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "B",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "count"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "last"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=",
+              "value": "all"
+            },
+            {
+              "condition": "AND",
+              "key": "application",
+              "operator": "=~",
+              "value": "/^$application$/"
+            }
+          ]
+        }
       ],
-      "tags": []
-    }
-    ],
-    "thresholds": [],
-    "timeFrom": null,
-    "timeRegions": [],
-    "timeShift": null,
-    "title": "Active Threads",
-    "tooltip": {
-      "shared": true,
-      "sort": 0,
-      "value_type": "individual"
-    },
-    "type": "graph",
-    "xaxis": {
-      "buckets": null,
-      "mode": "time",
-      "name": null,
-      "show": true,
-      "values": []
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Total Throughput",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
-    "yaxes": [
     {
+      "aliasColors": {
+        "No of Errors": "#BF1B00",
+        "Num of Errors": "#bf1b00"
+      },
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "jmeter",
       "decimals": 0,
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-    ],
-    "yaxis": {
-      "align": false,
-      "alignLevel": null
-    }
-  },
-  {
-    "aliasColors": {
-      "banner": "#508642"
-    },
-    "bars": false,
-    "dashLength": 10,
-    "dashes": false,
-    "datasource": "jmeter",
-    "decimals": 2,
-    "editable": true,
-    "error": false,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
-      },
-      "overrides": []
-    },
-    "fill": 1,
-    "fillGradient": 0,
-    "gridPos": {
-      "h": 7,
-      "w": 24,
-      "x": 0,
-      "y": 15
-    },
-    "height": "",
-    "hiddenSeries": false,
-    "id": 23,
-    "interval": "[[send_interval]]s",
-    "legend": {
-      "alignAsTable": true,
-      "avg": true,
-      "current": false,
-      "hideEmpty": false,
-      "hideZero": false,
-      "max": true,
-      "min": false,
-      "rightSide": true,
-      "show": true,
-      "total": false,
-      "values": true
-    },
-    "lines": true,
-    "linewidth": 1,
-    "links": [],
-    "nullPointMode": "null",
-    "options": {
-      "dataLinks": []
-    },
-    "percentage": false,
-    "pointradius": 1,
-    "points": false,
-    "renderer": "flot",
-    "seriesOverrides": [],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [
-    {
-      "alias": "$tag_transaction",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "transaction"
-        ],
-        "type": "tag"
-      }
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 7,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "interval": "[[send_interval]]s",
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": true,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 1,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "alias": "Num of Errors",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$aggregation"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT sum(\"countError\") FROM \"$measurement_name\" WHERE (\"transaction\" = 'all' AND \"application\" =~ /^$application$/) AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "B",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "countError"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "sum"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=",
+              "value": "all"
+            },
+            {
+              "condition": "AND",
+              "key": "application",
+              "operator": "=~",
+              "value": "/^$application$/"
+            }
+          ]
+        }
       ],
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT mean(\"pct95.0\") FROM \"$measurement_name\" WHERE (\"statut\" = 'ok' AND \"application\" =~ /^$application$/) AND $timeFilter GROUP BY \"transaction\", time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "B",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "pct95.0"
-        ],
-        "type": "field"
-      }
-      ]
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Total Errors",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": false
+        }
       ],
-      "tags": [
-      {
-        "key": "statut",
-        "operator": "=",
-        "value": "ok"
-      },
-      {
-        "condition": "AND",
-        "key": "application",
-        "operator": "=~",
-        "value": "/^$application$/"
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
-    }
-    ],
-    "thresholds": [
-    {
-      "colorMode": "ok",
-      "fill": true,
-      "line": true,
-      "op": "lt",
-      "value": 500
-    },
-    {
-      "colorMode": "warning",
-      "fill": false,
-      "line": true,
-      "op": "gt",
-      "value": 1500
-    },
-    {
-      "colorMode": "critical",
-      "fill": true,
-      "line": true,
-      "op": "gt",
-      "value": 5000
-    }
-    ],
-    "timeFrom": null,
-    "timeRegions": [],
-    "timeShift": null,
-    "title": "Transactions Response Times (95th pct)",
-    "tooltip": {
-      "msResolution": false,
-      "shared": true,
-      "sort": 0,
-      "value_type": "individual"
-    },
-    "type": "graph",
-    "xaxis": {
-      "buckets": null,
-      "mode": "time",
-      "name": null,
-      "show": true,
-      "values": []
-    },
-    "yaxes": [
-    {
-      "format": "ms",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
-    }
-    ],
-    "yaxis": {
-      "align": false,
-      "alignLevel": null
-    }
-  },
-  {
-    "collapsed": true,
-    "datasource": null,
-    "gridPos": {
-      "h": 1,
-      "w": 24,
-      "x": 0,
-      "y": 22
     },
-    "id": 34,
-    "panels": [
     {
-      "columns": [],
+      "aliasColors": {
+        "Threads": "#614d93",
+        "threads": "#614d93"
+      },
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
       "datasource": "jmeter",
-      "fontSize": "100%",
+      "decimals": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 7,
+      "fillGradient": 0,
       "gridPos": {
         "h": 7,
         "w": 8,
-        "x": 0,
-        "y": 23
+        "x": 16,
+        "y": 8
       },
-      "height": "",
-      "id": 25,
+      "hiddenSeries": false,
+      "id": 31,
       "interval": "[[send_interval]]s",
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": true,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
       "links": [],
-      "pageSize": null,
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": 2,
-        "desc": true
-      },
-      "styles": [
-      {
-        "alias": "Time",
-        "align": "auto",
-        "dateFormat": "YYYY-MM-DD HH:mm:ss",
-        "pattern": "Time",
-        "type": "hidden"
-      },
-      {
-        "alias": "",
-        "align": "auto",
-        "colorMode": null,
-        "colors": [
-          "rgba(245, 54, 54, 0.9)",
-          "rgba(237, 129, 40, 0.89)",
-          "rgba(50, 172, 45, 0.97)"
-        ],
-        "decimals": 0,
-        "pattern": "/.*/",
-        "thresholds": [],
-        "type": "number",
-        "unit": "short"
-      }
-      ],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
       "targets": [
-      {
-        "alias": "$tag_transaction",
-        "dsType": "influxdb",
-        "groupBy": [
         {
-          "params": [
-            "transaction"
+          "alias": "Threads",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
           ],
-          "type": "tag"
-        }
-        ],
-        "measurement": "jmeter",
-        "orderByTime": "ASC",
-        "policy": "default",
-        "query": "SELECT sum(\"count\") FROM \"$measurement_name\" WHERE (\"application\" =~ /^$application$/ AND \"statut\" = 'ko') AND $timeFilter GROUP BY \"transaction\"",
-        "rawQuery": true,
-        "refId": "A",
-        "resultFormat": "table",
-        "select": [
-        [
-        {
-          "params": [
-            "count"
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT last(\"maxAT\") FROM \"$measurement_name\" WHERE (\"transaction\" = 'internal' AND \"application\" =~ /^$application$/) AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "value"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "mean"
+              }
+            ]
           ],
-          "type": "field"
-        },
-        {
-          "params": [],
-          "type": "sum"
+          "tags": []
         }
-        ]
-        ],
-        "tags": [
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Active Threads",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
         {
-          "key": "application",
-          "operator": "=~",
-          "value": "/^$application$/"
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
         },
         {
-          "condition": "AND",
-          "key": "statut",
-          "operator": "=",
-          "value": "ko"
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
         }
-        ]
-      }
       ],
-      "title": "Errors per Transaction",
-      "transform": "table",
-      "type": "table-old"
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
-      "columns": [],
+      "aliasColors": {
+        "banner": "#508642"
+      },
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
       "datasource": "jmeter",
-      "fontSize": "100%",
+      "decimals": 2,
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 7,
-        "w": 16,
-        "x": 8,
-        "y": 23
+        "w": 24,
+        "x": 0,
+        "y": 15
       },
-      "id": 27,
+      "height": "",
+      "hiddenSeries": false,
+      "id": 23,
       "interval": "[[send_interval]]s",
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "hideEmpty": false,
+        "hideZero": false,
+        "max": true,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
       "links": [],
-      "pageSize": null,
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-      {
-        "alias": "Time",
-        "align": "auto",
-        "dateFormat": "YYYY-MM-DD HH:mm:ss",
-        "pattern": "Time",
-        "type": "hidden"
-      },
-      {
-        "alias": "",
-        "align": "auto",
-        "colorMode": null,
-        "colors": [
-          "rgba(245, 54, 54, 0.9)",
-          "rgba(237, 129, 40, 0.89)",
-          "rgba(50, 172, 45, 0.97)"
-        ],
-        "decimals": 0,
-        "pattern": "/.*/",
-        "thresholds": [],
-        "type": "number",
-        "unit": "short"
-      }
-      ],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 1,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
       "targets": [
-      {
-        "alias": "$tag_responseCode",
-        "dsType": "influxdb",
-        "groupBy": [
         {
-          "params": [
-            "responseCode"
+          "alias": "$tag_transaction",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "transaction"
+              ],
+              "type": "tag"
+            }
           ],
-          "type": "tag"
-        }
-        ],
-        "measurement": "jmeter",
-        "orderByTime": "ASC",
-        "policy": "default",
-        "query": "SELECT sum(\"count\") FROM \"$measurement_name\" WHERE (\"application\" =~ /^$application$/ AND \"responseCode\" !~ /^$/) AND $timeFilter GROUP BY \"responseCode\",\"responseMessage\"",
-        "rawQuery": true,
-        "refId": "A",
-        "resultFormat": "table",
-        "select": [
-        [
-        {
-          "params": [
-            "count"
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT mean(\"pct95.0\") FROM \"$measurement_name\" WHERE (\"statut\" = 'ok' AND \"application\" =~ /^$application$/) AND $timeFilter GROUP BY \"transaction\", time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "B",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "pct95.0"
+                ],
+                "type": "field"
+              }
+            ]
           ],
-          "type": "field"
+          "tags": [
+            {
+              "key": "statut",
+              "operator": "=",
+              "value": "ok"
+            },
+            {
+              "condition": "AND",
+              "key": "application",
+              "operator": "=~",
+              "value": "/^$application$/"
+            }
+          ]
         }
-        ],
-        [
+      ],
+      "thresholds": [
         {
-          "params": [
-            "responseMessage"
-          ],
-          "type": "field"
+          "colorMode": "ok",
+          "fill": true,
+          "line": true,
+          "op": "lt",
+          "value": 500
+        },
+        {
+          "colorMode": "warning",
+          "fill": false,
+          "line": true,
+          "op": "gt",
+          "value": 1500
+        },
+        {
+          "colorMode": "critical",
+          "fill": true,
+          "line": true,
+          "op": "gt",
+          "value": 5000
         }
-        ]
-        ],
-        "tags": [
+      ],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Transactions Response Times (95th pct)",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
         {
-          "key": "application",
-          "operator": "=~",
-          "value": "/^$application$/"
+          "format": "ms",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
         },
         {
-          "condition": "AND",
-          "key": "responseCode",
-          "operator": "!~",
-          "value": "/^$/"
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": false
         }
-        ]
-      }
       ],
-      "title": "Error Info",
-      "transform": "table",
-      "type": "table-old"
-    }
-    ],
-    "repeat": null,
-    "title": "Errors",
-    "type": "row"
-  },
-  {
-    "collapsed": false,
-    "datasource": null,
-    "gridPos": {
-      "h": 1,
-      "w": 24,
-      "x": 0,
-      "y": 23
-    },
-    "id": 35,
-    "panels": [],
-    "repeat": null,
-    "title": "Individual Transaction - $transaction",
-    "type": "row"
-  },
-  {
-    "cacheTimeout": null,
-    "colorBackground": false,
-    "colorValue": true,
-    "colors": [
-      "rgba(245, 54, 54, 0.9)",
-      "#e5ac0e",
-      "rgba(50, 172, 45, 0.97)"
-    ],
-    "datasource": "jmeter",
-    "decimals": 0,
-    "editable": true,
-    "error": false,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
-      },
-      "overrides": []
-    },
-    "format": "none",
-    "gauge": {
-      "maxValue": 100,
-      "minValue": 0,
-      "show": false,
-      "thresholdLabels": false,
-      "thresholdMarkers": true
-    },
-    "gridPos": {
-      "h": 7,
-      "w": 8,
-      "x": 0,
-      "y": 24
-    },
-    "id": 9,
-    "interval": "[[send_interval]]s",
-    "links": [],
-    "mappingType": 1,
-    "mappingTypes": [
-    {
-      "name": "value to text",
-      "value": 1
-    },
-    {
-      "name": "range to text",
-      "value": 2
-    }
-    ],
-    "maxDataPoints": 100,
-    "nullPointMode": "connected",
-    "nullText": null,
-    "postfix": " Requests",
-    "postfixFontSize": "50%",
-    "prefix": "",
-    "prefixFontSize": "50%",
-    "rangeMaps": [
-    {
-      "from": "null",
-      "text": "N/A",
-      "to": "null"
-    }
-    ],
-    "sparkline": {
-      "fillColor": "rgba(31, 118, 189, 0.18)",
-      "full": false,
-      "lineColor": "#e5ac0e",
-      "show": false
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
-    "tableColumn": "",
-    "targets": [
     {
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$__interval"
-        ],
-        "type": "time"
-      },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
-      ],
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT sum(\"count\") FROM \"$measurement_name\" WHERE (\"application\" =~ /^$application$/ AND \"transaction\" =~ /^$transaction$/ AND \"statut\" = 'all') AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "count"
-        ],
-        "type": "field"
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 22
       },
-      {
-        "params": [],
-        "type": "sum"
-      }
-      ]
+      "id": 34,
+      "panels": [
+        {
+          "columns": [],
+          "datasource": "jmeter",
+          "fontSize": "100%",
+          "gridPos": {
+            "h": 7,
+            "w": 8,
+            "x": 0,
+            "y": 23
+          },
+          "height": "",
+          "id": 25,
+          "interval": "[[send_interval]]s",
+          "links": [],
+          "pageSize": null,
+          "scroll": true,
+          "showHeader": true,
+          "sort": {
+            "col": 2,
+            "desc": true
+          },
+          "styles": [
+            {
+              "alias": "Time",
+              "align": "auto",
+              "dateFormat": "YYYY-MM-DD HH:mm:ss",
+              "pattern": "Time",
+              "type": "hidden"
+            },
+            {
+              "alias": "",
+              "align": "auto",
+              "colorMode": null,
+              "colors": [
+                "rgba(245, 54, 54, 0.9)",
+                "rgba(237, 129, 40, 0.89)",
+                "rgba(50, 172, 45, 0.97)"
+              ],
+              "decimals": 0,
+              "pattern": "/.*/",
+              "thresholds": [],
+              "type": "number",
+              "unit": "short"
+            }
+          ],
+          "targets": [
+            {
+              "alias": "$tag_transaction",
+              "dsType": "influxdb",
+              "groupBy": [
+                {
+                  "params": [
+                    "transaction"
+                  ],
+                  "type": "tag"
+                }
+              ],
+              "measurement": "jmeter",
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"count\") FROM \"$measurement_name\" WHERE (\"application\" =~ /^$application$/ AND \"statut\" = 'ko') AND $timeFilter GROUP BY \"transaction\"",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "table",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "count"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "sum"
+                  }
+                ]
+              ],
+              "tags": [
+                {
+                  "key": "application",
+                  "operator": "=~",
+                  "value": "/^$application$/"
+                },
+                {
+                  "condition": "AND",
+                  "key": "statut",
+                  "operator": "=",
+                  "value": "ko"
+                }
+              ]
+            }
+          ],
+          "title": "Errors per Transaction",
+          "transform": "table",
+          "type": "table-old"
+        },
+        {
+          "columns": [],
+          "datasource": "jmeter",
+          "fontSize": "100%",
+          "gridPos": {
+            "h": 7,
+            "w": 16,
+            "x": 8,
+            "y": 23
+          },
+          "id": 27,
+          "interval": "[[send_interval]]s",
+          "links": [],
+          "pageSize": null,
+          "scroll": true,
+          "showHeader": true,
+          "sort": {
+            "col": 0,
+            "desc": true
+          },
+          "styles": [
+            {
+              "alias": "Time",
+              "align": "auto",
+              "dateFormat": "YYYY-MM-DD HH:mm:ss",
+              "pattern": "Time",
+              "type": "hidden"
+            },
+            {
+              "alias": "",
+              "align": "auto",
+              "colorMode": null,
+              "colors": [
+                "rgba(245, 54, 54, 0.9)",
+                "rgba(237, 129, 40, 0.89)",
+                "rgba(50, 172, 45, 0.97)"
+              ],
+              "decimals": 0,
+              "pattern": "/.*/",
+              "thresholds": [],
+              "type": "number",
+              "unit": "short"
+            }
+          ],
+          "targets": [
+            {
+              "alias": "$tag_responseCode",
+              "dsType": "influxdb",
+              "groupBy": [
+                {
+                  "params": [
+                    "responseCode"
+                  ],
+                  "type": "tag"
+                }
+              ],
+              "measurement": "jmeter",
+              "orderByTime": "ASC",
+              "policy": "default",
+              "query": "SELECT sum(\"count\") FROM \"$measurement_name\" WHERE (\"application\" =~ /^$application$/ AND \"responseCode\" !~ /^$/) AND $timeFilter GROUP BY \"responseCode\",\"responseMessage\"",
+              "rawQuery": true,
+              "refId": "A",
+              "resultFormat": "table",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "count"
+                    ],
+                    "type": "field"
+                  }
+                ],
+                [
+                  {
+                    "params": [
+                      "responseMessage"
+                    ],
+                    "type": "field"
+                  }
+                ]
+              ],
+              "tags": [
+                {
+                  "key": "application",
+                  "operator": "=~",
+                  "value": "/^$application$/"
+                },
+                {
+                  "condition": "AND",
+                  "key": "responseCode",
+                  "operator": "!~",
+                  "value": "/^$/"
+                }
+              ]
+            }
+          ],
+          "title": "Error Info",
+          "transform": "table",
+          "type": "table-old"
+        }
       ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=~",
-        "value": "/^$transaction$/"
-      },
-      {
-        "condition": "AND",
-        "key": "statut",
-        "operator": "=",
-        "value": "all"
-      }
-      ]
-    }
-    ],
-    "thresholds": "",
-    "title": "Total Requests - $transaction",
-    "type": "singlestat",
-    "valueFontSize": "80%",
-    "valueMaps": [
-    {
-      "op": "=",
-      "text": "0",
-      "value": "null"
-    }
-    ],
-    "valueName": "total"
-  },
-  {
-    "cacheTimeout": null,
-    "colorBackground": false,
-    "colorValue": true,
-    "colors": [
-      "rgba(245, 54, 54, 0.9)",
-      "#e24d42",
-      "rgba(50, 172, 45, 0.97)"
-    ],
-    "datasource": "jmeter",
-    "decimals": 0,
-    "editable": true,
-    "error": false,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
-      },
-      "overrides": []
+      "repeat": null,
+      "title": "Errors",
+      "type": "row"
     },
-    "format": "none",
-    "gauge": {
-      "maxValue": 100,
-      "minValue": 0,
-      "show": false,
-      "thresholdLabels": false,
-      "thresholdMarkers": true
-    },
-    "gridPos": {
-      "h": 7,
-      "w": 8,
-      "x": 8,
-      "y": 24
-    },
-    "id": 6,
-    "interval": "[[send_interval]]s",
-    "links": [],
-    "mappingType": 1,
-    "mappingTypes": [
-    {
-      "name": "value to text",
-      "value": 1
-    },
-    {
-      "name": "range to text",
-      "value": 2
-    }
-    ],
-    "maxDataPoints": 100,
-    "nullPointMode": "connected",
-    "nullText": null,
-    "postfix": " Failed",
-    "postfixFontSize": "50%",
-    "prefix": "",
-    "prefixFontSize": "50%",
-    "rangeMaps": [
     {
-      "from": "null",
-      "text": "N/A",
-      "to": "null"
-    }
-    ],
-    "sparkline": {
-      "fillColor": "rgba(31, 118, 189, 0.18)",
-      "full": false,
-      "lineColor": "#e24d42",
-      "show": false
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 23
+      },
+      "id": 35,
+      "panels": [],
+      "repeat": null,
+      "title": "Individual Transaction - $transaction",
+      "type": "row"
     },
-    "tableColumn": "",
-    "targets": [
     {
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$__interval"
-        ],
-        "type": "time"
-      },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "rgba(245, 54, 54, 0.9)",
+        "#e5ac0e",
+        "rgba(50, 172, 45, 0.97)"
       ],
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT sum(\"count\") FROM \"$measurement_name\" WHERE (\"application\" =~ /^$application$/ AND \"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ko') AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "count"
-        ],
-        "type": "field"
+      "datasource": "jmeter",
+      "decimals": 0,
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "params": [],
-        "type": "sum"
-      }
-      ]
-      ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=~",
-        "value": "/^$transaction$/"
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
       },
-      {
-        "condition": "AND",
-        "key": "statut",
-        "operator": "=",
-        "value": "ko"
-      }
-      ]
-    }
-    ],
-    "thresholds": "",
-    "title": "Failed Requests - $transaction",
-    "type": "singlestat",
-    "valueFontSize": "80%",
-    "valueMaps": [
-    {
-      "op": "=",
-      "text": "0",
-      "value": "null"
-    }
-    ],
-    "valueName": "total"
-  },
-  {
-    "cacheTimeout": null,
-    "colorBackground": false,
-    "colorValue": true,
-    "colors": [
-      "rgba(50, 172, 45, 0.97)",
-      "#e5ac0e",
-      "#e24d42"
-    ],
-    "datasource": "jmeter",
-    "decimals": 2,
-    "editable": true,
-    "error": false,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
-      },
-      "overrides": []
-    },
-    "format": "percentunit",
-    "gauge": {
-      "maxValue": 1,
-      "minValue": 0,
-      "show": true,
-      "thresholdLabels": false,
-      "thresholdMarkers": true
-    },
-    "gridPos": {
-      "h": 7,
-      "w": 8,
-      "x": 16,
-      "y": 24
-    },
-    "id": 8,
-    "interval": "[[send_interval]]s",
-    "links": [],
-    "mappingType": 1,
-    "mappingTypes": [
-    {
-      "name": "value to text",
-      "value": 1
-    },
-    {
-      "name": "range to text",
-      "value": 2
-    }
-    ],
-    "maxDataPoints": 100,
-    "nullPointMode": "connected",
-    "nullText": null,
-    "postfix": "",
-    "postfixFontSize": "50%",
-    "prefix": "",
-    "prefixFontSize": "50%",
-    "rangeMaps": [
-    {
-      "from": "null",
-      "text": "N/A",
-      "to": "null"
-    }
-    ],
-    "sparkline": {
-      "fillColor": "rgba(31, 118, 189, 0.18)",
-      "full": false,
-      "lineColor": "rgb(14, 237, 45)",
-      "show": false
-    },
-    "tableColumn": "",
-    "targets": [
-    {
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$__interval"
-        ],
-        "type": "time"
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 24
       },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
+      "id": 9,
+      "interval": "[[send_interval]]s",
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
       ],
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT sum(\"error\") / sum(\"all\") FROM (SELECT sum(\"count\") AS \"all\" FROM \"$measurement_name\" WHERE \"transaction\" =~ /^$transaction$/ AND \"statut\" = 'all' AND \"application\" =~ /^$application$/ AND $timeFilter GROUP BY time($__interval) fill(null)), (SELECT sum(\"count\") AS \"error\" FROM \"$measurement_name\" WHERE \"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ko' AND \"application\" =~ /^$application$/ AND $timeFilter GROUP BY time($__interval) fill(null))",
-      "rawQuery": true,
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "count"
-        ],
-        "type": "field"
-      },
-      {
-        "params": [],
-        "type": "sum"
-      }
-      ]
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": " Requests",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
       ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=~",
-        "value": "/^$transaction$/"
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "#e5ac0e",
+        "show": false
       },
-      {
-        "condition": "AND",
-        "key": "statut",
-        "operator": "=",
-        "value": "ok"
-      }
-      ]
-    }
-    ],
-    "thresholds": "0,0.01",
-    "title": "Error Rate % - $transaction",
-    "type": "singlestat",
-    "valueFontSize": "50%",
-    "valueMaps": [
-    {
-      "op": "=",
-      "text": "0",
-      "value": "null"
-    }
-    ],
-    "valueName": "total"
-  },
-  {
-    "aliasColors": {
-      "90th Percentage": "#EAB839",
-      "95th Percentage": "#EF843C",
-      "99th Percentage": "#99440A",
-      "Average": "#3F6833",
-      "Max": "#58140C",
-      "Req / s": "#6ed0e0"
-    },
-    "bars": false,
-    "dashLength": 10,
-    "dashes": false,
-    "datasource": "jmeter",
-    "decimals": 2,
-    "editable": true,
-    "error": false,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
-      },
-      "overrides": []
-    },
-    "fill": 7,
-    "gridPos": {
-      "h": 7,
-      "w": 12,
-      "x": 0,
-      "y": 31
-    },
-    "height": "",
-    "id": 10,
-    "interval": "[[send_interval]]s",
-    "legend": {
-      "alignAsTable": true,
-      "avg": true,
-      "current": false,
-      "max": true,
-      "min": true,
-      "rightSide": false,
-      "show": true,
-      "total": false,
-      "values": true
+      "tableColumn": "",
+      "targets": [
+        {
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT sum(\"count\") FROM \"$measurement_name\" WHERE (\"application\" =~ /^$application$/ AND \"transaction\" =~ /^$transaction$/ AND \"statut\" = 'all') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "count"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "sum"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=~",
+              "value": "/^$transaction$/"
+            },
+            {
+              "condition": "AND",
+              "key": "statut",
+              "operator": "=",
+              "value": "all"
+            }
+          ]
+        }
+      ],
+      "thresholds": "",
+      "title": "Total Requests - $transaction",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "0",
+          "value": "null"
+        }
+      ],
+      "valueName": "total"
     },
-    "lines": true,
-    "linewidth": 1,
-    "links": [],
-    "nullPointMode": "null",
-    "percentage": false,
-    "pointradius": 1,
-    "points": false,
-    "renderer": "flot",
-    "seriesOverrides": [
-    {
-      "alias": "Average",
-      "yaxis": 1
-    }
-    ],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [
     {
-      "alias": "Req / s",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$__interval"
-        ],
-        "type": "time"
-      }
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "rgba(245, 54, 54, 0.9)",
+        "#e24d42",
+        "rgba(50, 172, 45, 0.97)"
       ],
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT last(\"count\") / $send_interval FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval)",
-      "rawQuery": true,
-      "refId": "B",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "count"
-        ],
-        "type": "field"
+      "datasource": "jmeter",
+      "decimals": 0,
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "params": [],
-        "type": "sum"
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
       },
-      {
-        "params": [
-          "5s"
-        ],
-        "type": "non_negative_derivative"
-      }
-      ]
-      ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=~",
-        "value": "/^$transaction$/"
-      },
-      {
-        "condition": "AND",
-        "key": "statut",
-        "operator": "=",
-        "value": "ok"
-      }
-      ]
-    }
-    ],
-    "thresholds": [],
-    "timeFrom": null,
-    "timeShift": null,
-    "title": "Throughput - $transaction",
-    "tooltip": {
-      "msResolution": false,
-      "shared": true,
-      "sort": 0,
-      "value_type": "individual"
-    },
-    "type": "graph",
-    "xaxis": {
-      "buckets": null,
-      "mode": "time",
-      "name": null,
-      "show": true,
-      "values": []
-    },
-    "yaxes": [
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
-    }
-    ]
-  },
-  {
-    "aliasColors": {
-      "Num of Errors": "#bf1b00",
-      "num of errors": "#bf1b00"
-    },
-    "bars": false,
-    "dashLength": 10,
-    "dashes": false,
-    "datasource": "jmeter",
-    "decimals": 0,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
-      },
-      "overrides": []
-    },
-    "fill": 7,
-    "gridPos": {
-      "h": 7,
-      "w": 12,
-      "x": 12,
-      "y": 31
-    },
-    "id": 32,
-    "interval": "[[send_interval]]s",
-    "legend": {
-      "alignAsTable": true,
-      "avg": false,
-      "current": false,
-      "max": false,
-      "min": false,
-      "rightSide": false,
-      "show": true,
-      "total": true,
-      "values": true
-    },
-    "lines": true,
-    "linewidth": 1,
-    "links": [],
-    "nullPointMode": "null",
-    "percentage": false,
-    "pointradius": 1,
-    "points": true,
-    "renderer": "flot",
-    "seriesOverrides": [],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [
-    {
-      "alias": "Num of Errors",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$__interval"
-        ],
-        "type": "time"
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 24
       },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
+      "id": 6,
+      "interval": "[[send_interval]]s",
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
       ],
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT sum(\"count\") FROM \"$measurement_name\" WHERE \"application\" =~ /^$application$/ AND \"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ko' AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "value"
-        ],
-        "type": "field"
-      },
-      {
-        "params": [],
-        "type": "mean"
-      }
-      ]
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": " Failed",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
       ],
-      "tags": []
-    }
-    ],
-    "thresholds": [],
-    "timeFrom": null,
-    "timeShift": null,
-    "title": "Errors",
-    "tooltip": {
-      "shared": true,
-      "sort": 0,
-      "value_type": "individual"
-    },
-    "type": "graph",
-    "xaxis": {
-      "buckets": 1,
-      "mode": "time",
-      "name": null,
-      "show": true,
-      "values": []
-    },
-    "yaxes": [
-    {
-      "decimals": 0,
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-    ]
-  },
-  {
-    "aliasColors": {
-      "90th Percentage": "#f2c96d",
-      "95th Percentage": "#EF843C",
-      "99th Percentage": "#bf1b00",
-      "Average": "#7eb26d",
-      "Max": "#584477",
-      "Median": "#6ed0e0",
-      "median": "#6ed0e0"
-    },
-    "bars": false,
-    "dashLength": 10,
-    "dashes": false,
-    "datasource": "jmeter",
-    "decimals": 2,
-    "editable": true,
-    "error": false,
-    "fieldConfig": {
-      "defaults": {
-        "custom": {}
-      },
-      "overrides": []
-    },
-    "fill": 1,
-    "gridPos": {
-      "h": 7,
-      "w": 24,
-      "x": 0,
-      "y": 38
-    },
-    "height": "",
-    "id": 5,
-    "interval": "[[send_interval]]s",
-    "legend": {
-      "alignAsTable": true,
-      "avg": true,
-      "current": false,
-      "hideEmpty": true,
-      "max": true,
-      "min": false,
-      "rightSide": true,
-      "show": true,
-      "sortDesc": true,
-      "total": false,
-      "values": true
-    },
-    "lines": true,
-    "linewidth": 1,
-    "links": [],
-    "nullPointMode": "null",
-    "percentage": false,
-    "pointradius": 1,
-    "points": false,
-    "renderer": "flot",
-    "seriesOverrides": [
-    {
-      "alias": "Average",
-      "yaxis": 1
-    }
-    ],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [
-    {
-      "alias": "Average",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$aggregation"
-        ],
-        "type": "time"
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "#e24d42",
+        "show": false
       },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
+      "tableColumn": "",
+      "targets": [
+        {
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT sum(\"count\") FROM \"$measurement_name\" WHERE (\"application\" =~ /^$application$/ AND \"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ko') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "count"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "sum"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=~",
+              "value": "/^$transaction$/"
+            },
+            {
+              "condition": "AND",
+              "key": "statut",
+              "operator": "=",
+              "value": "ko"
+            }
+          ]
+        }
       ],
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT last(\"avg\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval)",
-      "rawQuery": true,
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "avg"
-        ],
-        "type": "field"
-      },
-      {
-        "params": [],
-        "type": "last"
-      }
-      ]
+      "thresholds": "",
+      "title": "Failed Requests - $transaction",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "0",
+          "value": "null"
+        }
       ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=~",
-        "value": "/^$request$/"
-      },
-      {
-        "condition": "AND",
-        "key": "statut",
-        "operator": "=",
-        "value": "ok"
-      }
-      ]
+      "valueName": "total"
     },
     {
-      "alias": "Median",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$aggregation"
-        ],
-        "type": "time"
-      },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": [
+        "rgba(50, 172, 45, 0.97)",
+        "#e5ac0e",
+        "#e24d42"
       ],
-      "hide": false,
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT last(\"pct50.0\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval)",
-      "rawQuery": true,
-      "refId": "F",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "pct50.0"
-        ],
-        "type": "field"
+      "datasource": "jmeter",
+      "decimals": 2,
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "params": [],
-        "type": "last"
-      }
-      ]
-      ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=~",
-        "value": "/^$request$/"
+      "format": "percentunit",
+      "gauge": {
+        "maxValue": 1,
+        "minValue": 0,
+        "show": true,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
       },
-      {
-        "condition": "AND",
-        "key": "statut",
-        "operator": "=",
-        "value": "all"
-      }
-      ]
-    },
-    {
-      "alias": "90th Percentile",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$aggregation"
-        ],
-        "type": "time"
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 16,
+        "y": 24
       },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
+      "id": 8,
+      "interval": "[[send_interval]]s",
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
       ],
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT last(\"pct90.0\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "B",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "pct90.0"
-        ],
-        "type": "field"
-      },
-      {
-        "params": [],
-        "type": "last"
-      }
-      ]
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
       ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=~",
-        "value": "/^$request$/"
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(14, 237, 45)",
+        "show": false
       },
-      {
-        "condition": "AND",
-        "key": "statut",
-        "operator": "=",
-        "value": "all"
-      }
-      ]
+      "tableColumn": "",
+      "targets": [
+        {
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT sum(\"error\") / sum(\"all\") FROM (SELECT sum(\"count\") AS \"all\" FROM \"$measurement_name\" WHERE \"transaction\" =~ /^$transaction$/ AND \"statut\" = 'all' AND \"application\" =~ /^$application$/ AND $timeFilter GROUP BY time($__interval) fill(null)), (SELECT sum(\"count\") AS \"error\" FROM \"$measurement_name\" WHERE \"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ko' AND \"application\" =~ /^$application$/ AND $timeFilter GROUP BY time($__interval) fill(null))",
+          "rawQuery": true,
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "count"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "sum"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=~",
+              "value": "/^$transaction$/"
+            },
+            {
+              "condition": "AND",
+              "key": "statut",
+              "operator": "=",
+              "value": "ok"
+            }
+          ]
+        }
+      ],
+      "thresholds": "0,0.01",
+      "title": "Error Rate % - $transaction",
+      "type": "singlestat",
+      "valueFontSize": "50%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "0",
+          "value": "null"
+        }
+      ],
+      "valueName": "total"
     },
     {
-      "alias": "95th Percentile",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$aggregation"
-        ],
-        "type": "time"
+      "aliasColors": {
+        "90th Percentage": "#EAB839",
+        "95th Percentage": "#EF843C",
+        "99th Percentage": "#99440A",
+        "Average": "#3F6833",
+        "Max": "#58140C",
+        "Req / s": "#6ed0e0"
       },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
-      ],
-      "hide": false,
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT last(\"pct95.0\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "C",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "pct95.0"
-        ],
-        "type": "field"
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "jmeter",
+      "decimals": 2,
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "params": [],
-        "type": "last"
-      }
-      ]
+      "fill": 7,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 0,
+        "y": 31
+      },
+      "height": "",
+      "hiddenSeries": false,
+      "id": 10,
+      "interval": "[[send_interval]]s",
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 1,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [
+        {
+          "alias": "Average",
+          "yaxis": 1
+        }
       ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=~",
-        "value": "/^$request$/"
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "alias": "Req / s",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            }
+          ],
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT last(\"count\") / $send_interval FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval)",
+          "rawQuery": true,
+          "refId": "B",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "count"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "sum"
+              },
+              {
+                "params": [
+                  "5s"
+                ],
+                "type": "non_negative_derivative"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=~",
+              "value": "/^$transaction$/"
+            },
+            {
+              "condition": "AND",
+              "key": "statut",
+              "operator": "=",
+              "value": "ok"
+            }
+          ]
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Throughput - $transaction",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
-      "alias": "99th Percentile",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$aggregation"
-        ],
-        "type": "time"
+      "aliasColors": {
+        "Num of Errors": "#bf1b00",
+        "num of errors": "#bf1b00"
       },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
-      ],
-      "hide": false,
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT last(\"pct99.0\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "D",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "pct99.0"
-        ],
-        "type": "field"
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "jmeter",
+      "decimals": 0,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "params": [],
-        "type": "last"
-      }
-      ]
+      "fill": 7,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 12,
+        "y": 31
+      },
+      "hiddenSeries": false,
+      "id": 32,
+      "interval": "[[send_interval]]s",
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": true,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 1,
+      "points": true,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "alias": "Num of Errors",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT sum(\"count\") FROM \"$measurement_name\" WHERE \"application\" =~ /^$application$/ AND \"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ko' AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "value"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "mean"
+              }
+            ]
+          ],
+          "tags": []
+        }
       ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=~",
-        "value": "/^$request$/"
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Errors",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": 1,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
       }
-      ]
     },
     {
-      "alias": "Max",
-      "dsType": "influxdb",
-      "groupBy": [
-      {
-        "params": [
-          "$aggregation"
-        ],
-        "type": "time"
+      "aliasColors": {
+        "90th Percentage": "#f2c96d",
+        "95th Percentage": "#EF843C",
+        "99th Percentage": "#bf1b00",
+        "Average": "#7eb26d",
+        "Max": "#584477",
+        "Median": "#6ed0e0",
+        "median": "#6ed0e0"
       },
-      {
-        "params": [
-          "null"
-        ],
-        "type": "fill"
-      }
-      ],
-      "measurement": "jmeter",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "query": "SELECT last(\"max\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval) fill(null)",
-      "rawQuery": true,
-      "refId": "E",
-      "resultFormat": "time_series",
-      "select": [
-      [
-      {
-        "params": [
-          "max"
-        ],
-        "type": "field"
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "jmeter",
+      "decimals": 2,
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
       },
-      {
-        "params": [],
-        "type": "last"
-      }
-      ]
-      ],
-      "tags": [
-      {
-        "key": "transaction",
-        "operator": "=~",
-        "value": "/^$request$/"
+      "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 38
       },
-      {
-        "condition": "AND",
-        "key": "statut",
-        "operator": "=",
-        "value": "ok"
-      }
+      "height": "",
+      "id": 5,
+      "interval": "[[send_interval]]s",
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "hideEmpty": true,
+        "max": true,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 1,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [
+        {
+          "alias": "Average",
+          "yaxis": 1
+        }
+      ],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "alias": "Average",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$aggregation"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT last(\"avg\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval)",
+          "rawQuery": true,
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "avg"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "last"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=~",
+              "value": "/^$request$/"
+            },
+            {
+              "condition": "AND",
+              "key": "statut",
+              "operator": "=",
+              "value": "ok"
+            }
+          ]
+        },
+        {
+          "alias": "Median",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$aggregation"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "hide": false,
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT last(\"pct50.0\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval)",
+          "rawQuery": true,
+          "refId": "F",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "pct50.0"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "last"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=~",
+              "value": "/^$request$/"
+            },
+            {
+              "condition": "AND",
+              "key": "statut",
+              "operator": "=",
+              "value": "all"
+            }
+          ]
+        },
+        {
+          "alias": "90th Percentile",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$aggregation"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT last(\"pct90.0\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "B",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "pct90.0"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "last"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=~",
+              "value": "/^$request$/"
+            },
+            {
+              "condition": "AND",
+              "key": "statut",
+              "operator": "=",
+              "value": "all"
+            }
+          ]
+        },
+        {
+          "alias": "95th Percentile",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$aggregation"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "hide": false,
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT last(\"pct95.0\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "C",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "pct95.0"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "last"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=~",
+              "value": "/^$request$/"
+            }
+          ]
+        },
+        {
+          "alias": "99th Percentile",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$aggregation"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "hide": false,
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT last(\"pct99.0\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "D",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "pct99.0"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "last"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=~",
+              "value": "/^$request$/"
+            }
+          ]
+        },
+        {
+          "alias": "Max",
+          "dsType": "influxdb",
+          "groupBy": [
+            {
+              "params": [
+                "$aggregation"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "measurement": "jmeter",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT last(\"max\") FROM \"$measurement_name\" WHERE (\"transaction\" =~ /^$transaction$/ AND \"statut\" = 'ok') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": true,
+          "refId": "E",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "max"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "last"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "transaction",
+              "operator": "=~",
+              "value": "/^$request$/"
+            },
+            {
+              "condition": "AND",
+              "key": "statut",
+              "operator": "=",
+              "value": "ok"
+            }
+          ]
+        }
+      ],
+      "thresholds": [
+        {
+          "colorMode": "ok",
+          "fill": true,
+          "line": true,
+          "op": "lt",
+          "value": 500
+        },
+        {
+          "colorMode": "warning",
+          "fill": false,
+          "line": true,
+          "op": "gt",
+          "value": 1500
+        },
+        {
+          "colorMode": "critical",
+          "fill": true,
+          "line": true,
+          "op": "gt",
+          "value": 5000
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Response Times - $transaction",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "ms",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": false
+        }
       ]
     }
-    ],
-    "thresholds": [
-    {
-      "colorMode": "ok",
-      "fill": true,
-      "line": true,
-      "op": "lt",
-      "value": 500
-    },
-    {
-      "colorMode": "warning",
-      "fill": false,
-      "line": true,
-      "op": "gt",
-      "value": 1500
-    },
-    {
-      "colorMode": "critical",
-      "fill": true,
-      "line": true,
-      "op": "gt",
-      "value": 5000
-    }
-    ],
-    "timeFrom": null,
-    "timeShift": null,
-    "title": "Response Times - $transaction",
-    "tooltip": {
-      "msResolution": false,
-      "shared": true,
-      "sort": 0,
-      "value_type": "individual"
-    },
-    "type": "graph",
-    "xaxis": {
-      "buckets": null,
-      "mode": "time",
-      "name": null,
-      "show": true,
-      "values": []
-    },
-    "yaxes": [
-    {
-      "format": "ms",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
-    }
-    ]
-  }
   ],
   "refresh": "5s",
   "schemaVersion": 25,
@@ -2341,108 +2360,116 @@
   ],
   "templating": {
     "list": [
-    {
-      "current": {
-        "selected": false,
-        "text": "jmeter",
-        "value": "jmeter"
-      },
-      "hide": 0,
-      "includeAll": false,
-      "label": "",
-      "multi": false,
-      "name": "data_source",
-      "options": [],
-      "query": "influxdb",
-      "refresh": 1,
-      "regex": "",
-      "skipUrlSync": false,
-      "type": "datasource"
-    },
-    {
-      "allValue": null,
-      "current": {},
-      "datasource": "jmeter",
-      "definition": "",
-      "hide": 0,
-      "includeAll": false,
-      "label": "",
-      "multi": false,
-      "name": "application",
-      "options": [],
-      "query": "SHOW TAG VALUES FROM \"jmeter\" WITH KEY = \"application\"",
-      "refresh": 1,
-      "regex": "",
-      "skipUrlSync": false,
-      "sort": 0,
-      "tagValuesQuery": null,
-      "tags": [],
-      "tagsQuery": null,
-      "type": "query",
-      "useTags": false
-    },
-    {
-      "allValue": null,
-      "current": {},
-      "datasource": "jmeter",
-      "definition": "",
-      "hide": 0,
-      "includeAll": false,
-      "label": "",
-      "multi": false,
-      "name": "transaction",
-      "options": [],
-      "query": "SHOW TAG VALUES FROM \"jmeter\" WITH KEY = \"transaction\" WHERE \"application\" =~ /^$application$/ AND \"transaction\" != 'internal' AND \"transaction\" != 'all'",
-      "refresh": 1,
-      "regex": "",
-      "skipUrlSync": false,
-      "sort": 0,
-      "tagValuesQuery": null,
-      "tags": [],
-      "tagsQuery": null,
-      "type": "query",
-      "useTags": false
-    },
-    {
-      "current": {
-        "text": "jmeter",
-        "value": "jmeter"
-      },
-      "hide": 2,
-      "label": "Measurement name",
-      "name": "measurement_name",
-      "options": [
       {
-        "text": "jmeter",
-        "value": "jmeter"
-      }
-      ],
-      "query": "jmeter",
-      "skipUrlSync": false,
-      "type": "constant"
-    },
-    {
-      "current": {
-        "text": "5",
-        "value": "5"
-      },
-      "hide": 2,
-      "label": "Backend send interval in second",
-      "name": "send_interval",
-      "options": [
+        "current": {
+          "selected": false,
+          "text": "jmeter",
+          "value": "jmeter"
+        },
+        "hide": 0,
+        "includeAll": false,
+        "label": "",
+        "multi": false,
+        "name": "data_source",
+        "options": [],
+        "query": "influxdb",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "allValue": null,
+        "current": {
+          "selected": false,
+          "text": "ves",
+          "value": "ves"
+        },
+        "datasource": "jmeter",
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "",
+        "multi": false,
+        "name": "application",
+        "options": [],
+        "query": "SHOW TAG VALUES FROM \"jmeter\" WITH KEY = \"application\"",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": null,
+        "tags": [],
+        "tagsQuery": null,
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allValue": null,
+        "current": {
+          "selected": false,
+          "text": "HTTP Request",
+          "value": "HTTP Request"
+        },
+        "datasource": "jmeter",
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "",
+        "multi": false,
+        "name": "transaction",
+        "options": [],
+        "query": "SHOW TAG VALUES FROM \"jmeter\" WITH KEY = \"transaction\" WHERE \"application\" =~ /^$application$/ AND \"transaction\" != 'internal' AND \"transaction\" != 'all'",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": null,
+        "tags": [],
+        "tagsQuery": null,
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "current": {
+          "text": "jmeter",
+          "value": "jmeter"
+        },
+        "hide": 2,
+        "label": "Measurement name",
+        "name": "measurement_name",
+        "options": [
+          {
+            "text": "jmeter",
+            "value": "jmeter"
+          }
+        ],
+        "query": "jmeter",
+        "skipUrlSync": false,
+        "type": "constant"
+      },
       {
-        "text": "5",
-        "value": "5"
+        "current": {
+          "text": "5",
+          "value": "5"
+        },
+        "hide": 2,
+        "label": "Backend send interval in second",
+        "name": "send_interval",
+        "options": [
+          {
+            "text": "5",
+            "value": "5"
+          }
+        ],
+        "query": "5",
+        "skipUrlSync": false,
+        "type": "constant"
       }
-      ],
-      "query": "5",
-      "skipUrlSync": false,
-      "type": "constant"
-    }
     ]
   },
   "time": {
-    "from": "now-30m",
+    "from": "now-15m",
     "to": "now"
   },
   "timepicker": {
@@ -2472,5 +2499,5 @@
   "timezone": "browser",
   "title": "JMeter Dashboard",
   "uid": "symhaxzMz",
-  "version": 4
+  "version": 1
 }
\ No newline at end of file
diff --git a/performanceTests/k8s/grafana/dashboards/jmeterVM.json b/performanceTests/k8s/grafana/dashboards/jmeterVM.json
new file mode 100644
index 00000000..d2deb774
--- /dev/null
+++ b/performanceTests/k8s/grafana/dashboards/jmeterVM.json
@@ -0,0 +1,296 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "jmeterVM",
+      "description": "CPU usage of JMeter VM",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": null
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pluginVersion": "7.0.3",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "alias": "cpu",
+          "groupBy": [],
+          "measurement": "cpu_value",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "query": "SELECT mean(\"value\") FROM \"cpu_value\" WHERE $timeFilter GROUP BY time($__interval) fill(null)",
+          "rawQuery": false,
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "value"
+                ],
+                "type": "field"
+              }
+            ]
+          ],
+          "tags": []
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "CPU Usage",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:60",
+          "decimals": null,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": "100",
+          "min": "0",
+          "show": true
+        },
+        {
+          "$$hashKey": "object:61",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": "100",
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "jmeterVM",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "alias": "RAM",
+          "groupBy": [],
+          "measurement": "memory_value",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "value"
+                ],
+                "type": "field"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "type_instance",
+              "operator": "=",
+              "value": "used"
+            }
+          ]
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "RAM usage",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:220",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": "100",
+          "min": "0",
+          "show": true
+        },
+        {
+          "$$hashKey": "object:221",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": "100",
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "refresh": "5s",
+  "schemaVersion": 25,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-15m",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ]
+  },
+  "timezone": "",
+  "title": "JMeter CPU & RAM",
+  "uid": "3vqG7iiGz",
+  "version": 1
+}
\ No newline at end of file
diff --git a/performanceTests/k8s/grafana/dashboards/k8s-metrics.json b/performanceTests/k8s/grafana/dashboards/k8s-metrics.json
new file mode 100644
index 00000000..513f2b0a
--- /dev/null
+++ b/performanceTests/k8s/grafana/dashboards/k8s-metrics.json
@@ -0,0 +1,653 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "links": [],
+  "panels": [
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "mappings": [],
+          "max": 100,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "percent"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 8,
+        "x": 0,
+        "y": 0
+      },
+      "id": 6,
+      "options": {
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true
+      },
+      "pluginVersion": "7.0.3",
+      "targets": [
+        {
+          "expr": "sum(rate(container_cpu_usage_seconds_total{id=\"/\", instance=~\".*worker.*\"}[1m])) by(instance) / (sum(machine_cpu_cores{instance=~\".*worker.*\"}) by (instance))*100",
+          "interval": "",
+          "legendFormat": "{{instance}}",
+          "refId": "A"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Nodes CPU Usage",
+      "type": "gauge"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 12,
+        "w": 8,
+        "x": 8,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(rate(container_cpu_usage_seconds_total{id=\"/\"}[1m])) by(instance) / (sum(machine_cpu_cores) by (instance))*100",
+          "interval": "",
+          "legendFormat": "{{instance}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": "20m",
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Nodes Total CPU usage",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "percent",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 12,
+        "w": 8,
+        "x": 16,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 10,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(irate(container_network_receive_bytes_total{pod!=\"\", namespace=\"onap\", instance=~\".*worker.*\"}[1m])) by (instance)",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "{{instance}}",
+          "refId": "C"
+        },
+        {
+          "expr": "sum(irate(container_network_receive_bytes_total{pod!=\"\", namespace=\"onap\", instance=~\".*worker.*\"}[1m]))",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Total Receive",
+          "refId": "D"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": "20m",
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Network Usage - Receive",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "Bps",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "mappings": [],
+          "max": 100,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "percent"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 8,
+        "x": 0,
+        "y": 5
+      },
+      "id": 8,
+      "options": {
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true
+      },
+      "pluginVersion": "7.0.3",
+      "targets": [
+        {
+          "expr": "sum(container_memory_working_set_bytes{id=\"/\", instance=~\".*worker.*\"}) by(instance) / (sum(machine_memory_bytes{instance=~\".*worker.*\"}) by (instance))*100",
+          "interval": "",
+          "legendFormat": "{{instance}}",
+          "refId": "A"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Nodes RAM Usage",
+      "type": "gauge"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 13,
+        "w": 8,
+        "x": 0,
+        "y": 10
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(container_memory_working_set_bytes{id=\"/\"}) by (instance) / (sum(machine_memory_bytes) by (instance))*100",
+          "interval": "",
+          "legendFormat": "{{instance}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": "20m",
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Nodes Total RAM Usage",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "percent",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 11,
+        "w": 8,
+        "x": 8,
+        "y": 12
+      },
+      "hiddenSeries": false,
+      "id": 12,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "rightSide": true,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "100- sum(rate(node_cpu_seconds_total{mode=\"idle\"}[1m])) by (node_name, cpu) * 100",
+          "interval": "",
+          "legendFormat": "Instance: {{node_name}} cpu: {{cpu}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": "20m",
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Usage of each core",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "percent",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 11,
+        "w": 8,
+        "x": 16,
+        "y": 12
+      },
+      "hiddenSeries": false,
+      "id": 11,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(irate(container_network_transmit_bytes_total{pod!=\"\", namespace=\"onap\", instance=~\".*worker.*\"}[1m])) by (instance)",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "{{instance}}",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(irate(container_network_transmit_bytes_total{pod!=\"\", namespace=\"onap\", instance=~\".*worker.*\"}[1m]))",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Total Transmit",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": "20m",
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Network Usage - Transmit",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "Bps",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "refresh": "5s",
+  "schemaVersion": 25,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-15m",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ]
+  },
+  "timezone": "",
+  "title": "K8s metrics",
+  "uid": "RxjnWpjZk",
+  "version": 1
+}
\ No newline at end of file
diff --git a/performanceTests/k8s/grafana/datasource.yaml b/performanceTests/k8s/grafana/datasource.yaml
index 83c44869..06deb347 100644
--- a/performanceTests/k8s/grafana/datasource.yaml
+++ b/performanceTests/k8s/grafana/datasource.yaml
@@ -32,7 +32,7 @@ data:
       url: http://prometheus-service:8080
       access: proxy
       isDefault: true
-  influxdbDatasource.yaml: |-
+  jmeterDatasource.yaml: |-
     apiVersion: 1
     datasources:
     - name: jmeter
@@ -42,4 +42,15 @@ data:
       access: proxy
       editable: true
       jsonData:
+        timeInterval: '5s'
+  jmeterVMDatasource.yaml: |-
+    apiVersion: 1
+    datasources:
+    - name: jmeterVM
+      type: influxdb
+      database: collectd
+      url: http://influxdb-service:8086
+      access: proxy
+      editable: true
+      jsonData:
         timeInterval: '5s'
\ No newline at end of file
diff --git a/performanceTests/k8s/influxdb/configmap.yaml b/performanceTests/k8s/influxdb/configmap.yaml
new file mode 100644
index 00000000..7a27bd60
--- /dev/null
+++ b/performanceTests/k8s/influxdb/configmap.yaml
@@ -0,0 +1,58 @@
+# ============LICENSE_START=======================================================
+# dcaegen2-collectors-ves
+# ================================================================================
+# Copyright (C) 2020 NOKIA
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ves-influxdb-conf
+  labels:
+    name: ves-influxdb-conf
+  namespace: onap
+data:
+  influxdb.conf: |-
+    [meta]
+      dir = "/var/lib/influxdb/meta"
+
+    [data]
+      dir = "/var/lib/influxdb/data"
+      engine = "tsm1"
+      wal-dir = "/var/lib/influxdb/wal"
+
+    [[collectd]]
+      enabled = true
+      bind-address = ":25826"
+      database = "collectd"
+      retention-policy = ""
+      batch-size = 5000
+      batch-pending = 10
+      batch-timeout = "10s"
+      read-buffer = 0
+      typesdb = "/usr/share/collectd/types.db"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ves-influxdb-types
+  labels:
+    name: ves-influxdb-types
+  namespace: onap
+data:
+  types.db: |-
+    cpu                     value:DERIVE:0:U
+    memory                  value:GAUGE:0:281474976710656
+    percent                 value:GAUGE:0:100.1
diff --git a/performanceTests/k8s/influxdb/deployment.yaml b/performanceTests/k8s/influxdb/deployment.yaml
index 3b039227..a1782973 100644
--- a/performanceTests/k8s/influxdb/deployment.yaml
+++ b/performanceTests/k8s/influxdb/deployment.yaml
@@ -39,6 +39,18 @@ spec:
           env:
             - name: INFLUXDB_DB
               value: "jmeter"
+          volumeMounts:
+            - name: ves-influxdb-conf
+              mountPath: /etc/influxdb
+            - name: ves-influxdb-types
+              mountPath: /usr/share/collectd
+      volumes:
+        - name: ves-influxdb-conf
+          configMap:
+            name: ves-influxdb-conf
+        - name: ves-influxdb-types
+          configMap:
+            name: ves-influxdb-types
 ---
 apiVersion: v1
 kind: Service
@@ -53,5 +65,11 @@ spec:
   type: NodePort
   ports:
     - port: 8086
+      name: influx-db
       targetPort: 8086
-      nodePort: 30002
\ No newline at end of file
+      nodePort: 30002
+    - port: 25826
+      protocol: UDP
+      name: collectd-port
+      targetPort: 25826
+      nodePort: 30003
\ No newline at end of file
diff --git a/performanceTests/k8s/node-exporter.yaml b/performanceTests/k8s/node-exporter.yaml
new file mode 100644
index 00000000..26fa7847
--- /dev/null
+++ b/performanceTests/k8s/node-exporter.yaml
@@ -0,0 +1,39 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    prometheus.io/scrape: 'true'
+  labels:
+    app: node-exporter
+    name: node-exporter
+  name: node-exporter
+spec:
+  clusterIP: None
+  ports:
+    - name: scrape
+      port: 9100
+      protocol: TCP
+  selector:
+    app: node-exporter
+  type: ClusterIP
+---
+apiVersion: extensions/v1beta1
+kind: DaemonSet
+metadata:
+  name: node-exporter
+spec:
+  template:
+    metadata:
+      labels:
+        app: node-exporter
+      name: node-exporter
+    spec:
+      containers:
+        - image: prom/node-exporter
+          name: node-exporter
+          ports:
+            - containerPort: 9100
+              hostPort: 9100
+              name: scrape
+      hostNetwork: true
+      hostPID: true
diff --git a/performanceTests/k8s/prometheus/configmap.yaml b/performanceTests/k8s/prometheus/configmap.yaml
index 96001713..0c22cd6b 100644
--- a/performanceTests/k8s/prometheus/configmap.yaml
+++ b/performanceTests/k8s/prometheus/configmap.yaml
@@ -41,4 +41,59 @@ data:
         tls_config:
           insecure_skip_verify: true
         static_configs:
-          - targets: ['dcae-ves-collector.onap:8443']
\ No newline at end of file
+          - targets: ['dcae-ves-collector.onap:8443']
+
+      - job_name: 'kubernetes-cadvisor'
+
+        scheme: https
+
+        tls_config:
+          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+        bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+
+        kubernetes_sd_configs:
+        - role: node
+
+        relabel_configs:
+        - action: labelmap
+          regex: __meta_kubernetes_node_label_(.+)
+        - target_label: __address__
+          replacement: kubernetes.default.svc:443
+        - source_labels: [__meta_kubernetes_node_name]
+          regex: (.+)
+          target_label: __metrics_path__
+          replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor
+
+      - job_name: 'kubernetes-service-endpoints'
+
+        kubernetes_sd_configs:
+        - role: endpoints
+
+        relabel_configs:
+        - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
+          action: keep
+          regex: true
+        - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
+          action: replace
+          target_label: __scheme__
+          regex: (https?)
+        - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
+          action: replace
+          target_label: __metrics_path__
+          regex: (.+)
+        - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
+          action: replace
+          target_label: __address__
+          regex: ([^:]+)(?::\d+)?;(\d+)
+          replacement: $1:$2
+        - action: labelmap
+          regex: __meta_kubernetes_service_label_(.+)
+        - source_labels: [__meta_kubernetes_namespace]
+          action: replace
+          target_label: kubernetes_namespace
+        - source_labels: [__meta_kubernetes_service_name]
+          action: replace
+          target_label: kubernetes_name
+        - source_labels: [__meta_kubernetes_endpoint_node_name]
+          action: replace
+          target_label: node_name
\ No newline at end of file
diff --git a/performanceTests/k8s/testScenario/test_scenario.jmx b/performanceTests/k8s/testScenario/test_scenario.jmx
index b9d0257a..0aab5f6b 100644
--- a/performanceTests/k8s/testScenario/test_scenario.jmx
+++ b/performanceTests/k8s/testScenario/test_scenario.jmx
@@ -18,8 +18,8 @@
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">100</stringProp>
-        <stringProp name="ThreadGroup.ramp_time">10</stringProp>
+        <stringProp name="ThreadGroup.num_threads">1000</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">60</stringProp>
         <boolProp name="ThreadGroup.scheduler">false</boolProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
         <stringProp name="ThreadGroup.delay"></stringProp>
@@ -44,7 +44,7 @@
             &quot;priority&quot;: &quot;High&quot;,&#xd;
             &quot;reportingEntityId&quot;: &quot;cc305d54-75b4-431b-adb2-eb6b9e541234&quot;,&#xd;
             &quot;reportingEntityName&quot;: &quot;ibcx0001vm002oam001&quot;,&#xd;
-            &quot;sourceId&quot;: &quot;de305d54-75b4-431b-adb2-eb6b9e546014&quot;,&#xd;
+            &quot;sourceId&quot;: &quot;de305d54-75b4-431b-dupa-eb6b9e546014&quot;,&#xd;
             &quot;sourceName&quot;: &quot;scfx0001vm002cap001&quot;,&#xd;
             &quot;nfVendorName&quot;: &quot;SomeNamee&quot;,&#xd;
             &quot;nfNamingCode&quot;: &quot;scfx&quot;,&#xd;