Skip to content

Commit

Permalink
Fix container enricher with correct container ids for pods with multi…
Browse files Browse the repository at this point in the history
…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
#	metricbeat/module/kubernetes/state_container/state_container.go
#	metricbeat/module/kubernetes/util/kubernetes.go
  • Loading branch information
MichaelKatsoulis authored and mergify[bot] committed Feb 10, 2023
1 parent f64bf63 commit 2b260a5
Show file tree
Hide file tree
Showing 11 changed files with 5,247 additions and 3 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,22 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
*Metricbeat*

- Fix kubernetes module's internal cache expiration issue. This avoid metrics like `kubernetes.container.cpu.usage.limit.pct` from not being populated. {pull}31785[31785]
- in module/windows/perfmon, changed collection method of the second counter value required to create a displayable value {pull}32305[32305]
- Fix and improve AWS metric period calculation to avoid zero-length intervals {pull}32724[32724]
- Add missing cluster metadata to k8s module metricsets {pull}32979[32979] {pull}33032[33032]
- Add GCP CloudSQL region filter {pull}32943[32943]
- Fix logstash cgroup mappings {pull}33131[33131]
- Remove unused `elasticsearch.node_stats.indices.bulk.avg_time.bytes` mapping {pull}33263[33263]
- Fix kafka dashboard field names {pull}33555[33555]
- Add tags to events based on parsed identifier. {pull}33472[33472]
- Support Oracle-specific connection strings in SQL module {issue}32089[32089] {pull}32293[32293]
- Remove deprecated metrics from controller manager, scheduler and proxy {pull}34161[34161]
- 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*


*Packetbeat*

Expand Down
Loading

0 comments on commit 2b260a5

Please sign in to comment.