From c95524c0b9a48081a2b2be1c550f6c326b76007b Mon Sep 17 00:00:00 2001 From: Linu-Elias Date: Fri, 23 Aug 2024 12:25:28 +0530 Subject: [PATCH 1/2] x-pack/metricbeat/module/gcp: Fix missing ECS labels when using exclude_labels: true (#40467) * Issue fix * Change.log * resolved comments * fix (cherry picked from commit 973af491a7bbf1095235cd6f310b190a116ceac5) --- CHANGELOG.next.asciidoc | 2 ++ x-pack/metricbeat/module/gcp/metrics/metricset.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 332a1e8e458..93d332eda30 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -99,6 +99,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Fix missing metrics from CloudWatch when include_linked_accounts set to false. {issue}40071[40071] {pull}40135[40135] - Update beat module with apm-server monitoring metrics fields {pull}40127[40127] - Fix Azure Monitor metric timespan to restore Storage Account PT1H metrics {issue}40376[40376] {pull}40367[40367] +- Remove excessive info-level logs in cgroups setup {pull}40491[40491] +- Add missing ECS Cloud fields in GCP `metrics` metricset when using `exclude_labels: true` {issue}40437[40437] {pull}40467[40467] *Osquerybeat* diff --git a/x-pack/metricbeat/module/gcp/metrics/metricset.go b/x-pack/metricbeat/module/gcp/metrics/metricset.go index 49cdce5d73a..eb4e3c57fd3 100644 --- a/x-pack/metricbeat/module/gcp/metrics/metricset.go +++ b/x-pack/metricbeat/module/gcp/metrics/metricset.go @@ -212,7 +212,7 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) (err erro func (m *MetricSet) mapToEvents(ctx context.Context, timeSeries []timeSeriesWithAligner, sdc metricsConfig) ([]mb.Event, error) { mapper := newIncomingFieldMapper(m.Logger(), sdc) - var metadataService = gcp.NewStackdriverMetadataServiceForTimeSeries(nil) + var metadataService gcp.MetadataService var err error if !m.config.ExcludeLabels { From 0093353ed8c2763a4d63d5e5ccda8b2bda9d1329 Mon Sep 17 00:00:00 2001 From: Linu-Elias Date: Mon, 26 Aug 2024 14:01:39 +0530 Subject: [PATCH 2/2] Update CHANGELOG.next.asciidoc Co-authored-by: Andrew Kroh --- CHANGELOG.next.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 93d332eda30..2e347b5f17f 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -99,7 +99,6 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Fix missing metrics from CloudWatch when include_linked_accounts set to false. {issue}40071[40071] {pull}40135[40135] - Update beat module with apm-server monitoring metrics fields {pull}40127[40127] - Fix Azure Monitor metric timespan to restore Storage Account PT1H metrics {issue}40376[40376] {pull}40367[40367] -- Remove excessive info-level logs in cgroups setup {pull}40491[40491] - Add missing ECS Cloud fields in GCP `metrics` metricset when using `exclude_labels: true` {issue}40437[40437] {pull}40467[40467] *Osquerybeat*