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

[add_cloud_metadata processor] Update azure metadata api version #35302

Merged

Conversation

tetianakravchenko
Copy link
Contributor

What does this PR do?

Update azure metadata api version to get missing field: cloud.account.id

Why is it important?

missing field cloud.account.id because curl -s -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2017-04-02" does not return this value:

{
        "location": "eastus",
        "name": "aks-agentpool-12628255-vmss_2",
        "offer": "",
        "osType": "Linux",
        "platformFaultDomain": "0",
        "platformUpdateDomain": "0",
        "publisher": "",
        "sku": "",
        "version": "",
        "vmId": "220e2b43-0913-492f-ada0-b6b2795bdb9b",
        "vmSize": "Standard_DS2_v2"
    },

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

Logs

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
@tetianakravchenko tetianakravchenko requested a review from a team as a code owner May 3, 2023 11:13
@tetianakravchenko tetianakravchenko requested review from belimawr and cmacknz and removed request for a team May 3, 2023 11:13
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 3, 2023
@botelastic
Copy link

botelastic bot commented May 3, 2023

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

@tetianakravchenko tetianakravchenko requested review from a team and zmoog May 3, 2023 11:13
@mergify
Copy link
Contributor

mergify bot commented May 3, 2023

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 3, 2023

💚 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-05-05T15:57:43.616+0000

  • Duration: 66 min 5 sec

Test stats 🧪

Test Results
Failed 0
Passed 26305
Skipped 1975
Total 28280

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

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
@kaiyan-sheng kaiyan-sheng changed the title [add_cloud_metasata processor] Update azure metadata api version [add_cloud_metadata processor] Update azure metadata api version May 4, 2023
@mergify
Copy link
Contributor

mergify bot commented May 5, 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 add_cloud_metadata_azure upstream/add_cloud_metadata_azure
git merge upstream/main
git push upstream add_cloud_metadata_azure

@tetianakravchenko 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 6, 2023
@tetianakravchenko tetianakravchenko merged commit 25e882f into elastic:main May 6, 2023
@tetianakravchenko tetianakravchenko deleted the add_cloud_metadata_azure branch May 6, 2023 17:50
mergify bot pushed a commit that referenced this pull request May 6, 2023
)

* update azure metadata api version

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

* fix linter

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

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
(cherry picked from commit 25e882f)

# Conflicts:
#	libbeat/processors/add_cloud_metadata/provider_azure_vm.go
#	libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go
mergify bot pushed a commit that referenced this pull request May 6, 2023
)

* update azure metadata api version

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

* fix linter

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

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
(cherry picked from commit 25e882f)
mergify bot pushed a commit that referenced this pull request May 6, 2023
)

* update azure metadata api version

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

* fix linter

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

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
(cherry picked from commit 25e882f)
tetianakravchenko added a commit that referenced this pull request May 8, 2023
) (#35365)

* update azure metadata api version

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

* fix linter

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

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
(cherry picked from commit 25e882f)

Co-authored-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
tetianakravchenko added a commit that referenced this pull request May 8, 2023
) (#35366)

* update azure metadata api version

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

* fix linter

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

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
(cherry picked from commit 25e882f)

Co-authored-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
tetianakravchenko added a commit that referenced this pull request May 9, 2023
…etadata api version (#35364)

* [add_cloud_metadata processor] Update azure metadata api version (#35302)

* update azure metadata api version

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

* fix linter

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

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
(cherry picked from commit 25e882f)

# Conflicts:
#	libbeat/processors/add_cloud_metadata/provider_azure_vm.go
#	libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go

* Update provider_azure_vm.go

* Update provider_azure_vm_test.go

* Update provider_azure_vm_test.go

---------

Co-authored-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023
)

* update azure metadata api version

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

* fix linter

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

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
@reakaleek reakaleek mentioned this pull request Jul 19, 2023
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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 bug needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants