Move azure module to GA (#16754) (#16793)

* work on GA * mage fmt * fix * work on tests * fix * work on tests * generate from test (cherry picked from commit 1894441)
elastic · Mar 4, 2020 · 939a426 · 939a426
1 parent 742a7fd
commit 939a426
Show file tree

Hide file tree

Showing 47 changed files with 1,252 additions and 733 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -279,6 +279,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add OpenMetrics Metricbeat module {pull}16596[16596]
 - Add `redisenterprise` module. {pull}16482[16482] {issue}15269[15269]
 - Add `cloudfoundry` module to send events from Cloud Foundry. {pull}16671[16671]
+- Align fields to ECS and add more tests for the azure module. {issue}16024[16024] {pull}16754[16754]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -3124,16 +3124,6 @@ The resource specified
 
 
 
-*`azure.resource.name`*::
-+
---
-The name of the resource
-
-
-type: keyword
-
---
-
 *`azure.resource.type`*::
 +
 --

diff --git a/x-pack/metricbeat/module/azure/_meta/fields.yml b/x-pack/metricbeat/module/azure/_meta/fields.yml
@@ -17,10 +17,6 @@
           description: >
             The resource specified
           fields:
-            - name: name
-              type: keyword
-              description: >
-                The name of the resource
             - name: type
               type: keyword
               description: >

diff --git a/...ricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-blob-storage-overview.json b/...ricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-blob-storage-overview.json
@@ -483,7 +483,7 @@
             "index_pattern": "metricbeat-*",
             "interval": "60m",
             "isModelInvalid": false,
-            "pivot_id": "azure.resource.name",
+            "pivot_id": "cloud.instance.name",
             "pivot_label": "Resource Name",
             "pivot_rows": "30",
             "pivot_type": "string",
@@ -513,7 +513,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -616,7 +616,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -767,7 +767,7 @@
                 "type": "list"
               },
               {
-                "fieldName": "azure.resource.name",
+                "fieldName": "cloud.instance.name",
                 "id": "1578578146383",
                 "indexPatternRefName": "control_2_index_pattern",
                 "label": "Resource Name",
@@ -1048,7 +1048,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"

diff --git a/...ricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-file-storage-overview.json b/...ricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-file-storage-overview.json
@@ -523,7 +523,7 @@
             "index_pattern": "metricbeat-*",
             "interval": "60m",
             "isModelInvalid": false,
-            "pivot_id": "azure.resource.name",
+            "pivot_id": "cloud.instance.name",
             "pivot_label": "Resource Name",
             "pivot_rows": "30",
             "pivot_type": "string",
@@ -553,7 +553,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -656,7 +656,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -759,7 +759,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -910,7 +910,7 @@
                 "type": "list"
               },
               {
-                "fieldName": "azure.resource.name",
+                "fieldName": "cloud.instance.name",
                 "id": "1578578146383",
                 "indexPatternRefName": "control_2_index_pattern",
                 "label": "Resource Name",
@@ -1165,7 +1165,7 @@
             "index_pattern": "metricbeat-*",
             "interval": "60m",
             "isModelInvalid": false,
-            "pivot_id": "azure.resource.name",
+            "pivot_id": "cloud.instance.name",
             "pivot_label": "Resource Name",
             "pivot_rows": "30",
             "pivot_type": "string",
@@ -1195,7 +1195,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -1272,7 +1272,7 @@
             "index_pattern": "metricbeat-*",
             "interval": "60m",
             "isModelInvalid": false,
-            "pivot_id": "azure.resource.name",
+            "pivot_id": "cloud.instance.name",
             "pivot_label": "Resource Name",
             "pivot_rows": "30",
             "pivot_type": "string",
@@ -1302,7 +1302,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"

diff --git a/...icbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-queue-storage-overview.json b/...icbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-queue-storage-overview.json
@@ -483,7 +483,7 @@
             "index_pattern": "metricbeat-*",
             "interval": "60m",
             "isModelInvalid": false,
-            "pivot_id": "azure.resource.name",
+            "pivot_id": "cloud.instance.name",
             "pivot_label": "Resource Name",
             "pivot_rows": "30",
             "pivot_type": "string",
@@ -513,7 +513,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -616,7 +616,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -719,7 +719,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -870,7 +870,7 @@
                 "type": "list"
               },
               {
-                "fieldName": "azure.resource.name",
+                "fieldName": "cloud.instance.name",
                 "id": "1578578146383",
                 "indexPatternRefName": "control_2_index_pattern",
                 "label": "Resource Name",

diff --git a/...k/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-storage-overview.json b/...k/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-storage-overview.json
@@ -474,7 +474,7 @@
             "index_pattern": "metricbeat-*",
             "interval": "60m",
             "isModelInvalid": false,
-            "pivot_id": "azure.resource.name",
+            "pivot_id": "cloud.instance.name",
             "pivot_label": "Resource Name",
             "pivot_rows": "30",
             "pivot_type": "string",
@@ -504,7 +504,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -607,7 +607,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -710,7 +710,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -861,7 +861,7 @@
                 "type": "list"
               },
               {
-                "fieldName": "azure.resource.name",
+                "fieldName": "cloud.instance.name",
                 "id": "1578578146383",
                 "indexPatternRefName": "control_2_index_pattern",
                 "label": "Resource Name",
@@ -1116,7 +1116,7 @@
             "index_pattern": "metricbeat-*",
             "interval": "60m",
             "isModelInvalid": false,
-            "pivot_id": "azure.resource.name",
+            "pivot_id": "cloud.instance.name",
             "pivot_label": "Resource Name",
             "pivot_rows": "30",
             "pivot_type": "string",
@@ -1146,7 +1146,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "terms",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"

diff --git a/...icbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-table-storage-overview.json b/...icbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-table-storage-overview.json
@@ -483,7 +483,7 @@
             "index_pattern": "metricbeat-*",
             "interval": "60m",
             "isModelInvalid": false,
-            "pivot_id": "azure.resource.name",
+            "pivot_id": "cloud.instance.name",
             "pivot_label": "Resource Name",
             "pivot_rows": "30",
             "pivot_type": "string",
@@ -513,7 +513,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -616,7 +616,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -719,7 +719,7 @@
                 "split_color_mode": "gradient",
                 "split_mode": "everything",
                 "stacked": "none",
-                "terms_field": "azure.resource.name",
+                "terms_field": "cloud.instance.name",
                 "terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                 "type": "timeseries",
                 "value_template": "{{value}}"
@@ -870,7 +870,7 @@
                 "type": "list"
               },
               {
-                "fieldName": "azure.resource.name",
+                "fieldName": "cloud.instance.name",
                 "id": "1578578146383",
                 "indexPatternRefName": "control_2_index_pattern",
                 "label": "Resource Name",

diff --git a/...beat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-vm-guestmetrics-overview.json b/...beat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-vm-guestmetrics-overview.json
@@ -251,7 +251,7 @@
                 "type": "list"
               },
               {
-                "fieldName": "azure.resource.name",
+                "fieldName": "cloud.instance.name",
                 "id": "1570774891724",
                 "indexPatternRefName": "control_2_index_pattern",
                 "label": "VM Name",