elastic · narph · Oct 6, 2021 · Oct 6, 2021
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -115,6 +115,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Remove deprecated fields in Docker module. {issue}11835[11835] {pull}27933[27933]
 - Remove deprecated fields in Kafka module. {pull}27938[27938]
 - Remove deprecated config option default_region from aws module. {pull}28120[28120]
+- Rename storage to storage_account metricset in the azure module for consistency. {pull}28284[28284]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -6197,7 +6197,7 @@ type: object
 monitor
 
 
-*`azure.storage.*.*`*::
+*`azure.storage_account.*.*`*::
 +
 --
 storage account

diff --git a/metricbeat/docs/modules/azure.asciidoc b/metricbeat/docs/modules/azure.asciidoc
@@ -117,9 +117,9 @@ This metricset will collect metrics from the virtual machine scalesets, these me
 so the `period` for `compute_vm_scaleset` metricset  should be `300s` or multiples of `300s`.
 
 [float]
-=== `storage`
+=== `storage_account`
 This metricset will collect metrics from the storage accounts, these metrics will have a timegrain every 5 minutes,
-so the `period` for `storage` metricset  should be `300s` or multiples of `300s`.
+so the `period` for `storage_account` metricset  should be `300s` or multiples of `300s`.
 
 [float]
 === `container_instance`
@@ -209,7 +209,7 @@ metricbeat.modules:
 
 - module: azure
   metricsets:
-  - storage
+  - storage_account
   enabled: true
   period: 300s
   client_id: '${AZURE_CLIENT_ID:""}'
@@ -311,7 +311,7 @@ The following metricsets are available:
 
 * <<metricbeat-metricset-azure-monitor,monitor>>
 
-* <<metricbeat-metricset-azure-storage,storage>>
+* <<metricbeat-metricset-azure-storage_account,storage_account>>
 
 include::azure/app_insights.asciidoc[]
 
@@ -333,5 +333,5 @@ include::azure/database_account.asciidoc[]
 
 include::azure/monitor.asciidoc[]
 
-include::azure/storage.asciidoc[]
+include::azure/storage_account.asciidoc[]
 
diff --git a/...cbeat/docs/modules/azure/storage.asciidoc → ...cs/modules/azure/storage_account.asciidoc b/...cbeat/docs/modules/azure/storage.asciidoc → ...cs/modules/azure/storage_account.asciidoc
@@ -2,11 +2,11 @@
 This file is generated! See scripts/mage/docs_collector.go
 ////
 
-[[metricbeat-metricset-azure-storage]]
+[[metricbeat-metricset-azure-storage_account]]
 [role="xpack"]
-=== Azure storage metricset
+=== Azure storage_account metricset
 
-include::../../../../x-pack/metricbeat/module/azure/storage/_meta/docs.asciidoc[]
+include::../../../../x-pack/metricbeat/module/azure/storage_account/_meta/docs.asciidoc[]
 
 
 ==== Fields
@@ -18,5 +18,5 @@ Here is an example document generated by this metricset:
 
 [source,json]
 ----
-include::../../../../x-pack/metricbeat/module/azure/storage/_meta/data.json[]
+include::../../../../x-pack/metricbeat/module/azure/storage_account/_meta/data.json[]
 ----
diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -48,7 +48,7 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-metricset-azure-container_service,container_service>>   
 |<<metricbeat-metricset-azure-database_account,database_account>>   
 |<<metricbeat-metricset-azure-monitor,monitor>>   
-|<<metricbeat-metricset-azure-storage,storage>>   
+|<<metricbeat-metricset-azure-storage_account,storage_account>>   
 |<<metricbeat-module-beat,Beat>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .2+| .2+|  |<<metricbeat-metricset-beat-state,state>>   
 |<<metricbeat-metricset-beat-stats,stats>>   

diff --git a/x-pack/metricbeat/include/list.go b/x-pack/metricbeat/include/list.go
diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml
@@ -291,7 +291,7 @@ metricbeat.modules:
 
 - module: azure
   metricsets:
-  - storage
+  - storage_account
   enabled: true
   period: 300s
   client_id: '${AZURE_CLIENT_ID:""}'

diff --git a/x-pack/metricbeat/module/azure/_meta/config.reference.yml b/x-pack/metricbeat/module/azure/_meta/config.reference.yml
@@ -35,7 +35,7 @@
 
 - module: azure
   metricsets:
-  - storage
+  - storage_account
   enabled: true
   period: 300s
   client_id: '${AZURE_CLIENT_ID:""}'

diff --git a/x-pack/metricbeat/module/azure/_meta/config.yml b/x-pack/metricbeat/module/azure/_meta/config.yml
@@ -38,7 +38,7 @@
 
 #- module: azure
 #  metricsets:
-#  - storage
+#  - storage_account
 #  enabled: true
 #  period: 300s
 #  client_id: '${AZURE_CLIENT_ID:""}'

diff --git a/x-pack/metricbeat/module/azure/_meta/docs.asciidoc b/x-pack/metricbeat/module/azure/_meta/docs.asciidoc
@@ -107,9 +107,9 @@ This metricset will collect metrics from the virtual machine scalesets, these me
 so the `period` for `compute_vm_scaleset` metricset  should be `300s` or multiples of `300s`.
 
 [float]
