From 4b52d9cb916eafceae71da6efd15ed29d9d4404c Mon Sep 17 00:00:00 2001 From: David Calvert Date: Thu, 4 Jan 2024 11:17:21 +0100 Subject: [PATCH] feat: cluster var in prom,trivy,apisrv,coredns Signed-off-by: David Calvert --- dashboards/k8s-addons-prometheus.json | 116 ++++++++++++++-------- dashboards/k8s-addons-trivy-operator.json | 84 ++++++++++------ dashboards/k8s-system-api-server.json | 54 +++++++--- dashboards/k8s-system-coredns.json | 74 +++++++++----- 4 files changed, 220 insertions(+), 108 deletions(-) diff --git a/dashboards/k8s-addons-prometheus.json b/dashboards/k8s-addons-prometheus.json index 7786ef2..c13dfe3 100644 --- a/dashboards/k8s-addons-prometheus.json +++ b/dashboards/k8s-addons-prometheus.json @@ -149,7 +149,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "prometheus_build_info{pod=~\"$pod\"}", + "expr": "prometheus_build_info{pod=~\"$pod\", cluster=~\"$cluster\"}", "instant": true, "interval": "", "legendFormat": "{{ version }}", @@ -216,7 +216,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "up{pod=~\"$pod\"} < 1", + "expr": "up{pod=~\"$pod\", cluster=~\"$cluster\"} < 1", "instant": true, "interval": "", "legendFormat": "__auto", @@ -276,7 +276,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(prometheus_tsdb_head_series{pod=~\"$pod\"}) by (pod)", + "expr": "sum(prometheus_tsdb_head_series{pod=~\"$pod\", cluster=~\"$cluster\"}) by (pod)", "interval": "", "legendFormat": "__auto", "range": true, @@ -338,7 +338,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(prometheus_sd_discovered_targets{pod=~\"$pod\"}) by (pod)", + "expr": "sum(prometheus_sd_discovered_targets{pod=~\"$pod\", cluster=~\"$cluster\"}) by (pod)", "instant": true, "interval": "", "legendFormat": "__auto", @@ -464,7 +464,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "up{pod=~\"$pod\"}", + "expr": "up{pod=~\"$pod\", cluster=~\"$cluster\"}", "interval": "", "legendFormat": "{{ pod }}", "range": true, @@ -563,7 +563,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(prometheus_config_last_reload_successful{pod=~\"$pod\"}) by (pod)", + "expr": "sum(prometheus_config_last_reload_successful{pod=~\"$pod\", cluster=~\"$cluster\"}) by (pod)", "interval": "", "legendFormat": "{{ pod }}", "range": true, @@ -666,7 +666,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(prometheus_target_scrapes_exceeded_body_size_limit_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_target_scrapes_exceeded_body_size_limit_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "", "legendFormat": "{{ pod }} - Exceeded body size limit", "range": true, @@ -678,7 +678,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(rate(prometheus_target_scrapes_exceeded_sample_limit_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_target_scrapes_exceeded_sample_limit_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "hide": false, "legendFormat": "{{ pod }} - Exceeded sample limit", "range": true, @@ -690,7 +690,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(rate(prometheus_target_scrapes_sample_duplicate_timestamp_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_target_scrapes_sample_duplicate_timestamp_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "hide": false, "legendFormat": "{{ pod }} - Duplicate timestamp", "range": true, @@ -702,7 +702,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(rate(prometheus_target_scrapes_sample_out_of_bounds_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_target_scrapes_sample_out_of_bounds_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "hide": false, "legendFormat": "{{ pod }} - Sample out of bounds", "range": true, @@ -714,7 +714,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(rate(prometheus_target_scrapes_sample_out_of_order_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_target_scrapes_sample_out_of_order_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "hide": false, "legendFormat": "{{ pod }} - Sample out of order", "range": true, @@ -817,7 +817,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(prometheus_sd_discovered_targets{pod=~\"$pod\"}) by (pod)", + "expr": "sum(prometheus_sd_discovered_targets{pod=~\"$pod\", cluster=~\"$cluster\"}) by (pod)", "interval": "", "legendFormat": "{{ pod }}", "range": true, @@ -920,7 +920,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(prometheus_target_sync_length_seconds_sum{pod=~\"$pod\"}[$__rate_interval])) by (pod, scrape_job) * 1000", + "expr": "sum(rate(prometheus_target_sync_length_seconds_sum{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod, scrape_job) * 1000", "interval": "", "legendFormat": "{{ pod }} - {{ scrape_job }}", "range": true, @@ -1023,7 +1023,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "round(sum(rate(prometheus_target_interval_length_seconds_sum{pod=~\"$pod\"}[$__rate_interval]) / rate(prometheus_target_interval_length_seconds_count{pod=~\"$pod\"}[$__rate_interval])) by (pod))", + "expr": "round(sum(rate(prometheus_target_interval_length_seconds_sum{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval]) / rate(prometheus_target_interval_length_seconds_count{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod))", "interval": "", "legendFormat": "{{ pod }}", "range": true, @@ -1152,7 +1152,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(prometheus_tsdb_head_series{pod=~\"$pod\"}) by (pod)", + "expr": "sum(prometheus_tsdb_head_series{pod=~\"$pod\", cluster=~\"$cluster\"}) by (pod)", "interval": "", "legendFormat": "{{ pod }} - Head Series", "range": true, @@ -1164,7 +1164,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(prometheus_tsdb_head_chunks{pod=~\"$pod\"}) by (pod)", + "expr": "sum(prometheus_tsdb_head_chunks{pod=~\"$pod\", cluster=~\"$cluster\"}) by (pod)", "hide": false, "legendFormat": "{{ pod }} - Head Chunks", "range": true, @@ -1267,7 +1267,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(prometheus_tsdb_head_samples_appended_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_tsdb_head_samples_appended_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "", "legendFormat": "{{ pod }}", "range": true, @@ -1370,7 +1370,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(prometheus_tsdb_blocks_loaded{pod=~\"$pod\"}) by (pod)", + "expr": "sum(prometheus_tsdb_blocks_loaded{pod=~\"$pod\", cluster=~\"$cluster\"}) by (pod)", "interval": "", "legendFormat": "{{ pod }} - Head Series", "range": true, @@ -1473,7 +1473,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(prometheus_tsdb_compactions_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_tsdb_compactions_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "", "legendFormat": "{{ pod }} - Total Compactions", "range": true, @@ -1485,7 +1485,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(rate(prometheus_tsdb_compactions_triggered_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_tsdb_compactions_triggered_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "hide": false, "legendFormat": "{{ pod }} - Triggered Compactions", "range": true, @@ -1497,7 +1497,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(rate(prometheus_tsdb_compactions_skipped_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_tsdb_compactions_skipped_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "hide": false, "legendFormat": "{{ pod }} - Skipped Compactions", "range": true, @@ -1509,7 +1509,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(rate(prometheus_tsdb_compactions_failed_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_tsdb_compactions_failed_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "hide": false, "legendFormat": "{{ pod }} - Failed Compactions", "range": true, @@ -1612,7 +1612,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(prometheus_tsdb_reloads_failures_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_tsdb_reloads_failures_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "", "legendFormat": "{{ pod }}", "range": true, @@ -1715,7 +1715,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(prometheus_tsdb_head_series_created_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_tsdb_head_series_created_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "", "legendFormat": "{{ pod }} - Created series", "range": true, @@ -1727,7 +1727,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(rate(prometheus_tsdb_head_series_removed_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_tsdb_head_series_removed_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "hide": false, "legendFormat": "{{ pod }} - Deleted series", "range": true, @@ -1830,7 +1830,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(prometheus_engine_query_duration_seconds_count{pod=~\"$pod\", slice=\"inner_eval\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(prometheus_engine_query_duration_seconds_count{pod=~\"$pod\", slice=\"inner_eval\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "", "legendFormat": "{{ pod }}", "range": true, @@ -1933,7 +1933,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "max(prometheus_engine_query_duration_seconds{pod=~\"$pod\"}) by (pod, slice) * 1000", + "expr": "max(prometheus_engine_query_duration_seconds{pod=~\"$pod\", cluster=~\"$cluster\"}) by (pod, slice) * 1000", "interval": "", "legendFormat": "{{ pod }} - {{ slice }}", "range": true, @@ -2080,7 +2080,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(container_cpu_usage_seconds_total{pod=~\"$pod\", image!=\"\", container!=\"\"}[$__rate_interval])) by (pod, container)", + "expr": "sum(rate(container_cpu_usage_seconds_total{pod=~\"$pod\", image!=\"\", container!=\"\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod, container)", "interval": "$resolution", "legendFormat": "{{ pod }} - {{ container }}", "range": true, @@ -2184,7 +2184,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{pod=~\"$pod\", image!=\"\", container!=\"\"}) by (pod, container)", + "expr": "sum(container_memory_working_set_bytes{pod=~\"$pod\", image!=\"\", container!=\"\", cluster=~\"$cluster\"}) by (pod, container)", "interval": "", "legendFormat": "{{ pod }} - {{ container }}", "range": true, @@ -2313,7 +2313,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\"}) by (persistentvolumeclaim)", + "expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)", "interval": "", "legendFormat": "{{ persistentvolumeclaim }}", "range": true, @@ -2416,7 +2416,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\"}) by (persistentvolumeclaim)", + "expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)", "interval": "", "legendFormat": "{{ persistentvolumeclaim }} - Used", "range": true, @@ -2429,7 +2429,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\"}) by (persistentvolumeclaim)", + "expr": "sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)", "hide": false, "legendFormat": "{{ persistentvolumeclaim }} - Capacity", "range": true, @@ -2527,7 +2527,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "1 - sum(kubelet_volume_stats_inodes_used{persistentvolumeclaim=~\".*prom.*\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_inodes{persistentvolumeclaim=~\".*prom.*\"}) by (persistentvolumeclaim)", + "expr": "1 - sum(kubelet_volume_stats_inodes_used{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_inodes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -2652,7 +2652,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(container_network_receive_bytes_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(container_network_receive_bytes_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }} - Received", "range": true, @@ -2665,7 +2665,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "- sum(rate(container_network_transmit_bytes_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "- sum(rate(container_network_transmit_bytes_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }} - Transmitted", "range": true, @@ -2761,7 +2761,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(container_network_receive_packets_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(container_network_receive_packets_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }} - Received", "range": true, @@ -2774,7 +2774,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "- sum(rate(container_network_transmit_packets_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "- sum(rate(container_network_transmit_packets_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }} - Transmitted", "range": true, @@ -2870,7 +2870,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(container_network_receive_packets_dropped_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(container_network_receive_packets_dropped_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }} - Received", "range": true, @@ -2883,7 +2883,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "- sum(rate(container_network_transmit_packets_dropped_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "- sum(rate(container_network_transmit_packets_dropped_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }} - Transmitted", "range": true, @@ -2979,7 +2979,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(container_network_receive_errors_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(container_network_receive_errors_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }} - Received", "range": true, @@ -2992,7 +2992,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "- sum(rate(container_network_transmit_errors_total{pod=~\"$pod\"}[$__rate_interval])) by (pod)", + "expr": "- sum(rate(container_network_transmit_errors_total{pod=~\"$pod\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }} - Transmitted", "range": true, @@ -3031,6 +3031,34 @@ "skipUrlSync": false, "type": "datasource" }, + { + "current": { + "isNone": true, + "selected": false, + "text": "None", + "value": "" + }, + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "definition": "label_values(kube_node_info,cluster)", + "hide": 0, + "includeAll": false, + "multi": false, + "name": "cluster", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(kube_node_info,cluster)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, { "current": { "selected": false, @@ -3041,14 +3069,14 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(prometheus_build_info, pod)", + "definition": "label_values(prometheus_build_info{cluster=\"$cluster\"}, pod)", "hide": 0, "includeAll": true, "multi": false, "name": "pod", "options": [], "query": { - "query": "label_values(prometheus_build_info, pod)", + "query": "label_values(prometheus_build_info{cluster=\"$cluster\"}, pod)", "refId": "StandardVariableQuery" }, "refresh": 2, @@ -3117,6 +3145,6 @@ "timezone": "", "title": "Prometheus", "uid": "k8s_addons_prometheus", - "version": 1, + "version": 2, "weekStart": "" } \ No newline at end of file diff --git a/dashboards/k8s-addons-trivy-operator.json b/dashboards/k8s-addons-trivy-operator.json index e4bc5c3..335dcb8 100644 --- a/dashboards/k8s-addons-trivy-operator.json +++ b/dashboards/k8s-addons-trivy-operator.json @@ -146,7 +146,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_image_vulnerabilities{severity=\"Critical\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_image_vulnerabilities{severity=\"Critical\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -214,7 +214,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_image_vulnerabilities{severity=\"High\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_image_vulnerabilities{severity=\"High\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -282,7 +282,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_image_vulnerabilities{severity=\"Medium\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_image_vulnerabilities{severity=\"Medium\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -350,7 +350,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_image_vulnerabilities{severity=\"Low\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_image_vulnerabilities{severity=\"Low\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -418,7 +418,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_image_vulnerabilities{severity=\"Unknown\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_image_vulnerabilities{severity=\"Unknown\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -486,7 +486,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_image_vulnerabilities{namespace=~\"$namespace\"})", + "expr": "sum(trivy_image_vulnerabilities{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -582,7 +582,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_image_vulnerabilities) by (namespace)", + "expr": "sum(trivy_image_vulnerabilities{cluster=~\"$cluster\"}) by (namespace)", "instant": false, "interval": "$resolution", "legendFormat": "{{namespace}}", @@ -755,7 +755,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_image_vulnerabilities) by (severity)", + "expr": "sum(trivy_image_vulnerabilities{cluster=~\"$cluster\"}) by (severity)", "instant": false, "interval": "$resolution", "legendFormat": "__auto", @@ -883,7 +883,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_image_vulnerabilities{namespace=~\"$namespace\"}) by (namespace, image_registry, image_repository, image_tag, severity) > 0", + "expr": "sum(trivy_image_vulnerabilities{namespace=~\"$namespace\", cluster=~\"$cluster\"}) by (namespace, image_registry, image_repository, image_tag, severity) > 0", "format": "table", "instant": false, "legendFormat": "__auto", @@ -1110,7 +1110,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_vulnerability_id{vuln_id=~\"CVE.*\", namespace=~\"$namespace\"}) by (namespace, image_registry, image_repository, image_tag, vuln_id, severity)", + "expr": "sum(trivy_vulnerability_id{vuln_id=~\"CVE.*\", namespace=~\"$namespace\", cluster=~\"$cluster\"}) by (namespace, image_registry, image_repository, image_tag, vuln_id, severity)", "format": "table", "instant": false, "interval": "$resolution", @@ -1291,7 +1291,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_resource_configaudits{severity=\"Critical\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_resource_configaudits{severity=\"Critical\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -1359,7 +1359,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_resource_configaudits{severity=\"High\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_resource_configaudits{severity=\"High\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -1427,7 +1427,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_resource_configaudits{severity=\"Medium\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_resource_configaudits{severity=\"Medium\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -1495,7 +1495,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_resource_configaudits{severity=\"Low\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_resource_configaudits{severity=\"Low\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -1563,7 +1563,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_resource_configaudits{namespace=~\"$namespace\"})", + "expr": "sum(trivy_resource_configaudits{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -1659,7 +1659,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_resource_configaudits) by (namespace)", + "expr": "sum(trivy_resource_configaudits{cluster=~\"$cluster\"}) by (namespace)", "instant": false, "interval": "$resolution", "legendFormat": "__auto", @@ -1817,7 +1817,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_resource_configaudits) by (severity)", + "expr": "sum(trivy_resource_configaudits{cluster=~\"$cluster\"}) by (severity)", "instant": false, "interval": "$resolution", "legendFormat": "__auto", @@ -1899,7 +1899,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_role_rbacassessments{severity=\"Critical\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_role_rbacassessments{severity=\"Critical\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -1967,7 +1967,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_role_rbacassessments{severity=\"High\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_role_rbacassessments{severity=\"High\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -2035,7 +2035,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_role_rbacassessments{severity=\"Medium\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_role_rbacassessments{severity=\"Medium\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -2103,7 +2103,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_role_rbacassessments{severity=\"Low\", namespace=~\"$namespace\"})", + "expr": "sum(trivy_role_rbacassessments{severity=\"Low\", namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -2171,7 +2171,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_role_rbacassessments{namespace=~\"$namespace\"})", + "expr": "sum(trivy_role_rbacassessments{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "__auto", @@ -2267,7 +2267,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_role_rbacassessments) by (namespace)", + "expr": "sum(trivy_role_rbacassessments{cluster=~\"$cluster\"}) by (namespace)", "instant": false, "interval": "$resolution", "legendFormat": "__auto", @@ -2425,7 +2425,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_role_rbacassessments) by (severity)", + "expr": "sum(trivy_role_rbacassessments{cluster=~\"$cluster\"}) by (severity)", "instant": false, "interval": "$resolution", "legendFormat": "__auto", @@ -2535,7 +2535,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(trivy_image_exposedsecrets) by (namespace)", + "expr": "sum(trivy_image_exposedsecrets{cluster=~\"$cluster\"}) by (namespace)", "instant": false, "interval": "$resolution", "legendFormat": "__auto", @@ -2576,6 +2576,34 @@ "skipUrlSync": false, "type": "datasource" }, + { + "current": { + "isNone": true, + "selected": false, + "text": "None", + "value": "" + }, + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "definition": "label_values(kube_node_info,cluster)", + "hide": 0, + "includeAll": false, + "multi": false, + "name": "cluster", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(kube_node_info,cluster)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, { "current": { "selected": true, @@ -2590,14 +2618,14 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(kube_pod_info, namespace)", + "definition": "label_values(kube_pod_info{cluster=\"$cluster\"}, namespace)", "hide": 0, "includeAll": true, "multi": true, "name": "namespace", "options": [], "query": { - "query": "label_values(kube_pod_info, namespace)", + "query": "label_values(kube_pod_info{cluster=\"$cluster\"}, namespace)", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -2663,6 +2691,6 @@ "timezone": "", "title": "Trivy Operator - Vulnerabilities", "uid": "security_trivy_operator", - "version": 10, + "version": 11, "weekStart": "" } diff --git a/dashboards/k8s-system-api-server.json b/dashboards/k8s-system-api-server.json index f7131c1..be0dcfc 100644 --- a/dashboards/k8s-system-api-server.json +++ b/dashboards/k8s-system-api-server.json @@ -130,7 +130,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "up{job=\"apiserver\"}", + "expr": "up{job=\"apiserver\", cluster=~\"$cluster\"}", "interval": "", "legendFormat": "{{ instance }}", "refId": "A" @@ -216,7 +216,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "apiserver_requested_deprecated_apis", + "expr": "apiserver_requested_deprecated_apis{cluster=~\"$cluster\"}", "interval": "", "legendFormat": "", "refId": "A" @@ -388,7 +388,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum by (code) (rate(apiserver_request_total[$__rate_interval]))", + "expr": "sum by (code) (rate(apiserver_request_total{cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "{{ code }}", "refId": "A" @@ -482,7 +482,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum by (verb) (rate(apiserver_request_total[$__rate_interval]))", + "expr": "sum by (verb) (rate(apiserver_request_total{cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "{{ verb}}", "refId": "A" @@ -576,7 +576,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(apiserver_request_duration_seconds_sum{job=\"apiserver\"}[$__rate_interval])) by (instance)\n/\nsum(rate(apiserver_request_duration_seconds_count{job=\"apiserver\"}[$__rate_interval])) by (instance)", + "expr": "sum(rate(apiserver_request_duration_seconds_sum{job=\"apiserver\", cluster=~\"$cluster\"}[$__rate_interval])) by (instance)\n/\nsum(rate(apiserver_request_duration_seconds_count{job=\"apiserver\", cluster=~\"$cluster\"}[$__rate_interval])) by (instance)", "interval": "$resolution", "legendFormat": "{{ instance }}", "refId": "A" @@ -670,7 +670,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(apiserver_request_duration_seconds_sum{job=\"apiserver\"}[$__rate_interval])) by (verb)\n/\nsum(rate(apiserver_request_duration_seconds_count{job=\"apiserver\"}[$__rate_interval])) by (verb)", + "expr": "sum(rate(apiserver_request_duration_seconds_sum{job=\"apiserver\", cluster=~\"$cluster\"}[$__rate_interval])) by (verb)\n/\nsum(rate(apiserver_request_duration_seconds_count{job=\"apiserver\", cluster=~\"$cluster\"}[$__rate_interval])) by (verb)", "interval": "$resolution", "legendFormat": "{{ verb }}", "refId": "A" @@ -764,7 +764,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum by(instance) (rate(apiserver_request_total{code=~\"5..\", job=\"apiserver\"}[$__rate_interval]))\n / sum by(instance) (rate(apiserver_request_total{job=\"apiserver\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(apiserver_request_total{code=~\"5..\", job=\"apiserver\", cluster=~\"$cluster\"}[$__rate_interval]))\n / sum by(instance) (rate(apiserver_request_total{job=\"apiserver\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "{{ instance }}", "refId": "A" @@ -858,7 +858,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum by(verb) (rate(apiserver_request_total{code=~\"5..\",job=\"apiserver\"}[$__rate_interval]))\n / sum by(verb) (rate(apiserver_request_total{job=\"apiserver\"}[$__rate_interval]))", + "expr": "sum by(verb) (rate(apiserver_request_total{code=~\"5..\",job=\"apiserver\", cluster=~\"$cluster\"}[$__rate_interval]))\n / sum by(verb) (rate(apiserver_request_total{job=\"apiserver\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "{{ verb }}", "refId": "A" @@ -952,7 +952,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(apiserver_request_total[$__rate_interval])) by (instance)", + "expr": "sum(rate(apiserver_request_total{cluster=~\"$cluster\"}[$__rate_interval])) by (instance)", "interval": "$resolution", "legendFormat": "{{ instance }}", "refId": "A" @@ -1046,7 +1046,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(workqueue_depth{job=\"apiserver\"}[$__rate_interval])) by (instance)", + "expr": "sum(rate(workqueue_depth{job=\"apiserver\", cluster=~\"$cluster\"}[$__rate_interval])) by (instance)", "interval": "$resolution", "legendFormat": "{{ instance }}", "refId": "A" @@ -1141,7 +1141,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "rate(process_cpu_seconds_total{job=\"apiserver\"}[$__rate_interval])", + "expr": "rate(process_cpu_seconds_total{job=\"apiserver\", cluster=~\"$cluster\"}[$__rate_interval])", "interval": "$resolution", "legendFormat": "{{ instance }}", "refId": "A" @@ -1235,7 +1235,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "process_resident_memory_bytes{job=\"apiserver\"}", + "expr": "process_resident_memory_bytes{job=\"apiserver\", cluster=~\"$cluster\"}", "interval": "$resolution", "legendFormat": "{{ instance }}", "refId": "A" @@ -1273,6 +1273,34 @@ "skipUrlSync": false, "type": "datasource" }, + { + "current": { + "isNone": true, + "selected": false, + "text": "None", + "value": "" + }, + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "definition": "label_values(kube_node_info,cluster)", + "hide": 0, + "includeAll": false, + "multi": false, + "name": "cluster", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(kube_node_info,cluster)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, { "current": { "selected": true, @@ -1330,6 +1358,6 @@ "timezone": "", "title": "Kubernetes / System / API Server", "uid": "k8s_system_apisrv", - "version": 14, + "version": 15, "weekStart": "" } diff --git a/dashboards/k8s-system-coredns.json b/dashboards/k8s-system-coredns.json index 936678d..2b8464c 100644 --- a/dashboards/k8s-system-coredns.json +++ b/dashboards/k8s-system-coredns.json @@ -131,7 +131,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "up{job=~\"$job\", instance=~\"$instance\"}", + "expr": "up{job=~\"$job\", instance=~\"$instance\", cluster=~\"$cluster\"}", "interval": "", "legendFormat": "{{ instance }}", "refId": "A" @@ -228,7 +228,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "rate(process_cpu_seconds_total{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])", + "expr": "rate(process_cpu_seconds_total{job=~\"$job\", instance=~\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])", "interval": "$resolution", "legendFormat": "{{ instance }}", "refId": "A" @@ -324,7 +324,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "process_resident_memory_bytes{job=~\"$job\", instance=~\"$instance\"}", + "expr": "process_resident_memory_bytes{job=~\"$job\", instance=~\"$instance\", cluster=~\"$cluster\"}", "interval": "", "legendFormat": "{{ instance }}", "refId": "A" @@ -420,7 +420,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(coredns_dns_requests_total{instance=~\"$instance\",proto=\"$protocol\"}[$__rate_interval]))", + "expr": "sum(rate(coredns_dns_requests_total{instance=~\"$instance\",proto=\"$protocol\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "total $protocol requests", "refId": "A" @@ -516,7 +516,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(coredns_dns_request_size_bytes_sum{instance=~\"$instance\",proto=\"$protocol\"}[$__rate_interval])) by (proto) / sum(rate(coredns_dns_request_size_bytes_count{instance=~\"$instance\",proto=\"$protocol\"}[$__rate_interval])) by (proto)", + "expr": "sum(rate(coredns_dns_request_size_bytes_sum{instance=~\"$instance\",proto=\"$protocol\", cluster=~\"$cluster\"}[$__rate_interval])) by (proto) / sum(rate(coredns_dns_request_size_bytes_count{instance=~\"$instance\",proto=\"$protocol\", cluster=~\"$cluster\"}[$__rate_interval])) by (proto)", "interval": "$resolution", "legendFormat": "average $protocol packet size", "refId": "A" @@ -612,7 +612,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(coredns_dns_requests_total{instance=~\"$instance\"}[$__rate_interval])) by (type)", + "expr": "sum(rate(coredns_dns_requests_total{instance=~\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])) by (type)", "interval": "$resolution", "legendFormat": "{{ type }}", "refId": "A" @@ -708,7 +708,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(coredns_dns_responses_total{instance=~\"$instance\"}[$__rate_interval])) by (rcode)", + "expr": "sum(rate(coredns_dns_responses_total{instance=~\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])) by (rcode)", "interval": "$resolution", "legendFormat": "{{ rcode }}", "refId": "A" @@ -804,7 +804,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(coredns_forward_requests_total[$__rate_interval]))", + "expr": "sum(rate(coredns_forward_requests_total{cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "total forward requests", "refId": "A" @@ -900,7 +900,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(coredns_forward_responses_total{rcode=~\"SERVFAIL|REFUSED\"}[$__rate_interval])) by (rcode)", + "expr": "sum(rate(coredns_forward_responses_total{rcode=~\"SERVFAIL|REFUSED\", cluster=~\"$cluster\"}[$__rate_interval])) by (rcode)", "interval": "$resolution", "legendFormat": "{{ rcode }}", "refId": "A" @@ -996,7 +996,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(coredns_cache_hits_total{instance=~\"$instance\"}[$__rate_interval])) by (type)", + "expr": "sum(rate(coredns_cache_hits_total{instance=~\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])) by (type)", "interval": "$resolution", "legendFormat": "{{ type }}", "refId": "A" @@ -1007,7 +1007,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(coredns_cache_misses_total{instance=~\"$instance\"}[$__rate_interval])) by (type)", + "expr": "sum(rate(coredns_cache_misses_total{instance=~\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])) by (type)", "interval": "$resolution", "legendFormat": "misses", "refId": "B" @@ -1103,7 +1103,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(coredns_cache_entries) by (type)", + "expr": "sum(coredns_cache_entries{cluster=~\"$cluster\"}) by (type)", "interval": "", "legendFormat": "{{ type }}", "refId": "A" @@ -1181,7 +1181,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(increase(coredns_dns_request_duration_seconds_bucket{instance=~\"$instance\"}[$__rate_interval])) by (le)", + "expr": "sum(increase(coredns_dns_request_duration_seconds_bucket{instance=~\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])) by (le)", "format": "heatmap", "legendFormat": "{{le}}", "range": true, @@ -1260,7 +1260,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(increase(coredns_forward_request_duration_seconds_bucket{instance=~\"$instance\"}[$__rate_interval])) by (le)", + "expr": "sum(increase(coredns_forward_request_duration_seconds_bucket{instance=~\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])) by (le)", "format": "heatmap", "legendFormat": "{{le}}", "range": true, @@ -1339,7 +1339,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(increase(coredns_dns_request_size_bytes_bucket{instance=~\"$instance\", le!=\"0\"}[$__rate_interval])) by (le)", + "expr": "sum(increase(coredns_dns_request_size_bytes_bucket{instance=~\"$instance\", le!=\"0\", cluster=~\"$cluster\"}[$__rate_interval])) by (le)", "format": "heatmap", "legendFormat": "{{le}}", "range": true, @@ -1418,7 +1418,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(increase(coredns_dns_response_size_bytes_bucket{instance=~\"$instance\", le!=\"0\"}[$__rate_interval])) by (le)", + "expr": "sum(increase(coredns_dns_response_size_bytes_bucket{instance=~\"$instance\", le!=\"0\", cluster=~\"$cluster\"}[$__rate_interval])) by (le)", "format": "heatmap", "legendFormat": "{{le}}", "range": true, @@ -1455,6 +1455,34 @@ "skipUrlSync": false, "type": "datasource" }, + { + "current": { + "isNone": true, + "selected": false, + "text": "None", + "value": "" + }, + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "definition": "label_values(kube_node_info,cluster)", + "hide": 0, + "includeAll": false, + "multi": false, + "name": "cluster", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(kube_node_info,cluster)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, { "current": { "selected": false, @@ -1465,7 +1493,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(up{job=\"$job\"},instance)", + "definition": "label_values(up{job=\"$job\", cluster=\"$cluster\"},instance)", "hide": 0, "includeAll": true, "label": "", @@ -1474,7 +1502,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(up{job=\"$job\"},instance)", + "query": "label_values(up{job=\"$job\", cluster=\"$cluster\"},instance)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, @@ -1497,7 +1525,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(coredns_dns_requests_total, proto)", + "definition": "label_values(coredns_dns_requests_total{cluster=\"$cluster\"}, proto)", "hide": 0, "includeAll": false, "label": "", @@ -1505,7 +1533,7 @@ "name": "protocol", "options": [], "query": { - "query": "label_values(coredns_dns_requests_total, proto)", + "query": "label_values(coredns_dns_requests_total{cluster=\"$cluster\"}, proto)", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -1574,7 +1602,7 @@ "coredns" ] }, - "definition": "label_values(coredns_build_info,job)", + "definition": "label_values(coredns_build_info{cluster=\"$cluster\"},job)", "hide": 0, "includeAll": false, "multi": true, @@ -1582,7 +1610,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(coredns_build_info,job)", + "query": "label_values(coredns_build_info{cluster=\"$cluster\"},job)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, @@ -1601,6 +1629,6 @@ "timezone": "", "title": "Kubernetes / System / CoreDNS", "uid": "k8s_system_coredns", - "version": 15, + "version": 16, "weekStart": "" }