From 59e5203c11fc91fd6a2d202a966d46963c72f76f Mon Sep 17 00:00:00 2001 From: Mariana Dima Date: Thu, 27 Aug 2020 14:37:35 +0200 Subject: [PATCH] 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.next.asciidoc | 2 ++ .../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, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 5c8a70071cf6..7c66379ec647 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -182,6 +182,8 @@ 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] +- 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 9a5fcfcbf912..41c0dd6d9f37 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 077e9b610ddb..9cd3eba55b8e 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 57f26c8ecd5b..307ac60abada 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",