From 8c712eaa36656b76b06de13ce94afa543f3551e8 Mon Sep 17 00:00:00 2001 From: Luis Vidal Ernst Date: Tue, 27 Apr 2021 12:47:23 +0200 Subject: [PATCH 1/2] Fixed labels in windows addon --- jsonnet/kube-prometheus/addons/windows.libsonnet | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jsonnet/kube-prometheus/addons/windows.libsonnet b/jsonnet/kube-prometheus/addons/windows.libsonnet index cbf9071a..89920322 100644 --- a/jsonnet/kube-prometheus/addons/windows.libsonnet +++ b/jsonnet/kube-prometheus/addons/windows.libsonnet @@ -3,6 +3,7 @@ local windowsrules = import 'kubernetes-mixin/rules/windows.libsonnet'; { values+:: { + // This needs to follow prometheus naming convention and not prometheus-operator one windowsScrapeConfig+:: { job_name: 'windows-exporter', static_configs: [ @@ -15,10 +16,10 @@ local windowsrules = import 'kubernetes-mixin/rules/windows.libsonnet'; action: 'replace', regex: '(.*)', replacement: '$1', - sourceLabels: [ + source_labels: [ '__meta_kubernetes_endpoint_address_target_name', ], - targetLabel: 'instance', + target_label: 'instance', }, ], }, From 419eaf28cef7a0e920c7dc7144dd1a28721b9b31 Mon Sep 17 00:00:00 2001 From: Luis Vidal Ernst Date: Tue, 27 Apr 2021 12:49:29 +0200 Subject: [PATCH 2/2] Fixed windows addon example --- examples/windows.jsonnet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/windows.jsonnet b/examples/windows.jsonnet index 0c9ff36f..d90fb8da 100644 --- a/examples/windows.jsonnet +++ b/examples/windows.jsonnet @@ -7,9 +7,9 @@ local kp = namespace: 'monitoring', }, windowsScrapeConfig+:: { - static_configs: { + static_configs: [{ targets: ['10.240.0.65:5000', '10.240.0.63:5000'], - }, + }], }, }, };