Fix issues with grafana dashboards after multiple micrometer

and spring actuator uplifts.

- changed the metrics that have been renamed automatically
- changed the irate functions range to the same used on each
dashboard instead of fixed
- apex_healthcheck function wasn't being called when running
csit script because it was declared after usage

Issue-ID: POLICY-5155
Change-Id: I993f022937f6e2041a6c50dc5037c559da087849
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

diff --git a/compose/compose.common.yml b/compose/compose.common.yml
index 40404c8..47212ad 100644 (file)
--- a/compose/compose.common.yml
+++ b/compose/compose.common.yml
@@ -132,7 +132,7 @@ services:
 
 # integration tests:
   csit-tests:
-    image: policy-csit-robot:latest
+    image: onap/policy-csit-robot:latest
     container_name: policy-csit
     hostname: policy-csit
     volumes:

diff --git a/compose/metrics/dashboards/dashboard-apex-pdp.json b/compose/metrics/dashboards/dashboard-apex-pdp.json
index e0199a4..d8dc110 100644 (file)
--- a/compose/metrics/dashboards/dashboard-apex-pdp.json
+++ b/compose/metrics/dashboards/dashboard-apex-pdp.json
@@ -3,7 +3,10 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -22,12 +25,16 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 7,
+  "id": 8,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -36,10 +43,23 @@
       },
       "id": 19,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Quick Info",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Uptime per pod for Policy APEX-PDP application calculated in days",
       "fieldConfig": {
         "defaults": {
@@ -60,7 +80,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "s"
         },
         "overrides": []
       },
@@ -76,25 +97,29 @@
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "vertical",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "text": {
           "titleSize": 16
         },
-        "textMode": "value_and_name"
+        "textMode": "value_and_name",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "(time() - process_start_time_seconds{job=\"apex-pdp-metrics\"}) / 86400",
+          "expr": "(time() - process_start_time_seconds{job=\"apex-pdp-metrics\"})",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -103,11 +128,14 @@
         }
       ],
       "title": "Process Uptime (days)",
-      "transformations": [],
       "transparent": true,
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy APEX-PDP CPU Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -170,6 +198,8 @@
       },
       "id": 26,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -180,9 +210,10 @@
         },
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
+        "sizing": "auto",
         "text": {}
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -190,7 +221,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "irate(process_cpu_seconds_total{job=\"apex-pdp-metrics\"}[5m])*100",
+          "expr": "irate(process_cpu_seconds_total{job=\"apex-pdp-metrics\"}[$__range])*100",
           "interval": "",
           "legendFormat": "{{pod}}",
           "refId": "A"
@@ -200,6 +231,10 @@
       "type": "gauge"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy APEX-PDP Memory Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -265,6 +300,8 @@
       },
       "id": 27,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -274,9 +311,10 @@
           "values": false
         },
         "showThresholdLabels": false,
-        "showThresholdMarkers": false
+        "showThresholdMarkers": false,
+        "sizing": "auto"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -296,6 +334,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -304,10 +346,23 @@
       },
       "id": 17,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "System",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy APEX-PDP CPU Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -315,6 +370,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -326,6 +384,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -395,8 +454,8 @@
         ]
       },
       "gridPos": {
-        "h": 14,
-        "w": 12,
+        "h": 8,
+        "w": 7,
         "x": 0,
         "y": 8
       },
@@ -410,6 +469,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Max",
           "sortDesc": true
         },
@@ -425,7 +485,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "irate(process_cpu_seconds_total{job=\"apex-pdp-metrics\"}[5m])*100",
+          "expr": "irate(process_cpu_seconds_total{job=\"apex-pdp-metrics\"}[$__range])*100",
           "interval": "",
           "legendFormat": "system: {{pod}}",
           "refId": "A"
@@ -435,6 +495,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy APEX-PDP Memory Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -442,6 +506,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -453,6 +520,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -522,9 +590,9 @@
         ]
       },
       "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 12,
+        "h": 8,
+        "w": 8,
+        "x": 7,
         "y": 8
       },
       "id": 13,
@@ -537,6 +605,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Last",
           "sortDesc": false
         },
@@ -563,6 +632,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy APEX-PDP JVM Threads",
       "fieldConfig": {
         "defaults": {
@@ -570,6 +643,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -581,6 +657,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -616,10 +693,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 13,
-        "w": 12,
-        "x": 12,
-        "y": 19
+        "h": 8,
+        "w": 8,
+        "x": 15,
+        "y": 8
       },
       "id": 8,
       "options": {
@@ -630,7 +707,8 @@
             "mean"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "multi",
@@ -680,18 +758,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 32
+        "y": 16
       },
       "id": 15,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Garbage Collection",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "GC operations per second",
       "fieldConfig": {
         "defaults": {
@@ -699,6 +794,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -710,6 +808,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 1,
@@ -748,7 +847,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 33
+        "y": 17
       },
       "id": 10,
       "options": {
@@ -759,7 +858,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -773,7 +873,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "rate(jvm_gc_collection_seconds_count{job=\"apex-pdp-metrics\"}[5m])",
+          "expr": "rate(jvm_gc_collection_seconds_count{job=\"apex-pdp-metrics\"}[$__range])",
           "interval": "",
           "legendFormat": "{{ gc }} : {{ pod }}",
           "refId": "A"
@@ -783,6 +883,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Average GC Time",
       "fieldConfig": {
         "defaults": {
@@ -790,6 +894,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -801,6 +908,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 1,
@@ -838,7 +946,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 33
+        "y": 17
       },
       "id": 22,
       "options": {
@@ -847,7 +955,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -861,7 +970,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "rate(jvm_gc_collection_seconds_sum{job=\"apex-pdp-metrics\"}[5m])/rate(jvm_gc_collection_seconds_count{job=\"apex-pdp-metrics\"}[5m])",
+          "expr": "rate(jvm_gc_collection_seconds_sum{job=\"apex-pdp-metrics\"}[$__range])/rate(jvm_gc_collection_seconds_count{job=\"apex-pdp-metrics\"}[$__range])",
           "interval": "",
           "legendFormat": "avg {{ gc }} : {{ pod }}",
           "refId": "A"
@@ -872,18 +981,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 41
+        "y": 25
       },
       "id": 21,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Requests",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy Deployments Total for APEX-PDP",
       "fieldConfig": {
         "defaults": {
@@ -895,8 +1021,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -912,11 +1037,15 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 42
+        "y": 26
       },
       "id": 12,
       "options": {
         "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -925,9 +1054,11 @@
           "fields": "",
           "values": false
         },
-        "showUnfilled": true
+        "showUnfilled": true,
+        "sizing": "auto",
+        "valueMode": "color"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -1005,6 +1136,10 @@
       "type": "bargauge"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy Executions Total for APEX-PDP per instance",
       "fieldConfig": {
         "defaults": {
@@ -1016,8 +1151,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1033,11 +1167,15 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 42
+        "y": 26
       },
       "id": 30,
       "options": {
         "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1046,9 +1184,11 @@
           "fields": "",
           "values": false
         },
-        "showUnfilled": true
+        "showUnfilled": true,
+        "sizing": "auto",
+        "valueMode": "color"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -1091,18 +1231,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 50
+        "y": 34
       },
       "id": 34,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Engine Stats",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy Engine States for APEX-PDP per engine per instance",
       "fieldConfig": {
         "defaults": {
@@ -1158,13 +1315,14 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 51
+        "y": 35
       },
       "id": 31,
       "options": {
         "legend": {
           "displayMode": "table",
           "placement": "right",
+          "showLegend": true,
           "values": [
             "value"
           ]
@@ -1200,6 +1358,10 @@
       "type": "piechart"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Uptime per engine for Policy APEX-PDP application calculated in days",
       "fieldConfig": {
         "defaults": {
@@ -1212,8 +1374,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1229,7 +1390,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 51
+        "y": 35
       },
       "id": 32,
       "options": {
@@ -1237,6 +1398,7 @@
         "graphMode": "area",
         "justifyMode": "center",
         "orientation": "auto",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "lastNotNull"
@@ -1244,9 +1406,11 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -1263,60 +1427,30 @@
         }
       ],
       "title": "Engine Uptime (days)",
-      "transformations": [],
       "transparent": true,
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Number of APEX event execution counter per engine thread",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
+                "color": "green"
               }
             ]
           },
-          "unit": "ops"
+          "unit": "none"
         },
         "overrides": []
       },
@@ -1324,38 +1458,50 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 59
+        "y": 43
       },
       "id": 35,
       "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "table",
-          "placement": "right"
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "center",
+        "orientation": "vertical",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.4.5",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "avg by (engine_instance_id)(rate(pdpa_engine_event_executions{job=\"apex-pdp-metrics\"}[5m]))",
+          "expr": "pdpa_engine_event_executions{job=\"apex-pdp-metrics\"}",
           "interval": "",
           "legendFormat": "{{ engine_instance_id }}",
+          "range": true,
           "refId": "A"
         }
       ],
       "title": "Engine Executions",
-      "type": "timeseries"
+      "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Average time taken to execute an APEX policy in seconds per engine instance per pod",
       "fieldConfig": {
         "defaults": {
@@ -1363,6 +1509,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1374,6 +1523,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1395,8 +1545,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1412,7 +1561,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 59
+        "y": 43
       },
       "id": 36,
       "options": {
@@ -1423,6 +1572,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Last *",
           "sortDesc": true
         },
@@ -1449,79 +1599,98 @@
       "type": "timeseries"
     },
     {
-      "cards": {},
-      "color": {
-        "cardColor": "#b4ff00",
-        "colorScale": "sqrt",
-        "colorScheme": "interpolateSpectral",
-        "exponent": 0.5,
-        "mode": "spectrum"
-      },
-      "dataFormat": "tsbuckets",
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Time taken to execute the last APEX policy in seconds expressed as a histogram over time",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "orange",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
       "gridPos": {
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 67
+        "y": 51
       },
-      "heatmap": {},
-      "hideZeroBuckets": true,
-      "highlightCards": true,
       "id": 38,
-      "legend": {
-        "show": true
-      },
       "maxDataPoints": 100,
-      "reverseYBuckets": false,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        }
+      },
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
-          "exemplar": true,
-          "expr": "sum by(le)(increase(pdpa_engine_last_execution_time_bucket{job=\"apex-pdp-metrics\"}[$__interval]))",
-          "format": "heatmap",
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "sum (increase(pdpa_engine_last_execution_time_bucket{job=\"apex-pdp-metrics\"}[$__range])) by (le)",
+          "format": "time_series",
+          "instant": false,
           "interval": "",
           "legendFormat": "{{ le }}",
+          "range": true,
           "refId": "A"
         }
       ],
       "title": "Engine Latency distribution",
-      "tooltip": {
-        "show": true,
-        "showHistogram": false
-      },
-      "tooltipDecimals": 0,
-      "transparent": true,
-      "type": "heatmap",
-      "xAxis": {
-        "show": true
-      },
-      "yAxis": {
-        "format": "s",
-        "logBase": 1,
-        "show": true
-      },
-      "yBucketBound": "upper"
+      "type": "histogram"
     }
   ],
   "refresh": "",
-  "schemaVersion": 34,
-  "style": "dark",
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-3h",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
-  "title": "Policy APEX-PDP Jakarta",
+  "title": "Policy APEX-PDP",
   "uid": "DM56uTogk",
-  "version": 2,
+  "version": 3,
   "weekStart": ""
 }
\ No newline at end of file

diff --git a/compose/metrics/dashboards/dashboard-api.json b/compose/metrics/dashboards/dashboard-api.json
index 8046cfe..505477f 100644 (file)
--- a/compose/metrics/dashboards/dashboard-api.json
+++ b/compose/metrics/dashboards/dashboard-api.json
@@ -3,7 +3,10 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -22,12 +25,16 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 1,
+  "id": 9,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -36,10 +43,23 @@
       },
       "id": 19,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Quick Info",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Uptime per pod for Policy API application calculated in days",
       "fieldConfig": {
         "defaults": {
@@ -60,7 +80,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "s"
         },
         "overrides": []
       },
@@ -76,23 +97,27 @@
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "auto",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "text": {},
-        "textMode": "value_and_name"
+        "textMode": "value_and_name",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "process_uptime_seconds{job=\"api-metrics\"} * 86400",
+          "expr": "process_uptime_seconds{job=\"api-metrics\"}",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -101,11 +126,14 @@
         }
       ],
       "title": "Process Uptime (days)",
-      "transformations": [],
       "transparent": true,
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy API CPU Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -168,6 +196,8 @@
       },
       "id": 26,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -177,9 +207,10 @@
           "values": false
         },
         "showThresholdLabels": false,
-        "showThresholdMarkers": false
+        "showThresholdMarkers": false,
+        "sizing": "auto"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -197,6 +228,10 @@
       "type": "gauge"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy API Memory Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -262,6 +297,8 @@
       },
       "id": 27,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -271,9 +308,10 @@
           "values": false
         },
         "showThresholdLabels": false,
-        "showThresholdMarkers": false
+        "showThresholdMarkers": false,
+        "sizing": "auto"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -305,6 +343,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -313,10 +355,23 @@
       },
       "id": 17,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "System",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy API CPU Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -324,6 +379,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -335,6 +393,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -404,8 +463,8 @@
         ]
       },
       "gridPos": {
-        "h": 14,
-        "w": 12,
+        "h": 9,
+        "w": 8,
         "x": 0,
         "y": 11
       },
@@ -419,6 +478,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Max",
           "sortDesc": true
         },
@@ -457,7 +517,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "avg_over_time(process_cpu_usage{job=\"api-metrics\"}[1h]) * 100",
+          "expr": "avg_over_time(process_cpu_usage{job=\"api-metrics\"}[$__range]) * 100",
           "hide": false,
           "interval": "",
           "legendFormat": "process_1h: {{pod}}",
@@ -468,6 +528,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy API Memory Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -475,6 +539,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -486,6 +553,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -555,9 +623,9 @@
         ]
       },
       "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 12,
+        "h": 9,
+        "w": 8,
+        "x": 8,
         "y": 11
       },
       "id": 13,
@@ -570,6 +638,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Last",
           "sortDesc": false
         },
@@ -608,6 +677,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy API JVM Threads",
       "fieldConfig": {
         "defaults": {
@@ -615,6 +688,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -626,6 +702,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -661,10 +738,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 13,
-        "w": 12,
-        "x": 12,
-        "y": 22
+        "h": 9,
+        "w": 7,
+        "x": 16,
+        "y": 11
       },
       "id": 8,
       "options": {
@@ -674,7 +751,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "multi",
@@ -724,18 +802,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 35
+        "y": 20
       },
       "id": 15,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Garbage Collection",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "GC operations per second",
       "fieldConfig": {
         "defaults": {
@@ -743,6 +838,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -754,6 +852,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 1,
@@ -792,7 +891,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 36
+        "y": 21
       },
       "id": 10,
       "options": {
@@ -803,7 +902,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -817,7 +917,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "rate(jvm_gc_pause_seconds_count{job=\"api-metrics\"}[1h])",
+          "expr": "rate(jvm_gc_pause_seconds_count{job=\"api-metrics\"}[$__range])",
           "interval": "",
           "legendFormat": "{{action}} ({{cause}}) : {{ pod }}",
           "refId": "A"
@@ -827,6 +927,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Average GC Time",
       "fieldConfig": {
         "defaults": {
@@ -834,6 +938,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -845,6 +952,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 1,
@@ -882,7 +990,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 36
+        "y": 21
       },
       "id": 22,
       "options": {
@@ -891,7 +999,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -905,9 +1014,9 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "rate(jvm_gc_pause_seconds_sum{job=\"api-metrics\"}[1h])/rate(jvm_gc_pause_seconds_count{job=\"api-metrics\"}[1h])",
+          "expr": "rate(jvm_gc_pause_seconds_sum{job=\"api-metrics\"}[$__range])/rate(jvm_gc_pause_seconds_count{job=\"api-metrics\"}[$__range])",
           "interval": "",
-          "legendFormat": "avg {{action}} ({{cause}}) : {{ pod }}",
+          "legendFormat": "avg {{action}} ({{cause}})",
           "refId": "A"
         }
       ],
@@ -916,18 +1025,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 44
+        "y": 29
       },
       "id": 21,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Requests",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "HTTP API requests rate filtered by URI and REST method",
       "fieldConfig": {
         "defaults": {
@@ -935,6 +1061,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -946,6 +1075,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -970,8 +1100,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -987,7 +1116,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 45
+        "y": 30
       },
       "id": 12,
       "options": {
@@ -997,6 +1126,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Last",
           "sortDesc": true
         },
@@ -1012,7 +1142,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "avg by(method,uri) (rate(http_server_requests_seconds_count{job=\"api-metrics\"}[5m]))",
+          "expr": "avg by(method,uri) (rate(http_server_requests_seconds_count{job=\"api-metrics\"}[$__range]))",
           "interval": "",
           "legendFormat": "{{ method }} - {{ uri }}",
           "refId": "A"
@@ -1022,6 +1152,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Time taken for an API request filtered by REST method and URI",
       "fieldConfig": {
         "defaults": {
@@ -1029,6 +1163,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1040,6 +1177,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -1064,8 +1202,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1081,7 +1218,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 45
+        "y": 30
       },
       "id": 23,
       "options": {
@@ -1092,6 +1229,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Last",
           "sortDesc": true
         },
@@ -1117,6 +1255,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Stats for Policy API Operations",
       "fieldConfig": {
         "defaults": {
@@ -1128,8 +1270,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1144,11 +1285,15 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 53
+        "y": 38
       },
       "id": 24,
       "options": {
         "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
         "orientation": "vertical",
         "reduceOptions": {
           "calcs": [
@@ -1158,11 +1303,13 @@
           "values": false
         },
         "showUnfilled": false,
+        "sizing": "auto",
         "text": {
           "titleSize": 12
-        }
+        },
+        "valueMode": "color"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -1277,6 +1424,10 @@
       "type": "bargauge"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Stats for Policy Types API operations",
       "fieldConfig": {
         "defaults": {
@@ -1288,8 +1439,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1304,11 +1454,15 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 53
+        "y": 38
       },
       "id": 28,
       "options": {
         "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
         "orientation": "vertical",
         "reduceOptions": {
           "calcs": [
@@ -1318,11 +1472,13 @@
           "values": false
         },
         "showUnfilled": false,
+        "sizing": "auto",
         "text": {
           "titleSize": 12
-        }
+        },
+        "valueMode": "color"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -1438,20 +1594,19 @@
     }
   ],
   "refresh": "",
-  "schemaVersion": 34,
-  "style": "dark",
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-3h",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
-  "title": "Policy API Jakarta",
+  "title": "Policy API",
   "uid": "DM56uKltt",
-  "version": 2,
+  "version": 3,
   "weekStart": ""
 }
\ No newline at end of file

diff --git a/compose/metrics/dashboards/dashboard-distribution.json b/compose/metrics/dashboards/dashboard-distribution.json
index 1a53fcb..2102489 100644 (file)
--- a/compose/metrics/dashboards/dashboard-distribution.json
+++ b/compose/metrics/dashboards/dashboard-distribution.json
@@ -3,7 +3,10 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -22,12 +25,16 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 5,
+  "id": 9,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -36,10 +43,23 @@
       },
       "id": 19,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Quick Info",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Uptime for Policy Distribution application",
       "fieldConfig": {
         "defaults": {
@@ -66,7 +86,7 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 9,
+        "h": 8,
         "w": 8,
         "x": 0,
         "y": 1
@@ -77,6 +97,7 @@
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "auto",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "lastNotNull"
@@ -84,10 +105,12 @@
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "text": {},
-        "textMode": "auto"
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -104,11 +127,14 @@
         }
       ],
       "title": "Process Uptime",
-      "transformations": [],
       "transparent": true,
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy Distribution CPU Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -135,11 +161,13 @@
       "gridPos": {
         "h": 8,
         "w": 7,
-        "x": 9,
+        "x": 8,
         "y": 1
       },
       "id": 26,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -149,9 +177,10 @@
           "values": false
         },
         "showThresholdLabels": false,
-        "showThresholdMarkers": false
+        "showThresholdMarkers": false,
+        "sizing": "auto"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -169,6 +198,10 @@
       "type": "gauge"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy Distribution Memory Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -197,12 +230,14 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 6,
-        "x": 17,
+        "w": 7,
+        "x": 15,
         "y": 1
       },
       "id": 27,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -212,9 +247,10 @@
           "values": false
         },
         "showThresholdLabels": false,
-        "showThresholdMarkers": false
+        "showThresholdMarkers": false,
+        "sizing": "auto"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -234,18 +270,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 10
+        "y": 9
       },
       "id": 17,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "System",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy Distribution CPU Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -253,6 +306,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -264,6 +320,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -302,10 +359,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 14,
-        "w": 12,
+        "h": 9,
+        "w": 8,
         "x": 0,
