Skip to content

Commit

Permalink
[8.14](backport #40467) x-pack/metricbeat/module/gcp: Fix missing ECS…
Browse files Browse the repository at this point in the history
… labels when using exclude_labels: true (#40595)

* 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 973af49)

* Update CHANGELOG.next.asciidoc

Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>

---------

Co-authored-by: Linu-Elias <linu.elias@elastic.co>
Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
  • Loading branch information
3 people authored Sep 9, 2024
1 parent 7cded34 commit 7b6cfad
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ 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]
- Add missing ECS Cloud fields in GCP `metrics` metricset when using `exclude_labels: true` {issue}40437[40437] {pull}40467[40467]

*Osquerybeat*

Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/gcp/metrics/metricset.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 7b6cfad

Please sign in to comment.