From 16095dd85e01ae3266fe8d3731b93284bd9b61d2 Mon Sep 17 00:00:00 2001 From: Pat Riehecky <3534830+jcpunk@users.noreply.github.com> Date: Tue, 25 Jul 2023 03:21:21 -0500 Subject: [PATCH] feat(helm): Sync up dashboards and try to set automation (#8891) Signed-off-by: Pat Riehecky --- .../templates/jobs/build/build_strimzi.yaml | 2 + Makefile | 2 +- .../strimzi-cruise-control.json | 210 +++++++++++-- .../strimzi-kafka-bridge.json | 151 +++++++--- .../strimzi-kafka-connect.json | 171 +++++++++-- .../strimzi-kafka-exporter.json | 176 ++++++++++- .../strimzi-kafka-mirror-maker-2.json | 155 ++++++++-- .../strimzi-kafka-oauth.json | 66 ++-- .../grafana-dashboards/strimzi-kafka.json | 283 +++++++++++++++++- .../grafana-dashboards/strimzi-kraft.json | 179 ++++++++++- .../grafana-dashboards/strimzi-operators.json | 178 ++++++++++- .../grafana-dashboards/strimzi-zookeeper.json | 221 +++++++++++++- 12 files changed, 1611 insertions(+), 183 deletions(-) diff --git a/.azure/templates/jobs/build/build_strimzi.yaml b/.azure/templates/jobs/build/build_strimzi.yaml index 61cf3383b9..95739866bf 100644 --- a/.azure/templates/jobs/build/build_strimzi.yaml +++ b/.azure/templates/jobs/build/build_strimzi.yaml @@ -41,6 +41,8 @@ jobs: displayName: "Run Spotbugs" env: MVN_ARGS: "-e -V -B" + - bash: "make dashboard_install" + displayName: "Setup dashboards for Helm Chart" - bash: "make helm_install" displayName: "Generate YAMLs from Helm Chart" - bash: "make crd_install" diff --git a/Makefile b/Makefile index c86dd15d0c..7d26a59944 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ release_single_file: $(FIND) ./strimzi-$(RELEASE_VERSION)/install/user-operator/ -type f -exec cat {} \; -exec printf "\n---\n" \; > strimzi-user-operator-$(RELEASE_VERSION).yaml $(FIND) ./strimzi-$(RELEASE_VERSION)/install/cluster-operator/*-Crd-*.yaml -type f -exec cat {} \; -exec printf "\n---\n" \; > strimzi-crds-$(RELEASE_VERSION).yaml -helm_pkg: +helm_pkg: dashboard_install # Copying unarchived Helm Chart to release directory mkdir -p strimzi-$(RELEASE_VERSION)/helm3-charts/ helm package --version $(CHART_SEMANTIC_RELEASE_VERSION) --app-version $(CHART_SEMANTIC_RELEASE_VERSION) --destination ./ ./packaging/helm-charts/helm3/strimzi-kafka-operator/ diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-cruise-control.json b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-cruise-control.json index 878e7dd5ed..456775fa41 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-cruise-control.json +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-cruise-control.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -52,7 +42,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1596037257491, + "iteration": 1687297471450, "links": [], "panels": [ { @@ -66,6 +56,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "The number of snapshot windows that are monitored", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -122,8 +118,8 @@ { "expr": "kafka_cruisecontrol_loadmonitor_total_monitored_windows_value{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\"}", "format": "time_series", - "instant": true, "hide": false, + "instant": true, "intervalFactor": 1, "legendFormat": "", "refId": "A" @@ -153,6 +149,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of time windows considered to be valid because of enough samples for computing a proposal.", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -207,8 +209,8 @@ { "expr": "kafka_cruisecontrol_loadmonitor_valid_windows_value{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\"}", "format": "time_series", - "instant": true, "hide": false, + "instant": true, "intervalFactor": 1, "refId": "A" } @@ -237,6 +239,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of ongoing executions running for proposals or rebalance", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -291,8 +299,8 @@ { "expr": "kafka_cruisecontrol_executor_ongoing_execution_non_kafka_assigner_value{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\"}", "format": "time_series", - "instant": true, "hide": false, + "instant": true, "intervalFactor": 1, "refId": "A" } @@ -321,6 +329,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "The current balancedness score of the Kafka cluster as calculated by the anomaly detector (every 5 minutes by default)", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -375,8 +389,8 @@ { "expr": "kafka_cruisecontrol_anomalydetector_balancedness_score_value{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\"}", "format": "time_series", - "instant": true, "hide": false, + "instant": true, "intervalFactor": 1, "refId": "A" } @@ -405,6 +419,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Monitored Partition Percentage", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "percentunit", "gauge": { "maxValue": 100, @@ -459,8 +479,8 @@ { "expr": "kafka_cruisecontrol_loadmonitor_monitored_partitions_percentage_value{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\"}", "format": "time_series", - "instant": true, "hide": false, + "instant": true, "intervalFactor": 1, "refId": "A" } @@ -479,6 +499,7 @@ "valueName": "current" }, { + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -496,6 +517,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Goal Violation Rate", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -504,6 +532,7 @@ "x": 0, "y": 5 }, + "hiddenSeries": false, "id": 106, "legend": { "alignAsTable": false, @@ -523,10 +552,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -595,6 +626,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Disk read failures reported by Kafka", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -603,6 +641,7 @@ "x": 12, "y": 5 }, + "hiddenSeries": false, "id": 107, "legend": { "alignAsTable": false, @@ -622,10 +661,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -694,6 +735,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Partition Samples Fetcher Failure Rate", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -702,6 +750,7 @@ "x": 0, "y": 13 }, + "hiddenSeries": false, "id": 117, "legend": { "alignAsTable": false, @@ -721,10 +770,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -793,6 +844,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Training Samples Fetcher Failure Rate", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -801,6 +859,7 @@ "x": 12, "y": 13 }, + "hiddenSeries": false, "id": 118, "legend": { "alignAsTable": false, @@ -820,10 +879,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -892,6 +953,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Proposal Computation Time", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -900,6 +968,7 @@ "x": 0, "y": 21 }, + "hiddenSeries": false, "id": 109, "legend": { "alignAsTable": false, @@ -919,10 +988,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1008,6 +1079,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Cluster Model Creation Time", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1016,6 +1094,7 @@ "x": 12, "y": 21 }, + "hiddenSeries": false, "id": 111, "legend": { "alignAsTable": false, @@ -1035,10 +1114,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1117,6 +1198,7 @@ }, { "collapsed": false, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -1135,6 +1217,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Rebalance Request Rate", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1166,6 +1255,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1234,6 +1324,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "User Tasks Request Rate", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1261,6 +1358,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1325,6 +1423,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Proposal Request Rate", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1356,6 +1461,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1423,6 +1529,13 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1451,6 +1564,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1510,6 +1624,7 @@ }, { "collapsed": false, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -1527,6 +1642,13 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1554,6 +1676,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1617,6 +1740,13 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1644,6 +1774,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1707,6 +1838,13 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1734,6 +1872,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1798,6 +1937,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Kafka broker pods memory usage", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1825,6 +1971,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1890,6 +2037,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Aggregated Kafka broker pods CPU usage", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1917,6 +2071,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1977,7 +2132,7 @@ } ], "refresh": "5s", - "schemaVersion": 19, + "schemaVersion": 26, "style": "dark", "tags": [ "Strimzi", @@ -1985,11 +2140,27 @@ ], "templating": { "list": [ + { + "current": {}, + "error": null, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "query_result(kafka_cruisecontrol_loadmonitor_valid_windows_value)", + "error": null, "hide": 0, "includeAll": false, "label": "Namespace", @@ -2012,6 +2183,7 @@ "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "query_result(kafka_cruisecontrol_loadmonitor_valid_windows_value{namespace=\"$kubernetes_namespace\"})", + "error": null, "hide": 0, "includeAll": false, "label": "Cluster Name", @@ -2063,5 +2235,5 @@ "timezone": "", "title": "Strimzi Cruise Control", "uid": "8wCTC5Tmq", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-bridge.json b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-bridge.json index 16014d471d..36f43999d3 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-bridge.json +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-bridge.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -52,9 +42,11 @@ "gnetId": null, "graphTooltip": 0, "id": null, + "iteration": 1687299446541, "links": [], "panels": [ { + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -801,6 +793,7 @@ }, { "collapsed": false, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -821,7 +814,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -849,9 +843,11 @@ "links": [], "nullPointMode": "null as zero", "options": { + "alertThreshold": true, "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -917,7 +913,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -945,9 +942,11 @@ "links": [], "nullPointMode": "null as zero", "options": { + "alertThreshold": true, "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1013,7 +1012,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1041,9 +1041,11 @@ "links": [], "nullPointMode": "null as zero", "options": { + "alertThreshold": true, "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1109,7 +1111,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1137,9 +1140,11 @@ "links": [], "nullPointMode": "null as zero", "options": { + "alertThreshold": true, "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1205,7 +1210,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1233,9 +1239,11 @@ "links": [], "nullPointMode": "null as zero", "options": { + "alertThreshold": true, "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1302,7 +1310,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1330,9 +1339,11 @@ "links": [], "nullPointMode": "null as zero", "options": { + "alertThreshold": true, "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1400,7 +1411,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1431,6 +1443,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1498,7 +1511,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1529,6 +1543,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1596,7 +1611,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1627,6 +1643,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1694,7 +1711,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1725,6 +1743,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1792,7 +1811,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1823,6 +1843,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1882,6 +1903,7 @@ } }, { + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -1902,6 +1924,7 @@ "fieldConfig": { "defaults": { "custom": {}, + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -1946,7 +1969,7 @@ "dataLinks": [] }, "percentage": false, - "pluginVersion": "7.0.3", + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -2013,7 +2036,8 @@ "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2044,6 +2068,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -2135,7 +2160,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2166,6 +2192,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -2233,7 +2260,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2264,6 +2292,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -2330,7 +2359,8 @@ "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2361,6 +2391,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -2425,7 +2456,8 @@ "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2456,6 +2488,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -2522,7 +2555,8 @@ "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2553,6 +2587,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -2620,7 +2655,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2651,6 +2687,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -2718,7 +2755,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2749,6 +2787,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -2817,7 +2856,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2848,6 +2888,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -2915,7 +2956,8 @@ "description": "", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2946,6 +2988,7 @@ "dataLinks": [] }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -3005,6 +3048,7 @@ } }, { + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -3021,6 +3065,12 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -3044,6 +3094,7 @@ "nullPointMode": "null as zero", "options": {}, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -3106,6 +3157,12 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -3129,6 +3186,7 @@ "nullPointMode": "null as zero", "options": {}, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -3191,6 +3249,12 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -3214,6 +3278,7 @@ "nullPointMode": "null as zero", "options": {}, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -3272,14 +3337,30 @@ } ], "refresh": "5s", - "schemaVersion": 18, + "schemaVersion": 26, "style": "dark", "tags": [ "Strimzi", "Kafka" ], "templating": { - "list": [] + "list": [ + { + "current": {}, + "error": null, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + } + ] }, "time": { "from": "now-5m", @@ -3312,5 +3393,5 @@ "timezone": "", "title": "Strimzi Kafka Bridge", "uid": "z6qqIxmMz", - "version": 17 + "version": 18 } diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-connect.json b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-connect.json index 3ad61322d1..0df9e3d955 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-connect.json +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-connect.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -58,7 +48,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1600638818861, + "iteration": 1687300079448, "links": [], "panels": [ { @@ -71,6 +61,12 @@ "rgba(50, 172, 45, 0.97)" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -154,6 +150,12 @@ "rgba(50, 172, 45, 0.97)" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -232,13 +234,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 8, "x": 8, "y": 0 }, + "hiddenSeries": false, "id": 28, "legend": { "avg": false, @@ -253,7 +263,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -271,6 +285,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "(Sink/Consumers) Incoming bytes per second", "tooltip": { @@ -315,13 +330,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 8, "x": 16, "y": 0 }, + "hiddenSeries": false, "id": 29, "legend": { "avg": false, @@ -336,7 +359,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -354,6 +381,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "(Source/Producers) Outgoing bytes per second", "tooltip": { @@ -398,13 +426,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 0, "y": 7 }, + "hiddenSeries": false, "id": 30, "legend": { "avg": false, @@ -419,7 +455,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -442,6 +482,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "CPU Usage", "tooltip": { @@ -486,13 +527,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 6, "y": 7 }, + "hiddenSeries": false, "id": 31, "legend": { "avg": false, @@ -507,7 +556,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -530,6 +583,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "JVM Memory", "tooltip": { @@ -574,13 +628,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 12, "y": 7 }, + "hiddenSeries": false, "id": 32, "legend": { "avg": false, @@ -595,7 +657,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -618,6 +684,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Time spent in GC", "tooltip": { @@ -663,13 +730,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "JVM thread count", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 18, "y": 7 }, + "hiddenSeries": false, "id": 37, "legend": { "avg": false, @@ -684,8 +759,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -704,6 +783,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "JVM Thread Count", "tooltip": { @@ -746,6 +826,12 @@ "cacheTimeout": null, "columns": [], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 7, @@ -842,13 +928,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 8, "x": 8, "y": 14 }, + "hiddenSeries": false, "id": 35, "legend": { "avg": false, @@ -863,8 +957,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "6.7.1", + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -914,6 +1011,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Connector task state", "tooltip": { @@ -960,13 +1058,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 8, "x": 16, "y": 14 }, + "hiddenSeries": false, "id": 36, "legend": { "avg": false, @@ -980,7 +1086,11 @@ "lines": true, "linewidth": 1, "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1004,13 +1114,14 @@ }, { "expr": "sum(kafka_admin_client_connection_count{strimzi_io_kind=~\"KafkaConnect.*\",strimzi_io_cluster=\"$strimzi_connect_cluster_name\"})", - "legendFormat": "#admin connections", "interval": "", + "legendFormat": "#admin connections", "refId": "C" } ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Connection count", "tooltip": { @@ -1138,7 +1249,7 @@ } ] }, - "pluginVersion": "8.1.2", + "pluginVersion": "7.3.7", "targets": [ { "exemplar": true, @@ -1193,7 +1304,8 @@ }, "custom": { "align": "auto", - "displayMode": "auto" + "displayMode": "auto", + "filterable": false }, "mappings": [], "thresholds": { @@ -1235,7 +1347,7 @@ "options": { "showHeader": true }, - "pluginVersion": "8.1.2", + "pluginVersion": "7.3.7", "targets": [ { "exemplar": true, @@ -1285,7 +1397,7 @@ } ], "refresh": "5s", - "schemaVersion": 21, + "schemaVersion": 26, "style": "dark", "tags": [ "Strimzi", @@ -1294,10 +1406,27 @@ ], "templating": { "list": [ + { + "current": {}, + "error": null, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", + "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Namespace", @@ -1307,6 +1436,7 @@ "query": "query_result(kafka_connect_worker_connector_count{strimzi_io_kind=~\"KafkaConnect.*\"})", "refresh": 1, "regex": "/.*namespace=\"([^\"]*).*/", + "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", "tags": [], @@ -1318,6 +1448,8 @@ "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", + "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Cluster Name", @@ -1327,6 +1459,7 @@ "query": "query_result(kafka_connect_worker_connector_count{namespace=\"$kubernetes_namespace\", strimzi_io_kind=~\"KafkaConnect.*\"})", "refresh": 1, "regex": "/.*strimzi_io_cluster=\"([^\"]*).*/", + "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", "tags": [], @@ -1368,5 +1501,5 @@ "timezone": "", "title": "Strimzi Kafka Connect", "uid": "39fb097dc2c5ebf8a7717cf78fc2f8f7", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json index 2b4aa187cb..70c2fa42b5 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json @@ -1,15 +1,5 @@ { "_comment": "Based on https://grafana.com/grafana/dashboards/7589", - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -28,6 +18,18 @@ "id": "prometheus", "name": "Prometheus", "version": "5.0.0" + }, + { + "type": "panel", + "id": "singlestat", + "name": "Singlestat", + "version": "" + }, + { + "type": "panel", + "id": "table", + "name": "Table", + "version": "" } ], "annotations": { @@ -47,7 +49,7 @@ "editable": true, "gnetId": 7589, "graphTooltip": 0, - "iteration": 1571176708910, + "iteration": 1687300484097, "links": [], "panels": [ { @@ -60,6 +62,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -142,6 +150,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -224,6 +238,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -306,6 +326,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -388,6 +414,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -471,6 +503,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of partitions which are at their minimum in sync replica count (| ISR | == | min.insync.replicas |)", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -554,6 +592,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of partitions which are under their minimum in sync replica count (| ISR | < | min.insync.replicas |)", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -636,6 +680,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -714,13 +764,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 0, + "fillGradient": 0, "gridPos": { "h": 10, "w": 8, "x": 0, "y": 4 }, + "hiddenSeries": false, "id": 14, "legend": { "alignAsTable": true, @@ -740,8 +798,12 @@ "linewidth": 1, "links": [], "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -805,13 +867,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 0, + "fillGradient": 0, "gridPos": { "h": 10, "w": 8, "x": 8, "y": 4 }, + "hiddenSeries": false, "id": 18, "legend": { "alignAsTable": true, @@ -831,8 +901,12 @@ "linewidth": 1, "links": [], "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -896,13 +970,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 0, + "fillGradient": 0, "gridPos": { "h": 10, "w": 8, "x": 16, "y": 4 }, + "hiddenSeries": false, "id": 12, "legend": { "alignAsTable": true, @@ -921,8 +1003,12 @@ "linewidth": 1, "links": [], "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -985,6 +1071,12 @@ { "columns": [], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 10, @@ -1005,12 +1097,14 @@ "styles": [ { "alias": "Time", + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "Time", "type": "date" }, { "alias": "Offset", + "align": "auto", "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", @@ -1027,6 +1121,7 @@ }, { "alias": "", + "align": "auto", "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", @@ -1059,6 +1154,12 @@ { "columns": [], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 10, @@ -1079,12 +1180,14 @@ "styles": [ { "alias": "Time", + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "Time", "type": "date" }, { "alias": "Lag", + "align": "auto", "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", @@ -1101,6 +1204,7 @@ }, { "alias": "", + "align": "auto", "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", @@ -1133,6 +1237,12 @@ { "columns": [], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 10, @@ -1153,12 +1263,14 @@ "styles": [ { "alias": "Time", + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "Time", "type": "date" }, { "alias": "Partitions", + "align": "auto", "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", @@ -1175,6 +1287,7 @@ }, { "alias": "", + "align": "auto", "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", @@ -1207,6 +1320,12 @@ { "columns": [], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 10, @@ -1227,12 +1346,14 @@ "styles": [ { "alias": "Time", + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "Time", "type": "date" }, { "alias": "Offset", + "align": "auto", "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", @@ -1249,6 +1370,7 @@ }, { "alias": "", + "align": "auto", "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", @@ -1281,6 +1403,12 @@ { "columns": [], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 10, @@ -1301,12 +1429,14 @@ "styles": [ { "alias": "Time", + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "Time", "type": "date" }, { "alias": "Offset", + "align": "auto", "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", @@ -1323,6 +1453,7 @@ }, { "alias": "", + "align": "auto", "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", @@ -1354,7 +1485,7 @@ } ], "refresh": "5s", - "schemaVersion": 18, + "schemaVersion": 26, "style": "dark", "tags": [ "Strimzi", @@ -1363,11 +1494,27 @@ ], "templating": { "list": [ + { + "current": {}, + "error": null, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Namespace", @@ -1390,6 +1537,7 @@ "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Cluster Name", @@ -1417,6 +1565,7 @@ }, "datasource": "${DS_PROMETHEUS}", "definition": "label_values(kafka_consumergroup_current_offset{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\"}, consumergroup)", + "error": null, "hide": 0, "includeAll": true, "label": "Consumer Group", @@ -1444,6 +1593,7 @@ }, "datasource": "${DS_PROMETHEUS}", "definition": "label_values(kafka_topic_partition_current_offset{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\"}, topic)", + "error": null, "hide": 0, "includeAll": true, "label": "Topic", @@ -1495,5 +1645,5 @@ "timezone": "browser", "title": "Strimzi Kafka Exporter", "uid": "jwPKIsniz", - "version": 1 + "version": 2 } diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-mirror-maker-2.json b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-mirror-maker-2.json index 60f536ae1a..3388a27b06 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-mirror-maker-2.json +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-mirror-maker-2.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -33,6 +23,18 @@ "id": "singlestat", "name": "Singlestat", "version": "5.0.0" + }, + { + "type": "panel", + "id": "stat", + "name": "Stat", + "version": "" + }, + { + "type": "panel", + "id": "table", + "name": "Table", + "version": "" } ], "annotations": { @@ -52,7 +54,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1536950082067, + "iteration": 1687300878687, "links": [], "panels": [ { @@ -65,6 +67,12 @@ "rgba(50, 172, 45, 0.97)" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -148,6 +156,12 @@ "rgba(50, 172, 45, 0.97)" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -226,13 +240,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 8, "x": 8, "y": 0 }, + "hiddenSeries": false, "id": 28, "legend": { "avg": false, @@ -247,7 +269,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -270,6 +296,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Incoming bytes", "tooltip": { @@ -314,13 +341,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 8, "x": 16, "y": 0 }, + "hiddenSeries": false, "id": 29, "legend": { "avg": false, @@ -335,7 +370,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -358,6 +397,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Outgoing bytes", "tooltip": { @@ -458,7 +498,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "7.1.1", + "pluginVersion": "7.3.7", "targets": [ { "expr": "sum(kafka_connect_worker_task_count{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"})", @@ -606,14 +646,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", - + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 8, "x": 0, "y": 8 }, + "hiddenSeries": false, "id": 30, "legend": { "avg": false, @@ -628,7 +675,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -651,6 +702,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "CPU Usage", "tooltip": { @@ -695,6 +747,12 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -703,6 +761,7 @@ "x": 8, "y": 8 }, + "hiddenSeries": false, "id": 31, "legend": { "avg": false, @@ -717,7 +776,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -740,6 +803,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "JVM Memory", "tooltip": { @@ -784,13 +848,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 8, "x": 16, "y": 8 }, + "hiddenSeries": false, "id": 32, "legend": { "avg": false, @@ -805,7 +877,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -828,6 +904,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Time spent in GC", "tooltip": { @@ -1160,7 +1237,8 @@ }, "custom": { "align": "auto", - "displayMode": "auto" + "displayMode": "auto", + "filterable": false }, "mappings": [], "thresholds": { @@ -1281,7 +1359,7 @@ } ] }, - "pluginVersion": "7.1.1", + "pluginVersion": "7.3.7", "targets": [ { "exemplar": false, @@ -1375,7 +1453,8 @@ }, "custom": { "align": "auto", - "displayMode": "auto" + "displayMode": "auto", + "filterable": false }, "mappings": [], "thresholds": { @@ -1496,7 +1575,7 @@ } ] }, - "pluginVersion": "7.1.1", + "pluginVersion": "7.3.7", "targets": [ { "exemplar": false, @@ -1590,7 +1669,8 @@ }, "custom": { "align": "auto", - "displayMode": "auto" + "displayMode": "auto", + "filterable": false }, "mappings": [], "thresholds": { @@ -1723,7 +1803,7 @@ } ] }, - "pluginVersion": "7.1.1", + "pluginVersion": "7.3.7", "targets": [ { "exemplar": false, @@ -1816,7 +1896,12 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", - + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1843,7 +1928,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.1.1", + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1910,7 +1995,8 @@ }, "custom": { "align": "auto", - "displayMode": "auto" + "displayMode": "auto", + "filterable": false }, "mappings": [], "thresholds": { @@ -1939,6 +2025,7 @@ "options": { "showHeader": true }, + "pluginVersion": "7.3.7", "targets": [ { "exemplar": true, @@ -1983,6 +2070,21 @@ ], "templating": { "list": [ + { + "current": {}, + "error": null, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": { @@ -1990,6 +2092,8 @@ "value": "" }, "datasource": "${DS_PROMETHEUS}", + "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Namespace", @@ -1999,6 +2103,7 @@ "query": "query_result(kafka_connect_worker_connector_count{strimzi_io_kind=\"KafkaMirrorMaker2\"})", "refresh": 1, "regex": "/.*namespace=\"([^\"]*).*/", + "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", "tags": [], @@ -2013,6 +2118,8 @@ "value": "my-mirror-maker-2-cluster" }, "datasource": "${DS_PROMETHEUS}", + "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Cluster Name", @@ -2022,6 +2129,7 @@ "query": "query_result(kafka_connect_worker_connector_count{namespace=\"$kubernetes_namespace\", strimzi_io_kind=\"KafkaMirrorMaker2\"})", "refresh": 1, "regex": "/.*strimzi_io_cluster=\"([^\"]*).*/", + "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", "tags": [], @@ -2061,8 +2169,7 @@ ] }, "timezone": "", - "title": "Strimzi Kafka Mirror Maker 2", "uid": "spCQwc0mz", - "version": 6 + "version": 7 } diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-oauth.json b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-oauth.json index 179157304d..cd7b08310e 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-oauth.json +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-oauth.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -51,7 +41,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "iteration": 1600633283203, + "iteration": 1687301303076, "links": [], "panels": [ { @@ -77,6 +67,7 @@ "description": "", "fieldConfig": { "defaults": { + "custom": {}, "unit": "none" }, "overrides": [] @@ -109,7 +100,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "8.2.6", + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -182,6 +173,7 @@ "description": "", "fieldConfig": { "defaults": { + "custom": {}, "unit": "none" }, "overrides": [] @@ -214,7 +206,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "8.2.6", + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -287,6 +279,7 @@ "description": "", "fieldConfig": { "defaults": { + "custom": {}, "unit": "none" }, "overrides": [] @@ -319,7 +312,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "8.2.6", + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -392,6 +385,7 @@ "description": "", "fieldConfig": { "defaults": { + "custom": {}, "unit": "none" }, "overrides": [] @@ -424,7 +418,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "8.2.6", + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -495,6 +489,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -523,7 +523,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "8.2.6", + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -594,6 +594,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -622,7 +628,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "8.2.6", + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -688,7 +694,7 @@ } ], "refresh": "5s", - "schemaVersion": 1, + "schemaVersion": 26, "style": "dark", "tags": [ "Strimzi", @@ -697,10 +703,27 @@ "templating": { "list": [ { + "current": {}, + "error": null, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, + { + "allFormat": "glob", "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Namespace", @@ -719,10 +742,12 @@ "useTags": false }, { + "allFormat": "glob", "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Cluster Name", @@ -741,10 +766,12 @@ "useTags": false }, { + "allFormat": "glob", "allValue": ".*", "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "", + "error": null, "hide": 0, "includeAll": true, "label": "Broker", @@ -757,6 +784,7 @@ "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", + "tags": [], "tagsQuery": "", "type": "query", "useTags": false @@ -795,5 +823,5 @@ "timezone": "", "title": "Strimzi Kafka OAuth", "uid": "aa66282eda2b42a2b9304fb2934f940f", - "version": 1 + "version": 2 } diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka.json b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka.json index 7d8312d89a..07e652e1fd 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka.json +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -51,7 +41,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "iteration": 1600633283203, + "iteration": 1687298918684, "links": [], "panels": [ { @@ -65,6 +55,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of brokers online", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -150,6 +146,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of active controllers in the cluster", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -232,6 +234,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Unclean leader election rate", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -314,6 +322,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Replicas that are online", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -395,6 +409,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of under-replicated partitions (| ISR | < | all replicas |).", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -477,6 +497,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of partitions which are at their minimum in sync replica count (| ISR | == | min.insync.replicas |)", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -559,6 +585,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of partitions which are under their minimum in sync replica count (| ISR | < | min.insync.replicas |)", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -641,6 +673,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of partitions that don’t have an active leader and are hence not writable or readable", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -714,6 +752,7 @@ }, { "collapsed": false, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -732,13 +771,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Kafka broker pods memory usage", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 0, "y": 5 }, + "hiddenSeries": false, "id": 82, "legend": { "avg": false, @@ -753,8 +800,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -820,13 +871,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Aggregated Kafka broker pods CPU usage", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 6, "y": 5 }, + "hiddenSeries": false, "id": 81, "legend": { "avg": false, @@ -841,8 +900,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -908,13 +971,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Kafka broker pods disk usage", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 12, "y": 5 }, + "hiddenSeries": false, "id": 83, "legend": { "avg": false, @@ -929,8 +1000,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -996,13 +1071,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Open File Descriptors", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 18, "y": 5 }, + "hiddenSeries": false, "id": 107, "legend": { "avg": false, @@ -1017,8 +1100,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1083,13 +1170,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 0, "y": 12 }, + "hiddenSeries": false, "id": 93, "legend": { "avg": false, @@ -1104,8 +1199,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1169,13 +1268,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 6, "y": 12 }, + "hiddenSeries": false, "id": 95, "legend": { "avg": false, @@ -1190,8 +1297,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1255,13 +1366,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 12, "y": 12 }, + "hiddenSeries": false, "id": 97, "legend": { "avg": false, @@ -1276,8 +1395,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1342,13 +1465,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "JVM thread count", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 18, "y": 12 }, + "hiddenSeries": false, "id": 108, "legend": { "avg": false, @@ -1363,8 +1494,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1433,6 +1568,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Total incoming byte rate", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "Bps", "gauge": { "maxValue": 100, @@ -1517,6 +1658,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Total outgoing byte rate", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "Bps", "gauge": { "maxValue": 100, @@ -1601,6 +1748,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Incoming messages rate", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "wps", "gauge": { "maxValue": 100, @@ -1685,6 +1838,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Total produce request rate", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "reqps", "gauge": { "maxValue": 100, @@ -1765,13 +1924,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Byte rate", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 23 }, + "hiddenSeries": false, "id": 44, "legend": { "alignAsTable": false, @@ -1790,8 +1957,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1867,13 +2038,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 12, "x": 12, "y": 23 }, + "hiddenSeries": false, "id": 58, "legend": { "alignAsTable": false, @@ -1889,8 +2068,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1955,6 +2138,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Produce request rate", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -1978,6 +2167,7 @@ "nullPointMode": "null", "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -2050,6 +2240,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Fetch request rate", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -2073,6 +2269,7 @@ "nullPointMode": "null", "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -2144,6 +2341,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Average percentage of time network processor is idle", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -2167,6 +2370,7 @@ "nullPointMode": "null", "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -2231,6 +2435,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Average percentage of time request handler threads are idle", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -2254,6 +2464,7 @@ "nullPointMode": "null", "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -2319,6 +2530,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Disk writes", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -2342,6 +2559,7 @@ "nullPointMode": "null", "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -2407,6 +2625,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Disk reads", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -2430,6 +2654,7 @@ "nullPointMode": "null", "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -2495,6 +2720,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Disk reads", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -2518,6 +2749,7 @@ "nullPointMode": "null", "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -2582,6 +2814,12 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 13, @@ -2605,6 +2843,7 @@ "nullPointMode": "null", "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -2665,7 +2904,7 @@ } ], "refresh": "5s", - "schemaVersion": 21, + "schemaVersion": 26, "style": "dark", "tags": [ "Strimzi", @@ -2673,11 +2912,27 @@ ], "templating": { "list": [ + { + "current": {}, + "error": null, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Namespace", @@ -2700,6 +2955,7 @@ "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Cluster Name", @@ -2722,6 +2978,7 @@ "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "", + "error": null, "hide": 0, "includeAll": true, "label": "Broker", @@ -2744,6 +3001,7 @@ "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "", + "error": null, "hide": 0, "includeAll": true, "label": "Topic", @@ -2766,6 +3024,7 @@ "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "", + "error": null, "hide": 0, "includeAll": true, "label": "Partition", diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json index 8b944629cd..9b343e6df4 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -46,7 +36,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1678709634579, + "iteration": 1687301522242, "links": [], "panels": [ { @@ -70,13 +60,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Kafka broker pods memory usage", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 0, "y": 1 }, + "hiddenSeries": false, "id": 82, "legend": { "avg": false, @@ -162,13 +160,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Aggregated Kafka broker pods CPU usage", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 6, "y": 1 }, + "hiddenSeries": false, "id": 81, "legend": { "avg": false, @@ -254,13 +260,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Kafka broker pods disk usage", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 12, "y": 1 }, + "hiddenSeries": false, "id": 83, "legend": { "avg": false, @@ -346,13 +360,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Open File Descriptors", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 18, "y": 1 }, + "hiddenSeries": false, "id": 107, "legend": { "avg": false, @@ -437,13 +459,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 0, "y": 8 }, + "hiddenSeries": false, "id": 93, "legend": { "avg": false, @@ -527,13 +557,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 6, "y": 8 }, + "hiddenSeries": false, "id": 95, "legend": { "avg": false, @@ -619,13 +657,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 12, "y": 8 }, + "hiddenSeries": false, "id": 97, "legend": { "avg": false, @@ -710,13 +756,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "JVM thread count", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 18, "y": 8 }, + "hiddenSeries": false, "id": 108, "legend": { "avg": false, @@ -801,13 +855,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The average number of records appended per sec as the leader of the raft quorum.", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 8, "x": 0, "y": 15 }, + "hiddenSeries": false, "id": 44, "legend": { "alignAsTable": false, @@ -902,13 +964,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The average number of records fetched from the leader of the raft quorum.", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 8, "x": 8, "y": 15 }, + "hiddenSeries": false, "id": 58, "legend": { "alignAsTable": false, @@ -997,13 +1067,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The average time in milliseconds to commit an entry in the raft log.", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 8, "x": 16, "y": 15 }, + "hiddenSeries": false, "id": 112, "legend": { "alignAsTable": false, @@ -1098,13 +1176,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The current quorum leader's id; -1 indicates unknown", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 8, "x": 0, "y": 23 }, + "hiddenSeries": false, "id": 104, "legend": { "avg": false, @@ -1194,13 +1280,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The current voted leader's id; -1 indicates not voted for anyone", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 8, "x": 8, "y": 23 }, + "hiddenSeries": false, "id": 105, "legend": { "avg": false, @@ -1290,13 +1384,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The current quorum epoch", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 8, "x": 16, "y": 23 }, + "hiddenSeries": false, "id": 113, "legend": { "avg": false, @@ -1386,6 +1488,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The number of bytes read off all sockets per second", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -1481,6 +1589,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The number of outgoing bytes sent to all servers per second", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -1576,6 +1690,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The number of requests sent per second", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -1672,6 +1792,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The number of responses received per second", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -1767,6 +1893,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The high watermark maintained on this member; -1 if it is unknown.", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -1862,6 +1994,12 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "The current raft log end offset.", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "gridPos": { "h": 8, @@ -1960,6 +2098,21 @@ ], "templating": { "list": [ + { + "current": {}, + "error": null, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": {}, @@ -2063,5 +2216,5 @@ "timezone": "", "title": "Strimzi KRaft", "uid": "0nVoON14z", - "version": 26 -} \ No newline at end of file + "version": 27 +} diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-operators.json b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-operators.json index 60730d90f9..d7ff962905 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-operators.json +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-operators.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -51,11 +41,13 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "id": 2, + "id": null, + "iteration": 1687301758926, "links": [], "panels": [ { "collapsed": false, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -77,6 +69,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -160,6 +158,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -243,6 +247,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -326,6 +336,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -409,6 +425,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -492,6 +514,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -575,6 +603,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -658,6 +692,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -741,6 +781,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -816,6 +862,7 @@ }, { "collapsed": false, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -834,6 +881,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "decimals": null, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -842,6 +896,7 @@ "x": 0, "y": 8 }, + "hiddenSeries": false, "id": 48, "legend": { "avg": false, @@ -859,10 +914,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -927,6 +984,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "decimals": null, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -935,6 +999,7 @@ "x": 8, "y": 8 }, + "hiddenSeries": false, "id": 49, "legend": { "avg": false, @@ -952,10 +1017,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1020,6 +1087,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "decimals": null, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1028,6 +1102,7 @@ "x": 16, "y": 8 }, + "hiddenSeries": false, "id": 51, "legend": { "avg": false, @@ -1045,10 +1120,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1114,6 +1191,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "decimals": null, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1122,6 +1206,7 @@ "x": 0, "y": 16 }, + "hiddenSeries": false, "id": 47, "legend": { "avg": false, @@ -1139,10 +1224,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1208,6 +1295,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "decimals": null, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1216,6 +1310,7 @@ "x": 8, "y": 16 }, + "hiddenSeries": false, "id": 46, "legend": { "avg": false, @@ -1233,10 +1328,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1302,6 +1399,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "decimals": null, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1310,6 +1414,7 @@ "x": 16, "y": 16 }, + "hiddenSeries": false, "hideTimeOverride": false, "id": 52, "legend": { @@ -1328,10 +1433,12 @@ "links": [], "nullPointMode": "null", "options": { + "alertThreshold": true, "dataLinks": [] }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1392,6 +1499,7 @@ }, { "collapsed": false, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -1409,6 +1517,13 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1436,6 +1551,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1499,6 +1615,13 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1526,6 +1649,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1589,6 +1713,13 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1616,6 +1747,7 @@ }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1675,14 +1807,30 @@ } ], "refresh": "5s", - "schemaVersion": 18, + "schemaVersion": 26, "style": "dark", "tags": [ "Strimzi", "Kafka" ], "templating": { - "list": [] + "list": [ + { + "current": {}, + "error": null, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + } + ] }, "time": { "from": "now-1h", @@ -1716,5 +1864,5 @@ "timezone": "", "title": "Strimzi Operators", "uid": "ISIAR7rWz", - "version": 2 -} \ No newline at end of file + "version": 3 +} diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-zookeeper.json b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-zookeeper.json index d4ddeddaac..5805d6f375 100644 --- a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-zookeeper.json +++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-zookeeper.json @@ -1,14 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], "__requires": [ { "type": "grafana", @@ -54,11 +44,12 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1600637492559, + "iteration": 1687302048648, "links": [], "panels": [ { "collapsed": false, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -81,6 +72,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Quorum size of ZooKeeper ensemble", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -162,6 +159,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of active connections", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -239,13 +242,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Number of queued requests in the server. This goes up when the server receives more requests than it can process", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 16, "x": 8, "y": 1 }, + "hiddenSeries": false, "id": 12, "legend": { "avg": false, @@ -260,7 +271,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -280,6 +295,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Outstanding Requests", "tooltip": { @@ -328,6 +344,12 @@ "#d44a3a" ], "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -409,6 +431,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Number of watchers", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -486,13 +514,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "ZooKeeper pods memory usage", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 0, "y": 9 }, + "hiddenSeries": false, "id": 87, "legend": { "avg": false, @@ -507,7 +543,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -526,6 +566,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Memory Usage", "tooltip": { @@ -571,13 +612,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Aggregated ZooKeeper pods CPU usage", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 6, "y": 9 }, + "hiddenSeries": false, "id": 85, "legend": { "avg": false, @@ -592,7 +641,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -611,6 +664,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "CPU Usage", "tooltip": { @@ -656,13 +710,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Kafka broker pods disk usage", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 12, "y": 9 }, + "hiddenSeries": false, "id": 89, "legend": { "avg": false, @@ -677,7 +739,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -696,6 +762,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Available Disk Space", "tooltip": { @@ -741,13 +808,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Open File Descriptors", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 18, "y": 9 }, + "hiddenSeries": false, "id": 96, "legend": { "avg": false, @@ -762,8 +837,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -783,6 +862,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Open File Descriptors", "tooltip": { @@ -827,13 +907,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 0, "y": 16 }, + "hiddenSeries": false, "id": 91, "legend": { "avg": false, @@ -848,7 +936,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -867,6 +959,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "JVM Memory Used", "tooltip": { @@ -911,13 +1004,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 6, "y": 16 }, + "hiddenSeries": false, "id": 93, "legend": { "avg": false, @@ -932,7 +1033,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -951,6 +1056,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "JVM GC Time", "tooltip": { @@ -995,13 +1101,21 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 12, "y": 16 }, + "hiddenSeries": false, "id": 95, "legend": { "avg": false, @@ -1016,7 +1130,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1035,6 +1153,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "JVM GC Count", "tooltip": { @@ -1080,13 +1199,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "JVM thread count", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 18, "y": 16 }, + "hiddenSeries": false, "id": 97, "legend": { "avg": false, @@ -1101,8 +1228,12 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "paceLength": 10, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1121,6 +1252,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "JVM thread count", "tooltip": { @@ -1166,13 +1298,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Amount of time (in ms) it takes for the server to respond to a client request", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 8, "x": 0, "y": 23 }, + "hiddenSeries": false, "id": 10, "legend": { "avg": false, @@ -1187,7 +1327,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1206,6 +1350,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Request Latency - Minimum", "tooltip": { @@ -1251,13 +1396,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Amount of time (in ms) it takes for the server to respond to a client request", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 8, "x": 8, "y": 23 }, + "hiddenSeries": false, "id": 6, "legend": { "avg": false, @@ -1272,7 +1425,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1291,6 +1448,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Request Latency - Average", "tooltip": { @@ -1336,13 +1494,21 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "Amount of time (in ms) it takes for the server to respond to a client request", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 8, "w": 8, "x": 16, "y": 23 }, + "hiddenSeries": false, "id": 8, "legend": { "avg": false, @@ -1357,7 +1523,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 5, "points": false, "renderer": "flot", @@ -1376,6 +1546,7 @@ ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Request Latency - Maximum", "tooltip": { @@ -1416,7 +1587,7 @@ } ], "refresh": "5s", - "schemaVersion": 21, + "schemaVersion": 26, "style": "dark", "tags": [ "Strimzi", @@ -1425,10 +1596,27 @@ ], "templating": { "list": [ + { + "current": {}, + "error": null, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", + "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Namespace", @@ -1438,6 +1626,7 @@ "query": "query_result(zookeeper_inmemorydatatree_nodecount)", "refresh": 1, "regex": "/.*namespace=\"([^\"]*).*/", + "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", "tags": [], @@ -1449,6 +1638,8 @@ "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", + "definition": "", + "error": null, "hide": 0, "includeAll": false, "label": "Cluster Name", @@ -1458,6 +1649,7 @@ "query": "query_result(zookeeper_inmemorydatatree_nodecount{namespace=\"$kubernetes_namespace\"})", "refresh": 1, "regex": "/.*strimzi_io_cluster=\"([^\"]*).*/", + "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", "tags": [], @@ -1469,6 +1661,8 @@ "allValue": ".*", "current": {}, "datasource": "${DS_PROMETHEUS}", + "definition": "", + "error": null, "hide": 0, "includeAll": true, "label": "Node", @@ -1478,6 +1672,7 @@ "query": "query_result(zookeeper_inmemorydatatree_nodecount{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\"})", "refresh": 1, "regex": "/.*pod_name=\"$strimzi_cluster_name-([^\"]*).*/", + "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", "tags": [], @@ -1519,5 +1714,5 @@ "timezone": "", "title": "Strimzi ZooKeeper", "uid": "fc85de600d62d9841e9de00083b24b72", - "version": 2 + "version": 3 }