Skip to content

Set the job label for annotation discoverered metric sources #1717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 23, 2025
Merged

Set the job label for annotation discoverered metric sources #1717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f7fa40
Set the job label for annotation discovererd metric sources
petewall Jun 27, 2025
4d4cd11
Update tests
petewall Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions charts/k8s-monitoring/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,3 +242,15 @@ ifdef HAS_HELM_UNITTEST
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 --failfast --with-subchart=false .
endif

.PHONY: update-test-snapshots
update-test-snapshots:
ifdef HAS_HELM_UNITTEST
helm unittest --with-subchart=false . --update-snapshot
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 --with-subchart=false . --update-snapshot
endif
set -e && \
for chart in $(FEATURE_CHARTS); do \
make -C charts/$$chart update-test-snapshots; \
done
8 changes: 8 additions & 0 deletions charts/k8s-monitoring/charts/feature-annotation-autodiscovery/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,11 @@ ifdef HAS_HELM_UNITTEST
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 .
endif

.PHONY: update-test-snapshots
update-test-snapshots:
ifdef HAS_HELM_UNITTEST
helm unittest . --update-snapshot
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 . --update-snapshot
endif
15 changes: 15 additions & 0 deletions charts/k8s-monitoring/charts/feature-annotation-autodiscovery/templates/_pods.alloy.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,21 @@ discovery.relabel "annotation_autodiscovery_pods" {
source_labels = ["{{ include "pod_annotation" .Values.annotations.job }}"]
target_label = "job"
}
rule {
source_labels = ["job", "{{ include "pod_label" "app.kubernetes.io/name" }}"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "{{ include "pod_label" "app" }}"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "container"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["{{ include "pod_annotation" .Values.annotations.instance }}"]
target_label = "instance"
Expand Down
15 changes: 15 additions & 0 deletions charts/k8s-monitoring/charts/feature-annotation-autodiscovery/templates/_services.alloy.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,21 @@ discovery.relabel "annotation_autodiscovery_services" {
source_labels = ["{{ include "service_annotation" .Values.annotations.job }}"]
target_label = "job"
}
rule {
source_labels = ["job", "{{ include "service_label" "app.kubernetes.io/name" }}"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "{{ include "service_label" "app" }}"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "service"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["{{ include "service_annotation" .Values.annotations.instance }}"]
target_label = "instance"
Expand Down
30 changes: 30 additions & 0 deletions ...itoring/charts/feature-annotation-autodiscovery/tests/__snapshot__/default_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,21 @@ creates a module with default discovery, scraping, and processing configurations
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "container"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
target_label = "instance"
Expand Down Expand Up @@ -172,6 +187,21 @@ creates a module with default discovery, scraping, and processing configurations
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_job"]
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_service_label_app_kubernetes_io_name"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_service_label_app"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "service"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_instance"]
target_label = "instance"
Expand Down
60 changes: 60 additions & 0 deletions ...ring/charts/feature-annotation-autodiscovery/tests/__snapshot__/namespaced_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,21 @@ can exclude a specified list of namespaces:
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "container"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
target_label = "instance"
Expand Down Expand Up @@ -182,6 +197,21 @@ can exclude a specified list of namespaces:
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_job"]
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_service_label_app_kubernetes_io_name"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_service_label_app"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "service"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_instance"]
target_label = "instance"
Expand Down Expand Up @@ -356,6 +386,21 @@ can use a specified list of namespaces:
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "container"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
target_label = "instance"
Expand Down Expand Up @@ -488,6 +533,21 @@ can use a specified list of namespaces:
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_job"]
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_service_label_app_kubernetes_io_name"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_service_label_app"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "service"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_instance"]
target_label = "instance"
Expand Down
15 changes: 15 additions & 0 deletions ...oring/charts/feature-annotation-autodiscovery/tests/__snapshot__/pods_only_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,21 @@ will only discover pods:
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "container"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
target_label = "instance"
Expand Down
30 changes: 30 additions & 0 deletions .../feature-annotation-autodiscovery/tests/__snapshot__/prometheus_annotation_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,21 @@ creates a module with default discovery, scraping, and processing configurations
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "container"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
target_label = "instance"
Expand Down Expand Up @@ -172,6 +187,21 @@ creates a module with default discovery, scraping, and processing configurations
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_job"]
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_service_label_app_kubernetes_io_name"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_service_label_app"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "service"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_instance"]
target_label = "instance"
Expand Down
30 changes: 30 additions & 0 deletions ...oring/charts/feature-annotation-autodiscovery/tests/__snapshot__/selectors_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,21 @@ will set appropriate selectors:
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_job"]
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app_kubernetes_io_name"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_pod_label_app"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "container"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_instance"]
target_label = "instance"
Expand Down Expand Up @@ -180,6 +195,21 @@ will set appropriate selectors:
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_job"]
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_service_label_app_kubernetes_io_name"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "__meta_kubernetes_service_label_app"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["job", "service"]
regex = ";(.+)"
target_label = "job"
}
rule {
source_labels = ["__meta_kubernetes_service_annotation_k8s_grafana_com_instance"]
target_label = "instance"
Expand Down
8 changes: 8 additions & 0 deletions charts/k8s-monitoring/charts/feature-application-observability/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,11 @@ ifdef HAS_HELM_UNITTEST
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 .
endif

.PHONY: update-test-snapshots
update-test-snapshots:
ifdef HAS_HELM_UNITTEST
helm unittest . --update-snapshot
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 . --update-snapshot
endif
8 changes: 8 additions & 0 deletions charts/k8s-monitoring/charts/feature-auto-instrumentation/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,11 @@ ifdef HAS_HELM_UNITTEST
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 .
endif

.PHONY: update-test-snapshots
update-test-snapshots:
ifdef HAS_HELM_UNITTEST
helm unittest . --update-snapshot
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 . --update-snapshot
endif
8 changes: 8 additions & 0 deletions charts/k8s-monitoring/charts/feature-cluster-events/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,11 @@ ifdef HAS_HELM_UNITTEST
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 .
endif

.PHONY: update-test-snapshots
update-test-snapshots:
ifdef HAS_HELM_UNITTEST
helm unittest . --update-snapshot
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 . --update-snapshot
endif
8 changes: 8 additions & 0 deletions charts/k8s-monitoring/charts/feature-cluster-metrics/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,11 @@ ifdef HAS_HELM_UNITTEST
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 .
endif

.PHONY: update-test-snapshots
update-test-snapshots:
ifdef HAS_HELM_UNITTEST
helm unittest . --update-snapshot
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 . --update-snapshot
endif
7 changes: 7 additions & 0 deletions charts/k8s-monitoring/charts/feature-integrations/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,10 @@ else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 .
endif

.PHONY: update-test-snapshots
update-test-snapshots:
ifdef HAS_HELM_UNITTEST
helm unittest . --update-snapshot
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 . --update-snapshot
endif
8 changes: 8 additions & 0 deletions charts/k8s-monitoring/charts/feature-node-logs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,11 @@ ifdef HAS_HELM_UNITTEST
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 .
endif

.PHONY: update-test-snapshots
update-test-snapshots:
ifdef HAS_HELM_UNITTEST
helm unittest . --update-snapshot
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 . --update-snapshot
endif
8 changes: 8 additions & 0 deletions charts/k8s-monitoring/charts/feature-pod-logs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,11 @@ ifdef HAS_HELM_UNITTEST
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 .
endif

.PHONY: update-test-snapshots
update-test-snapshots:
ifdef HAS_HELM_UNITTEST
helm unittest . --update-snapshot
else
docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 . --update-snapshot
endif
Loading
Loading