From cbb703ccc9cea510ba47a5302a9caa7487914e35 Mon Sep 17 00:00:00 2001 From: Muzammil Date: Fri, 21 Jun 2024 16:49:43 +0500 Subject: [PATCH] feat: add cluster label to mojaloop dashboards (#633) --- .../dashboard-account-lookup-service.json | 450 +++++++++++------- ...ard-central-services-characterization.json | 392 +++++++++------ .../mojaloop/dashboard-ml-adapter.json | 366 ++++++++------ 3 files changed, 744 insertions(+), 464 deletions(-) diff --git a/monitoring/dashboards/mojaloop/dashboard-account-lookup-service.json b/monitoring/dashboards/mojaloop/dashboard-account-lookup-service.json index 112fb39f7..742bb8c7b 100644 --- a/monitoring/dashboards/mojaloop/dashboard-account-lookup-service.json +++ b/monitoring/dashboards/mojaloop/dashboard-account-lookup-service.json @@ -21,7 +21,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "10.0.2" + "version": "10.2.3" }, { "type": "panel", @@ -154,9 +154,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -165,7 +166,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_ing_getPartiesByTypeAndID_count)", + "expr": "sum(moja_als_ing_getPartiesByTypeAndID_count{cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -180,7 +181,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(moja_als_ing_getPartiesByTypeIDAndSubID_count)", + "expr": "sum(moja_als_ing_getPartiesByTypeIDAndSubID_count{cluster=\"$cluster\"})", "hide": false, "instant": false, "range": true, @@ -264,9 +265,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -275,7 +277,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_ing_putPartiesByTypeAndID_count)", + "expr": "sum(moja_als_ing_putPartiesByTypeAndID_count{cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -290,7 +292,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(moja_als_ing_putPartiesByTypeIDAndSubID_count)", + "expr": "sum(moja_als_ing_putPartiesByTypeIDAndSubID_count{cluster=\"$cluster\"})", "hide": false, "instant": false, "range": true, @@ -374,9 +376,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -384,7 +387,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(moja_als_ing_putPartiesErrorByTypeAndID_count)", + "expr": "sum(moja_als_ing_putPartiesErrorByTypeAndID_count{cluster=\"$cluster\"})", "hide": false, "instant": false, "range": true, @@ -396,7 +399,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(moja_als_ing_putPartiesErrorByTypeIDAndSubID_count)", + "expr": "sum(moja_als_ing_putPartiesErrorByTypeIDAndSubID_count{cluster=\"$cluster\"})", "hide": false, "instant": false, "range": true, @@ -487,9 +490,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -498,7 +502,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_getPartiesByTypeAndID_count{success=\"true\"})", + "expr": "sum(moja_als_getPartiesByTypeAndID_count{success=\"true\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -514,7 +518,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_getPartiesByTypeAndID_count{success=\"false\"})", + "expr": "sum(moja_als_getPartiesByTypeAndID_count{success=\"false\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -592,9 +596,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -603,7 +608,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_putPartiesByTypeAndID_count{success=\"true\"})", + "expr": "sum(moja_als_putPartiesByTypeAndID_count{success=\"true\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -619,7 +624,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_putPartiesByTypeAndID_count{success=\"false\"})", + "expr": "sum(moja_als_putPartiesByTypeAndID_count{success=\"false\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -697,9 +702,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -708,7 +714,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_puttPartiesErrorByTypeAndID_count{success=\"true\"})", + "expr": "sum(moja_als_puttPartiesErrorByTypeAndID_count{success=\"true\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -724,7 +730,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_puttPartiesErrorByTypeAndID_count{success=\"false\"})", + "expr": "sum(moja_als_puttPartiesErrorByTypeAndID_count{success=\"false\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -762,6 +768,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -775,6 +782,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -840,7 +848,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_getPartiesByTypeAndID_sum[$__rate_interval]) / rate(moja_als_ing_getPartiesByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_getPartiesByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_getPartiesByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "instant": false, "legendFormat": "getPartiesByTypeAndID success:{{success}}", "range": true, @@ -852,7 +860,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_putPartiesByTypeAndID_sum[$__rate_interval]) / rate(moja_als_ing_putPartiesByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_putPartiesByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_putPartiesByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "putPartiesByTypeAndID success:{{success}}", @@ -865,7 +873,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_getPartiesByTypeIDAndSubID_sum[$__rate_interval]) / rate(moja_als_ing_getPartiesByTypeIDAndSubID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_getPartiesByTypeIDAndSubID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_getPartiesByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "getPartiesByTypeIDAndSubID success:{{success}}", @@ -878,7 +886,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_putPartiesByTypeIDAndSubID_sum[$__rate_interval]) / rate(moja_als_ing_putPartiesByTypeIDAndSubID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_putPartiesByTypeIDAndSubID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_putPartiesByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "putPartiesByTypeIDAndSubID success:{{success}}", @@ -891,7 +899,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_putPartiesErrorByTypeAndID_sum[$__rate_interval]) / rate(moja_als_ing_putPartiesErrorByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_putPartiesErrorByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_putPartiesErrorByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "putPartiesErrorByTypeAndID success:{{success}}", @@ -904,7 +912,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_putPartiesErrorByTypeIDAndSubID_sum[$__rate_interval]) / rate(moja_als_ing_putPartiesErrorByTypeIDAndSubID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_putPartiesErrorByTypeIDAndSubID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_putPartiesErrorByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "putPartiesErrorByTypeIDAndSubID success:{{success}}", @@ -926,6 +934,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -939,6 +948,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1004,7 +1014,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_getPartiesByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_getPartiesByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "instant": false, "interval": "", "legendFormat": "getPartiesByTypeAndID success:{{success}}", @@ -1017,7 +1027,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_putPartiesByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_putPartiesByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "putPartiesByTypeAndID success:{{success}}", @@ -1030,7 +1040,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_getPartiesByTypeIDAndSubID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_getPartiesByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "getPartiesByTypeIDAndSubID success:{{success}}", @@ -1043,7 +1053,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_putPartiesByTypeIDAndSubID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_putPartiesByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "putPartiesByTypeIDAndSubID success:{{success}}", @@ -1056,7 +1066,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_putPartiesErrorByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_putPartiesErrorByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": " putPartiesErrorByTypeAndID success:{{success}}", @@ -1069,7 +1079,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_putPartiesErrorByTypeIDAndSubID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_putPartiesErrorByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "putPartiesErrorByTypeIDAndSubID success:{{success}}", @@ -1091,6 +1101,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1104,6 +1115,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1170,7 +1182,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg(rate(moja_als_getPartiesByTypeAndID_sum[$__rate_interval]) / rate(moja_als_getPartiesByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_getPartiesByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_getPartiesByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "getPartiesByTypeAndID success:{{success}}", @@ -1183,7 +1195,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_putPartiesByTypeAndID_sum[$__rate_interval]) / rate(moja_als_putPartiesByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_putPartiesByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_putPartiesByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "putPartiesByTypeAndID success:{{success}}", @@ -1196,7 +1208,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_puttPartiesErrorByTypeAndID_sum[$__rate_interval]) / rate(moja_als_puttPartiesErrorByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_puttPartiesErrorByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_puttPartiesErrorByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "puttPartiesErrorByTypeAndID success:{{success}}", @@ -1218,6 +1230,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1231,6 +1244,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1296,7 +1310,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_getPartiesByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_getPartiesByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "instant": false, "interval": "", "legendFormat": "getPartiesByTypeAndID success:{{success}}", @@ -1309,7 +1323,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_putPartiesByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_putPartiesByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "putPartiesByTypeAndID success:{{success}}", @@ -1322,7 +1336,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_puttPartiesErrorByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_puttPartiesErrorByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "puttPartiesErrorByTypeAndID success:{{success}}", @@ -1373,7 +1387,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -1402,9 +1417,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1413,7 +1429,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_ing_getParticipantsByTypeAndID_count)", + "expr": "sum(moja_als_ing_getParticipantsByTypeAndID_count{cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -1428,7 +1444,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(moja_als_ing_getParticipantsByTypeIdAndSubID_count)", + "expr": "sum(moja_als_ing_getParticipantsByTypeIdAndSubID_count{cluster=\"$cluster\"})", "hide": false, "instant": false, "range": true, @@ -1482,7 +1498,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -1511,9 +1528,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1522,7 +1540,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_ing_postParticipantsbyTypeAndID_count)", + "expr": "sum(moja_als_ing_postParticipantsbyTypeAndID_count{cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -1537,7 +1555,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(moja_als_ing_postParticipantsByTypeIDAndSubID_count)", + "expr": "sum(moja_als_ing_postParticipantsByTypeIDAndSubID_count{cluster=\"$cluster\"})", "hide": false, "instant": false, "range": true, @@ -1591,7 +1609,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -1620,9 +1639,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1631,7 +1651,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_ing_postParticipantsBatch_count)", + "expr": "sum(moja_als_ing_postParticipantsBatch_count{cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -1672,7 +1692,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -1701,9 +1722,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1712,7 +1734,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_ing_deleteParticipantsByTypeAndID_count)", + "expr": "sum(moja_als_ing_deleteParticipantsByTypeAndID_count{cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -1727,7 +1749,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(moja_als_ing_deleteParticipantsByTypeIDAndSubID_count)", + "expr": "sum(moja_als_ing_deleteParticipantsByTypeIDAndSubID_count{cluster=\"$cluster\"})", "hide": false, "instant": false, "range": true, @@ -1781,7 +1803,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -1810,9 +1833,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1821,7 +1845,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_ing_putParticipantsByTypeAndID_count)", + "expr": "sum(moja_als_ing_putParticipantsByTypeAndID_count{cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -1836,7 +1860,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(moja_als_ing_putParticipantsByTypeIDAndSubID_count)", + "expr": "sum(moja_als_ing_putParticipantsByTypeIDAndSubID_count{cluster=\"$cluster\"})", "hide": false, "instant": false, "range": true, @@ -1890,7 +1914,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -1919,9 +1944,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1930,7 +1956,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_ing_putParticipantsErrorByTypeAndID_count)", + "expr": "sum(moja_als_ing_putParticipantsErrorByTypeAndID_count{cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -1945,7 +1971,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(moja_als_ing_putParticipantsErrorByTypeIDAndSubID_count)", + "expr": "sum(moja_als_ing_putParticipantsErrorByTypeIDAndSubID_count{cluster=\"$cluster\"})", "hide": false, "instant": false, "range": true, @@ -1988,7 +2014,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] } @@ -2035,9 +2062,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -2046,7 +2074,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_getParticipantsByTypeAndID_count{success=\"true\"})", + "expr": "sum(moja_als_getParticipantsByTypeAndID_count{success=\"true\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2062,7 +2090,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_getParticipantsByTypeAndID_count{success=\"false\"})", + "expr": "sum(moja_als_getParticipantsByTypeAndID_count{success=\"false\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2092,7 +2120,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] } @@ -2139,9 +2168,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -2150,7 +2180,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_postParticipants_count{success=\"true\"})", + "expr": "sum(moja_als_postParticipants_count{success=\"true\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2166,7 +2196,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_postParticipants_count{success=\"false\"})", + "expr": "sum(moja_als_postParticipants_count{success=\"false\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2196,7 +2226,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] } @@ -2243,9 +2274,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -2254,7 +2286,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_postParticipantsBatch_count{success=\"true\"})", + "expr": "sum(moja_als_postParticipantsBatch_count{success=\"true\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2270,7 +2302,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_postParticipantsBatch_count{success=\"false\"})", + "expr": "sum(moja_als_postParticipantsBatch_count{success=\"false\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2300,7 +2332,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] } @@ -2347,9 +2380,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -2358,7 +2392,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_deleteParticipants_count{success=\"true\"})", + "expr": "sum(moja_als_deleteParticipants_count{success=\"true\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2374,7 +2408,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_deleteParticipants_count{success=\"false\"})", + "expr": "sum(moja_als_deleteParticipants_count{success=\"false\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2404,7 +2438,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] } @@ -2451,9 +2486,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -2462,7 +2498,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_putParticipantsByTypeAndID_count{success=\"true\"})", + "expr": "sum(moja_als_putParticipantsByTypeAndID_count{success=\"true\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2478,7 +2514,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_putParticipantsByTypeAndID_count{success=\"false\"})", + "expr": "sum(moja_als_putParticipantsByTypeAndID_count{success=\"false\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2508,7 +2544,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] } @@ -2555,9 +2592,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -2566,7 +2604,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_putParticipantsErrorByTypeAndID_count{success=\"true\"})", + "expr": "sum(moja_als_putParticipantsErrorByTypeAndID_count{success=\"true\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2582,7 +2620,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(moja_als_putParticipantsErrorByTypeAndID_count{success=\"false\"})", + "expr": "sum(moja_als_putParticipantsErrorByTypeAndID_count{success=\"false\",cluster=\"$cluster\"})", "format": "time_series", "hide": false, "instant": false, @@ -2620,6 +2658,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2633,6 +2672,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2654,7 +2694,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2697,7 +2738,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_getParticipantsByTypeAndID_sum[$__rate_interval]) / rate(moja_als_ing_getParticipantsByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_getParticipantsByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_getParticipantsByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "instant": false, "legendFormat": "getParticipantsByTypeAndID success:{{success}}", "range": true, @@ -2709,7 +2750,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_putParticipantsByTypeAndID_sum[$__rate_interval]) / rate(moja_als_ing_putParticipantsByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_putParticipantsByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_putParticipantsByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsByTypeAndID success:{{success}}", @@ -2722,7 +2763,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_postParticipantsbyTypeAndID_sum[$__rate_interval]) / rate(moja_als_ing_postParticipantsbyTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_postParticipantsbyTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_postParticipantsbyTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "postParticipantsbyTypeAndID success:{{success}}", @@ -2735,7 +2776,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_deleteParticipantsByTypeAndID_sum[$__rate_interval]) / rate(moja_als_ing_deleteParticipantsByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_deleteParticipantsByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_deleteParticipantsByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "deleteParticipantsByTypeAndID success:{{success}}", @@ -2748,7 +2789,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_getParticipantsByTypeIdAndSubID_sum[$__rate_interval]) / rate(moja_als_ing_getParticipantsByTypeIdAndSubID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_getParticipantsByTypeIdAndSubID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_getParticipantsByTypeIdAndSubID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "getParticipantsByTypeIdAndSubID success:{{success}}", @@ -2761,7 +2802,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_putParticipantsByTypeIDAndSubID_sum[$__rate_interval]) / rate(moja_als_ing_putParticipantsByTypeIDAndSubID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_putParticipantsByTypeIDAndSubID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_putParticipantsByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsByTypeIDAndSubID success:{{success}}", @@ -2774,7 +2815,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_postParticipantsByTypeIDAndSubID_sum[$__rate_interval]) / rate(moja_als_ing_postParticipantsByTypeIDAndSubID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_postParticipantsByTypeIDAndSubID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_postParticipantsByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "postParticipantsByTypeIDAndSubID success:{{success}}", @@ -2787,7 +2828,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_deleteParticipantsByTypeIDAndSubID_sum[$__rate_interval]) / rate(moja_als_ing_deleteParticipantsByTypeIDAndSubID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_deleteParticipantsByTypeIDAndSubID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_deleteParticipantsByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "deleteParticipantsByTypeIDAndSubID success:{{success}}", @@ -2800,7 +2841,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_putParticipantsErrorByTypeAndID_sum[$__rate_interval]) / rate(moja_als_ing_putParticipantsErrorByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_putParticipantsErrorByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_putParticipantsErrorByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsErrorByTypeAndID success:{{success}}", @@ -2813,7 +2854,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_ing_putParticipantsErrorByTypeIDAndSubID_sum[$__rate_interval]) / rate(moja_als_ing_putParticipantsErrorByTypeIDAndSubID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_ing_putParticipantsErrorByTypeIDAndSubID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_ing_putParticipantsErrorByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsErrorByTypeIDAndSubID success:{{success}}", @@ -2835,6 +2876,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2848,6 +2890,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2869,7 +2912,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2912,7 +2956,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_getParticipantsByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_getParticipantsByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "instant": false, "interval": "", "legendFormat": "getParticipantsByTypeAndID success:{{success}}", @@ -2925,7 +2969,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_putParticipantsByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_putParticipantsByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsByTypeAndID success:{{success}}", @@ -2938,7 +2982,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_postParticipantsbyTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_postParticipantsbyTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "postParticipantsbyTypeAndID success:{{success}}", @@ -2951,7 +2995,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_deleteParticipantsByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_deleteParticipantsByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "deleteParticipantsByTypeAndID success:{{success}}", @@ -2964,7 +3008,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_getParticipantsByTypeIdAndSubID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_getParticipantsByTypeIdAndSubID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "getParticipantsByTypeIdAndSubID success:{{success}}", @@ -2977,7 +3021,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_putParticipantsByTypeIDAndSubID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_putParticipantsByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsByTypeIDAndSubID success:{{success}}", @@ -2990,7 +3034,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_postParticipantsByTypeIDAndSubID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_postParticipantsByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "postParticipantsByTypeIDAndSubID success:{{success}}", @@ -3003,7 +3047,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_deleteParticipantsByTypeIDAndSubID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_deleteParticipantsByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "deleteParticipantsByTypeIDAndSubID success:{{success}}", @@ -3016,7 +3060,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_putParticipantsErrorByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_putParticipantsErrorByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsErrorByTypeAndID success:{{success}}", @@ -3029,7 +3073,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_ing_putParticipantsErrorByTypeIDAndSubID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_ing_putParticipantsErrorByTypeIDAndSubID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsErrorByTypeIDAndSubID success:{{success}}", @@ -3051,6 +3095,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3064,6 +3109,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3095,7 +3141,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3138,7 +3185,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_getParticipantsByTypeAndID_sum[$__rate_interval]) / rate(moja_als_getParticipantsByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_getParticipantsByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_getParticipantsByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "instant": false, "legendFormat": "getParticipantsByTypeAndID success:{{success}}", "range": true, @@ -3150,7 +3197,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_putParticipantsByTypeAndID_sum[$__rate_interval]) / rate(moja_als_putParticipantsByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_putParticipantsByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_putParticipantsByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsByTypeAndID success:{{success}}", @@ -3163,7 +3210,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_putParticipantsErrorByTypeAndID_sum[$__rate_interval]) / rate(moja_als_putParticipantsErrorByTypeAndID_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_putParticipantsErrorByTypeAndID_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_putParticipantsErrorByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsErrorByTypeAndID success:{{success}}", @@ -3176,7 +3223,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_postParticipants_sum[$__rate_interval]) / rate(moja_als_postParticipants_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_postParticipants_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_postParticipants_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "postParticipants success:{{success}}", @@ -3189,7 +3236,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_postParticipantsBatch_sum[$__rate_interval]) / rate(moja_als_postParticipantsBatch_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_postParticipantsBatch_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_postParticipantsBatch_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "postParticipantsBatch success:{{success}}", @@ -3202,7 +3249,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_deleteParticipants_sum[$__rate_interval]) / rate(moja_als_deleteParticipants_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_deleteParticipants_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_deleteParticipants_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "deleteParticipants success:{{success}}", @@ -3224,6 +3271,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3237,6 +3285,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3258,7 +3307,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3301,7 +3351,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_getParticipantsByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_getParticipantsByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "instant": false, "interval": "", "legendFormat": "getParticipantsByTypeAndID success:{{success}}", @@ -3314,7 +3364,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_putParticipantsByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_putParticipantsByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsByTypeAndID success:{{success}}", @@ -3327,7 +3377,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_putParticipantsErrorByTypeAndID_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_putParticipantsErrorByTypeAndID_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "putParticipantsErrorByTypeAndID success:{{success}}", @@ -3340,7 +3390,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_postParticipants_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_postParticipants_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "postParticipants success:{{success}}", @@ -3353,7 +3403,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_postParticipantsBatch_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_postParticipantsBatch_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "postParticipantsBatch success:{{success}}", @@ -3366,7 +3416,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_postParticipantsBatch_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_postParticipantsBatch_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "deleteParticipants success:{{success}}", @@ -3388,6 +3438,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3401,6 +3452,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3422,7 +3474,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3468,7 +3521,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg(rate(moja_als_egress_getParticipantEndpoint_sum[$__rate_interval]) / rate(moja_als_egress_getParticipantEndpoint_count[$__rate_interval]) >=0) by (endpointType,success)", + "expr": "avg(rate(moja_als_egress_getParticipantEndpoint_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_egress_getParticipantEndpoint_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (endpointType,success)", "instant": false, "legendFormat": "getParticipantEndpoint {{endpointType}} success:{{success}}", "range": true, @@ -3481,7 +3534,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg(rate(moja_als_egress_sendRequestToParticipant_sum[$__rate_interval]) / rate(moja_als_egress_sendRequestToParticipant_count[$__rate_interval]) >=0) by (endpointType,success)", + "expr": "avg(rate(moja_als_egress_sendRequestToParticipant_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_egress_sendRequestToParticipant_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (endpointType,success)", "hide": false, "instant": false, "legendFormat": "sendRequestToParticipant {{endpointType}} success:{{success}}", @@ -3494,7 +3547,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_als_egress_validateParticipant_sum[$__rate_interval]) / rate(moja_als_egress_validateParticipant_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_als_egress_validateParticipant_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_als_egress_validateParticipant_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": false, "instant": false, "legendFormat": "validateParticipant success:{{success}}", @@ -3516,6 +3569,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3529,6 +3583,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3550,7 +3605,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3595,7 +3651,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_egress_getParticipantEndpoint_count[$__rate_interval])) by (success, endpointType)", + "expr": "sum(rate(moja_als_egress_getParticipantEndpoint_count{cluster=\"$cluster\"}[$__rate_interval])) by (success, endpointType)", "instant": false, "interval": "", "legendFormat": "getParticipantEndpoint {{endpointType}} success:{{success}}", @@ -3608,7 +3664,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_egress_sendRequestToParticipant_count[$__rate_interval])) by (success, endpointType)", + "expr": "sum(rate(moja_als_egress_sendRequestToParticipant_count{cluster=\"$cluster\"}[$__rate_interval])) by (success, endpointType)", "hide": false, "instant": false, "legendFormat": "sendRequestToParticipant {{endpointType}} success:{{success}}", @@ -3621,7 +3677,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_als_egress_validateParticipant_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_als_egress_validateParticipant_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "instant": false, "legendFormat": "validateParticipant {{endpointType}} success:{{success}}", @@ -3673,7 +3729,8 @@ "mode": "absolute", "steps": [ { - "color": "#299c46" + "color": "#299c46", + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -3690,7 +3747,7 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 6, "w": 4, "x": 0, "y": 67 @@ -3699,6 +3756,8 @@ "links": [], "maxDataPoints": 100, "options": { + "minVizHeight": 200, + "minVizWidth": 200, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -3708,9 +3767,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -3718,22 +3778,12 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*account-lookup.*'}[2m])) * 100", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod=~'.*account-lookup.*',cluster=\"$cluster\"}[2m])) * 100", "format": "time_series", - "hide": true, + "hide": false, "instant": true, "intervalFactor": 1, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "sum(irate (container_cpu_usage_seconds_total{pod_name=~'.*account-lookup.*'}[2m]))", - "range": true, - "refId": "B" } ], "title": "ALS Total CPU Usage", @@ -3745,7 +3795,7 @@ "h": 1, "w": 24, "x": 0, - "y": 70 + "y": 73 }, "id": 21, "panels": [], @@ -3763,6 +3813,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3776,6 +3827,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3798,7 +3850,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3814,7 +3867,7 @@ "h": 8, "w": 24, "x": 0, - "y": 71 + "y": 74 }, "id": 22, "options": { @@ -3842,7 +3895,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "moja_als_nodejs_heap_size_total_bytes{serviceName=~\"account-lookup.*\"}", + "expr": "moja_als_nodejs_heap_size_total_bytes{serviceName=~\"account-lookup.*\",cluster=\"$cluster\"}", "legendFormat": "heap_total-{{instance}} {{kubernetes_pod_name}}", "range": true, "refId": "A" @@ -3853,7 +3906,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "moja_als_nodejs_heap_size_used_bytes{serviceName=~\"account-lookup.*\"}", + "expr": "moja_als_nodejs_heap_size_used_bytes{serviceName=~\"account-lookup.*\",cluster=\"$cluster\"}", "legendFormat": "heap_used-{{instance}} {{kubernetes_pod_name}}", "range": true, "refId": "B" @@ -3864,7 +3917,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "moja_als_nodejs_external_memory_bytes{serviceName=~\"account-lookup.*\"}", + "expr": "moja_als_nodejs_external_memory_bytes{serviceName=~\"account-lookup.*\",cluster=\"$cluster\"}", "legendFormat": "ext_memory-{{instance}} {{kubernetes_pod_name}}", "range": true, "refId": "C" @@ -3885,6 +3938,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3898,6 +3952,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3936,7 +3991,7 @@ "h": 7, "w": 24, "x": 0, - "y": 79 + "y": 82 }, "id": 23, "links": [], @@ -3964,7 +4019,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum (rate (moja_als_process_cpu_seconds_total{serviceName=~\"account-lookup.*\"}[2m])) by (kubernetes_pod_name)", + "expr": "sum (rate (moja_als_process_cpu_seconds_total{serviceName=~\"account-lookup.*\",cluster=\"$cluster\"}[2m])) by (kubernetes_pod_name)", "format": "time_series", "hide": true, "intervalFactor": 1, @@ -3978,7 +4033,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(\n rate(container_cpu_usage_seconds_total{pod_name=~'.*account-lookup.*'}[2m]))\nby (pod_name)", + "expr": "sum(\n rate(container_cpu_usage_seconds_total{pod_name=~'.*account-lookup.*',cluster=\"$cluster\"}[2m]))\nby (pod_name)", "format": "time_series", "hide": true, "intervalFactor": 1, @@ -3992,7 +4047,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(container_cpu_usage_seconds_total{pod_name=~'.*account-lookup.*'}[2m]))", + "expr": "sum(rate(container_cpu_usage_seconds_total{pod_name=~'.*account-lookup.*',cluster=\"$cluster\"}[2m]))", "format": "time_series", "hide": true, "intervalFactor": 1, @@ -4006,7 +4061,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "rate(moja_als_process_cpu_seconds_total{serviceName=~\"account-lookup.*\"}[30s]) * 100", + "expr": "rate(moja_als_process_cpu_seconds_total{serviceName=~\"account-lookup.*\",cluster=\"$cluster\"}[30s]) * 100", "legendFormat": "{{kubernetes_pod_name}}", "range": true, "refId": "B" @@ -4021,7 +4076,7 @@ "h": 1, "w": 24, "x": 0, - "y": 86 + "y": 89 }, "id": 18, "panels": [], @@ -4050,7 +4105,7 @@ "h": 4, "w": 24, "x": 0, - "y": 87 + "y": 90 }, "hiddenSeries": false, "id": 19, @@ -4075,7 +4130,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "pointradius": 5, "points": false, "renderer": "flot", @@ -4090,7 +4145,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "kube_deployment_spec_replicas{deployment=~\".*account-lookup.*\"}", + "expr": "kube_deployment_spec_replicas{deployment=~\".*account-lookup.*\",cluster=\"$cluster\"}", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -4141,6 +4196,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -4154,6 +4210,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -4192,7 +4249,7 @@ "h": 7, "w": 24, "x": 0, - "y": 91 + "y": 94 }, "id": 20, "links": [], @@ -4216,7 +4273,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(moja_als_nodejs_eventloop_lag_seconds{serviceName=~\"account-lookup.*\"}) by (app)", + "expr": "avg(moja_als_nodejs_eventloop_lag_seconds{serviceName=~\"account-lookup.*\",cluster=\"$cluster\"}) by (app)", "format": "time_series", "intervalFactor": 1, "legendFormat": "{{app}}", @@ -4228,12 +4285,35 @@ "type": "timeseries" } ], - "refresh": "5s", - "schemaVersion": 38, - "style": "dark", + "refresh": "", + "schemaVersion": 39, "tags": [], "templating": { - "list": [] + "list": [ + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "label_values(node_uname_info,cluster)", + "hide": 0, + "includeAll": false, + "multi": false, + "name": "cluster", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(node_uname_info,cluster)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" + } + ] }, "time": { "from": "now-5m", @@ -4242,7 +4322,7 @@ "timepicker": {}, "timezone": "", "title": "Mojaloop - ALS", - "uid": "a0bc6ab1-e6f8-4cd3-a173-89b9ae692807", + "uid": "a7a0aacb-a090-44a6-bee7-97ce431acf95-v04", "version": 1, "weekStart": "" -} +} \ No newline at end of file diff --git a/monitoring/dashboards/mojaloop/dashboard-central-services-characterization.json b/monitoring/dashboards/mojaloop/dashboard-central-services-characterization.json index b6913515e..c8a363cd6 100644 --- a/monitoring/dashboards/mojaloop/dashboard-central-services-characterization.json +++ b/monitoring/dashboards/mojaloop/dashboard-central-services-characterization.json @@ -27,7 +27,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "10.0.2" + "version": "10.2.3" }, { "type": "datasource", @@ -95,6 +95,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -108,6 +109,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -216,9 +218,11 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum_over_time(sum(moja_cl_model_participant_count{queryName=\"model_getParticipantsCached\"}[$__interval]))", + "editorMode": "code", + "expr": "sum_over_time(sum(moja_cl_model_participant_count{queryName=\"model_getParticipantsCached\",cluster=\"$cluster\"}[$__interval]))", "hide": true, "legendFormat": "{{queryName}}-hit:{{hit}}", + "range": true, "refId": "A" }, { @@ -226,9 +230,11 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum by (queryName, hit) (sum_over_time( moja_cl_model_participant_count{queryName=\"model_getParticipantsCached\"}[$__interval]))", + "editorMode": "code", + "expr": "sum by (queryName, hit) (sum_over_time( moja_cl_model_participant_count{queryName=\"model_getParticipantsCached\",cluster=\"$cluster\"}[$__interval]))", "hide": true, "legendFormat": "{{queryName}}-{{hit}}", + "range": true, "refId": "B" }, { @@ -236,9 +242,11 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum by (queryName, hit) (sum_over_time( moja_cl_model_participant_count{queryName=~\"model_.*Cached\"}[$__interval]))", + "editorMode": "code", + "expr": "sum by (queryName, hit) (sum_over_time( moja_cl_model_participant_count{queryName=~\"model_.*Cached\",cluster=\"$cluster\"}[$__interval]))", "hide": true, "legendFormat": "{{queryName}}-{{hit}}", + "range": true, "refId": "C" }, { @@ -246,9 +254,11 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate( moja_cl_model_participant_count{queryName=~\"model_.*Cached\"}[$__rate_interval])) by (queryName, hit) ", + "editorMode": "code", + "expr": "sum(rate( moja_cl_model_participant_count{queryName=~\"model_.*Cached\",cluster=\"$cluster\"}[$__rate_interval])) by (queryName, hit) ", "hide": false, "legendFormat": "{{queryName}}-{{hit}}", + "range": true, "refId": "D" } ], @@ -266,6 +276,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -279,6 +290,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -369,8 +381,10 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_cl_model_transfer_count[$__rate_interval])) by (queryName)", + "editorMode": "code", + "expr": "sum(rate(moja_cl_model_transfer_count{cluster=\"$cluster\"}[$__rate_interval])) by (queryName)", "legendFormat": "{{queryName}}", + "range": true, "refId": "A" }, { @@ -378,8 +392,10 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_cl_model_participant_count[$__rate_interval])) by (queryName)", + "editorMode": "code", + "expr": "sum(rate(moja_cl_model_participant_count{cluster=\"$cluster\"}[$__rate_interval])) by (queryName)", "legendFormat": "{{queryName}}", + "range": true, "refId": "B" }, { @@ -387,8 +403,10 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_cl_model_position_count[$__rate_interval])) by (queryName)", + "editorMode": "code", + "expr": "sum(rate(moja_cl_model_position_count{cluster=\"$cluster\"}[$__rate_interval])) by (queryName)", "legendFormat": "{{queryName}}", + "range": true, "refId": "C" } ], @@ -406,6 +424,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -419,6 +438,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -510,7 +530,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_transfer_prepare_sum{serviceName=\"central-handler-prepare\"}[$__rate_interval]) / rate(moja_cl_transfer_prepare_count{serviceName=\"central-handler-prepare\"}[$__rate_interval]) >=0 )", + "expr": "avg(rate(moja_cl_transfer_prepare_sum{serviceName=\"central-handler-prepare\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_transfer_prepare_count{serviceName=\"central-handler-prepare\",cluster=\"$cluster\"}[$__rate_interval]) >=0 )", "hide": true, "legendFormat": "IGNORE - ?", "range": true, @@ -522,7 +542,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_model_transfer_sum{queryName=\"facade_savePayeeTransferResponse\"}[$__rate_interval]) / rate(moja_cl_model_transfer_count{queryName=\"facade_savePayeeTransferResponse\"}[$__rate_interval]) >=0 )", + "expr": "avg(rate(moja_cl_model_transfer_sum{queryName=\"facade_savePayeeTransferResponse\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_model_transfer_count{queryName=\"facade_savePayeeTransferResponse\",cluster=\"$cluster\"}[$__rate_interval]) >=0 )", "hide": true, "legendFormat": "IGNORE - {{queryName}}", "range": true, @@ -534,7 +554,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_model_position_sum{queryName=\"facade_prepareChangeParticipantPositionTransaction_transaction\"}[$__rate_interval]) / rate(moja_cl_model_position_count{queryName=\"facade_prepareChangeParticipantPositionTransaction_transaction\"}[$__rate_interval]) >=0 )", + "expr": "avg(rate(moja_cl_model_position_sum{queryName=\"facade_prepareChangeParticipantPositionTransaction_transaction\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_model_position_count{queryName=\"facade_prepareChangeParticipantPositionTransaction_transaction\",cluster=\"$cluster\"}[$__rate_interval]) >=0 )", "hide": true, "legendFormat": "IGNORE - {{queryName}}", "range": true, @@ -546,7 +566,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_model_position_sum{queryName=~\"facade_prepareChangeParticipantPositionTransaction_transaction_*\"}[$__rate_interval]) / rate(moja_cl_model_position_count{queryName=~\"facade_prepareChangeParticipantPositionTransaction_transaction_*\"}[$__rate_interval]) >=0 )", + "expr": "avg(rate(moja_cl_model_position_sum{queryName=~\"facade_prepareChangeParticipantPositionTransaction_transaction_*\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_model_position_count{queryName=~\"facade_prepareChangeParticipantPositionTransaction_transaction_*\",cluster=\"$cluster\"}[$__rate_interval]) >=0 )", "hide": true, "legendFormat": "IGNORE - {{queryNIGNORE - ame}}", "range": true, @@ -558,7 +578,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_model_transfer_sum[$__rate_interval]) / rate(moja_cl_model_transfer_count[$__rate_interval]) >=0 ) by (queryName, kubernetes_pod_name)", + "expr": "avg(rate(moja_cl_model_transfer_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_model_transfer_count{cluster=\"$cluster\"}[$__rate_interval]) >=0 ) by (queryName, kubernetes_pod_name)", "hide": false, "legendFormat": "{{queryName}} - {{kubernetes_pod_name}}", "range": true, @@ -570,7 +590,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_model_participant_sum[$__rate_interval]) / rate(moja_cl_model_participant_count[$__rate_interval]) >=0 ) by (queryName, kubernetes_pod_name)", + "expr": "avg(rate(moja_cl_model_participant_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_model_participant_count{cluster=\"$cluster\"}[$__rate_interval]) >=0 ) by (queryName, kubernetes_pod_name)", "hide": false, "legendFormat": "{{queryName}} - {{kubernetes_pod_name}}", "range": true, @@ -582,7 +602,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_model_position_sum[$__rate_interval]) / rate(moja_cl_model_position_count[$__rate_interval]) >=0 ) by (queryName, kubernetes_pod_name)", + "expr": "avg(rate(moja_cl_model_position_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_model_position_count{cluster=\"$cluster\"}[$__rate_interval]) >=0 ) by (queryName, kubernetes_pod_name)", "hide": false, "legendFormat": "{{queryName}} - {{kubernetes_pod_name}}", "range": true, @@ -603,6 +623,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -616,6 +637,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -639,7 +661,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -703,8 +726,10 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_cl_handler_transfers_count[$__rate_interval])) by (funcName)", + "editorMode": "code", + "expr": "sum(rate(moja_cl_handler_transfers_count{cluster=\"$cluster\"}[$__rate_interval])) by (funcName)", "legendFormat": "{{funcName}}", + "range": true, "refId": "A" }, { @@ -712,8 +737,10 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_cl_handlers_transfer_validator_count[$__rate_interval])) by (funcName)", + "editorMode": "code", + "expr": "sum(rate(moja_cl_handlers_transfer_validator_count{cluster=\"$cluster\"}[$__rate_interval])) by (funcName)", "legendFormat": "{{funcName}}", + "range": true, "refId": "B" }, { @@ -721,9 +748,11 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_cl_domain_transfer_count[$__rate_interval])) by (funcName)", + "editorMode": "code", + "expr": "sum(rate(moja_cl_domain_transfer_count{cluster=\"$cluster\"}[$__rate_interval])) by (funcName)", "hide": false, "legendFormat": "{{funcName}}", + "range": true, "refId": "C" }, { @@ -731,9 +760,11 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_cl_domain_position_count[$__rate_interval])) by (funcName)", + "editorMode": "code", + "expr": "sum(rate(moja_cl_domain_position_count{cluster=\"$cluster\"}[$__rate_interval])) by (funcName)", "hide": false, "legendFormat": "{{funcName}}", + "range": true, "refId": "D" } ], @@ -751,6 +782,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -764,6 +796,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -787,7 +820,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -854,7 +888,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_handler_transfers_sum[$__rate_interval]) / rate(moja_cl_handler_transfers_count[$__rate_interval]) >=0) by (funcName, kubernetes_pod_name)", + "expr": "avg(rate(moja_cl_handler_transfers_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_handler_transfers_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (funcName, kubernetes_pod_name)", "legendFormat": "{{funcName}} - {{kubernetes_pod_name}} - {{mode}}", "range": true, "refId": "A" @@ -865,7 +899,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_handlers_transfer_validator_sum[$__rate_interval]) / rate(moja_cl_handlers_transfer_validator_count[$__rate_interval]) >=0) by (funcName, kubernetes_pod_name)", + "expr": "avg(rate(moja_cl_handlers_transfer_validator_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_handlers_transfer_validator_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (funcName, kubernetes_pod_name)", "legendFormat": "{{funcName}} - {{kubernetes_pod_name}}", "range": true, "refId": "B" @@ -876,7 +910,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_domain_transfer_sum[$__rate_interval]) / rate(moja_cl_domain_transfer_count[$__rate_interval]) >=0) by (funcName, kubernetes_pod_name)", + "expr": "avg(rate(moja_cl_domain_transfer_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_domain_transfer_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (funcName, kubernetes_pod_name)", "legendFormat": "{{funcName}} - {{kubernetes_pod_name}}", "range": true, "refId": "C" @@ -887,7 +921,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_domain_position_sum[$__rate_interval]) / rate(moja_cl_domain_position_count[$__rate_interval]) >=0) by (funcName, kubernetes_pod_name)", + "expr": "avg(rate(moja_cl_domain_position_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_domain_position_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (funcName, kubernetes_pod_name)", "legendFormat": "{{funcName}} - {{kubernetes_pod_name}}", "range": true, "refId": "D" @@ -898,7 +932,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_transfer_position_sum[$__rate_interval]) / rate(moja_cl_transfer_position_count[$__rate_interval]) >=0) by (funcName, kubernetes_pod_name)", + "expr": "avg(rate(moja_cl_transfer_position_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_transfer_position_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (funcName, kubernetes_pod_name)", "legendFormat": "Position handler - {{kubernetes_pod_name}}", "range": true, "refId": "E" @@ -945,6 +979,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -958,6 +993,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -980,7 +1016,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1023,7 +1060,8 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(kafka_consumergroup_lag{topic=~\"topic-.*\", consumergroup=~\"cl-group-.*\"}) by (consumergroup, topic)", + "editorMode": "code", + "expr": "sum(kafka_consumergroup_lag{topic=~\"topic-.*\", consumergroup=~\"cl-group-.*\",cluster=\"$cluster\"}) by (consumergroup, topic)", "format": "time_series", "hide": false, "instant": false, @@ -1073,6 +1111,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1086,6 +1125,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1109,7 +1149,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1195,7 +1236,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_cl_transfer_prepare_count{serviceName=~\"central-handler-prepare|central-service\"}[$__rate_interval])) by (app_kubernetes_io_name)", + "expr": "sum(rate(moja_cl_transfer_prepare_count{serviceName=~\"central-handler-prepare|central-service\",cluster=\"$cluster\"}[$__rate_interval])) by (app_kubernetes_io_name)", "format": "time_series", "hide": false, "interval": "", @@ -1210,7 +1251,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-position|central-service\", }[$__rate_interval])) by (app_kubernetes_io_name, action)", + "expr": "sum(rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-position|central-service\",cluster=\"$cluster\" }[$__rate_interval])) by (app_kubernetes_io_name, action)", "format": "time_series", "hide": true, "intervalFactor": 1, @@ -1224,7 +1265,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-position|central-service\", }[$__rate_interval])) by (app_kubernetes_io_name)", + "expr": "sum(rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-position|central-service\", cluster=\"$cluster\"}[$__rate_interval])) by (app_kubernetes_io_name)", "hide": false, "legendFormat": "{{app_kubernetes_io_name}}-position", "range": true, @@ -1236,7 +1277,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_cl_transfer_fulfil_count{serviceName=~\"central-handler-fulfil|central-service\"}[$__rate_interval])) by (app_kubernetes_io_name)", + "expr": "sum(rate(moja_cl_transfer_fulfil_count{serviceName=~\"central-handler-fulfil|central-service\",cluster=\"$cluster\"}[$__rate_interval])) by (app_kubernetes_io_name)", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1250,7 +1291,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-prepare|central-service\"}[$__rate_interval]))", + "expr": "sum(rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-prepare|central-service\",cluster=\"$cluster\"}[$__rate_interval]))", "format": "time_series", "hide": true, "intervalFactor": 1, @@ -1264,7 +1305,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_cl_transfer_prepare_count{serviceName=~\"central-handler-prepare|central-service\"}[$__rate_interval])) by (kubernetes_pod_name)", + "expr": "sum(rate(moja_cl_transfer_prepare_count{serviceName=~\"central-handler-prepare|central-service\",cluster=\"$cluster\"}[$__rate_interval])) by (kubernetes_pod_name)", "hide": false, "legendFormat": "{{kubernetes_pod_name}}", "range": true, @@ -1276,7 +1317,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_cl_transfer_fulfil_count{serviceName=~\"central-handler-fulfil|central-service\"}[$__rate_interval])) by (kubernetes_pod_name)", + "expr": "sum(rate(moja_cl_transfer_fulfil_count{serviceName=~\"central-handler-fulfil|central-service\",cluster=\"$cluster\"}[$__rate_interval])) by (kubernetes_pod_name)", "hide": false, "legendFormat": "{{kubernetes_pod_name}}", "range": true, @@ -1288,7 +1329,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-position|central-service\"}[$__rate_interval])) by (kubernetes_pod_name)", + "expr": "sum(rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-position|central-service\",cluster=\"$cluster\"}[$__rate_interval])) by (kubernetes_pod_name)", "hide": false, "legendFormat": "{{kubernetes_pod_name}}", "range": true, @@ -1299,9 +1340,11 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_cl_handler_transfers_count[$__rate_interval])) by (kubernetes_pod_name, funcName)", + "editorMode": "code", + "expr": "sum(rate(moja_cl_handler_transfers_count{cluster=\"$cluster\"}[$__rate_interval])) by (kubernetes_pod_name, funcName)", "hide": true, "legendFormat": "handler-transfers-{{funcName}}-{{kubernetes_pod_name}}", + "range": true, "refId": "H" }, { @@ -1309,9 +1352,11 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_cl_handlers_transfer_validator_count[$__rate_interval])) by (kubernetes_pod_name, funcName)", + "editorMode": "code", + "expr": "sum(rate(moja_cl_handlers_transfer_validator_count{cluster=\"$cluster\"}[$__rate_interval])) by (kubernetes_pod_name, funcName)", "hide": true, "legendFormat": "handler-transfers-validator-{{funcName}}-{{kubernetes_pod_name}}", + "range": true, "refId": "J" } ], @@ -1344,7 +1389,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1377,9 +1423,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1387,7 +1434,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_cl_transfer_prepare_count{serviceName=~\"central-handler-prepare|central-service\"}[$__rate_interval]))", + "expr": "sum(rate(moja_cl_transfer_prepare_count{serviceName=~\"central-handler-prepare|central-service\",cluster=\"$cluster\"}[$__rate_interval]))", "format": "time_series", "instant": true, "intervalFactor": 1, @@ -1424,7 +1471,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1457,9 +1505,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1467,7 +1516,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-prepare|central-service\"}[$__rate_interval]))", + "expr": "sum(rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-prepare|central-service\",cluster=\"$cluster\"}[$__rate_interval]))", "format": "time_series", "instant": true, "intervalFactor": 1, @@ -1503,7 +1552,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1536,9 +1586,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1546,7 +1597,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_cl_transfer_fulfil_count{serviceName=~\"central-handler-fulfil|central-service\"}[$__rate_interval]))", + "expr": "sum(rate(moja_cl_transfer_fulfil_count{serviceName=~\"central-handler-fulfil|central-service\",cluster=\"$cluster\"}[$__rate_interval]))", "format": "time_series", "instant": true, "interval": "", @@ -1568,6 +1619,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1581,6 +1633,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1604,7 +1657,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1691,7 +1745,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "rate(moja_cl_transfer_prepare_sum{serviceName=~\"central-handler-prepare|central-service\"}[$__rate_interval]) / rate(moja_cl_transfer_prepare_count{serviceName=~\"central-handler-prepare|central-service\"}[$__rate_interval]) >=0", + "expr": "rate(moja_cl_transfer_prepare_sum{serviceName=~\"central-handler-prepare|central-service\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_transfer_prepare_count{serviceName=~\"central-handler-prepare|central-service\",cluster=\"$cluster\"}[$__rate_interval]) >=0", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1705,7 +1759,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "rate(moja_cl_transfer_position_sum{serviceName=~\"central-handler-position|central-service\"}[$__rate_interval]) / rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-position|central-service\"}[$__rate_interval]) >=0", + "expr": "rate(moja_cl_transfer_position_sum{serviceName=~\"central-handler-position|central-service\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-position|central-service\",cluster=\"$cluster\"}[$__rate_interval]) >=0", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1719,7 +1773,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "rate(moja_cl_transfer_fulfil_sum{serviceName=~\"central-handler-fulfil|central-service\"}[$__rate_interval]) / rate(moja_cl_transfer_fulfil_count{serviceName=~\"central-handler-fulfil|central-service\"}[$__rate_interval]) >=0 ", + "expr": "rate(moja_cl_transfer_fulfil_sum{serviceName=~\"central-handler-fulfil|central-service\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_transfer_fulfil_count{serviceName=~\"central-handler-fulfil|central-service\",cluster=\"$cluster\"}[$__rate_interval]) >=0 ", "legendFormat": "Transfer Fulfil - {{kubernetes_pod_name}}", "range": true, "refId": "F" @@ -1730,7 +1784,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_transfer_prepare_sum{serviceName=~\"central-handler-prepare|central-service\"}[$__rate_interval]) / rate(moja_cl_transfer_prepare_count{serviceName=~\"central-handler-prepare|central-service\"}[$__rate_interval]) >=0) ", + "expr": "avg(rate(moja_cl_transfer_prepare_sum{serviceName=~\"central-handler-prepare|central-service\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_transfer_prepare_count{serviceName=~\"central-handler-prepare|central-service\",cluster=\"$cluster\"}[$__rate_interval]) >=0) ", "format": "time_series", "hide": false, "instant": false, @@ -1744,7 +1798,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_transfer_position_sum{serviceName=~\"central-handler-position|central-service\"}[$__rate_interval]) / rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-position|central-service\"}[$__rate_interval]) >=0) ", + "expr": "avg(rate(moja_cl_transfer_position_sum{serviceName=~\"central-handler-position|central-service\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_transfer_position_count{serviceName=~\"central-handler-position|central-service\",cluster=\"$cluster\"}[$__rate_interval]) >=0) ", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1758,7 +1812,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_cl_transfer_fulfil_sum{serviceName=~\"central-handler-fulfil|central-service\"}[$__rate_interval]) / rate(moja_cl_transfer_fulfil_count{serviceName=~\"central-handler-fulfil|central-service\"}[$__rate_interval]) >=0) ", + "expr": "avg(rate(moja_cl_transfer_fulfil_sum{serviceName=~\"central-handler-fulfil|central-service\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_cl_transfer_fulfil_count{serviceName=~\"central-handler-fulfil|central-service\",cluster=\"$cluster\"}[$__rate_interval]) >=0) ", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1795,7 +1849,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1817,8 +1872,10 @@ "links": [], "options": { "displayMode": "gradient", + "maxVizHeight": 300, "minVizHeight": 10, "minVizWidth": 0, + "namePlacement": "auto", "orientation": "vertical", "reduceOptions": { "calcs": [ @@ -1828,16 +1885,17 @@ "values": false }, "showUnfilled": true, + "sizing": "auto", "valueMode": "color" }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(sum_over_time( moja_cl_model_transfer_count{queryName=\"facade_saveTransferPrepared_transaction\", success=\"true\"}[$__interval]))", + "expr": "sum(sum_over_time( moja_cl_model_transfer_count{queryName=\"facade_saveTransferPrepared_transaction\", success=\"true\",cluster=\"$cluster\"}[$__interval]))", "legendFormat": "Transfer Prepares (success)", "refId": "A" }, @@ -1846,7 +1904,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(sum_over_time( moja_cl_model_transfer_count{queryName=\"facade_saveTransferPrepared_transaction\", success=\"false\"}[$__interval]))", + "expr": "sum(sum_over_time( moja_cl_model_transfer_count{queryName=\"facade_saveTransferPrepared_transaction\", success=\"false\",cluster=\"$cluster\"}[$__interval]))", "hide": true, "legendFormat": "Transfer Prepares (failed)", "refId": "B" @@ -1856,7 +1914,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(sum_over_time( moja_cl_model_transfer_count{queryName=\"facade_saveTransferPrepared_transaction\"}[$__interval]))", + "expr": "sum(sum_over_time( moja_cl_model_transfer_count{queryName=\"facade_saveTransferPrepared_transaction\",cluster=\"$cluster\"}[$__interval]))", "hide": true, "refId": "C" } @@ -1919,7 +1977,8 @@ "mode": "absolute", "steps": [ { - "color": "#299c46" + "color": "#299c46", + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -1936,7 +1995,7 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 7, "w": 5, "x": 0, "y": 90 @@ -1945,6 +2004,8 @@ "links": [], "maxDataPoints": 100, "options": { + "minVizHeight": 200, + "minVizWidth": 200, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -1954,29 +2015,19 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*centralledger.*'}[2m])) / sum (machine_cpu_cores{}) * 100", - "format": "time_series", - "hide": true, - "instant": true, - "intervalFactor": 1, - "legendFormat": "Central Services Total CPU Usage", - "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*centralledger.*'}[2m]))", + "editorMode": "code", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod=~'.*centralledger.*',cluster=\"$cluster\"}[2m])) * 100", + "range": true, "refId": "B" } ], @@ -2012,7 +2063,8 @@ "mode": "absolute", "steps": [ { - "color": "#299c46" + "color": "#299c46", + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -2029,7 +2081,7 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 7, "w": 5, "x": 5, "y": 90 @@ -2038,6 +2090,8 @@ "links": [], "maxDataPoints": 100, "options": { + "minVizHeight": 200, + "minVizWidth": 200, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -2047,30 +2101,24 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*centralledger-handler-transfer-prepare.*'}[2m])) / sum (machine_cpu_cores{}) * 100", + "editorMode": "code", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod=~'.*centralledger-handler-transfer-prepare.*',cluster=\"$cluster\"}[2m])) * 100", "format": "time_series", - "hide": true, + "hide": false, "instant": true, "intervalFactor": 1, "legendFormat": "Transfer Prepare Handler CPU Usage", "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*centralledger-handler-transfer-prepare.*'}[2m]))", - "refId": "B" } ], "title": "Transfer Prepare Handler CPU Usage", @@ -2105,7 +2153,8 @@ "mode": "absolute", "steps": [ { - "color": "#299c46" + "color": "#299c46", + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -2122,7 +2171,7 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 7, "w": 5, "x": 10, "y": 90 @@ -2131,6 +2180,8 @@ "links": [], "maxDataPoints": 100, "options": { + "minVizHeight": 200, + "minVizWidth": 200, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -2140,16 +2191,18 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*centralledger-handler-transfer-position.*'}[2m])) / sum (machine_cpu_cores{}) * 100", + "editorMode": "code", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod=~'.*centralledger-handler-transfer-position.*',cluster=\"$cluster\"}[2m])) / sum (machine_cpu_cores{cluster=\"$cluster\"}) * 100", "format": "time_series", "hide": true, "instant": true, @@ -2162,7 +2215,9 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*centralledger-handler-transfer-position.*'}[2m]))", + "editorMode": "code", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod=~'.*centralledger-handler-transfer-position.*',cluster=\"$cluster\"}[2m])) * 100", + "range": true, "refId": "B" } ], @@ -2198,7 +2253,8 @@ "mode": "absolute", "steps": [ { - "color": "#299c46" + "color": "#299c46", + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -2215,7 +2271,7 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 7, "w": 5, "x": 15, "y": 90 @@ -2224,6 +2280,8 @@ "links": [], "maxDataPoints": 100, "options": { + "minVizHeight": 200, + "minVizWidth": 200, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -2233,16 +2291,18 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*centralledger-handler-transfer-fulfil.*'}[2m])) / sum (machine_cpu_cores{}) * 100", + "editorMode": "code", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod=~'.*centralledger-handler-transfer-fulfil.*',cluster=\"$cluster\"}[2m])) / sum (machine_cpu_cores{cluster=\"$cluster\"}) * 100", "format": "time_series", "hide": true, "instant": true, @@ -2255,7 +2315,9 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*centralledger-handler-transfer-fulfil.*'}[2m]))", + "editorMode": "code", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod=~'.*centralledger-handler-transfer-fulfil.*',cluster=\"$cluster\"}[2m])) *100 ", + "range": true, "refId": "B" } ], @@ -2272,7 +2334,7 @@ "h": 1, "w": 24, "x": 0, - "y": 93 + "y": 97 }, "id": 48, "panels": [], @@ -2300,6 +2362,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2313,6 +2376,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2335,7 +2399,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2392,7 +2457,7 @@ "h": 9, "w": 24, "x": 0, - "y": 94 + "y": 98 }, "id": 2, "links": [], @@ -2419,11 +2484,13 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (moja_cl_process_cpu_seconds_total{serviceName=~\"central.*\"}[$__rate_interval])) by (app)", + "editorMode": "code", + "expr": "sum (irate (moja_cl_process_cpu_seconds_total{serviceName=~\"central.*\",cluster=\"$cluster\"}[$__rate_interval])) by (app)", "format": "time_series", "hide": true, "intervalFactor": 1, "legendFormat": "{{app}}", + "range": true, "refId": "A" }, { @@ -2431,7 +2498,8 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(\n irate(container_cpu_usage_seconds_total{pod_name=~'.*centralledger-handler-transfer-.*|.*centralledger-service.*'}[$__rate_interval]))\nby (pod_name)", + "editorMode": "code", + "expr": "sum(\n irate(container_cpu_usage_seconds_total{pod_name=~'.*centralledger-handler-transfer-.*|.*centralledger-service.*',cluster=\"$cluster\"}[$__rate_interval]))\nby (pod_name)", "format": "time_series", "hide": true, "instant": false, @@ -2444,7 +2512,8 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*centralledger-handler-transfer-.*|.*centralledger-service.*'}[$__rate_interval]))", + "editorMode": "code", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*centralledger-handler-transfer-.*|.*centralledger-service.*',cluster=\"$cluster\"}[$__rate_interval]))", "format": "time_series", "hide": true, "instant": false, @@ -2457,10 +2526,12 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (rate (container_cpu_usage_seconds_total{namespace='test', pod_name=~'test-centralledger-hand.*|test-centralledger-serv.*|test-centralledger-handler-transfer-fulfil.*'}[1m])) by (instance)", + "editorMode": "code", + "expr": "sum (rate (container_cpu_usage_seconds_total{namespace='test', pod_name=~'test-centralledger-hand.*|test-centralledger-serv.*|test-centralledger-handler-transfer-fulfil.*',cluster=\"$cluster\"}[1m])) by (instance)", "format": "time_series", "hide": true, "intervalFactor": 1, + "range": true, "refId": "D" }, { @@ -2468,10 +2539,12 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{}[1m])) by (instance)", + "editorMode": "code", + "expr": "sum (irate (container_cpu_usage_seconds_total{cluster=\"$cluster\"}[1m])) by (instance)", "format": "time_series", "hide": true, "intervalFactor": 1, + "range": true, "refId": "F" }, { @@ -2479,11 +2552,13 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "irate(node_cpu_seconds_total{}[5m]})", + "editorMode": "code", + "expr": "irate(node_cpu_seconds_total{cluster=\"$cluster\"}[5m])", "format": "time_series", "hide": true, "intervalFactor": 1, "legendFormat": "", + "range": true, "refId": "G" }, { @@ -2491,10 +2566,12 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "kube_node_status_capacity_cpu_cores", + "editorMode": "code", + "expr": "kube_node_status_capacity_cpu_cores{cluster=\"$cluster\"}", "format": "time_series", "hide": true, "intervalFactor": 1, + "range": true, "refId": "H" }, { @@ -2502,10 +2579,12 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "kube_node_status_allocatable_cpu_cores", + "editorMode": "code", + "expr": "kube_node_status_allocatable_cpu_cores{cluster=\"$cluster\"}", "format": "time_series", "hide": true, "intervalFactor": 1, + "range": true, "refId": "J" }, { @@ -2513,10 +2592,12 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(node_load1) by (instance)", + "editorMode": "code", + "expr": "sum(node_load1{cluster=\"$cluster\"}) by (instance)", "format": "time_series", "hide": true, "intervalFactor": 1, + "range": true, "refId": "K" }, { @@ -2524,10 +2605,12 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(node_load1)", + "editorMode": "code", + "expr": "sum(node_load1{cluster=\"$cluster\"})", "format": "time_series", "hide": true, "intervalFactor": 1, + "range": true, "refId": "L" }, { @@ -2535,10 +2618,12 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(\n irate(container_cpu_usage_seconds_total{beta_kubernetes_io_instance_type=\"m4.2xlarge\"}[$__rate_interval]))\nby (pod_name)", + "editorMode": "code", + "expr": "sum(\n irate(container_cpu_usage_seconds_total{beta_kubernetes_io_instance_type=\"m4.2xlarge\",cluster=\"$cluster\"}[$__rate_interval]))\nby (pod_name)", "format": "time_series", "hide": true, "intervalFactor": 1, + "range": true, "refId": "M" }, { @@ -2546,10 +2631,12 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(\n irate(container_cpu_usage_seconds_total{}[$__rate_interval]))", + "editorMode": "code", + "expr": "sum(\n irate(container_cpu_usage_seconds_total{cluster=\"$cluster\"}[$__rate_interval]))", "format": "time_series", "hide": true, "intervalFactor": 1, + "range": true, "refId": "N" }, { @@ -2557,9 +2644,11 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "rate(moja_cl_process_cpu_seconds_total{serviceName=~\"central.*\"}[2m]) * 100", + "editorMode": "code", + "expr": "rate(moja_cl_process_cpu_seconds_total{serviceName=~\"central.*\",cluster=\"$cluster\"}[2m]) * 100", "hide": false, "legendFormat": "{{kubernetes_pod_name}}", + "range": true, "refId": "E" } ], @@ -2576,7 +2665,7 @@ "h": 1, "w": 24, "x": 0, - "y": 103 + "y": 107 }, "id": 46, "panels": [], @@ -2603,6 +2692,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2616,6 +2706,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2638,7 +2729,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2654,7 +2746,7 @@ "h": 7, "w": 24, "x": 0, - "y": 104 + "y": 108 }, "id": 10, "links": [], @@ -2678,7 +2770,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(moja_cl_nodejs_eventloop_lag_seconds{serviceName=~\"central.*\"}) by (instance, serviceName)", + "expr": "avg(moja_cl_nodejs_eventloop_lag_seconds{serviceName=~\"central.*\",cluster=\"$cluster\"}) by (instance, serviceName)", "format": "time_series", "intervalFactor": 1, "legendFormat": "{{instance}} {{serviceName}}", @@ -2700,6 +2792,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2713,6 +2806,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2736,7 +2830,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2752,7 +2847,7 @@ "h": 8, "w": 24, "x": 0, - "y": 111 + "y": 115 }, "id": 18, "links": [], @@ -2777,11 +2872,13 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "kube_deployment_spec_replicas{deployment=~\".*-centralledger-.*\"}", + "editorMode": "code", + "expr": "kube_deployment_spec_replicas{deployment=~\".*-centralledger-.*\",cluster=\"$cluster\"}", "format": "time_series", "hide": false, "intervalFactor": 1, "legendFormat": "{{deployment}}", + "range": true, "refId": "A" } ], @@ -2789,12 +2886,35 @@ "type": "timeseries" } ], - "refresh": "5s", - "schemaVersion": 38, - "style": "dark", + "refresh": "", + "schemaVersion": 39, "tags": [], "templating": { - "list": [] + "list": [ + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "label_values(node_uname_info,cluster)", + "hide": 0, + "includeAll": false, + "multi": false, + "name": "cluster", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(node_uname_info,cluster)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" + } + ] }, "time": { "from": "now-5m", @@ -2827,7 +2947,7 @@ }, "timezone": "", "title": "Mojaloop - Central-Ledger - Performance Characterization", - "uid": "5z9mkZ-prSDsDA", + "uid": "5z9mkZ-prSDsDA-v002", "version": 1, "weekStart": "" -} +} \ No newline at end of file diff --git a/monitoring/dashboards/mojaloop/dashboard-ml-adapter.json b/monitoring/dashboards/mojaloop/dashboard-ml-adapter.json index e85530de1..ccfebdb7f 100644 --- a/monitoring/dashboards/mojaloop/dashboard-ml-adapter.json +++ b/monitoring/dashboards/mojaloop/dashboard-ml-adapter.json @@ -21,7 +21,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "10.0.2" + "version": "10.2.3" }, { "type": "datasource", @@ -115,6 +115,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -128,6 +129,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -193,7 +195,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\"}[${__range_s}s]))", + "expr": "sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\",cluster=\"$cluster\"}[${__range_s}s]))", "hide": false, "instant": true, "legendFormat": "Total", @@ -205,7 +207,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(increase(moja_ml_tx_transfer_bucket{le=\"1\"}[${__range_s}s]))", + "expr": "sum(increase(moja_ml_tx_transfer_bucket{le=\"1\",cluster=\"$cluster\"}[${__range_s}s]))", "hide": false, "legendFormat": "Less than 1 sec", "range": true, @@ -217,7 +219,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\"}[${__range_s}s])) - sum(increase(moja_ml_tx_transfer_prepare_bucket{le=\"1\"}[${__range_s}s]))", + "expr": "sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\",cluster=\"$cluster\"}[${__range_s}s])) - sum(increase(moja_ml_tx_transfer_prepare_bucket{le=\"1\",cluster=\"$cluster\"}[${__range_s}s]))", "hide": false, "instant": true, "legendFormat": "More than 1 sec", @@ -229,7 +231,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\"}[${__range_s}s])) - sum(increase(moja_ml_tx_transfer_prepare_bucket{le=\"2\"}[${__range_s}s]))", + "expr": "sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\",cluster=\"$cluster\"}[${__range_s}s])) - sum(increase(moja_ml_tx_transfer_prepare_bucket{le=\"2\",cluster=\"$cluster\"}[${__range_s}s]))", "hide": false, "legendFormat": "More than 2 sec", "range": true, @@ -241,7 +243,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\"}[${__range_s}s])) - sum(increase(moja_ml_tx_transfer_prepare_bucket{le=\"5\"}[${__range_s}s]))", + "expr": "sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\",cluster=\"$cluster\"}[${__range_s}s])) - sum(increase(moja_ml_tx_transfer_prepare_bucket{le=\"5\",cluster=\"$cluster\"}[${__range_s}s]))", "hide": false, "legendFormat": "More than 5 sec", "range": true, @@ -288,6 +290,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -301,6 +304,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -414,7 +418,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_ml_tx_transfer_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": true, "legendFormat": "moja_ml_tx_transfer - success:{{success}}", "refId": "I" @@ -424,7 +428,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_prepare_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_ml_tx_transfer_prepare_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": true, "legendFormat": "moja_ml_tx_transfer_prepare - success:{{success}}", "refId": "J" @@ -434,7 +438,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_fulfil_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_ml_tx_transfer_fulfil_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": true, "legendFormat": "moja_ml_tx_transfer_fulfil - success:{{success}}", "refId": "K" @@ -444,7 +448,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_count[$__rate_interval]))", + "expr": "sum(rate(moja_ml_tx_transfer_count{cluster=\"$cluster\"}[$__rate_interval]))", "hide": false, "legendFormat": "moja_ml_tx_transfer - avg", "refId": "L" @@ -454,7 +458,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_prepare_count[$__rate_interval]))", + "expr": "sum(rate(moja_ml_tx_transfer_prepare_count{cluster=\"$cluster\"}[$__rate_interval]))", "hide": false, "legendFormat": "moja_ml_tx_transfer_prepare - avg", "refId": "M" @@ -464,7 +468,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_fulfil_count[$__rate_interval]))", + "expr": "sum(rate(moja_ml_tx_transfer_fulfil_count{cluster=\"$cluster\"}[$__rate_interval]))", "hide": false, "legendFormat": "moja_ml_tx_transfer_fulfil - avg", "refId": "N" @@ -474,7 +478,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\"}[$__rate_interval])) by (app, success)", + "expr": "sum(rate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval])) by (app, success)", "hide": false, "legendFormat": "Transfers API Prepare - success:{{success}}", "refId": "A" @@ -484,7 +488,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_transfer_fulfil_count{serviceName=\"ml-service\"}[$__rate_interval])) by (app, success)", + "expr": "sum(rate(moja_ml_transfer_fulfil_count{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval])) by (app, success)", "hide": false, "legendFormat": "Transfers API Fulfill - success:{{success}}", "refId": "B" @@ -494,7 +498,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_notification_event_delivery_count{serviceName=\"ml-handler-notification\"}[$__rate_interval])) by (app, action, status, success)", + "expr": "sum(rate(moja_ml_notification_event_delivery_count{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval])) by (app, action, status, success)", "hide": false, "legendFormat": "Notification Delivery - {{action}} - {{status}} - success:{{success}}", "refId": "G" @@ -514,6 +518,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -527,6 +532,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -619,7 +625,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_transfer_prepare_sum{serviceName=\"ml-service\"}[$__rate_interval]) / rate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\"}[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_transfer_prepare_sum{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval]) >=0)", "format": "time_series", "hide": false, "interval": "", @@ -634,7 +640,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_transfer_fulfil_sum{serviceName=\"ml-service\"}[$__rate_interval]) / rate(moja_ml_transfer_fulfil_count{serviceName=\"ml-service\"}[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_transfer_fulfil_sum{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_transfer_fulfil_count{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval]) >=0)", "format": "time_series", "hide": false, "interval": "", @@ -649,7 +655,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_notification_event_delivery_sum{serviceName=\"ml-handler-notification\"}[$__rate_interval]) / rate(moja_ml_notification_event_delivery_count{serviceName=\"ml-handler-notification\"}[$__rate_interval]) >=0) by (action, status, success)", + "expr": "avg(rate(moja_ml_notification_event_delivery_sum{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_notification_event_delivery_count{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) >=0) by (action, status, success)", "hide": false, "interval": "", "legendFormat": "Notification Deliveries - {{action}} - {{status}} - success:{{success}}", @@ -662,7 +668,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_notification_event_delivery_sum{serviceName=\"ml-handler-notification\"}[$__rate_interval]) / rate(moja_ml_notification_event_delivery_count{serviceName=\"ml-handler-notification\"}[$__rate_interval]) >=0) by (kubernetes_pod_name, action, status, success)", + "expr": "avg(rate(moja_ml_notification_event_delivery_sum{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_notification_event_delivery_count{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) >=0) by (kubernetes_pod_name, action, status, success)", "hide": true, "instant": false, "interval": "", @@ -675,7 +681,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_sum[$__rate_interval]) / rate(moja_ml_tx_transfer_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_ml_tx_transfer_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_tx_transfer_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": true, "interval": "", "legendFormat": "moja_ml_tx_transfer - success:{{success}}", @@ -688,7 +694,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_prepare_sum[$__rate_interval]) / rate(moja_ml_tx_transfer_prepare_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_ml_tx_transfer_prepare_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_tx_transfer_prepare_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "hide": true, "interval": "", "legendFormat": "moja_ml_tx_transfer_prepare - success:{{success}}", @@ -701,7 +707,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_fulfil_sum[$__rate_interval]) / rate(moja_ml_tx_transfer_fulfil_count[$__rate_interval])>=0) by (success)", + "expr": "avg(rate(moja_ml_tx_transfer_fulfil_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_tx_transfer_fulfil_count{cluster=\"$cluster\"}[$__rate_interval])>=0) by (success)", "hide": true, "interval": "", "legendFormat": "moja_ml_tx_transfer_fulfil - success:{{success}}", @@ -714,7 +720,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_sum[$__rate_interval]) / irate(moja_ml_tx_transfer_count[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_tx_transfer_sum{cluster=\"$cluster\"}[$__rate_interval]) / irate(moja_ml_tx_transfer_count{cluster=\"$cluster\"}[$__rate_interval]) >=0)", "interval": "", "legendFormat": "moja_ml_tx_transfer - avg", "range": true, @@ -726,7 +732,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_prepare_sum[$__rate_interval]) / rate(moja_ml_tx_transfer_prepare_count[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_tx_transfer_prepare_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_tx_transfer_prepare_count{cluster=\"$cluster\"}[$__rate_interval]) >=0)", "interval": "", "legendFormat": "moja_ml_tx_transfer_prepare - avg", "range": true, @@ -738,7 +744,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_fulfil_sum[$__rate_interval]) / rate(moja_ml_tx_transfer_fulfil_count[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_tx_transfer_fulfil_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_tx_transfer_fulfil_count{cluster=\"$cluster\"}[$__rate_interval]) >=0)", "interval": "", "legendFormat": "moja_ml_tx_transfer_fulfil - avg", "range": true, @@ -800,7 +806,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -833,9 +840,10 @@ "fields": "/^Financial Transfers / sec$/", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -843,7 +851,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(irate(moja_ml_tx_transfer_count[$__rate_interval]))", + "expr": "sum(irate(moja_ml_tx_transfer_count{cluster=\"$cluster\"}[$__rate_interval]))", "instant": true, "legendFormat": "Financial Transfers / sec", "refId": "A" @@ -878,7 +886,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -911,16 +920,17 @@ "fields": "/^Transfers / Sec$/", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(irate(moja_ml_tx_transfer_prepare_count[$__rate_interval]))", + "expr": "sum(irate(moja_ml_tx_transfer_prepare_count{cluster=\"$cluster\"}[$__rate_interval]))", "instant": true, "legendFormat": "Transfers / Sec", "refId": "A" @@ -955,7 +965,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -988,16 +999,17 @@ "fields": "/^Financial Fulfils / sec$/", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(irate(moja_ml_tx_transfer_fulfil_count[$__rate_interval]))", + "expr": "sum(irate(moja_ml_tx_transfer_fulfil_count{cluster=\"$cluster\"}[$__rate_interval]))", "instant": true, "legendFormat": "Financial Fulfils / sec", "refId": "A" @@ -1032,7 +1044,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1065,16 +1078,17 @@ "fields": "/^Transfers Prepare / sec$/", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(irate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\"}[$__rate_interval]))", + "expr": "sum(irate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval]))", "format": "time_series", "instant": true, "interval": "", @@ -1112,7 +1126,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1145,16 +1160,17 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(irate(moja_ml_transfer_fulfil_count{serviceName=\"ml-service\"}[$__rate_interval]))", + "expr": "sum(irate(moja_ml_transfer_fulfil_count{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval]))", "format": "time_series", "instant": true, "intervalFactor": 1, @@ -1190,7 +1206,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1223,9 +1240,10 @@ "fields": "/^Notification Events / sec$/", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1233,7 +1251,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(irate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\"}[$__rate_interval]))", + "expr": "sum(irate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\",cluster=\"$cluster\"}[$__rate_interval]))", "format": "time_series", "instant": true, "intervalFactor": 1, @@ -1270,7 +1288,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1303,9 +1322,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1313,7 +1333,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "histogram_quantile(0.95, sum(rate(moja_ml_tx_transfer_bucket[${__range_s}s])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(moja_ml_tx_transfer_bucket{cluster=\"$cluster\"}[${__range_s}s])) by (le))", "format": "time_series", "range": true, "refId": "A" @@ -1348,7 +1368,8 @@ "mode": "absolute", "steps": [ { - "color": "#299c46" + "color": "#299c46", + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -1385,9 +1406,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { @@ -1395,7 +1417,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "(sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\"}[${__range_s}s])) - sum(increase(moja_ml_tx_transfer_bucket{le=\"1\"}[${__range_s}s]))) / sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\"}[${__range_s}s]))", + "expr": "(sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\",cluster=\"$cluster\"}[${__range_s}s])) - sum(increase(moja_ml_tx_transfer_bucket{le=\"1\",cluster=\"$cluster\"}[${__range_s}s]))) / sum(increase(moja_ml_tx_transfer_bucket{le=\"+Inf\"}[${__range_s}s]))", "range": true, "refId": "A" } @@ -1441,6 +1463,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1454,6 +1477,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1477,7 +1501,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1563,7 +1588,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(kafka_consumergroup_lag{topic=~\"topic-.*\", consumergroup=~\"ml-group.*\"}) by (consumergroup, topic)", + "expr": "sum(kafka_consumergroup_lag{topic=~\"topic-.*\", consumergroup=~\"ml-group.*\",cluster=\"$cluster\"}) by (consumergroup, topic)", "format": "time_series", "instant": false, "interval": "", @@ -1576,7 +1601,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(kafka_consumergroup_lag{topic=~\"topic-event\"}) by (consumergroup, topic)", + "expr": "sum(kafka_consumergroup_lag{topic=~\"topic-event\",cluster=\"$cluster\"}) by (consumergroup, topic)", "hide": true, "legendFormat": "{{topic}}", "refId": "B" @@ -1586,7 +1611,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(kafka_consumergroup_lag{topic=~\"topic-.*\", consumergroup=~\"cl-group-.*\"}) by (consumergroup, topic)", + "expr": "sum(kafka_consumergroup_lag{topic=~\"topic-.*\", consumergroup=~\"cl-group-.*\",cluster=\"$cluster\"}) by (consumergroup, topic)", "hide": true, "legendFormat": "{{topic}}", "refId": "C" @@ -1632,6 +1657,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1645,6 +1671,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1668,7 +1695,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1757,7 +1785,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_ml_tx_transfer_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "legendFormat": "moja_ml_tx_transfer - success:{{success}}", "refId": "I" @@ -1767,7 +1795,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_prepare_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_ml_tx_transfer_prepare_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "legendFormat": "moja_ml_tx_transfer_prepare - success:{{success}}", "refId": "J" @@ -1777,7 +1805,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_fulfil_count[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_ml_tx_transfer_fulfil_count{cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "legendFormat": "moja_ml_tx_transfer_fulfil - success:{{success}}", "refId": "K" @@ -1788,7 +1816,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\"}[$__rate_interval])) by (app, success)", + "expr": "sum(rate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval])) by (app, success)", "format": "time_series", "hide": false, "interval": "", @@ -1802,7 +1830,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_transfer_fulfil_count{serviceName=\"ml-service\"}[$__rate_interval])) by (app, success)", + "expr": "sum(rate(moja_ml_transfer_fulfil_count{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval])) by (app, success)", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1815,7 +1843,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\"}[$__rate_interval])) by (app, success)", + "expr": "sum(rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\",cluster=\"$cluster\"}[$__rate_interval])) by (app, success)", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1829,7 +1857,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_ml_notification_event_process_msg_count{serviceName=~\"ml-handler-notification|ml-service\"}[$__rate_interval])) by (app, action, success)", + "expr": "sum(rate(moja_ml_notification_event_process_msg_count{serviceName=~\"ml-handler-notification|ml-service\",cluster=\"$cluster\"}[$__rate_interval])) by (app, action, success)", "hide": false, "legendFormat": "Notification Events - {{action}} - success:{{success}}", "range": true, @@ -1841,7 +1869,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_ml_notification_event_delivery_count{serviceName=\"~ml-handler-notification|ml-service\"}[$__rate_interval])) by (app, action, status, success)", + "expr": "sum(rate(moja_ml_notification_event_delivery_count{serviceName=\"~ml-handler-notification|ml-service\",cluster=\"$cluster\"}[$__rate_interval])) by (app, action, status, success)", "hide": false, "legendFormat": "Notification Delivery - {{action}} - {{status}} - success:{{success}}", "range": true, @@ -1853,7 +1881,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\"}[$__rate_interval])) by (instance, kubernetes_pod_name, success)", + "expr": "sum(rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\",cluster=\"$cluster\"}[$__rate_interval])) by (instance, kubernetes_pod_name, success)", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1867,7 +1895,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\"}[$__rate_interval])) by (app, kubernetes_pod_name, success)", + "expr": "sum(rate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval])) by (app, kubernetes_pod_name, success)", "format": "time_series", "hide": true, "intervalFactor": 1, @@ -1881,7 +1909,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_ml_notification_event_getEndpoint_count{serviceName=~\"ml-handler-notification|ml-service\"}[$__rate_interval])) by (success)", + "expr": "sum(rate(moja_ml_notification_event_getEndpoint_count{serviceName=~\"ml-handler-notification|ml-service\",cluster=\"$cluster\"}[$__rate_interval])) by (success)", "hide": false, "legendFormat": "Notification GetEndpoint - success:{{success}}", "range": true, @@ -1892,7 +1920,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_count[$__rate_interval]))", + "expr": "sum(rate(moja_ml_tx_transfer_count{cluster=\"$cluster\"}[$__rate_interval]))", "legendFormat": "moja_ml_tx_transfer - avg", "refId": "L" }, @@ -1901,7 +1929,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_prepare_count[$__rate_interval]))", + "expr": "sum(rate(moja_ml_tx_transfer_prepare_count{cluster=\"$cluster\"}[$__rate_interval]))", "legendFormat": "moja_ml_tx_transfer_prepare - avg", "refId": "M" }, @@ -1910,7 +1938,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_fulfil_count[$__rate_interval]))", + "expr": "sum(rate(moja_ml_tx_transfer_fulfil_count{cluster=\"$cluster\"}[$__rate_interval]))", "legendFormat": "moja_ml_tx_transfer_fulfil - avg", "refId": "N" } @@ -1929,6 +1957,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1942,6 +1971,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1965,7 +1995,8 @@ "mode": "absolute", "steps": [ { - "color": "transparent" + "color": "transparent", + "value": null }, { "color": "red", @@ -2033,7 +2064,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_transfer_prepare_sum{serviceName=\"ml-service\"}[$__rate_interval]) / rate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\"}[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_transfer_prepare_sum{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_transfer_prepare_count{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval]) >=0)", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -2047,7 +2078,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_transfer_fulfil_sum{serviceName=\"ml-service\"}[$__rate_interval]) / rate(moja_ml_transfer_fulfil_count{serviceName=\"ml-service\"}[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_transfer_fulfil_sum{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_transfer_fulfil_count{serviceName=\"ml-service\",cluster=\"$cluster\"}[$__rate_interval]) >=0)", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -2061,7 +2092,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_notification_event_sum{serviceName=\"ml-handler-notification\"}[$__rate_interval]) / rate(moja_ml_notification_event_count{serviceName=\"ml-handler-notification\"}[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_notification_event_sum{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_notification_event_count{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) >=0)", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -2075,7 +2106,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_notification_event_delivery_sum{serviceName=\"ml-handler-notification\"}[$__rate_interval]) / rate(moja_ml_notification_event_delivery_count{serviceName=\"ml-handler-notification\"}[$__rate_interval]) >=0) by (action, status, success)", + "expr": "avg(rate(moja_ml_notification_event_delivery_sum{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_notification_event_delivery_count{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) >=0) by (action, status, success)", "hide": false, "legendFormat": "Notification Deliveries - {{action}} - {{status}} - success:{{success}}", "range": true, @@ -2087,7 +2118,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_notification_event_delivery_sum{serviceName=\"ml-handler-notification\"}[$__rate_interval]) / rate(moja_ml_notification_event_delivery_count{serviceName=\"ml-handler-notification\"}[$__rate_interval]) >=0) by (kubernetes_pod_name, action, status, success)", + "expr": "avg(rate(moja_ml_notification_event_delivery_sum{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_notification_event_delivery_count{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) >=0) by (kubernetes_pod_name, action, status, success)", "hide": true, "instant": false, "legendFormat": "Notification Deliveries - {{kubernetes_pod_name}} - {{action}} - {{status}} - success:{{success}}", @@ -2099,7 +2130,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "rate(moja_ml_notification_event_sum{serviceName=\"ml-handler-notification\"}[$__rate_interval]) / rate(moja_ml_notification_event_count{serviceName=\"ml-handler-notification\"}[$__rate_interval]) >=0", + "expr": "rate(moja_ml_notification_event_sum{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_notification_event_count{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) >=0", "hide": true, "legendFormat": "Notification Events - {{kubernetes_pod_name}}", "range": true, @@ -2111,7 +2142,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_notification_event_getEndpoint_sum{serviceName=\"ml-handler-notification\"}[$__rate_interval]) / rate(moja_ml_notification_event_getEndpoint_count{serviceName=\"ml-handler-notification\"}[$__rate_interval]) >=0) by (kubernetes_pod_name)", + "expr": "avg(rate(moja_ml_notification_event_getEndpoint_sum{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_notification_event_getEndpoint_count{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) >=0) by (kubernetes_pod_name)", "hide": true, "legendFormat": "Notification GetEndPoint - {{kubernetes_pod_name}}", "range": true, @@ -2123,7 +2154,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_notification_event_getEndpoint_sum{serviceName=\"ml-handler-notification\"}[$__rate_interval]) / rate(moja_ml_notification_event_getEndpoint_count{serviceName=\"ml-handler-notification\"}[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_notification_event_getEndpoint_sum{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_notification_event_getEndpoint_count{serviceName=\"ml-handler-notification\",cluster=\"$cluster\"}[$__rate_interval]) >=0)", "hide": true, "legendFormat": "Notification GetEndPoint ", "range": true, @@ -2135,7 +2166,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_sum[$__rate_interval]) / rate(moja_ml_tx_transfer_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_ml_tx_transfer_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_tx_transfer_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "legendFormat": "moja_ml_tx_transfer - success:{{success}}", "range": true, "refId": "I" @@ -2146,7 +2177,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_prepare_sum[$__rate_interval]) / rate(moja_ml_tx_transfer_prepare_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_ml_tx_transfer_prepare_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_tx_transfer_prepare_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "legendFormat": "moja_ml_tx_transfer_prepare - success:{{success}}", "range": true, "refId": "J" @@ -2157,7 +2188,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_fulfil_sum[$__rate_interval]) / rate(moja_ml_tx_transfer_fulfil_count[$__rate_interval]) >=0) by (success)", + "expr": "avg(rate(moja_ml_tx_transfer_fulfil_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_tx_transfer_fulfil_count{cluster=\"$cluster\"}[$__rate_interval]) >=0) by (success)", "legendFormat": "moja_ml_tx_transfer_fulfil - success:{{success}}", "range": true, "refId": "K" @@ -2168,7 +2199,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_sum[$__rate_interval]) / irate(moja_ml_tx_transfer_count[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_tx_transfer_sum{cluster=\"$cluster\"}[$__rate_interval]) / irate(moja_ml_tx_transfer_count{cluster=\"$cluster\"}[$__rate_interval]) >=0)", "legendFormat": "moja_ml_tx_transfer - avg", "range": true, "refId": "L" @@ -2179,7 +2210,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_prepare_sum[$__rate_interval]) / rate(moja_ml_tx_transfer_prepare_count[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_tx_transfer_prepare_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_tx_transfer_prepare_count{cluster=\"$cluster\"}[$__rate_interval]) >=0)", "legendFormat": "moja_ml_tx_transfer_prepare - avg", "range": true, "refId": "M" @@ -2190,7 +2221,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(moja_ml_tx_transfer_fulfil_sum[$__rate_interval]) / rate(moja_ml_tx_transfer_fulfil_count[$__rate_interval]) >=0)", + "expr": "avg(rate(moja_ml_tx_transfer_fulfil_sum{cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_tx_transfer_fulfil_count{cluster=\"$cluster\"}[$__rate_interval]) >=0)", "legendFormat": "moja_ml_tx_transfer_fulfil - avg", "range": true, "refId": "N" @@ -2236,6 +2267,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2249,6 +2281,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2272,7 +2305,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2360,7 +2394,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum_over_time(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\", success!='true'}[$__interval]) by (app, success, error)", + "expr": "sum_over_time(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\", success!='true',cluster=\"$cluster\"}[$__interval]) by (app, success, error)", "hide": true, "legendFormat": "{{error}}", "range": true, @@ -2372,7 +2406,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\", success!='true'}[$__rate_interval])) by (app, success, error)", + "expr": "sum(rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\", success!='true',cluster=\"$cluster\"}[$__rate_interval])) by (app, success, error)", "hide": false, "legendFormat": "{{error}}", "range": true, @@ -2384,7 +2418,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\", success!='true'}[$__rate_interval])) by (app, success, error, kubernetes_pod_name)", + "expr": "sum(rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\", success!='true',cluster=\"$cluster\"}[$__rate_interval])) by (app, success, error, kubernetes_pod_name)", "hide": false, "legendFormat": "{{kubernetes_pod_name}} - {{error}}", "range": true, @@ -2396,7 +2430,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "rate(moja_ml_notification_event_sum{serviceName=~\"ml-handler-notification|ml-service\", success!='true'}[$__rate_interval]) / rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\", success!='true'}[$__rate_interval]) >= 0", + "expr": "rate(moja_ml_notification_event_sum{serviceName=~\"ml-handler-notification|ml-service\", success!='true',cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\", success!='true'}[$__rate_interval]) >= 0", "hide": false, "range": true, "refId": "D" @@ -2407,7 +2441,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "rate(moja_ml_notification_event_sum{serviceName=~\"ml-handler-notification|ml-service\", success!='false'}[$__rate_interval]) / rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\", success!='false'}[$__rate_interval]) >= 0", + "expr": "rate(moja_ml_notification_event_sum{serviceName=~\"ml-handler-notification|ml-service\", success!='false',cluster=\"$cluster\"}[$__rate_interval]) / rate(moja_ml_notification_event_count{serviceName=~\"ml-handler-notification|ml-service\", success!='false'}[$__rate_interval]) >= 0", "hide": false, "range": true, "refId": "E" @@ -2417,7 +2451,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(moja_ml_tx_transfer_bucket[$__rate_interval])) by (le)", + "expr": "sum(rate(moja_ml_tx_transfer_bucket{cluster=\"$cluster\"}[$__rate_interval])) by (le)", "hide": false, "refId": "F" } @@ -2437,6 +2471,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2450,6 +2485,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2473,7 +2509,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2556,7 +2593,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(increase(moja_ml_notification_event_bucket{le=\"+Inf\", serviceName=~\"ml-handler-notification|ml-service\", success!='true'}[${__range_s}s])) by (app, success, error)", + "expr": "sum(increase(moja_ml_notification_event_bucket{le=\"+Inf\", serviceName=~\"ml-handler-notification|ml-service\", success!='true',cluster=\"$cluster\"}[${__range_s}s])) by (app, success, error)", "format": "time_series", "instant": false, "legendFormat": "{{error}}", @@ -2620,7 +2657,8 @@ "mode": "absolute", "steps": [ { - "color": "#299c46" + "color": "#299c46", + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -2637,7 +2675,7 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 7, "w": 4, "x": 0, "y": 62 @@ -2646,6 +2684,8 @@ "links": [], "maxDataPoints": 100, "options": { + "minVizHeight": 200, + "minVizWidth": 200, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -2655,16 +2695,17 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api.*'}[2m])) * 100", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api.*',cluster=\"$cluster\"}[2m])) * 100", "format": "time_series", "hide": true, "instant": true, @@ -2676,7 +2717,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api.*'}[2m]))", + "expr": "sum(irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api.*',cluster=\"$cluster\"}[2m]))", "refId": "B" } ], @@ -2711,7 +2752,8 @@ "mode": "absolute", "steps": [ { - "color": "#299c46" + "color": "#299c46", + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -2728,7 +2770,7 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 7, "w": 4, "x": 4, "y": 62 @@ -2737,6 +2779,8 @@ "links": [], "maxDataPoints": 100, "options": { + "minVizHeight": 200, + "minVizWidth": 200, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -2746,16 +2790,17 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api-adapter-service.*'}[2m])) / sum (machine_cpu_cores{}) * 100", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api-adapter-service.*',cluster=\"$cluster\"}[2m])) / sum (machine_cpu_cores{cluster=\"$cluster\"}) * 100", "format": "time_series", "hide": true, "instant": true, @@ -2767,7 +2812,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api-adapter-service.*'}[2m]))", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api-adapter-service.*',cluster=\"$cluster\"}[2m]))", "refId": "B" } ], @@ -2802,7 +2847,8 @@ "mode": "absolute", "steps": [ { - "color": "#299c46" + "color": "#299c46", + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -2819,7 +2865,7 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 7, "w": 4, "x": 8, "y": 62 @@ -2828,6 +2874,8 @@ "links": [], "maxDataPoints": 100, "options": { + "minVizHeight": 200, + "minVizWidth": 200, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -2837,16 +2885,17 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "10.0.2", + "pluginVersion": "10.2.3", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api-adapter-handler-notification.*'}[2m])) / sum (machine_cpu_cores{}) * 100", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api-adapter-handler-notification.*',cluster=\"$cluster\"}[2m])) / sum (machine_cpu_cores{cluster=\"$cluster\"}) * 100", "format": "time_series", "hide": true, "instant": true, @@ -2858,7 +2907,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api-adapter-handler-notification.*'}[2m]))", + "expr": "sum (irate (container_cpu_usage_seconds_total{pod_name=~'.*ml-api-adapter-handler-notification.*',cluster=\"$cluster\"}[2m]))", "refId": "B" } ], @@ -2875,7 +2924,7 @@ "h": 1, "w": 24, "x": 0, - "y": 65 + "y": 69 }, "id": 28, "panels": [], @@ -2902,6 +2951,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2915,6 +2965,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2937,7 +2988,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2953,7 +3005,7 @@ "h": 8, "w": 24, "x": 0, - "y": 66 + "y": 70 }, "id": 46, "options": { @@ -2982,7 +3034,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "moja_ml_nodejs_heap_size_total_bytes{serviceName=~\"ml-s.*\"}", + "expr": "moja_ml_nodejs_heap_size_total_bytes{serviceName=~\"ml-s.*\",cluster=\"$cluster\"}", "legendFormat": "heap_total-{{kubernetes_pod_name}}", "refId": "A" }, @@ -2991,7 +3043,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "moja_ml_nodejs_heap_size_used_bytes{serviceName=~\"ml-s.*\"}", + "expr": "moja_ml_nodejs_heap_size_used_bytes{serviceName=~\"ml-s.*\",cluster=\"$cluster\"}", "legendFormat": "heap_used-{{kubernetes_pod_name}}", "refId": "B" }, @@ -3000,7 +3052,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "moja_ml_nodejs_external_memory_bytes{serviceName=~\"ml-s.*\"}", + "expr": "moja_ml_nodejs_external_memory_bytes{serviceName=~\"ml-s.*\",cluster=\"$cluster\"}", "legendFormat": "ext_memory-{{kubernetes_pod_name}}", "refId": "C" } @@ -3020,6 +3072,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3033,6 +3086,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3055,7 +3109,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3071,7 +3126,7 @@ "h": 7, "w": 24, "x": 0, - "y": 74 + "y": 78 }, "id": 2, "links": [], @@ -3100,7 +3155,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum (rate (moja_ml_process_cpu_seconds_total{serviceName=~\"ml-.*\"}[2m])) by (kubernetes_pod_name)", + "expr": "sum (rate (moja_ml_process_cpu_seconds_total{serviceName=~\"ml-.*\",cluster=\"$cluster\"}[2m])) by (kubernetes_pod_name)", "format": "time_series", "hide": true, "intervalFactor": 1, @@ -3112,7 +3167,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(\n rate(container_cpu_usage_seconds_total{pod_name=~'.*ml.*'}[2m]))\nby (pod_name)", + "expr": "sum(\n rate(container_cpu_usage_seconds_total{pod_name=~'.*ml.*',cluster=\"$cluster\"}[2m]))\nby (pod_name)", "format": "time_series", "hide": true, "intervalFactor": 1, @@ -3124,7 +3179,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(rate(container_cpu_usage_seconds_total{pod_name=~'.*ml.*'}[2m]))", + "expr": "sum(rate(container_cpu_usage_seconds_total{pod_name=~'.*ml.*',cluster=\"$cluster\"}[2m]))", "format": "time_series", "hide": true, "intervalFactor": 1, @@ -3136,7 +3191,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "rate(moja_ml_process_cpu_seconds_total{serviceName=~\"ml-.*\"}[$__rate_interval]) * 100", + "expr": "rate(moja_ml_process_cpu_seconds_total{serviceName=~\"ml-.*\",cluster=\"$cluster\"}[$__rate_interval]) * 100", "legendFormat": "{{kubernetes_pod_name}}", "refId": "B" } @@ -3154,7 +3209,7 @@ "h": 1, "w": 24, "x": 0, - "y": 81 + "y": 85 }, "id": 34, "panels": [], @@ -3181,6 +3236,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3194,6 +3250,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3217,7 +3274,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3233,7 +3291,7 @@ "h": 4, "w": 24, "x": 0, - "y": 82 + "y": 86 }, "id": 18, "links": [], @@ -3258,7 +3316,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "kube_deployment_spec_replicas{deployment=~\".*ml-api-.*\"}", + "expr": "kube_deployment_spec_replicas{deployment=~\".*ml-api-.*\",cluster=\"$cluster\"}", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -3270,7 +3328,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "kube_deployment_spec_replicas{deployment=~\".*simnotifhandler.*\"}", + "expr": "kube_deployment_spec_replicas{deployment=~\".*simnotifhandler.*\",cluster=\"$cluster\"}", "legendFormat": "{{deployment}}", "refId": "B" } @@ -3289,6 +3347,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3302,6 +3361,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3324,7 +3384,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3340,7 +3401,7 @@ "h": 7, "w": 24, "x": 0, - "y": 86 + "y": 90 }, "id": 10, "links": [], @@ -3363,7 +3424,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "avg(moja_ml_nodejs_eventloop_lag_seconds{serviceName=~\"ml.*\"}) by (app)", + "expr": "avg(moja_ml_nodejs_eventloop_lag_seconds{serviceName=~\"ml.*\",cluster=\"$cluster\"}) by (app)", "format": "time_series", "intervalFactor": 1, "legendFormat": "{{app}}", @@ -3375,11 +3436,30 @@ } ], "refresh": "5s", - "schemaVersion": 38, - "style": "dark", + "schemaVersion": 39, "tags": [], "templating": { - "list": [] + "list": [ + { + "current": {}, + "definition": "label_values(node_uname_info,cluster)", + "hide": 0, + "includeAll": false, + "multi": false, + "name": "cluster", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(node_uname_info,cluster)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" + } + ] }, "time": { "from": "now-5m", @@ -3412,7 +3492,7 @@ }, "timezone": "", "title": "Mojaloop - ML-API", - "uid": "5z9mkZ-msa", + "uid": "5z9mkZ-msa-v001", "version": 1, "weekStart": "" -} +} \ No newline at end of file