diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f93af6b..2c327409 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- Added missing datasource to all dashboards and panels. + +### Removed + +- Ger rid the of useless analytics panels. + ## [3.17.0] - 2024-06-07 ### Added diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/api-performance.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/api-performance.json index 55cc09df..6e12e2d4 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/api-performance.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/api-performance.json @@ -1603,7 +1603,7 @@ "uid": "$datasource" }, "definition": "label_values(etcd_request_duration_seconds_bucket, operation)", - "hide": 2, + "hide": 0, "includeAll": true, "multi": true, "name": "etcd_operation", @@ -1633,7 +1633,7 @@ "uid": "$datasource" }, "definition": "label_values(apiserver_flowcontrol_dispatched_requests_total, priority_level)", - "hide": 2, + "hide": 0, "includeAll": true, "multi": true, "name": "priority_level", diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/credentials.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/credentials.json index 9cefb839..bb07c540 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/credentials.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/credentials.json @@ -22,7 +22,7 @@ "panels": [ { "columns": [], - "datasource": "default", + "datasource": "$datasource", "description": "List of credentials currently installed", "fontSize": "100%", "gridPos": { @@ -77,7 +77,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Rate of requests to credentiald to create, list, and search for credentials.", "fill": 1, "gridPos": { @@ -178,7 +178,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "95th percentile latency for credentiald for creating, listing, and searching for credentials.", "fill": 1, "gridPos": { @@ -279,7 +279,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Rate of errors for credentiald for accessing Kubernetes.", "fill": 1, "gridPos": { @@ -383,7 +383,22 @@ "owner:team-honeybadger" ], "templating": { - "list": [] + "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "label": "Data source", + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "type": "datasource" + } + ] }, "time": { "from": "now-3h", diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/crossplane.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/crossplane.json index 3dc29df4..b3e19845 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/crossplane.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/crossplane.json @@ -45,7 +45,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -123,7 +123,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(reason) (rate(kube_event_count{type=\"Normal\", namespace=\"$namespace\"}[$rate_interval]))", @@ -138,7 +138,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -216,7 +216,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by(reason) (rate(kube_event_count{type=\"Warning\", namespace=\"$namespace\"}[$rate_interval]))", @@ -244,7 +244,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -321,7 +321,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by (job) (rate(rest_client_requests_total{job=~\"$namespace/.*\"}[$__rate_interval]))", @@ -336,7 +336,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -416,7 +416,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "builder", "expr": "topk(10, sum by (resource) (rate(apiserver_request_total[$__rate_interval])))", @@ -444,7 +444,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -521,7 +521,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "topk(10, sum by (controller) (rate(controller_runtime_reconcile_total{job=~\"$namespace/.*\"}[$rate_interval])))", @@ -536,7 +536,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -613,7 +613,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "topk(10, sum by (name) (workqueue_depth{job=~\"$namespace/.+\"}))", @@ -635,6 +635,23 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "auto": false, "auto_count": 30, diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/crsync.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/crsync.json index e0ac9a3f..db32e5cd 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/crsync.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/crsync.json @@ -20,7 +20,7 @@ "panels": [ { "columns": [], - "datasource": "default", + "datasource": "$datasource", "fontSize": "100%", "gridPos": { "h": 19, @@ -83,7 +83,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fill": 0, "fillGradient": 0, "gridPos": { @@ -175,7 +175,25 @@ "owner:team-honeybadger" ], "templating": { - "list": [] + "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + } + ] }, "time": { "from": "now-3h", diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd-backup.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd-backup.json index af45594f..b6bdad8b 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd-backup.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd-backup.json @@ -1142,7 +1142,10 @@ "$__all" ] }, - "datasource": "${datasource}", + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, "definition": "label_values(etcd_backup_latest_attempt, tenant_cluster_id)", "description": null, "error": null, diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd-health.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd-health.json index c2925977..d313e3fe 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd-health.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd-health.json @@ -33,7 +33,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -110,7 +110,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(etcd_kubernetes_resources_count{cluster_id=\"$cluster_id\", kind=~\".*kyverno.io\"}) by (kind, namespace)", @@ -122,7 +122,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(etcd_kubernetes_resources_count{cluster_id=\"$cluster_id\", kind=~\"clusteradmissionreports.kyverno.io\"}) by (kind)", @@ -134,7 +134,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(etcd_kubernetes_resources_count{cluster_id=\"$cluster_id\", kind=~\"backgroundscanreports.kyverno.io\"}) by (kind)", @@ -146,7 +146,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(etcd_kubernetes_resources_count{cluster_id=\"$cluster_id\", kind=~\"reportchangerequests.kyverno.io\"}) by (kind)", @@ -158,7 +158,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(etcd_kubernetes_resources_count{cluster_id=\"$cluster_id\", kind=~\"updaterequests.kyverno.io\"}) by (kind)", @@ -170,7 +170,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(etcd_kubernetes_resources_count{cluster_id=\"$cluster_id\", kind=~\"clusterpolicies.kyverno.io\"}) by (kind)", @@ -186,7 +186,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -264,7 +264,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "(last_over_time(etcd_mvcc_db_total_size_in_bytes{cluster_id=\"$cluster_id\"}[1m]) / last_over_time(etcd_server_quota_backend_bytes{cluster_id=\"$cluster_id\"}[1m]))*100", @@ -275,7 +275,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "75", @@ -288,7 +288,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "100", @@ -308,7 +308,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editable": true, "error": false, @@ -352,7 +352,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "etcd_mvcc_db_total_size_in_bytes{cluster_id=\"$cluster_id\"}", @@ -369,7 +369,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "etcd_server_quota_backend_bytes{cluster_id=\"$cluster_id\"}", @@ -417,7 +417,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editable": true, "error": false, @@ -460,7 +460,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "process_resident_memory_bytes{cluster_id=\"$cluster_id\",role=~\"control-plane|master\", job=\"$cluster_id-prometheus/etcd-$cluster_id/0\"}", @@ -507,7 +507,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Defrag needed if it goes below 50%.", "fieldConfig": { @@ -586,7 +586,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -601,7 +601,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "50", @@ -617,7 +617,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -695,7 +695,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.99, rate(etcd_disk_backend_commit_duration_seconds_bucket{cluster_id=\"$cluster_id\",job=~\".*etcd.*\"}[5m]))", @@ -706,7 +706,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "0.1", @@ -722,7 +722,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -800,7 +800,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.99, rate(etcd_disk_wal_fsync_duration_seconds_bucket{cluster_id=\"$cluster_id\", job=~\".*etcd.*\"}[5m]))", @@ -812,7 +812,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "0.03", @@ -828,7 +828,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -896,7 +896,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "max(etcd_server_has_leader{cluster_id=\"$cluster_id\"})", @@ -913,7 +913,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -975,7 +975,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "max(etcd_server_leader_changes_seen_total{cluster_id=\"$cluster_id\"})", @@ -992,7 +992,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1054,7 +1054,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "max(etcd_server_leader_changes_seen_total{cluster_id=\"$cluster_id\"})", @@ -1075,7 +1075,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editable": true, "error": false, @@ -1118,7 +1118,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(grpc_server_started_total{grpc_type=\"unary\", cluster_id=\"$cluster_id\"}[5m]))", @@ -1133,7 +1133,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(grpc_server_handled_total{grpc_type=\"unary\",grpc_code!=\"OK\", cluster_id=\"$cluster_id\"}[5m]))", @@ -1184,7 +1184,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editable": true, "error": false, @@ -1227,7 +1227,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(grpc_server_started_total{grpc_service=\"etcdserverpb.Watch\",grpc_type=\"bidi_stream\", cluster_id=\"$cluster_id\"}) - sum(grpc_server_handled_total{grpc_service=\"etcdserverpb.Watch\",grpc_type=\"bidi_stream\", cluster_id=\"$cluster_id\"})", @@ -1242,7 +1242,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(grpc_server_started_total{grpc_service=\"etcdserverpb.Lease\",grpc_type=\"bidi_stream\", cluster_id=\"$cluster_id\"}) - sum(grpc_server_handled_total{grpc_service=\"etcdserverpb.Lease\",grpc_type=\"bidi_stream\", cluster_id=\"$cluster_id\"})", @@ -1294,7 +1294,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editable": true, "error": false, @@ -1343,7 +1343,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "rate(etcd_network_client_grpc_received_bytes_total{cluster_id=\"$cluster_id\"}[5m])", @@ -1394,7 +1394,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editable": true, "error": false, @@ -1443,7 +1443,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "rate(etcd_network_client_grpc_sent_bytes_total{cluster_id=\"$cluster_id\"}[5m])", @@ -1494,7 +1494,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editable": true, "error": false, @@ -1537,7 +1537,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_network_peer_received_bytes_total{cluster_id=\"$cluster_id\"}[5m])) by (instance)", @@ -1588,7 +1588,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editable": true, "error": false, @@ -1632,7 +1632,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_network_peer_sent_bytes_total{cluster_id=\"$cluster_id\"}[5m])) by (instance)", @@ -1685,7 +1685,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editable": true, "error": false, @@ -1728,7 +1728,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_server_proposals_failed_total{cluster_id=\"$cluster_id\"}[5m]))", @@ -1743,7 +1743,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(etcd_server_proposals_pending{cluster_id=\"$cluster_id\"})", @@ -1758,7 +1758,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_server_proposals_committed_total{cluster_id=\"$cluster_id\"}[5m]))", @@ -1773,7 +1773,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum(rate(etcd_server_proposals_applied_total[5m]))", "format": "time_series", @@ -1818,7 +1818,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1900,7 +1900,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.99, sum(rate(etcd_disk_wal_fsync_duration_seconds_bucket{cluster_id=\"$cluster_id\"}[5m])) by (instance, le))", @@ -1916,7 +1916,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.99, sum(rate(etcd_disk_backend_commit_duration_seconds_bucket{cluster_id=\"$cluster_id\"}[5m])) by (instance, le))", @@ -1939,7 +1939,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "proposals_committed_total records the total number of consensus proposals committed. This gauge should increase over time if the cluster is healthy. Several healthy members of an etcd cluster may have different total committed proposals at once. This discrepancy may be due to recovering from peers after starting, lagging behind the leader, or being the leader and therefore having the most commits. It is important to monitor this metric across all the members in the cluster; a consistently large lag between a single member and its leader indicates that member is slow or unhealthy.\n\nproposals_applied_total records the total number of consensus proposals applied. The etcd server applies every committed proposal asynchronously. The difference between proposals_committed_total and proposals_applied_total should usually be small (within a few thousands even under high load). If the difference between them continues to rise, it indicates that the etcd server is overloaded. This might happen when applying expensive queries like heavy range queries or large txn operations.", "fill": 1, @@ -1983,7 +1983,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_server_proposals_committed_total{cluster_id=\"$cluster_id\"}[5m]))", @@ -1998,7 +1998,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_server_proposals_applied_total{cluster_id=\"$cluster_id\"}[5m]))", @@ -2049,7 +2049,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "decimals": 0, "editable": true, @@ -2095,7 +2095,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "changes(etcd_server_leader_changes_seen_total{cluster_id=\"$cluster_id\"}[1d])", @@ -2146,7 +2146,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "indicates how many proposals are queued to commit. Rising pending proposals suggests there is a high client load or the member cannot commit proposals.", "fill": 1, @@ -2188,7 +2188,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(etcd_server_proposals_pending{cluster_id=\"$cluster_id\"})", @@ -2237,7 +2237,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fill": 1, "fillGradient": 0, @@ -2278,7 +2278,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_disk_wal_fsync_duration_seconds_sum{cluster_id=\"$cluster_id\"}[5m]))", @@ -2292,7 +2292,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_disk_backend_commit_duration_seconds_sum{cluster_id=\"$cluster_id\"}[5m]))", @@ -2341,7 +2341,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -2388,7 +2388,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_network_client_grpc_received_bytes_total{cluster_id=\"$cluster_id\"}[5m]))", @@ -2402,7 +2402,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_network_client_grpc_sent_bytes_total{cluster_id=\"$cluster_id\"}[5m]))", @@ -2451,7 +2451,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Abnormally high snapshot duration (snapshot_save_total_duration_seconds) indicates disk issues and might cause the cluster to be unstable.", "fieldConfig": { @@ -2499,7 +2499,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_debugging_snap_save_total_duration_seconds_sum{cluster_id=\"$cluster_id\"}[5m]))", @@ -2552,6 +2552,23 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": false, @@ -2560,7 +2577,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(up, cluster_id)", "hide": 0, diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd.json index 3b2b2461..87ca9255 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/etcd.json @@ -27,7 +27,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "default", + "datasource": "$datasource", "editable": true, "error": false, "fieldConfig": { @@ -114,7 +114,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "editable": true, "error": false, "fieldConfig": { @@ -225,7 +225,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "editable": true, "error": false, "fieldConfig": { @@ -336,7 +336,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": null, "editable": true, "error": false, @@ -440,7 +440,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "editable": true, "error": false, "fieldConfig": { @@ -553,7 +553,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "editable": true, "error": false, "fieldConfig": { @@ -656,7 +656,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "editable": true, "error": false, "fieldConfig": { @@ -759,7 +759,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "editable": true, "error": false, "fieldConfig": { @@ -862,7 +862,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "editable": true, "error": false, "fieldConfig": { @@ -964,7 +964,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": null, "editable": true, "error": false, @@ -1068,7 +1068,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "editable": true, "error": false, "fieldConfig": { @@ -1196,7 +1196,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "editable": true, "error": false, @@ -1302,7 +1302,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "", "fieldConfig": { "defaults": { @@ -1398,7 +1398,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -1493,7 +1493,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -1592,7 +1592,25 @@ "owner:team-turtles" ], "templating": { - "list": [] + "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + } + ] }, "time": { "from": "now-15m", diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/external-dns.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/external-dns.json index e1ed82a6..1635e4ea 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/external-dns.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/external-dns.json @@ -28,7 +28,7 @@ "collapsed": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -42,7 +42,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -53,7 +53,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Number of Endpoints in the registry", "fieldConfig": { @@ -131,7 +131,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": true, @@ -148,7 +148,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Number of Endpoints in all sources", "fieldConfig": { @@ -226,7 +226,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": true, @@ -244,7 +244,7 @@ "collapsed": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -258,7 +258,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -269,7 +269,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Number of Registry errors", "fieldConfig": { @@ -347,7 +347,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": true, @@ -364,7 +364,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Number of Source errors", "fieldConfig": { @@ -442,7 +442,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": true, @@ -460,7 +460,7 @@ "collapsed": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -474,7 +474,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -485,7 +485,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Timestamp of last successful sync with the DNS provider", "fieldConfig": { @@ -537,7 +537,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": true, @@ -555,7 +555,7 @@ "collapsed": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -569,7 +569,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -580,7 +580,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -743,7 +743,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": true, @@ -759,7 +759,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": true, @@ -775,7 +775,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": true, @@ -795,7 +795,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -958,7 +958,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": true, @@ -974,7 +974,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": true, "expr": "scalar(kube_resourcequota{pod=~\".*external-dns.*\", type=\"hard\",resource=\"requests.memory\"})", @@ -988,7 +988,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": true, @@ -1015,12 +1015,33 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": true, "text": "giantswarm", "value": "giantswarm" }, + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, "definition": "label_values(kubernetes_build_info,cluster_id)", "hide": 0, "includeAll": false, @@ -1044,6 +1065,10 @@ "text": "external-dns-app", "value": "external-dns-app" }, + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, "definition": "label_values(external_dns_registry_endpoints_total{cluster_id=~\"$cluster\"},app)", "hide": 0, "includeAll": false, diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/external-secrets.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/external-secrets.json index 40560a30..c1673094 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/external-secrets.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/external-secrets.json @@ -45,7 +45,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -123,7 +123,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "builder", "expr": "etcd_kubernetes_resources_count{namespace=\"$namespace\", kind=~\".*external-secrets.*\"}", @@ -139,7 +139,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -216,7 +216,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by (name) (workqueue_depth{job=~\"$namespace/.+\"})", @@ -244,7 +244,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -321,7 +321,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum by(webhook) (controller_runtime_webhook_requests_total{namespace=\"$namespace\", webhook=~\"/validate.*\"})", @@ -337,7 +337,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -415,7 +415,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum by(webhook) (controller_runtime_webhook_latency_seconds_sum{namespace=\"$namespace\", webhook=~\"/validate.*\"})", @@ -431,7 +431,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -508,7 +508,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum by(webhook) (controller_runtime_webhook_requests_total{namespace=\"$namespace\", webhook=~\"/convert.*\"})", @@ -524,7 +524,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -603,7 +603,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum by(webhook) (controller_runtime_webhook_latency_seconds_sum{namespace=\"$namespace\", webhook=~\"/convert.*\"})", @@ -619,7 +619,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -696,7 +696,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum by(webhook) (controller_runtime_webhook_requests_in_flight{namespace=\"$namespace\"})", @@ -722,7 +722,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -799,7 +799,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum by(app) (certwatcher_read_certificate_total{namespace=\"$namespace\"})", @@ -814,7 +814,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -891,7 +891,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "builder", "expr": "sum by(app) (certwatcher_read_certificate_errors_total{namespace=\"$namespace\"})", @@ -910,6 +910,23 @@ "tags": [], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "auto": false, "auto_count": 30, diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/k8s-core-components-errors.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/k8s-core-components-errors.json index 776d2df7..043a3ac8 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/k8s-core-components-errors.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/k8s-core-components-errors.json @@ -27,6 +27,7 @@ "liveNow": false, "panels": [ { + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -97,7 +98,6 @@ }, "targets": [ { - "datasource": "default", "exemplar": true, "expr": "sum(increase(rest_client_requests_total{app=~\"kube-controller-manager|kube-proxy|kube-scheduler|kubelet\", code=~\"5..|\", cluster_id=\"$cluster_id\"}[5m])) by (app)", "hide": false, @@ -110,6 +110,7 @@ "type": "timeseries" }, { + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -180,7 +181,6 @@ }, "targets": [ { - "datasource": "default", "exemplar": true, "expr": "sum(increase(cloudprovider_azure_api_request_errors{app=~\"kube-controller-manager|kube-scheduler\", cluster_id=\"$cluster_id\"}[5m])) by (app)", "hide": false, @@ -189,7 +189,6 @@ "refId": "A" }, { - "datasource": "default", "exemplar": true, "expr": "sum(increase(cloudprovider_aws_api_request_errors{app=~\"kube-controller-manager|kube-scheduler\", cluster_id=\"$cluster_id\"}[5m])) by (app)", "hide": false, @@ -209,12 +208,33 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": true, "text": "gollum", "value": "gollum" }, + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, "definition": "label_values(rest_client_requests_total, cluster_id)", "description": "Cluster", "hide": 0, diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kube-builder.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kube-builder.json index 867818c9..ecfb0baa 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kube-builder.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kube-builder.json @@ -36,7 +36,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "gridPos": { @@ -79,7 +79,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -144,7 +144,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(increase(workqueue_queue_duration_seconds_bucket{cluster_id=~\"$cluster\", app=~\"$operator\", name=~\"$controller\"}[$__rate_interval])) by (le)", @@ -162,7 +162,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -226,7 +226,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(increase(workqueue_work_duration_seconds_bucket{cluster_id=~\"$cluster\", app=~\"$operator\", name=~\"$controller\"}[$__rate_interval])) by (le)", @@ -244,7 +244,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -329,7 +329,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(increase(workqueue_queue_duration_seconds_sum{cluster_id=~\"$cluster\", app=~\"$operator\", name=~\"$controller\"}[$__rate_interval])) by (cluster_id,app,name)", @@ -347,7 +347,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -432,7 +432,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(increase(workqueue_work_duration_seconds_sum{cluster_id=~\"$cluster\", app=~\"$operator\", name=~\"$controller\"}[$__rate_interval])) by (cluster_id,app,name)", @@ -463,7 +463,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Shows how often operators reconciliate some resources.", "fieldConfig": { @@ -546,7 +546,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(controller_runtime_reconcile_total{cluster_id=~\"$cluster\", app=~\"$operator\", controller=~\"$controller\"}[$__rate_interval])) by (cluster_id, app, controller, result)", @@ -563,7 +563,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "0% = all reconciliations work ❤️ |\n100% = no reconciliation works 💔 |\nno data = there's never been any error 🎉", "fieldConfig": { @@ -650,7 +650,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(\n rate (controller_runtime_reconcile_total{cluster_id=~\"$cluster\", app=~\"$operator\", controller=~\"$controller\", result=\"error\"}[$__rate_interval])) by (cluster_id, app, controller)\n/\nsum(\n rate (controller_runtime_reconcile_total{cluster_id=~\"$cluster\", app=~\"$operator\", controller=~\"$controller\"}[$__rate_interval])) by (cluster_id, app, controller)", @@ -677,7 +677,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Per-second rate of total reconciliation as measured over the last 5 minutes", "fieldConfig": { @@ -757,7 +757,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(controller_runtime_reconcile_total{cluster_id=~\"$cluster\", app=~\"$operator\", controller=~\"$controller\"}[5m])) by (cluster_id, app, controller)", @@ -773,7 +773,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Per-second rate of reconciliation errors as measured over the last 5 minutes", "fieldConfig": { @@ -853,7 +853,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(controller_runtime_reconcile_errors_total{cluster_id=~\"$cluster\", app=~\"$operator\", controller=~\"$controller\"}[5m])) by (cluster_id, app, controller)", @@ -886,7 +886,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Per-second rate of CPU usage as measured over the last 5 minutes", "fieldConfig": { @@ -966,7 +966,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "rate(process_cpu_seconds_total{cluster_id=~\"$cluster\", app=~\"$operator\"}[5m]) * 100", @@ -982,7 +982,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Allocated Memory for the running controller", "fieldConfig": { @@ -1062,7 +1062,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "process_resident_memory_bytes{cluster_id=~\"$cluster\", app=~\"$operator\"}", @@ -1091,7 +1091,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Seconds an item stays in workqueue before being requested.", "fieldConfig": { @@ -1171,7 +1171,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.50, sum(rate(workqueue_queue_duration_seconds_bucket{cluster_id=~\"$cluster\", app=~\"$operator\"}[5m])) by (cluster_id, app, le))", @@ -1187,7 +1187,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Seconds of processing an item from workqueue takes.", "fieldConfig": { @@ -1267,7 +1267,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.50, sum(rate(workqueue_work_duration_seconds_bucket{cluster_id=~\"$cluster\", app=~\"$operator\"}[5m])) by (cluster_id, app, le))", @@ -1283,7 +1283,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Per-second rate of items added to work queue", "fieldConfig": { @@ -1363,7 +1363,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(workqueue_adds_total{cluster_id=~\"$cluster\", app=~\"$operator\"}[5m])) by (cluster_id, app)", @@ -1379,7 +1379,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Per-second rate of retries handled by workqueue", "fieldConfig": { @@ -1459,7 +1459,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(workqueue_retries_total{cluster_id=~\"$cluster\", app=~\"$operator\"}[5m])) by (cluster_id, app)", @@ -1475,7 +1475,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "The number of active controller workers", "fieldConfig": { @@ -1526,7 +1526,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -1543,7 +1543,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Current depth of workqueue", "fieldConfig": { @@ -1594,7 +1594,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -1611,7 +1611,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "How many seconds of work has done that is in progress and hasn’t been observed by work_duration.", "fieldConfig": { @@ -1662,7 +1662,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -1684,6 +1684,24 @@ ], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": false, @@ -1692,7 +1710,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(controller_runtime_reconcile_total,cluster_id)", "hide": 0, @@ -1723,7 +1741,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(controller_runtime_reconcile_total{cluster_id=~\"$cluster\"},app)", "hide": 0, @@ -1754,7 +1772,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(controller_runtime_reconcile_total{cluster_id=~\"$cluster\", app=~\"$operator\"},controller)", "hide": 0, diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kubernetes-api-uptime.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kubernetes-api-uptime.json index 2e0d854b..377ead4b 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kubernetes-api-uptime.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kubernetes-api-uptime.json @@ -20,7 +20,7 @@ "panels": [ { "columns": [], - "datasource": "default", + "datasource": "$datasource", "description": "Workload clusters Kubernetes API uptime for the last 7 days", "fontSize": "100%", "gridPos": { @@ -110,7 +110,7 @@ "bars": true, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Kubernetes API downtime for last week", "fill": 3, "gridPos": { @@ -205,7 +205,22 @@ "topic:workload-cluster" ], "templating": { - "list": [] + "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "label": "Data source", + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "type": "datasource" + } + ] }, "time": { "from": "now-6h", diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kubernetes.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kubernetes.json index 572a750d..8ee7e15c 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kubernetes.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kubernetes.json @@ -63,7 +63,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "default", + "datasource": "$datasource", "description": "Memory used by containers, in comparision to the memory available on machines", "editable": true, "error": false, @@ -151,7 +151,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "default", + "datasource": "$datasource", "decimals": null, "description": "CPU used by containers in comparison to the amount of CPU cores available in machines", "editable": true, @@ -239,7 +239,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "default", + "datasource": "$datasource", "decimals": null, "description": "Disk space used by containers as a share of all avalable disk space", "editable": true, @@ -329,7 +329,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "default", + "datasource": "$datasource", "decimals": null, "editable": true, "error": false, @@ -416,7 +416,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "default", + "datasource": "$datasource", "decimals": null, "editable": true, "error": false, @@ -503,7 +503,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "default", + "datasource": "$datasource", "decimals": null, "editable": true, "error": false, @@ -590,7 +590,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "default", + "datasource": "$datasource", "decimals": null, "editable": true, "error": false, @@ -677,7 +677,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "default", + "datasource": "$datasource", "decimals": null, "editable": true, "error": false, @@ -764,7 +764,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "default", + "datasource": "$datasource", "decimals": null, "editable": true, "error": false, @@ -857,7 +857,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 3, "description": "The CPU usage of individual pods, in percentage of 1 core", "editable": true, @@ -972,7 +972,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 3, "editable": true, "error": false, @@ -1085,7 +1085,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 3, "description": "CPU usage on a container level", "editable": true, @@ -1213,7 +1213,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 3, "editable": true, "error": false, @@ -1325,7 +1325,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 2, "editable": true, "error": false, @@ -1437,7 +1437,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 2, "editable": true, "error": false, @@ -1549,7 +1549,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 2, "editable": true, "error": false, @@ -1681,7 +1681,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 2, "editable": true, "error": false, @@ -1793,7 +1793,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 2, "description": "Sum of all network transfer from and to containers", "editable": true, @@ -1919,7 +1919,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 2, "editable": true, "error": false, @@ -2041,7 +2041,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 2, "editable": true, "error": false, @@ -2209,7 +2209,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 2, "editable": true, "error": false, @@ -2328,13 +2328,33 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": { "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, "hide": 0, "includeAll": false, "label": "Cluster", @@ -2357,7 +2377,10 @@ "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, "hide": 0, "includeAll": true, "label": "Instance", diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kyverno-health.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kyverno-health.json index db52a1de..8b2a375e 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kyverno-health.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kyverno-health.json @@ -23,7 +23,8 @@ "panels": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -100,7 +101,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "expr": "aggregation:kyverno_resource_counts{cluster_id=\"$cluster\"}", @@ -115,7 +117,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -164,7 +167,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "expr": "avg(kube_deployment_spec_replicas{cluster_id=\"$cluster\", deployment=~\"kyverno|kyverno-admission-controller\"})", @@ -179,7 +183,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -232,7 +237,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -249,7 +255,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -302,7 +309,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -319,7 +327,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -368,7 +377,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -398,7 +408,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -475,7 +486,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(kyverno_admission_review_duration_seconds_sum{cluster_id=\"$cluster\"}[5m])) by (resource_request_operation) / sum(rate(kyverno_admission_review_duration_seconds_count{cluster_id=\"$cluster\"}[5m])) by (resource_request_operation)", @@ -489,7 +501,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -566,7 +579,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(kyverno_admission_review_duration_seconds_sum{cluster_id=\"$cluster\"}[5m])) by (resource_kind) / sum(rate(kyverno_admission_review_duration_seconds_count{cluster_id=\"$cluster\"}[5m])) by (resource_kind)", @@ -593,7 +607,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -670,7 +685,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(kyverno_policy_execution_duration_seconds_sum{cluster_id=\"$cluster\"}[5m])) by (policy_name) / sum(rate(kyverno_policy_execution_duration_seconds_count{cluster_id=\"$cluster\"}[5m])) by (policy_name)", @@ -685,7 +701,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -758,7 +775,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(sum(increase(kyverno_policy_results_total{rule_result=\"fail\", cluster_id=\"$cluster\"}[5m])) by (policy_name, policy_type)) by (policy_type)", @@ -772,7 +790,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -818,7 +837,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "expr": "count(count(kyverno_policy_rule_info_total{cluster_id=\"$cluster\"}==1) by (policy_name, policy_type)) by (policy_type)", @@ -846,7 +866,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -922,7 +943,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(increase(kyverno_admission_requests_total{cluster_id=\"$cluster\"}[5m])) by (resource_request_operation)", @@ -936,7 +958,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1012,7 +1035,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(increase(kyverno_admission_requests_total{cluster_id=\"$cluster\"}[5m])) by (resource_kind)", @@ -1026,7 +1050,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1075,7 +1100,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(increase(kyverno_admission_requests_total{cluster_id=\"$cluster\"}[24h]))", @@ -1090,7 +1116,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1165,7 +1192,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -1181,7 +1209,8 @@ }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1257,7 +1286,8 @@ "targets": [ { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -1281,9 +1311,27 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "$datasource" }, "definition": "label_values(etcd_kubernetes_resources_count,cluster_id)", "hide": 0, diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/linkerd-control-plane.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/linkerd-control-plane.json index c08d02cb..52f3fc2f 100644 --- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/linkerd-control-plane.json +++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/linkerd-control-plane.json @@ -25,7 +25,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 2, @@ -49,7 +49,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -60,7 +60,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -143,7 +143,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "process_virtual_memory_bytes{cluster_id=\"$cluster\", job=\"linkerd/linkerd-proxy\"}", @@ -156,7 +156,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "process_resident_memory_bytes{cluster_id=\"$cluster\", job=\"linkerd/linkerd-proxy\"}", @@ -173,7 +173,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -256,7 +256,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(process_cpu_seconds_total{cluster_id=\"$cluster\", job=\"linkerd/linkerd-proxy\"}[$__rate_interval])) by (namespace, pod)", @@ -273,7 +273,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -356,7 +356,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "process_open_fds{cluster_id=\"$cluster\", job=\"linkerd/linkerd-proxy\"}", @@ -373,7 +373,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 2, @@ -397,7 +397,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -408,7 +408,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -491,7 +491,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(response_total{cluster_id=\"$cluster\", classification=\"success\", deployment!=\"\", namespace=~\"$namespace|$namespace-viz\", direction=\"inbound\"}[$__rate_interval])) by (pod) / sum(irate(response_total{cluster_id=\"$cluster\", deployment!=\"\", namespace=~\"$namespace|$namespace-viz\", direction=\"inbound\"}[$__rate_interval])) by (pod)", @@ -508,7 +508,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -591,7 +591,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(irate(request_total{cluster_id=\"$cluster\",deployment!=\"\", namespace=~\"$namespace|$namespace-viz\", direction=\"inbound\"}[$__rate_interval])) by (pod)", @@ -608,7 +608,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -691,7 +691,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.95, sum(rate(response_latency_ms_bucket{cluster_id=\"$cluster\", deployment!=\"\", namespace=~\"$namespace|$namespace-viz\", direction=\"inbound\"}[$__rate_interval])) by (le, pod))", @@ -713,6 +713,24 @@ ], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": false, @@ -721,7 +739,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kubernetes_build_info,cluster_id)", "hide": 0, @@ -750,10 +768,10 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "", - "hide": 2, + "hide": 0, "includeAll": true, "label": "Deployment", "multi": false, @@ -778,10 +796,10 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "", - "hide": 2, + "hide": 0, "includeAll": true, "label": "Component", "multi": false, @@ -806,7 +824,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "", "hide": 0, @@ -834,7 +852,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "", "hide": 0, diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-falco.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-falco.json index 9c97380e..216dd6db 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-falco.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-falco.json @@ -331,7 +331,7 @@ }, "hide": 0, "includeAll": false, - "label": "Datasource", + "label": "Data source", "multi": false, "name": "datasource", "options": [], diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-kubernetes.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-kubernetes.json index 3ba17b82..4d1f0833 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-kubernetes.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-kubernetes.json @@ -29,7 +29,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "Number of pods being able to be scheduled per node.", "editable": true, @@ -125,7 +125,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "Number of pods restarting within the Kubernetes cluster.", "fill": 8, @@ -217,7 +217,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 2, "description": "Error rates of the Kubernetes apiserver grouped by request verb. Note that the graph's values are stacked to have a better idea about the overall error rate within the Kubernetes cluster.", "editable": true, @@ -318,7 +318,26 @@ "owner:team-honeybadger" ], "templating": { - "list": [] + "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + } + ] }, "time": { "from": "now-15m", diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-overview.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-overview.json index 829352e1..c6a7878f 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-overview.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-overview.json @@ -41,7 +41,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -116,6 +116,7 @@ }, { "columns": [], + "datasource": "$datasource", "fontSize": "100%", "gridPos": { "h": 12, @@ -180,6 +181,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -259,6 +261,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -338,6 +341,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -417,6 +421,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], + "datasource": "$datasource", "format": "decgbytes", "gauge": { "maxValue": 100, @@ -496,6 +501,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], + "datasource": "$datasource", "format": "decgbytes", "gauge": { "maxValue": 100, @@ -575,6 +581,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], + "datasource": "$datasource", "format": "decgbytes", "gauge": { "maxValue": 100, @@ -663,6 +670,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 1, "gridPos": { "h": 9, @@ -755,6 +763,7 @@ "dashLength": 10, "dashes": false, "decimals": null, + "datasource": "$datasource", "fill": 1, "gridPos": { "h": 10, @@ -850,7 +859,28 @@ "templating": { "list": [ { - "datasource": "default", + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, + { + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, "filters": [ { "key": "label_app", diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-starboard.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-starboard.json index 892c4b02..139173ce 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-starboard.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/management-cluster-starboard.json @@ -696,7 +696,7 @@ }, "hide": 0, "includeAll": false, - "label": "Datasource", + "label": "Data source", "multi": false, "name": "datasource", "options": [], diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-overview.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-overview.json index 66273c06..16e45288 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-overview.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-overview.json @@ -38,7 +38,7 @@ "panels": [ { "content": "The 'Status' panel shows an overview on the cluster health over the time.\nTo investigate failures, see a specific dashboard:\n\n- Writes\n- Reads\n- Rule evaluations\n- Alerting notifications\n- Object storage\n", - "datasource": null, + "datasource": "$datasource", "description": "", "id": 1, "mode": "markdown", @@ -186,7 +186,7 @@ "panels": [ { "content": "These panels show an overview on the write path. \nTo examine the write path in detail, see a specific dashboard:\n\n- Writes\n- Writes resources\n- Writes networking\n- Overview resources\n- Overview networking\n", - "datasource": null, + "datasource": "$datasource", "description": "", "id": 4, "mode": "markdown", @@ -508,7 +508,7 @@ "panels": [ { "content": "These panels show an overview on the read path. \nTo examine the read path in detail, see a specific dashboard:\n\n- Reads\n- Reads resources\n- Reads networking\n- Overview resources\n- Overview networking\n- Queries\n- Compactor\n", - "datasource": null, + "datasource": "$datasource", "description": "", "id": 8, "mode": "markdown", @@ -1039,7 +1039,7 @@ "panels": [ { "content": "These panels show an overview on the recording and alerting rules evaluation.\nTo examine the rules evaluation and alerts notifications in detail, see a specific dashboard:\n\n- Ruler\n- Alertmanager\n- Alertmanager resources\n- Overview resources\n- Overview networking\n", - "datasource": null, + "datasource": "$datasource", "description": "", "id": 12, "mode": "markdown", @@ -1286,7 +1286,7 @@ "panels": [ { "content": "These panels show an overview on the long-term storage (object storage).\nTo examine the storage in detail, see a specific dashboard:\n\n- Object store\n- Compactor\n", - "datasource": null, + "datasource": "$datasource", "description": "", "id": 16, "mode": "markdown", @@ -1650,4 +1650,4 @@ "title": "Mimir / Overview", "uid": "ffcd83628d7d4b5a03d1cafd159e6c9c", "version": 0 - } \ No newline at end of file + } diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-queries.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-queries.json index 72a2e5d0..7f878d64 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-queries.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-queries.json @@ -2536,4 +2536,4 @@ "title": "Mimir / Queries", "uid": "b3abe8d5c040395cc36615cb4334c92d", "version": 0 - } \ No newline at end of file + } diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-reads.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-reads.json index 41d181f9..ee6b942a 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-reads.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-reads.json @@ -38,7 +38,7 @@ "panels": [ { "content": "

