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.

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 #18757 to 7.x: [Metricbeat] Fix getting compute instance metadata with partial zone/region config #18839

Merged
merged 3 commits into from
May 29, 2020

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented May 28, 2020

Cherry-pick of PR #18757 to 7.x 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.

…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
Collaborator

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
Collaborator

elasticmachine commented May 28, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #18839 updated]

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

  • Duration: 66 min 50 sec

Test stats 🧪

Test Results
Failed 0
Passed 497
Skipped 48
Total 545

@kaiyan-sheng kaiyan-sheng merged commit 8928a7d into elastic:7.x May 29, 2020
@kaiyan-sheng kaiyan-sheng deleted the backport_18757_7.x branch May 29, 2020 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport review Team:Platforms Label for the Integrations - Platforms team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants