diff --git a/deploy/helm/CHANGELOG.md b/deploy/helm/CHANGELOG.md index 190bfe0f..acd7a156 100644 --- a/deploy/helm/CHANGELOG.md +++ b/deploy/helm/CHANGELOG.md @@ -7,9 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased + +## [4.0.0-alpha.5] - 2024-07-16 + +### Added + +- Added k8s.object.kind to manifest events. + ### Changed -- internal configuration of filterprocessor is using OTTL syntax now. +- Internal configuration of filterprocessor is using OTTL syntax now. ## [4.0.0-alpha.4] - 2024-07-11 diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml index 3ec9d8b9..7f0023c6 100644 --- a/deploy/helm/Chart.yaml +++ b/deploy/helm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: swo-k8s-collector -version: 4.0.0-alpha.4 +version: 4.0.0-alpha.5 appVersion: "0.11.1" description: SolarWinds Kubernetes Integration keywords: diff --git a/deploy/helm/events-collector-config.yaml b/deploy/helm/events-collector-config.yaml index 760127e8..700d8c9f 100644 --- a/deploy/helm/events-collector-config.yaml +++ b/deploy/helm/events-collector-config.yaml @@ -123,6 +123,7 @@ processors: - set(attributes["k8s.persistentvolumeclaim.name"], body["metadata"]["name"]) where body["kind"] == "PersistentVolumeClaim" - set(attributes["k8s.namespace.name"], body["metadata"]["namespace"]) - set(attributes["k8s.ingress.name"], body["metadata"]["name"]) where body["kind"] == "Ingress" + - set(attributes["k8s.object.kind"], body["kind"]) where body["kind"] != nil # There are some attributes added by k8sobjects receiver, SWO do not need them so removing it - delete_key(attributes, "k8s.resource.name") 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 5af5712a..e8a5c186 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 @@ -960,6 +960,7 @@ Events config should match snapshot when using default values: - set(attributes["k8s.namespace.name"], body["metadata"]["namespace"]) - set(attributes["k8s.ingress.name"], body["metadata"]["name"]) where body["kind"] == "Ingress" + - set(attributes["k8s.object.kind"], body["kind"]) where body["kind"] != nil - delete_key(attributes, "k8s.resource.name") - delete_key(attributes, "event.name") - delete_key(attributes, "event.domain") diff --git a/deploy/helm/tests/__snapshot__/logs-fargate-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/logs-fargate-config-map_test.yaml.snap index fa722e7f..7c527dcc 100644 --- a/deploy/helm/tests/__snapshot__/logs-fargate-config-map_test.yaml.snap +++ b/deploy/helm/tests/__snapshot__/logs-fargate-config-map_test.yaml.snap @@ -22,7 +22,7 @@ Fargate logging ConfigMap spec should include additional filters when they are c Match * Add sw.k8s.cluster.uid Add sw.k8s.log.type container - Add sw.k8s.agent.manifest.version "4.0.0-alpha.4" + Add sw.k8s.agent.manifest.version "4.0.0-alpha.5" flb_log_cw: "false" output.conf: | [OUTPUT] @@ -60,7 +60,7 @@ Fargate logging ConfigMap spec should match snapshot when Fargate logging is ena Match * Add sw.k8s.cluster.uid Add sw.k8s.log.type container - Add sw.k8s.agent.manifest.version "4.0.0-alpha.4" + Add sw.k8s.agent.manifest.version "4.0.0-alpha.5" flb_log_cw: "false" output.conf: | [OUTPUT]