Remove azure.resourcegroup.name

elastic · Mar 8, 2024 · 884af33 · 884af33
1 parent 757fc01
commit 884af33
Show file tree

Hide file tree

Showing 21 changed files with 16 additions and 123 deletions.
diff --git a/auditbeat/docs/fields.asciidoc b/auditbeat/docs/fields.asciidoc
@@ -2559,17 +2559,6 @@ alias to: cloud.region
 
 --
 
-
-*`azure.resourcegroup.name`*::
-+
---
-Name of resourceGroup the azure cloud instance belongs to.
-
-
-type: keyword
-
---
-
 [[exported-fields-common]]
 == Common fields
 

diff --git a/auditbeat/include/fields.go b/auditbeat/include/fields.go
diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc
@@ -27762,17 +27762,6 @@ alias to: cloud.region
 
 --
 
-
-*`azure.resourcegroup.name`*::
-+
---
-Name of resourceGroup the azure cloud instance belongs to.
-
-
-type: keyword
-
---
-
 [[exported-fields-coredns]]
 == Coredns fields
 

diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go
diff --git a/heartbeat/docs/fields.asciidoc b/heartbeat/docs/fields.asciidoc
@@ -321,17 +321,6 @@ alias to: cloud.region
 
 --
 
-
-*`azure.resourcegroup.name`*::
-+
---
-Name of resourceGroup the azure cloud instance belongs to.
-
-
-type: keyword
-
---
-
 [[exported-fields-common]]
 == Common heartbeat monitor fields
 

diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go
diff --git a/libbeat/processors/add_cloud_metadata/_meta/fields.yml b/libbeat/processors/add_cloud_metadata/_meta/fields.yml
@@ -51,13 +51,3 @@
       type: alias
       path: cloud.region
       migration: true
-
-    - name: azure.resourcegroup
-      default_field: true
-      type: group
-      fields:
-        - name: name
-          type: keyword
-          description: >
-            Name of resourceGroup the azure cloud instance belongs to.
-    
diff --git a/libbeat/processors/add_cloud_metadata/docs/add_cloud_metadata.asciidoc b/libbeat/processors/add_cloud_metadata/docs/add_cloud_metadata.asciidoc
@@ -159,9 +159,6 @@ _Azure Virtual Machine_
 [source,json]
 -------------------------------------------------------------------------------
 {
-  "azure": {
-    "resourcegroup.name": "/subscriptions/641ebacb-7743-41e7-b4fa-af1167351a61/resourcegroups/testgroup/providers/Microsoft.ContainerService/managedClusters/testcluster"
-  },
   "cloud": {
     "provider": "azure",
     "instance.id": "04ab04c3-63de-4709-a9f9-9ab8c0411d5e",

diff --git a/libbeat/processors/add_cloud_metadata/provider_azure_vm.go b/libbeat/processors/add_cloud_metadata/provider_azure_vm.go
@@ -83,15 +83,11 @@ var azureVMMetadataFetcher = provider{
 				"service": s.Object{
 					"name": c.Str("serviceName"),
 				},
-				"region": c.Str("location"),
+				"region":        c.Str("location"),
+				"resourcegroup": c.Str("resourceGroupName"),
 			}.Apply(m)
 
-			azure, _ := s.Schema{
-				"resourcegroup": s.Object{
-					"name": c.Str("resourceGroupName"),
-				},
-			}.Apply(m)
-			return mapstr.M{"cloud": cloud, "azure": azure}
+			return mapstr.M{"cloud": cloud}
 		}
 
 		azGenSchema := func(m map[string]interface{}) mapstr.M {
@@ -189,11 +185,14 @@ func (az *azureMetadataFetcher) fetchAzureClusterMeta(
 ) {
 	logger := logp.NewLogger("add_cloud_metadata")
 	subscriptionId, _ := az.httpMeta.GetValue("cloud.account.id")
-	resourceGroupName, _ := az.httpMeta.GetValue("azure.resourcegroup.name")
+	resourceGroupName, _ := az.httpMeta.GetValue("cloud.resourcegroup")
 	strResourceGroupName := ""
 	if val, ok := resourceGroupName.(string); ok {
 		strResourceGroupName = val
 	}
+	// Drop cloud.resourcegroup field as we do not want the cloud provider to populate this field
+	az.httpMeta.Delete("cloud.resourcegroup")
+
 	strSubscriptionId := ""
 	if val, ok := subscriptionId.(string); ok {
 		strSubscriptionId = val

diff --git a/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go b/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go
@@ -186,11 +186,6 @@ func TestRetrieveAzureMetadata(t *testing.T) {
 	}
 
 	expected := mapstr.M{
-		"azure": mapstr.M{
-			"resourcegroup": mapstr.M{
-				"name": "MC_myname_group_myname_eastus",
-			},
-		},
 		"cloud": mapstr.M{
 			"provider": "azure",
 			"instance": mapstr.M{

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -10158,17 +10158,6 @@ alias to: cloud.region
 
 --
 
-
-*`azure.resourcegroup.name`*::
-+
---
-Name of resourceGroup the azure cloud instance belongs to.
-
-
-type: keyword
-
---
-
 [[exported-fields-cloudfoundry]]
 == Cloudfoundry fields
 

diff --git a/metricbeat/include/fields/fields.go b/metricbeat/include/fields/fields.go
diff --git a/packetbeat/docs/fields.asciidoc b/packetbeat/docs/fields.asciidoc
@@ -1347,17 +1347,6 @@ alias to: cloud.region
 
 --
 
-
-*`azure.resourcegroup.name`*::
-+
---
-Name of resourceGroup the azure cloud instance belongs to.
-
-
-type: keyword
-
---
-
 [[exported-fields-common]]
 == Common fields
 

diff --git a/packetbeat/include/fields.go b/packetbeat/include/fields.go
diff --git a/winlogbeat/docs/fields.asciidoc b/winlogbeat/docs/fields.asciidoc
@@ -174,17 +174,6 @@ alias to: cloud.region
 
 --
 
-
-*`azure.resourcegroup.name`*::
-+
---
-Name of resourceGroup the azure cloud instance belongs to.
-
-
-type: keyword
-
---
-
 [[exported-fields-docker-processor]]
 == Docker fields
 

diff --git a/winlogbeat/include/fields.go b/winlogbeat/include/fields.go
diff --git a/x-pack/functionbeat/docs/fields.asciidoc b/x-pack/functionbeat/docs/fields.asciidoc
@@ -170,17 +170,6 @@ alias to: cloud.region
 
 --
 
-
-*`azure.resourcegroup.name`*::
-+
---
-Name of resourceGroup the azure cloud instance belongs to.
-
-
-type: keyword
-
---
-
 [[exported-fields-docker-processor]]
 == Docker fields
 

diff --git a/x-pack/functionbeat/include/fields.go b/x-pack/functionbeat/include/fields.go
diff --git a/x-pack/heartbeat/include/fields.go b/x-pack/heartbeat/include/fields.go
diff --git a/x-pack/osquerybeat/docs/fields.asciidoc b/x-pack/osquerybeat/docs/fields.asciidoc
@@ -170,17 +170,6 @@ alias to: cloud.region
 
 --
 
-
-*`azure.resourcegroup.name`*::
-+
---
-Name of resourceGroup the azure cloud instance belongs to.
-
-
-type: keyword
-
---
-
 [[exported-fields-docker-processor]]
 == Docker fields
 

diff --git a/x-pack/osquerybeat/include/fields.go b/x-pack/osquerybeat/include/fields.go