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

Cherry-pick #20689 to 7.x: Rename cloud.provider to azure instead of az in add_cloud_metadata processor #20824

Merged
merged 3 commits into from
Aug 31, 2020
Merged

Cherry-pick #20689 to 7.x: Rename cloud.provider to azure instead of az in add_cloud_metadata processor #20824

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59e5203
Rename cloud.provider to `azure` instead of `az` in add_cloud_metadat…
narph Aug 27, 2020
c3a85b2
changelog
narph Aug 27, 2020
9456225
Merge branch '7.x' into backport_20689_7.x
narph Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ field. You can revert this change by configuring tags for the module and omittin
- Fix issue in autodiscover that kept inputs stopped after config updates. {pull}20305[20305]
- Add service resource in k8s cluster role. {pull}20546[20546]
- [Metricbeat][Kubernetes] Change cluster_ip field from ip to keyword. {pull}20571[20571]
- Rename cloud.provider `az` value to `azure` inside the add_cloud_metadata processor. {pull}20689[20689]

*Auditbeat*

Expand Down
2 changes: 1 addition & 1 deletion libbeat/processors/add_cloud_metadata/docs/add_cloud_metadata.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ _Azure Virtual Machine_
-------------------------------------------------------------------------------
{
"cloud": {
"provider": "az",
"provider": "azure",
"instance.id": "04ab04c3-63de-4709-a9f9-9ab8c0411d5e",
"instance.name": "test-az-vm",
"machine.type": "Standard_D3_v2",
Expand Down
2 changes: 1 addition & 1 deletion libbeat/processors/add_cloud_metadata/provider_azure_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var azureVMMetadataFetcher = provider{
return out
}

fetcher, err := newMetadataFetcher(config, "az", azHeaders, metadataHost, azSchema, azMetadataURI)
fetcher, err := newMetadataFetcher(config, "azure", azHeaders, metadataHost, azSchema, azMetadataURI)
return fetcher, err
},
}
2 changes: 1 addition & 1 deletion libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func TestRetrieveAzureMetadata(t *testing.T) {

expected := common.MapStr{
"cloud": common.MapStr{
"provider": "az",
"provider": "azure",
"instance": common.MapStr{
"id": "04ab04c3-63de-4709-a9f9-9ab8c0411d5e",
"name": "test-az-vm",
Expand Down