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/metrics/dashboards/sla-metrics.json b/compose/metrics/dashboards/sla-metrics.json
index 5287b54..d48be38 100644
--- 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