-        "y": 11
+        "y": 10
       },
       "id": 2,
       "options": {
@@ -317,6 +374,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Max",
           "sortDesc": true
         },
@@ -331,41 +389,23 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "avg_over_time(process_cpu_seconds_total{job=\"distribution-metrics\"}[1m]) * 100",
+          "expr": "avg_over_time(process_cpu_seconds_total{job=\"distribution-metrics\"}[$__rate_interval])",
           "interval": "",
           "legendFormat": "system: {{pod}}",
+          "range": true,
           "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "avg_over_time(process_cpu_seconds_total{job=\"distribution-metrics\"}[5m]) * 100",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "process: {{pod}}",
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "avg_over_time(process_cpu_seconds_total{job=\"distribution-metrics\"}[1h]) * 100",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "process_1h: {{pod}}",
-          "refId": "C"
         }
       ],
       "title": "CPU Usage",
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy Distribution Memory Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -373,6 +413,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -384,6 +427,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -422,10 +466,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 12,
-        "y": 11
+        "h": 9,
+        "w": 7,
+        "x": 8,
+        "y": 10
       },
       "id": 13,
       "options": {
@@ -437,6 +481,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Last",
           "sortDesc": false
         },
@@ -463,6 +508,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy Distribution JVM Threads",
       "fieldConfig": {
         "defaults": {
@@ -470,6 +519,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -481,6 +533,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -516,10 +569,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 13,
-        "w": 12,
-        "x": 12,
-        "y": 22
+        "h": 9,
+        "w": 7,
+        "x": 15,
+        "y": 10
       },
       "id": 8,
       "options": {
@@ -529,7 +582,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "multi",
@@ -579,18 +633,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 35
+        "y": 19
       },
       "id": 15,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Garbage Collection",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "GC operations per second",
       "fieldConfig": {
         "defaults": {
@@ -598,6 +669,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -609,6 +683,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 1,
@@ -647,7 +722,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 36
+        "y": 20
       },
       "id": 10,
       "options": {
@@ -658,7 +733,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -671,10 +747,12 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(jvm_gc_collection_seconds_count{job=\"distribution-metrics\"}[1h])",
+          "expr": "rate(jvm_gc_collection_seconds_count{job=\"distribution-metrics\"}[$__range])",
           "interval": "",
           "legendFormat": "{{action}} ({{cause}}) : {{ pod }}",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -682,6 +760,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Average GC Time",
       "fieldConfig": {
         "defaults": {
@@ -689,6 +771,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -700,6 +785,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 1,
@@ -737,7 +823,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 36
+        "y": 20
       },
       "id": 22,
       "options": {
@@ -746,7 +832,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -760,7 +847,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "rate(jvm_gc_collection_seconds_sum{job=\"distribution-metrics\"}[1h])/rate(jvm_gc_collection_seconds_count{job=\"distribution-metrics\"}[1h])",
+          "expr": "rate(jvm_gc_collection_seconds_sum{job=\"distribution-metrics\"}[$__range])/rate(jvm_gc_collection_seconds_count{job=\"distribution-metrics\"}[$__range])",
           "interval": "",
           "legendFormat": "avg {{action}} ({{cause}}) : {{ pod }}",
           "refId": "A"
@@ -771,18 +858,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 44
+        "y": 28
       },
       "id": 21,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Statistics",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Stats for Distribution Statistics Count",
       "fieldConfig": {
         "defaults": {
@@ -807,14 +911,18 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 11,
-        "w": 12,
+        "h": 7,
+        "w": 13,
         "x": 0,
-        "y": 45
+        "y": 29
       },
       "id": 32,
       "options": {
         "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
         "orientation": "vertical",
         "reduceOptions": {
           "calcs": [
@@ -824,21 +932,25 @@
           "values": false
         },
         "showUnfilled": false,
+        "sizing": "auto",
         "text": {
           "titleSize": 12
-        }
+        },
+        "valueMode": "color"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(total_distribution_received_count{job=\"distribution-metrics\"})",
+          "expr": "sum(total_distribution_received_count_total{job=\"distribution-metrics\"})",
           "interval": "",
           "legendFormat": "Total Count",
+          "range": true,
           "refId": "A"
         },
         {
@@ -858,11 +970,13 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(distribution_failure_count{job=\"distribution-metrics\"})",
+          "expr": "sum(distribution_success_count_total{job=\"distribution-metrics\"})",
           "hide": false,
           "interval": "",
           "legendFormat": "Failure Count",
+          "range": true,
           "refId": "C"
         },
         {
@@ -870,11 +984,13 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(total_download_received_count{job=\"distribution-metrics\"})",
+          "expr": "sum(total_download_received_count_total{job=\"distribution-metrics\"})",
           "hide": false,
           "interval": "",
           "legendFormat": "Total Download Count",
+          "range": true,
           "refId": "D"
         },
         {
@@ -882,11 +998,13 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(download_success_count{job=\"distribution-metrics\"})",
+          "expr": "sum(download_success_count_total{job=\"distribution-metrics\"})",
           "hide": false,
           "interval": "",
           "legendFormat": "Download Success Count",
+          "range": true,
           "refId": "E"
         },
         {
@@ -894,11 +1012,13 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(download_failure_count{job=\"distribution-metrics\"})",
+          "expr": "sum(download_failure_count_total{job=\"distribution-metrics\"})",
           "hide": false,
           "interval": "",
           "legendFormat": "Download Failure Count",
+          "range": true,
           "refId": "F"
         }
       ],
@@ -908,20 +1028,19 @@
     }
   ],
   "refresh": "",
-  "schemaVersion": 34,
-  "style": "dark",
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-24h",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
   "title": "Policy Distribution",
   "uid": "5HkCopg4z",
-  "version": 5,
+  "version": 6,
   "weekStart": ""
 }
\ No newline at end of file

diff --git a/compose/metrics/dashboards/dashboard-drools-apps.json b/compose/metrics/dashboards/dashboard-drools-apps.json
index a804927..b5f13bf 100644 (file)
--- a/compose/metrics/dashboards/dashboard-drools-apps.json
+++ b/compose/metrics/dashboards/dashboard-drools-apps.json
@@ -3,7 +3,10 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -22,12 +25,16 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 10,
+  "id": 9,
   "links": [],
   "liveNow": false,
   "panels": [
     {
-      "collapsed": true,
+      "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -35,1034 +42,1202 @@
         "y": 0
       },
       "id": 19,
-      "panels": [
+      "panels": [],
+      "targets": [
         {
-          "description": "Uptime per pod for Policy Drools-APPS application calculated in days",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Quick Info",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
+      "description": "Uptime per pod for Policy Drools-APPS application calculated in days",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "decimals": 1,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
               },
-              "decimals": 1,
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
+              {
+                "color": "red",
+                "value": 80
               }
-            },
-            "overrides": []
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 0,
+        "y": 1
+      },
+      "id": 4,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "vertical",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "text": {
+          "titleSize": 16
+        },
+        "textMode": "value_and_name",
+        "wideLayout": true
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
           },
-          "gridPos": {
-            "h": 6,
-            "w": 6,
-            "x": 0,
-            "y": 1
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "(time() - process_start_time_seconds{job=\"drools-apps-metrics\"})",
+          "format": "time_series",
+          "instant": false,
+          "interval": "",
+          "legendFormat": " ",
+          "refId": "A"
+        }
+      ],
+      "title": "Process Uptime",
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
+      "description": "Policy Drools-APPS CPU Usage Monitoring",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
           },
-          "id": 4,
-          "options": {
-            "colorMode": "value",
-            "graphMode": "none",
-            "justifyMode": "auto",
-            "orientation": "vertical",
-            "reduceOptions": {
-              "calcs": [],
-              "fields": "",
-              "values": false
-            },
-            "text": {
-              "titleSize": 16
-            },
-            "textMode": "value_and_name"
+          "decimals": 2,
+          "mappings": [],
+          "max": 100,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
           },
-          "pluginVersion": "8.3.4",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "(time() - process_start_time_seconds{job=\"drools-apps-metrics\"}) / 86400",
-              "format": "time_series",
-              "instant": false,
-              "interval": "",
-              "legendFormat": "{{ pod }}",
-              "refId": "A"
-            }
-          ],
-          "title": "Process Uptime (days)",
-          "transformations": [],
-          "transparent": true,
-          "type": "stat"
+          "unit": "percent"
         },
-        {
-          "description": "Policy Drools-APPS CPU Usage Monitoring",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "decimals": 2,
-              "mappings": [],
-              "max": 100,
-              "min": 0,
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  }
-                ]
-              },
-              "unit": "percent"
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "process-1h: dev-policy-api-69f54f45cc-wq6xq"
             },
-            "overrides": [
+            "properties": [
               {
-                "matcher": {
-                  "id": "byName",
-                  "options": "process-1h: dev-policy-api-69f54f45cc-wq6xq"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "dark-purple",
-                      "mode": "fixed"
-                    }
-                  }
-                ]
-              },
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "process_1h: dev-policy-api-69f54f45cc-wq6xq"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "dark-purple",
-                      "mode": "fixed"
-                    }
-                  }
-                ]
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-purple",
+                  "mode": "fixed"
+                }
               }
             ]
           },
-          "gridPos": {
-            "h": 6,
-            "w": 8,
-            "x": 7,
-            "y": 1
-          },
-          "id": 26,
-          "options": {
-            "orientation": "auto",
-            "reduceOptions": {
-              "calcs": [
-                "last"
-              ],
-              "fields": "",
-              "values": false
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "process_1h: dev-policy-api-69f54f45cc-wq6xq"
             },
-            "showThresholdLabels": false,
-            "showThresholdMarkers": false,
-            "text": {}
-          },
-          "pluginVersion": "8.3.4",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "irate(process_cpu_seconds_total{job=\"drools-apps-metrics\"}[5m])*100",
-              "interval": "",
-              "legendFormat": "{{pod}}",
-              "refId": "A"
-            }
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 8,
+        "x": 7,
+        "y": 1
+      },
+      "id": 26,
+      "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "last"
           ],
-          "title": "CPU Usage",
-          "type": "gauge"
+          "fields": "",
+          "values": false
         },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": false,
+        "sizing": "auto",
+        "text": {}
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
         {
-          "description": "Policy Drools-APPS Memory Usage Monitoring",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "mappings": [],
-              "max": 100,
-              "min": 0,
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "percent"
-            },
-            "overrides": [
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "irate(process_cpu_seconds_total{job=\"drools-apps-metrics\"}[$__range])",
+          "interval": "",
+          "legendFormat": "{{pod}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "CPU Usage",
+      "type": "gauge"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
+      "description": "Policy Drools-APPS Memory Usage Monitoring",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "mappings": [],
+          "max": 100,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
               {
-                "matcher": {
-                  "id": "byName",
-                  "options": "{area=\"heap\", container=\"policy-api\", endpoint=\"policy-api\", id=\"Tenured Gen\", instance=\"10.42.7.19:6969\", job=\"policy-api\", namespace=\"onap\", pod=\"dev-policy-api-69f54f45cc-sb56v\", service=\"policy-api\"}"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "text",
-                      "mode": "fixed"
-                    }
-                  }
-                ]
+                "color": "green",
+                "value": null
               },
               {
-                "matcher": {
-                  "id": "byName",
-                  "options": "Tenured Gen - dev-policy-api-69f54f45cc-wq6xq"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "dark-purple",
-                      "mode": "fixed"
-                    }
-                  }
-                ]
+                "color": "red",
+                "value": 80
               }
             ]
           },
-          "gridPos": {
-            "h": 6,
-            "w": 8,
-            "x": 16,
-            "y": 1
-          },
-          "id": 27,
-          "options": {
-            "orientation": "auto",
-            "reduceOptions": {
-              "calcs": [
-                "last"
-              ],
-              "fields": "",
-              "values": false
+          "unit": "percent"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "{area=\"heap\", container=\"policy-api\", endpoint=\"policy-api\", id=\"Tenured Gen\", instance=\"10.42.7.19:6969\", job=\"policy-api\", namespace=\"onap\", pod=\"dev-policy-api-69f54f45cc-sb56v\", service=\"policy-api\"}"
             },
-            "showThresholdLabels": false,
-            "showThresholdMarkers": false
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "text",
+                  "mode": "fixed"
+                }
+              }
+            ]
           },
-          "pluginVersion": "8.3.4",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "100 * jvm_memory_bytes_used{area=\"heap\", job=\"drools-apps-metrics\"} / jvm_memory_bytes_max{area=\"heap\", job=\"drools-apps-metrics\"}",
-              "hide": false,
-              "interval": "",
-              "legendFormat": "Heap : {{ pod }}",
-              "refId": "A"
-            }
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Tenured Gen - dev-policy-api-69f54f45cc-wq6xq"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 8,
+        "x": 16,
+        "y": 1
+      },
+      "id": 27,
+      "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "last"
           ],
-          "title": "Memory Usage",
-          "type": "gauge"
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": false,
+        "sizing": "auto"
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "(jvm_memory_bytes_used{area=\"heap\", job=\"drools-apps-metrics\"} / jvm_memory_bytes_max{area=\"heap\", job=\"drools-apps-metrics\"}) * 100",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
         }
       ],
-      "title": "Quick Info",
-      "type": "row"
+      "title": "Memory Usage",
+      "type": "gauge"
     },
     {
-      "collapsed": true,
+      "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 1
+        "y": 7
       },
       "id": 17,
-      "panels": [
+      "panels": [],
+      "targets": [
         {
-          "description": "Policy Drools-APPS CPU Usage Monitoring",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineStyle": {
-                  "fill": "solid"
-                },
-                "lineWidth": 1,
-                "pointSize": 1,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "percent"
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "System",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
+      "description": "Policy Drools-APPS CPU Usage Monitoring",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineStyle": {
+              "fill": "solid"
+            },
+            "lineWidth": 1,
+            "pointSize": 1,
+            "scaleDistribution": {
+              "type": "linear"
             },
-            "overrides": [
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
               {
-                "matcher": {
-                  "id": "byName",
-                  "options": "process-1h: dev-policy-api-69f54f45cc-wq6xq"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "dark-purple",
-                      "mode": "fixed"
-                    }
-                  }
-                ]
+                "color": "green",
+                "value": null
               },
               {
-                "matcher": {
-                  "id": "byName",
-                  "options": "process_1h: dev-policy-api-69f54f45cc-wq6xq"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "dark-purple",
-                      "mode": "fixed"
-                    }
-                  }
-                ]
+                "color": "red",
+                "value": 80
               }
             ]
           },
-          "gridPos": {
-            "h": 14,
-            "w": 12,
-            "x": 0,
-            "y": 2
-          },
-          "id": 2,
-          "options": {
-            "legend": {
-              "calcs": [
-                "max",
-                "mean",
-                "last"
-              ],
-              "displayMode": "table",
-              "placement": "bottom",
-              "sortBy": "Max",
-              "sortDesc": true
+          "unit": "percent"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "process-1h: dev-policy-api-69f54f45cc-wq6xq"
             },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
           },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "irate(process_cpu_seconds_total{job=\"drools-apps-metrics\"}[5m])*100",
-              "interval": "",
-              "legendFormat": "system: {{pod}}",
-              "refId": "A"
-            }
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "process_1h: dev-policy-api-69f54f45cc-wq6xq"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 0,
+        "y": 8
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": [
+            "max",
+            "mean",
+            "last"
           ],
-          "title": "CPU Usage",
-          "type": "timeseries"
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true,
+          "sortBy": "Max",
+          "sortDesc": true
         },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
         {
-          "description": "Policy Drools-APPS Memory Usage Monitoring",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineStyle": {
-                  "fill": "solid"
-                },
-                "lineWidth": 1,
-                "pointSize": 1,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "percent"
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "irate(process_cpu_seconds_total{job=\"drools-apps-metrics\"}[$__range])*100",
+          "interval": "",
+          "legendFormat": "system: {{pod}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "CPU Usage",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
+      "description": "Policy Drools-APPS Memory Usage Monitoring",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
             },
-            "overrides": [
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineStyle": {
+              "fill": "solid"
+            },
+            "lineWidth": 1,
+            "pointSize": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
               {
-                "matcher": {
-                  "id": "byName",
-                  "options": "{area=\"heap\", container=\"policy-api\", endpoint=\"policy-api\", id=\"Tenured Gen\", instance=\"10.42.7.19:6969\", job=\"policy-api\", namespace=\"onap\", pod=\"dev-policy-api-69f54f45cc-sb56v\", service=\"policy-api\"}"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "text",
-                      "mode": "fixed"
-                    }
-                  }
-                ]
+                "color": "green",
+                "value": null
               },
               {
-                "matcher": {
-                  "id": "byName",
-                  "options": "Tenured Gen - dev-policy-api-69f54f45cc-wq6xq"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "dark-purple",
-                      "mode": "fixed"
-                    }
-                  }
-                ]
+                "color": "red",
+                "value": 80
               }
             ]
           },
-          "gridPos": {
-            "h": 11,
-            "w": 12,
-            "x": 12,
-            "y": 2
-          },
-          "id": 13,
-          "options": {
-            "legend": {
-              "calcs": [
-                "max",
-                "mean",
-                "last"
-              ],
-              "displayMode": "table",
-              "placement": "bottom",
-              "sortBy": "Last",
-              "sortDesc": false
+          "unit": "percent"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "{area=\"heap\", container=\"policy-api\", endpoint=\"policy-api\", id=\"Tenured Gen\", instance=\"10.42.7.19:6969\", job=\"policy-api\", namespace=\"onap\", pod=\"dev-policy-api-69f54f45cc-sb56v\", service=\"policy-api\"}"
             },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "text",
+                  "mode": "fixed"
+                }
+              }
+            ]
           },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "100 * jvm_memory_bytes_used{area=\"heap\", job=\"drools-apps-metrics\"} / jvm_memory_bytes_max{area=\"heap\", job=\"drools-apps-metrics\"}",
-              "hide": false,
-              "interval": "",
-              "legendFormat": "Heap : {{ pod }}",
-              "refId": "A"
-            }
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Tenured Gen - dev-policy-api-69f54f45cc-wq6xq"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 8,
+        "y": 8
+      },
+      "id": 13,
+      "options": {
+        "legend": {
+          "calcs": [
+            "max",
+            "mean",
+            "last"
           ],
-          "title": "Memory Usage",
-          "type": "timeseries"
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true,
+          "sortBy": "Last",
+          "sortDesc": false
         },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
         {
-          "description": "Policy Drools-APPS JVM Threads",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "never",
-                "spanNulls": true,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "short"
-            },
-            "overrides": []
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
           },
-          "gridPos": {
-            "h": 13,
-            "w": 12,
-            "x": 12,
-            "y": 13
+          "exemplar": true,
+          "expr": "100 * jvm_memory_bytes_used{area=\"heap\", job=\"drools-apps-metrics\"} / jvm_memory_bytes_max{area=\"heap\", job=\"drools-apps-metrics\"}",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Heap : {{ pod }}",
+          "refId": "A"
+        }
+      ],
+      "title": "Memory Usage",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
+      "description": "Policy Drools-APPS JVM Threads",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
           },
-          "id": 8,
-          "options": {
-            "legend": {
-              "calcs": [
-                "max",
-                "last",
-                "mean"
-              ],
-              "displayMode": "table",
-              "placement": "bottom"
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
             },
-            "tooltip": {
-              "mode": "multi",
-              "sort": "none"
-            }
-          },
-          "pluginVersion": "8.4.5",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "jvm_threads_current{job=\"drools-apps-metrics\"}",
-              "interval": "",
-              "legendFormat": "Live Threads: {{ pod }}",
-              "refId": "A"
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
             },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "jvm_threads_peak{job=\"drools-apps-metrics\"}",
-              "hide": false,
-              "interval": "",
-              "legendFormat": "Peak Threads: {{ pod }}",
-              "refId": "B"
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
             },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "jvm_threads_daemon{job=\"drools-apps-metrics\"}",
-              "hide": false,
-              "interval": "",
-              "legendFormat": "Daemon Threads: {{ pod }}",
-              "refId": "C"
+            "thresholdsStyle": {
+              "mode": "off"
             }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 7,
+        "x": 16,
+        "y": 8
+      },
+      "id": 8,
+      "options": {
+        "legend": {
+          "calcs": [
+            "max",
+            "last",
+            "mean"
           ],
-          "title": "JVM threads",
-          "type": "timeseries"
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "8.4.5",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "exemplar": true,
+          "expr": "jvm_threads_current{job=\"drools-apps-metrics\"}",
+          "interval": "",
+          "legendFormat": "Live Threads: {{ pod }}",
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "exemplar": true,
+          "expr": "jvm_threads_peak{job=\"drools-apps-metrics\"}",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Peak Threads: {{ pod }}",
+          "refId": "B"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "exemplar": true,
+          "expr": "jvm_threads_daemon{job=\"drools-apps-metrics\"}",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Daemon Threads: {{ pod }}",
+          "refId": "C"
         }
       ],
