From c82d3248ec775191213c809712bfd40407d1f0a1 Mon Sep 17 00:00:00 2001 From: Maurizio Branca Date: Mon, 7 Oct 2024 12:55:00 +0200 Subject: [PATCH 1/2] Enable subobjects: false on azure.resource.tags.* --- .../data_stream/compute_vm/fields/package-fields.yml | 1 + .../data_stream/compute_vm_scaleset/fields/package-fields.yml | 1 + .../data_stream/container_registry/fields/package-fields.yml | 1 + .../data_stream/container_service/fields/package-fields.yml | 1 + .../data_stream/database_account/fields/package-fields.yml | 1 + .../azure_metrics/data_stream/monitor/fields/package-fields.yml | 1 + .../data_stream/storage_account/fields/package-fields.yml | 1 + 7 files changed, 7 insertions(+) diff --git a/packages/azure_metrics/data_stream/compute_vm/fields/package-fields.yml b/packages/azure_metrics/data_stream/compute_vm/fields/package-fields.yml index e8599123a216..dae8b235edc9 100644 --- a/packages/azure_metrics/data_stream/compute_vm/fields/package-fields.yml +++ b/packages/azure_metrics/data_stream/compute_vm/fields/package-fields.yml @@ -39,6 +39,7 @@ type: object object_type: keyword object_type_mapping_type: "*" + subobjects: false description: > Azure resource tags. diff --git a/packages/azure_metrics/data_stream/compute_vm_scaleset/fields/package-fields.yml b/packages/azure_metrics/data_stream/compute_vm_scaleset/fields/package-fields.yml index 02b1fa45f434..5b3a14f7c799 100644 --- a/packages/azure_metrics/data_stream/compute_vm_scaleset/fields/package-fields.yml +++ b/packages/azure_metrics/data_stream/compute_vm_scaleset/fields/package-fields.yml @@ -39,6 +39,7 @@ type: object object_type: keyword object_type_mapping_type: "*" + subobjects: false description: > Azure resource tags. diff --git a/packages/azure_metrics/data_stream/container_registry/fields/package-fields.yml b/packages/azure_metrics/data_stream/container_registry/fields/package-fields.yml index 3dc39b31b4ba..36c47dd06525 100644 --- a/packages/azure_metrics/data_stream/container_registry/fields/package-fields.yml +++ b/packages/azure_metrics/data_stream/container_registry/fields/package-fields.yml @@ -39,6 +39,7 @@ type: object object_type: keyword object_type_mapping_type: "*" + subobjects: false description: > Azure resource tags. diff --git a/packages/azure_metrics/data_stream/container_service/fields/package-fields.yml b/packages/azure_metrics/data_stream/container_service/fields/package-fields.yml index 052de7832b1f..85c239258fcf 100644 --- a/packages/azure_metrics/data_stream/container_service/fields/package-fields.yml +++ b/packages/azure_metrics/data_stream/container_service/fields/package-fields.yml @@ -39,6 +39,7 @@ type: object object_type: keyword object_type_mapping_type: "*" + subobjects: false description: > Azure resource tags. diff --git a/packages/azure_metrics/data_stream/database_account/fields/package-fields.yml b/packages/azure_metrics/data_stream/database_account/fields/package-fields.yml index 766b2d19b077..471c946a5956 100644 --- a/packages/azure_metrics/data_stream/database_account/fields/package-fields.yml +++ b/packages/azure_metrics/data_stream/database_account/fields/package-fields.yml @@ -39,6 +39,7 @@ type: object object_type: keyword object_type_mapping_type: "*" + subobjects: false description: > Azure resource tags. diff --git a/packages/azure_metrics/data_stream/monitor/fields/package-fields.yml b/packages/azure_metrics/data_stream/monitor/fields/package-fields.yml index 445f903c9de7..e477acfceb32 100644 --- a/packages/azure_metrics/data_stream/monitor/fields/package-fields.yml +++ b/packages/azure_metrics/data_stream/monitor/fields/package-fields.yml @@ -39,6 +39,7 @@ type: object object_type: keyword object_type_mapping_type: "*" + subobjects: false description: > Azure resource tags. diff --git a/packages/azure_metrics/data_stream/storage_account/fields/package-fields.yml b/packages/azure_metrics/data_stream/storage_account/fields/package-fields.yml index 06117dae3e99..d771bbac0690 100644 --- a/packages/azure_metrics/data_stream/storage_account/fields/package-fields.yml +++ b/packages/azure_metrics/data_stream/storage_account/fields/package-fields.yml @@ -39,6 +39,7 @@ type: object object_type: keyword object_type_mapping_type: "*" + subobjects: false description: > Azure resource tags. From 36dd77da46be25ed6996babe1c69e0b39f42f396 Mon Sep 17 00:00:00 2001 From: Maurizio Branca Date: Mon, 7 Oct 2024 13:18:51 +0200 Subject: [PATCH 2/2] Update tests adding field with dots in the name --- .../_dev/test/pipeline/test-azure-metrics-compute-vm.json | 3 ++- .../test-azure-metrics-compute-vm.json-expected.json | 3 ++- .../pipeline/test-azure-metrics-compute-vm-scaleset.json | 6 +++++- ...est-azure-metrics-compute-vm-scaleset.json-expected.json | 6 +++++- .../pipeline/test-azure-metrics-container-instance.json | 3 ++- ...test-azure-metrics-container-instance.json-expected.json | 3 ++- .../_dev/test/pipeline/test-azure-container-service.json | 3 ++- .../test-azure-container-service.json-expected.json | 3 ++- 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/packages/azure_metrics/data_stream/compute_vm/_dev/test/pipeline/test-azure-metrics-compute-vm.json b/packages/azure_metrics/data_stream/compute_vm/_dev/test/pipeline/test-azure-metrics-compute-vm.json index 47e779394f79..856c9a30fcc3 100644 --- a/packages/azure_metrics/data_stream/compute_vm/_dev/test/pipeline/test-azure-metrics-compute-vm.json +++ b/packages/azure_metrics/data_stream/compute_vm/_dev/test/pipeline/test-azure-metrics-compute-vm.json @@ -81,7 +81,8 @@ "group": "obs-infrastructure", "tags": { "vmtest1": "value3", - "vmtest": "value1, value 2" + "vmtest": "value1, value 2", + "i.contain.dots": "value4" } }, "namespace": "Microsoft.Compute/virtualMachines", diff --git a/packages/azure_metrics/data_stream/compute_vm/_dev/test/pipeline/test-azure-metrics-compute-vm.json-expected.json b/packages/azure_metrics/data_stream/compute_vm/_dev/test/pipeline/test-azure-metrics-compute-vm.json-expected.json index 1e5c7c93efae..a11964d59077 100644 --- a/packages/azure_metrics/data_stream/compute_vm/_dev/test/pipeline/test-azure-metrics-compute-vm.json-expected.json +++ b/packages/azure_metrics/data_stream/compute_vm/_dev/test/pipeline/test-azure-metrics-compute-vm.json-expected.json @@ -30,7 +30,8 @@ "name": "obstestmemleak", "tags": { "vmtest": "value1, value 2", - "vmtest1": "value3" + "vmtest1": "value3", + "i.contain.dots": "value4" }, "type": "Microsoft.Compute/virtualMachines" }, diff --git a/packages/azure_metrics/data_stream/compute_vm_scaleset/_dev/test/pipeline/test-azure-metrics-compute-vm-scaleset.json b/packages/azure_metrics/data_stream/compute_vm_scaleset/_dev/test/pipeline/test-azure-metrics-compute-vm-scaleset.json index cad588fe072c..5ef626c591bc 100644 --- a/packages/azure_metrics/data_stream/compute_vm_scaleset/_dev/test/pipeline/test-azure-metrics-compute-vm-scaleset.json +++ b/packages/azure_metrics/data_stream/compute_vm_scaleset/_dev/test/pipeline/test-azure-metrics-compute-vm-scaleset.json @@ -71,7 +71,11 @@ "name": "obswinvmss", "id": "/subscriptions/70bd6e77-4b1e-4835-8896-db77b8eef364/resourceGroups/obs-infrastructure/providers/Microsoft.Compute/virtualMachineScaleSets/obswinvmss", "type": "Microsoft.Compute/virtualMachineScaleSets", - "group": "obs-infrastructure" + "group": "obs-infrastructure", + "tags": { + "vmtest1": "value1", + "i.contain.dots": "value2" + } }, "namespace": "Microsoft.Compute/virtualMachineScaleSets" } diff --git a/packages/azure_metrics/data_stream/compute_vm_scaleset/_dev/test/pipeline/test-azure-metrics-compute-vm-scaleset.json-expected.json b/packages/azure_metrics/data_stream/compute_vm_scaleset/_dev/test/pipeline/test-azure-metrics-compute-vm-scaleset.json-expected.json index 9370ba17512c..3d731dfb29f6 100644 --- a/packages/azure_metrics/data_stream/compute_vm_scaleset/_dev/test/pipeline/test-azure-metrics-compute-vm-scaleset.json-expected.json +++ b/packages/azure_metrics/data_stream/compute_vm_scaleset/_dev/test/pipeline/test-azure-metrics-compute-vm-scaleset.json-expected.json @@ -16,7 +16,11 @@ "group": "obs-infrastructure", "id": "/subscriptions/70bd6e77-4b1e-4835-8896-db77b8eef364/resourceGroups/obs-infrastructure/providers/Microsoft.Compute/virtualMachineScaleSets/obswinvmss", "name": "obswinvmss", - "type": "Microsoft.Compute/virtualMachineScaleSets" + "type": "Microsoft.Compute/virtualMachineScaleSets", + "tags": { + "vmtest1": "value1", + "i.contain.dots": "value2" + } }, "subscription_id": "70bd6e77-4b1e-4835-8896-db77b8eef364", "timegrain": "PT5M" diff --git a/packages/azure_metrics/data_stream/container_instance/_dev/test/pipeline/test-azure-metrics-container-instance.json b/packages/azure_metrics/data_stream/container_instance/_dev/test/pipeline/test-azure-metrics-container-instance.json index 4bb2ad2e2792..92f48edcbeb5 100644 --- a/packages/azure_metrics/data_stream/container_instance/_dev/test/pipeline/test-azure-metrics-container-instance.json +++ b/packages/azure_metrics/data_stream/container_instance/_dev/test/pipeline/test-azure-metrics-container-instance.json @@ -63,7 +63,8 @@ "id": "/subscriptions/70bd6e77-4b1e-4835-8896-db77b8eef364/resourceGroups/obs-infrastructure/providers/Microsoft.ContainerInstance/containerGroups/testcontainergroup", "type": "Microsoft.ContainerInstance/containerGroups", "tags": { - "tag1": "value1" + "tag1": "value1", + "i.contain.dots": "value2" }, "group": "obs-infrastructure" }, diff --git a/packages/azure_metrics/data_stream/container_instance/_dev/test/pipeline/test-azure-metrics-container-instance.json-expected.json b/packages/azure_metrics/data_stream/container_instance/_dev/test/pipeline/test-azure-metrics-container-instance.json-expected.json index 9d2cc55ed9e5..de4879945e77 100644 --- a/packages/azure_metrics/data_stream/container_instance/_dev/test/pipeline/test-azure-metrics-container-instance.json-expected.json +++ b/packages/azure_metrics/data_stream/container_instance/_dev/test/pipeline/test-azure-metrics-container-instance.json-expected.json @@ -17,7 +17,8 @@ "id": "/subscriptions/70bd6e77-4b1e-4835-8896-db77b8eef364/resourceGroups/obs-infrastructure/providers/Microsoft.ContainerInstance/containerGroups/testcontainergroup", "name": "testcontainergroup", "tags": { - "tag1": "value1" + "tag1": "value1", + "i.contain.dots": "value2" }, "type": "Microsoft.ContainerInstance/containerGroups" }, diff --git a/packages/azure_metrics/data_stream/container_service/_dev/test/pipeline/test-azure-container-service.json b/packages/azure_metrics/data_stream/container_service/_dev/test/pipeline/test-azure-container-service.json index 18c57694440a..e6f1ed2ba747 100644 --- a/packages/azure_metrics/data_stream/container_service/_dev/test/pipeline/test-azure-container-service.json +++ b/packages/azure_metrics/data_stream/container_service/_dev/test/pipeline/test-azure-container-service.json @@ -94,7 +94,8 @@ "type": "Microsoft.ContainerService/managedClusters", "group": "test_group", "tags": { - "custodian_status": "Resource does not meet policy: delete@2023/09/26" + "custodian_status": "Resource does not meet policy: delete@2023/09/26", + "i.contain.dots": "value2" } }, "namespace": "Microsoft.ContainerService/managedClusters", diff --git a/packages/azure_metrics/data_stream/container_service/_dev/test/pipeline/test-azure-container-service.json-expected.json b/packages/azure_metrics/data_stream/container_service/_dev/test/pipeline/test-azure-container-service.json-expected.json index b3d6388c9f5a..83e95a64cac7 100644 --- a/packages/azure_metrics/data_stream/container_service/_dev/test/pipeline/test-azure-container-service.json-expected.json +++ b/packages/azure_metrics/data_stream/container_service/_dev/test/pipeline/test-azure-container-service.json-expected.json @@ -26,7 +26,8 @@ "id": "/subscriptions/a2960656-390f-47b5-a154-b048d34ab096/resourceGroups/test_group/providers/Microsoft.ContainerService/managedClusters/test", "name": "test", "tags": { - "custodian_status": "Resource does not meet policy: delete@2023/09/26" + "custodian_status": "Resource does not meet policy: delete@2023/09/26", + "i.contain.dots": "value2" }, "type": "Microsoft.ContainerService/managedClusters" },