diff --git a/dashboards/grafana-dashboard-insights-hccm.configmap.yaml b/dashboards/grafana-dashboard-insights-hccm.configmap.yaml index 11ace23bd9..d9f5509994 100644 --- a/dashboards/grafana-dashboard-insights-hccm.configmap.yaml +++ b/dashboards/grafana-dashboard-insights-hccm.configmap.yaml @@ -27,8 +27,6 @@ data: "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 69016, - "iteration": 1675977639896, "links": [], "liveNow": false, "panels": [ @@ -98,7 +96,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -186,7 +184,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -282,7 +280,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -370,7 +368,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -447,6 +445,7 @@ data: "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -460,6 +459,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -585,6 +585,8 @@ data: }, "id": 76, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -594,9 +596,10 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -623,13 +626,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery download_xl_queue", + "description": "Cost Management celery summary_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -643,6 +647,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -659,6 +664,7 @@ data: "mode": "line+area" } }, + "decimals": 0, "displayName": "", "mappings": [], "thresholds": { @@ -670,11 +676,11 @@ data: }, { "color": "#EAB839", - "value": 450 + "value": 200 }, { "color": "red", - "value": 550 + "value": 300 } ] }, @@ -688,7 +694,7 @@ data: "x": 12, "y": 19 }, - "id": 86, + "id": 69, "options": { "legend": { "calcs": [ @@ -711,15 +717,11 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "editorMode": "code", - "expr": "max(download_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", - "interval": "", - "legendFormat": "Queue Size", - "range": true, + "expr": "koku:celery:summary_queue", "refId": "A" } ], - "title": "Download XL", + "title": "Summary", "transformations": [ { "id": "seriesToColumns", @@ -735,12 +737,13 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery download_xl_queue", + "description": "Cost Management celery summary_queue", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, + "decimals": 0, "displayName": "", "mappings": [], "thresholds": { @@ -752,11 +755,11 @@ data: }, { "color": "#EAB839", - "value": 450 + "value": 200 }, { "color": "red", - "value": 550 + "value": 300 } ] }, @@ -770,8 +773,10 @@ data: "x": 22, "y": 19 }, - "id": 87, + "id": 77, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -781,22 +786,21 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${Datasource}" }, - "editorMode": "code", - "expr": "max(download_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", - "range": true, + "expr": "koku:celery:summary_queue", "refId": "A" } ], - "title": "DL XL", + "title": "Summary", "transformations": [ { "id": "seriesToColumns", @@ -812,13 +816,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery download_penalty_queue", + "description": "Cost Management celery download_xl_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -832,6 +837,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -874,8 +880,8 @@ data: "gridPos": { "h": 8, "w": 10, - "x": 12, - "y": 19 + "x": 0, + "y": 27 }, "id": 86, "options": { @@ -901,14 +907,14 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(download_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(download_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "interval": "", "legendFormat": "Queue Size", "range": true, "refId": "A" } ], - "title": "Download Penalty", + "title": "Download XL", "transformations": [ { "id": "seriesToColumns", @@ -924,7 +930,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery download_penalty_queue", + "description": "Cost Management celery download_xl_queue", "fieldConfig": { "defaults": { "color": { @@ -956,11 +962,13 @@ data: "gridPos": { "h": 8, "w": 2, - "x": 22, - "y": 19 + "x": 10, + "y": 27 }, "id": 87, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -970,9 +978,10 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -980,12 +989,12 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(download_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(download_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "range": true, "refId": "A" } ], - "title": "DL Penalty", + "title": "DL XL", "transformations": [ { "id": "seriesToColumns", @@ -1001,13 +1010,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery summary_queue", + "description": "Cost Management celery summary_xl_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1021,6 +1031,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1037,7 +1048,6 @@ data: "mode": "line+area" } }, - "decimals": 0, "displayName": "", "mappings": [], "thresholds": { @@ -1064,10 +1074,10 @@ data: "gridPos": { "h": 8, "w": 10, - "x": 0, + "x": 12, "y": 27 }, - "id": 69, + "id": 84, "options": { "legend": { "calcs": [ @@ -1090,11 +1100,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:summary_queue", + "editorMode": "code", + "expr": "max(summary_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "legendFormat": "Queue Size", + "range": true, "refId": "A" } ], - "title": "Summary", + "title": "Summary XL", "transformations": [ { "id": "seriesToColumns", @@ -1110,13 +1123,12 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery summary_queue", + "description": "Cost Management celery summary_xl_queue", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "decimals": 0, "displayName": "", "mappings": [], "thresholds": { @@ -1143,11 +1155,13 @@ data: "gridPos": { "h": 8, "w": 2, - "x": 10, + "x": 22, "y": 27 }, - "id": 77, + "id": 85, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -1157,20 +1171,23 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:summary_queue", + "editorMode": "code", + "expr": "max(summary_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "range": true, "refId": "A" } ], - "title": "Summary", + "title": "Sum XL", "transformations": [ { "id": "seriesToColumns", @@ -1186,13 +1203,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery summary_xl_queue", + "description": "Cost Management celery download_penalty_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1206,6 +1224,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1233,11 +1252,11 @@ data: }, { "color": "#EAB839", - "value": 200 + "value": 450 }, { "color": "red", - "value": 300 + "value": 550 } ] }, @@ -1248,10 +1267,10 @@ data: "gridPos": { "h": 8, "w": 10, - "x": 12, - "y": 27 + "x": 0, + "y": 35 }, - "id": 84, + "id": 96, "options": { "legend": { "calcs": [ @@ -1275,13 +1294,14 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(summary_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(download_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "interval": "", "legendFormat": "Queue Size", "range": true, "refId": "A" } ], - "title": "Summary XL", + "title": "Download Penalty", "transformations": [ { "id": "seriesToColumns", @@ -1297,7 +1317,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery summary_xl_queue", + "description": "Cost Management celery download_penalty_queue", "fieldConfig": { "defaults": { "color": { @@ -1314,11 +1334,11 @@ data: }, { "color": "#EAB839", - "value": 200 + "value": 450 }, { "color": "red", - "value": 300 + "value": 550 } ] }, @@ -1329,11 +1349,13 @@ data: "gridPos": { "h": 8, "w": 2, - "x": 22, - "y": 27 + "x": 10, + "y": 35 }, - "id": 85, + "id": 97, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -1343,9 +1365,10 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -1353,12 +1376,12 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(summary_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(download_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "range": true, "refId": "A" } ], - "title": "Sum XL", + "title": "DL Penalty", "transformations": [ { "id": "seriesToColumns", @@ -1381,6 +1404,7 @@ data: "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1394,6 +1418,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1437,9 +1462,9 @@ data: "h": 8, "w": 10, "x": 12, - "y": 27 + "y": 35 }, - "id": 84, + "id": 98, "options": { "legend": { "calcs": [ @@ -1518,10 +1543,12 @@ data: "h": 8, "w": 2, "x": 22, - "y": 27 + "y": 35 }, - "id": 85, + "id": 99, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -1531,9 +1558,10 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -1562,13 +1590,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery priority_queue", + "description": "Cost Management celery ocp_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1582,6 +1611,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1609,11 +1639,11 @@ data: }, { "color": "#EAB839", - "value": 90 + "value": 200 }, { "color": "red", - "value": 100 + "value": 300 } ] }, @@ -1625,9 +1655,9 @@ data: "h": 8, "w": 10, "x": 0, - "y": 35 + "y": 43 }, - "id": 90, + "id": 74, "options": { "legend": { "calcs": [ @@ -1650,11 +1680,11 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:priority_queue", + "expr": "koku:celery:ocp_queue", "refId": "A" } ], - "title": "Priority", + "title": "OCP", "transformations": [ { "id": "seriesToColumns", @@ -1670,7 +1700,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery priority_queue", + "description": "Cost Management celery ocp_queue", "fieldConfig": { "defaults": { "color": { @@ -1687,11 +1717,11 @@ data: }, { "color": "#EAB839", - "value": 90 + "value": 200 }, { "color": "red", - "value": 100 + "value": 300 } ] }, @@ -1703,10 +1733,12 @@ data: "h": 8, "w": 2, "x": 10, - "y": 35 + "y": 43 }, - "id": 91, + "id": 83, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -1716,20 +1748,21 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:priority_queue", + "expr": "koku:celery:ocp_queue", "refId": "A" } ], - "title": "Priority", + "title": "OCP", "transformations": [ { "id": "seriesToColumns", @@ -1745,13 +1778,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery priority_xl_queue", + "description": "Cost Management celery cost_model_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1765,6 +1799,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1808,9 +1843,9 @@ data: "h": 8, "w": 10, "x": 12, - "y": 35 + "y": 43 }, - "id": 70, + "id": 92, "options": { "legend": { "calcs": [ @@ -1833,14 +1868,11 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "editorMode": "code", - "expr": "max(priority_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", - "legendFormat": "Queue Size", - "range": true, + "expr": "koku:celery:cost_model_queue", "refId": "A" } ], - "title": "Priority XL", + "title": "Cost Model", "transformations": [ { "id": "seriesToColumns", @@ -1856,7 +1888,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery priority_xl_queue", + "description": "Cost Management celery cost_model_queue", "fieldConfig": { "defaults": { "color": { @@ -1889,10 +1921,12 @@ data: "h": 8, "w": 2, "x": 22, - "y": 35 + "y": 43 }, - "id": 80, + "id": 93, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -1902,22 +1936,21 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${Datasource}" }, - "editorMode": "code", - "expr": "max(priority_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", - "range": true, + "expr": "koku:celery:cost_model_queue", "refId": "A" } ], - "title": "Priority XL", + "title": "Cost Model", "transformations": [ { "id": "seriesToColumns", @@ -1933,13 +1966,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery priority_penalty_queue", + "description": "Cost Management celery ocp_xl_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1953,6 +1987,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1980,11 +2015,11 @@ data: }, { "color": "#EAB839", - "value": 90 + "value": 200 }, { "color": "red", - "value": 100 + "value": 300 } ] }, @@ -1995,10 +2030,10 @@ data: "gridPos": { "h": 8, "w": 10, - "x": 12, - "y": 35 + "x": 0, + "y": 51 }, - "id": 70, + "id": 88, "options": { "legend": { "calcs": [ @@ -2022,13 +2057,13 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(priority_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(ocp_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "legendFormat": "Queue Size", "range": true, "refId": "A" } ], - "title": "Priority Penalty", + "title": "OCP XL", "transformations": [ { "id": "seriesToColumns", @@ -2044,7 +2079,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery priority_penalty_queue", + "description": "Cost Management celery ocp_xl_queue", "fieldConfig": { "defaults": { "color": { @@ -2061,11 +2096,11 @@ data: }, { "color": "#EAB839", - "value": 90 + "value": 200 }, { "color": "red", - "value": 100 + "value": 300 } ] }, @@ -2076,11 +2111,13 @@ data: "gridPos": { "h": 8, "w": 2, - "x": 22, - "y": 35 + "x": 10, + "y": 51 }, - "id": 80, + "id": 89, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2090,9 +2127,10 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -2100,12 +2138,12 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(priority_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(ocp_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "range": true, "refId": "A" } ], - "title": "Priority Penalty", + "title": "OCP XL", "transformations": [ { "id": "seriesToColumns", @@ -2121,13 +2159,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery ocp_queue", + "description": "Cost Management celery cost_model_xl_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2141,6 +2180,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2168,11 +2208,11 @@ data: }, { "color": "#EAB839", - "value": 200 + "value": 90 }, { "color": "red", - "value": 300 + "value": 100 } ] }, @@ -2183,10 +2223,10 @@ data: "gridPos": { "h": 8, "w": 10, - "x": 0, - "y": 43 + "x": 12, + "y": 51 }, - "id": 74, + "id": 72, "options": { "legend": { "calcs": [ @@ -2209,11 +2249,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:ocp_queue", + "editorMode": "code", + "expr": "max(cost_model_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "legendFormat": "Queue Size", + "range": true, "refId": "A" } ], - "title": "OCP", + "title": "Cost Model XL", "transformations": [ { "id": "seriesToColumns", @@ -2229,7 +2272,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery ocp_queue", + "description": "Cost Management celery cost_model_xl_queue", "fieldConfig": { "defaults": { "color": { @@ -2246,11 +2289,11 @@ data: }, { "color": "#EAB839", - "value": 200 + "value": 90 }, { "color": "red", - "value": 300 + "value": 100 } ] }, @@ -2261,11 +2304,13 @@ data: "gridPos": { "h": 8, "w": 2, - "x": 10, - "y": 43 + "x": 22, + "y": 51 }, - "id": 83, + "id": 82, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2275,20 +2320,23 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:ocp_queue", + "editorMode": "code", + "expr": "max(cost_model_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "range": true, "refId": "A" } ], - "title": "OCP", + "title": "CM XL", "transformations": [ { "id": "seriesToColumns", @@ -2304,13 +2352,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery ocp_xl_queue", + "description": "Cost Management celery ocp_penalty_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2324,6 +2373,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2366,10 +2416,10 @@ data: "gridPos": { "h": 8, "w": 10, - "x": 12, - "y": 43 + "x": 0, + "y": 59 }, - "id": 88, + "id": 102, "options": { "legend": { "calcs": [ @@ -2393,13 +2443,13 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(ocp_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(ocp_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "legendFormat": "Queue Size", "range": true, "refId": "A" } ], - "title": "OCP XL", + "title": "OCP Penalty", "transformations": [ { "id": "seriesToColumns", @@ -2415,7 +2465,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery ocp_xl_queue", + "description": "Cost Management celery ocp_penalty_queue", "fieldConfig": { "defaults": { "color": { @@ -2447,11 +2497,396 @@ data: "gridPos": { "h": 8, "w": 2, - "x": 22, - "y": 43 + "x": 10, + "y": 59 }, - "id": 89, + "id": 103, + "options": { + "minVizHeight": 75, + "minVizWidth": 75, + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showThresholdLabels": false, + "showThresholdMarkers": true, + "sizing": "auto" + }, + "pluginVersion": "10.4.1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${Datasource}" + }, + "editorMode": "code", + "expr": "max(ocp_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "range": true, + "refId": "A" + } + ], + "title": "OCP Penalty", + "transformations": [ + { + "id": "seriesToColumns", + "options": { + "reducers": [] + } + } + ], + "type": "gauge" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${Datasource}" + }, + "description": "Cost Management celery cost_model_penalty_queue", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 30, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "line+area" + } + }, + "displayName": "", + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "#EAB839", + "value": 90 + }, + { + "color": "red", + "value": 100 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 10, + "x": 12, + "y": 59 + }, + "id": 104, + "options": { + "legend": { + "calcs": [ + "min", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "8.5.2", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${Datasource}" + }, + "editorMode": "code", + "expr": "max(cost_model_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "legendFormat": "Queue Size", + "range": true, + "refId": "A" + } + ], + "title": "Cost Model Penalty", + "transformations": [ + { + "id": "seriesToColumns", + "options": { + "reducers": [] + } + } + ], + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${Datasource}" + }, + "description": "Cost Management celery cost_model_penalty_queue", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "displayName": "", + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "#EAB839", + "value": 90 + }, + { + "color": "red", + "value": 100 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 2, + "x": 22, + "y": 59 + }, + "id": 105, + "options": { + "minVizHeight": 75, + "minVizWidth": 75, + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showThresholdLabels": false, + "showThresholdMarkers": true, + "sizing": "auto" + }, + "pluginVersion": "10.4.1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${Datasource}" + }, + "editorMode": "code", + "expr": "max(cost_model_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "range": true, + "refId": "A" + } + ], + "title": "CM Penalty", + "transformations": [ + { + "id": "seriesToColumns", + "options": { + "reducers": [] + } + } + ], + "type": "gauge" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${Datasource}" + }, + "description": "Cost Management celery priority_queue", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 30, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "line+area" + } + }, + "displayName": "", + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "#EAB839", + "value": 90 + }, + { + "color": "red", + "value": 100 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 10, + "x": 0, + "y": 67 + }, + "id": 90, + "options": { + "legend": { + "calcs": [ + "min", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "8.5.2", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${Datasource}" + }, + "expr": "koku:celery:priority_queue", + "refId": "A" + } + ], + "title": "Priority", + "transformations": [ + { + "id": "seriesToColumns", + "options": { + "reducers": [] + } + } + ], + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${Datasource}" + }, + "description": "Cost Management celery priority_queue", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "displayName": "", + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "#EAB839", + "value": 90 + }, + { + "color": "red", + "value": 100 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 2, + "x": 10, + "y": 67 + }, + "id": 91, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2461,22 +2896,21 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${Datasource}" }, - "editorMode": "code", - "expr": "max(ocp_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", - "range": true, + "expr": "koku:celery:priority_queue", "refId": "A" } ], - "title": "OCP XL", + "title": "Priority", "transformations": [ { "id": "seriesToColumns", @@ -2492,13 +2926,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery ocp_penalty_queue", + "description": "Cost Management celery refresh_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2512,6 +2947,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2539,11 +2975,11 @@ data: }, { "color": "#EAB839", - "value": 200 + "value": 90 }, { "color": "red", - "value": 300 + "value": 100 } ] }, @@ -2555,9 +2991,9 @@ data: "h": 8, "w": 10, "x": 12, - "y": 43 + "y": 67 }, - "id": 88, + "id": 71, "options": { "legend": { "calcs": [ @@ -2580,14 +3016,11 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "editorMode": "code", - "expr": "max(ocp_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", - "legendFormat": "Queue Size", - "range": true, + "expr": "koku:celery:refresh_queue", "refId": "A" } ], - "title": "OCP Penalty", + "title": "Refresh", "transformations": [ { "id": "seriesToColumns", @@ -2603,7 +3036,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery ocp_penalty_queue", + "description": "Cost Management celery refresh_queue", "fieldConfig": { "defaults": { "color": { @@ -2620,11 +3053,11 @@ data: }, { "color": "#EAB839", - "value": 200 + "value": 90 }, { "color": "red", - "value": 300 + "value": 100 } ] }, @@ -2636,10 +3069,12 @@ data: "h": 8, "w": 2, "x": 22, - "y": 43 + "y": 67 }, - "id": 89, + "id": 78, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2649,22 +3084,21 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${Datasource}" }, - "editorMode": "code", - "expr": "max(ocp_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", - "range": true, + "expr": "koku:celery:refresh_queue", "refId": "A" } ], - "title": "OCP Penalty", + "title": "Refresh", "transformations": [ { "id": "seriesToColumns", @@ -2680,13 +3114,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery cost_model_queue", + "description": "Cost Management celery priority_xl_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2700,6 +3135,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2743,9 +3179,9 @@ data: "h": 8, "w": 10, "x": 0, - "y": 51 + "y": 75 }, - "id": 92, + "id": 70, "options": { "legend": { "calcs": [ @@ -2768,11 +3204,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:cost_model_queue", + "editorMode": "code", + "expr": "max(priority_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "legendFormat": "Queue Size", + "range": true, "refId": "A" } ], - "title": "Cost Model", + "title": "Priority XL", "transformations": [ { "id": "seriesToColumns", @@ -2788,7 +3227,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery cost_model_queue", + "description": "Cost Management celery priority_xl_queue", "fieldConfig": { "defaults": { "color": { @@ -2821,10 +3260,12 @@ data: "h": 8, "w": 2, "x": 10, - "y": 51 + "y": 75 }, - "id": 93, + "id": 80, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2834,20 +3275,23 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:cost_model_queue", + "editorMode": "code", + "expr": "max(priority_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "range": true, "refId": "A" } ], - "title": "Cost Model", + "title": "Priority XL", "transformations": [ { "id": "seriesToColumns", @@ -2863,13 +3307,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery cost_model_xl_queue", + "description": "Cost Management celery refresh_xl_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2883,6 +3328,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2926,9 +3372,9 @@ data: "h": 8, "w": 10, "x": 12, - "y": 51 + "y": 75 }, - "id": 72, + "id": 94, "options": { "legend": { "calcs": [ @@ -2952,13 +3398,13 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(cost_model_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(refresh_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "legendFormat": "Queue Size", "range": true, "refId": "A" } ], - "title": "Cost Model XL", + "title": "Refresh XL", "transformations": [ { "id": "seriesToColumns", @@ -2974,7 +3420,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery cost_model_xl_queue", + "description": "Cost Management celery refresh_xl_queue", "fieldConfig": { "defaults": { "color": { @@ -3007,10 +3453,12 @@ data: "h": 8, "w": 2, "x": 22, - "y": 51 + "y": 75 }, - "id": 82, + "id": 95, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -3020,9 +3468,10 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -3030,12 +3479,12 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(cost_model_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(refresh_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "range": true, "refId": "A" } ], - "title": "CM XL", + "title": "Ref XL", "transformations": [ { "id": "seriesToColumns", @@ -3051,13 +3500,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery cost_model_penalty_queue", + "description": "Cost Management celery priority_penalty_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3071,6 +3521,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3113,10 +3564,10 @@ data: "gridPos": { "h": 8, "w": 10, - "x": 12, - "y": 51 + "x": 0, + "y": 83 }, - "id": 72, + "id": 100, "options": { "legend": { "calcs": [ @@ -3140,13 +3591,13 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(cost_model_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(priority_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "legendFormat": "Queue Size", "range": true, "refId": "A" } ], - "title": "Cost Model Penalty", + "title": "Priority Penalty", "transformations": [ { "id": "seriesToColumns", @@ -3162,7 +3613,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery cost_model_penalty_queue", + "description": "Cost Management celery priority_penalty_queue", "fieldConfig": { "defaults": { "color": { @@ -3194,11 +3645,13 @@ data: "gridPos": { "h": 8, "w": 2, - "x": 22, - "y": 51 + "x": 10, + "y": 83 }, - "id": 82, + "id": 101, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -3208,9 +3661,10 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -3218,12 +3672,12 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(cost_model_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(priority_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "range": true, "refId": "A" } ], - "title": "CM Penalty", + "title": "Priority Penalty", "transformations": [ { "id": "seriesToColumns", @@ -3239,13 +3693,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery refresh_queue", + "description": "Cost Management celery refresh_penalty_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3259,6 +3714,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3301,10 +3757,10 @@ data: "gridPos": { "h": 8, "w": 10, - "x": 0, - "y": 59 + "x": 12, + "y": 83 }, - "id": 71, + "id": 106, "options": { "legend": { "calcs": [ @@ -3327,11 +3783,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:refresh_queue", + "editorMode": "code", + "expr": "max(refresh_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "legendFormat": "Queue Size", + "range": true, "refId": "A" } ], - "title": "Refresh", + "title": "Refresh Penalty", "transformations": [ { "id": "seriesToColumns", @@ -3347,7 +3806,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery refresh_queue", + "description": "Cost Management celery refresh_penalty_queue", "fieldConfig": { "defaults": { "color": { @@ -3379,11 +3838,13 @@ data: "gridPos": { "h": 8, "w": 2, - "x": 10, - "y": 59 + "x": 22, + "y": 83 }, - "id": 78, + "id": 107, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -3393,20 +3854,23 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:refresh_queue", + "editorMode": "code", + "expr": "max(refresh_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "range": true, "refId": "A" } ], - "title": "Refresh", + "title": "Ref Penalty", "transformations": [ { "id": "seriesToColumns", @@ -3422,13 +3886,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery refresh_xl_queue", + "description": "Cost Management celery subs_extraction", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3442,6 +3907,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3484,10 +3950,10 @@ data: "gridPos": { "h": 8, "w": 10, - "x": 12, - "y": 59 + "x": 0, + "y": 91 }, - "id": 94, + "id": 111, "options": { "legend": { "calcs": [ @@ -3511,13 +3977,12 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(refresh_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", - "legendFormat": "Queue Size", + "expr": "max(subs_transmission_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "range": true, "refId": "A" } ], - "title": "Refresh XL", + "title": "subs_transmission", "transformations": [ { "id": "seriesToColumns", @@ -3533,7 +3998,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery refresh_xl_queue", + "description": "Cost Management celery subs transmission queue", "fieldConfig": { "defaults": { "color": { @@ -3565,11 +4030,13 @@ data: "gridPos": { "h": 8, "w": 2, - "x": 22, - "y": 59 + "x": 10, + "y": 91 }, - "id": 95, + "id": 112, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -3579,9 +4046,10 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -3589,12 +4057,12 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(refresh_xl_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(subs_transmission_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "range": true, "refId": "A" } ], - "title": "Ref XL", + "title": "Subs Transmissoin", "transformations": [ { "id": "seriesToColumns", @@ -3610,13 +4078,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery refresh_penalty_queue", + "description": "Cost Management celery subs_extraction", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3630,6 +4099,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3673,9 +4143,9 @@ data: "h": 8, "w": 10, "x": 12, - "y": 59 + "y": 91 }, - "id": 94, + "id": 109, "options": { "legend": { "calcs": [ @@ -3699,13 +4169,12 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(refresh_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", - "legendFormat": "Queue Size", + "expr": "max(subs_extraction_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "range": true, "refId": "A" } ], - "title": "Refresh Penalty", + "title": "subs_extraction", "transformations": [ { "id": "seriesToColumns", @@ -3721,7 +4190,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery refresh_penalty_queue", + "description": "Cost Management celery subs extraction queue", "fieldConfig": { "defaults": { "color": { @@ -3754,10 +4223,12 @@ data: "h": 8, "w": 2, "x": 22, - "y": 59 + "y": 91 }, - "id": 95, + "id": 110, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -3767,9 +4238,10 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -3777,12 +4249,12 @@ data: "uid": "${Datasource}" }, "editorMode": "code", - "expr": "max(refresh_penalty_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", + "expr": "max(subs_extraction_backlog{namespace=\"${namespace}\", pod=~\".+worker.+\"})", "range": true, "refId": "A" } ], - "title": "Ref Penalty", + "title": "Subs Extraction", "transformations": [ { "id": "seriesToColumns", @@ -3798,13 +4270,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery default_celery_queue", + "description": "Cost Management celery hcs_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3818,6 +4291,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -3861,9 +4335,9 @@ data: "h": 8, "w": 10, "x": 0, - "y": 67 + "y": 99 }, - "id": 75, + "id": 73, "options": { "legend": { "calcs": [ @@ -3886,11 +4360,11 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:default_celery_queue", + "expr": "koku:celery:hcs_queue", "refId": "A" } ], - "title": "Default", + "title": "HCS", "transformations": [ { "id": "seriesToColumns", @@ -3906,7 +4380,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery default_celery_queue", + "description": "Cost Management celery hcs_queue", "fieldConfig": { "defaults": { "color": { @@ -3939,10 +4413,12 @@ data: "h": 8, "w": 2, "x": 10, - "y": 67 + "y": 99 }, - "id": 81, + "id": 79, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -3952,20 +4428,21 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:default_celery_queue", + "expr": "koku:celery:hcs_queue", "refId": "A" } ], - "title": "Default", + "title": "HCS", "transformations": [ { "id": "seriesToColumns", @@ -3981,13 +4458,14 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery hcs_queue", + "description": "Cost Management celery default_celery_queue", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -4001,6 +4479,7 @@ data: "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -4044,9 +4523,9 @@ data: "h": 8, "w": 10, "x": 12, - "y": 67 + "y": 99 }, - "id": 73, + "id": 75, "options": { "legend": { "calcs": [ @@ -4069,11 +4548,11 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:hcs_queue", + "expr": "koku:celery:default_celery_queue", "refId": "A" } ], - "title": "HCS", + "title": "Default", "transformations": [ { "id": "seriesToColumns", @@ -4089,7 +4568,7 @@ data: "type": "prometheus", "uid": "${Datasource}" }, - "description": "Cost Management celery hcs_queue", + "description": "Cost Management celery default_celery_queue", "fieldConfig": { "defaults": { "color": { @@ -4122,10 +4601,12 @@ data: "h": 8, "w": 2, "x": 22, - "y": 67 + "y": 99 }, - "id": 79, + "id": 81, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -4135,20 +4616,21 @@ data: "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${Datasource}" }, - "expr": "koku:celery:hcs_queue", + "expr": "koku:celery:default_celery_queue", "refId": "A" } ], - "title": "HCS", + "title": "Default", "transformations": [ { "id": "seriesToColumns", @@ -4159,32 +4641,6 @@ data: ], "type": "gauge" }, - { - "collapsed": false, - "datasource": { - "type": "prometheus", - "uid": "iLX_mMBnk" - }, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 75 - }, - "id": 28, - "panels": [], - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "iLX_mMBnk" - }, - "refId": "A" - } - ], - "title": "RDS Database", - "type": "row" - }, { "aliasColors": {}, "bars": false, @@ -4205,7 +4661,7 @@ data: "h": 8, "w": 12, "x": 0, - "y": 76 + "y": 107 }, "hiddenSeries": false, "id": 24, @@ -4225,7 +4681,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -4341,7 +4797,7 @@ data: "h": 8, "w": 12, "x": 12, - "y": 76 + "y": 107 }, "hiddenSeries": false, "id": 22, @@ -4361,7 +4817,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -4438,7 +4894,7 @@ data: "h": 8, "w": 12, "x": 0, - "y": 84 + "y": 115 }, "hiddenSeries": false, "id": 20, @@ -4458,7 +4914,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -4530,7 +4986,7 @@ data: "h": 8, "w": 12, "x": 12, - "y": 84 + "y": 115 }, "hiddenSeries": false, "id": 26, @@ -4550,7 +5006,7 @@ data: "alertThreshold": true }, "percentage": true, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -4642,7 +5098,33 @@ data: "h": 1, "w": 24, "x": 0, - "y": 92 + "y": 123 + }, + "id": 28, + "panels": [], + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "iLX_mMBnk" + }, + "refId": "A" + } + ], + "title": "RDS Database", + "type": "row" + }, + { + "collapsed": false, + "datasource": { + "type": "prometheus", + "uid": "iLX_mMBnk" + }, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 124 }, "id": 32, "panels": [], @@ -4678,7 +5160,7 @@ data: "h": 7, "w": 24, "x": 0, - "y": 93 + "y": 125 }, "hiddenSeries": false, "id": 30, @@ -4698,7 +5180,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -4756,7 +5238,7 @@ data: "h": 1, "w": 24, "x": 0, - "y": 100 + "y": 132 }, "id": 40, "panels": [], @@ -4799,7 +5281,7 @@ data: "h": 6, "w": 4, "x": 0, - "y": 101 + "y": 133 }, "id": 42, "options": { @@ -4814,9 +5296,11 @@ data: "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -4857,7 +5341,7 @@ data: "h": 6, "w": 5, "x": 4, - "y": 101 + "y": 133 }, "id": 44, "options": { @@ -4872,9 +5356,11 @@ data: "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -4915,7 +5401,7 @@ data: "h": 6, "w": 4, "x": 9, - "y": 101 + "y": 133 }, "id": 46, "options": { @@ -4930,9 +5416,11 @@ data: "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -4962,7 +5450,7 @@ data: "h": 6, "w": 11, "x": 13, - "y": 101 + "y": 133 }, "id": 54, "legend": { @@ -4970,7 +5458,6 @@ data: "values": true }, "legendType": "Under graph", - "links": [], "nullPointMode": "connected", "pieType": "pie", "strokeWidth": 1, @@ -5016,7 +5503,7 @@ data: "h": 7, "w": 4, "x": 0, - "y": 107 + "y": 139 }, "id": 48, "options": { @@ -5031,9 +5518,11 @@ data: "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -5067,7 +5556,7 @@ data: "h": 7, "w": 9, "x": 4, - "y": 107 + "y": 139 }, "hiddenSeries": false, "id": 50, @@ -5087,7 +5576,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -5155,7 +5644,7 @@ data: "h": 7, "w": 11, "x": 13, - "y": 107 + "y": 139 }, "hiddenSeries": false, "id": 52, @@ -5175,7 +5664,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -5234,7 +5723,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -5249,7 +5739,7 @@ data: "h": 7, "w": 4, "x": 0, - "y": 114 + "y": 146 }, "id": 56, "options": { @@ -5264,9 +5754,11 @@ data: "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -5300,7 +5792,7 @@ data: "h": 7, "w": 9, "x": 4, - "y": 114 + "y": 146 }, "hiddenSeries": false, "id": 57, @@ -5320,7 +5812,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -5389,7 +5881,7 @@ data: "h": 7, "w": 11, "x": 13, - "y": 114 + "y": 146 }, "hiddenSeries": false, "id": 58, @@ -5409,7 +5901,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -5468,7 +5960,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -5483,7 +5976,7 @@ data: "h": 7, "w": 4, "x": 0, - "y": 121 + "y": 153 }, "id": 59, "options": { @@ -5498,9 +5991,11 @@ data: "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -5534,7 +6029,7 @@ data: "h": 7, "w": 9, "x": 4, - "y": 121 + "y": 153 }, "hiddenSeries": false, "id": 60, @@ -5554,7 +6049,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -5623,7 +6118,7 @@ data: "h": 7, "w": 11, "x": 13, - "y": 121 + "y": 153 }, "hiddenSeries": false, "id": 61, @@ -5643,7 +6138,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -5702,7 +6197,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -5717,7 +6213,7 @@ data: "h": 7, "w": 4, "x": 0, - "y": 128 + "y": 160 }, "id": 63, "options": { @@ -5732,9 +6228,11 @@ data: "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -5768,7 +6266,7 @@ data: "h": 7, "w": 9, "x": 4, - "y": 128 + "y": 160 }, "hiddenSeries": false, "id": 65, @@ -5783,13 +6281,12 @@ data: }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -5858,7 +6355,7 @@ data: "h": 7, "w": 11, "x": 13, - "y": 128 + "y": 160 }, "hiddenSeries": false, "id": 66, @@ -5878,7 +6375,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -5937,7 +6434,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -5952,7 +6450,7 @@ data: "h": 7, "w": 4, "x": 0, - "y": 135 + "y": 167 }, "id": 64, "options": { @@ -5967,9 +6465,11 @@ data: "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "targets": [ { "datasource": { @@ -6003,7 +6503,7 @@ data: "h": 7, "w": 9, "x": 4, - "y": 135 + "y": 167 }, "hiddenSeries": false, "id": 67, @@ -6018,13 +6518,12 @@ data: }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -6093,7 +6592,7 @@ data: "h": 7, "w": 11, "x": 13, - "y": 135 + "y": 167 }, "hiddenSeries": false, "id": 68, @@ -6113,7 +6612,7 @@ data: "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.8", + "pluginVersion": "10.4.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -6162,9 +6661,8 @@ data: } } ], - "refresh": "1m", - "schemaVersion": 37, - "style": "dark", + "refresh": "", + "schemaVersion": 39, "tags": [], "templating": { "list": [ @@ -6285,7 +6783,7 @@ data: "timezone": "", "title": "Cost Management", "uid": "R0HueuFGk", - "version": 4, + "version": 3, "weekStart": "" } kind: ConfigMap