Skip to content

Commit 716220d

Browse files
petewallpetewall
authored
Set the job label for annotation discoverered metric sources (#1717)
* Set the job label for annotation discovererd metric sources order: * k8s.grafana.com/job (annotation) * app.kubernetes.io/name (label) * app (label) * container or service name Signed-off-by: Pete Wall <[email protected]> * Update tests Also, add makefile targets to update the tests in the future Signed-off-by: Pete Wall <[email protected]> --------- Signed-off-by: Pete Wall <[email protected]>
1 parent d42da5c commit 716220d

File tree

40 files changed

+891
-7
lines changed

40 files changed

+891
-7
lines changed

‎charts/k8s-monitoring/Makefile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,3 +242,15 @@ ifdef HAS_HELM_UNITTEST
242242
else
243243
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 --failfast --with-subchart=false .
244244
endif
245+
246+
.PHONY: update-test-snapshots
247+
update-test-snapshots:
248+
ifdef HAS_HELM_UNITTEST
249+
helm unittest --with-subchart=false . --update-snapshot
250+
else
251+
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 --with-subchart=false . --update-snapshot
252+
endif
253+
set -e && \
254+
for chart in $(FEATURE_CHARTS); do \
255+
make -C charts/$$chart update-test-snapshots; \
256+
done

‎charts/k8s-monitoring/charts/feature-annotation-autodiscovery/Makefile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,11 @@ ifdef HAS_HELM_UNITTEST
3232
else
3333
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 .
3434
endif
35+
36+
.PHONY: update-test-snapshots
37+
update-test-snapshots:
38+
ifdef HAS_HELM_UNITTEST
39+
helm unittest . --update-snapshot
40+
else
41+
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 . --update-snapshot
42+
endif

‎charts/k8s-monitoring/charts/feature-annotation-autodiscovery/templates/_pods.alloy.tpl‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,21 @@ discovery.relabel "annotation_autodiscovery_pods" {
7171
source_labels = ["{{ include "pod_annotation" .Values.annotations.job }}"]
7272
target_label = "job"
7373
}
74+
rule {
75+
source_labels = ["job", "{{ include "pod_label" "app.kubernetes.io/name" }}"]
76+
regex = ";(.+)"
77+
target_label = "job"
78+
}
79+
rule {
80+
source_labels = ["job", "{{ include "pod_label" "app" }}"]
81+
regex = ";(.+)"
82+
target_label = "job"
83+
}
84+
rule {
85+
source_labels = ["job", "container"]
86+
regex = ";(.+)"
87+
target_label = "job"
88+
}
7489
rule {
7590
source_labels = ["{{ include "pod_annotation" .Values.annotations.instance }}"]
7691
target_label = "instance"

‎charts/k8s-monitoring/charts/feature-annotation-autodiscovery/templates/_services.alloy.tpl‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,21 @@ discovery.relabel "annotation_autodiscovery_services" {
5656
source_labels = ["{{ include "service_annotation" .Values.annotations.job }}"]
5757
target_label = "job"
5858
}
59+
rule {
60+
source_labels = ["job", "{{ include "service_label" "app.kubernetes.io/name" }}"]
61+
regex = ";(.+)"
62+
target_label = "job"
63+
}
64+
rule {
65+
source_labels = ["job", "{{ include "service_label" "app" }}"]
66+
regex = ";(.+)"
67+
target_label = "job"
68+
}
69+
rule {
70+
source_labels = ["job", "service"]
71+
regex = ";(.+)"
72+
target_label = "job"
73+
}
5974
rule {
6075
source_labels = ["{{ include "service_annotation" .Values.annotations.instance }}"]
6176
target_label = "instance"

‎charts/k8s-monitoring/charts/feature-annotation-autodiscovery/tests/__snapshot__/default_test.yaml.snap‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,21 @@ creates a module with default discovery, scraping, and processing configurations
4343
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
4444
target_label = "job"
4545
}
46+
rule {
47+
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
48+
regex = ";(.+)"
49+
target_label = "job"
50+
}
51+
rule {
52+
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
53+
regex = ";(.+)"
54+
target_label = "job"
55+
}
56+
rule {
57+
source_labels = ["job", "container"]
58+
regex = ";(.+)"
59+
target_label = "job"
60+
}
4661
rule {
4762
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
4863
target_label = "instance"
@@ -172,6 +187,21 @@ creates a module with default discovery, scraping, and processing configurations
172187
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_job"]
173188
target_label = "job"
174189
}
190+
rule {
191+
source_labels = ["job", "__meta_kubernetes_service_label_app_kubernetes_io_name"]
192+
regex = ";(.+)"
193+
target_label = "job"
194+
}
195+
rule {
196+
source_labels = ["job", "__meta_kubernetes_service_label_app"]
197+
regex = ";(.+)"
198+
target_label = "job"
199+
}
200+
rule {
201+
source_labels = ["job", "service"]
202+
regex = ";(.+)"
203+
target_label = "job"
204+
}
175205
rule {
176206
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_instance"]
177207
target_label = "instance"

‎charts/k8s-monitoring/charts/feature-annotation-autodiscovery/tests/__snapshot__/namespaced_test.yaml.snap‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,21 @@ can exclude a specified list of namespaces:
4848
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
4949
target_label = "job"
5050
}
51+
rule {
52+
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
53+
regex = ";(.+)"
54+
target_label = "job"
55+
}
56+
rule {
57+
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
58+
regex = ";(.+)"
59+
target_label = "job"
60+
}
61+
rule {
62+
source_labels = ["job", "container"]
63+
regex = ";(.+)"
64+
target_label = "job"
65+
}
5166
rule {
5267
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
5368
target_label = "instance"
@@ -182,6 +197,21 @@ can exclude a specified list of namespaces:
182197
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_job"]
183198
target_label = "job"
184199
}
200+
rule {
201+
source_labels = ["job", "__meta_kubernetes_service_label_app_kubernetes_io_name"]
202+
regex = ";(.+)"
203+
target_label = "job"
204+
}
205+
rule {
206+
source_labels = ["job", "__meta_kubernetes_service_label_app"]
207+
regex = ";(.+)"
208+
target_label = "job"
209+
}
210+
rule {
211+
source_labels = ["job", "service"]
212+
regex = ";(.+)"
213+
target_label = "job"
214+
}
185215
rule {
186216
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_instance"]
187217
target_label = "instance"
@@ -356,6 +386,21 @@ can use a specified list of namespaces:
356386
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
357387
target_label = "job"
358388
}
389+
rule {
390+
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
391+
regex = ";(.+)"
392+
target_label = "job"
393+
}
394+
rule {
395+
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
396+
regex = ";(.+)"
397+
target_label = "job"
398+
}
399+
rule {
400+
source_labels = ["job", "container"]
401+
regex = ";(.+)"
402+
target_label = "job"
403+
}
359404
rule {
360405
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
361406
target_label = "instance"
@@ -488,6 +533,21 @@ can use a specified list of namespaces:
488533
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_job"]
489534
target_label = "job"
490535
}
536+
rule {
537+
source_labels = ["job", "__meta_kubernetes_service_label_app_kubernetes_io_name"]
538+
regex = ";(.+)"
539+
target_label = "job"
540+
}
541+
rule {
542+
source_labels = ["job", "__meta_kubernetes_service_label_app"]
543+
regex = ";(.+)"
544+
target_label = "job"
545+
}
546+
rule {
547+
source_labels = ["job", "service"]
548+
regex = ";(.+)"
549+
target_label = "job"
550+
}
491551
rule {
492552
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_instance"]
493553
target_label = "instance"

‎charts/k8s-monitoring/charts/feature-annotation-autodiscovery/tests/__snapshot__/pods_only_test.yaml.snap‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,21 @@ will only discover pods:
4747
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
4848
target_label = "job"
4949
}
50+
rule {
51+
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
52+
regex = ";(.+)"
53+
target_label = "job"
54+
}
55+
rule {
56+
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
57+
regex = ";(.+)"
58+
target_label = "job"
59+
}
60+
rule {
61+
source_labels = ["job", "container"]
62+
regex = ";(.+)"
63+
target_label = "job"
64+
}
5065
rule {
5166
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
5267
target_label = "instance"

‎charts/k8s-monitoring/charts/feature-annotation-autodiscovery/tests/__snapshot__/prometheus_annotation_test.yaml.snap‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,21 @@ creates a module with default discovery, scraping, and processing configurations
4343
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
4444
target_label = "job"
4545
}
46+
rule {
47+
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
48+
regex = ";(.+)"
49+
target_label = "job"
50+
}
51+
rule {
52+
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
53+
regex = ";(.+)"
54+
target_label = "job"
55+
}
56+
rule {
57+
source_labels = ["job", "container"]
58+
regex = ";(.+)"
59+
target_label = "job"
60+
}
4661
rule {
4762
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
4863
target_label = "instance"
@@ -172,6 +187,21 @@ creates a module with default discovery, scraping, and processing configurations
172187
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_job"]
173188
target_label = "job"
174189
}
190+
rule {
191+
source_labels = ["job", "__meta_kubernetes_service_label_app_kubernetes_io_name"]
192+
regex = ";(.+)"
193+
target_label = "job"
194+
}
195+
rule {
196+
source_labels = ["job", "__meta_kubernetes_service_label_app"]
197+
regex = ";(.+)"
198+
target_label = "job"
199+
}
200+
rule {
201+
source_labels = ["job", "service"]
202+
regex = ";(.+)"
203+
target_label = "job"
204+
}
175205
rule {
176206
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_instance"]
177207
target_label = "instance"

‎charts/k8s-monitoring/charts/feature-annotation-autodiscovery/tests/__snapshot__/selectors_test.yaml.snap‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,21 @@ will set appropriate selectors:
4747
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
4848
target_label = "job"
4949
}
50+
rule {
51+
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
52+
regex = ";(.+)"
53+
target_label = "job"
54+
}
55+
rule {
56+
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
57+
regex = ";(.+)"
58+
target_label = "job"
59+
}
60+
rule {
61+
source_labels = ["job", "container"]
62+
regex = ";(.+)"
63+
target_label = "job"
64+
}
5065
rule {
5166
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
5267
target_label = "instance"
@@ -180,6 +195,21 @@ will set appropriate selectors:
180195
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_job"]
181196
target_label = "job"
182197
}
198+
rule {
199+
source_labels = ["job", "__meta_kubernetes_service_label_app_kubernetes_io_name"]
200+
regex = ";(.+)"
201+
target_label = "job"
202+
}
203+
rule {
204+
source_labels = ["job", "__meta_kubernetes_service_label_app"]
205+
regex = ";(.+)"
206+
target_label = "job"
207+
}
208+
rule {
209+
source_labels = ["job", "service"]
210+
regex = ";(.+)"
211+
target_label = "job"
212+
}
183213
rule {
184214
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_instance"]
185215
target_label = "instance"

‎charts/k8s-monitoring/charts/feature-application-observability/Makefile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,11 @@ ifdef HAS_HELM_UNITTEST
3232
else
3333
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 .
3434
endif
35+
36+
.PHONY: update-test-snapshots
37+
update-test-snapshots:
38+
ifdef HAS_HELM_UNITTEST
39+
helm unittest . --update-snapshot
40+
else
41+
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 . --update-snapshot
42+
endif

0 commit comments

Comments
 (0)