-      "title": "System",
-      "type": "row"
+      "title": "JVM threads",
+      "type": "timeseries"
     },
     {
-      "collapsed": true,
+      "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 2
+        "y": 17
       },
       "id": 15,
-      "panels": [
+      "panels": [],
+      "targets": [
         {
-          "description": "GC operations per second",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 1,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "ops"
-            },
-            "overrides": []
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
           },
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 0,
-            "y": 3
+          "refId": "A"
+        }
+      ],
+      "title": "Garbage Collection",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
+      "description": "GC operations per second",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
           },
-          "id": 10,
-          "options": {
-            "legend": {
-              "calcs": [
-                "max",
-                "mean",
-                "last"
-              ],
-              "displayMode": "table",
-              "placement": "bottom"
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
             },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
+            "thresholdsStyle": {
+              "mode": "off"
             }
           },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
               },
-              "exemplar": true,
-              "expr": "rate(jvm_gc_collection_seconds_count{job=\"drools-apps-metrics\"}[5m])",
-              "interval": "",
-              "legendFormat": "{{ gc }} : {{ pod }}",
-              "refId": "A"
-            }
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "ops"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 18
+      },
+      "id": 10,
+      "options": {
+        "legend": {
+          "calcs": [
+            "max",
+            "mean",
+            "last"
           ],
-          "title": "Collection",
-          "type": "timeseries"
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
         },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
         {
-          "description": "Average GC Time",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 1,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              }
-            },
-            "overrides": []
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
           },
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 12,
-            "y": 3
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "rate(jvm_gc_collection_seconds_count{job=\"drools-apps-metrics\"}[$__range])",
+          "interval": "",
+          "legendFormat": "{{ gc }} : {{ pod }}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Collection",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
+      "description": "Average GC Time",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
           },
-          "id": 22,
-          "options": {
-            "legend": {
-              "calcs": [
-                "last"
-              ],
-              "displayMode": "table",
-              "placement": "bottom"
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
             },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
+            "thresholdsStyle": {
+              "mode": "off"
             }
           },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
               },
-              "exemplar": true,
-              "expr": "rate(jvm_gc_collection_seconds_sum{job=\"drools-apps-metrics\"}[5m])/rate(jvm_gc_collection_seconds_count{job=\"drools-apps-metrics\"}[5m])",
-              "interval": "",
-              "legendFormat": "avg {{ gc }} : {{ pod }}",
-              "refId": "A"
-            }
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 18
+      },
+      "id": 22,
+      "options": {
+        "legend": {
+          "calcs": [
+            "last"
           ],
-          "title": "Pause Durations",
-          "type": "timeseries"
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "rate(jvm_gc_collection_seconds_sum{job=\"drools-apps-metrics\"}[$__range])/rate(jvm_gc_collection_seconds_count{job=\"drools-apps-metrics\"}[$__range])",
+          "interval": "",
+          "legendFormat": "avg {{ gc }} : {{ pod }}",
+          "range": true,
+          "refId": "A"
         }
       ],
-      "title": "Garbage Collection",
-      "type": "row"
+      "title": "Pause Durations",
+      "type": "timeseries"
     },
     {
-      "collapsed": true,
+      "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 3
+        "y": 26
       },
       "id": 21,
-      "panels": [
+      "panels": [],
+      "targets": [
         {
-          "description": "Policy Deployments Total for Drools-APPS",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "none"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 0,
-            "y": 4
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
           },
-          "id": 12,
-          "options": {
-            "displayMode": "gradient",
-            "orientation": "auto",
-            "reduceOptions": {
-              "calcs": [
-                "lastNotNull"
-              ],
-              "fields": "",
-              "values": false
-            },
-            "showUnfilled": true
+          "refId": "A"
+        }
+      ],
+      "title": "Requests",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
+      "description": "Policy Deployments Total for Drools-APPS",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
           },
-          "pluginVersion": "8.3.4",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-apps-metrics\", operation=\"deploy\", status=\"SUCCESS\"})",
-              "interval": "",
-              "legendFormat": "Deploy - Success",
-              "refId": "A"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-apps-metrics\", operation=\"deploy\", status=\"FAILURE\"})",
-              "hide": false,
-              "interval": "",
-              "legendFormat": "Deploy - Failure",
-              "refId": "B"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-apps-metrics\", operation=\"undeploy\", status=\"SUCCESS\"})",
-              "hide": false,
-              "interval": "",
-              "legendFormat": "Undeploy - Success",
-              "refId": "D"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
               },
-              "exemplar": true,
-              "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-apps-metrics\", operation=\"undeploy\", status=\"FAILURE\"})",
-              "hide": false,
-              "interval": "",
-              "legendFormat": "Undeploy - Failure",
-              "refId": "E"
-            }
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 27
+      },
+      "id": 12,
+      "options": {
+        "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "top",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
           ],
-          "title": "Policy Deployments Total",
-          "type": "bargauge"
+          "fields": "",
+          "values": false
         },
+        "showUnfilled": true,
+        "sizing": "auto",
+        "valueMode": "color"
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
         {
-          "description": "Policy Executions Total for Drools-APPS per instance",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "none"
-            },
-            "overrides": []
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
           },
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 12,
-            "y": 4
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-apps-metrics\", operation=\"deploy\", status=\"SUCCESS\"})",
+          "interval": "",
+          "legendFormat": "Deploy - Success",
+          "range": true,
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
           },
-          "id": 30,
-          "options": {
-            "displayMode": "gradient",
-            "orientation": "auto",
-            "reduceOptions": {
-              "calcs": [
-                "lastNotNull"
-              ],
-              "fields": "",
-              "values": false
-            },
-            "showUnfilled": true
+          "exemplar": true,
+          "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-apps-metrics\", operation=\"deploy\", status=\"FAILURE\"})",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Deploy - Failure",
+          "refId": "B"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
           },
-          "pluginVersion": "8.3.4",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
-              },
-              "exemplar": true,
-              "expr": "pdpd_policy_executions_latency_seconds_count{job=\"drools-apps-metrics\", status=\"SUCCESS\"}",
-              "interval": "",
-              "legendFormat": "Executions - Count",
-              "refId": "A"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "dkSf71fnz"
+          "exemplar": true,
+          "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-apps-metrics\", operation=\"undeploy\", status=\"SUCCESS\"})",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Undeploy - Success",
+          "refId": "D"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "exemplar": true,
+          "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-apps-metrics\", operation=\"undeploy\", status=\"FAILURE\"})",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Undeploy - Failure",
+          "refId": "E"
+        }
+      ],
+      "title": "Policy Deployments Total",
+      "type": "bargauge"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
+      "description": "Policy Executions Total for Drools-APPS per instance",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
               },
-              "exemplar": true,
-              "expr": "pdpd_policy_executions_latency_seconds_sum{job=\"drools-apps-metrics\"}",
-              "hide": false,
-              "interval": "",
-              "legendFormat": "Executions - Sum",
-              "refId": "B"
-            }
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 27
+      },
+      "id": 30,
+      "options": {
+        "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
           ],
-          "title": "Policy Executions",
-          "type": "bargauge"
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": false,
+        "sizing": "auto",
+        "valueMode": "color"
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "exemplar": true,
+          "expr": "pdpd_policy_executions_latency_seconds_count{job=\"drools-apps-metrics\", status=\"SUCCESS\"}",
+          "interval": "",
+          "legendFormat": "Executions - Count",
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "irate(pdpd_policy_executions_latency_seconds_sum{job=\"drools-apps-metrics\", status=\"SUCCESS\"}[$__range])",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Executions - Latency (success)",
+          "range": true,
+          "refId": "B"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "irate(pdpd_policy_executions_latency_seconds_sum{job=\"drools-apps-metrics\", status=\"FAIL\"}[$__range])",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Executions - Latency (fail)",
+          "range": true,
+          "refId": "C"
         }
       ],
-      "title": "Requests",
-      "type": "row"
+      "title": "Policy Executions",
+      "type": "bargauge"
     }
   ],
   "refresh": "",
-  "schemaVersion": 34,
-  "style": "dark",
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-3h",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
   "title": "Policy Drools-APPS",
   "uid": "i9l6oyz4z",
-  "version": 3,
+  "version": 4,
   "weekStart": ""
 }
\ No newline at end of file

diff --git a/compose/metrics/dashboards/dashboard-drools-pdp.json b/compose/metrics/dashboards/dashboard-drools-pdp.json
deleted file mode 100644 (file)
index 683d768..0000000
--- a/compose/metrics/dashboards/dashboard-drools-pdp.json
+++ /dev/null
@@ -1,1150 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
-        "type": "dashboard"
-      }
-    ]
-  },
-  "description": "Grafana Dashboard for Policy Drools-PDP",
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "id": 9,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 19,
-      "panels": [],
-      "title": "Quick Info",
-      "type": "row"
-    },
-    {
-      "description": "Uptime per pod for Policy Drools-PDP application calculated in days",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "decimals": 1,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 0,
-        "y": 1
-      },
-      "id": 4,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "vertical",
-        "reduceOptions": {
-          "calcs": [],
-          "fields": "",
-          "values": false
-        },
-        "text": {
-          "titleSize": 16
-        },
-        "textMode": "value_and_name"
-      },
-      "pluginVersion": "8.3.4",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "(time() - process_start_time_seconds{job=\"drools-pdp-metrics\"}) / 86400",
-          "format": "time_series",
-          "instant": false,
-          "interval": "",
-          "legendFormat": "process_uptime: {{ pod }}",
-          "refId": "A"
-        }
-      ],
-      "title": "Process Uptime (days)",
-      "transformations": [],
-      "transparent": true,
-      "type": "stat"
-    },
-    {
-      "description": "Policy Drools-PDP CPU Usage Monitoring",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "decimals": 2,
-          "mappings": [],
-          "max": 100,
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "process-1h: dev-policy-api-69f54f45cc-wq6xq"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "dark-purple",
-                  "mode": "fixed"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "process_1h: dev-policy-api-69f54f45cc-wq6xq"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "dark-purple",
-                  "mode": "fixed"
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 8,
-        "x": 7,
-        "y": 1
-      },
-      "id": 26,
-      "options": {
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showThresholdLabels": false,
-        "showThresholdMarkers": false,
-        "text": {}
-      },
-      "pluginVersion": "8.3.4",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "irate(process_cpu_seconds_total{job=\"drools-pdp-metrics\"}[5m])*100",
-          "interval": "",
-          "legendFormat": "{{pod}}",
-          "refId": "A"
-        }
-      ],
-      "title": "CPU Usage",
-      "type": "gauge"
-    },
-    {
-      "description": "Policy Drools-PDP Memory Usage Monitoring",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "mappings": [],
-          "max": 100,
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "{area=\"heap\", container=\"policy-api\", endpoint=\"policy-api\", id=\"Tenured Gen\", instance=\"10.42.7.19:6969\", job=\"policy-api\", namespace=\"onap\", pod=\"dev-policy-api-69f54f45cc-sb56v\", service=\"policy-api\"}"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "text",
-                  "mode": "fixed"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Tenured Gen - dev-policy-api-69f54f45cc-wq6xq"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "dark-purple",
-                  "mode": "fixed"
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 8,
-        "x": 16,
-        "y": 1
-      },
-      "id": 27,
-      "options": {
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showThresholdLabels": false,
-        "showThresholdMarkers": false
-      },
-      "pluginVersion": "8.3.4",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "100 * jvm_memory_bytes_used{area=\"heap\", job=\"drools-pdp-metrics\"} / jvm_memory_bytes_max{area=\"heap\", job=\"drools-pdp-metrics\"}",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Heap : {{ pod }}",
-          "refId": "A"
-        }
-      ],
-      "title": "Memory Usage",
-      "type": "gauge"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 7
-      },
-      "id": 17,
-      "panels": [],
-      "title": "System",
-      "type": "row"
-    },
-    {
-      "description": "Policy Drools-PDP CPU Usage Monitoring",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "process-1h: dev-policy-api-69f54f45cc-wq6xq"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "dark-purple",
-                  "mode": "fixed"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "process_1h: dev-policy-api-69f54f45cc-wq6xq"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "dark-purple",
-                  "mode": "fixed"
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 14,
-        "w": 12,
-        "x": 0,
-        "y": 8
-      },
-      "id": 2,
-      "options": {
-        "legend": {
-          "calcs": [
-            "max",
-            "mean",
-            "last"
-          ],
-          "displayMode": "table",
-          "placement": "bottom",
-          "sortBy": "Max",
-          "sortDesc": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "irate(process_cpu_seconds_total{job=\"drools-pdp-metrics\"}[5m])*100",
-          "interval": "",
-          "legendFormat": "system: {{pod}}",
-          "refId": "A"
-        }
-      ],
-      "title": "CPU Usage",
-      "type": "timeseries"
-    },
-    {
-      "description": "Policy Drools-PDP Memory Usage Monitoring",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "{area=\"heap\", container=\"policy-api\", endpoint=\"policy-api\", id=\"Tenured Gen\", instance=\"10.42.7.19:6969\", job=\"policy-api\", namespace=\"onap\", pod=\"dev-policy-api-69f54f45cc-sb56v\", service=\"policy-api\"}"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "text",
-                  "mode": "fixed"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Tenured Gen - dev-policy-api-69f54f45cc-wq6xq"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "dark-purple",
-                  "mode": "fixed"
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 12,
-        "y": 8
-      },
-      "id": 13,
-      "options": {
-        "legend": {
-          "calcs": [
-            "max",
-            "mean",
-            "last"
-          ],
-          "displayMode": "table",
-          "placement": "bottom",
-          "sortBy": "Last",
-          "sortDesc": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "100 * jvm_memory_bytes_used{area=\"heap\", job=\"drools-pdp-metrics\"} / jvm_memory_bytes_max{area=\"heap\", job=\"drools-pdp-metrics\"}",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Heap : {{ pod }}",
-          "refId": "A"
-        }
-      ],
-      "title": "Memory Usage",
-      "type": "timeseries"
-    },
-    {
-      "description": "Policy Drools-PDP JVM Threads",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 13,
-        "w": 12,
-        "x": 12,
-        "y": 19
-      },
-      "id": 8,
-      "options": {
-        "legend": {
-          "calcs": [
-            "max",
-            "last",
-            "mean"
-          ],
-          "displayMode": "table",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.4.5",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "jvm_threads_current{job=\"drools-pdp-metrics\"}",
-          "interval": "",
-          "legendFormat": "Live Threads: {{ pod }}",
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "jvm_threads_peak{job=\"drools-pdp-metrics\"}",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Peak Threads: {{ pod }}",
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "jvm_threads_daemon{job=\"policy-drools-pdp\"}",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Daemon Threads: {{ pod }}",
-          "refId": "C"
-        }
-      ],
-      "title": "JVM threads",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 32
-      },
-      "id": 15,
-      "panels": [],
-      "title": "Garbage Collection",
-      "type": "row"
-    },
-    {
-      "description": "GC operations per second",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "ops"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 33
-      },
-      "id": 10,
-      "options": {
-        "legend": {
-          "calcs": [
-            "max",
-            "mean",
-            "last"
-          ],
-          "displayMode": "table",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "rate(jvm_gc_collection_seconds_count{job=\"drools-pdp-metrics\"}[5m])",
-          "interval": "",
-          "legendFormat": "{{ gc }} : {{ pod }}",
-          "refId": "A"
-        }
-      ],
-      "title": "Collection",
-      "type": "timeseries"
-    },
-    {
-      "description": "Average GC Time",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 33
-      },
-      "id": 22,
-      "options": {
-        "legend": {
-          "calcs": [
-            "last"
-          ],
-          "displayMode": "table",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "rate(jvm_gc_collection_seconds_sum{job=\"drools-pdp-metrics\"}[5m])/rate(jvm_gc_collection_seconds_count{job=\"drools-pdp-metrics\"}[5m])",
-          "interval": "",
-          "legendFormat": "avg {{ gc }} : {{ pod }}",
-          "refId": "A"
-        }
-      ],
-      "title": "Pause Durations",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 41
-      },
-      "id": 21,
-      "panels": [],
-      "title": "Requests",
-      "type": "row"
-    },
-    {
-      "description": "Policy Deployments Total for Drools-PDP",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 42
-      },
-      "id": 12,
-      "options": {
-        "displayMode": "gradient",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showUnfilled": true
-      },
-      "pluginVersion": "8.3.4",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-pdp-metrics\", operation=\"deploy\", status=\"SUCCESS\"})",
-          "interval": "",
-          "legendFormat": "Deploy - Success",
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-pdp-metrics\", operation=\"deploy\", status=\"FAILURE\"})",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Deploy - Failure",
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-pdp-metrics\", operation=\"undeploy\", status=\"SUCCESS\"})",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Undeploy - Success",
-          "refId": "D"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "avg by(job)(pdpd_policy_deployments_total{job=\"drools-pdp-metrics\", operation=\"undeploy\", status=\"FAILURE\"})",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Undeploy - Failure",
-          "refId": "E"
-        }
-      ],
-      "title": "Policy Deployments Total",
-      "type": "bargauge"
-    },
-    {
-      "description": "Policy Executions Total for Drools-PDP per instance",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 42
-      },
-      "id": 30,
-      "options": {
-        "displayMode": "gradient",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showUnfilled": true
-      },
-      "pluginVersion": "8.3.4",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "pdpd_policy_executions_latency_seconds_count{job=\"drools-pdp-metrics\"}",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Executions - Count",
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "pdpd_policy_executions_latency_seconds_sum{job=\"drools-pdp-metrics\"}",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Executions - Sum",
-          "refId": "C"
-        }
-      ],
-      "title": "Policy Executions",
-      "type": "bargauge"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 50
-      },
-      "id": 34,
-      "panels": [],
-      "title": "Logging",
-      "type": "row"
-    },
-    {
-      "description": "Policy number of log entries for Drool-PDP",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 51
-      },
-      "id": 36,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "8.3.4",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "logback_appender_total{job=\"drools-pdp-metrics\"}",
-          "interval": "",
-          "legendFormat": "Level",
-          "refId": "A"
-        }
-      ],
-      "title": "Logback Total",
-      "type": "stat"
-    }
-  ],
-  "refresh": "",
-  "schemaVersion": 34,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-3h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Policy Drools-PDP",
-  "uid": "ro24hskVz",
-  "version": 2,
-  "weekStart": ""
-}
\ No newline at end of file

diff --git a/compose/metrics/dashboards/dashboard-for-springboot.json b/compose/metrics/dashboards/dashboard-for-springboot.json
index 0eed3f7..d7654df 100644 (file)
--- a/compose/metrics/dashboards/dashboard-for-springboot.json
+++ b/compose/metrics/dashboards/dashboard-for-springboot.json
@@ -3,7 +3,10 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -23,13 +26,16 @@
   "fiscalYearStartMonth": 0,
   "gnetId": 14430,
   "graphTooltip": 0,
-  "id": 1,
-  "iteration": 1645635034981,
+  "id": 5,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -38,6 +44,15 @@
       },
       "id": 54,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Basic Statistics",
       "type": "row"
     },
@@ -87,13 +102,13 @@
         "y": 1
       },
       "id": 52,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "colorMode": "value",
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "lastNotNull"
@@ -101,11 +116,17 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "process_uptime_seconds{application=\"$application\",instance=\"$instance\"}",
           "format": "time_series",
           "intervalFactor": 2,
@@ -163,13 +184,13 @@
         "y": 1
       },
       "id": 56,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "colorMode": "value",
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "lastNotNull"
@@ -177,11 +198,17 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "process_start_time_seconds{application=\"$application\",instance=\"$instance\"}*1000",
           "format": "time_series",
           "intervalFactor": 2,
@@ -246,9 +273,10 @@
         "y": 1
       },
       "id": 58,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "horizontal",
         "reduceOptions": {
           "calcs": [
@@ -258,11 +286,16 @@
           "values": false
         },
         "showThresholdLabels": false,
-        "showThresholdMarkers": true
+        "showThresholdMarkers": true,
+        "sizing": "auto"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "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": 1,
@@ -336,9 +369,10 @@
         "y": 1
       },
       "id": 60,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "horizontal",
         "reduceOptions": {
           "calcs": [
@@ -348,11 +382,16 @@
           "values": false
         },
         "showThresholdLabels": false,
-        "showThresholdMarkers": true
+        "showThresholdMarkers": true,
+        "sizing": "auto"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "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,
@@ -365,58 +404,97 @@
       "type": "gauge"
     },
     {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
       "datasource": {
         "type": "prometheus",
         "uid": "dkSf71fnz"
       },
       "fieldConfig": {
         "defaults": {
-          "links": []
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
         },
         "overrides": []
       },
-      "fill": 1,
-      "fillGradient": 0,
       "gridPos": {
         "h": 7,
         "w": 12,
         "x": 0,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 95,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
       "options": {
-        "alertThreshold": true
+        "legend": {
+          "calcs": [
+            "mean",
+            "lastNotNull",
+            "max",
+            "min"
+          ],
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        }
       },
-      "percentage": false,
       "pluginVersion": "8.3.4",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "system_cpu_usage{instance=\"$instance\",application=\"$application\"}",
           "format": "time_series",
           "intervalFactor": 1,
@@ -424,6 +502,10 @@
           "refId": "A"
         },
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "process_cpu_usage{instance=\"$instance\",application=\"$application\"}",
           "format": "time_series",
           "intervalFactor": 1,
@@ -431,89 +513,101 @@
           "refId": "B"
         }
       ],
