Fix container enricher with correct container ids for pods with multi…

…ple containers (#34516) * Fix container enricher with correct container ids for pods with multiple containers * Align kubernetes.container.id with ecs container.id (cherry picked from commit 4ac4973) # Conflicts: # metricbeat/module/kubernetes/state_container/_meta/test/ksm.v1.3.0.expected # metricbeat/module/kubernetes/state_container/_meta/test/ksm.v1.8.0.expected # metricbeat/module/kubernetes/state_container/_meta/test/ksm.v2.0.0.expected # metricbeat/module/kubernetes/state_container/_meta/test/ksm.v2.7.0.expected # metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.4.2.plain-expected.json # metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.5.0.plain-expected.json # metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.6.0.plain-expected.json # metricbeat/module/kubernetes/state_container/_meta/testdata/ksm.v2.7.0.plain-expected.json
elastic · Feb 9, 2023 · a9b56d3 · a9b56d3
1 parent 484330e
commit a9b56d3
Show file tree

Hide file tree

Showing 11 changed files with 5,196 additions and 4 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -109,6 +109,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 - Add missing cluster metadata to k8s module metricsets {pull}32979[32979] {pull}33032[33032]
 - Add GCP CloudSQL region filter {pull}32943[32943]
 - Fix metrics split through different events and metadata not matching for aws cloudwatch. {pull}34483[34483]
+- Fix metadata enricher with correct container ids for pods with multiple containers in container metricset. Align `kubernetes.container.id` and `container.id` fields for state_container metricset. {pull}34516[34516]
 
 
 *Osquerybeat*