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

[GCP] Region and zone ecs fields nested in cloud field #37015

Merged
merged 2 commits into from
Nov 3, 2023

Conversation

ishleenk17
Copy link
Contributor

@ishleenk17 ishleenk17 commented Nov 2, 2023

The regsion and zone ecs fields were present as below:

{
  "cloud": {
    "account": {
      "id": "acount-id-1",
      "name": "account-name-1"
    },
    "instance": {
      "id": "111111",
      "name": "test-name"
    },
    "machine": {
      "type": "f1-micro"
    },
    "provider": "gcp"
  },
  "cloud.availability_zone": "asia-northeast1-a",
  "cloud.region": "asia-northeast1"
  ...

These fields have now been nested and event will look like this after thae change:

{
  "cloud": {
    "account": {
      "id": "acount-id-1",
      "name": "account-name-1"
    },
    "instance": {
      "id": "111111",
      "name": "test-name"
    },
    "machine": {
      "type": "f1-micro"
    },
    "provider": "gcp",
    "availability_zone": "asia-northeast1",
    "region": "asia-northeast1"
  },
  ...

}

Proposed commit message

See title

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 2, 2023
Copy link
Contributor

mergify bot commented Nov 2, 2023

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 gcp_nested upstream/gcp_nested
git merge upstream/main
git push upstream gcp_nested

Copy link
Contributor

mergify bot commented Nov 2, 2023

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-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@ishleenk17 ishleenk17 added the Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team label Nov 2, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 2, 2023
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-11-02T05:15:29.399+0000

  • Duration: 57 min 43 sec

Test stats 🧪

Test Results
Failed 0
Passed 1534
Skipped 96
Total 1630

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@ishleenk17 ishleenk17 marked this pull request as ready for review November 2, 2023 06:12
@ishleenk17 ishleenk17 requested a review from a team as a code owner November 2, 2023 06:12
Copy link
Contributor

@zmoog zmoog left a comment

Choose a reason for hiding this comment

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

LGTM!

@ishleenk17 ishleenk17 merged commit 48e0660 into elastic:main Nov 3, 2023
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[MetricBeat][GCP] ecs field cloud.region, cloud.availability_zone should be nested in cloud field
3 participants