From 582976562444680b18b344019a08007247a13d00 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 00:25:44 +0530 Subject: [PATCH] chore(deps): update grafana/promtail docker tag to v3 (#714) * chore(deps): update grafana/promtail docker tag to v3 * feat : upgrade dashboard provisions --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Raja Kolli --- api-gateway/pom.xml | 2 +- catalog-service/pom.xml | 2 +- config-server/pom.xml | 2 +- .../dashboards/JVM_Dashboard.json | 1183 +++++++++-------- .../dashboards/circuit-breaker.json | 367 ++--- .../dashboards/logs_traces_metrics.json | 6 +- .../dashboards/spring-boot-statistics.json | 515 +++---- .../dashboards/spring-cloud-gateway.json | 188 +-- docker-compose-tools.yml | 2 +- inventory-service/pom.xml | 2 +- order-service/pom.xml | 2 +- payment-service/pom.xml | 2 +- service-registry/pom.xml | 2 +- 13 files changed, 1183 insertions(+), 1092 deletions(-) diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml index 7b941e17..ca0efaff 100644 --- a/api-gateway/pom.xml +++ b/api-gateway/pom.xml @@ -280,7 +280,7 @@ - 1.17.0 + 1.22.0 diff --git a/catalog-service/pom.xml b/catalog-service/pom.xml index 0044d5a8..1b5603ae 100644 --- a/catalog-service/pom.xml +++ b/catalog-service/pom.xml @@ -501,7 +501,7 @@ - 1.19.2 + 1.22.0 diff --git a/config-server/pom.xml b/config-server/pom.xml index 5a5b61f9..c8df984b 100644 --- a/config-server/pom.xml +++ b/config-server/pom.xml @@ -154,7 +154,7 @@ - 1.17.0 + 1.22.0 diff --git a/config/grafana/provisioning/dashboards/JVM_Dashboard.json b/config/grafana/provisioning/dashboards/JVM_Dashboard.json index 35049079..35a0783a 100644 --- a/config/grafana/provisioning/dashboards/JVM_Dashboard.json +++ b/config/grafana/provisioning/dashboards/JVM_Dashboard.json @@ -97,8 +97,7 @@ } ] }, - "unit": "s", - "unitScale": true + "unit": "s" }, "overrides": [] }, @@ -109,7 +108,6 @@ "y": 1 }, "id": 63, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", @@ -128,7 +126,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -171,8 +169,7 @@ } ] }, - "unit": "dateTimeAsIso", - "unitScale": true + "unit": "dateTimeAsIso" }, "overrides": [] }, @@ -183,7 +180,6 @@ "y": 1 }, "id": 92, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", @@ -202,7 +198,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -250,8 +246,7 @@ } ] }, - "unit": "percent", - "unitScale": true + "unit": "percent" }, "overrides": [] }, @@ -262,7 +257,6 @@ "y": 1 }, "id": 65, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", @@ -281,7 +275,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -328,8 +322,7 @@ } ] }, - "unit": "percent", - "unitScale": true + "unit": "percent" }, "overrides": [] }, @@ -340,7 +333,6 @@ "y": 1 }, "id": 75, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", @@ -359,7 +351,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -404,55 +396,89 @@ "type": "row" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "ops" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 0, "y": 5 }, - "hiddenSeries": false, "id": 111, - "legend": { - "avg": false, - "current": true, - "max": false, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "lastNotNull" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -466,90 +492,124 @@ "refId": "A" } ], - "thresholds": [], - "timeRegions": [], "title": "Rate", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "ops", - "logBase": 1, - "min": "0", - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": { - "HTTP": "#890f02", - "HTTP - 5xx": "#bf1b00" - }, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "ops" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "HTTP" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#890f02", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "HTTP - 5xx" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#bf1b00", + "mode": "fixed" + } + } + ] + } + ] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 6, "y": 5 }, - "hiddenSeries": false, "id": 112, - "legend": { - "avg": false, - "current": true, - "max": false, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "lastNotNull" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -563,87 +623,93 @@ "refId": "A" } ], - "thresholds": [], - "timeRegions": [], "title": "Errors", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "ops", - "logBase": 1, - "min": "0", - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "s" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 12, "y": 5 }, - "hiddenSeries": false, "id": 113, - "legend": { - "avg": false, - "current": true, - "max": false, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "lastNotNull" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -670,42 +736,10 @@ "refId": "B" } ], - "thresholds": [], - "timeRegions": [], "title": "Duration", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "s", - "logBase": 1, - "min": "0", - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" @@ -713,46 +747,83 @@ "description": "", "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 18, "y": 5 }, - "hiddenSeries": false, "id": 119, - "legend": { - "alignAsTable": false, - "avg": false, - "current": true, - "max": false, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "lastNotNull" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -827,36 +898,8 @@ "refId": "F" } ], - "thresholds": [], - "timeRegions": [], "title": "Utilisation", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "logBase": 1, - "min": "0", - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { "collapsed": false, @@ -885,61 +928,90 @@ "type": "row" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, - "editable": true, - "error": false, "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, - "grid": { - "leftLogBase": 1, - "rightLogBase": 1 - }, "gridPos": { "h": 7, "w": 6, "x": 0, "y": 13 }, - "hiddenSeries": false, "id": 24, - "legend": { - "avg": false, - "current": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "lastNotNull", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -979,100 +1051,94 @@ "step": 2400 } ], - "thresholds": [], - "timeRegions": [], "title": "JVM Heap", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "y-axis": true, - "y_formats": [ - "mbytes", - "short" - ], - "yaxes": [ - { - "format": "bytes", - "logBase": 1, - "min": 0, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, - "editable": true, - "error": false, "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, - "grid": { - "leftLogBase": 1, - "rightLogBase": 1 - }, "gridPos": { "h": 7, "w": 6, "x": 6, "y": 13 }, - "hiddenSeries": false, "id": 25, - "legend": { - "avg": false, - "current": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "lastNotNull", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -1113,101 +1179,94 @@ "step": 2400 } ], - "thresholds": [], - "timeRegions": [], "title": "JVM Non-Heap", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "y-axis": true, - "y_formats": [ - "mbytes", - "short" - ], - "yaxes": [ - { - "format": "bytes", - "logBase": 1, - "min": 0, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, - "editable": true, - "error": false, "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, - "grid": { - "leftLogBase": 1, - "rightLogBase": 1 - }, "gridPos": { "h": 7, "w": 6, "x": 12, "y": 13 }, - "hiddenSeries": false, "id": 26, - "legend": { - "alignAsTable": false, - "avg": false, - "current": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "lastNotNull", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -1247,101 +1306,94 @@ "step": 2400 } ], - "thresholds": [], - "timeRegions": [], "title": "JVM Total", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "y-axis": true, - "y_formats": [ - "mbytes", - "short" - ], - "yaxes": [ - { - "format": "bytes", - "label": "", - "logBase": 1, - "min": 0, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, - "editable": true, - "error": false, "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, - "grid": { - "leftLogBase": 1, - "rightLogBase": 1 - }, "gridPos": { "h": 7, "w": 6, "x": 18, "y": 13 }, - "hiddenSeries": false, "id": 86, - "legend": { - "avg": false, - "current": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "lastNotNull", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -1391,44 +1443,8 @@ "refId": "D" } ], - "thresholds": [], - "timeRegions": [], "title": "JVM Process Memory", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "y-axis": true, - "y_formats": [ - "mbytes", - "short" - ], - "yaxes": [ - { - "format": "bytes", - "label": "", - "logBase": 1, - "min": "0", - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { "collapsed": false, @@ -1458,6 +1474,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1498,7 +1515,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1561,7 +1577,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -1595,6 +1611,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1635,7 +1652,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1684,7 +1700,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -1717,6 +1733,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1757,7 +1774,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1833,7 +1849,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -1872,6 +1888,7 @@ "timed-waiting": "#c15c17", "waiting": "#eab839" }, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1908,7 +1925,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1943,7 +1959,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1973,6 +1989,7 @@ "trace": "#6ED0E0", "warn": "#EAB839" }, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2018,7 +2035,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2066,7 +2082,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -2098,6 +2114,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2138,7 +2155,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2191,7 +2207,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -2250,6 +2266,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2292,7 +2309,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "maxPerRow": 3, "nullPointMode": "null", "options": { @@ -2364,7 +2380,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -2421,6 +2437,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2463,7 +2480,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "maxPerRow": 3, "nullPointMode": "null", "options": { @@ -2535,7 +2551,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -2592,6 +2608,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2626,7 +2643,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2662,7 +2678,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -2688,6 +2704,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2722,7 +2739,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2772,7 +2788,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -2798,6 +2814,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2832,7 +2849,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2880,7 +2896,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -2931,6 +2947,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2971,7 +2988,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3009,7 +3025,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -3040,6 +3056,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -3080,7 +3097,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3120,7 +3136,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -3177,6 +3193,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -3217,7 +3234,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3268,7 +3284,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -3299,6 +3315,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -3339,7 +3356,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3377,7 +3393,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -3409,6 +3425,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -3449,7 +3466,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3500,7 +3516,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -3531,6 +3547,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -3571,7 +3588,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3609,7 +3625,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "x-axis": true, "xaxis": { "mode": "time", @@ -3777,6 +3793,7 @@ "from": "now-15m", "to": "now" }, + "timeRangeUpdatedDuringEditOrView": false, "timepicker": { "now": true, "refresh_intervals": [ @@ -3808,4 +3825,4 @@ "uid": "jvm-micrometer", "version": 1, "weekStart": "" -} \ No newline at end of file +} diff --git a/config/grafana/provisioning/dashboards/circuit-breaker.json b/config/grafana/provisioning/dashboards/circuit-breaker.json index fbca6165..e2c11984 100644 --- a/config/grafana/provisioning/dashboards/circuit-breaker.json +++ b/config/grafana/provisioning/dashboards/circuit-breaker.json @@ -82,8 +82,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -94,7 +93,6 @@ "y": 1 }, "id": 8, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", @@ -113,7 +111,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -158,8 +156,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -170,7 +167,6 @@ "y": 1 }, "id": 6, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", @@ -189,7 +185,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -206,10 +202,6 @@ "type": "stat" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" @@ -217,50 +209,84 @@ "description": "", "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "Number", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "decimals": 0, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 7, "w": 12, "x": 0, "y": 6 }, - "hiddenSeries": false, "id": 4, "interval": "", - "legend": { - "alignAsTable": false, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "lastNotNull" + ], + "displayMode": "list", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -274,37 +300,8 @@ "refId": "A" } ], - "thresholds": [], - "timeRegions": [], "title": "CircuitBreaker States", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Number", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { "datasource": { @@ -334,8 +331,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -346,7 +342,6 @@ "y": 6 }, "id": 21, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", @@ -365,7 +360,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -428,7 +423,8 @@ "mode": "absolute", "steps": [ { - "color": "#299c46" + "color": "#299c46", + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -451,7 +447,6 @@ "y": 14 }, "id": 2, - "links": [], "maxDataPoints": 100, "options": { "minVizHeight": 75, @@ -466,9 +461,10 @@ }, "showThresholdLabels": true, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "10.2.2", + "pluginVersion": "11.0.0", "repeatDirection": "h", "targets": [ { @@ -489,57 +485,153 @@ "type": "gauge" }, { - "aliasColors": { - "failed ": "red", - "ignored ": "blue", - "not_permitted ": "orange", - "successful ": "green" - }, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, - "fill": 1, - "fillGradient": 0, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "Calls/sec", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 6, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "always", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "failed " + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "red", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "ignored " + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "not_permitted " + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "successful " + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "green", + "mode": "fixed" + } + } + ] + } + ] + }, "gridPos": { "h": 7, "w": 16, "x": 8, "y": 14 }, - "hiddenSeries": false, "id": 23, "interval": "", - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "rightSide": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "mean", + "lastNotNull", + "max", + "min" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.2.2", - "pointradius": 2, - "points": true, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -565,42 +657,15 @@ "refId": "B" } ], - "thresholds": [], - "timeRegions": [], "title": "Call rate: $circuitbreaker_name", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": "Calls/sec", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { "aliasColors": { "failed": "red", "successful": "green" }, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -633,7 +698,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -680,7 +744,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -706,6 +770,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -737,7 +802,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -806,7 +870,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -835,6 +899,7 @@ "ignored": "blue", "successful": "green" }, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -866,7 +931,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -912,7 +976,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1366,6 +1430,7 @@ "from": "now-5m", "to": "now" }, + "timeRangeUpdatedDuringEditOrView": false, "timepicker": { "refresh_intervals": [ "5s", @@ -1396,4 +1461,4 @@ "uid": "circuit-breakers", "version": 1, "weekStart": "" -} \ No newline at end of file +} diff --git a/config/grafana/provisioning/dashboards/logs_traces_metrics.json b/config/grafana/provisioning/dashboards/logs_traces_metrics.json index 9c6a54f5..970b15ff 100644 --- a/config/grafana/provisioning/dashboards/logs_traces_metrics.json +++ b/config/grafana/provisioning/dashboards/logs_traces_metrics.json @@ -264,6 +264,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -327,6 +328,7 @@ "showLegend": true }, "tooltip": { + "maxHeight": 600, "mode": "single", "sort": "none" } @@ -376,8 +378,7 @@ } ], "refresh": "auto", - "schemaVersion": 38, - "style": "dark", + "schemaVersion": 39, "tags": [], "templating": { "list": [] @@ -386,6 +387,7 @@ "from": "now-15m", "to": "now" }, + "timeRangeUpdatedDuringEditOrView": false, "timepicker": {}, "timezone": "", "title": "Logs, Traces, Metrics", diff --git a/config/grafana/provisioning/dashboards/spring-boot-statistics.json b/config/grafana/provisioning/dashboards/spring-boot-statistics.json index a1fa33a6..5cd7ba2d 100644 --- a/config/grafana/provisioning/dashboards/spring-boot-statistics.json +++ b/config/grafana/provisioning/dashboards/spring-boot-statistics.json @@ -15,7 +15,7 @@ } ] }, - "description": "Dashboard for Spring Boot3.2 Statistics(based on Spring Boot3 Statistic by micrometer-prometheus).", + "description": "Dashboard for Spring Boot3.3 Statistics(based on Spring Boot3 Statistic by micrometer-prometheus).", "editable": true, "fiscalYearStartMonth": 0, "gnetId": 10280, @@ -84,8 +84,7 @@ } ] }, - "unit": "s", - "unitScale": true + "unit": "s" }, "overrides": [] }, @@ -96,7 +95,6 @@ "y": 1 }, "id": 52, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", @@ -114,7 +112,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -174,8 +172,7 @@ } ] }, - "unit": "percent", - "unitScale": true + "unit": "percent" }, "overrides": [] }, @@ -186,7 +183,6 @@ "y": 1 }, "id": 58, - "links": [], "maxDataPoints": 100, "options": { "minVizHeight": 75, @@ -203,7 +199,7 @@ "showThresholdMarkers": true, "sizing": "auto" }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -272,8 +268,7 @@ } ] }, - "unit": "percent", - "unitScale": true + "unit": "percent" }, "overrides": [] }, @@ -284,7 +279,6 @@ "y": 1 }, "id": 60, - "links": [], "maxDataPoints": 100, "options": { "minVizHeight": 75, @@ -301,7 +295,7 @@ "showThresholdMarkers": true, "sizing": "auto" }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -320,55 +314,86 @@ "type": "gauge" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "locale" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 6, "w": 8, "x": 16, "y": 1 }, - "hiddenSeries": false, "id": 66, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -393,87 +418,95 @@ "refId": "B" } ], - "thresholds": [], - "timeRegions": [], "title": "Process Open Files", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "locale", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 7, "w": 12, "x": 0, "y": 7 }, - "hiddenSeries": false, "id": 95, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "mean", + "lastNotNull", + "max", + "min" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -498,87 +531,95 @@ "refId": "B" } ], - "thresholds": [], - "timeRegions": [], "title": "CPU Usage", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 7, "w": 12, "x": 12, "y": 7 }, - "hiddenSeries": false, "id": 96, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "mean", + "lastNotNull", + "max", + "min" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "multi", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -603,35 +644,8 @@ "refId": "B" } ], - "thresholds": [], - "timeRegions": [], "title": "Load Average", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { "datasource": { @@ -667,8 +681,7 @@ } ] }, - "unit": "dateTimeAsIso", - "unitScale": true + "unit": "dateTimeAsIso" }, "overrides": [] }, @@ -679,7 +692,6 @@ "y": 14 }, "id": 56, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", @@ -697,7 +709,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -744,6 +756,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -779,7 +792,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -838,7 +850,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -862,6 +874,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -897,7 +910,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -956,7 +968,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -980,6 +992,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1014,7 +1027,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1049,7 +1061,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1073,6 +1085,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1109,7 +1122,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1144,7 +1156,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1170,6 +1182,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1204,7 +1217,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1250,7 +1262,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1274,6 +1286,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1308,7 +1321,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1354,7 +1366,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1378,6 +1390,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1412,7 +1425,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1458,7 +1470,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1482,6 +1494,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1517,7 +1530,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1574,7 +1586,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1624,6 +1636,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1661,7 +1674,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1696,7 +1708,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1720,6 +1732,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1757,7 +1770,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1792,7 +1804,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1865,8 +1877,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1886,7 +1897,6 @@ "y": 77 }, "id": 44, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "none", @@ -1923,6 +1933,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1960,7 +1971,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2017,7 +2027,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -2064,8 +2074,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2085,7 +2094,6 @@ "y": 81 }, "id": 46, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "none", @@ -2122,6 +2130,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2156,7 +2165,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2191,7 +2199,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -2215,6 +2223,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2249,7 +2258,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2284,7 +2292,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -2308,6 +2316,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2342,7 +2351,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2377,7 +2385,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -2401,6 +2409,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2437,7 +2446,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2472,7 +2480,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -2522,6 +2530,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2558,7 +2567,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2594,7 +2602,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -2668,8 +2676,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2689,7 +2696,6 @@ "y": 107 }, "id": 28, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "none", @@ -2726,6 +2732,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2762,7 +2769,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2797,7 +2803,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -2822,6 +2828,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -2857,7 +2864,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -2903,7 +2909,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -2950,8 +2956,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2971,7 +2976,6 @@ "y": 111 }, "id": 32, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "none", @@ -3008,6 +3012,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -3043,7 +3048,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3089,7 +3093,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -3139,6 +3143,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -3174,7 +3179,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3211,7 +3215,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -3235,6 +3239,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -3270,7 +3275,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3307,7 +3311,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -3331,6 +3335,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -3366,7 +3371,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3403,7 +3407,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -3427,6 +3431,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -3462,7 +3467,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3499,7 +3503,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -3523,6 +3527,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -3558,7 +3563,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -3595,7 +3599,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -3764,6 +3768,7 @@ "from": "now-1h", "to": "now" }, + "timeRangeUpdatedDuringEditOrView": false, "timepicker": { "refresh_intervals": [ "5s", @@ -3790,8 +3795,8 @@ ] }, "timezone": "", - "title": "Spring Boot 3.2 Statistics", - "uid": "spring_boot_32", + "title": "Spring Boot 3.3 Statistics", + "uid": "spring_boot_33", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/config/grafana/provisioning/dashboards/spring-cloud-gateway.json b/config/grafana/provisioning/dashboards/spring-cloud-gateway.json index 79c013a1..1610787c 100644 --- a/config/grafana/provisioning/dashboards/spring-cloud-gateway.json +++ b/config/grafana/provisioning/dashboards/spring-cloud-gateway.json @@ -78,8 +78,7 @@ "value": 80 } ] - }, - "unitScale": true + } }, "overrides": [] }, @@ -106,7 +105,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -146,8 +145,7 @@ "value": 80 } ] - }, - "unitScale": true + } }, "overrides": [] }, @@ -174,7 +172,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -215,8 +213,7 @@ "value": 1 } ] - }, - "unitScale": true + } }, "overrides": [] }, @@ -243,7 +240,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.3.1", + "pluginVersion": "11.0.0", "targets": [ { "datasource": { @@ -287,56 +284,87 @@ "type": "row" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "prometheus-micro-service" }, "fieldConfig": { "defaults": { - "unitScale": true + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "s" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 0, "y": 6 }, - "hiddenSeries": false, "id": 49, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": false + }, + "tooltip": { + "maxHeight": 600, + "mode": "single", + "sort": "none" + } }, - "percentage": false, "pluginVersion": "10.3.1", - "pointradius": 5, - "points": false, - "renderer": "flot", "repeat": "routeId", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "datasource": { @@ -354,35 +382,8 @@ "step": 240 } ], - "thresholds": [], - "timeRegions": [], "title": "$routeId", - "tooltip": { - "shared": false, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "s", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { "collapsed": false, @@ -394,7 +395,7 @@ "h": 1, "w": 24, "x": 0, - "y": 13 + "y": 20 }, "id": 52, "panels": [], @@ -412,6 +413,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -432,7 +434,7 @@ "h": 7, "w": 6, "x": 0, - "y": 14 + "y": 21 }, "hiddenSeries": false, "id": 2, @@ -447,7 +449,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -488,7 +489,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -520,7 +521,7 @@ "h": 1, "w": 24, "x": 0, - "y": 21 + "y": 35 }, "id": 53, "panels": [], @@ -538,6 +539,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -558,7 +560,7 @@ "h": 7, "w": 6, "x": 0, - "y": 22 + "y": 36 }, "hiddenSeries": false, "id": 3, @@ -573,7 +575,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -613,7 +614,7 @@ "sort": 0, "value_type": "cumulative" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -645,7 +646,7 @@ "h": 1, "w": 24, "x": 0, - "y": 29 + "y": 50 }, "id": 54, "panels": [], @@ -663,6 +664,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -683,7 +685,7 @@ "h": 7, "w": 6, "x": 0, - "y": 30 + "y": 51 }, "hiddenSeries": false, "id": 35, @@ -698,7 +700,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -738,7 +739,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -770,7 +771,7 @@ "h": 1, "w": 24, "x": 0, - "y": 37 + "y": 65 }, "id": 64, "panels": [], @@ -788,6 +789,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -807,7 +809,7 @@ "h": 9, "w": 6, "x": 0, - "y": 38 + "y": 66 }, "hiddenSeries": false, "id": 62, @@ -822,7 +824,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -859,7 +860,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -883,6 +884,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -902,7 +904,7 @@ "h": 9, "w": 6, "x": 6, - "y": 38 + "y": 66 }, "hiddenSeries": false, "id": 69, @@ -917,7 +919,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -954,7 +955,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -978,6 +979,7 @@ }, { "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -997,7 +999,7 @@ "h": 9, "w": 6, "x": 12, - "y": 38 + "y": 66 }, "hiddenSeries": false, "id": 77, @@ -1012,7 +1014,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1050,7 +1051,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1107,6 +1108,7 @@ "notifications": [] }, "aliasColors": {}, + "autoMigrateFrom": "graph", "bars": false, "dashLength": 10, "dashes": false, @@ -1126,7 +1128,7 @@ "h": 9, "w": 6, "x": 18, - "y": 38 + "y": 66 }, "hiddenSeries": false, "id": 79, @@ -1141,7 +1143,6 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "null", "options": { "alertThreshold": true @@ -1186,7 +1187,7 @@ "sort": 0, "value_type": "individual" }, - "type": "graph", + "type": "timeseries", "xaxis": { "mode": "time", "show": true, @@ -1288,6 +1289,7 @@ "from": "now-30m", "to": "now" }, + "timeRangeUpdatedDuringEditOrView": false, "timepicker": { "refresh_intervals": [ "5s", @@ -1318,4 +1320,4 @@ "uid": "spring-cloud-gateway", "version": 1, "weekStart": "" -} \ No newline at end of file +} diff --git a/docker-compose-tools.yml b/docker-compose-tools.yml index 4a3b7448..a8a272c0 100644 --- a/docker-compose-tools.yml +++ b/docker-compose-tools.yml @@ -338,7 +338,7 @@ services: - microservice-network promtail: - image: grafana/promtail:2.9.8 + image: grafana/promtail:3.0.0 container_name: promtail extra_hosts: [ 'host.docker.internal:host-gateway' ] volumes: diff --git a/inventory-service/pom.xml b/inventory-service/pom.xml index 5067f50c..f2ca4e8f 100644 --- a/inventory-service/pom.xml +++ b/inventory-service/pom.xml @@ -534,7 +534,7 @@ - 1.19.2 + 1.22.0 diff --git a/order-service/pom.xml b/order-service/pom.xml index 1072a225..cdf1ff5f 100644 --- a/order-service/pom.xml +++ b/order-service/pom.xml @@ -491,7 +491,7 @@ - 1.19.2 + 1.22.0 diff --git a/payment-service/pom.xml b/payment-service/pom.xml index f4723710..d84b611a 100644 --- a/payment-service/pom.xml +++ b/payment-service/pom.xml @@ -380,7 +380,7 @@ - 1.19.2 + 1.22.0 diff --git a/service-registry/pom.xml b/service-registry/pom.xml index 71ec0626..2e9420fc 100644 --- a/service-registry/pom.xml +++ b/service-registry/pom.xml @@ -145,7 +145,7 @@ - 1.17.0 + 1.22.0