-      "thresholds": [],
-      "timeRegions": [],
       "title": "CPU Usage",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "mode": "time",
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false
-      }
+      "type": "timeseries"
     },
     {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
       "datasource": {
         "type": "prometheus",
         "uid": "dkSf71fnz"
       },
       "fieldConfig": {
         "defaults": {
-          "links": []
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
         },
         "overrides": []
       },
-      "fill": 1,
-      "fillGradient": 0,
       "gridPos": {
         "h": 7,
         "w": 12,
         "x": 12,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 96,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
       "options": {
-        "alertThreshold": true
+        "legend": {
+          "calcs": [
+            "mean",
+            "lastNotNull",
+            "max",
+            "min"
+          ],
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        }
       },
-      "percentage": false,
       "pluginVersion": "8.3.4",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "system_load_average_1m{instance=\"$instance\",application=\"$application\"}",
           "format": "time_series",
           "intervalFactor": 1,
@@ -521,6 +615,10 @@
           "refId": "A"
         },
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "system_cpu_count{instance=\"$instance\",application=\"$application\"}",
           "format": "time_series",
           "intervalFactor": 1,
@@ -528,35 +626,8 @@
           "refId": "B"
         }
       ],
-      "thresholds": [],
-      "timeRegions": [],
       "title": "Load Average",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "mode": "time",
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false
-      }
+      "type": "timeseries"
     },
     {
       "datasource": {
@@ -569,6 +640,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -580,6 +654,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -622,20 +697,25 @@
         "y": 14
       },
       "id": 66,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "http_server_requests_seconds_count{instance=\"$instance\",application=\"$application\"}",
           "format": "time_series",
           "interval": "",
@@ -658,6 +738,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -669,6 +752,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -711,20 +795,25 @@
         "y": 14
       },
       "id": 110,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "http_server_requests_seconds_sum{instance=\"$instance\",application=\"$application\"}",
           "format": "time_series",
           "interval": "",
@@ -747,6 +836,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -758,6 +850,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -800,20 +893,25 @@
         "y": 14
       },
       "id": 111,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "http_server_requests_seconds_max{instance=\"$instance\",application=\"$application\"}",
           "format": "time_series",
           "interval": "",
@@ -827,6 +925,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -835,6 +937,15 @@
       },
       "id": 48,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "JVM Statistics - Memory",
       "type": "row"
     },
@@ -849,6 +960,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -860,6 +974,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -902,7 +1017,6 @@
         "y": 21
       },
       "id": 85,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -912,10 +1026,12 @@
             "min"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -923,6 +1039,10 @@
       "repeatDirection": "h",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "jvm_memory_used_bytes{instance=\"$instance\",application=\"$application\",id=\"$memory_pool_heap\"}",
           "format": "time_series",
           "intervalFactor": 1,
@@ -930,6 +1050,10 @@
           "refId": "C"
         },
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "jvm_memory_committed_bytes{instance=\"$instance\",application=\"$application\",id=\"$memory_pool_heap\"}",
           "format": "time_series",
           "intervalFactor": 1,
@@ -937,6 +1061,10 @@
           "refId": "A"
         },
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "jvm_memory_max_bytes{instance=\"$instance\",application=\"$application\",id=\"$memory_pool_heap\"}",
           "format": "time_series",
           "intervalFactor": 1,
@@ -948,12 +1076,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -965,6 +1100,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1007,7 +1143,6 @@
         "y": 31
       },
       "id": 88,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -1017,10 +1152,12 @@
             "min"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1071,12 +1208,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1088,6 +1232,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1127,10 +1272,9 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 31
+        "y": 41
       },
       "id": 80,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -1138,10 +1282,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1152,7 +1298,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "irate(jvm_classes_unloaded_classes_total{instance=\"$instance\"}[5m])",
+          "expr": "irate(jvm_classes_unloaded_classes_total{instance=\"$instance\"}[$__range])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1164,12 +1310,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1181,6 +1334,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1220,18 +1374,19 @@
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 39
+        "y": 49
       },
       "id": 83,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1267,12 +1422,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1284,6 +1446,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1327,7 +1490,6 @@
         "y": 51
       },
       "id": 50,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -1337,10 +1499,12 @@
             "min"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1363,12 +1527,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1380,6 +1551,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1422,15 +1594,16 @@
         "y": 56
       },
       "id": 78,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1441,7 +1614,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "irate(jvm_gc_memory_allocated_bytes_total{instance=\"$instance\"}[5m])",
+          "expr": "irate(jvm_gc_memory_allocated_bytes_total{instance=\"$instance\"}[$__range])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1454,7 +1627,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "irate(jvm_gc_memory_promoted_bytes_total{instance=\"$instance\"}[5m])",
+          "expr": "irate(jvm_gc_memory_promoted_bytes_total{instance=\"$instance\"}[$__range])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1476,6 +1649,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1487,6 +1663,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1529,20 +1706,25 @@
         "y": 59
       },
       "id": 82,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "jvm_buffer_memory_used_bytes{instance=\"$instance\",application=\"$application\",id=\"direct\"}",
           "format": "time_series",
           "intervalFactor": 1,
@@ -1550,6 +1732,10 @@
           "refId": "A"
         },
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "jvm_buffer_total_capacity_bytes{instance=\"$instance\",application=\"$application\",id=\"direct\"}",
           "format": "time_series",
           "intervalFactor": 1,
@@ -1561,12 +1747,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1578,6 +1771,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1620,7 +1814,6 @@
         "y": 66
       },
       "id": 68,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -1630,10 +1823,12 @@
             "min"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1683,6 +1878,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1691,16 +1890,32 @@
       },
       "id": 72,
       "panels": [],
-      "title": "JVM Statistics - GC",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "JVM Statistics - GC",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1712,6 +1927,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1754,7 +1970,6 @@
         "y": 75
       },
       "id": 74,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -1764,10 +1979,12 @@
             "sum"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1778,7 +1995,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "irate(jvm_gc_pause_seconds_count{instance=\"$instance\"}[5m])",
+          "expr": "irate(jvm_gc_pause_seconds_count{instance=\"$instance\"}[$__range])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1800,6 +2017,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1811,6 +2031,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1853,7 +2074,6 @@
         "y": 75
       },
       "id": 76,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -1863,16 +2083,22 @@
             "sum"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
-          "expr": "irate(jvm_gc_pause_seconds_sum{instance=\"$instance\",application=\"$application\"}[5m])",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "expr": "irate(jvm_gc_pause_seconds_sum{instance=\"$instance\",application=\"$application\"}[$__range])",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{action}} [{{cause}}]",
@@ -1884,6 +2110,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1892,92 +2122,32 @@
       },
       "id": 34,
       "panels": [],
-      "title": "HikariCP Statistics",
-      "type": "row"
-    },
-    {
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [
-            {
-              "options": {
-                "match": "null",
-                "result": {
-                  "text": "N/A"
-                }
-              },
-              "type": "special"
-            }
-          ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 0,
-        "y": 86
-      },
-      "id": 44,
-      "links": [],
-      "maxDataPoints": 100,
-      "options": {
-        "colorMode": "none",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "/^hikaricp_connections{app=\"orders\",app_kubernetes_io_instance=\"mushop\",app_kubernetes_io_name=\"orders\",instance=\"10.1.0.72:80\",job=\"kubernetes-pods\",kubernetes_namespace=\"mushop\",kubernetes_pod_name=\"mushop-orders-67bb8f45c8-5cr5p\",mockmode=\"false\",pod_template_hash=\"67bb8f45c8\",pool=\"HikariPool-1\",version=\"local\"}$/",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "8.3.4",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
-          "exemplar": true,
-          "expr": "hikaricp_connections{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"}",
-          "format": "time_series",
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "",
           "refId": "A"
         }
       ],
-      "title": "Connections Size",
-      "type": "stat"
+      "title": "HikariCP Statistics",
+      "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1989,6 +2159,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2026,12 +2197,11 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 20,
-        "x": 4,
+        "w": 12,
+        "x": 0,
         "y": 86
       },
       "id": 36,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -2041,10 +2211,12 @@
             "min"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -2090,82 +2262,6 @@
       "title": "Connections",
       "type": "timeseries"
     },
-    {
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [
-            {
-              "options": {
-                "match": "null",
-                "result": {
-                  "text": "N/A"
-                }
-              },
-              "type": "special"
-            }
-          ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 0,
-        "y": 90
-      },
-      "id": 46,
-      "links": [],
-      "maxDataPoints": 100,
-      "options": {
-        "colorMode": "none",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "/^hikaricp_connections_timeout_total{app=\"orders\",app_kubernetes_io_instance=\"mushop\",app_kubernetes_io_name=\"orders\",instance=\"10.1.0.72:80\",job=\"kubernetes-pods\",kubernetes_namespace=\"mushop\",kubernetes_pod_name=\"mushop-orders-67bb8f45c8-5cr5p\",mockmode=\"false\",pod_template_hash=\"67bb8f45c8\",pool=\"HikariPool-1\",version=\"local\"}$/",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "8.3.4",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "hikaricp_connections_timeout_total{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"}",
-          "format": "time_series",
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "",
-          "refId": "A"
-        }
-      ],
-      "title": "Connection Timeout Count",
-      "type": "stat"
-    },
     {
       "datasource": {
         "type": "prometheus",
@@ -2177,6 +2273,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2188,6 +2287,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2224,34 +2324,39 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 6,
-        "w": 8,
-        "x": 0,
-        "y": 94
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 86
       },
-      "id": 38,
-      "links": [],
+      "id": 40,
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
-          "expr": "hikaricp_connections_creation_seconds_sum{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"} / hikaricp_connections_creation_seconds_count{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"}",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "expr": "hikaricp_connections_acquire_seconds_sum{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"} / hikaricp_connections_acquire_seconds_count{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"}",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "Creation Time",
+          "legendFormat": "Acquire Time",
           "refId": "A"
         }
       ],
-      "title": "Connection Creation Time",
+      "title": "Connection Acquire Time",
       "type": "timeseries"
     },
     {
@@ -2265,6 +2370,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2276,6 +2384,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2314,32 +2423,37 @@
       "gridPos": {
         "h": 6,
         "w": 8,
-        "x": 8,
+        "x": 0,
         "y": 94
       },
-      "id": 42,
-      "links": [],
+      "id": 38,
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
-          "expr": "hikaricp_connections_usage_seconds_sum{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"} / hikaricp_connections_usage_seconds_count{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"}",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "expr": "hikaricp_connections_creation_seconds_sum{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"} / hikaricp_connections_creation_seconds_count{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"}",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "Usage Time",
+          "legendFormat": "Creation Time",
           "refId": "A"
         }
       ],
-      "title": "Connection Usage Time",
+      "title": "Connection Creation Time",
       "type": "timeseries"
     },
     {
@@ -2353,6 +2467,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2364,6 +2481,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2402,36 +2520,45 @@
       "gridPos": {
         "h": 6,
         "w": 8,
-        "x": 16,
+        "x": 8,
         "y": 94
       },
-      "id": 40,
-      "links": [],
+      "id": 42,
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
-          "expr": "hikaricp_connections_acquire_seconds_sum{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"} / hikaricp_connections_acquire_seconds_count{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"}",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "expr": "hikaricp_connections_usage_seconds_sum{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"} / hikaricp_connections_usage_seconds_count{instance=\"$instance\",application=\"$application\",pool=\"$hikaricp\"}",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "Acquire Time",
+          "legendFormat": "Usage Time",
           "refId": "A"
         }
       ],
-      "title": "Connection Acquire Time",
+      "title": "Connection Usage Time",
       "type": "timeseries"
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -2440,10 +2567,23 @@
       },
       "id": 101,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Database Stats",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -2483,7 +2623,6 @@
         "y": 101
       },
       "id": 102,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "colorMode": "value",
@@ -2495,6 +2634,7 @@
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "last"
@@ -2502,9 +2642,11 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -2526,6 +2668,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -2565,7 +2711,6 @@
         "y": 101
       },
       "id": 106,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "colorMode": "value",
@@ -2577,6 +2722,7 @@
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "last"
@@ -2584,9 +2730,11 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -2608,6 +2756,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -2647,7 +2799,6 @@
         "y": 101
       },
       "id": 108,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "colorMode": "value",
@@ -2659,6 +2810,7 @@
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "last"
@@ -2666,9 +2818,11 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -2690,6 +2844,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -2697,6 +2855,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2708,6 +2869,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2760,7 +2922,6 @@
         "y": 104
       },
       "id": 107,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "legend": {
@@ -2770,10 +2931,12 @@
             "max"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -2784,7 +2947,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "sum(rate(spring_data_repository_invocations_seconds_max{instance=\"$instance\"}[5m]))",
+          "expr": "sum(rate(spring_data_repository_invocations_seconds_max{instance=\"$instance\"}[$__range]))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2799,6 +2962,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -2807,6 +2974,15 @@
       },
       "id": 18,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "HTTP Statistics",
       "type": "row"
     },
@@ -2821,6 +2997,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2832,6 +3011,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2874,21 +3054,26 @@
         "y": 113
       },
       "id": 4,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
-          "expr": "irate(http_server_requests_seconds_count{instance=\"$instance\",application=\"$application\",uri!~\".*actuator.*\"}[5m])",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "expr": "irate(http_server_requests_seconds_count{instance=\"$instance\",application=\"$application\",uri!~\".*actuator.*\"}[$__range])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2910,6 +3095,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2921,6 +3109,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2963,7 +3152,6 @@
         "y": 120
       },
       "id": 2,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -2972,19 +3160,27 @@
             "min"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
-          "expr": "irate(http_server_requests_seconds_sum{instance=\"$instance\",application=\"$application\",exception=\"None\",uri!~\".*actuator.*\"}[5m]) / irate(http_server_requests_seconds_count{instance=\"$instance\",application=\"$application\",exception=\"None\",uri!~\".*actuator.*\"}[5m])",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "expr": "irate(http_server_requests_seconds_sum{instance=\"$instance\"}[$__range]) / irate(http_server_requests_seconds_count{instance=\"$instance\"}[$__range])",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{method}} [{{status}}] - {{uri}}",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -2993,6 +3189,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -3001,6 +3201,15 @@
       },
       "id": 8,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Logback Statistics",
       "type": "row"
     },
@@ -3015,6 +3224,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -3026,6 +3238,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -3068,7 +3281,6 @@
         "y": 128
       },
       "id": 6,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -3079,20 +3291,28 @@
             "sum"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
           "alias": "",
-          "expr": "irate(logback_events_total{instance=\"$instance\",application=\"$application\",level=\"info\"}[5m])",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "expr": "irate(logback_events_total{instance=\"$instance\",level=\"info\"}[$__range])",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "info",
+          "range": true,
           "rawSql": "SELECT\n  $__time(time_column),\n  value1\nFROM\n  metric_table\nWHERE\n  $__timeFilter(time_column)\n",
           "refId": "A"
         }
@@ -3111,6 +3331,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -3122,6 +3345,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -3164,7 +3388,6 @@
         "y": 128
       },
       "id": 10,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -3175,20 +3398,28 @@
             "sum"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
           "alias": "",
-          "expr": "irate(logback_events_total{instance=\"$instance\",application=\"$application\",level=\"error\"}[5m])",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "expr": "irate(logback_events_total{instance=\"$instance\",level=\"error\"}[$__range])",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "error",
+          "range": true,
           "rawSql": "SELECT\n  $__time(time_column),\n  value1\nFROM\n  metric_table\nWHERE\n  $__timeFilter(time_column)\n",
           "refId": "A"
         }
@@ -3207,6 +3438,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -3218,6 +3452,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -3240,8 +3475,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -3260,7 +3494,6 @@
         "y": 135
       },
       "id": 14,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -3271,20 +3504,28 @@
             "sum"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
           "alias": "",
-          "expr": "irate(logback_events_total{instance=\"$instance\",application=\"$application\",level=\"warn\"}[5m])",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "expr": "irate(logback_events_total{instance=\"$instance\",level=\"warn\"}[$__range])",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "warn",
+          "range": true,
           "rawSql": "SELECT\n  $__time(time_column),\n  value1\nFROM\n  metric_table\nWHERE\n  $__timeFilter(time_column)\n",
           "refId": "A"
         }
@@ -3303,6 +3544,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -3314,6 +3558,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -3336,8 +3581,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -3356,7 +3600,6 @@
         "y": 135
       },
       "id": 16,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -3367,17 +3610,23 @@
             "sum"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
           "alias": "",
-          "expr": "irate(logback_events_total{instance=\"$instance\",application=\"$application\",level=\"debug\"}[5m])",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "expr": "irate(logback_events_total{instance=\"$instance\",application=\"$application\",level=\"debug\"}[$__range])",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "debug",
@@ -3399,6 +3648,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -3410,6 +3662,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -3432,8 +3685,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -3452,7 +3704,6 @@
         "y": 135
       },
       "id": 20,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -3463,20 +3714,28 @@
             "sum"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
       "targets": [
         {
           "alias": "",
-          "expr": "irate(logback_events_total{instance=\"$instance\",application=\"$application\",level=\"trace\"}[5m])",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "expr": "irate(logback_events_total{instance=\"$instance\",level=\"trace\"}[$__range])",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "trace",
+          "range": true,
           "rawSql": "SELECT\n  $__time(time_column),\n  value1\nFROM\n  metric_table\nWHERE\n  $__timeFilter(time_column)\n",
           "refId": "A"
         }
@@ -3486,8 +3745,7 @@
     }
   ],
   "refresh": "10s",
-  "schemaVersion": 34,
-  "style": "dark",
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": [
@@ -3554,10 +3812,9 @@
       },
       {
         "current": {
-          "isNone": true,
           "selected": false,
-          "text": "None",
-          "value": ""
+          "text": "HikariPool-1",
+          "value": "HikariPool-1"
         },
         "datasource": {
           "type": "prometheus",
@@ -3646,7 +3903,7 @@
     ]
   },
   "time": {
-    "from": "now-15m",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {
@@ -3676,6 +3933,6 @@
   "timezone": "",
   "title": "Spring Boot Statistics & Endpoint Metrics",
   "uid": "OS7-NUiGz",
-  "version": 1,
+  "version": 2,
   "weekStart": ""
 }
\ No newline at end of file

diff --git a/compose/metrics/dashboards/dashboard-jvm-basic.json b/compose/metrics/dashboards/dashboard-jvm-basic.json
index dce01fc..a7c2605 100644 (file)
--- a/compose/metrics/dashboards/dashboard-jvm-basic.json
+++ b/compose/metrics/dashboards/dashboard-jvm-basic.json
@@ -3,7 +3,10 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -19,7 +22,10 @@
         "type": "dashboard"
       },
       {
-        "datasource": "dkSf71fnz",
+        "datasource": {
+          "type": "prometheus",
+          "uid": "dkSf71fnz"
+        },
         "enable": true,
         "expr": "resets(process_uptime_seconds{job=\"$job\"}[1m]) > 0",
         "iconColor": "rgba(255, 96, 96, 1)",
@@ -37,13 +43,16 @@
   "fiscalYearStartMonth": 0,
   "gnetId": 4701,
   "graphTooltip": 1,
-  "id": 4,
-  "iteration": 1645634994099,
+  "id": 5,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -52,10 +61,23 @@
       },
       "id": 125,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Quick Facts",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -97,13 +119,13 @@
         "y": 1
       },
       "id": 63,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "colorMode": "value",
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "lastNotNull"
@@ -111,22 +133,26 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "time()-process_start_time_seconds{job=\"$job\"}",
+          "expr": "(time()-process_start_time_seconds{job=\"$job\"})",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "",
           "metric": "",
+          "range": true,
           "refId": "A",
           "step": 14400
         }
@@ -179,13 +205,13 @@
         "y": 1
       },
       "id": 92,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "colorMode": "value",
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "lastNotNull"
@@ -193,11 +219,17 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
           "expr": "process_start_time_seconds{job=\"$job\"}*1000",
           "format": "time_series",
           "intervalFactor": 2,
