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

Cherry-pick #17608 to 7.x: [Metricbeat] Fix "ID" event generator of Google Cloud module #17610

Merged
merged 1 commit into from
Apr 8, 2020
Merged

Cherry-pick #17608 to 7.x: [Metricbeat] Fix "ID" event generator of Google Cloud module #17610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -193,6 +193,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix Unix socket path in memcached. {pull}17512[17512]
- Fix vsphere VM dashboard host aggregation visualizations. {pull}17555[17555]
- Metricbeat no longer needs to be started strictly after Logstash for `logstash-xpack` module to report correct data. {issue}17261[17261] {pull}17497[17497]
- Fix "ID" event generator of Google Cloud module {issue}17160[17160] {pull}17608[17608]

*Packetbeat*

Expand Down
13 changes: 7 additions & 6 deletions x-pack/metricbeat/module/googlecloud/stackdriver/timeseries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,29 @@ import (
func (m *MetricSet) timeSeriesGrouped(ctx context.Context, gcpService googlecloud.MetadataService, tss []*monitoringpb.TimeSeries, e *incomingFieldExtractor) (map[string][]KeyValuePoint, error) {
eventGroups := make(map[string][]KeyValuePoint)

for _, ts := range tss {
if gcpService == nil {
gcpService = googlecloud.NewStackdriverMetadataServiceForTimeSeries(ts)
}
metadataService := gcpService

for _, ts := range tss {
keyValues, err := e.extractTimeSeriesMetricValues(ts)
if err != nil {
return nil, err
}

sdCollectorInputData := googlecloud.NewStackdriverCollectorInputData(ts, m.config.ProjectID, m.config.Zone, m.config.Region)
if gcpService == nil {
metadataService = googlecloud.NewStackdriverMetadataServiceForTimeSeries(ts)
}

for i := range keyValues {
sdCollectorInputData.Timestamp = &keyValues[i].Timestamp

id, err := gcpService.ID(ctx, sdCollectorInputData)
id, err := metadataService.ID(ctx, sdCollectorInputData)
if err != nil {
m.Logger().Errorf("error trying to retrieve ID from metric event '%v'", err)
continue
}

metadataCollectorData, err := gcpService.Metadata(ctx, sdCollectorInputData.TimeSeries)
metadataCollectorData, err := metadataService.Metadata(ctx, sdCollectorInputData.TimeSeries)
if err != nil {
m.Logger().Error("error trying to retrieve labels from metric event")
continue
Expand Down