From c57746fce9c462ba222afc58b2d7aca3ca4a804a Mon Sep 17 00:00:00 2001 From: Peter Stranak Date: Thu, 27 Nov 2025 08:54:04 +0100 Subject: [PATCH] Collect 'container.image.name' and 'container.image.tag' attributes for containers --- deploy/helm/node-collector-config.yaml | 2 ++ deploy/helm/templates/_helpers.tpl | 2 ++ .../events-collector-config-map_test.yaml.snap | 8 ++++++++ .../__snapshot__/gateway-config-map_test.yaml.snap | 2 ++ ...trics-collector-config-map-fargate_test.yaml.snap | 2 ++ .../metrics-collector-config-map_test.yaml.snap | 6 ++++++ .../metrics-discovery-config-map_test.yaml.snap | 2 ++ .../node-collector-config-map-windows_test.yaml.snap | 4 ++++ .../node-collector-config-map_test.yaml.snap | 12 ++++++++++++ 9 files changed, 40 insertions(+) diff --git a/deploy/helm/node-collector-config.yaml b/deploy/helm/node-collector-config.yaml index a94f7ee8e..cc871e0bf 100644 --- a/deploy/helm/node-collector-config.yaml +++ b/deploy/helm/node-collector-config.yaml @@ -244,6 +244,8 @@ processors: - k8s.job.name - k8s.cronjob.name - k8s.statefulset.name + - container.image.name + - container.image.tag pod_association: - sources: - from: resource_attribute diff --git a/deploy/helm/templates/_helpers.tpl b/deploy/helm/templates/_helpers.tpl index f53584d3a..ef6aaa1ec 100644 --- a/deploy/helm/templates/_helpers.tpl +++ b/deploy/helm/templates/_helpers.tpl @@ -145,6 +145,8 @@ extract: - k8s.cronjob.name - k8s.statefulset.name - k8s.node.name + - container.image.name + - container.image.tag pod_association: - sources: - from: resource_attribute diff --git a/deploy/helm/tests/__snapshot__/events-collector-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/events-collector-config-map_test.yaml.snap index 8fcd8c4e2..35d3a2c7a 100644 --- a/deploy/helm/tests/__snapshot__/events-collector-config-map_test.yaml.snap +++ b/deploy/helm/tests/__snapshot__/events-collector-config-map_test.yaml.snap @@ -237,6 +237,8 @@ Custom events filter with new syntax: - k8s.cronjob.name - k8s.statefulset.name - k8s.node.name + - container.image.name + - container.image.tag passthrough: false pod_association: - sources: @@ -1203,6 +1205,8 @@ Custom events filter with old syntax: - k8s.cronjob.name - k8s.statefulset.name - k8s.node.name + - container.image.name + - container.image.tag passthrough: false pod_association: - sources: @@ -2162,6 +2166,8 @@ Events config should match snapshot when using default values: - k8s.cronjob.name - k8s.statefulset.name - k8s.node.name + - container.image.name + - container.image.tag passthrough: false pod_association: - sources: @@ -3038,6 +3044,8 @@ Events config should not contain manifest collection pipeline when disabled: - k8s.cronjob.name - k8s.statefulset.name - k8s.node.name + - container.image.name + - container.image.tag passthrough: false pod_association: - sources: diff --git a/deploy/helm/tests/__snapshot__/gateway-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/gateway-config-map_test.yaml.snap index be6e725bd..96b0d0bcd 100644 --- a/deploy/helm/tests/__snapshot__/gateway-config-map_test.yaml.snap +++ b/deploy/helm/tests/__snapshot__/gateway-config-map_test.yaml.snap @@ -484,6 +484,8 @@ Gateway config should match snapshot when using default values: - k8s.cronjob.name - k8s.statefulset.name - k8s.node.name + - container.image.name + - container.image.tag passthrough: false pod_association: - sources: diff --git a/deploy/helm/tests/__snapshot__/metrics-collector-config-map-fargate_test.yaml.snap b/deploy/helm/tests/__snapshot__/metrics-collector-config-map-fargate_test.yaml.snap index 5705fcff8..59d030c40 100644 --- a/deploy/helm/tests/__snapshot__/metrics-collector-config-map-fargate_test.yaml.snap +++ b/deploy/helm/tests/__snapshot__/metrics-collector-config-map-fargate_test.yaml.snap @@ -461,6 +461,8 @@ Metrics config should match snapshot when using default values: - k8s.cronjob.name - k8s.statefulset.name - k8s.node.name + - container.image.name + - container.image.tag passthrough: false pod_association: - sources: diff --git a/deploy/helm/tests/__snapshot__/metrics-collector-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/metrics-collector-config-map_test.yaml.snap index c8e99326a..5b65ee159 100644 --- a/deploy/helm/tests/__snapshot__/metrics-collector-config-map_test.yaml.snap +++ b/deploy/helm/tests/__snapshot__/metrics-collector-config-map_test.yaml.snap @@ -461,6 +461,8 @@ Metrics config should match snapshot when fargate is enabled: - k8s.cronjob.name - k8s.statefulset.name - k8s.node.name + - container.image.name + - container.image.tag passthrough: false pod_association: - sources: @@ -2266,6 +2268,8 @@ Metrics config should match snapshot when using Prometheus url with extra_scrape - k8s.cronjob.name - k8s.statefulset.name - k8s.node.name + - container.image.name + - container.image.tag passthrough: false pod_association: - sources: @@ -4013,6 +4017,8 @@ Metrics config should match snapshot when using default values: - k8s.cronjob.name - k8s.statefulset.name - k8s.node.name + - container.image.name + - container.image.tag passthrough: false pod_association: - sources: diff --git a/deploy/helm/tests/__snapshot__/metrics-discovery-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/metrics-discovery-config-map_test.yaml.snap index 3a33f00ef..11005b76a 100644 --- a/deploy/helm/tests/__snapshot__/metrics-discovery-config-map_test.yaml.snap +++ b/deploy/helm/tests/__snapshot__/metrics-discovery-config-map_test.yaml.snap @@ -469,6 +469,8 @@ Metrics discovery config should match snapshot when Fargate is enabled: - k8s.cronjob.name - k8s.statefulset.name - k8s.node.name + - container.image.name + - container.image.tag passthrough: false pod_association: - sources: diff --git a/deploy/helm/tests/__snapshot__/node-collector-config-map-windows_test.yaml.snap b/deploy/helm/tests/__snapshot__/node-collector-config-map-windows_test.yaml.snap index 2b2605c94..200366528 100644 --- a/deploy/helm/tests/__snapshot__/node-collector-config-map-windows_test.yaml.snap +++ b/deploy/helm/tests/__snapshot__/node-collector-config-map-windows_test.yaml.snap @@ -633,6 +633,8 @@ Node collector config for windows nodes should match snapshot when using default - k8s.job.name - k8s.cronjob.name - k8s.statefulset.name + - container.image.name + - container.image.tag filter: node_from_env_var: NODE_NAME passthrough: false @@ -2458,6 +2460,8 @@ Node collector config for windows nodes should match snapshot when using legacy - k8s.job.name - k8s.cronjob.name - k8s.statefulset.name + - container.image.name + - container.image.tag filter: node_from_env_var: NODE_NAME passthrough: false diff --git a/deploy/helm/tests/__snapshot__/node-collector-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/node-collector-config-map_test.yaml.snap index 4f2293c68..81a1be840 100644 --- a/deploy/helm/tests/__snapshot__/node-collector-config-map_test.yaml.snap +++ b/deploy/helm/tests/__snapshot__/node-collector-config-map_test.yaml.snap @@ -637,6 +637,8 @@ Custom logs filter with new syntax: - k8s.job.name - k8s.cronjob.name - k8s.statefulset.name + - container.image.name + - container.image.tag filter: node_from_env_var: NODE_NAME passthrough: false @@ -2499,6 +2501,8 @@ Custom logs filter with old syntax: - k8s.job.name - k8s.cronjob.name - k8s.statefulset.name + - container.image.name + - container.image.tag filter: node_from_env_var: NODE_NAME passthrough: false @@ -4435,6 +4439,8 @@ Node collector config should match snapshot when autodiscovery is disabled: - k8s.job.name - k8s.cronjob.name - k8s.statefulset.name + - container.image.name + - container.image.tag filter: node_from_env_var: NODE_NAME passthrough: false @@ -6226,6 +6232,8 @@ Node collector config should match snapshot when fargate is enabled: - k8s.job.name - k8s.cronjob.name - k8s.statefulset.name + - container.image.name + - container.image.tag filter: node_from_env_var: NODE_NAME passthrough: false @@ -7993,6 +8001,8 @@ Node collector config should match snapshot when fargate is enabled and autodisc - k8s.job.name - k8s.cronjob.name - k8s.statefulset.name + - container.image.name + - container.image.tag filter: node_from_env_var: NODE_NAME passthrough: false @@ -9696,6 +9706,8 @@ Node collector config should match snapshot when using default values: - k8s.job.name - k8s.cronjob.name - k8s.statefulset.name + - container.image.name + - container.image.tag filter: node_from_env_var: NODE_NAME passthrough: false