Fix for azure billing dashboard (elastic#25554)

* add field back

* changelog

(cherry picked from commit 5e084a7)

CHANGELOG.next.asciidoc

@@ -234,6 +234,16 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix remote_write flaky test. {pull}21173[21173]
 - Remove io.time from windows {pull}22237[22237]
 - Fix `logstash` module when `xpack.enabled: true` is set from emitting redundant events. {pull}22808[22808]
+- Change vsphere.datastore.capacity.used.pct value to betweeen 0 and 1. {pull}23148[23148]
+- Fix incorrect types of fields GetHits and Ops in NodeInterestingStats for Couchbase module in Metricbeat {issue}21021[21021] {pull}23287[23287]
+- Update config in `windows.yml` file. {issue}23027[23027]{pull}23327[23327]
+- Fix metric grouping for windows/perfmon module {issue}23489[23489] {pull}23505[23505]
+- Fix GCP not able to request Cloudfunctions metrics if a region filter was set {pull}24218[24218]
+- Fix type of `uwsgi.status.worker.rss` type. {pull}24468[24468]
+- Accept text/plain type by default for prometheus client scraping. {pull}24622[24622]
+- Use working set bytes to calculate the pod memory limit pct when memory usage is not reported (ie. Windows pods). {pull}25428[25428]
+- Fix copy-paste error in libbeat docs. {pull}25448[25448]
+- Fix azure billing dashboard. {pull}25554[25554]
 
 *Packetbeat*
 

metricbeat/docs/fields.asciidoc

@@ -5176,6 +5176,16 @@ The resource specified
 The type of the resource
 
 
+type: keyword
+
+--
+
+*`azure.resource.name`*::
++
+--
+The name of the resource
+
+
 type: keyword
 
 --

x-pack/metricbeat/module/azure/_meta/fields.yml

@@ -21,6 +21,10 @@
               type: keyword
               description: >
                 The type of the resource
+            - name: name
+              type: keyword
+              description: >
+                The name of the resource
             - name: group
               type: keyword
               description: >

x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-storage-overview.json

@@ -494,7 +494,7 @@
                 "line_width": 2,
                 "metrics": [
                   {
-                    "field": "azure.storage.usedcapacity.avg",
+                    "field": "azure.storage.used_capacity.avg",
                     "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                     "type": "avg"
                   }
@@ -1138,7 +1138,7 @@
                 "line_width": 2,
                 "metrics": [
                   {
-                    "field": "azure.storage.usedcapacity.avg",
+                    "field": "azure.storage.used_capacity.avg",
                     "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                     "type": "avg"
                   }

x-pack/metricbeat/module/azure/billing/data.go

@@ -26,6 +26,7 @@ func EventsMapping(results Usage) []mb.Event {
 					"resource": common.MapStr{
 						"type":  usageDetail.ConsumedService,
 						"group": getResourceGroupFromId(*usageDetail.InstanceID),
+						"name":  usageDetail.InstanceName,
 					},
 					"subscription_id": usageDetail.SubscriptionGUID,
 				},