Skip to content

Enable namespace filtering for trivy metrics #1199

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
jakub-racek-swi merged 5 commits into from
Nov 26, 2025
Merged

Enable namespace filtering for trivy metrics #1199

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14247e8
fix: add namespace filtering to trivy metrics
jakub-racek-swi Nov 19, 2025
1c3e9b5
fix: expand values
jakub-racek-swi Nov 26, 2025
be42bca
comments
jakub-racek-swi Nov 26, 2025
653c502
fix
jakub-racek-swi Nov 26, 2025
a370a8f
Merge branch 'master' into Fix-filters-for-trivy-data
jakub-racek-swi Nov 26, 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
5 changes: 4 additions & 1 deletion deploy/helm/metrics-collector-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ processors:
- set(resource.attributes["sw.k8s.cluster.uid"], "${CLUSTER_UID}")
- set(resource.attributes["k8s.cluster.name"], "${CLUSTER_NAME}")

- set(datapoint.attributes["k8s.namespace.name"], datapoint.attributes["namespace"])
- set(resource.attributes["k8s.namespace.name"], datapoint.attributes["namespace"])
Copy link
Contributor

@mpecenka mpecenka Nov 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think, this could malform data in case there will be multiple datapoints with different namespaces.
You do not need this at all, just move the filter/namespace after groupbyattrs/trivy-operator-metrics.

Copy link
Contributor Author

@jakub-racek-swi jakub-racek-swi Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea that works

- set(datapoint.attributes[Format("k8s.%s.name",[ToLowerCase(datapoint.attributes["resource_kind"])])], datapoint.attributes["resource_name"])

transform/trivy-operator-metrics-split:
Expand Down Expand Up @@ -1170,6 +1170,9 @@ service:
- memory_limiter
- filter/trivy-operator-metrics
- transform/trivy-operator-metrics-attributes
{{- if eq (include "isNamespacesFilterEnabled" .) "true" }}
- filter/namespaces
{{- end }}
- metricstransform/rename
- groupbyattrs/trivy-operator-metrics
- metricstransform/trivy-operator-metrics-aggregation
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/tests/__snapshot__/metrics-collector-config-map-fargate_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,7 @@ Metrics config should match snapshot when using default values:
- set(resource.attributes["sw.k8s.agent.app.version"], "${APP_VERSION}")
- set(resource.attributes["sw.k8s.cluster.uid"], "${CLUSTER_UID}")
- set(resource.attributes["k8s.cluster.name"], "${CLUSTER_NAME}")
- set(datapoint.attributes["k8s.namespace.name"], datapoint.attributes["namespace"])
- set(resource.attributes["k8s.namespace.name"], datapoint.attributes["namespace"])
- set(datapoint.attributes[Format("k8s.%s.name",[ToLowerCase(datapoint.attributes["resource_kind"])])],
datapoint.attributes["resource_name"])
transform/trivy-operator-metrics-split:
Expand Down
6 changes: 3 additions & 3 deletions deploy/helm/tests/__snapshot__/metrics-collector-config-map_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,7 @@ Metrics config should match snapshot when fargate is enabled:
- set(resource.attributes["sw.k8s.agent.app.version"], "${APP_VERSION}")
- set(resource.attributes["sw.k8s.cluster.uid"], "${CLUSTER_UID}")
- set(resource.attributes["k8s.cluster.name"], "${CLUSTER_NAME}")
- set(datapoint.attributes["k8s.namespace.name"], datapoint.attributes["namespace"])
- set(resource.attributes["k8s.namespace.name"], datapoint.attributes["namespace"])
- set(datapoint.attributes[Format("k8s.%s.name",[ToLowerCase(datapoint.attributes["resource_kind"])])],
datapoint.attributes["resource_name"])
transform/trivy-operator-metrics-split:
Expand Down Expand Up @@ -3275,7 +3275,7 @@ Metrics config should match snapshot when using Prometheus url with extra_scrape
- set(resource.attributes["sw.k8s.agent.app.version"], "${APP_VERSION}")
- set(resource.attributes["sw.k8s.cluster.uid"], "${CLUSTER_UID}")
- set(resource.attributes["k8s.cluster.name"], "${CLUSTER_NAME}")
- set(datapoint.attributes["k8s.namespace.name"], datapoint.attributes["namespace"])
- set(resource.attributes["k8s.namespace.name"], datapoint.attributes["namespace"])
- set(datapoint.attributes[Format("k8s.%s.name",[ToLowerCase(datapoint.attributes["resource_kind"])])],
datapoint.attributes["resource_name"])
transform/trivy-operator-metrics-split:
Expand Down Expand Up @@ -5001,7 +5001,7 @@ Metrics config should match snapshot when using default values:
- set(resource.attributes["sw.k8s.agent.app.version"], "${APP_VERSION}")
- set(resource.attributes["sw.k8s.cluster.uid"], "${CLUSTER_UID}")
- set(resource.attributes["k8s.cluster.name"], "${CLUSTER_NAME}")
- set(datapoint.attributes["k8s.namespace.name"], datapoint.attributes["namespace"])
- set(resource.attributes["k8s.namespace.name"], datapoint.attributes["namespace"])
- set(datapoint.attributes[Format("k8s.%s.name",[ToLowerCase(datapoint.attributes["resource_kind"])])],
datapoint.attributes["resource_name"])
transform/trivy-operator-metrics-split:
Expand Down
Loading