@@ -211,6 +243,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -256,13 +292,13 @@
         "y": 1
       },
       "id": 65,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "colorMode": "value",
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "lastNotNull"
@@ -270,9 +306,11 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -293,6 +331,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -348,13 +390,13 @@
         "y": 1
       },
       "id": 75,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "colorMode": "value",
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "lastNotNull"
@@ -362,9 +404,11 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -386,6 +430,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -394,16 +442,32 @@
       },
       "id": 127,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "JVM Memory",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -415,6 +479,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -457,7 +522,6 @@
         "y": 5
       },
       "id": 24,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -465,10 +529,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -521,12 +587,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -538,6 +611,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -580,7 +654,6 @@
         "y": 5
       },
       "id": 25,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -588,10 +661,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -644,12 +719,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -661,6 +743,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -703,7 +786,6 @@
         "y": 5
       },
       "id": 26,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -711,10 +793,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -767,12 +851,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -784,6 +875,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -826,7 +918,6 @@
         "y": 5
       },
       "id": 86,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -834,10 +925,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -890,6 +983,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -898,16 +995,32 @@
       },
       "id": 128,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "JVM Misc",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -919,6 +1032,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -963,7 +1077,6 @@
         "y": 13
       },
       "id": 106,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -971,10 +1084,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -984,14 +1099,16 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(process_cpu_seconds_total{job=\"$job\"}[5m])",
+          "expr": "rate(process_cpu_seconds_total{job=\"$job\"}[$__range])",
           "format": "time_series",
           "hide": false,
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "system + process",
           "metric": "",
+          "range": true,
           "refId": "A",
           "step": 2400
         },
@@ -1000,13 +1117,15 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "avg_over_time(process_cpu_usage{job=\"$job\"}[1h])",
+          "expr": "avg_over_time(process_cpu_usage{job=\"$job\"}[$__range])",
           "format": "time_series",
           "hide": false,
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "process-1h",
+          "range": true,
           "refId": "C"
         }
       ],
@@ -1014,12 +1133,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1031,6 +1157,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1074,17 +1201,18 @@
         "y": 13
       },
       "id": 61,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
             "lastNotNull"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1126,12 +1254,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1143,6 +1278,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1186,17 +1322,18 @@
         "y": 13
       },
       "id": 32,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
             "lastNotNull"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1264,12 +1401,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1281,6 +1425,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1413,17 +1558,18 @@
         "y": 13
       },
       "id": 124,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
             "lastNotNull"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1447,6 +1593,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1456,16 +1606,32 @@
       "id": 129,
       "panels": [],
       "repeat": "persistence_counts",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "JVM Memory Pools (Heap)",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1477,6 +1643,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1519,17 +1686,18 @@
         "y": 21
       },
       "id": 3,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
             "lastNotNull"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1589,6 +1757,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1597,16 +1769,32 @@
       },
       "id": 130,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "JVM Memory Pools (Non-Heap)",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1618,6 +1806,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1660,17 +1849,18 @@
         "y": 29
       },
       "id": 78,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
             "lastNotNull"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1730,6 +1920,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1738,16 +1932,32 @@
       },
       "id": 131,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Garbage Collection",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1759,6 +1969,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1801,7 +2012,6 @@
         "y": 37
       },
       "id": 98,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -1809,10 +2019,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1822,13 +2034,15 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(rate(jvm_gc_collection_seconds_count{job=\"xacml-pdp-metrics\"}[5m]))",
+          "expr": "sum(rate(jvm_gc_collection_seconds_count{job=\"$job\"}[$__range]))",
           "format": "time_series",
           "hide": false,
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "rate",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -1836,12 +2050,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1853,6 +2074,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1895,7 +2117,6 @@
         "y": 37
       },
       "id": 101,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -1903,10 +2124,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -1917,7 +2140,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "sum(rate(jvm_gc_collection_seconds_sum{job=\"$job\"}[5m]))/sum(rate(jvm_gc_collection_seconds_count{job=\"$job\"}[5m]))",
+          "expr": "sum(rate(jvm_gc_collection_seconds_sum{job=\"$job\"}[$__range]))/sum(rate(jvm_gc_collection_seconds_count{job=\"$job\"}[$__range]))",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -1944,12 +2167,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1961,6 +2191,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2003,7 +2234,6 @@
         "y": 37
       },
       "id": 99,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -2011,10 +2241,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -2025,7 +2257,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "sum(rate(jvm_memory_pool_allocated_bytes_total{job=\"$job\"}[5m]))",
+          "expr": "sum(rate(jvm_memory_pool_allocated_bytes_total{job=\"$job\"}[$__range]))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2038,7 +2270,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "sum(rate(jvm_memory_pool_allocated_bytes_created{job=\"$job\"}[5m]))",
+          "expr": "sum(rate(jvm_memory_pool_allocated_bytes_created{job=\"$job\"}[$__range]))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2051,6 +2283,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -2059,16 +2295,32 @@
       },
       "id": 132,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Classloading",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2080,6 +2332,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2122,7 +2375,6 @@
         "y": 45
       },
       "id": 37,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -2130,10 +2382,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -2143,6 +2397,7 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
           "expr": "jvm_classes_loaded{job=\"$job\"}",
           "format": "time_series",
@@ -2150,20 +2405,45 @@
           "intervalFactor": 2,
           "legendFormat": "loaded",
           "metric": "",
+          "range": true,
           "refId": "A",
           "step": 1200
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "disableTextWrap": false,
+          "editorMode": "code",
+          "expr": "jvm_classes_loaded_total{job=\"$job\"}",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "Classes loaded",
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2175,6 +2455,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2216,7 +2497,6 @@
         "y": 45
       },
       "id": 38,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -2224,10 +2504,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -2237,16 +2519,36 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "delta(jvm_classes_loaded{job=\"$job\"}[5m])",
+          "expr": "delta(jvm_classes_loaded_classes{job=\"$job\"}[$__range])",
           "format": "time_series",
           "hide": false,
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "delta-1m",
           "metric": "",
+          "range": true,
           "refId": "A",
           "step": 1200
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "delta(jvm_classes_loaded_total{job=\"$job\"}[$__range])",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "delta-1m",
+          "metric": "",
+          "range": true,
+          "refId": "B",
+          "step": 1200
         }
       ],
       "title": "Class delta",
@@ -2254,6 +2556,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -2262,16 +2568,32 @@
       },
       "id": 133,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Buffer Pools",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2283,6 +2605,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2325,17 +2648,18 @@
         "y": 53
       },
       "id": 33,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
             "lastNotNull"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -2375,12 +2699,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2392,6 +2723,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2435,7 +2767,6 @@
         "y": 53
       },
       "id": 83,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -2443,10 +2774,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -2471,12 +2804,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2488,6 +2828,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2530,7 +2871,6 @@
         "y": 53
       },
       "id": 85,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -2538,10 +2878,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -2577,16 +2919,23 @@
           "step": 2400
         }
       ],
-      "title": "Mapped Buffers",
+      "title": "Mapped Buffers (Bytes)",
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2598,6 +2947,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2641,7 +2991,6 @@
         "y": 53
       },
       "id": 84,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -2649,10 +2998,12 @@
             "max"
           ],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -2678,16 +3029,15 @@
     }
   ],
   "refresh": "30s",
-  "schemaVersion": 34,
-  "style": "dark",
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": [
       {
         "current": {
           "selected": false,
-          "text": "apex-pdp-metrics",
-          "value": "apex-pdp-metrics"
+          "text": "xacml-pdp-metrics",
+          "value": "xacml-pdp-metrics"
         },
         "datasource": {
           "type": "prometheus",
@@ -2716,7 +3066,7 @@
     ]
   },
   "time": {
-    "from": "now-24h",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {
@@ -2748,6 +3098,6 @@
   "timezone": "browser",
   "title": "JVM Basic Metrics",
   "uid": "SLdKRfB7z",
-  "version": 1,
+  "version": 2,
   "weekStart": ""
 }
\ No newline at end of file

diff --git a/compose/metrics/dashboards/dashboard-pap.json b/compose/metrics/dashboards/dashboard-pap.json
index 275fe83..13e03f6 100644 (file)
--- a/compose/metrics/dashboards/dashboard-pap.json
+++ b/compose/metrics/dashboards/dashboard-pap.json
@@ -3,7 +3,10 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -22,12 +25,16 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 4,
+  "id": 6,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -36,10 +43,23 @@
       },
       "id": 19,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Quick Info",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Uptime per pod for Policy PAP application calculated in days",
       "fieldConfig": {
         "defaults": {
@@ -60,7 +80,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "s"
         },
         "overrides": []
       },
@@ -76,23 +97,27 @@
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "auto",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "text": {},
-        "textMode": "value_and_name"
+        "textMode": "value_and_name",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "process_uptime_seconds{job=\"pap-metrics\"} / 86400",
+          "expr": "process_uptime_seconds{job=\"pap-metrics\"}",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -101,11 +126,14 @@
         }
       ],
       "title": "Process Uptime (days)",
-      "transformations": [],
       "transparent": true,
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy PAP CPU Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -168,6 +196,8 @@
       },
       "id": 26,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -178,9 +208,10 @@
         },
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
+        "sizing": "auto",
         "text": {}
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -198,6 +229,10 @@
       "type": "gauge"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy PAP Memory Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -258,11 +293,13 @@
       "gridPos": {
         "h": 6,
         "w": 8,
-        "x": 15,
+        "x": 14,
         "y": 1
       },
       "id": 27,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -272,9 +309,10 @@
           "values": false
         },
         "showThresholdLabels": false,
-        "showThresholdMarkers": false
+        "showThresholdMarkers": false,
+        "sizing": "auto"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -306,6 +344,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -314,10 +356,23 @@
       },
       "id": 17,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "System",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy PAP CPU Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -325,6 +380,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -336,6 +394,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -405,8 +464,8 @@
         ]
       },
       "gridPos": {
-        "h": 14,
-        "w": 12,
+        "h": 9,
+        "w": 8,
         "x": 0,
         "y": 8
       },
@@ -420,6 +479,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Max",
           "sortDesc": true
         },
@@ -458,7 +518,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "avg_over_time(process_cpu_usage{job=\"pap-metrics\"}[1h]) * 100",
+          "expr": "avg_over_time(process_cpu_usage{job=\"pap-metrics\"}[$__range]) * 100",
           "hide": false,
           "interval": "",
           "legendFormat": "process_1h: {{pod}}",
@@ -469,6 +529,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy PAP Memory Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -476,6 +540,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -487,6 +554,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -556,9 +624,9 @@
         ]
       },
       "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 12,
+        "h": 9,
+        "w": 7,
+        "x": 8,
         "y": 8
       },
       "id": 13,
@@ -571,6 +639,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Last",
           "sortDesc": false
         },
@@ -609,6 +678,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy PAP JVM Threads",
       "fieldConfig": {
         "defaults": {
@@ -616,6 +689,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -627,6 +703,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -662,10 +739,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 13,
-        "w": 12,
-        "x": 12,
-        "y": 19
+        "h": 9,
+        "w": 7,
+        "x": 15,
+        "y": 8
       },
       "id": 8,
       "options": {
@@ -675,7 +752,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "multi",
@@ -725,18 +803,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 32
+        "y": 17
       },
       "id": 15,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Garbage Collection",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "GC operations per second",
       "fieldConfig": {
         "defaults": {
@@ -744,6 +839,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -755,6 +853,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 1,
@@ -793,7 +892,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 33
+        "y": 18
       },
       "id": 10,
       "options": {
@@ -804,7 +903,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -818,7 +918,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "rate(jvm_gc_pause_seconds_count{job=\"pap-metrics\"}[1h])",
+          "expr": "rate(jvm_gc_pause_seconds_count{job=\"pap-metrics\"}[$__range])",
           "interval": "",
           "legendFormat": "{{action}} ({{cause}}) : {{ pod }}",
           "refId": "A"
@@ -828,6 +928,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Average GC Time",
       "fieldConfig": {
         "defaults": {
@@ -835,6 +939,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -846,6 +953,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 1,
@@ -883,7 +991,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 33
+        "y": 18
       },
       "id": 22,
       "options": {
@@ -892,7 +1000,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -906,7 +1015,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "rate(jvm_gc_pause_seconds_sum{job=\"pap-metrics\"}[1h])/rate(jvm_gc_pause_seconds_count{job=\"pap-metrics\"}[1h])",
+          "expr": "rate(jvm_gc_pause_seconds_sum{job=\"pap-metrics\"}[$__range])/rate(jvm_gc_pause_seconds_count{job=\"pap-metrics\"}[$__range])",
           "interval": "",
           "legendFormat": "avg {{action}} ({{cause}}) : {{ pod }}",
           "refId": "A"
@@ -917,18 +1026,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 41
+        "y": 26
       },
       "id": 21,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Requests",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Total number of PAP requests per second filtered by URI and REST method",
       "fieldConfig": {
         "defaults": {
@@ -936,6 +1062,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -947,6 +1076,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -971,8 +1101,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -988,7 +1117,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 42
+        "y": 27
       },
       "id": 12,
       "options": {
@@ -998,6 +1127,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Last",
           "sortDesc": true
         },
@@ -1014,7 +1144,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "avg by(method,uri) (rate(http_server_requests_seconds_count{job=\"pap-metrics\"}[5m]))",
+          "expr": "avg by(method,uri) (rate(http_server_requests_seconds_count{job=\"pap-metrics\"}[$__range]))",
           "interval": "",
           "legendFormat": "{{ method }} - {{ uri }}",
           "refId": "A"
@@ -1024,6 +1154,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Time taken for PAP request filtered by REST method and URI",
       "fieldConfig": {
         "defaults": {
@@ -1031,6 +1165,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1042,6 +1179,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -1066,8 +1204,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1083,7 +1220,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 42
+        "y": 27
       },
       "id": 23,
       "options": {
@@ -1094,6 +1231,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Max",
           "sortDesc": true
         },
@@ -1119,6 +1257,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Percentage of PAP calls that passed filtered by method and URI",
       "fieldConfig": {
         "defaults": {
@@ -1130,8 +1272,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1147,10 +1288,12 @@
         "h": 11,
         "w": 12,
         "x": 0,
-        "y": 50
+        "y": 35
       },
       "id": 29,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1161,11 +1304,12 @@
         },
         "showThresholdLabels": false,
         "showThresholdMarkers": true,
+        "sizing": "auto",
         "text": {
           "titleSize": 12
         }
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -1183,6 +1327,10 @@
       "type": "gauge"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Stats for Policy PAP Deployment/Undeployment Operations",
       "fieldConfig": {
         "defaults": {
@@ -1194,8 +1342,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1210,11 +1357,15 @@
         "h": 11,
         "w": 12,
         "x": 12,
-        "y": 50
+        "y": 35
       },
       "id": 24,
       "options": {
         "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
         "orientation": "vertical",
         "reduceOptions": {
           "calcs": [
@@ -1224,11 +1375,13 @@
           "values": false
         },
         "showUnfilled": false,
+        "sizing": "auto",
         "text": {
           "titleSize": 12
-        }
+        },
+        "valueMode": "color"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -1309,20 +1462,19 @@
     }
   ],
   "refresh": "",
-  "schemaVersion": 34,
-  "style": "dark",
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-3h",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
-  "title": "Policy PAP Jakarta",
+  "title": "Policy PAP",
   "uid": "DM56uKldd",
-  "version": 2,
+  "version": 3,
   "weekStart": ""
 }
\ No newline at end of file

diff --git a/compose/metrics/dashboards/dashboard-xacml-pdp.json b/compose/metrics/dashboards/dashboard-xacml-pdp.json
index a1c10c5..75b776b 100644 (file)
--- a/compose/metrics/dashboards/dashboard-xacml-pdp.json
+++ b/compose/metrics/dashboards/dashboard-xacml-pdp.json
@@ -3,7 +3,10 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -22,12 +25,16 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 5,
+  "id": 6,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -36,10 +43,23 @@
       },
       "id": 19,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Quick Info",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Uptime per pod for Policy XACML-PDP application calculated in days",
       "fieldConfig": {
         "defaults": {
@@ -60,7 +80,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "s"
         },
         "overrides": []
       },
@@ -76,25 +97,29 @@
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "vertical",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [],
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "text": {
           "titleSize": 16
         },
-        "textMode": "value_and_name"
+        "textMode": "value_and_name",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "(time() - process_start_time_seconds{job=\"xacml-pdp-metrics\"}) / 86400",
+          "expr": "(time() - process_start_time_seconds{job=\"xacml-pdp-metrics\"})",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -102,12 +127,15 @@
           "refId": "A"
         }
       ],
-      "title": "Process Uptime (days)",
-      "transformations": [],
+      "title": "Process Uptime",
       "transparent": true,
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy XACML-PDP CPU Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -164,12 +192,14 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 8,
-        "x": 7,
+        "w": 6,
+        "x": 6,
         "y": 1
       },
       "id": 26,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -180,9 +210,10 @@
         },
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
+        "sizing": "auto",
         "text": {}
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -190,7 +221,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "irate(process_cpu_seconds_total{job=\"xacml-pdp-metrics\"}[5m])*100",
+          "expr": "irate(process_cpu_seconds_total{job=\"xacml-pdp-metrics\"}[$__range])*100",
           "interval": "",
           "legendFormat": "{{pod}}",
           "refId": "A"
@@ -200,6 +231,10 @@
       "type": "gauge"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy XACML-PDP Memory Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -259,12 +294,14 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 8,
-        "x": 16,
+        "w": 6,
+        "x": 12,
         "y": 1
       },
       "id": 27,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -274,9 +311,10 @@
           "values": false
         },
         "showThresholdLabels": false,
-        "showThresholdMarkers": false
+        "showThresholdMarkers": false,
+        "sizing": "auto"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -296,6 +334,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -304,10 +346,23 @@
       },
       "id": 17,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "System",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy XACML-PDP CPU Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -315,6 +370,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -326,6 +384,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -395,8 +454,8 @@
         ]
       },
       "gridPos": {
-        "h": 14,
-        "w": 12,
+        "h": 9,
+        "w": 8,
         "x": 0,
         "y": 8
       },
@@ -410,6 +469,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Max",
           "sortDesc": true
         },
@@ -424,10 +484,12 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "irate(process_cpu_seconds_total{job=\"xacml-pdp-metrics\"}[5m])*100",
+          "expr": "irate(process_cpu_seconds_total{job=\"xacml-pdp-metrics\"}[$__range])*100",
           "interval": "",
           "legendFormat": "system: {{pod}}",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -435,6 +497,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy XACML-PDP Memory Usage Monitoring",
       "fieldConfig": {
         "defaults": {
@@ -442,6 +508,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -453,6 +522,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineStyle": {
               "fill": "solid"
@@ -522,9 +592,9 @@
         ]
       },
       "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 12,
+        "h": 9,
+        "w": 7,
+        "x": 8,
         "y": 8
       },
       "id": 13,
@@ -537,6 +607,7 @@
           ],
           "displayMode": "table",
           "placement": "bottom",
+          "showLegend": true,
           "sortBy": "Last",
           "sortDesc": false
         },
