Fix for azure billing dashboard (elastic#25554)

* add field back * changelog (cherry picked from commit 5e084a7)
narph · May 6, 2021 · 87c4ad3 · 87c4ad3
1 parent 712398e
commit 87c4ad3
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -345,6 +345,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - 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*
 

diff --git a/metricbeat/docs/fields.asciidoc b/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
 
 --

diff --git a/x-pack/metricbeat/module/azure/_meta/fields.yml b/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: >

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
@@ -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"
                   }

diff --git a/x-pack/metricbeat/module/azure/billing/data.go b/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,
 				},

diff --git a/x-pack/metricbeat/module/azure/fields.go b/x-pack/metricbeat/module/azure/fields.go