[add_cloud_metadata processor] add cloud.region field to GCE cloud provider #35300

tetianakravchenko · 2023-05-03T10:21:01Z

What does this PR do?

Add cloud.region field to GCE cloud provider

Why is it important?

To align with other cloud providers

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.

Author's Checklist

[ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Before:

After:

Logs

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

botelastic · 2023-05-03T10:21:06Z

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

mergify · 2023-05-03T10:21:38Z

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @tetianakravchenko? 🙏.
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

endorama · 2023-05-03T10:35:36Z

libbeat/processors/add_cloud_metadata/provider_google_gce.go

@@ -82,6 +94,10 @@ var gceMetadataFetcher = provider{
 				}.ApplyTo(cloud, instance)
 				trimLeadingPath("machine.type")
 				trimLeadingPath("availability_zone")
+
+				if zone := getValue("availability_zone"); len(zone) >= 2 {


May you clarify what 2 means in this context? My understanding is that zone is a string, there is no region information available and we are extracting the region from the zone by removing the last 2 characters.

This works as zones in GCP are <region>-<zone> (docs) but to my knowledge <zone> is not guaranteed to be a single character.

@endorama you are right, I assumed it from the list of available regions/zones, but I couldn't find naming convention for that.
I've updated implementation - cd04fee

awesome 😃

elasticmachine · 2023-05-03T11:41:39Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2023-05-03T13:03:29.393+0000
Duration: 67 min 41 sec

Test stats 🧪

Test	Results
Failed	0
Passed	26297
Skipped	1975
Total	28272

💚 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!)

…ter '-' separators Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

…ovider (#35300) * add cloud.region field for GCE cloud provider Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * instead of relyin on assumed length of <zone>, remove last element after '-' separators Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> --------- Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> (cherry picked from commit 42ca469)

…ovider (#35300) * add cloud.region field for GCE cloud provider Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * instead of relyin on assumed length of <zone>, remove last element after '-' separators Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> --------- Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> (cherry picked from commit 42ca469) # Conflicts: # libbeat/processors/add_cloud_metadata/provider_google_gce_test.go

…ovider (#35300) (#35346) * add cloud.region field for GCE cloud provider Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * instead of relyin on assumed length of <zone>, remove last element after '-' separators Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> --------- Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> (cherry picked from commit 42ca469) Co-authored-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

…ovider (#35300) (#35347) * add cloud.region field for GCE cloud provider Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * instead of relyin on assumed length of <zone>, remove last element after '-' separators Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> --------- Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> (cherry picked from commit 42ca469) Co-authored-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

…on field to GCE cloud provider (#35345) * [add_cloud_metadata processor] add cloud.region field to GCE cloud provider (#35300) * add cloud.region field for GCE cloud provider Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * instead of relyin on assumed length of <zone>, remove last element after '-' separators Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> --------- Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> (cherry picked from commit 42ca469) # Conflicts: # libbeat/processors/add_cloud_metadata/provider_google_gce_test.go * Update CHANGELOG.next.asciidoc * Update provider_google_gce_test.go --------- Co-authored-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

…ovider (#35300) * add cloud.region field for GCE cloud provider Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * instead of relyin on assumed length of <zone>, remove last element after '-' separators Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> --------- Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

add cloud.region field for GCE cloud provider

1af29f0

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

tetianakravchenko requested a review from a team as a code owner May 3, 2023 10:21

tetianakravchenko requested review from faec and leehinman and removed request for a team May 3, 2023 10:21

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 3, 2023

tetianakravchenko requested review from a team and endorama May 3, 2023 10:21

mergify bot assigned tetianakravchenko May 3, 2023

endorama reviewed May 3, 2023

View reviewed changes

instead of relyin on assumed length of <zone>, remove last element af…

cd04fee

…ter '-' separators Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

endorama approved these changes May 4, 2023

View reviewed changes

tetianakravchenko mentioned this pull request May 5, 2023

[ECS] [TSDB] Centralisation of Dimension Fields elastic/integrations#5193

Open

tetianakravchenko added backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.7.0 Automated backport with mergify backport-v8.8.0 Automated backport with mergify labels May 5, 2023

tetianakravchenko merged commit 42ca469 into elastic:main May 5, 2023

tetianakravchenko deleted the add_cloud_metadata-processor branch May 5, 2023 11:12

reakaleek mentioned this pull request Jul 19, 2023

Fix ironbank validation in 8.8 #36115

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[add_cloud_metadata processor] add cloud.region field to GCE cloud provider #35300

[add_cloud_metadata processor] add cloud.region field to GCE cloud provider #35300

tetianakravchenko commented May 3, 2023

botelastic bot commented May 3, 2023

mergify bot commented May 3, 2023

endorama May 3, 2023

tetianakravchenko May 3, 2023

endorama May 4, 2023

elasticmachine commented May 3, 2023 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

[add_cloud_metadata processor] add cloud.region field to GCE cloud provider #35300

[add_cloud_metadata processor] add cloud.region field to GCE cloud provider #35300

Conversation

tetianakravchenko commented May 3, 2023

What does this PR do?

Why is it important?

Checklist

Author's Checklist

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

botelastic bot commented May 3, 2023

mergify bot commented May 3, 2023

endorama May 3, 2023

Choose a reason for hiding this comment

tetianakravchenko May 3, 2023

Choose a reason for hiding this comment

endorama May 4, 2023

Choose a reason for hiding this comment

elasticmachine commented May 3, 2023 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

elasticmachine commented May 3, 2023 •

edited by jenkins-beats-ci bot

Loading