Skip to content

Cherry-pick #18757 to 7.8: [Metricbeat] Fix getting compute instance metadata with partial zone/region config#18840

Merged
kaiyan-sheng merged 3 commits intoelastic:7.8from
kaiyan-sheng:backport_18757_7.8
May 29, 2020
Merged

Cherry-pick #18757 to 7.8: [Metricbeat] Fix getting compute instance metadata with partial zone/region config#18840
kaiyan-sheng merged 3 commits intoelastic:7.8from
kaiyan-sheng:backport_18757_7.8

Conversation

@kaiyan-sheng
Copy link
Copy Markdown
Contributor

@kaiyan-sheng kaiyan-sheng commented May 28, 2020 •
edited by zube bot
Loading

Cherry-pick of PR #18757 to 7.8 branch. Original message:

What does this PR do?

This PR fixes getting compute instance metadata when zone/region in googlecloud.yml is partial. For example:

- module: googlecloud
  metricsets:
    - compute
  region: "us-"
  project_id: "your project id"
  credentials_file_path: "your JSON credentials file path"
  exclude_labels: false
  period: 1m

This bug is introduced from #17913

Why is it important?

Instances.Get API does not accept partial zone name and Regions.Get API does not accept partial region name. So instead of using the region/zone information from the config, use the zone label from time series metric.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

[Metricbeat] Fix getting compute instance metadata with partial zone/…
20b69c9 
…region config (#18757)

* use zone for getting instance metadata

(cherry picked from commit f4c65f3)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 28, 2020
@kaiyan-sheng kaiyan-sheng self-assigned this May 28, 2020
@kaiyan-sheng kaiyan-sheng added the Team:Platforms Label for the Integrations - Platforms team label May 28, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 28, 2020

Pinging @elastic/integrations-platforms (Team:Platforms)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 28, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 28, 2020 •
edited
Loading

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #18840 updated]

  • Start Time: 2020-05-29T13:42:55.681+0000

  • Duration: 63 min 52 sec

Test stats 🧪

Test Results
Failed 0
Passed 497
Skipped 48
Total 545

Steps errors

Expand to view the steps failures

  • Name: Report to Codecov

    • Description: curl -sSLo codecov https://codecov.io/bash for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat do FILE="${i}/build/coverage/full.cov" if [ -f "${FILE}" ]; then bash codecov -f "${FILE}" fi done

    • Duration: 2 min 22 sec

    • Start Time: 2020-05-29T14:06:06.701+0000

    • log

@kaiyan-sheng kaiyan-sheng merged commit 9ef64e3 into elastic:7.8 May 29, 2020
@kaiyan-sheng kaiyan-sheng deleted the backport_18757_7.8 branch May 29, 2020 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

Assignees

@kaiyan-sheng kaiyan-sheng

Labels

backport review Team:Platforms Label for the Integrations - Platforms team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kaiyan-sheng @elasticmachine @ChrsMark