Node: Missing cluster label

kubernetes-monitoring · Nov 22, 2023 · 0e5c99c · 0e5c99c
1 parent 5e51bba
commit 0e5c99c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,12 @@
 BIN_DIR ?= $(shell pwd)/tmp/bin
 
 JSONNET_VENDOR=vendor
-GRAFANA_DASHBOARD_LINTER_BIN=$(BIN_DIR)/dashboard-linter
-JB_BIN=$(BIN_DIR)/jb
-JSONNET_BIN=$(BIN_DIR)/jsonnet
-JSONNETLINT_BIN=$(BIN_DIR)/jsonnet-lint
-JSONNETFMT_BIN=$(BIN_DIR)/jsonnetfmt
-PROMTOOL_BIN=$(BIN_DIR)/promtool
+GRAFANA_DASHBOARD_LINTER_BIN=dashboard-linter
+JB_BIN=jb
+JSONNET_BIN=jsonnet
+JSONNETLINT_BIN=jsonnet-lint
+JSONNETFMT_BIN=jsonnetfmt
+PROMTOOL_BIN=promtool
 TOOLING=$(JB_BIN) $(JSONNETLINT_BIN) $(JSONNET_BIN) $(JSONNETFMT_BIN) $(PROMTOOL_BIN) $(GRAFANA_DASHBOARD_LINTER_BIN)
 JSONNETFMT_ARGS=-n 2 --max-blank-lines 2 --string-style s --comment-style s
 SRC_DIR ?=dashboards
@@ -74,7 +74,7 @@ $(BIN_DIR):
 
 $(TOOLING): $(BIN_DIR)
 	@echo Installing tools from hack/tools.go
-	@cd scripts && go list -mod=mod -tags tools -f '{{ range .Imports }}{{ printf "%s\n" .}}{{end}}' ./ | xargs -tI % go build -mod=mod -o $(BIN_DIR) %
+	#@cd scripts && go list -mod=mod -tags tools -f '{{ range .Imports }}{{ printf "%s\n" .}}{{end}}' ./ | xargs -tI % go build -mod=mod -o $(BIN_DIR) %
 
 ########################################
 # "check-with-upstream" workflow checks.

diff --git a/rules/node.libsonnet b/rules/node.libsonnet
@@ -32,8 +32,8 @@
             expr: |||
               count by (%(clusterLabel)s, node) (
                 node_cpu_seconds_total{mode="idle",%(nodeExporterSelector)s}
-                * on (namespace, %(podLabel)s) group_left(node)
-                topk by(namespace, %(podLabel)s) (1, node_namespace_pod:kube_pod_info:)
+                * on (%(clusterLabel)s, namespace, %(podLabel)s) group_left(node)
+                topk by(%(clusterLabel)s, namespace, %(podLabel)s) (1, node_namespace_pod:kube_pod_info:)
               )
             ||| % $._config,
           },