diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 303b2a715fe..9f045aedb5d 100644
--- 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
index 7460d3f8243..0b5977cea93 100644
--- 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
index a6476fcc957..8e96461286b 100644
--- 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/x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-storage-overview.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-storage-overview.json
index 0ad7aa93d44..54724b58089 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-storage-overview.json
+++ b/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"
                   }
diff --git a/x-pack/metricbeat/module/azure/billing/data.go b/x-pack/metricbeat/module/azure/billing/data.go
index 9b84d9d20ae..091a2751c2b 100644
--- 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
index 6a308a5d2ae..cf23987915d 100644
--- a/x-pack/metricbeat/module/azure/fields.go
+++ b/x-pack/metricbeat/module/azure/fields.go
@@ -19,5 +19,5 @@ func init() {
 // AssetAzure returns asset data.
 // This is the base64 encoded gzipped contents of module/azure.
 func AssetAzure() string {
-	return "eJzkmU1v47YTxu/5FIMcA2w+gA9/IP+2hz0ULfpyJsbUWGEjkVxy6Kz76QuKkixLsizbspugOSywenme30MOJyLzBd5otwL8Ozh6AGDFBa3g8SX+//EBICMvnbKsjF7B/x4AID0LpclCEV9xVBB6WkGODwAbRUXmV9WDX0BjSXvx+MM7Gx91Jtj6yojDoUxXilVJuUOl2zuN5Bvt3o3LOtdHhdPPH68ELykGsVNyRLdxdORNcJIGht0MM+waHfCWpNoo6qL24x5E3lk6uHE88QmMBiW+DmYD3MEate5HXMC7HYahdhsYc//8NGpr1n+R5N6tdFFMgXUeESVaq3ReP//49HheiFQ2bYwKdlA08V9vcaRqzi7TVgo8FSS5UzeNmw/rVkKo7HrPriB8/XFgiNYWSuJifh29MbtMlaS9MvqwLI6UxIlymFsKE8gHnaMDNwBPj/jnp7O5N4XBIzcvpf45wYAjDk5TNsRFa4XSXuWv7E+2u7btr4lxHkF3mkd8ppqgZ3QsMuTxVjhyY0YvqkSH7zaepLOlHUlnx/3GqwXOaH79qoFFW18MUDOOlo7nw2Q3qZu+yX+9aBx9C+TZC2mC5mcfylHnsco4Yf1bUoZKeNp7g6qg7BbmSXmCIXhyTfig1bcwPvIXIPzpyU0Ye/JV17+J9+9J/GRuDPxKmuPioGxhhpeudvKb4Fk78+7JCVal0rkXmvjduDeRBVct3Gfc5kuR/T95Qe0FtRc0XrMAfbVS70Dnq/V7DpojSWpL4g5wtdV5fNYZGQtU53cZwL3deZhsGIu7EFZO03D0XVKld4NO/VOjPbE+O/71ON2QAJCb2YCCtlScQvLktjcnSiYTQJbcxrgStaQ0SbHFllQatxO4RVXguiCx3jH5Javp170tNLaQbKG1hcp2Pna9aIR1aot8L+raFWrXS6GlDcKSk6QZc0oL+W7s0gbYm6e1fW2Efwn+bGxlqhmL5MKTNDq7G/nXX1K1RD5I3oNdxloVhdL5LfYYtTSgjt86ceIzYlTF3A2qDM6RlrvRsbr4tGxUtZ1IR4zfhTS+Pw8Xz9APfa32CIYsOi5Js4gXlk25F4eB+D6sycJg93ulcS06PGLdf2XH/lNt+Rbc0KX6OrGRTNak+7GuN57cT9brIHYAZbLD0z24fsSbZZbkoSffnibIqj3coNTaZZ4cjtcbSg5YLLq4qpPOShYGso3txjiS6Hlx40b4uHUquIXPLupW2n237ZimtIFJbMveidfhH5QOKe5+arqnnAggvMSCPPHnSNLitvdHsmlGpckJpT3H39gfO1pNCw3tRCBHufLsdp8jUEM7ESjua9RnmaAadhAnQ8Y1ehJ1Z/7IaRrW5rfIIExptGLj5n+n5jO/UofC/W/S40vas3FxK/KBB7ZGbMf1nwAAAP//oQy/EA=="
+	return "eJzkmc9u67YSxvd5ikGWAU4ewIsL5LZdnEXRon/WxJgaK2wkkoccOsd9+oKiJMuSLMu27CaoFwZiUd/vG3JmJDJf4I12K8C/g6MHAFZc0AoeX+Lfjw8AGXnplGVl9Ar+9wAAaSyUJgtFvMVRQehpBTk+AGwUFZlfVQO/gMaS9uLxwzsbhzoTbP3LCOFQpivFqqTcodLtlUbyjXbvxmWd30eF0+ePV4KXFAaxU3JEtyE68iY4SQNgN4YZuEYHvCWpNoq6VvvhHoS8s3Rw4XjEJ2w0VuLtYDbAHVuj6Pi9LDoqzkL3Z3cBdrsCQ+12rjH3z0+jWLP+iyT3LqUfxZSxzhBRorVK5/X4x6fH84JIGduGUZkd5Gv89hZHEvbsCmmlwFNBkjsp29B8WLcSQmXXM7uC8PXHARCtLZTExXgdvTFcpkrSXhl9mBZHUuJEOsxNhQnLB02rY25gPA3xz09n+94UBo9cvNT1z8kMOOLgNGVDu2itUNqr/JX9yU7bPnHWxDjPQXeZRzhT/dczOhYZ8ngrHLkwoxdVosN7GybpbGki6ew4bzxb4Izm188aWLT1xQBqj6Op4/kwspvkTR/yX08aR98CefZCmqD52YdylDyWGSfQvyVlqISn2RtUBWW3gCflCQ/Bk2uCD1p9C+Mzf4GFPz25CbAnX3X9m7B/T+In48bAr6Q5FgdlC3t46Won3oSftTPvnpxgVSqde6GJ3417E1lwVeE+4zZfytn/EwtqFtQsaFizDPqqUu/gzlf1e441R5LUlsQdzNWo8/xZZ2RMUJ3fZQL3uPNssmEs7uKwIk2bo++SKr0bdOqfGu2J+uzw63m6oQNAblYDCtpSccqSJ7e9uaMEmTBkyW2MK1FLSosUW2xJpXE7gVtUBa4LEusdk18ym37dY6HBQsJCi4UKO992XTTCOrVFvpfrmgo19VLT0gZhyUnSjDmlQr6bd2kD7OGptq8N4V8yf7ZtZaoVi86FJ2l0djfnX39J2RL9QWIPdhlrVRRK57fYY9TSgDq+68SFz4hRFXM3qDI4R1ruRufq4tOyUdV2IR0xfhfS+P46XLxCP/S12iMYsui4JM1i+fPIvfjwsHMfrMnCYPd7JbgWHZ7u7t+yY/+ptnwLbuhSfp3YSCY06X5Y14Mn95N1HcQOoEx2eLoH1894U2ZJHnry7WmCrNrDDVKtLfNEOJ5vKDlgsWhxVSedlSwMZBvsxjiS6HlxcCN8HJ0SbuGzi7qVdu9tO6YpbWAS27J34nX4v6xDF3c/Nd27nAhAeIkFeeLPEUlrt70+EptmVJqcUNpzfGJ/7NBqt9C4nQjIUa48u93nCKhxOxFQ3Neoz7JAtdlBOBkyrtGTqDvzR46m8do8RQbBlEYrNm7+e2o+8y11KNx/Jz1e0p6Ni1uRDzyxtcV2Xv8JAAD//1lC3T4="
 }