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

Jump to bottom

Support location_label config in GCP Metrics Metricset #41626

Merged
merged 11 commits into from
Dec 2, 2024
Merged

Support location_label config in GCP Metrics Metricset #41626

merged 11 commits into from
Dec 2, 2024

Conversation

ishleenk17
Copy link
Contributor

@ishleenk17 ishleenk17 commented Nov 13, 2024 •
edited
Loading

Proposed commit message

Explain here the changes you made on the PR.

Please explain:

  • WHAT: Addition of location_label config option to get the resource label for the new GCP service from the user
  • WHY: When the current metrics metricset was used for a new GCP service, the resource label used for data filtering was always the default "resource.label.zone", which may/may not be correct depending on the service. This PR get this label through config from the user.

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.

Related issues

Screenshots

Screenshot 2024-11-12 at 9 52 30 PM Screenshot 2024-11-12 at 9 52 48 PM

@ishleenk17 ishleenk17 self-assigned this Nov 13, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 13, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 13, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @ishleenk17? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 13, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Nov 13, 2024
@ishleenk17 ishleenk17 marked this pull request as ready for review November 14, 2024 16:37
@ishleenk17 ishleenk17 requested review from a team as code owners November 14, 2024 16:37
@ishleenk17 ishleenk17 requested a review from a team as a code owner November 28, 2024 16:13
@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 28, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b servicelabel_beats upstream/servicelabel_beats
git merge upstream/main
git push upstream servicelabel_beats

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Nov 28, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 28, 2024
@ishleenk17 ishleenk17 changed the title Support of servicelabel config in GCP Metrics Metricset Support of locationlabel config in GCP Metrics Metricset Nov 29, 2024
@shmsr shmsr changed the title Support of locationlabel config in GCP Metrics Metricset Support of location_label config in GCP Metrics Metricset Nov 29, 2024
@shmsr shmsr changed the title Support of location_label config in GCP Metrics Metricset Support location_label config in GCP Metrics Metricset Nov 29, 2024
AndersonQ
AndersonQ reviewed Nov 29, 2024
View reviewed changes
x-pack/metricbeat/module/gcp/metrics/_meta/docs.asciidoc Outdated Show resolved Hide resolved
CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@ishleenk17 ishleenk17 merged commit 3144d38 into elastic:main Dec 2, 2024
32 checks passed
@ishleenk17 ishleenk17 added the backport-8.17 Automated backport with mergify label Dec 2, 2024
mergify bot pushed a commit that referenced this pull request Dec 2, 2024
@ishleenk17 @mergify
Support location_label config in GCP Metrics Metricset (#41626)
773b433 
* Support of servicelabel config

* Update the label

* update location_label

* Add metricbeat and gcp.yml.disabled

* Update changelog

* update gcp asciidoc

* adress review comments

(cherry picked from commit 3144d38)
mergify bot pushed a commit that referenced this pull request Dec 2, 2024
@ishleenk17 @mergify
Support location_label config in GCP Metrics Metricset (#41626)
7cfe7ae 
* Support of servicelabel config

* Update the label

* update location_label

* Add metricbeat and gcp.yml.disabled

* Update changelog

* update gcp asciidoc

* adress review comments

(cherry picked from commit 3144d38)
This was referenced Dec 2, 2024
Merged
Merged
ishleenk17 added a commit that referenced this pull request Dec 3, 2024
@mergify @ishleenk17
Support location_label config in GCP Metrics Metricset (#41626) (#4…
42255fe 
…1852)

* Support of servicelabel config

* Update the label

* update location_label

* Add metricbeat and gcp.yml.disabled

* Update changelog

* update gcp asciidoc

* adress review comments

(cherry picked from commit 3144d38)

Co-authored-by: Ishleen Kaur <[email protected]>
ishleenk17 added a commit that referenced this pull request Dec 3, 2024
@mergify @ishleenk17
Support location_label config in GCP Metrics Metricset (#41626) (#4…
fb6f3f9 
…1853)

* Support of servicelabel config

* Update the label

* update location_label

* Add metricbeat and gcp.yml.disabled

* Update changelog

* update gcp asciidoc

* adress review comments

(cherry picked from commit 3144d38)

Co-authored-by: Ishleen Kaur <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shmsr shmsr shmsr left review comments

@gpop63 gpop63 gpop63 approved these changes

@gizas gizas gizas approved these changes

@AndersonQ AndersonQ AndersonQ approved these changes

@faec faec Awaiting requested review from faec faec is a code owner automatically assigned from elastic/elastic-agent-data-plane

@VihasMakwana VihasMakwana Awaiting requested review from VihasMakwana VihasMakwana is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@ishleenk17 ishleenk17

Labels
backport-8.x Automated backport to the 8.x branch with mergify backport-8.17 Automated backport with mergify enhancement Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support GCP region/zone for new services through Configuration
7 participants
@ishleenk17 @elasticmachine @AndersonQ @gizas @shmsr @gpop63 @pierrehilbert