@@ -551,11 +622,13 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "100 * jvm_memory_bytes_used{area=\"heap\", job=\"xacml-pdp-metrics\"} / jvm_memory_bytes_max{area=\"heap\", job=\"xacml-pdp-metrics\"}",
+          "expr": "100 * (jvm_memory_bytes_used{area=\"heap\", job=\"xacml-pdp-metrics\"} / jvm_memory_bytes_max{area=\"heap\", job=\"xacml-pdp-metrics\"})",
           "hide": false,
           "interval": "",
           "legendFormat": "Heap : {{ pod }}",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -563,6 +636,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy XACML-PDP JVM Threads",
       "fieldConfig": {
         "defaults": {
@@ -570,6 +647,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -581,6 +661,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -616,10 +697,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 13,
-        "w": 12,
-        "x": 12,
-        "y": 19
+        "h": 9,
+        "w": 8,
+        "x": 15,
+        "y": 8
       },
       "id": 8,
       "options": {
@@ -630,7 +711,8 @@
             "mean"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "multi",
@@ -680,18 +762,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 32
+        "y": 17
       },
       "id": 15,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Garbage Collection",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "GC operations per second",
       "fieldConfig": {
         "defaults": {
@@ -699,6 +798,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -710,6 +812,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 1,
@@ -748,7 +851,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 33
+        "y": 18
       },
       "id": 10,
       "options": {
@@ -759,7 +862,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -772,10 +876,12 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(jvm_gc_collection_seconds_count{job=\"xacml-pdp-metrics\"}[5m])",
+          "expr": "rate(jvm_gc_collection_seconds_count{job=\"xacml-pdp-metrics\"}[$__range])",
           "interval": "",
           "legendFormat": "{{ gc }} : {{ pod }}",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -783,6 +889,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Average GC Time",
       "fieldConfig": {
         "defaults": {
@@ -790,6 +900,9 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -801,6 +914,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 1,
@@ -838,7 +952,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 33
+        "y": 18
       },
       "id": 22,
       "options": {
@@ -847,7 +961,8 @@
             "last"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -860,10 +975,12 @@
             "type": "prometheus",
             "uid": "dkSf71fnz"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(jvm_gc_collection_seconds_sum{job=\"xacml-pdp-metrics\"}[5m])/rate(jvm_gc_collection_seconds_count{job=\"xacml-pdp-metrics\"}[5m])",
+          "expr": "rate(jvm_gc_collection_seconds_sum{job=\"xacml-pdp-metrics\"}[$__range])/rate(jvm_gc_collection_seconds_count{job=\"xacml-pdp-metrics\"}[$__range])",
           "interval": "",
           "legendFormat": "avg {{ gc }} : {{ pod }}",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -872,18 +989,35 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 41
+        "y": 26
       },
       "id": 21,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Requests",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy Deployments Total for XACML-PDP",
       "fieldConfig": {
         "defaults": {
@@ -912,11 +1046,15 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 42
+        "y": 27
       },
       "id": 12,
       "options": {
         "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -925,9 +1063,11 @@
           "fields": "",
           "values": false
         },
-        "showUnfilled": true
+        "showUnfilled": true,
+        "sizing": "auto",
+        "valueMode": "color"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -981,6 +1121,10 @@
       "type": "bargauge"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy Decisions Total for XACML-PDP per instance",
       "fieldConfig": {
         "defaults": {
@@ -1009,11 +1153,15 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 42
+        "y": 27
       },
       "id": 30,
       "options": {
         "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1022,9 +1170,11 @@
           "fields": "",
           "values": false
         },
-        "showUnfilled": true
+        "showUnfilled": true,
+        "sizing": "auto",
+        "valueMode": "color"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -1065,98 +1215,22 @@
       ],
       "title": "Policy Decisions",
       "type": "bargauge"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 50
-      },
-      "id": 34,
-      "panels": [],
-      "title": "Logging",
-      "type": "row"
-    },
-    {
-      "description": "Policy number of log entries for XACML-PDP",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 51
-      },
-      "id": 36,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "8.3.4",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "dkSf71fnz"
-          },
-          "exemplar": true,
-          "expr": "logback_appender_total{job=\"xacml-pdp-metrics\"}",
-          "interval": "",
-          "legendFormat": "Level",
-          "refId": "A"
-        }
-      ],
-      "title": "Logback Total",
-      "type": "stat"
     }
   ],
   "refresh": "",
-  "schemaVersion": 34,
-  "style": "dark",
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-3h",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
   "title": "Policy XACML-PDP",
   "uid": "Fk_2HkmVk",
-  "version": 2,
+  "version": 3,
   "weekStart": ""
 }
\ No newline at end of file

diff --git a/compose/metrics/dashboards/sla-metrics.json b/compose/metrics/dashboards/sla-metrics.json
index 5287b54..d48be38 100644 (file)
--- a/compose/metrics/dashboards/sla-metrics.json
+++ b/compose/metrics/dashboards/sla-metrics.json
@@ -3,7 +3,10 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -24,12 +27,15 @@
   "gnetId": 14430,
   "graphTooltip": 0,
   "id": 3,
-  "iteration": 1673599566103,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -38,10 +44,23 @@
       },
       "id": 54,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Basic Statistics",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -83,13 +102,13 @@
         "y": 1
       },
       "id": 52,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "colorMode": "value",
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "lastNotNull"
@@ -97,9 +116,11 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -121,6 +142,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -161,13 +186,13 @@
         "y": 1
       },
       "id": 56,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
         "colorMode": "value",
         "graphMode": "none",
         "justifyMode": "auto",
         "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
             "lastNotNull"
@@ -175,9 +200,11 @@
           "fields": "",
           "values": false
         },
-        "textMode": "auto"
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -199,6 +226,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -246,9 +277,10 @@
         "y": 7
       },
       "id": 58,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "horizontal",
         "reduceOptions": {
           "calcs": [
@@ -258,9 +290,10 @@
           "values": false
         },
         "showThresholdLabels": false,
-        "showThresholdMarkers": true
+        "showThresholdMarkers": true,
+        "sizing": "auto"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -281,6 +314,10 @@
       "type": "gauge"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -338,9 +375,10 @@
         "y": 7
       },
       "id": 60,
-      "links": [],
       "maxDataPoints": 100,
       "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
         "orientation": "horizontal",
         "reduceOptions": {
           "calcs": [
@@ -350,9 +388,10 @@
           "values": false
         },
         "showThresholdLabels": false,
-        "showThresholdMarkers": true
+        "showThresholdMarkers": true,
+        "sizing": "auto"
       },
-      "pluginVersion": "8.3.4",
+      "pluginVersion": "11.1.0",
       "targets": [
         {
           "datasource": {
@@ -373,12 +412,19 @@
       "type": "gauge"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -390,6 +436,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -432,7 +479,6 @@
         "y": 13
       },
       "id": 96,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -442,10 +488,12 @@
             "min"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -481,12 +529,19 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -498,6 +553,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -540,7 +596,6 @@
         "y": 21
       },
       "id": 95,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -550,10 +605,12 @@
             "min"
           ],
           "displayMode": "table",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "pluginVersion": "8.3.4",
@@ -589,6 +646,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -627,8 +688,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -655,7 +715,8 @@
             "max"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single"
@@ -679,6 +740,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -687,10 +752,23 @@
       },
       "id": 18,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "HTTP Statistics",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -730,8 +808,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -750,7 +827,6 @@
         "y": 37
       },
       "id": 4,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -758,7 +834,8 @@
             "sum"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single"
@@ -772,7 +849,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "rate(http_server_requests_seconds_count{uri!~\".*metrics.*|.*prometheus.*\"}[5m])",
+          "expr": "rate(http_server_requests_seconds_count{uri!~\".*metrics.*|.*prometheus.*\"}[$__range])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -784,6 +861,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -823,8 +904,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -843,7 +923,6 @@
         "y": 47
       },
       "id": 2,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -853,7 +932,8 @@
             "lastNotNull"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single"
@@ -867,7 +947,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "irate(http_server_requests_seconds_sum{job=~\"api-metrics|acm-metrics|pap-metrics\",outcome=\"SUCCESS\",uri!~\".*metrics.*|.*prometheus.*\"}[5m]) / irate(http_server_requests_seconds_count{job=~\"api-metrics|acm-metrics|pap-metrics\",outcome=\"SUCCESS\",uri!~\".*metrics.*|.*prometheus.*\"}[5m])",
+          "expr": "irate(http_server_requests_seconds_sum{job=~\"api-metrics|acm-metrics|pap-metrics\",outcome=\"SUCCESS\",uri!~\".*metrics.*|.*prometheus.*\"}[$__range]) / irate(http_server_requests_seconds_count{job=~\"api-metrics|acm-metrics|pap-metrics\",outcome=\"SUCCESS\",uri!~\".*metrics.*|.*prometheus.*\"}[$__range])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -879,6 +959,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -918,8 +1002,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -938,7 +1021,6 @@
         "y": 57
       },
       "id": 111,
-      "links": [],
       "options": {
         "legend": {
           "calcs": [
@@ -946,7 +1028,8 @@
             "max"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single"
@@ -973,6 +1056,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -981,10 +1068,23 @@
       },
       "id": 115,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Deployment statistics",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "mappings": [],
@@ -992,8 +1092,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1044,6 +1143,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "mappings": [],
@@ -1051,8 +1154,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1103,6 +1205,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "mappings": [],
@@ -1110,8 +1216,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1162,6 +1267,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "mappings": [],
@@ -1169,8 +1278,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1221,6 +1329,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Policy Executions Total for APEX-PDP",
       "fieldConfig": {
         "defaults": {
@@ -1229,8 +1341,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1305,6 +1416,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1343,8 +1458,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1371,7 +1485,8 @@
             "max"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single"
@@ -1384,7 +1499,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "irate(pap_policy_deployments_seconds_sum[5m])/irate(pap_policy_deployments_seconds_count[5m])",
+          "expr": "irate(pap_policy_deployments_seconds_sum[$__range])/irate(pap_policy_deployments_seconds_count[$__range])",
           "interval": "",
           "legendFormat": "{{operation}} - {{status}}",
           "refId": "A"
@@ -1395,6 +1510,10 @@
     },
     {
       "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1403,10 +1522,23 @@
       },
       "id": 124,
       "panels": [],
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "dkSf71fnz"
+          },
+          "refId": "A"
+        }
+      ],
       "title": "Apex-PDP",
       "type": "row"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1448,8 +1580,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1504,6 +1635,10 @@
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -1516,8 +1651,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1571,10 +1705,13 @@
         }
       ],
       "title": "Engine Uptime (since last start)",
-      "transformations": [],
       "type": "stat"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Number of APEX event execution counter per engine thread",
       "fieldConfig": {
         "defaults": {
@@ -1614,8 +1751,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1642,7 +1778,8 @@
             "max"
           ],
           "displayMode": "table",
-          "placement": "right"
+          "placement": "right",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -1657,7 +1794,7 @@
             "uid": "dkSf71fnz"
           },
           "exemplar": true,
-          "expr": "rate(pdpa_engine_average_execution_time_seconds{job=\"apex-pdp-metrics\"}[5m])",
+          "expr": "rate(pdpa_engine_average_execution_time_seconds{job=\"apex-pdp-metrics\"}[$__range])",
           "format": "time_series",
           "interval": "",
           "legendFormat": "{{ engine_instance_id }}",
@@ -1668,6 +1805,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "dkSf71fnz"
+      },
       "description": "Number of APEX event execution counter per engine thread",
       "fieldConfig": {
         "defaults": {
@@ -1700,6 +1841,7 @@
         "legend": {
           "displayMode": "table",
           "placement": "right",
+          "showLegend": true,
           "values": [
             "value"
           ]
@@ -1736,14 +1878,13 @@
     }
   ],
   "refresh": "10s",
-  "schemaVersion": 34,
-  "style": "dark",
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-5m",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {
@@ -1773,6 +1914,6 @@
   "timezone": "",
   "title": "SLA's Metrics",
   "uid": "ySoel0jnk",
-  "version": 6,
+  "version": 7,
   "weekStart": ""
 }
\ No newline at end of file

diff --git a/csit/resources/scripts/build-csit-docker-image.sh b/csit/resources/scripts/build-csit-docker-image.sh
index 8fd300f..c80afc4 100755 (executable)
--- a/csit/resources/scripts/build-csit-docker-image.sh
+++ b/csit/resources/scripts/build-csit-docker-image.sh
@@ -46,7 +46,7 @@ docker image rm -f ${ROBOT_DOCKER_IMAGE}
 clone_models
 
 echo "Build robot framework docker image"
-docker build . --file Dockerfile  --tag "${ROBOT_DOCKER_IMAGE}" --quiet
+docker build . --file Dockerfile  --tag "onap/${ROBOT_DOCKER_IMAGE}" --quiet
 docker save -o policy-csit-robot.tar ${ROBOT_DOCKER_IMAGE}:latest
 
 rm -rf ${WORKSPACE}/csit/resources/policy-csit-robot.tar

diff --git a/csit/resources/scripts/wait_for_rest.sh b/csit/resources/scripts/wait_for_rest.sh
index ce47d60..9732bc5 100755 (executable)
--- a/csit/resources/scripts/wait_for_rest.sh
+++ b/csit/resources/scripts/wait_for_rest.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # ============LICENSE_START====================================================
-# Copyright (C) 2023 Nordix Foundation.
+# Copyright (C) 2023-2024 Nordix Foundation.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -66,8 +66,7 @@ do
             sleep 5
         fi
     done
-    if [ $rc -ne 0 ]
-    then
+    if [ $rc -ne 0 ]; then
         echo "$host port $port REST cannot be detected"
         exit $rc
     fi

diff --git a/csit/resources/tests/policy-clamp-test.robot b/csit/resources/tests/policy-clamp-test.robot
index e765dd4..1c2ea03 100644 (file)
--- a/csit/resources/tests/policy-clamp-test.robot
+++ b/csit/resources/tests/policy-clamp-test.robot
@@ -9,419 +9,419 @@ Resource    common-library.robot
 
 *** Test Cases ***
 HealthcheckAcm
-     [Documentation]    Healthcheck on Clamp Acm
-     ${auth}=    ClampAuth
-     ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  onap/policy/clamp/acm/health  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
+    [Documentation]    Healthcheck on Clamp Acm
+    ${auth}=    ClampAuth
+    ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  onap/policy/clamp/acm/health  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
 
 HealthcheckParticipantSim
-     [Documentation]    Healthcheck on Participant Simulator
-     ${auth}=    ParticipantAuth
-     ${resp}=    MakeGetRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/health  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
+    [Documentation]    Healthcheck on Participant Simulator
+    ${auth}=    ParticipantAuth
+    ${resp}=    MakeGetRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/health  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
 
 HealthcheckApi
-     [Documentation]    Healthcheck on policy-api
-     Wait Until Keyword Succeeds    5 min    10 sec    VerifyHealthcheckApi
+    [Documentation]    Healthcheck on policy-api
+    Wait Until Keyword Succeeds    5 min    10 sec    VerifyHealthcheckApi
 
 HealthcheckPap
-     [Documentation]    Healthcheck on policy-pap
-     Wait Until Keyword Succeeds    5 min    10 sec    VerifyHealthcheckPap
+    [Documentation]    Healthcheck on policy-pap
+    Wait Until Keyword Succeeds    5 min    10 sec    VerifyHealthcheckPap
 
 RegisterParticipants
-     [Documentation]  Register Participants.
-     ${auth}=    ClampAuth
-     Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
-     ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
-     ${resp}=   PUT On Session     policy  /onap/policy/clamp/acm/v2/participants
-     Log    Received response from runtime acm ${resp.text}
-     Should Be Equal As Strings    ${resp.status_code}     202
+    [Documentation]  Register Participants.
+    ${auth}=    ClampAuth
+    Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
+    ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
+    ${resp}=   PUT On Session     policy  /onap/policy/clamp/acm/v2/participants
+    Log    Received response from runtime acm ${resp.text}
+    Should Be Equal As Strings    ${resp.status_code}     202
 
 CommissionAutomationComposition
-     [Documentation]  Commission automation composition definition.
-     ${auth}=    ClampAuth
-     ${postyaml}=  Get file  ${CURDIR}/data/acelement-usecase.yaml
-     ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions  ${postyaml}  ${auth}
-     ${respyaml}=  yaml.Safe Load  ${resp.text}
-     set Suite variable  ${compositionId}  ${respyaml["compositionId"]}
-     Should Be Equal As Strings    ${resp.status_code}     201
+    [Documentation]  Commission automation composition definition.
+    ${auth}=    ClampAuth
+    ${postyaml}=  Get file  ${CURDIR}/data/acelement-usecase.yaml
+    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions  ${postyaml}  ${auth}
+    ${respyaml}=  yaml.Safe Load  ${resp.text}
+    set Suite variable  ${compositionId}  ${respyaml["compositionId"]}
+    Should Be Equal As Strings    ${resp.status_code}     201
 
 CommissionAcDefinitionMigrationFrom
-     [Documentation]  Commission automation composition definition From.
-     ${auth}=    ClampAuth
-     ${postyaml}=  Get file  ${CURDIR}/data/ac-definition-migration-from.yaml
-     ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions  ${postyaml}  ${auth}
-     ${respyaml}=  yaml.Safe Load  ${resp.text}
-     set Suite variable  ${compositionFromId}  ${respyaml["compositionId"]}
-     Should Be Equal As Strings    ${resp.status_code}     201
+    [Documentation]  Commission automation composition definition From.
+    ${auth}=    ClampAuth
+    ${postyaml}=  Get file  ${CURDIR}/data/ac-definition-migration-from.yaml
+    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions  ${postyaml}  ${auth}
+    ${respyaml}=  yaml.Safe Load  ${resp.text}
+    set Suite variable  ${compositionFromId}  ${respyaml["compositionId"]}
+    Should Be Equal As Strings    ${resp.status_code}     201
 
 CommissionAcDefinitionMigrationTo
-     [Documentation]  Commission automation composition definition To.
-     ${auth}=    ClampAuth
-     ${postyaml}=  Get file  ${CURDIR}/data/ac-definition-migration-to.yaml
-     ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions  ${postyaml}  ${auth}
-     ${respyaml}=  yaml.Safe Load  ${resp.text}
-     set Suite variable  ${compositionToId}  ${respyaml["compositionId"]}
-     Should Be Equal As Strings    ${resp.status_code}     201
+    [Documentation]  Commission automation composition definition To.
+    ${auth}=    ClampAuth
+    ${postyaml}=  Get file  ${CURDIR}/data/ac-definition-migration-to.yaml
+    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions  ${postyaml}  ${auth}
+    ${respyaml}=  yaml.Safe Load  ${resp.text}
+    set Suite variable  ${compositionToId}  ${respyaml["compositionId"]}
+    Should Be Equal As Strings    ${resp.status_code}     201
 
 PrimeACDefinitions
-     [Documentation]  Prime automation composition definition
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionId}  PRIMED
+    [Documentation]  Prime automation composition definition
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionId}  PRIMED
 
 FailPrimeACDefinitionFrom
-     [Documentation]  Prime automation composition definition Migration From.
-     SetParticipantSimFail
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyFailedPriming  ${compositionFromId}
+    [Documentation]  Prime automation composition definition Migration From.
+    SetParticipantSimFail
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyFailedPriming  ${compositionFromId}
 
 PrimeACDefinitionFrom
-     [Documentation]  Prime automation composition definition Migration From.
-     SetParticipantSimSuccess
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionFromId}  PRIMED
+    [Documentation]  Prime automation composition definition Migration From.
+    SetParticipantSimSuccess
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionFromId}  PRIMED
 
 PrimeACDefinitionTo
-     [Documentation]  Prime automation composition definition Migration To.
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionToId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionToId}  PRIMED
+    [Documentation]  Prime automation composition definition Migration To.
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionToId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionToId}  PRIMED
 
 InstantiateAutomationComposition
-     [Documentation]  Instantiate automation composition.
-     ${auth}=    ClampAuth
-     Run Keyword If    '${TEST_ENV}'=='k8s'    set Suite variable  ${instantiationfile}  AcK8s.json
-
-     ...    ELSE    set Suite variable  ${instantiationfile}  AcDocker.json
-     ${postjson}=  Get file  ${CURDIR}/data/${instantiationfile}
-     ${updatedpostjson}=   Replace String     ${postjson}     COMPOSITIONIDPLACEHOLDER       ${compositionId}
-     ${resp}=   MakeJsonPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances  ${updatedpostjson}  ${auth}
-     ${respyaml}=  yaml.Safe Load  ${resp.text}
-     set Suite variable  ${instanceId}    ${respyaml["instanceId"]}
-     Should Be Equal As Strings    ${resp.status_code}     201
+    [Documentation]  Instantiate automation composition.
+    ${auth}=    ClampAuth
+    Run Keyword If    '${TEST_ENV}'=='k8s'    set Suite variable  ${instantiationfile}  AcK8s.json
+
+    ...    ELSE    set Suite variable  ${instantiationfile}  AcDocker.json
+    ${postjson}=  Get file  ${CURDIR}/data/${instantiationfile}
+    ${updatedpostjson}=   Replace String     ${postjson}     COMPOSITIONIDPLACEHOLDER       ${compositionId}
+    ${resp}=   MakeJsonPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances  ${updatedpostjson}  ${auth}
+    ${respyaml}=  yaml.Safe Load  ${resp.text}
+    set Suite variable  ${instanceId}    ${respyaml["instanceId"]}
+    Should Be Equal As Strings    ${resp.status_code}     201
 
 InstantiateAutomationCompositionMigrationFrom
-     [Documentation]  Instantiate automation composition migration.
-     ${auth}=    ClampAuth
-     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-from.yaml
-     ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
-     ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
-     ${respyaml}=  yaml.Safe Load  ${resp.text}
-     set Suite variable  ${instanceMigrationId}    ${respyaml["instanceId"]}
-     Should Be Equal As Strings    ${resp.status_code}     201
+    [Documentation]  Instantiate automation composition migration.
+    ${auth}=    ClampAuth
+    ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-from.yaml
+    ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
+    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
+    ${respyaml}=  yaml.Safe Load  ${resp.text}
+    set Suite variable  ${instanceMigrationId}    ${respyaml["instanceId"]}
+    Should Be Equal As Strings    ${resp.status_code}     201
 
 FailDeployAutomationCompositionMigration
