Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.15](backport #40467) x-pack/metricbeat/module/gcp: Fix missing ECS labels when using exclude_labels: true #40596

Merged
merged 4 commits into from
Sep 18, 2024
Merged

[8.15](backport #40467) x-pack/metricbeat/module/gcp: Fix missing ECS labels when using exclude_labels: true #40596

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f45d71
x-pack/metricbeat/module/gcp: Fix missing ECS labels when using exclu…
Linu-Elias Aug 23, 2024
1b712f7
Merge branch '8.15' into mergify/bp/8.15/pr-40467
Linu-Elias Sep 16, 2024
bbca1d5
Update CHANGELOG.next.asciidoc
Linu-Elias Sep 17, 2024
a038f1c
Merge branch '8.15' into mergify/bp/8.15/pr-40467
Linu-Elias Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Fix Azure Monitor 429 error by causing metricbeat to retry the request again. {pull}38294[38294]
- Fix fields not being parsed correctly in postgresql/database {issue}25301[25301] {pull}37720[37720]
- rabbitmq/queue - Change the mapping type of `rabbitmq.queue.consumers.utilisation.pct` to `scaled_float` from `long` because the values fall within the range of `[0.0, 1.0]`. Previously, conversion to integer resulted in reporting either `0` or `1`.
- 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,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