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

[8.x](backport #40461) x-pack/metricbeat/module/gcp: Add Organization ID and display name to cloud labels #40899

Open
wants to merge 9 commits into
base: 8.x
Choose a base branch
from
Open

[8.x](backport #40461) x-pack/metricbeat/module/gcp: Add Organization ID and display name to cloud labels #40899

wants to merge 9 commits into from
+240 −47

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2024

Proposed commit message

  • Set the project ID in the cloud.project.id field (currently missing)
  • Set the Google Cloud ORG ID in the cloud.account.id field (currently contains the project ID)
  • Set the Google Cloud ORG display name in the cloud.account.name field (currently contains the project ID)

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.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

  • With Project that belong to an Organization:

image

  • With Project that belong to "No Organization Category" and Compute Service
    NoOrgCompute

  • With Project that belong to "No Organization Category" and Spanner Service
    image

Logs

This is an automatic backport of pull request #40461 done by [Mergify](https://mergify.com).

@Linu-Elias @mergify
x-pack/metricbeat/module/gcp: Add Organization ID and display name to…
b1df8f7 
… cloud labels (#40461)

* issue fix

* add change.log

* formatting

* change.log

* error-fix

* resolved comments

* resolved comments

* context added

* resolve comments

* error handling

* doc changes

* change.log

* Update gcp.asciidoc

* Update CHANGELOG.asciidoc

* doc changes

(cherry picked from commit 355ed04)
@mergify mergify bot requested review from a team as code owners September 19, 2024 07:14
@mergify mergify bot added the backport label Sep 19, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 19, 2024
@botelastic
Copy link

botelastic bot commented Sep 19, 2024

This pull request doesn't have a Team:<team> label.

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Sep 23, 2024

This pull request has not been merged yet. Could you please review and merge it @Linu-Elias? 🙏

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Sep 23, 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 mergify/bp/8.x/pr-40461 upstream/mergify/bp/8.x/pr-40461
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-40461

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Sep 30, 2024

This pull request has not been merged yet. Could you please review and merge it @Linu-Elias? 🙏

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 7, 2024

This pull request has not been merged yet. Could you please review and merge it @Linu-Elias? 🙏

1 similar comment
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 14, 2024

This pull request has not been merged yet. Could you please review and merge it @Linu-Elias? 🙏

harnish-elastic
harnish-elastic reviewed Oct 14, 2024
View reviewed changes
x-pack/metricbeat/module/gcp/metrics/compute/metadata.go Outdated
@@ -23,9 +23,12 @@ import (
)

// NewMetadataService returns the specific Metadata service for a GCP Compute resource
func NewMetadataService(projectID, zone string, region string, regions []string, opt ...option.ClientOption) (gcp.MetadataService, error) {
func NewMetadataService(projectID, zone string, region string, regions []string, organizationID, organizationName string, projectName string, opt ...option.ClientOption) (gcp.MetadataService, error) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
func NewMetadataService(projectID, zone string, region string, regions []string, organizationID, organizationName string, projectName string, opt ...option.ClientOption) (gcp.MetadataService, error) {
func NewMetadataService(projectID, zone, region string, regions []string, organizationID, organizationName, projectName string, opt ...option.ClientOption) (gcp.MetadataService, error) {

shmsr
shmsr reviewed Oct 14, 2024
View reviewed changes
CHANGELOG.asciidoc Outdated
@@ -3,6 +3,16 @@
:issue: https://github.com/elastic/beats/issues/
:pull: https://github.com/elastic/beats/pull/

[[release-notes-8.15.2]]
=== Beats version 8.15.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this 8.15.2?

shmsr
shmsr reviewed Oct 14, 2024
View reviewed changes
CHANGELOG.asciidoc Outdated
@@ -3,6 +3,16 @@
:issue: https://github.com/elastic/beats/issues/
:pull: https://github.com/elastic/beats/pull/

[[release-notes-8.15.2]]
=== Beats version 8.15.2
https://github.com/elastic/beats/compare/v8.15.0\...v8.15.2[View commits]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this auto-generated?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we had initially discussed on the version here- PR

ishleenk17
ishleenk17 reviewed Oct 15, 2024
View reviewed changes
CHANGELOG.asciidoc

*Metricbeat*

- Add GCP organization and project details to ECS cloud fields. {pull}40461[40461]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addittion of this to the changelog.next.asciidoc should be sufficient. I think that is picked up in changelog.asciidoc when the release happens. Please cross check on this.

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 21, 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 mergify/bp/8.x/pr-40461 upstream/mergify/bp/8.x/pr-40461
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-40461

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 21, 2024

This pull request has not been merged yet. Could you please review and merge it @Linu-Elias? 🙏

2 similar comments
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 28, 2024

This pull request has not been merged yet. Could you please review and merge it @Linu-Elias? 🙏

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Nov 4, 2024

This pull request has not been merged yet. Could you please review and merge it @Linu-Elias? 🙏

@ishleenk17
Copy link
Contributor

@Linu-Elias Lets get this merged ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Linu-Elias Linu-Elias Linu-Elias left review comments

@harnish-elastic harnish-elastic harnish-elastic left review comments

@ishleenk17 ishleenk17 ishleenk17 left review comments

@shmsr shmsr shmsr left review comments

At least 1 approving review is required to merge this pull request.

Assignees

@Linu-Elias Linu-Elias

Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ishleenk17 @shmsr @harnish-elastic @Linu-Elias