\n This dashboard shows health metrics for the read path.\n It is broken into sections for each service on the read path, and organized by the order in which the read request flows.\n
\n Incoming queries travel from the gateway → query frontend → query scheduler → querier → ingester and/or store-gateway (depending on the time range of the query).\n
\n For each service, there are 3 panels showing (1) requests per second to that service, (2) average, median, and p99 latency of requests to that service, and (3) p99 latency of requests to each instance of that service.\n

\n

\n The dashboard also shows metrics for the 4 optional caches that can be deployed:\n the query results cache, the metadata cache, the chunks cache, and the index cache.\n
\n These panels will show “no data” if the caches are not deployed.\n

\n

\n Lastly, it also includes metrics for how the ingester and store-gateway interact with object storage.\n

\n", - "datasource": null, + "datasource": "$datasource", "description": "", "id": 1, "mode": "markdown", @@ -4518,4 +4518,4 @@ "title": "Mimir / Reads", "uid": "e327503188913dc38ad571c647eef643", "version": 0 - } \ No newline at end of file + } diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-remote-ruler-reads.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-remote-ruler-reads.json index 367ce16e..fd03b928 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-remote-ruler-reads.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-remote-ruler-reads.json @@ -38,7 +38,7 @@ "panels": [ { "content": "

\n This dashboard shows health metrics for the ruler read path when remote operational mode is enabled.\n It is broken into sections for each service on the ruler read path, and organized by the order in which the read request flows.\n
\n For each service, there are three panels showing (1) requests per second to that service, (2) average, median, and p99 latency of requests to that service, and (3) p99 latency of requests to each instance of that service.\n