-=== `storage`
+=== `storage_account`
 This metricset will collect metrics from the storage accounts, these metrics will have a timegrain every 5 minutes,
-so the `period` for `storage` metricset  should be `300s` or multiples of `300s`.
+so the `period` for `storage_account` metricset  should be `300s` or multiples of `300s`.
 
 [float]
 === `container_instance`

diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/0241cc10-339d-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/0241cc10-339d-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.queue_count.avg",
+                                "field": "azure.storage_account.queue_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:51.088Z",
     "version": "WzM1NjgsMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/09a6f150-3399-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/09a6f150-3399-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.file_share_snapshot_count.avg",
+                                "field": "azure.storage_account.file_share_snapshot_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:50.051Z",
     "version": "WzM1NTksMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/109ec950-32e6-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/109ec950-32e6-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.used_capacity.avg",
+                                "field": "azure.storage_account.used_capacity.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:52.180Z",
     "version": "WzM1ODUsMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/17ee2920-3391-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/17ee2920-3391-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.blob_capacity.avg",
+                                "field": "azure.storage_account.blob_capacity.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:44.945Z",
     "version": "WzM1MDksMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/2219de20-32ed-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/2219de20-32ed-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.egress.total",
+                                "field": "azure.storage_account.egress.total",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:52.180Z",
     "version": "WzM1ODAsMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/241a55e0-3399-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/241a55e0-3399-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.file_share_snapshot_size.avg",
+                                "field": "azure.storage_account.file_share_snapshot_size.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:50.051Z",
     "version": "WzM1NjAsMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/2bedaca0-339d-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/2bedaca0-339d-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.queue_message_count.avg",
+                                "field": "azure.storage_account.queue_message_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:51.088Z",
     "version": "WzM1NjcsMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/33d645e0-32ed-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/33d645e0-32ed-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.ingress.total",
+                                "field": "azure.storage_account.ingress.total",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:52.180Z",
     "version": "WzM1NzksMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/40dbc0d0-32e3-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/40dbc0d0-32e3-11ea-a83e-25b8612d00cc.json
@@ -63,7 +63,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.availability.avg",
+                                "field": "azure.storage_account.availability.avg",
                                 "id": "0e91b812-32e2-11ea-a93d-dd20c62559b3",
                                 "type": "avg"
                             }
@@ -98,4 +98,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTAsMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/43b31a20-339b-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/43b31a20-339b-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.table_count.avg",
+                                "field": "azure.storage_account.table_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTIsMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/453965a0-3393-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/453965a0-3393-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.file_capacity.avg",
+                                "field": "azure.storage_account.file_capacity.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:50.051Z",
     "version": "WzM1NTIsMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/4eaef260-32e1-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/4eaef260-32e1-11ea-a83e-25b8612d00cc.json
@@ -57,7 +57,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.ingress.total",
+                                "field": "azure.storage_account.ingress.total",
                                 "id": "f0edf191-32d5-11ea-b19d-fb5049b980ca",
                                 "type": "max"
                             }
@@ -102,4 +102,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTksMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/553f9320-32e9-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/553f9320-32e9-11ea-a83e-25b8612d00cc.json
@@ -30,11 +30,11 @@
                         "fill": 0.5,
                         "formatter": "number",
                         "id": "c9fd8ce0-32e8-11ea-84f4-e9593f8ba8f6",
-                        "label": "avg(azure.storage.transactions.total)",
+                        "label": "avg(azure.storage_account.transactions.total)",
                         "line_width": "1",
                         "metrics": [
                             {
-                                "field": "azure.storage.transactions.total",
+                                "field": "azure.storage_account.transactions.total",
                                 "id": "c9fd8ce1-32e8-11ea-84f4-e9593f8ba8f6",
                                 "type": "max"
                             }
@@ -69,4 +69,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTQsMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/55936920-3391-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/55936920-3391-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.blob_count.avg",
+                                "field": "azure.storage_account.blob_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:44.945Z",
     "version": "WzM1MTAsMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/599c62c0-32d7-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/599c62c0-32d7-11ea-a83e-25b8612d00cc.json
@@ -57,7 +57,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.egress.total",
+                                "field": "azure.storage_account.egress.total",
                                 "id": "f0edf191-32d5-11ea-b19d-fb5049b980ca",
                                 "type": "max"
                             }
@@ -102,4 +102,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTgsMV0="
-}
+}
diff --git a/...cbeat/module/azure/_meta/kibana/7/visualization/5cbf5820-339c-11ea-a83e-25b8612d00cc.json b/...cbeat/module/azure/_meta/kibana/7/visualization/5cbf5820-339c-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.table_entity_count.avg",
+                                "field": "azure.storage_account.table_entity_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTMsMV0="
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -6197,7 +6197,7 @@ type: object @@
     monitor
-    *`azure.storage.*.*`*::
+    *`azure.storage_account.*.*`*::
     +
     --
     storage account
@@ Expand Down @@