-     [Documentation]  Fail Deploy automation composition.
-     SetParticipantSimFail
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances/${instanceMigrationId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
+    [Documentation]  Fail Deploy automation composition.
+    SetParticipantSimFail
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances/${instanceMigrationId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
 
 TimeoutDeployAutomationCompositionMigration
-     [Documentation]  Timeout Deploy automation composition.
-     SetParticipantSimTimeout
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances/${instanceMigrationId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
+    [Documentation]  Timeout Deploy automation composition.
+    SetParticipantSimTimeout
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances/${instanceMigrationId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
 
 PrepareAutomationComposition
-     [Documentation]  Prepare automation composition.
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/PrepareAC.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    10 min    5 sec    VerifySubStatus  ${compositionId}  ${instanceId}
+    [Documentation]  Prepare automation composition.
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/PrepareAC.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}    202
+    Wait Until Keyword Succeeds    10 min    5 sec    VerifySubStatus  ${compositionId}  ${instanceId}
 
 DeployAutomationComposition
-     [Documentation]  Deploy automation composition.
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    10 min    5 sec    VerifyDeployStatus  ${compositionId}  ${instanceId}  DEPLOYED
+    [Documentation]  Deploy automation composition.
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    10 min    5 sec    VerifyDeployStatus  ${compositionId}  ${instanceId}  DEPLOYED
 
 CheckTraces
-     [Documentation]    Verify that traces are being recorded in jaeger
-     Log    Verifying Jaeger traces
-     ${acmResp}=    VerifyTracingWorks    ${JAEGER_IP}    acm-r
-     ${httpResp}=    VerifyTracingWorks    ${JAEGER_IP}    http-ppnt
-     ${policyResp}=    VerifyTracingWorks    ${JAEGER_IP}    policy-ppnt
-     ${k8sResp}=    VerifyTracingWorks    ${JAEGER_IP}    k8s-ppnt
-     Should Not Be Empty    ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
-     Log  Received spanID is ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
-     Should Not Be Empty    ${httpResp.json()["data"][0]["spans"][0]["spanID"]}
-     Should Not Be Empty    ${policyResp.json()["data"][0]["spans"][0]["spanID"]}
-     Should Not Be Empty    ${k8sResp.json()["data"][0]["spans"][0]["spanID"]}
+    [Documentation]    Verify that traces are being recorded in jaeger
+    Log    Verifying Jaeger traces
+    ${acmResp}=    VerifyTracingWorks    ${JAEGER_IP}    acm-r
+    ${httpResp}=    VerifyTracingWorks    ${JAEGER_IP}    http-ppnt
+    ${policyResp}=    VerifyTracingWorks    ${JAEGER_IP}    policy-ppnt
+    ${k8sResp}=    VerifyTracingWorks    ${JAEGER_IP}    k8s-ppnt
+    Should Not Be Empty    ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
+    Log  Received spanID is ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
+    Should Not Be Empty    ${httpResp.json()["data"][0]["spans"][0]["spanID"]}
+    Should Not Be Empty    ${policyResp.json()["data"][0]["spans"][0]["spanID"]}
+    Should Not Be Empty    ${k8sResp.json()["data"][0]["spans"][0]["spanID"]}
 
 CheckKafkaPresentInTraces
-     [Documentation]    Verify that kafka traces are being recorded in jaeger
-     Log    Verifying Kafka Jaeger traces
-     ${acmResp}=    VerifyKafkaInTraces    ${JAEGER_IP}    acm-r
-     ${httpResp}=    VerifyKafkaInTraces    ${JAEGER_IP}    http-ppnt
-     ${policyResp}=    VerifyKafkaInTraces    ${JAEGER_IP}    policy-ppnt
-     ${k8sResp}=    VerifyKafkaInTraces    ${JAEGER_IP}    k8s-ppnt
-     Should Not Be Empty    ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
-     Log  Received spanID is ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
-     Should Not Be Empty    ${httpResp.json()["data"][0]["spans"][0]["spanID"]}
-     Should Not Be Empty    ${policyResp.json()["data"][0]["spans"][0]["spanID"]}
-     Should Not Be Empty    ${k8sResp.json()["data"][0]["spans"][0]["spanID"]}
+    [Documentation]    Verify that kafka traces are being recorded in jaeger
+    Log    Verifying Kafka Jaeger traces
+    ${acmResp}=    VerifyKafkaInTraces    ${JAEGER_IP}    acm-r
+    ${httpResp}=    VerifyKafkaInTraces    ${JAEGER_IP}    http-ppnt
+    ${policyResp}=    VerifyKafkaInTraces    ${JAEGER_IP}    policy-ppnt
+    ${k8sResp}=    VerifyKafkaInTraces    ${JAEGER_IP}    k8s-ppnt
+    Should Not Be Empty    ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
+    Log  Received spanID is ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
+    Should Not Be Empty    ${httpResp.json()["data"][0]["spans"][0]["spanID"]}
+    Should Not Be Empty    ${policyResp.json()["data"][0]["spans"][0]["spanID"]}
+    Should Not Be Empty    ${k8sResp.json()["data"][0]["spans"][0]["spanID"]}
 
 CheckHttpPresentInAcmTraces
-     [Documentation]    Verify that http traces are being recorded in jaeger
-     Log    Verifying Http Jaeger traces
-     ${acmResp}=    VerifyHttpInTraces    ${JAEGER_IP}    acm-r
-     Should Not Be Empty    ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
-     Log  Received spanID is ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
+    [Documentation]    Verify that http traces are being recorded in jaeger
+    Log    Verifying Http Jaeger traces
+    ${acmResp}=    VerifyHttpInTraces    ${JAEGER_IP}    acm-r
+    Should Not Be Empty    ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
+    Log  Received spanID is ${acmResp.json()["data"][0]["spans"][0]["spanID"]}
 
 QueryPolicies
-     [Documentation]    Verify the new policies deployed
-     ${auth}=    PolicyAdminAuth
-     Sleep  10s
-     Log    Creating session http://${POLICY_PAP_IP}
-     ${session}=    Create Session      policy  http://${POLICY_PAP_IP}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   GET On Session     policy  /policy/pap/v1/policies/deployed     headers=${headers}
-     Log    Received response from policy-pap {resp.text}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     Dictionary Should Contain Value  ${resp.json()[0]}  onap.policies.native.apex.ac.element
+    [Documentation]    Verify the new policies deployed
+    ${auth}=    PolicyAdminAuth
+    Sleep  10s
+    Log    Creating session http://${POLICY_PAP_IP}
+    ${session}=    Create Session      policy  http://${POLICY_PAP_IP}   auth=${auth}
+    ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+    ${resp}=   GET On Session     policy  /policy/pap/v1/policies/deployed     headers=${headers}
+    Log    Received response from policy-pap {resp.text}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    Dictionary Should Contain Value  ${resp.json()[0]}  onap.policies.native.apex.ac.element
 
 QueryPolicyTypes
-     [Documentation]    Verify the new policy types created
-     ${auth}=    PolicyAdminAuth
-     Sleep  10s
-     Log    Creating session http://${POLICY_API_IP}:6969
-     ${session}=    Create Session      policy  http://${POLICY_API_IP}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   GET On Session     policy  /policy/api/v1/policytypes     headers=${headers}
-     Log    Received response from policy-api ${resp.text}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     List Should Contain Value  ${resp.json()['policy_types']}  onap.policies.native.Apex
+    [Documentation]    Verify the new policy types created
+    ${auth}=    PolicyAdminAuth
+    Sleep  10s
+    Log    Creating session http://${POLICY_API_IP}:6969
+    ${session}=    Create Session      policy  http://${POLICY_API_IP}   auth=${auth}
+    ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+    ${resp}=   GET On Session     policy  /policy/api/v1/policytypes     headers=${headers}
+    Log    Received response from policy-api ${resp.text}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    List Should Contain Value  ${resp.json()['policy_types']}  onap.policies.native.Apex
 
 ReviewAutomationComposition
-     [Documentation]  Review automation composition.
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/ReviewAC.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    10 min    5 sec    VerifySubStatus  ${compositionId}  ${instanceId}
+    [Documentation]  Review automation composition.
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/ReviewAC.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    10 min    5 sec    VerifySubStatus  ${compositionId}  ${instanceId}
 
 CheckTimeoutAutomationComposition
-     [Documentation]  Timeout Deploy automation composition.
-     Wait Until Keyword Succeeds    5 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  TIMEOUT
+    [Documentation]  Timeout Deploy automation composition.
+    Wait Until Keyword Succeeds    5 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  TIMEOUT
 
 DeployAutomationCompositionMigration
-     [Documentation]  Deploy automation composition.
-     SetParticipantSimSuccess
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances/${instanceMigrationId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionFromId}  ${instanceMigrationId}  DEPLOYED
+    [Documentation]  Deploy automation composition.
+    SetParticipantSimSuccess
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances/${instanceMigrationId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionFromId}  ${instanceMigrationId}  DEPLOYED
 
 SendOutPropertiesToRuntime
-     [Documentation]  Send Out Properties To Runtime
-     ${auth}=    ParticipantAuth
-     ${postjson}=  Get file  ${CURDIR}/data/OutProperties.json
-     ${updatedpostjson}=   Replace String     ${postjson}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
-     ${updatedpostjson}=   Replace String     ${updatedpostjson}     TEXTPLACEHOLDER       MyTextToSend
-     ${resp}=   MakeJsonPutRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/datas  ${updatedpostjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyPropertiesUpdated  ${compositionFromId}  ${instanceMigrationId}  MyTextToSend
+    [Documentation]  Send Out Properties To Runtime
+    ${auth}=    ParticipantAuth
+    ${postjson}=  Get file  ${CURDIR}/data/OutProperties.json
+    ${updatedpostjson}=   Replace String     ${postjson}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
+    ${updatedpostjson}=   Replace String     ${updatedpostjson}     TEXTPLACEHOLDER       MyTextToSend
+    ${resp}=   MakeJsonPutRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/datas  ${updatedpostjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyPropertiesUpdated  ${compositionFromId}  ${instanceMigrationId}  MyTextToSend
 
 AutomationCompositionUpdate
-     [Documentation]  Update of an automation composition.
-     ${auth}=    ClampAuth
-     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-update.yaml
-     ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
-     ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
-     ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER       MyTextUpdated
-     ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionFromId}  ${instanceMigrationId}  DEPLOYED
-     VerifyPropertiesUpdated  ${compositionFromId}  ${instanceMigrationId}  MyTextUpdated
-     VerifyParticipantSim  ${instanceMigrationId}  MyTextUpdated
+    [Documentation]  Update of an automation composition.
+    ${auth}=    ClampAuth
+    ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-update.yaml
+    ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
+    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
+    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER       MyTextUpdated
+    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionFromId}  ${instanceMigrationId}  DEPLOYED
+    VerifyPropertiesUpdated  ${compositionFromId}  ${instanceMigrationId}  MyTextUpdated
+    VerifyParticipantSim  ${instanceMigrationId}  MyTextUpdated
 
 PrecheckAutomationCompositionMigration
-     [Documentation]  Precheck Migration of an automation composition.
-     ${auth}=    ClampAuth
-     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-precheck-migration.yaml
-     ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
-     ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     COMPOSITIONTARGETIDPLACEHOLDER       ${compositionToId}
-     ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
-     ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER       TextForMigration
-     ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifySubStatus  ${compositionFromId}  ${instanceMigrationId}
+    [Documentation]  Precheck Migration of an automation composition.
+    ${auth}=    ClampAuth
+    ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-precheck-migration.yaml
+    ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
+    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     COMPOSITIONTARGETIDPLACEHOLDER       ${compositionToId}
+    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
+    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER       TextForMigration
+    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifySubStatus  ${compositionFromId}  ${instanceMigrationId}
 
 AutomationCompositionMigrationTo
-     [Documentation]  Migration of an automation composition.
-     ${auth}=    ClampAuth
-     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-to.yaml
-     ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
-     ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     COMPOSITIONTARGETIDPLACEHOLDER       ${compositionToId}
-     ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
-     ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER       TextForMigration
-     ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionToId}  ${instanceMigrationId}  DEPLOYED
-     VerifyPropertiesUpdated  ${compositionToId}  ${instanceMigrationId}  TextForMigration
-     VerifyParticipantSim  ${instanceMigrationId}  TextForMigration
-     VerifyMigratedElementsRuntime  ${compositionToId}  ${instanceMigrationId}
-     VerifyMigratedElementsSim  ${instanceMigrationId}
+    [Documentation]  Migration of an automation composition.
+    ${auth}=    ClampAuth
+    ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-to.yaml
+    ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
+    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     COMPOSITIONTARGETIDPLACEHOLDER       ${compositionToId}
+    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
+    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER       TextForMigration
+    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionToId}  ${instanceMigrationId}  DEPLOYED
+    VerifyPropertiesUpdated  ${compositionToId}  ${instanceMigrationId}  TextForMigration
+    VerifyParticipantSim  ${instanceMigrationId}  TextForMigration
+    VerifyMigratedElementsRuntime  ${compositionToId}  ${instanceMigrationId}
+    VerifyMigratedElementsSim  ${instanceMigrationId}
 
 UnDeployAutomationComposition
-     [Documentation]  UnDeploy automation composition.
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/UndeployAC.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    10 min    5 sec    VerifyDeployStatus  ${compositionId}  ${instanceId}  UNDEPLOYED
+    [Documentation]  UnDeploy automation composition.
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/UndeployAC.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}    202
+    Wait Until Keyword Succeeds    10 min    5 sec    VerifyDeployStatus  ${compositionId}  ${instanceId}  UNDEPLOYED
 
 FailUnDeployAutomationCompositionMigrationTo
-     [Documentation]  Fail UnDeploy automation composition migrated.
-     SetParticipantSimFail
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/UndeployAC.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionToId}/instances/${instanceMigrationId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionToId}  ${instanceMigrationId}  FAILED
+    [Documentation]  Fail UnDeploy automation composition migrated.
+    SetParticipantSimFail
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/UndeployAC.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionToId}/instances/${instanceMigrationId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}    202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionToId}  ${instanceMigrationId}  FAILED
 
 UnDeployAutomationCompositionMigrationTo
-     [Documentation]  UnDeploy automation composition migrated.
-     SetParticipantSimSuccess
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/UndeployAC.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionToId}/instances/${instanceMigrationId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionToId}  ${instanceMigrationId}  UNDEPLOYED
+    [Documentation]  UnDeploy automation composition migrated.
+    SetParticipantSimSuccess
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/UndeployAC.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionToId}/instances/${instanceMigrationId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionToId}  ${instanceMigrationId}  UNDEPLOYED
 
 UnInstantiateAutomationComposition
-     [Documentation]  Delete automation composition instance.
-     ${auth}=    ClampAuth
-     Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
-     ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId}     headers=${headers}
-     Log    Received response from runtime acm ${resp.text}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    1 min    5 sec    VerifyUninstantiated  ${compositionId}
+    [Documentation]  Delete automation composition instance.
+    ${auth}=    ClampAuth
+    Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
+    ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
+    ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+    ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId}     headers=${headers}
+    Log    Received response from runtime acm ${resp.text}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    1 min    5 sec    VerifyUninstantiated  ${compositionId}
 
 FailUnInstantiateAutomationCompositionMigrationTo
-     [Documentation]  Fail Delete automation composition instance migrated.
-     SetParticipantSimFail
-     ${auth}=    ClampAuth
-     Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
-     ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionToId}/instances/${instanceMigrationId}     headers=${headers}
-     Log    Received response from runtime acm ${resp.text}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionToId}  ${instanceMigrationId}  FAILED
+    [Documentation]  Fail Delete automation composition instance migrated.
+    SetParticipantSimFail
+    ${auth}=    ClampAuth
+    Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
+    ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
+    ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+    ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionToId}/instances/${instanceMigrationId}     headers=${headers}
+    Log    Received response from runtime acm ${resp.text}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionToId}  ${instanceMigrationId}  FAILED
 
 UnInstantiateAutomationCompositionMigrationTo
-     [Documentation]  Delete automation composition instance migrated.
-     SetParticipantSimSuccess
-     ${auth}=    ClampAuth
-     Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
-     ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionToId}/instances/${instanceMigrationId}     headers=${headers}
-     Log    Received response from runtime acm ${resp.text}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    1 min    5 sec    VerifyUninstantiated  ${compositionToId}
+    [Documentation]  Delete automation composition instance migrated.
+    SetParticipantSimSuccess
+    ${auth}=    ClampAuth
+    Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
+    ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
+    ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+    ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionToId}/instances/${instanceMigrationId}     headers=${headers}
+    Log    Received response from runtime acm ${resp.text}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    1 min    5 sec    VerifyUninstantiated  ${compositionToId}
 
 DePrimeACDefinitions
-     [Documentation]  DePrime automation composition definition
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/ACDepriming.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionId}  COMMISSIONED
+    [Documentation]  DePrime automation composition definition
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/ACDepriming.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionId}  COMMISSIONED
 
 FailDePrimeACDefinitionsFrom
-     [Documentation]  Fail DePrime automation composition definition migration From.
-     SetParticipantSimFail
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/ACDepriming.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyFailedPriming  ${compositionFromId}
+    [Documentation]  Fail DePrime automation composition definition migration From.
+    SetParticipantSimFail
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/ACDepriming.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyFailedPriming  ${compositionFromId}
 
 DePrimeACDefinitionsFrom
-     [Documentation]  DePrime automation composition definition migration From.
-     SetParticipantSimSuccess
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/ACDepriming.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionFromId}  COMMISSIONED
+    [Documentation]  DePrime automation composition definition migration From.
+    SetParticipantSimSuccess
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/ACDepriming.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionFromId}  COMMISSIONED
 
 DePrimeACDefinitionsTo
-     [Documentation]  DePrime automation composition definition migration To.
-     ${auth}=    ClampAuth
-     ${postjson}=  Get file  ${CURDIR}/data/ACDepriming.json
-     ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionToId}  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     202
-     Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionToId}  COMMISSIONED
+    [Documentation]  DePrime automation composition definition migration To.
+    ${auth}=    ClampAuth
+    ${postjson}=  Get file  ${CURDIR}/data/ACDepriming.json
+    ${resp}=   MakeJsonPutRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionToId}  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionToId}  COMMISSIONED
 
 DeleteACDefinition
-     [Documentation]  Delete automation composition definition.
-     ${auth}=    ClampAuth
-     Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
-     ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/yaml    Content-Type=application/yaml
-     ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionId}  headers=${headers}
-     Log    Received response from runtime acm ${resp.text}
-     Should Be Equal As Strings    ${resp.status_code}     200
+    [Documentation]  Delete automation composition definition.
+    ${auth}=    ClampAuth
+    Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
+    ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
+    ${headers}=  Create Dictionary     Accept=application/yaml    Content-Type=application/yaml
+    ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionId}  headers=${headers}
+    Log    Received response from runtime acm ${resp.text}
+    Should Be Equal As Strings    ${resp.status_code}     200
 
 DeleteACDefinitionFrom
-     [Documentation]  Delete automation composition definition migration From.
-     ${auth}=    ClampAuth
-     Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
-     ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/yaml    Content-Type=application/yaml
-     ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}  headers=${headers}
-     Log    Received response from runtime acm ${resp.text}
-     Should Be Equal As Strings    ${resp.status_code}     200
+    [Documentation]  Delete automation composition definition migration From.
+    ${auth}=    ClampAuth
+    Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
+    ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
+    ${headers}=  Create Dictionary     Accept=application/yaml    Content-Type=application/yaml
+    ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}  headers=${headers}
+    Log    Received response from runtime acm ${resp.text}
+    Should Be Equal As Strings    ${resp.status_code}     200
 
 DeleteACDefinitionTo
-     [Documentation]  Delete automation composition definition migration To.
-     ${auth}=    ClampAuth
-     Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
-     ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/yaml    Content-Type=application/yaml
-     ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionToId}  headers=${headers}
-     Log    Received response from runtime acm ${resp.text}
-     Should Be Equal As Strings    ${resp.status_code}     200
+    [Documentation]  Delete automation composition definition migration To.
+    ${auth}=    ClampAuth
+    Log    Creating session http://${POLICY_RUNTIME_ACM_IP}
+    ${session}=    Create Session      policy  http://${POLICY_RUNTIME_ACM_IP}   auth=${auth}
+    ${headers}=  Create Dictionary     Accept=application/yaml    Content-Type=application/yaml
+    ${resp}=   DELETE On Session     policy  /onap/policy/clamp/acm/v2/compositions/${compositionToId}  headers=${headers}
+    Log    Received response from runtime acm ${resp.text}
+    Should Be Equal As Strings    ${resp.status_code}     200
 
 
 *** Keywords ***
 
 VerifyHealthcheckApi
-     [Documentation]    Verify Healthcheck on policy-api
-     ${auth}=    PolicyAdminAuth
-     ${resp}=    MakeGetRequest  policy  ${POLICY_API_IP}  /policy/api/v1/health  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}   200
+    [Documentation]    Verify Healthcheck on policy-api
+    ${auth}=    PolicyAdminAuth
+    ${resp}=    MakeGetRequest  policy  ${POLICY_API_IP}  /policy/api/v1/health  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}   200
 
 VerifyHealthcheckPap