\n", - "datasource": null, + "datasource": "$datasource", "description": "", "id": 1, "mode": "markdown", @@ -1354,4 +1354,4 @@ "title": "Mimir / Remote ruler reads", "uid": "f103238f7f5ab2f1345ce650cbfbfe2f", "version": 0 - } \ No newline at end of file + } diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-tenants.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-tenants.json index aea571ba..a4940580 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-tenants.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-tenants.json @@ -38,7 +38,7 @@ "panels": [ { "content": "

\n This dashboard shows various metrics detailed by tenant (user) selected above.\n

\n", - "datasource": null, + "datasource": "$datasource", "description": "", "id": 1, "mode": "markdown", @@ -2674,4 +2674,4 @@ "title": "Mimir / Tenants", "uid": "35fa247ce651ba189debf33d7ae41611", "version": 0 - } \ No newline at end of file + } diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-top-tenants.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-top-tenants.json index 17944fa1..34db05ba 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-top-tenants.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-top-tenants.json @@ -38,7 +38,7 @@ "panels": [ { "content": "

\n This dashboard shows the top tenants based on multiple selection criterias.\n Rows are collapsed by default to avoid querying all of them.\n Use the templating variable \"limit\" above to select the amount of users to be shown.\n

\n", - "datasource": null, + "datasource": "$datasource", "description": "", "id": 1, "mode": "markdown", @@ -1739,4 +1739,4 @@ "title": "Mimir / Top tenants", "uid": "bc6e12d4fe540e4a1785b9d3ca0ffdd9", "version": 0 - } \ No newline at end of file + } diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-writes.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-writes.json index 5c2ab143..d9a6f163 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-writes.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/mimir-writes.json @@ -38,7 +38,7 @@ "panels": [ { "content": "

\n This dashboard shows various health metrics for the write path.\n It is broken into sections for each service on the write path,\n and organized by the order in which the write request flows.\n
\n Incoming metrics data travels from the gateway → distributor → ingester.\n
\n For each service, there are 3 panels showing\n (1) requests per second to that service,\n (2) average, median, and p99 latency of requests to that service, and\n (3) p99 latency of requests to each instance of that service.\n

\n

\n It also includes metrics for the key-value (KV) stores used to manage\n the high-availability tracker and the ingesters.\n

