From ce013580b66a6881672bb870a64768475283cd85 Mon Sep 17 00:00:00 2001 From: Mariana Dima Date: Mon, 31 Aug 2020 12:33:31 +0200 Subject: [PATCH] Cherry-pick #20689 to 7.9: Rename cloud.provider to `azure` instead of `az` in add_cloud_metadata processor (#20823) * Rename cloud.provider to `azure` instead of `az` in add_cloud_metadata processor (#20689) * mofidy doc * rename azure provider in cloud data * changelo (cherry picked from commit d34d1b654b17a3e87069f8f8354c0d3390a44bd9) * changelog --- CHANGELOG.next.asciidoc | 1 + .../add_cloud_metadata/docs/add_cloud_metadata.asciidoc | 2 +- libbeat/processors/add_cloud_metadata/provider_azure_vm.go | 2 +- libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 8f71b7eb445..ffb111bd9b1 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -52,6 +52,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix `setup.dashboards.index` setting not working. {pull}17749[17749] - Fix Elasticsearch license endpoint URL referenced in error message. {issue}17880[17880] {pull}18030[18030] - Change `decode_json_fields` processor, to merge parsed json objects with existing objects in the event instead of fully replacing them. {pull}17958[17958] +- Rename cloud.provider `az` value to `azure` inside the add_cloud_metadata processor. {pull}20689[20689] - Add missing country_name geo field in `add_host_metadata` and `add_observer_metadata` processors. {issue}20796[20796] {pull}20811[20811] *Auditbeat* diff --git a/libbeat/processors/add_cloud_metadata/docs/add_cloud_metadata.asciidoc b/libbeat/processors/add_cloud_metadata/docs/add_cloud_metadata.asciidoc index 9a5fcfcbf91..41c0dd6d9f3 100644 --- a/libbeat/processors/add_cloud_metadata/docs/add_cloud_metadata.asciidoc +++ b/libbeat/processors/add_cloud_metadata/docs/add_cloud_metadata.asciidoc @@ -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", diff --git a/libbeat/processors/add_cloud_metadata/provider_azure_vm.go b/libbeat/processors/add_cloud_metadata/provider_azure_vm.go index 077e9b610dd..9cd3eba55b8 100644 --- a/libbeat/processors/add_cloud_metadata/provider_azure_vm.go +++ b/libbeat/processors/add_cloud_metadata/provider_azure_vm.go @@ -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 }, } diff --git a/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go b/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go index 57f26c8ecd5..307ac60abad 100644 --- a/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go @@ -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",