-     [Documentation]    Verify Healthcheck on policy-pap
-     ${auth}=    PolicyAdminAuth
-     ${resp}=    MakeGetRequest  policy  ${POLICY_PAP_IP}  /policy/pap/v1/health  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
+    [Documentation]    Verify Healthcheck on policy-pap
+    ${auth}=    PolicyAdminAuth
+    ${resp}=    MakeGetRequest  policy  ${POLICY_PAP_IP}  /policy/pap/v1/health  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
 
 VerifyPriming
     [Arguments]  ${theCompositionId}  ${primestate}
@@ -441,110 +441,110 @@ VerifyFailedPriming
     Run Keyword If  ${resp.status_code}==200  Should Be Equal As Strings  ${resp.json()['stateChangeResult']}  FAILED
 
 VerifyDeployStatus
-     [Arguments]  ${theCompositionId}  ${theInstanceId}  ${deploystate}
-     [Documentation]  Verify the Deploy status of automation composition.
-     ${auth}=    ClampAuth
-     ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances/${theInstanceId}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     Should Be Equal As Strings  ${resp.json()['stateChangeResult']}  NO_ERROR
-     Run Keyword If  ${resp.status_code}==200  Should Be Equal As Strings  ${resp.json()['deployState']}  ${deploystate}
+    [Arguments]  ${theCompositionId}  ${theInstanceId}  ${deploystate}
+    [Documentation]  Verify the Deploy status of automation composition.
+    ${auth}=    ClampAuth
+    ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances/${theInstanceId}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    Should Be Equal As Strings  ${resp.json()['stateChangeResult']}  NO_ERROR
+    Run Keyword If  ${resp.status_code}==200  Should Be Equal As Strings  ${resp.json()['deployState']}  ${deploystate}
 
 VerifySubStatus
-     [Arguments]  ${theCompositionId}  ${theInstanceId}
-     [Documentation]  Verify the Sub status of automation composition.
-     ${auth}=    ClampAuth
-     ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances/${theInstanceId}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     Should Be Equal As Strings  ${resp.json()['stateChangeResult']}  NO_ERROR
-     Run Keyword If  ${resp.status_code}==200  Should Be Equal As Strings  ${resp.json()['subState']}  NONE
+    [Arguments]  ${theCompositionId}  ${theInstanceId}
+    [Documentation]  Verify the Sub status of automation composition.
+    ${auth}=    ClampAuth
+    ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances/${theInstanceId}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    Should Be Equal As Strings  ${resp.json()['stateChangeResult']}  NO_ERROR
+    Run Keyword If  ${resp.status_code}==200  Should Be Equal As Strings  ${resp.json()['subState']}  NONE
 
 VerifyStateChangeResult
-     [Arguments]  ${theCompositionId}  ${theInstanceId}  ${stateChangeResult}
-     [Documentation]  Verify the Deploy status of automation composition.
-     ${auth}=    ClampAuth
-     ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances/${theInstanceId}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     Run Keyword If  ${resp.status_code}==200  Should Be Equal As Strings  ${resp.json()['stateChangeResult']}  ${stateChangeResult}
+    [Arguments]  ${theCompositionId}  ${theInstanceId}  ${stateChangeResult}
+    [Documentation]  Verify the Deploy status of automation composition.
+    ${auth}=    ClampAuth
+    ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances/${theInstanceId}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    Run Keyword If  ${resp.status_code}==200  Should Be Equal As Strings  ${resp.json()['stateChangeResult']}  ${stateChangeResult}
 
 VerifyPropertiesUpdated
-     [Arguments]  ${theCompositionId}  ${theInstanceId}  ${textToFind}
-     [Documentation]  Verify the Deploy status of automation composition.
-     ${auth}=    ClampAuth
-     ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances/${theInstanceId}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     ${respstring}   Convert To String   ${resp.json()}
-     Run Keyword If  ${resp.status_code}==200  Should Match Regexp  ${respstring}  ${textToFind}
+    [Arguments]  ${theCompositionId}  ${theInstanceId}  ${textToFind}
+    [Documentation]  Verify the Deploy status of automation composition.
+    ${auth}=    ClampAuth
+    ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances/${theInstanceId}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    ${respstring}   Convert To String   ${resp.json()}
+    Run Keyword If  ${resp.status_code}==200  Should Match Regexp  ${respstring}  ${textToFind}
 
 VerifyMigratedElementsRuntime
-     [Arguments]  ${theCompositionId}  ${theInstanceId}
-     [Documentation]  Verify the Instance elements after Migration
-     ${auth}=    ClampAuth
-     ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances/${theInstanceId}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     ${respstring}   Convert To String   ${resp.json()}
-     Should Match Regexp  ${respstring}  Sim_NewAutomationCompositionElement
-     Should Not Match Regexp  ${respstring}  Sim_SinkAutomationCompositionElement
-     ${respstring}   Convert To String   ${resp.json()['elements']['709c62b3-8918-41b9-a747-d21eb79c6c34']['outProperties']['stage']}
-     Should Be Equal As Strings  ${respstring}  [1, 2]
-     ${respstring}   Convert To String   ${resp.json()['elements']['709c62b3-8918-41b9-a747-d21eb79c6c35']['outProperties']['stage']}
-     Should Be Equal As Strings  ${respstring}  [0, 1]
-     ${respstring}   Convert To String   ${resp.json()['elements']['709c62b3-8918-41b9-a747-d21eb79c6c37']['outProperties']['stage']}
-     Should Be Equal As Strings  ${respstring}  [0, 2]
+    [Arguments]  ${theCompositionId}  ${theInstanceId}
+    [Documentation]  Verify the Instance elements after Migration
+    ${auth}=    ClampAuth
+    ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances/${theInstanceId}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    ${respstring}   Convert To String   ${resp.json()}
+    Should Match Regexp  ${respstring}  Sim_NewAutomationCompositionElement
+    Should Not Match Regexp  ${respstring}  Sim_SinkAutomationCompositionElement
+    ${respstring}   Convert To String   ${resp.json()['elements']['709c62b3-8918-41b9-a747-d21eb79c6c34']['outProperties']['stage']}
+    Should Be Equal As Strings  ${respstring}  [1, 2]
+    ${respstring}   Convert To String   ${resp.json()['elements']['709c62b3-8918-41b9-a747-d21eb79c6c35']['outProperties']['stage']}
+    Should Be Equal As Strings  ${respstring}  [0, 1]
+    ${respstring}   Convert To String   ${resp.json()['elements']['709c62b3-8918-41b9-a747-d21eb79c6c37']['outProperties']['stage']}
+    Should Be Equal As Strings  ${respstring}  [0, 2]
 
 VerifyMigratedElementsSim
-     [Arguments]  ${theInstanceId}
-     [Documentation]  Query on Participant Simulator
-     ${auth}=    ParticipantAuth
-     ${resp}=    MakeGetRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/instances/${theInstanceId}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     ${respstring}   Convert To String   ${resp.json()}
-     Should Match Regexp  ${respstring}  Sim_NewAutomationCompositionElement
-     Should Not Match Regexp  ${respstring}  Sim_SinkAutomationCompositionElement
+    [Arguments]  ${theInstanceId}
+    [Documentation]  Query on Participant Simulator
+    ${auth}=    ParticipantAuth
+    ${resp}=    MakeGetRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/instances/${theInstanceId}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    ${respstring}   Convert To String   ${resp.json()}
+    Should Match Regexp  ${respstring}  Sim_NewAutomationCompositionElement
+    Should Not Match Regexp  ${respstring}  Sim_SinkAutomationCompositionElement
 
 VerifyParticipantSim
-     [Arguments]  ${theInstanceId}  ${textToFind}
-     [Documentation]  Query on Participant Simulator
-     ${auth}=    ParticipantAuth
-     ${resp}=    MakeGetRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/instances/${theInstanceId}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     ${respstring}   Convert To String   ${resp.json()}
-     Should Match Regexp  ${respstring}  ${textToFind}
+    [Arguments]  ${theInstanceId}  ${textToFind}
+    [Documentation]  Query on Participant Simulator
+    ${auth}=    ParticipantAuth
+    ${resp}=    MakeGetRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/instances/${theInstanceId}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    ${respstring}   Convert To String   ${resp.json()}
+    Should Match Regexp  ${respstring}  ${textToFind}
 
 VerifyUninstantiated
-     [Arguments]  ${theCompositionId}
-     [Documentation]  Verify the Uninstantiation of automation composition.
-     ${auth}=    ClampAuth
-     ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}   /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
-     Run Keyword If  ${resp.status_code}==200  Length Should Be  ${resp.json()['automationCompositionList']}  0
+    [Arguments]  ${theCompositionId}
+    [Documentation]  Verify the Uninstantiation of automation composition.
+    ${auth}=    ClampAuth
+    ${resp}=    MakeGetRequest  ACM  ${POLICY_RUNTIME_ACM_IP}   /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+    Run Keyword If  ${resp.status_code}==200  Length Should Be  ${resp.json()['automationCompositionList']}  0
 
 SetParticipantSimFail
-     [Documentation]  Set Participant Simulator Fail.
-     ${auth}=    ParticipantAuth
-     ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesFail.json
-     ${resp}=   MakeJsonPutRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
+    [Documentation]  Set Participant Simulator Fail.
+    ${auth}=    ParticipantAuth
+    ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesFail.json
+    ${resp}=   MakeJsonPutRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
 
 SetParticipantSimSuccess
-     [Documentation]  Set Participant Simulator Success.
-     ${auth}=    ParticipantAuth
-     ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesSuccess.json
-     ${resp}=   MakeJsonPutRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
+    [Documentation]  Set Participant Simulator Success.
+    ${auth}=    ParticipantAuth
+    ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesSuccess.json
+    ${resp}=   MakeJsonPutRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
 
 SetParticipantSimTimeout
-     [Documentation]  Set Participant Simulator Timeout.
-     ${auth}=    ParticipantAuth
-     ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesTimeout.json
-     ${resp}=   MakeJsonPutRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
-     Should Be Equal As Strings    ${resp.status_code}     200
+    [Documentation]  Set Participant Simulator Timeout.
+    ${auth}=    ParticipantAuth
+    ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesTimeout.json
+    ${resp}=   MakeJsonPutRequest  participant  ${POLICY_PARTICIPANT_SIM_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
 
 ClampAuth
     ${auth}=    Create List    runtimeUser    zb!XztG34
     RETURN  ${auth}
 
 ParticipantAuth
-     ${auth}=    Create List    participantUser    zb!XztG34
+    ${auth}=    Create List    participantUser    zb!XztG34
     RETURN  ${auth}
 
 MakeYamlPostRequest
@@ -560,7 +560,7 @@ MakeJsonPostRequest
     [Arguments]  ${name}  ${domain}  ${url}  ${postjson}  ${auth}
     Log  Creating session http://${domain}
     ${session}=  Create Session  ${name}  http://${domain}  auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+    ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
     ${resp}=  POST On Session  ${name}  ${url}  data=${postjson}  headers=${headers}
     Log  Received response from ${name} ${resp.text}
     RETURN  ${resp}
@@ -569,19 +569,19 @@ MakeJsonPutRequest
     [Arguments]  ${name}  ${domain}  ${url}  ${postjson}  ${auth}
     Log  Creating session http://${domain}
     ${session}=  Create Session  ${name}  http://${domain}  auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+    ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
     ${resp}=  PUT On Session  ${name}  ${url}  data=${postjson}  headers=${headers}
     Log  Received response from ${name} ${resp.text}
     RETURN  ${resp}
 
 MakeGetRequest
     [Arguments]  ${name}  ${domain}  ${url}  ${auth}
-     Log    Creating session http://${domain}
-     ${session}=    Create Session      ${name}  http://${domain}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   GET On Session     ${name}  ${url}     headers=${headers}
-     Log    Received response from ${name} {resp.text}
-     RETURN  ${resp}
+    Log    Creating session http://${domain}
+    ${session}=    Create Session      ${name}  http://${domain}   auth=${auth}
+    ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+    ${resp}=   GET On Session     ${name}  ${url}     headers=${headers}
+    Log    Received response from ${name} {resp.text}
+    RETURN  ${resp}
 
 VerifyKafkaInTraces
     [Arguments]  ${domain}    ${service}

diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh
index 8183cde..e355d5f 100755 (executable)
--- a/csit/run-project-csit.sh
+++ b/csit/run-project-csit.sh
@@ -18,6 +18,23 @@
 # limitations under the License.
 #
 
+# even with forced finish, clean up docker containers
+function on_exit(){
+    rm -rf ${CSAR_DIR}/csar_temp.csar
+
+    # teardown of compose containers for acm-replicas doesn't work with normal stop-compose script
+    if [ "${ACM_REPLICA_TEARDOWN}" = true ]; then
+        source ${DOCKER_COMPOSE_DIR}/start-acm-replica.sh --stop --replicas=2
+    elif [ "${APEX_REPLICA_TEARDOWN}" = true ]; then
+        source ${DOCKER_COMPOSE_DIR}/start-multiple-pdp.sh --stop --replicas=2
+    else
+        source ${DOCKER_COMPOSE_DIR}/stop-compose.sh ${PROJECT}
+    fi
+
+    mv ${DOCKER_COMPOSE_DIR}/*.log ${ROBOT_LOG_DIR}
+    exit $RC
+}
+
 function docker_stats(){
     # General memory details
     if [ "$(uname -s)" == "Darwin" ]
@@ -40,11 +57,41 @@ function docker_stats(){
     echo
 }
 
+function apex_healthcheck() {
+    sleep 20
+
+    healthy=false
+
+    while [ $healthy = false ]
+    do
+        msg=`curl -s -k --user 'policyadmin:zb!XztG34' http://localhost:${APEX_PORT}/policy/apex-pdp/v1/healthcheck`
+        echo "${msg}" | grep -q true
+        if [ "${?}" -eq 0 ]
+        then
+            healthy=true
+            break
+        fi
+        sleep 10s
+    done
+
+    if  [ $healthy = false ]; then
+        exit 2
+    fi
+}
+
+function check_rest_endpoint() {
+    bash ${SCRIPTS}/wait_for_rest.sh localhost "${1}"
+    rc=$?
+    if [ $rc -ne 0 ]; then
+        on_exit
+    fi
+}
+
 function setup_clamp() {
     export ROBOT_FILES="policy-clamp-test.robot clamp-slas.robot"
     source ${DOCKER_COMPOSE_DIR}/start-compose.sh policy-clamp-runtime-acm --grafana
     sleep 30
-    bash ${SCRIPTS}/wait_for_rest.sh localhost "${ACM_PORT}"
+    check_rest_endpoint "${ACM_PORT}"
 }
 
 function setup_clamp_replica() {
@@ -56,31 +103,32 @@ function setup_clamp_replica() {
     echo "Waiting a minute for the replicas to be started..."
     sleep 60
     # checking on apex-pdp status because acm-r replicas only start after apex-pdp is running
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${APEX_PORT}
+    check_rest_endpoint ${PAP_PORT}
+    check_rest_endpoint ${APEX_PORT}
     apex_healthcheck
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${ACM_PORT}
+    check_rest_endpoint ${ACM_PORT}
 }
 
 function setup_api() {
     export ROBOT_FILES="api-test.robot api-slas.robot"
     source ${DOCKER_COMPOSE_DIR}/start-compose.sh api --grafana
     sleep 10
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${API_PORT}
+    check_rest_endpoint ${API_PORT}
 }
 
 function setup_pap() {
     export ROBOT_FILES="pap-test.robot pap-slas.robot"
     source ${DOCKER_COMPOSE_DIR}/start-compose.sh apex-pdp --grafana
     sleep 10
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${PAP_PORT}
+    check_rest_endpoint ${PAP_PORT}
 }
 
 function setup_apex() {
     export ROBOT_FILES="apex-pdp-test.robot apex-slas.robot"
     source ${DOCKER_COMPOSE_DIR}/start-compose.sh apex-pdp --grafana
     sleep 10
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${PAP_PORT}
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${APEX_PORT}
+    check_rest_endpoint ${PAP_PORT}
+    check_rest_endpoint ${APEX_PORT}
     apex_healthcheck
 }
 
@@ -89,8 +137,8 @@ function setup_apex_medium() {
     export APEX_REPLICA_TEARDOWN=true
     source ${DOCKER_COMPOSE_DIR}/start-multiple-pdp.sh --start --replicas=3
     sleep 10
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${PAP_PORT}
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${APEX_PORT}
+    check_rest_endpoint ${PAP_PORT}
+    check_rest_endpoint ${APEX_PORT}
     apex_healthcheck
 }
 
@@ -99,52 +147,34 @@ function setup_apex_large() {
     export APEX_REPLICA_TEARDOWN=true
     source ${DOCKER_COMPOSE_DIR}/start-multiple-pdp.sh --start --replicas=10
     sleep 10
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${PAP_PORT}
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${APEX_PORT}
+    check_rest_endpoint ${PAP_PORT}
+    check_rest_endpoint ${APEX_PORT}
     apex_healthcheck
 }
 
-function apex_healthcheck() {
-    sleep 20
-
-    healthy=false
-
-    while [ $healthy = false ]
-    do
-        msg=`curl -s -k --user 'policyadmin:zb!XztG34' http://localhost:${APEX_PORT}/policy/apex-pdp/v1/healthcheck`
-        echo "${msg}" | grep -q true
-        if [ "${?}" -eq 0 ]
-        then
-            healthy=true
-            break
-        fi
-        sleep 10s
-    done
-}
-
 function setup_drools_apps() {
     export ROBOT_FILES="drools-applications-test.robot drools-applications-slas.robot"
     source ${DOCKER_COMPOSE_DIR}/start-compose.sh drools-applications --grafana
     sleep 10
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${PAP_PORT}
+    check_rest_endpoint ${PAP_PORT}
     sleep 10
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${DROOLS_APPS_PORT}
+    check_rest_endpoint ${DROOLS_APPS_PORT}
     sleep 10
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${DROOLS_APPS_TELEMETRY_PORT}
+    check_rest_endpoint ${DROOLS_APPS_TELEMETRY_PORT}
 }
 
 function setup_xacml_pdp() {
     export ROBOT_FILES="xacml-pdp-test.robot xacml-pdp-slas.robot"
     source ${DOCKER_COMPOSE_DIR}/start-compose.sh xacml-pdp --grafana
     sleep 10
-    bash ${SCRIPTS}/wait_for_rest.sh localhost "${XACML_PORT}"
+    check_rest_endpoint "${XACML_PORT}"
 }
 
 function setup_drools_pdp() {
     export ROBOT_FILES="drools-pdp-test.robot"
-    source ${DOCKER_COMPOSE_DIR}/start-compose.sh drools-pdp
+    source ${DOCKER_COMPOSE_DIR}/start-compose.sh drools-pdp --grafana
     sleep 30
-    bash ${SCRIPTS}/wait_for_rest.sh localhost ${DROOLS_TELEMETRY_PORT}
+    check_rest_endpoint ${DROOLS_TELEMETRY_PORT}
 }
 
 function setup_distribution() {
@@ -155,9 +185,9 @@ function setup_distribution() {
     sudo mkdir /tmp/distribution
 
     export ROBOT_FILES="distribution-test.robot"
-    source ${DOCKER_COMPOSE_DIR}/start-compose.sh distribution
+    source ${DOCKER_COMPOSE_DIR}/start-compose.sh distribution --grafana
     sleep 10
-    bash ${SCRIPTS}/wait_for_rest.sh localhost "${DIST_PORT}"
+    check_rest_endpoint "${DIST_PORT}"
 }
 
 function build_robot_image() {
@@ -229,23 +259,6 @@ function set_project_config() {
     esac
 }
 
-# even with forced finish, clean up docker containers
-function on_exit(){
-    rm -rf ${CSAR_DIR}/csar_temp.csar
-
-    # teardown of compose containers for acm-replicas doesn't work with normal stop-compose script
-    if [ "${ACM_REPLICA_TEARDOWN}" = true ]; then
-        source ${DOCKER_COMPOSE_DIR}/start-acm-replica.sh --stop --replicas=2
-    elif [ "${APEX_REPLICA_TEARDOWN}" = true ]; then
-        source ${DOCKER_COMPOSE_DIR}/start-multiple-pdp.sh --stop --replicas=2
-    else
-        source ${DOCKER_COMPOSE_DIR}/stop-compose.sh ${PROJECT}
-    fi
-
-    mv ${DOCKER_COMPOSE_DIR}/*.log ${ROBOT_LOG_DIR}
-    exit $RC
-}
-
 # ensure that teardown and other finalizing steps are always executed
 trap on_exit EXIT