\n", - "datasource": null, + "datasource": "$datasource", "description": "", "id": 1, "mode": "markdown", @@ -2985,4 +2985,4 @@ "title": "Mimir / Writes", "uid": "8280707b8f16e7b87b840fc1cc92d4c5", "version": 0 - } \ No newline at end of file + } diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/net-exporter.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/net-exporter.json index 9096ae33..766ffc8f 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/net-exporter.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/net-exporter.json @@ -20,7 +20,7 @@ "links": [], "panels": [ { - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -36,7 +36,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fill": 0, "fillGradient": 0, "gridPos": { @@ -121,7 +121,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fill": 0, "fillGradient": 0, "gridPos": { @@ -203,7 +203,7 @@ }, { "collapsed": false, - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -220,7 +220,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fill": 0, "fillGradient": 0, "gridPos": { @@ -315,7 +315,7 @@ }, { "collapsed": false, - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -332,7 +332,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fill": 0, "fillGradient": 0, "gridPos": { @@ -430,7 +430,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fill": 0, "fillGradient": 0, "gridPos": { @@ -534,13 +534,31 @@ ], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": { "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "definition": "label_values(kubernetes_build_info, cluster_id)", "hide": 0, "includeAll": false, diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/network-anomaly-detection.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/network-anomaly-detection.json index 17e326a3..1081d00d 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/network-anomaly-detection.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/network-anomaly-detection.json @@ -21,6 +21,7 @@ "panels": [ { "collapsed": false, + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -45,6 +46,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 9, @@ -137,6 +139,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 9, @@ -228,6 +231,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 9, @@ -319,6 +323,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 9, @@ -411,6 +416,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 9, @@ -500,6 +506,7 @@ }, { "collapsed": false, + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -526,6 +533,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 9, @@ -621,6 +629,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 9, @@ -715,6 +724,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 9, @@ -809,6 +819,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 9, @@ -904,6 +915,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 9, @@ -1004,13 +1016,31 @@ ], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": { "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "definition": "label_values(node_network_transmit_bytes_total, cluster_id)", "hide": 0, "includeAll": false, @@ -1036,7 +1066,7 @@ "text": "eth0", "value": "eth0" }, - "datasource": "default", + "datasource": "$datasource", "definition": "label_values(node_network_receive_bytes_total, device)", "hide": 0, "includeAll": false, diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/network.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/network.json index aac6392b..3b7d5e6e 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/network.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/network.json @@ -39,6 +39,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 12, @@ -152,6 +153,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "fill": 0, "gridPos": { "h": 12, @@ -307,6 +309,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "decimals": 1, "fill": 0, "gridPos": { @@ -398,6 +401,7 @@ "bars": false, "dashLength": 10, "dashes": false, + "datasource": "$datasource", "decimals": 1, "fill": 0, "gridPos": { @@ -527,7 +531,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "The rate of errors raised checking network latency.", "fill": 0, "gridPos": { @@ -611,7 +615,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "The rate of errors raised checking DNS latency.", "fill": 0, "gridPos": { @@ -705,13 +709,30 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": { "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "definition": "", "hide": 0, "includeAll": false, @@ -737,7 +758,7 @@ "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "definition": "label_values(dns_udp_latency_seconds_bucket, host)", "hide": 0, "includeAll": true, diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/nginx-admission.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/nginx-admission.json index 696557a3..ea7cf333 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/nginx-admission.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/nginx-admission.json @@ -25,7 +25,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -103,7 +103,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(nginx_ingress_controller_admission_tested_duration{cluster_id=\"$cluster\"}) by (pod) ", @@ -118,7 +118,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -195,7 +195,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "irate(nginx_ingress_controller_admission_tested_ingresses{cluster_id=\"$cluster\"}[2m])", @@ -210,7 +210,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -287,7 +287,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "avg(nginx_ingress_controller_admission_render_ingresses{cluster_id=\"$cluster\"})", @@ -344,12 +344,30 @@ "tags": [], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": true, "text": "", "value": "" }, + "datasource": "$datasource", "definition": "label_values(kubernetes_build_info{},cluster_id)", "hide": 0, "includeAll": false, diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/nginx-connection-distribution.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/nginx-connection-distribution.json index 4addc663..491192d8 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/nginx-connection-distribution.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/nginx-connection-distribution.json @@ -24,7 +24,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -103,7 +103,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "nginx_ingress_controller_nginx_process_connections{cluster_id=\"$cluster\",controller_namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",state=\"active\"}", "refId": "Active Connections by Pod" @@ -115,7 +115,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -194,7 +194,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum by (node) (nginx_ingress_controller_nginx_process_connections{cluster_id=\"$cluster\",controller_namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",state=\"active\"})", "refId": "Active Connections by Node" @@ -206,7 +206,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -285,7 +285,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum by (zone) (nginx_ingress_controller_nginx_process_connections{cluster_id=\"$cluster\",controller_namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",state=\"active\"} * on (node) group_left(zone) kube_node_labels{cluster_id=\"$cluster\"})", "refId": "Active Connections by Zone" @@ -304,6 +304,24 @@ ], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": true, @@ -312,7 +330,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "", "hide": 0, @@ -340,7 +358,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "", "hide": 0, @@ -368,7 +386,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "", "hide": 0, @@ -396,7 +414,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "", "hide": 0, @@ -424,7 +442,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "", "hide": 0, diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/node-utilization.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/node-utilization.json index 9ee4ff6d..28c88327 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/node-utilization.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/node-utilization.json @@ -1722,9 +1722,8 @@ "list": [ { "current": { - "selected": false, - "text": "Prometheus", - "value": "PBFA97CFB590B2093" + "text": "default", + "value": "default" }, "description": "Select the data source to use for all queries", "hide": 0, diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/persistentvolume.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/persistentvolume.json index c31db1ce..e84c53ff 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/persistentvolume.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/persistentvolume.json @@ -30,7 +30,7 @@ "collapsed": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -44,7 +44,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -535,7 +535,7 @@ "collapsed": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -549,7 +549,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -560,7 +560,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -811,7 +811,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": " sum by (persistentvolumeclaim,storageclass,volumename,cluster_id,namespace) (kube_persistentvolumeclaim_info{namespace=~\"${namespace}\",cluster_id=~\"${cluster_id}\"})", @@ -824,7 +824,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by (persistentvolumeclaim) (kubelet_volume_stats_capacity_bytes{namespace=~\"${namespace}\",cluster_id=~\"${cluster_id}\"}/1024/1024/1024)", @@ -837,7 +837,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by (persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace=~\"${namespace}\",cluster_id=~\"${cluster_id}\"}/1024/1024/1024)", @@ -850,7 +850,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by (persistentvolumeclaim) (kubelet_volume_stats_available_bytes{namespace=~\"${namespace}\",cluster_id=~\"${cluster_id}\"}/1024/1024/1024)", @@ -863,7 +863,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(kube_persistentvolumeclaim_status_phase{namespace=~\"${namespace}\",cluster_id=~\"${cluster_id}\",phase=~\"(Pending|Lost)\"}) by (persistentvolumeclaim) + sum(kube_persistentvolumeclaim_status_phase{namespace=~\"${namespace}\",cluster_id=~\"${cluster_id}\",phase=~\"(Lost)\"}) by (persistentvolumeclaim)", @@ -876,7 +876,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by (persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace=~\"${namespace}\",cluster_id=~\"${cluster_id}\"}/kubelet_volume_stats_capacity_bytes{namespace=~\"${namespace}\",cluster_id=~\"${cluster_id}\"} * 100)", @@ -935,7 +935,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -990,7 +990,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "kube_storageclass_info", "format": "table", @@ -1070,7 +1070,7 @@ "collapsed": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -1084,7 +1084,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -1095,7 +1095,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1181,7 +1181,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "(max by (persistentvolumeclaim,cluster_id,namespace) (kubelet_volume_stats_used_bytes{cluster_id=\"${cluster_id}\",namespace=~\"${namespace}\"}))", @@ -1198,7 +1198,7 @@ "collapsed": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -1212,7 +1212,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -1223,7 +1223,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1306,7 +1306,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "rate(kubelet_volume_stats_used_bytes{cluster_id=\"${cluster_id}\",namespace=~\"${namespace}\"}[1h])", @@ -1322,7 +1322,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1405,7 +1405,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "rate(kubelet_volume_stats_used_bytes{cluster_id=\"${cluster_id}\",namespace=~\"${namespace}\"}[1d])", @@ -1421,7 +1421,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1504,7 +1504,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "rate(kubelet_volume_stats_used_bytes{cluster_id=\"${cluster_id}\",namespace=~\"${namespace}\"}[1w])", @@ -1525,6 +1525,24 @@ ], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": false, @@ -1587,32 +1605,13 @@ "type": "query", "useTags": false }, - { - "current": { - "selected": false, - "text": "Prometheus", - "value": "PBFA97CFB590B2093" - }, - "hide": 0, - "includeAll": false, - "label": "Datasource", - "multi": false, - "name": "datasource", - "options": [], - "query": "prometheus", - "queryValue": "", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "type": "datasource" - }, { "current": { "selected": false, "text": "80", "value": "80" }, - "hide": 2, + "hide": 0, "label": "PVC % Used Warning Threshold", "name": "warning_threshold", "options": [ diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/zot.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/zot.json index b5f09ba5..17dffc33 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/zot.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/zot.json @@ -3370,21 +3370,16 @@ "list": [ { "current": { - "selected": false, - "text": "Mimir", - "value": "mimir" + "text": "default", + "value": "default" }, - "description": "Please select a Prometheus-compatible data soure", "hide": 0, - "includeAll": false, "label": "Data source", - "multi": false, "name": "datasource", "options": [], "query": "prometheus", "refresh": 1, "regex": "", - "skipUrlSync": false, "type": "datasource" }, { @@ -3403,7 +3398,7 @@ }, "definition": "label_values(zot_http_method_latency_seconds_bucket,method)", "description": "zot_http_method_latency_seconds_bucket method", - "hide": 2, + "hide": 0, "includeAll": true, "multi": true, "name": "http_method", @@ -3434,7 +3429,7 @@ }, "definition": "label_values(zot_scheduler_workers_tasks_duration_seconds_bucket,name)", "description": "zot_http_method_latency_seconds_bucket method", - "hide": 2, + "hide": 0, "includeAll": true, "multi": true, "name": "scheduler_workers_tasks_duration", @@ -3465,7 +3460,7 @@ }, "definition": "label_values(zot_storage_lock_latency_seconds_bucket,storageName)", "description": "zot_storage_lock_latency_seconds_bucket", - "hide": 2, + "hide": 0, "includeAll": true, "multi": true, "name": "storageName", @@ -3524,7 +3519,7 @@ }, "definition": "label_values(kube_persistentvolumeclaim_info{cluster_type=\"management_cluster\", namespace=\"zot\"},persistentvolumeclaim)", "description": "Name of the PersistentVolumeClaim for the container image storage", - "hide": 2, + "hide": 0, "includeAll": false, "multi": false, "name": "zot_pvc_name", diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/alertmanager-overview.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/alertmanager-overview.json index f2dd35d2..9dbd6af8 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/alertmanager-overview.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/alertmanager-overview.json @@ -560,7 +560,7 @@ "uid": "$datasource" }, "definition": "", - "hide": 2, + "hide": 0, "includeAll": true, "multi": false, "name": "integration", diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/api-audit.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/api-audit.json index 17299b2c..ab314375 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/api-audit.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/api-audit.json @@ -157,42 +157,6 @@ "title": "Total requests by User", "type": "timeseries" }, - { - "datasource": { - "uid": "$datasource" - }, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 12 - }, - "id": 35, - "options": { - "analyticsOptions": { - "dashboard": "$__dashboard", - "flatten": false, - "heartbeatAlways": false, - "heartbeatInterval": 60, - "postEnd": false, - "postHeartbeat": false, - "postStart": true, - "server": "/analytics-plugin/write", - "showDetails": false - } - }, - "targets": [ - { - "datasource": { - "uid": "$datasource" - }, - "refId": "A" - } - ], - "title": " ", - "transparent": true, - "type": "macropower-analytics-panel" - }, { "datasource": { "uid": "$datasource" @@ -597,8 +561,9 @@ "text": "default", "value": "default" }, - "hide": 2, + "hide": 0, "includeAll": false, + "label": "Data source", "multi": false, "name": "datasource", "options": [], diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/apiserver.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/apiserver.json index 89b00914..31f510e5 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/apiserver.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/apiserver.json @@ -50,7 +50,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -1233,7 +1233,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1312,7 +1312,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "avg(container_memory_usage_bytes{cluster_id=\"$cluster\", container=~\"(k8s-api-server|kube-apiserver)\", namespace=\"kube-system\", pod=~\"(k8s-api-server|kube-apiserver).*\"}) by (instance)", @@ -1519,7 +1519,7 @@ }, "hide": 0, "includeAll": false, - "label": "Data Source", + "label": "Data source", "multi": false, "name": "datasource", "options": [], diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/capi-overview.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/capi-overview.json index 01ab72b2..a560eb2b 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/capi-overview.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/capi-overview.json @@ -32,7 +32,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -80,7 +80,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(capi_cluster_info)", @@ -95,7 +95,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -171,7 +171,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -197,7 +197,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -277,7 +277,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "count(capi_machine_status_condition{type=\"Ready\",status=\"True\",name!~\".*bastion.*\"} == 1)", @@ -288,7 +288,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "count(capi_machine_status_condition{type!=\"Ready\",status=~\"False|Unknown\",name!~\".*bastion.*\"} == 1) * -1", @@ -314,7 +314,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -387,7 +387,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -413,7 +413,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -495,7 +495,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "count(capi_machine_info{control_plane_name!=\"\",cluster_name=\"${cluster_name:string}\"}) by (version)", @@ -527,7 +527,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -603,7 +603,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -629,7 +629,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "fieldConfig": { @@ -705,7 +705,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -731,7 +731,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -813,7 +813,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "count(capi_machine_info{control_plane_name=\"\",cluster_name=\"${cluster_name:string}\"}) by (version)", @@ -832,6 +832,24 @@ "tags": [], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": true, @@ -844,12 +862,12 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(capi_cluster_info,name)", "hide": 1, "includeAll": true, - "label": "cluster_name", + "label": "Cluster", "multi": true, "name": "cluster_name", "options": [], diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/cilium-performance.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/cilium-performance.json index 2e9e28ab..3e307a8b 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/cilium-performance.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/cilium-performance.json @@ -25,7 +25,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "", "gridPos": { @@ -64,7 +64,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -144,7 +144,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "count(kube_pod_created{cluster_id=\"$cluster_id\"})", @@ -173,7 +173,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -253,7 +253,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(cilium_endpoint_state{cluster_id=\"$cluster_id\", pod=~\"$pod\"}) by (endpoint_state)", @@ -268,7 +268,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -348,7 +348,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(cilium_endpoint{cluster_id=\"$cluster_id\", pod=~\"$pod\"})", @@ -364,7 +364,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -444,7 +444,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(cilium_endpoint_regenerations_total{cluster_id=\"$cluster_id\",pod=~\"$pod\"}[2m])) by(outcome)", @@ -473,7 +473,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -553,7 +553,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(cilium_identity{cluster_id=\"$cluster_id\", pod=~\"$pod\"}) by (type)", @@ -582,7 +582,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -662,7 +662,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "min(irate(cilium_process_cpu_seconds_total{cluster_id=\"$cluster_id\",pod=~\"$pod\"}[5m])) by (pod) * 100", @@ -691,7 +691,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -771,7 +771,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(etcd_kubernetes_events_count{cluster_id=\"$cluster_id\",reason=\"FailedCreatePodSandBox\"}[5m])) by (node)", @@ -800,7 +800,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -880,7 +880,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "avg(rate(cilium_agent_api_process_time_seconds_sum{cluster_id=\"$cluster_id\",pod=~\"$pod\"}[5m])/rate(cilium_agent_api_process_time_seconds_count{cluster_id=\"$cluster_id\",pod=~\"$pod\"}[5m]) > 50) by (pod, method, path)", @@ -896,7 +896,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -976,7 +976,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "avg(histogram_quantile(0.99, rate(cilium_endpoint_regeneration_time_stats_seconds_bucket{cluster_id=\"$cluster_id\",scope!=\"total\", pod=~\"$pod\"}[5m]))) by (scope)", @@ -995,6 +995,24 @@ "tags": [], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": false, @@ -1003,7 +1021,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(cilium_version,cluster_id)", "hide": 0, @@ -1030,7 +1048,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(cilium_version{cluster_id=\"$cluster_id\"},pod)", "hide": 0, diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/dex.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/dex.json index 19151aaa..6fecfaef 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/dex.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/dex.json @@ -103,6 +103,7 @@ "type": "stat" }, { + "datasource": "$datasource", "description": "Successful dex responses in the last 5 minutes.", "fieldConfig": { "defaults": { @@ -210,7 +211,7 @@ "pluginVersion": "8.0.3", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "exemplar": true, "expr": "sum (increase(http_requests_total{cluster_id=\"$cluster\",organization=~\"$organization\",app=\"dex\", code=~\"^[1]..$|[2]..$|^[3]..$\",handler!=\"/healthz\"}[5m]))by (code)", "format": "time_series", @@ -220,7 +221,7 @@ "refId": "A" }, { - "datasource": "default", + "datasource": "$datasource", "expr": "health", "format": "time_series", "intervalFactor": 1, @@ -231,6 +232,7 @@ "type": "timeseries" }, { + "datasource": "$datasource", "description": "Number of dex error responses in the last 5 minutes. Displays the average value in the selected time window.", "fieldConfig": { "defaults": { @@ -407,6 +409,7 @@ "type": "timeseries" }, { + "datasource": "$datasource", "description": "Excluding health checks to /healthz", "fieldConfig": { "defaults": { @@ -490,7 +493,7 @@ "pluginVersion": "8.0.3", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "exemplar": true, "expr": "sum(increase(http_requests_total{cluster_id=\"$cluster\",organization=~\"$organization\",app=\"dex\",handler!=\"/healthz\"}[2m])) by (handler, method, code)", "format": "time_series", @@ -521,9 +524,9 @@ "text": "default", "value": "default" }, - "hide": 2, + "hide": 0, "includeAll": false, - "label": null, + "label": "Data source", "multi": false, "name": "datasource", "options": [], @@ -568,6 +571,7 @@ "text": "talos", "value": "talos" }, + "datasource": "$datasource", "definition": "label_values(http_requests_total{app=\"dex\", organization=\"$organization\"}, cluster_id)", "hide": 0, "includeAll": false, diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/flux-cluster.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/flux-cluster.json index abd000e7..5878a898 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/flux-cluster.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/flux-cluster.json @@ -849,9 +849,9 @@ "text": "default", "value": "default" }, - "hide": 2, + "hide": 0, "includeAll": false, - "label": null, + "label": "Data source", "multi": false, "name": "datasource", "options": [], diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/flux-control-plane.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/flux-control-plane.json index 7e1323bf..a369f2d1 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/flux-control-plane.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/flux-control-plane.json @@ -1472,8 +1472,9 @@ "text": "default", "value": "default" }, - "hide": 2, + "hide": 0, "includeAll": false, + "label": "Data source", "multi": false, "name": "datasource", "options": [], diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/keda.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/keda.json index dd259eed..8f91a138 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/keda.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/keda.json @@ -868,17 +868,16 @@ "list": [ { "current": { - "selected": false, - "text": "Prometheus", - "value": "Prometheus" + "text": "default", + "value": "default" }, "hide": 0, "includeAll": false, + "label": "Data source", "multi": false, "name": "datasource", "options": [], "query": "prometheus", - "queryValue": "", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -894,9 +893,7 @@ "$__all" ] }, - "datasource": { - "type": "prometheus" - }, + "datasource": "$datasource", "definition": "label_values(keda_scaler_active, cluster_id)", "hide": 0, "includeAll": true, @@ -919,10 +916,7 @@ "text": "bhe-test", "value": "bhe-test" }, - "datasource": { - "type": "prometheus", - "uid": "$datasource" - }, + "datasource": "$datasource", "definition": "label_values(keda_scaler_active{cluster_id=\"$cluster\"},exported_namespace)", "hide": 0, "includeAll": false, @@ -945,10 +939,7 @@ "text": "All", "value": "$__all" }, - "datasource": { - "type": "prometheus", - "uid": "$datasource" - }, + "datasource": "$datasource", "definition": "label_values(keda_scaler_active{cluster_id=\"$cluster\", exported_namespace=\"$namespace\"},scaledObject)", "hide": 0, "includeAll": true, @@ -971,10 +962,7 @@ "text": "cronScaler", "value": "cronScaler" }, - "datasource": { - "type": "prometheus", - "uid": "$datasource" - }, + "datasource": "$datasource", "definition": "label_values(keda_scaler_active{cluster_id=\"$cluster\", exported_namespace=\"$namespace\"},scaler)", "hide": 0, "includeAll": false, @@ -997,10 +985,7 @@ "text": "s0-cron-Etc-UTC-40xxxx-55xxxx", "value": "s0-cron-Etc-UTC-40xxxx-55xxxx" }, - "datasource": { - "type": "prometheus", - "uid": "$datasource" - }, + "datasource": "$datasource", "definition": "label_values(keda_scaler_active{cluster_id=\"$cluster\", exported_namespace=\"$namespace\"},metric)", "hide": 0, "includeAll": false, diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-connection-distribution.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-connection-distribution.json index 7af99c03..e1dcff9d 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-connection-distribution.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-connection-distribution.json @@ -25,7 +25,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -102,7 +102,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "kong_nginx_http_current_connections{cluster_id=\"$cluster\",namespace=~\"$namespace\",service=~\"$proxy\",pod=~\"$pod\",state=\"active\"} or kong_nginx_connections_total{cluster_id=\"$cluster\",namespace=~\"$namespace\",service=~\"$proxy\",pod=~\"$pod\",state=\"active\"}", @@ -116,7 +116,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -193,7 +193,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by (node) (kong_nginx_http_current_connections{cluster_id=\"$cluster\",namespace=~\"$namespace\",service=~\"$proxy\",pod=~\"$pod\",state=\"active\"} or kong_nginx_connections_total{cluster_id=\"$cluster\",namespace=~\"$namespace\",service=~\"$proxy\",pod=~\"$pod\",state=\"active\"})", @@ -208,7 +208,7 @@ "id": 3, "title": "Active Connections by Zone", "type": "timeseries", - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 10, "w": 24, @@ -218,7 +218,7 @@ "targets": [ { "refId": "Active Connections by Zone", - "datasource": "default", + "datasource": "$datasource", "expr": "sum by (zone) (kong_nginx_http_current_connections{cluster_id=\"$cluster\",namespace=~\"$namespace\",pod=~\"$pod\",state=\"active\"} * on (node) group_left(zone) (group by (node, zone) (kube_node_labels{cluster_id=\"$cluster\"})))" } ] @@ -234,6 +234,24 @@ ], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allFormat": "glob", "current": { @@ -243,7 +261,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kong_datastore_reachable,cluster_id)", "hide": 0, @@ -272,7 +290,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kong_datastore_reachable{cluster_id=~\"$cluster\"},namespace)", "hide": 0, @@ -299,7 +317,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kong_datastore_reachable{cluster_id=~\"$cluster\", namespace=~\"$namespace\"},service)", "hide": 0, @@ -328,7 +346,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kong_datastore_reachable{cluster_id=~\"$cluster\",namespace=~\"$namespace\",service=~\"$proxy\"},pod)", "hide": 0, diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-ingress-controller.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-ingress-controller.json index 7184d0aa..519e3ae1 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-ingress-controller.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-ingress-controller.json @@ -30,33 +30,7 @@ "liveNow": false, "panels": [ { - "datasource": "default", - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 14, - "options": { - "analyticsOptions": { - "dashboard": "$__dashboard", - "flatten": false, - "heartbeatAlways": false, - "heartbeatInterval": 60, - "postEnd": false, - "postHeartbeat": false, - "postStart": true, - "server": "/analytics-plugin/write", - "showDetails": false - } - }, - "title": " ", - "transparent": true, - "type": "macropower-analytics-panel" - }, - { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -87,41 +61,40 @@ ] }, "unit": "ms" - }, - "gridPos": { - "h": 16, - "w": 12, - "x": 0, - "y": 1 - }, - "id": 2, - "options": { - "bucketOffset": 0, - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - } - }, - "targets": [ - { - "datasource": "default", - "editorMode": "code", - "exemplar": true, - "expr": "ingress_controller_configuration_push_duration_milliseconds_bucket{cluster_id=\"$cluster\", namespace=\"$namespace\"}", - "interval": "", - "legendFormat": "", - "range": true, - "refId": "A" - } - ], - "title": "Configuration push duration (ms)", - "type": "histogram" - } + } + }, + "gridPos": { + "h": 16, + "w": 12, + "x": 0, + "y": 1 + }, + "id": 2, + "options": { + "bucketOffset": 0, + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + } + }, + "targets": [ + { + "editorMode": "code", + "exemplar": true, + "expr": "ingress_controller_configuration_push_duration_milliseconds_bucket{cluster_id=\"$cluster\", namespace=\"$namespace\"}", + "interval": "", + "legendFormat": "", + "range": true, + "refId": "A" + } + ], + "title": "Configuration push duration (ms)", + "type": "histogram" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -166,7 +139,7 @@ "pluginVersion": "9.2.5", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "editorMode": "code", "exemplar": true, "expr": "ingress_controller_configuration_push_count{success=\"true\",cluster_id=\"$cluster\", namespace=\"$namespace\"}", @@ -181,7 +154,7 @@ "type": "stat" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -235,7 +208,7 @@ "pluginVersion": "9.2.5", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "editorMode": "code", "exemplar": true, "expr": "sum by (failure_reason) (ingress_controller_configuration_push_count{success=\"false\", cluster_id=\"$cluster\", namespace=\"$namespace\"})", @@ -249,7 +222,7 @@ "type": "stat" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -294,7 +267,7 @@ "pluginVersion": "9.2.5", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "editorMode": "code", "exemplar": true, "expr": "ingress_controller_translation_count{success=\"true\", cluster_id=\"$cluster\", namespace=\"$namespace\"}", @@ -308,7 +281,7 @@ "type": "stat" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -357,7 +330,7 @@ "pluginVersion": "9.2.5", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "exemplar": true, "expr": "ingress_controller_translation_count{success=\"false\"}", "interval": "", @@ -375,9 +348,27 @@ "tags": [], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": {}, - "datasource": "default", + "datasource": "$datasource", "definition": "label_values(ingress_controller_configuration_push_duration_milliseconds_bucket, cluster_id)", "hide": 0, "includeAll": true, @@ -396,7 +387,7 @@ }, { "current": {}, - "datasource": "default", + "datasource": "$datasource", "definition": "label_values(ingress_controller_configuration_push_duration_milliseconds_bucket{cluster_id=\"$cluster\"}, namespace)", "hide": 0, "includeAll": true, diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-official.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-official.json index 8af370a1..8fa46d9c 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-official.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/kong-official.json @@ -5,7 +5,7 @@ "builtIn": 1, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "enable": true, "hide": true, @@ -41,7 +41,7 @@ "collapsed": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -55,7 +55,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -70,7 +70,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -152,7 +152,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(kong_http_requests_total{cluster_id=~\"$cluster_id\", instance=~\"$instance\"}[1m]))", @@ -200,7 +200,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -306,7 +306,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(kong_http_requests_total{cluster_id=~\"$cluster_id\", service=~\"$service\", route=~\"$route\", instance=~\"$instance\"}[1m])) by (service)", @@ -319,7 +319,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(kong_http_requests_total{cluster_id=~\"$cluster_id\", service=~\"$service\", route=~\"$route\", instance=~\"$instance\"}[1m])) by (route)", @@ -367,7 +367,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -473,7 +473,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum(rate(kong_http_requests_total{cluster_id=~\"$cluster_id\", service=~\"$service\", route=~\"$route\", instance=~\"$instance\"}[1m])) by (service,code)", "format": "time_series", @@ -484,7 +484,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum(rate(kong_http_requests_total{cluster_id=~\"$cluster_id\", service=~\"$service\", route=~\"$route\", instance=~\"$instance\"}[1m])) by (route,code)", "format": "time_series", @@ -527,7 +527,7 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -544,7 +544,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -650,7 +650,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.90, sum(rate(kong_kong_latency_ms_bucket{cluster_id=~\"$cluster_id\", instance=~\"$instance\"}[1m])) by (le))", @@ -663,7 +663,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.95, sum(rate(kong_kong_latency_ms_bucket{cluster_id=~\"$cluster_id\", instance=~\"$instance\"}[1m])) by (le))", "format": "time_series", @@ -674,7 +674,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.99, sum(rate(kong_kong_latency_ms_bucket{cluster_id=~\"$cluster_id\", instance=~\"$instance\"}[1m])) by (le))", "format": "time_series", @@ -720,7 +720,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -826,7 +826,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.90, sum(rate(kong_kong_latency_ms_bucket{cluster_id=~\"$cluster_id\", service=~\"$service\", route=~\"$route\", instance=~\"$instance\"}[1m])) by (service,le))", @@ -839,7 +839,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.95, sum(rate(kong_kong_latency_ms_bucket{cluster_id=~\"$cluster_id\", service=~\"$service\", route=~\"$route\", instance=~\"$instance\"}[1m])) by (service,le))", @@ -852,7 +852,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.99, sum(rate(kong_kong_latency_ms_bucket{cluster_id=~\"$cluster_id\", service=~\"$service\", route=~\"$route\", instance=~\"$instance\"}[1m])) by (service,le))", @@ -900,7 +900,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1006,7 +1006,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.90, sum(rate(kong_kong_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (route,le))", "format": "time_series", @@ -1017,7 +1017,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.95, sum(rate(kong_kong_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (route,le))", "format": "time_series", @@ -1028,7 +1028,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.99, sum(rate(kong_kong_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (route,le))", "format": "time_series", @@ -1074,7 +1074,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1180,7 +1180,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.90, sum(rate(kong_request_latency_ms_bucket{}[1m])) by (le))", "format": "time_series", @@ -1191,7 +1191,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.95, sum(rate(kong_request_latency_ms_bucket{}[1m])) by (le))", "format": "time_series", @@ -1202,7 +1202,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.99, sum(rate(kong_request_latency_ms_bucket{}[1m])) by (le))", "format": "time_series", @@ -1248,7 +1248,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1354,7 +1354,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.90, sum(rate(kong_request_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (service,le))", "format": "time_series", @@ -1365,7 +1365,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.95, sum(rate(kong_request_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (service,le))", "format": "time_series", @@ -1376,7 +1376,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.99, sum(rate(kong_request_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (service,le))", "format": "time_series", @@ -1422,7 +1422,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1528,7 +1528,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.90, sum(rate(kong_request_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (route,le))", "format": "time_series", @@ -1539,7 +1539,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.95, sum(rate(kong_request_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (route,le))", "format": "time_series", @@ -1550,7 +1550,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.99, sum(rate(kong_request_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (route,le))", "format": "time_series", @@ -1596,7 +1596,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1703,7 +1703,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.90, sum(rate(kong_upstream_latency_ms_bucket{}[1m])) by (le))", "format": "time_series", @@ -1715,7 +1715,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.95, sum(rate(kong_upstream_latency_ms_bucket{}[1m])) by (le))", "format": "time_series", @@ -1726,7 +1726,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.99, sum(rate(kong_upstream_latency_ms_bucket{}[1m])) by (le))", "format": "time_series", @@ -1772,7 +1772,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1879,7 +1879,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.90, sum(rate(kong_upstream_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (service,le))", "format": "time_series", @@ -1891,7 +1891,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.95, sum(rate(kong_upstream_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (service,le))", "format": "time_series", @@ -1902,7 +1902,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.99, sum(rate(kong_upstream_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (service,le))", "format": "time_series", @@ -1948,7 +1948,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -2055,7 +2055,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.90, sum(rate(kong_upstream_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (route,le))", "format": "time_series", @@ -2067,7 +2067,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.95, sum(rate(kong_upstream_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (route,le))", "format": "time_series", @@ -2078,7 +2078,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "histogram_quantile(0.99, sum(rate(kong_upstream_latency_ms_bucket{cluster_id=~\"$cluster_id\", service =~ \"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (route,le))", "format": "time_series", @@ -2122,7 +2122,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -2134,7 +2134,7 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -2151,7 +2151,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -2264,7 +2264,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum(irate(kong_bandwidth_bytes{cluster_id=~\"$cluster_id\", instance=~\"$instance\"}[1m])) by (type)", "format": "time_series", @@ -2310,7 +2310,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -2416,7 +2416,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum(irate(kong_bandwidth_bytes{cluster_id=~\"$cluster_id\", direction=\"egress\", service =~\"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (service)", "format": "time_series", @@ -2427,7 +2427,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum(irate(kong_bandwidth_bytes{cluster_id=~\"$cluster_id\", direction=\"egress\", service =~\"$service\",route=~\"$route\",instance=~\"$instance\"}[1m])) by (route)", "format": "time_series", @@ -2473,7 +2473,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -2579,7 +2579,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum(irate(kong_bandwidth_bytes{cluster_id=~\"$cluster_id\", direction=\"ingress\", service =~\"$service\"}[1m])) by (service)", "format": "time_series", @@ -2623,7 +2623,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -2635,7 +2635,7 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -2648,7 +2648,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -2738,7 +2738,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": true, "expr": "(kong_memory_lua_shared_dict_bytes{cluster_id=~\"$cluster_id\", instance=~\"$instance\"}/kong_memory_lua_shared_dict_total_bytes{cluster_id=~\"$cluster_id\", instance=~\"$instance\"})*100", @@ -2779,7 +2779,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -2883,7 +2883,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": true, "expr": "kong_memory_workers_lua_vms_bytes{cluster_id=~\"$cluster_id\", instance=~\"$instance\"}", @@ -2929,7 +2929,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -2941,7 +2941,7 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -2963,7 +2963,7 @@ "dataFormat": "tsbuckets", "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -3036,7 +3036,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": true, "expr": "sum(kong_upstream_target_health{cluster_id=~\"$cluster_id\", state=\"healthy\",upstream=~\"$upstream\"}) by (upstream,target,address) * -1 + sum(kong_upstream_target_health{cluster_id=~\"$cluster_id\", state=~\"(unhealthy|dns_error)\",upstream=~\"$upstream\"}) by (upstream,target,address)", @@ -3074,7 +3074,7 @@ "columns": [], "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fontSize": "100%", "gridPos": { @@ -3182,7 +3182,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": false, "expr": "sum(\n# map state to a numeric value\n# since grafana doesn't support value mapping yet\n label_replace(\n label_replace(\n label_replace(\n kong_upstream_target_health{cluster_id=~\"$cluster_id\", upstream=~\"$upstream\"}\n # healthy is positive number\n , \"state_value\", \"1\", \"state\", \"healthy\"\n # healthchecks_off is 0\n ), \"state_value\", \"0\", \"state\", \"healthchecks_off\"\n # unhealthy is negative number\n ), \"state_value\", \"-1\", \"state\", \"(dns_error|unhealthy)\"\n )\n)\nby (upstream, target, address, state, state_value) > 0", @@ -3226,7 +3226,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -3238,7 +3238,7 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 1, @@ -3255,7 +3255,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -3361,7 +3361,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum(kong_nginx_connections_total{cluster_id=~\"$cluster_id\", state=~\"active|reading|writing|waiting\", instance=~\"$instance\"}) by (state)", "format": "time_series", @@ -3403,7 +3403,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -3467,7 +3467,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": true, "expr": "sum(kong_nginx_connections_total{cluster_id=~\"$cluster_id\", state=\"total\", instance=~\"$instance\"})", @@ -3484,7 +3484,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -3548,7 +3548,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum(kong_nginx_connections_total{cluster_id=~\"$cluster_id\", state=\"handled\", instance=~\"$instance\"})", "format": "time_series", @@ -3563,7 +3563,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -3627,7 +3627,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "expr": "sum(kong_nginx_connections_total{cluster_id=~\"$cluster_id\", state=\"accepted\", instance=~\"$instance\"})", "format": "time_series", @@ -3644,7 +3644,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "refId": "A" } @@ -3663,6 +3663,24 @@ ], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": ".*", "current": { @@ -3676,7 +3694,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kong_http_requests_total,cluster_id)", "hide": 0, @@ -3711,7 +3729,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kong_http_requests_total{cluster_id=~\"$cluster_id\"},service)", "hide": 0, @@ -3746,7 +3764,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kong_http_requests_total{cluster_id=~\"$cluster_id\"},instance)", "hide": 0, @@ -3781,7 +3799,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kong_http_requests_total{cluster_id=~\"$cluster_id\"},route)", "description": "Ingress", @@ -3816,7 +3834,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kong_upstream_target_health, upstream)", "hide": 0, @@ -3833,25 +3851,6 @@ "tagsQuery": "", "type": "query", "useTags": false - }, - { - "current": { - "selected": true, - "text": "Prometheus", - "value": "Prometheus" - }, - "hide": 0, - "includeAll": false, - "label": "Datasource", - "multi": false, - "name": "DS_PROMETHEUS", - "options": [], - "query": "prometheus", - "queryValue": "", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "type": "datasource" } ] }, diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/managed-apps.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/managed-apps.json index 36e888f9..848da138 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/managed-apps.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/managed-apps.json @@ -19,32 +19,6 @@ "iteration": 1631863780777, "links": [], "panels": [ - { - "datasource": "$datasource", - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 2, - "options": { - "analyticsOptions": { - "dashboard": "$__dashboard", - "flatten": false, - "heartbeatAlways": false, - "heartbeatInterval": 60, - "postEnd": false, - "postHeartbeat": false, - "postStart": true, - "server": "/analytics-plugin/write", - "showDetails": false - } - }, - "title": " ", - "transparent": true, - "type": "macropower-analytics-panel" - }, { "datasource": "$datasource", "fieldConfig": { @@ -423,9 +397,9 @@ "text": "default", "value": "default" }, - "hide": 2, + "hide": 0, "includeAll": false, - "label": null, + "label": "Data source", "multi": false, "name": "datasource", "options": [], diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/nginx.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/nginx.json index 50df0855..ff962ac1 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/nginx.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/nginx.json @@ -20,7 +20,7 @@ "type": "dashboard" }, { - "datasource": "default", + "datasource": "$datasource", "enable": true, "expr": "sum(changes(nginx_ingress_controller_config_last_reload_successful_timestamp_seconds{instance!=\"unknown\",cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\"}[30s])) by (controller_class)", "hide": false, @@ -45,33 +45,7 @@ "liveNow": false, "panels": [ { - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 2, - "options": { - "analyticsOptions": { - "dashboard": "$__dashboard", - "flatten": false, - "heartbeatAlways": false, - "heartbeatInterval": 60, - "postEnd": false, - "postHeartbeat": false, - "postStart": true, - "server": "/analytics-plugin/write", - "showDetails": false - } - }, - "title": " ", - "transparent": true, - "type": "macropower-analytics-panel" - }, - { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -126,7 +100,7 @@ "pluginVersion": "9.0.1", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "expr": "round(sum(irate(nginx_ingress_controller_requests{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}[2m])), 0.001)", "format": "time_series", "intervalFactor": 1, @@ -138,7 +112,7 @@ "type": "stat" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -199,7 +173,7 @@ "pluginVersion": "9.0.1", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "expr": "sum(avg_over_time(nginx_ingress_controller_nginx_process_connections{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}[2m]))", "format": "time_series", "instant": false, @@ -212,7 +186,7 @@ "type": "stat" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -277,7 +251,7 @@ "pluginVersion": "9.0.1", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "editorMode": "code", "expr": "sum(rate(nginx_ingress_controller_requests{\n cluster_id=~\"$cluster\",\n namespace=~\"$namespace\",\n app=~\"$app\",\n controller_class=~\"$controller_class\",\n controller_pod=~\"$controller\",\n status!~\"[4-5].*\"}[2m]\n)) / \nsum(rate(nginx_ingress_controller_requests{\n cluster_id=~\"$cluster\",\n namespace=~\"$namespace\",\n app=~\"$app\",\n controller_class=~\"$controller_class\",\n controller_pod=~\"$controller\"}[2m]\n))", "format": "time_series", @@ -291,7 +265,7 @@ "type": "stat" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -353,7 +327,7 @@ "pluginVersion": "9.0.1", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "expr": "avg(irate(nginx_ingress_controller_success{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}[1m])) * 60", "format": "time_series", "instant": false, @@ -366,7 +340,7 @@ "type": "stat" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -428,7 +402,7 @@ "pluginVersion": "9.0.1", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "expr": "count(nginx_ingress_controller_config_last_reload_successful{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"} == 0)", "format": "time_series", "instant": true, @@ -441,7 +415,7 @@ "type": "stat" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -515,7 +489,7 @@ "repeatDirection": "h", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "expr": "round(sum(irate(nginx_ingress_controller_requests{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",ingress=~\"$ingress\"}[2m])) by (ingress), 0.001)", "format": "time_series", "hide": false, @@ -540,7 +514,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 2, "editable": true, "error": false, @@ -590,7 +564,7 @@ "steppedLine": false, "targets": [ { - "datasource": "default", + "datasource": "$datasource", "expr": "sum(rate(nginx_ingress_controller_requests{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",ingress=~\"$ingress\",status!~\"[4-5].*\"}[2m])) by (ingress) / sum(rate(nginx_ingress_controller_requests{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",ingress=~\"$ingress\"}[2m])) by (ingress)", "format": "time_series", "instant": false, @@ -634,7 +608,7 @@ } }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -712,7 +686,7 @@ "pluginVersion": "9.0.1", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "expr": "sum (irate (nginx_ingress_controller_request_size_sum{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}[2m]))", "format": "time_series", "instant": false, @@ -724,7 +698,7 @@ "step": 10 }, { - "datasource": "default", + "datasource": "$datasource", "expr": "- sum (irate (nginx_ingress_controller_response_size_sum{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}[2m]))", "format": "time_series", "hide": false, @@ -740,7 +714,7 @@ "type": "timeseries" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -864,7 +838,7 @@ "pluginVersion": "9.0.1", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "expr": "avg(nginx_ingress_controller_nginx_process_resident_memory_bytes{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}) ", "format": "time_series", "instant": false, @@ -880,7 +854,7 @@ "type": "timeseries" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -953,7 +927,7 @@ "pluginVersion": "9.0.1", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "expr": "sum (rate (nginx_ingress_controller_nginx_process_cpu_seconds_total{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}[2m])) ", "format": "time_series", "interval": "10s", @@ -968,7 +942,7 @@ "type": "timeseries" }, { - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -1247,7 +1221,7 @@ "repeatDirection": "h", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "expr": "histogram_quantile(0.50, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{cluster_id=~\"$cluster\",controller_namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",ingress!=\"\",ingress=~\"$ingress\"}[2m])) by (le, ingress))", "format": "table", "hide": false, @@ -1257,7 +1231,7 @@ "refId": "C" }, { - "datasource": "default", + "datasource": "$datasource", "expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{cluster_id=~\"$cluster\",controller_namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",ingress!=\"\",ingress=~\"$ingress\"}[2m])) by (le, ingress))", "format": "table", "hide": false, @@ -1267,7 +1241,7 @@ "refId": "D" }, { - "datasource": "default", + "datasource": "$datasource", "expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{cluster_id=~\"$cluster\",controller_namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",ingress!=\"\",ingress=~\"$ingress\"}[2m])) by (le, ingress))", "format": "table", "hide": false, @@ -1277,7 +1251,7 @@ "refId": "E" }, { - "datasource": "default", + "datasource": "$datasource", "expr": "sum(irate(nginx_ingress_controller_request_size_sum{cluster_id=~\"$cluster\",controller_namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",ingress!=\"\",ingress=~\"$ingress\"}[2m])) by (ingress)", "format": "table", "hide": false, @@ -1288,7 +1262,7 @@ "refId": "F" }, { - "datasource": "default", + "datasource": "$datasource", "expr": "sum(irate(nginx_ingress_controller_response_size_sum{cluster_id=~\"$cluster\",controller_namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",ingress!=\"\",ingress=~\"$ingress\"}[2m])) by (ingress)", "format": "table", "instant": true, @@ -1311,7 +1285,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -1362,7 +1336,7 @@ "pluginVersion": "9.0.1", "targets": [ { - "datasource": "default", + "datasource": "$datasource", "editorMode": "code", "expr": "avg by(host) (nginx_ingress_controller_ssl_expire_time_seconds{cluster_id=~\"$cluster\", namespace=~\"$namespace\", app=~\"$app\", controller_class=~\"$controller_class\", controller_pod=~\"$controller\"}) - time()", "format": "time_series", @@ -1401,6 +1375,24 @@ ], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": false, @@ -1409,7 +1401,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "", "hide": 0, @@ -1440,7 +1432,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "", "hide": 0, @@ -1471,7 +1463,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(nginx_ingress_controller_config_hash{cluster_id=~\"$cluster\",namespace=~\"$namespace\"}, app) ", "hide": 0, @@ -1502,7 +1494,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(nginx_ingress_controller_config_hash{cluster_id=~\"$cluster\",namespace=~\"$namespace\"}, controller_class)", "hide": 0, @@ -1533,7 +1525,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(nginx_ingress_controller_config_hash{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\"}, controller_pod) ", "hide": 0, @@ -1564,7 +1556,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(nginx_ingress_controller_requests{cluster_id=~\"$cluster\",namespace=~\"$namespace\",app=~\"$app\",controller_class=~\"$controller_class\",controller=~\"$controller\"}, ingress) ", "hide": 0, diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/nodes-overview.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/nodes-overview.json index 796a6ab2..950d55a6 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/nodes-overview.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/nodes-overview.json @@ -28,42 +28,6 @@ "links": [], "liveNow": false, "panels": [ - { - "datasource": { - "uid": "$datasource" - }, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 35, - "options": { - "analyticsOptions": { - "dashboard": "$__dashboard", - "flatten": false, - "heartbeatAlways": false, - "heartbeatInterval": 60, - "postEnd": false, - "postHeartbeat": false, - "postStart": true, - "server": "/analytics-plugin/write", - "showDetails": false - } - }, - "targets": [ - { - "datasource": { - "uid": "$datasource" - }, - "refId": "A" - } - ], - "title": " ", - "transparent": true, - "type": "macropower-analytics-panel" - }, { "datasource": { "uid": "$datasource" @@ -1660,8 +1624,9 @@ "text": "default", "value": "default" }, - "hide": 2, + "hide": 0, "includeAll": false, + "label": "Data source", "multi": false, "name": "datasource", "options": [], diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/policy-status.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/policy-status.json index c9a4f154..e140a11a 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/policy-status.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/policy-status.json @@ -322,6 +322,24 @@ ], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": ".*", "current": { @@ -333,10 +351,7 @@ "$__all" ] }, - "datasource": { - "type": "prometheus", - "uid": "$datasource" - }, + "datasource": "$datasource", "definition": "label_values(dipstick_policyreport_policy_summary,cluster_id)", "hide": 0, "includeAll": true, @@ -354,23 +369,6 @@ "skipUrlSync": false, "sort": 0, "type": "query" - }, - { - "current": { - "selected": false, - "text": "default", - "value": "default" - }, - "hide": 0, - "includeAll": false, - "multi": false, - "name": "datasource", - "options": [], - "query": "prometheus", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "type": "datasource" } ] }, diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/servicemonitors-details.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/servicemonitors-details.json index 39f11f0f..3e9066d1 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/servicemonitors-details.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/servicemonitors-details.json @@ -432,8 +432,8 @@ { "current": { "selected": true, - "text": "Mimir", - "value": "mimir" + "text": "default", + "value": "default" }, "hide": 0, "includeAll": false, diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/servicemonitors-overview.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/servicemonitors-overview.json index 4d2b57a8..dc168d41 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/servicemonitors-overview.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/servicemonitors-overview.json @@ -182,7 +182,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "prometheus_agent_active_series{cluster_id=\"$cluster\"}", + "expr": "prometheus_agent_active_series{cluster_id=~\"$cluster\"}", "instant": false, "legendFormat": "{{cluster_id}} / {{pod}}", "range": true, diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/webhook-health.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/webhook-health.json index aa248415..6e9c4349 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/webhook-health.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/webhook-health.json @@ -27,6 +27,7 @@ "panels": [ { "description": "Shows the percentage of webhooks with a pod disruption budget. Ideally it should be 100%", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -76,7 +77,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": false, "expr": "webhook_exporter_webhooks_pod_disruption_budget", @@ -170,6 +171,7 @@ }, { "description": "A metric showing the percentage of webhooks that a valid namespace selector. That is webhooks that follow the following rules:\n namespaceSelector:\n\t matchExpressions:\n\t\t - key: name\n\t\t operator: NotIn\n\t\t values: [\"kube-system\", \"giantswarm\"]\n\t\t\t ", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -219,7 +221,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": false, "expr": "webhook_exporter_webhooks_valid_namespace_selectors", @@ -313,6 +315,7 @@ }, { "description": "List of webhooks whose pods don't have a PDB set. In an ideal scenario, this table should be empty", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -362,7 +365,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": true, "expr": "webhook_exporter_webhooks_pod_disruption_budget == 0", @@ -430,6 +433,7 @@ }, { "description": "List of webhooks not in the giantswarm namespace whose pods don't have a PDB set. In an ideal scenario, this table should be empty", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -479,7 +483,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": true, "expr": "webhook_exporter_webhooks_pod_disruption_budget == 0", @@ -565,6 +569,7 @@ }, { "description": "List of webhooks that have a valid namespace selector. That is webhooks that follow the following rules:\n namespaceSelector:\n\t matchExpressions:\n\t\t - key: name\n\t\t operator: NotIn\n\t\t values: [\"kube-system\", \"giantswarm\"]\n\t\t\t ", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -614,7 +619,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": true, "expr": "webhook_exporter_webhooks_valid_namespace_selectors == 0", @@ -682,6 +687,7 @@ }, { "description": "List of webhooks that aren't in the giantswarm namespace that have a valid namespace selector. That is webhooks that follow the following rules:\n namespaceSelector:\n\t matchExpressions:\n\t\t - key: name\n\t\t operator: NotIn\n\t\t values: [\"kube-system\", \"giantswarm\"]\n\t\t\t ", + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -731,7 +737,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": true, "expr": "webhook_exporter_webhooks_valid_namespace_selectors == 0", @@ -816,6 +822,7 @@ "type": "table" }, { + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -888,7 +895,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": true, "expr": "min(webhook_exporter_webhooks_replicas{webhook_type=\"mutating\"}) by (webhook)", @@ -901,6 +908,7 @@ "type": "timeseries" }, { + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -973,7 +981,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "exemplar": true, "expr": "min(webhook_exporter_webhooks_replicas{webhook_type=\"validating\"}) by (webhook)", @@ -992,7 +1000,26 @@ "team:phoenix" ], "templating": { - "list": [] + "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + } + ] }, "time": { "from": "now-6h", diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/webhooks-performance.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/webhooks-performance.json index f6f8113c..94604756 100644 --- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/webhooks-performance.json +++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/webhooks-performance.json @@ -32,7 +32,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -106,7 +106,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "rate(apiserver_admission_webhook_rejection_count{organization=\"$organization\", cluster_id=\"$cluster\"}[5m])", @@ -121,7 +121,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -196,7 +196,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum by (name, operation) (rate(apiserver_admission_webhook_admission_duration_seconds_count{organization=\"$organization\", cluster_id=\"$cluster\"}[5m]))", @@ -220,7 +220,7 @@ "dataFormat": "timeseries", "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 8, @@ -240,7 +240,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.95, sum(rate(apiserver_admission_webhook_admission_duration_seconds_bucket{organization=\"$organization\", cluster_id=\"$cluster\"}[$__rate_interval])) by (le))", @@ -251,7 +251,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.99, sum(rate(apiserver_admission_webhook_admission_duration_seconds_bucket{organization=\"$organization\", cluster_id=\"$cluster\"}[$__rate_interval])) by (le))", @@ -263,7 +263,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.50, sum(rate(apiserver_admission_webhook_admission_duration_seconds_bucket{organization=\"$organization\", cluster_id=\"$cluster\"}[$__rate_interval])) by (le))", @@ -292,7 +292,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -367,7 +367,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "histogram_quantile(0.95, sum (irate(apiserver_admission_webhook_admission_duration_seconds_bucket{organization=\"$organization\", cluster_id=\"$cluster\"}[15m])) by (name, operation, le))", @@ -389,6 +389,24 @@ ], "templating": { "list": [ + { + "current": { + "selected": false, + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": { "selected": false, @@ -397,7 +415,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kubernetes_build_info, organization)", "hide": 0, @@ -424,7 +442,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(kubernetes_build_info{organization=\"$organization\"}, cluster_id)", "hide": 0, diff --git a/helm/dashboards/dashboards/aws/private/autoscaling-groups.json b/helm/dashboards/dashboards/aws/private/autoscaling-groups.json index 7619e6d6..8f09aa0f 100644 --- a/helm/dashboards/dashboards/aws/private/autoscaling-groups.json +++ b/helm/dashboards/dashboards/aws/private/autoscaling-groups.json @@ -39,7 +39,7 @@ "rgba(237, 129, 40, 0.89)", "#299c46" ], - "datasource": "default", + "datasource": "$datasource", "description": "Current number of ASGs with actual number of instances < desired number", "format": "none", "gauge": { @@ -118,7 +118,7 @@ "bars": true, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "Number of instances missing in ASGs over time", "fill": 1, @@ -234,7 +234,7 @@ "rgba(237, 129, 40, 0.89)", "#299c46" ], - "datasource": "default", + "datasource": "$datasource", "description": "Current number of ASGs with actual number of instances < desired number", "format": "none", "gauge": { @@ -320,7 +320,7 @@ "bars": true, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "Number of instances missing in ASGs over time", "fill": 1, @@ -418,7 +418,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "The difference between capacity and InService instances. Negative values stand for missing instances, positive stands for too many instances.", "fill": 0, @@ -517,7 +517,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "Desired number of EC2 instances per Auto Scaling Group", "fill": 0, @@ -615,7 +615,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "The current number of EC2 instances \"InService\" (which means: working)", "fill": 0, @@ -720,13 +720,30 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": { "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "hide": 0, "includeAll": true, "label": "AWS Account", diff --git a/helm/dashboards/dashboards/aws/private/aws-cni.json b/helm/dashboards/dashboards/aws/private/aws-cni.json index 894820a8..b05d1e19 100644 --- a/helm/dashboards/dashboards/aws/private/aws-cni.json +++ b/helm/dashboards/dashboards/aws/private/aws-cni.json @@ -28,7 +28,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "description": "Number of Kubernetes nodes according to the kube_node_info metric", "format": "none", "gauge": { @@ -112,7 +112,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "description": "Number of aws-node instances, including both worker and control plane nodes. There should be one for each node.", "format": "none", "gauge": { @@ -196,7 +196,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "description": "The theoretical limit of Elastic Network Interface that could be available to nodes in this cluster.", "format": "none", "gauge": { @@ -280,7 +280,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "description": "The theoretical number of IP addresses available in this cluster if all nodes had all possible ENIs allocated", "format": "none", "gauge": { @@ -364,7 +364,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "description": "The number of ENIs currently allocated to nodes", "format": "none", "gauge": { @@ -448,7 +448,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "description": "The capacity of IP addresses in the cluster, based on the number of ENIs currently allocated.", "format": "none", "gauge": { @@ -532,7 +532,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "description": "IP addresses currently assigned to pods", "format": "none", "gauge": { @@ -616,7 +616,7 @@ "rgba(237, 129, 40, 0.89)", "#37872D" ], - "datasource": "default", + "datasource": "$datasource", "description": "IP addresses available per ENIs, but currently not assigned to pods", "format": "none", "gauge": { @@ -692,7 +692,7 @@ "valueName": "current" }, { - "datasource": "default", + "datasource": "$datasource", "description": "For each aws-node instance, the number of IP addresses assigned currently", "gridPos": { "h": 6, @@ -740,7 +740,7 @@ }, { "collapsed": true, - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -754,7 +754,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "This graph compares over time: (a) theoretical capacity based on ENI capacity, (b) actual capacity based on current ENIs, (c) actual IP addresses in use.", "fill": 1, "fillGradient": 0, @@ -859,7 +859,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "awscni_ip_max is set on start of the ipamD daemon to the value of NumENIs * NumIPsPerENI. The number of IPs per ENI and the number of ENIs is dependent on the instance type.", "fill": 1, @@ -951,7 +951,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "This is an actual metric/gauge whose value is incremented for each IP address that can be assigned to an ENI when an ENI is added to the set of ENIs managed by the ipamD daemon. This happens on start of the CNI plugin's ipamD daemon.", "fill": 1, @@ -1043,7 +1043,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "fill": 1, "fillGradient": 0, @@ -1134,7 +1134,7 @@ "bars": true, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": null, "description": "Requests to add an IP address to a node, in number of operations per hour", "fill": 1, @@ -1228,7 +1228,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "fill": 1, "fillGradient": 0, @@ -1320,7 +1320,7 @@ }, { "collapsed": true, - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -1334,7 +1334,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "Maximum number of ENIs available per node. This is dependent on the instance type.", "fill": 1, @@ -1426,7 +1426,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "Number of network interfaces allocated at the given moment.", "fill": 1, @@ -1518,7 +1518,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "", "fill": 1, "fillGradient": 0, @@ -1611,7 +1611,7 @@ }, { "collapsed": true, - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -1625,7 +1625,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fill": 1, "fillGradient": 0, "gridPos": { @@ -1715,7 +1715,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fill": 1, "fillGradient": 0, "gridPos": { @@ -1803,7 +1803,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fill": 1, "fillGradient": 0, "gridPos": { @@ -1904,13 +1904,30 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": { "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "definition": "label_values(kubernetes_build_info, cluster_id)", "hide": 0, "includeAll": false, diff --git a/helm/dashboards/dashboards/aws/private/aws-ena.json b/helm/dashboards/dashboards/aws/private/aws-ena.json index f5f46f3d..227645ee 100644 --- a/helm/dashboards/dashboards/aws/private/aws-ena.json +++ b/helm/dashboards/dashboards/aws/private/aws-ena.json @@ -30,7 +30,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "The number of packets queued or dropped because the inbound aggregate bandwidth exceeded the maximum for the instance.", "fieldConfig": { @@ -108,7 +108,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(node_ethtool_pps_allowance_exceeded{cluster_id=~\"$cluster\"}[5m])) by (node, device)", @@ -123,7 +123,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "The number of packets dropped because the PPS of the traffic to local proxy services exceeded the maximum for the network interface. This impacts traffic to the DNS service, the Instance Metadata Service, and the Amazon Time Sync Service.", "fieldConfig": { @@ -201,7 +201,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(node_ethtool_linklocal_allowance_exceeded{cluster_id=~\"$cluster\"}[5m])) by (node, device)", @@ -216,7 +216,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "The number of packets queued or dropped because the inbound aggregate bandwidth exceeded the maximum for the instance.", "fieldConfig": { @@ -294,7 +294,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(node_ethtool_bw_in_allowance_exceeded{cluster_id=~\"$cluster\"}[5m])) by (node, device)", @@ -309,7 +309,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "The number of packets queued or dropped because the outbound aggregate bandwidth exceeded the maximum for the instance.", "fieldConfig": { @@ -387,7 +387,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(node_ethtool_bw_out_allowance_exceeded{cluster_id=~\"$cluster\"}[5m])) by (node, device)", @@ -402,7 +402,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -479,7 +479,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(rate(node_ethtool_conntrack_allowance_exceeded{cluster_id=~\"$cluster\"}[5m])) by (node, device)", @@ -513,7 +513,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "The total number of established TCP connections.", "fill": 1, @@ -554,7 +554,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": true, @@ -610,17 +610,16 @@ { "current": { "selected": false, - "text": "Prometheus", - "value": "Prometheus" + "text": "default", + "value": "default" }, "hide": 0, "includeAll": false, - "label": "datasource", + "label": "Data source", "multi": false, - "name": "DS_PROMETHEUS", + "name": "datasource", "options": [], "query": "prometheus", - "queryValue": "", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -638,7 +637,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(node_ethtool_info{driver=\"ena\"}, device)", "hide": 0, @@ -668,7 +667,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(cluster_id)", "hide": 0, diff --git a/helm/dashboards/dashboards/aws/private/aws-service-limits.json b/helm/dashboards/dashboards/aws/private/aws-service-limits.json index 55f8883b..2cacd54e 100644 --- a/helm/dashboards/dashboards/aws/private/aws-service-limits.json +++ b/helm/dashboards/dashboards/aws/private/aws-service-limits.json @@ -28,7 +28,7 @@ "#299c46", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "description": "The number of resources that are currently exceeding 80% of their usage limit", "format": "none", "gauge": { @@ -104,7 +104,7 @@ "#d44a3a", "#299c46" ], - "datasource": "default", + "datasource": "$datasource", "description": "Only AWS accounts with Business or Enterprise level support plans can expose service limits and usage.", "format": "none", "gauge": { @@ -184,7 +184,7 @@ }, { "columns": [], - "datasource": "default", + "datasource": "$datasource", "description": "All resources that are currently using more than 80% of their limit", "fontSize": "100%", "gridPos": { @@ -256,7 +256,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "The usage of AWS resources, as a percentage of their overall limit.", "fill": 0, "gridPos": { @@ -355,7 +355,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "The usage of AWS resources.", "fill": 0, "gridPos": { @@ -444,7 +444,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "The limits of AWS resources.", "fill": 0, "gridPos": { @@ -538,13 +538,30 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": "", "current": { "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "hide": 0, "includeAll": true, "label": "Region", @@ -567,7 +584,7 @@ "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "hide": 0, "includeAll": true, "label": "Service", @@ -590,7 +607,7 @@ "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "hide": 0, "includeAll": true, "label": "Name", diff --git a/helm/dashboards/dashboards/aws/private/cluster-autoscaler.json b/helm/dashboards/dashboards/aws/private/cluster-autoscaler.json index 5698ee82..7cc4d49f 100644 --- a/helm/dashboards/dashboards/aws/private/cluster-autoscaler.json +++ b/helm/dashboards/dashboards/aws/private/cluster-autoscaler.json @@ -28,7 +28,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "default", + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -110,7 +110,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "default", + "datasource": "$datasource", "decimals": null, "description": "Shows the nodes which are ready as a percent of the total nodes", "format": "percent", @@ -194,7 +194,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "default", + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -282,7 +282,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], - "datasource": "default", + "datasource": "$datasource", "description": "Tells you if there are unscheduled pods", "format": "none", "gauge": { @@ -360,7 +360,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "default", + "datasource": "$datasource", "format": "s", "gauge": { "maxValue": 100, @@ -443,7 +443,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "default", + "datasource": "$datasource", "format": "s", "gauge": { "maxValue": 100, @@ -523,7 +523,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Shows the evicted and unscheduled pods", "editable": true, "error": false, @@ -626,7 +626,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Shows the state of the nodes as scaling happens", "editable": true, "error": false, @@ -737,7 +737,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "editable": true, "error": false, "fill": 1, @@ -850,7 +850,7 @@ "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)" ], - "datasource": "default", + "datasource": "$datasource", "description": "Is the cluster scaling up, down or ticking along okay?", "format": "none", "gauge": { @@ -946,13 +946,30 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": { "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "definition": "label_values(cluster_autoscaler_last_activity, cluster_id)", "hide": 0, "includeAll": false, diff --git a/helm/dashboards/dashboards/aws/private/instances.json b/helm/dashboards/dashboards/aws/private/instances.json index 3a2ebfb1..918f7330 100644 --- a/helm/dashboards/dashboards/aws/private/instances.json +++ b/helm/dashboards/dashboards/aws/private/instances.json @@ -40,7 +40,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -120,7 +120,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -202,7 +202,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -282,7 +282,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -364,7 +364,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -444,7 +444,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "format": "none", "gauge": { "maxValue": 100, @@ -535,7 +535,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "Number of healthy instances per cluster", "fill": 1, @@ -633,7 +633,7 @@ "bars": true, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "Information on instances not running/ok. This could also mean that an instance is coming up or being removed.", "fill": 1, @@ -734,7 +734,7 @@ }, { "columns": [], - "datasource": "default", + "datasource": "$datasource", "fontSize": "100%", "gridPos": { "h": 9, @@ -835,7 +835,7 @@ }, { "columns": [], - "datasource": "default", + "datasource": "$datasource", "fontSize": "100%", "gridPos": { "h": 9, @@ -982,7 +982,25 @@ "owner:team-phoenix" ], "templating": { - "list": [] + "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + } + ] }, "time": { "from": "now-6h", diff --git a/helm/dashboards/dashboards/aws/private/kiam.json b/helm/dashboards/dashboards/aws/private/kiam.json index 067ca65f..8f885bf1 100644 --- a/helm/dashboards/dashboards/aws/private/kiam.json +++ b/helm/dashboards/dashboards/aws/private/kiam.json @@ -22,7 +22,7 @@ "panels": [ { "collapsed": false, - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -39,7 +39,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -138,7 +138,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -237,7 +237,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -336,7 +336,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -436,7 +436,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -535,7 +535,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -634,7 +634,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Number of assume role calls currently executing", "fieldConfig": { "defaults": { @@ -741,7 +741,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -840,7 +840,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -949,7 +949,7 @@ "mode": "spectrum" }, "dataFormat": "tsbuckets", - "datasource": "default", + "datasource": "$datasource", "description": "Bucketed histogram of handler timings. Tagged by handler", "fieldConfig": { "defaults": { @@ -1022,7 +1022,7 @@ "mode": "spectrum" }, "dataFormat": "tsbuckets", - "datasource": "default", + "datasource": "$datasource", "description": "Bucketed histogram of handler timings. Tagged by handler", "fieldConfig": { "defaults": { @@ -1095,7 +1095,7 @@ "mode": "spectrum" }, "dataFormat": "tsbuckets", - "datasource": "default", + "datasource": "$datasource", "description": "Bucketed histogram of assumeRole timings", "fieldConfig": { "defaults": { @@ -1154,7 +1154,7 @@ }, { "collapsed": false, - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -1171,7 +1171,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Total number of RPCs completed on the server, regardless of success or failure.", "fieldConfig": { "defaults": { @@ -1269,7 +1269,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Total number of RPCs started on the server.", "fieldConfig": { "defaults": { @@ -1373,7 +1373,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Total number of RPC stream messages received on the server.", "fieldConfig": { "defaults": { @@ -1472,7 +1472,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Total number of gRPC stream messages sent by the server.", "fieldConfig": { "defaults": { @@ -1568,7 +1568,7 @@ }, { "collapsed": false, - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -1585,7 +1585,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Total number of RPCs completed by the client, regardless of success or failure.", "fieldConfig": { "defaults": { @@ -1684,7 +1684,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Total number of RPCs started on the client.", "fieldConfig": { "defaults": { @@ -1788,7 +1788,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Total number of RPC stream messages received on the client.", "fieldConfig": { "defaults": { @@ -1887,7 +1887,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "description": "Total number of gRPC stream messages sent by the client.", "fieldConfig": { "defaults": { @@ -1983,7 +1983,7 @@ }, { "collapsed": true, - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -2001,7 +2001,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -2089,7 +2089,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -2176,7 +2176,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -2263,7 +2263,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -2348,7 +2348,7 @@ }, { "collapsed": true, - "datasource": "default", + "datasource": "$datasource", "gridPos": { "h": 1, "w": 24, @@ -2366,7 +2366,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -2453,7 +2453,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -2539,7 +2539,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -2626,7 +2626,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "custom": {} @@ -2719,13 +2719,30 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "includeAll": false, + "label": "Data source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": null, "current": { "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "definition": "label_values(kubernetes_build_info{cluster_type=~\"workload_cluster\"}, cluster_id)", "hide": 0, "includeAll": false, @@ -2751,7 +2768,7 @@ "text": "kube-system", "value": "kube-system" }, - "datasource": "default", + "datasource": "$datasource", "definition": "", "hide": 0, "includeAll": false, diff --git a/helm/dashboards/dashboards/aws/public/aws-cluster-info.json b/helm/dashboards/dashboards/aws/public/aws-cluster-info.json index c4c9d470..3a09d1b2 100644 --- a/helm/dashboards/dashboards/aws/public/aws-cluster-info.json +++ b/helm/dashboards/dashboards/aws/public/aws-cluster-info.json @@ -20,7 +20,7 @@ "links": [], "panels": [ { - "datasource": null, + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -118,7 +118,7 @@ "type": "stat" }, { - "datasource": null, + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -201,7 +201,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "editable": true, "error": false, "fill": 1, @@ -316,7 +316,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "default", + "datasource": "$datasource", "decimals": 0, "description": "", "fieldConfig": { @@ -413,7 +413,7 @@ } }, { - "datasource": null, + "datasource": "$datasource", "description": "", "fieldConfig": { "defaults": { @@ -493,7 +493,7 @@ "type": "stat" }, { - "datasource": null, + "datasource": "$datasource", "description": "", "fieldConfig": { "defaults": { @@ -573,7 +573,7 @@ }, { "cacheTimeout": null, - "datasource": "default", + "datasource": "$datasource", "description": "CPU used by containers in comparison to the amount of CPU cores available in machines", "fieldConfig": { "defaults": { @@ -650,7 +650,7 @@ "type": "gauge" }, { - "datasource": null, + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -710,7 +710,7 @@ "type": "stat" }, { - "datasource": null, + "datasource": "$datasource", "description": "Number of IPs that are still available per aws-cni subnet .", "fieldConfig": { "defaults": { @@ -775,7 +775,7 @@ "type": "stat" }, { - "datasource": null, + "datasource": "$datasource", "description": "Percentage of IPs that are still available per aws-cni subnet .", "fieldConfig": { "defaults": { @@ -841,7 +841,7 @@ }, { "cacheTimeout": null, - "datasource": "default", + "datasource": "$datasource", "description": "Memory used by containers, in comparision to the memory available on machines", "fieldConfig": { "defaults": { @@ -939,7 +939,7 @@ }, { "cacheTimeout": null, - "datasource": "default", + "datasource": "$datasource", "fieldConfig": { "defaults": { "mappings": [ @@ -1018,7 +1018,7 @@ "type": "stat" }, { - "datasource": null, + "datasource": "$datasource", "gridPos": { "h": 2, "w": 2, @@ -1037,7 +1037,7 @@ "type": "text" }, { - "datasource": null, + "datasource": "$datasource", "description": "", "fieldConfig": { "defaults": { @@ -1103,7 +1103,7 @@ "type": "stat" }, { - "datasource": null, + "datasource": "$datasource", "description": "The max wait time between rolling of node batches during upgrades.", "fieldConfig": { "defaults": { @@ -1168,7 +1168,7 @@ "type": "stat" }, { - "datasource": null, + "datasource": "$datasource", "description": "The maximum percentage of nodes (batches) that can be rolled during upgrades at the same time.", "fieldConfig": { "defaults": { @@ -1243,13 +1243,27 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "label": "Data source", + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "type": "datasource" + }, { "allValue": null, "current": { "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "definition": "label_values(kubernetes_build_info, organization)", "description": null, "error": null, @@ -1278,7 +1292,7 @@ "text": "All", "value": "$__all" }, - "datasource": "default", + "datasource": "$datasource", "definition": "label_values(kubernetes_build_info{organization=\"$organization\"}, cluster_id)", "description": null, "error": null, diff --git a/helm/dashboards/dashboards/aws/public/aws-load-balancer-controller.json b/helm/dashboards/dashboards/aws/public/aws-load-balancer-controller.json index 0b6d8fd2..3d22aced 100644 --- a/helm/dashboards/dashboards/aws/public/aws-load-balancer-controller.json +++ b/helm/dashboards/dashboards/aws/public/aws-load-balancer-controller.json @@ -24,7 +24,7 @@ "liveNow": false, "panels": [ { - "datasource": null, + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -100,7 +100,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "aws_api_calls_total{error_code=\"WebIdentityErr\", app=\"aws-load-balancer-controller\", cluster_id=\"$cluster_id\"}", @@ -113,7 +113,7 @@ "type": "timeseries" }, { - "datasource": null, + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -189,7 +189,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "aws_api_calls_total{error_code=\"UnauthorizedOperation\", app=\"aws-load-balancer-controller\", cluster_id=\"$cluster_id\"}", @@ -209,7 +209,21 @@ "templating": { "list": [ { - "datasource": null, + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "label": "Data source", + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "type": "datasource" + }, + { + "datasource": "$datasource", "definition": "label_values(organization)", "description": "organization", "hide": 0, @@ -229,7 +243,7 @@ "type": "query" }, { - "datasource": null, + "datasource": "$datasource", "definition": "label_values(kubernetes_build_info{organization=\"$organization\"},cluster_id)", "hide": 0, "includeAll": false, diff --git a/helm/dashboards/dashboards/aws/public/karpenter.json b/helm/dashboards/dashboards/aws/public/karpenter.json index c5865472..77114d34 100644 --- a/helm/dashboards/dashboards/aws/public/karpenter.json +++ b/helm/dashboards/dashboards/aws/public/karpenter.json @@ -23,7 +23,7 @@ "liveNow": false, "panels": [ { - "datasource": null, + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -111,7 +111,7 @@ "pluginVersion": "10.0.3", "targets": [ { - "datasource": null, + "datasource": "$datasource", "editorMode": "code", "exemplar": false, "expr": "karpenter_provisioner_usage_pct{cluster_id=\"$cluster_id\",resource_type=\"memory\"}", @@ -121,7 +121,7 @@ "refId": "A" }, { - "datasource": null, + "datasource": "$datasource", "editorMode": "code", "exemplar": false, "expr": "karpenter_provisioner_usage_pct{cluster_id=\"$cluster_id\",resource_type=\"cpu\"}", @@ -245,7 +245,7 @@ "type": "table" }, { - "datasource": null, + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -320,7 +320,7 @@ "pluginVersion": "10.0.3", "targets": [ { - "datasource": null, + "datasource": "$datasource", "editorMode": "code", "expr": "sum(karpenter_deprovisioning_eligible_machines{cluster_id=\"$cluster_id\"}) by (deprovisioner)", "format": "time_series", @@ -333,7 +333,7 @@ "type": "timeseries" }, { - "datasource": null, + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -404,7 +404,7 @@ "pluginVersion": "10.0.3", "targets": [ { - "datasource": null, + "datasource": "$datasource", "editorMode": "code", "exemplar": false, "expr": "sum(karpenter_interruption_actions_performed{cluster_id=\"$cluster_id\"}) by (action_type)", @@ -420,7 +420,7 @@ "type": "barchart" }, { - "datasource": null, + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -494,7 +494,7 @@ "pluginVersion": "10.0.3", "targets": [ { - "datasource": null, + "datasource": "$datasource", "editorMode": "code", "exemplar": false, "expr": "group(karpenter_deprovisioning_actions_performed{cluster_id=\"$cluster_id\"}) by (action)", @@ -523,7 +523,7 @@ "type": "barchart" }, { - "datasource": null, + "datasource": "$datasource", "fieldConfig": { "defaults": { "color": { @@ -575,7 +575,7 @@ "pluginVersion": "10.0.3", "targets": [ { - "datasource": null, + "datasource": "$datasource", "editorMode": "code", "exemplar": false, "expr": "sum(karpenter_cloudprovider_errors_total{cluster_id=\"$cluster_id\"}) by (error)", @@ -602,12 +602,26 @@ "tags": [], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "label": "Data source", + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "type": "datasource" + }, { "current": { "text": "All", "value": "$__all" }, - "datasource": null, + "datasource": "$datasource", "definition": "label_values(organization)", "description": "organization", "hide": 0, @@ -631,7 +645,7 @@ "text": "All", "value": "$__all" }, - "datasource": null, + "datasource": "$datasource", "definition": "label_values(kubernetes_build_info{organization=\"$organization\"},cluster_id)", "description": "cluster_id", "hide": 0, diff --git a/helm/dashboards/dashboards/aws/public/node-problem-detector.json b/helm/dashboards/dashboards/aws/public/node-problem-detector.json index 5d637fa5..7059e4d2 100644 --- a/helm/dashboards/dashboards/aws/public/node-problem-detector.json +++ b/helm/dashboards/dashboards/aws/public/node-problem-detector.json @@ -25,7 +25,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 4, @@ -63,7 +63,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -141,7 +141,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(problem_gauge{cluster_id=\"$cluster_id\"}) by (type)", @@ -157,7 +157,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "fieldConfig": { "defaults": { @@ -237,7 +237,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -261,6 +261,20 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "label": "Data source", + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "type": "datasource" + }, { "current": { "selected": false, @@ -269,7 +283,7 @@ }, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "definition": "label_values(problem_counter,cluster_id)", "hide": 0, diff --git a/helm/dashboards/dashboards/home.json b/helm/dashboards/dashboards/home.json index 9e2dee1e..1c49a58b 100644 --- a/helm/dashboards/dashboards/home.json +++ b/helm/dashboards/dashboards/home.json @@ -19,33 +19,6 @@ "links": [], "panels": [ { - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 2, - "options": { - "analyticsOptions": { - "dashboard": "$__dashboard", - "flatten": false, - "heartbeatAlways": false, - "heartbeatInterval": 60, - "postEnd": false, - "postHeartbeat": false, - "postStart": true, - "server": "/analytics-plugin/write", - "showDetails": false - } - }, - "title": " ", - "transparent": true, - "type": "macropower-analytics-panel" - }, - { - "datasource": null, "description": "", "gridPos": { "h": 9, @@ -64,7 +37,6 @@ "type": "text" }, { - "datasource": null, "description": "", "gridPos": { "h": 22, @@ -90,7 +62,6 @@ "type": "dashlist" }, { - "datasource": null, "description": "Here you find latest release notes explaining changes on dashboards. Also find these at docs.giantswarm.io > Changes and releases.", "gridPos": { "h": 15, diff --git a/helm/dashboards/dashboards/mixin/cluster-total.json b/helm/dashboards/dashboards/mixin/cluster-total.json index f52e03ee..c87f26d9 100644 --- a/helm/dashboards/dashboards/mixin/cluster-total.json +++ b/helm/dashboards/dashboards/mixin/cluster-total.json @@ -1538,6 +1538,20 @@ ], "templating": { "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "label": "Data source", + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "type": "datasource" + }, { "allValue": null, "auto": false, @@ -1614,20 +1628,6 @@ "type": "interval", "useTags": false }, - { - "current": { - "text": "default", - "value": "default" - }, - "hide": 0, - "label": "Data Source", - "name": "datasource", - "options": [], - "query": "prometheus", - "refresh": 1, - "regex": "", - "type": "datasource" - }, { "allValue": null, "current": {}, diff --git a/helm/dashboards/dashboards/mixin/controller-manager.json b/helm/dashboards/dashboards/mixin/controller-manager.json index 5a55493e..c4dee138 100644 --- a/helm/dashboards/dashboards/mixin/controller-manager.json +++ b/helm/dashboards/dashboards/mixin/controller-manager.json @@ -948,7 +948,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/docker-io-images.json b/helm/dashboards/dashboards/mixin/docker-io-images.json index e8d630fc..cd8f03c7 100644 --- a/helm/dashboards/dashboards/mixin/docker-io-images.json +++ b/helm/dashboards/dashboards/mixin/docker-io-images.json @@ -26,7 +26,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "gridPos": { "h": 5, @@ -51,7 +51,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Number of all containers running in workload clusters", "fieldConfig": { @@ -99,7 +99,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -116,7 +116,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Number of containers in workload clusters with image from docker.io", "fieldConfig": { @@ -164,7 +164,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -181,7 +181,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Percentage of containers in workload clusters with image from docker.io", "fieldConfig": { @@ -229,7 +229,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -246,7 +246,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Count of all containers in workload clusters using images from docker.io, excluding those with prefix \"docker.io/giantswarm\".", "fieldConfig": { @@ -327,7 +327,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "expr": "sum(kube_pod_container_info{image_spec=~\"docker.io.*\",image_spec!~\".*/giantswarm/.*\",cluster_type=\"workload_cluster\"} or kube_pod_init_container_info{image_spec=~\"docker.io.*\",image_spec!~\".*/giantswarm/.*\",cluster_type=\"workload_cluster\"})", @@ -343,7 +343,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "Details of all containers in workload clusters using images from docker.io, excluding those with prefix \"docker.io/giantswarm\".", "fieldConfig": { @@ -420,7 +420,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -468,7 +468,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "description": "A flat list of the images used and the number of containers using the image", "fieldConfig": { @@ -545,7 +545,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "$datasource" }, "editorMode": "code", "exemplar": false, @@ -596,7 +596,22 @@ "owner:team-honeybadger" ], "templating": { - "list": [] + "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "label": "Data source", + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "type": "datasource" + } + ] }, "time": { "from": "now-15m", diff --git a/helm/dashboards/dashboards/mixin/k8s-resources-cluster.json b/helm/dashboards/dashboards/mixin/k8s-resources-cluster.json index a9fb0368..a08f78f2 100644 --- a/helm/dashboards/dashboards/mixin/k8s-resources-cluster.json +++ b/helm/dashboards/dashboards/mixin/k8s-resources-cluster.json @@ -2643,7 +2643,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/k8s-resources-multicluster.json b/helm/dashboards/dashboards/mixin/k8s-resources-multicluster.json index c1d543d9..fc865d7c 100644 --- a/helm/dashboards/dashboards/mixin/k8s-resources-multicluster.json +++ b/helm/dashboards/dashboards/mixin/k8s-resources-multicluster.json @@ -1168,7 +1168,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/k8s-resources-namespace.json b/helm/dashboards/dashboards/mixin/k8s-resources-namespace.json index 0cd31867..a3e89e0e 100644 --- a/helm/dashboards/dashboards/mixin/k8s-resources-namespace.json +++ b/helm/dashboards/dashboards/mixin/k8s-resources-namespace.json @@ -2369,7 +2369,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/k8s-resources-node.json b/helm/dashboards/dashboards/mixin/k8s-resources-node.json index a62be0f7..5ada1812 100644 --- a/helm/dashboards/dashboards/mixin/k8s-resources-node.json +++ b/helm/dashboards/dashboards/mixin/k8s-resources-node.json @@ -1078,7 +1078,7 @@ }, "hide": 0, "includeAll": false, - "label": "Data Source", + "label": "Data source", "multi": false, "name": "datasource", "options": [], diff --git a/helm/dashboards/dashboards/mixin/k8s-resources-pod.json b/helm/dashboards/dashboards/mixin/k8s-resources-pod.json index 84d31366..bd5f4116 100644 --- a/helm/dashboards/dashboards/mixin/k8s-resources-pod.json +++ b/helm/dashboards/dashboards/mixin/k8s-resources-pod.json @@ -2060,7 +2060,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/k8s-resources-workloads-namespace.json b/helm/dashboards/dashboards/mixin/k8s-resources-workloads-namespace.json index bbefc2b4..c4e8292d 100644 --- a/helm/dashboards/dashboards/mixin/k8s-resources-workloads-namespace.json +++ b/helm/dashboards/dashboards/mixin/k8s-resources-workloads-namespace.json @@ -1795,7 +1795,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/kube-proxy.json b/helm/dashboards/dashboards/mixin/kube-proxy.json index 167b2fb2..c5bc75f0 100644 --- a/helm/dashboards/dashboards/mixin/kube-proxy.json +++ b/helm/dashboards/dashboards/mixin/kube-proxy.json @@ -1106,7 +1106,7 @@ "value": "default" }, "hide": 0, - "label": null, + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", @@ -1142,6 +1142,7 @@ }, { "current": {}, + "datasource": "$datasource", "definition": "label_values(process_cpu_seconds_total{app=\"kube-proxy\"}, cluster_id)", "hide": 0, "includeAll": false, diff --git a/helm/dashboards/dashboards/mixin/namespace-by-pod.json b/helm/dashboards/dashboards/mixin/namespace-by-pod.json index 62a4fe94..34c265aa 100644 --- a/helm/dashboards/dashboards/mixin/namespace-by-pod.json +++ b/helm/dashboards/dashboards/mixin/namespace-by-pod.json @@ -1138,7 +1138,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/namespace-by-workload.json b/helm/dashboards/dashboards/mixin/namespace-by-workload.json index 00506ac3..5a58a063 100644 --- a/helm/dashboards/dashboards/mixin/namespace-by-workload.json +++ b/helm/dashboards/dashboards/mixin/namespace-by-workload.json @@ -1350,7 +1350,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/persistentvolumesusage.json b/helm/dashboards/dashboards/mixin/persistentvolumesusage.json index 711f9f70..c5262bc1 100644 --- a/helm/dashboards/dashboards/mixin/persistentvolumesusage.json +++ b/helm/dashboards/dashboards/mixin/persistentvolumesusage.json @@ -399,7 +399,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/pod-total.json b/helm/dashboards/dashboards/mixin/pod-total.json index 81619bd9..c2945898 100644 --- a/helm/dashboards/dashboards/mixin/pod-total.json +++ b/helm/dashboards/dashboards/mixin/pod-total.json @@ -904,7 +904,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/scheduler.json b/helm/dashboards/dashboards/mixin/scheduler.json index b3202a49..4ecefc0a 100644 --- a/helm/dashboards/dashboards/mixin/scheduler.json +++ b/helm/dashboards/dashboards/mixin/scheduler.json @@ -882,7 +882,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/statefulset.json b/helm/dashboards/dashboards/mixin/statefulset.json index 615d5f33..6c01592c 100644 --- a/helm/dashboards/dashboards/mixin/statefulset.json +++ b/helm/dashboards/dashboards/mixin/statefulset.json @@ -732,7 +732,7 @@ "value": "default" }, "hide": 0, - "label": null, + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/helm/dashboards/dashboards/mixin/workload-total.json b/helm/dashboards/dashboards/mixin/workload-total.json index 279c8396..dc0ccbb3 100644 --- a/helm/dashboards/dashboards/mixin/workload-total.json +++ b/helm/dashboards/dashboards/mixin/workload-total.json @@ -1062,7 +1062,7 @@ "value": "default" }, "hide": 0, - "label": "Data Source", + "label": "Data source", "name": "datasource", "options": [], "query": "prometheus", diff --git a/linter/config.yaml b/linter/config.yaml index 48eea7a3..126e89ac 100644 --- a/linter/config.yaml +++ b/linter/config.yaml @@ -7,7 +7,11 @@ exclusions: reason: We are not using it. template-job-rule: reason: We are not using it. + target-rate-interval-rule: + reason: We are not using it. panel-units-rule: reason: We are not using it even though we should. panel-title-description-rule: reason: We are not using it even though we should. + template-on-time-change-reload-rule: + reason: We are not using it. diff --git a/linter/lint-dashboards.sh b/linter/lint-dashboards.sh new file mode 100755 index 00000000..afc02cce --- /dev/null +++ b/linter/lint-dashboards.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +# Lint dashboards using the config.yaml +# +# Usage: +# ./linter/lint-dashboards.sh + +set -euo pipefail + +# Dashboard directory +DASHBOARDS_DIRECTORY=./helm/dashboards + +listDashboards () { + # find all dashboards ".json" files and remove the home.json and values.schema.json files + find "$DASHBOARDS_DIRECTORY" -type f -name \*.json \ + | grep -v 'values.schema.json' \ + | grep -v 'home.json' +} + +main() { + local returncode=0 + + # Investigation section + ######################## + + # Retrieve list of opsrecipes + mapfile -t dashboards < <(listDashboards) + + for dashboard in "${dashboards[@]}"; do + echo "-------" + echo "Linting \"$dashboard\"" + dashboard-linter lint -c linter/config.yaml "$dashboard" + done + + return "$returncode" +} + +main "$@"