diff --git a/packages/azure_metrics/changelog.yml b/packages/azure_metrics/changelog.yml
index 22585dd9197..331b7c0ef2b 100644
--- a/packages/azure_metrics/changelog.yml
+++ b/packages/azure_metrics/changelog.yml
@@ -1,3 +1,8 @@
+- version: "1.6.6"
+  changes:
+    - description: Fix capacity and count metrics visualizations in the overview, blob, table, and file storage dashboards.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/11120
 - version: "1.6.5"
   changes:
     - description: Consolidate content on Azure metrics pages.
diff --git a/packages/azure_metrics/kibana/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc.json b/packages/azure_metrics/kibana/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc.json
index 0e835d49e66..9fe3c3730f2 100644
--- a/packages/azure_metrics/kibana/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc.json
+++ b/packages/azure_metrics/kibana/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc.json
@@ -30,6 +30,28 @@
                                 "azure.namespace": "Microsoft.Storage/storageAccounts/queueServices"
                             }
                         }
+                    },
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "storage_account",
+                            "disabled": false,
+                            "field": "data_stream.dataset",
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "azure.storage_account"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "azure.storage_account"
+                            }
+                        }
                     }
                 ],
                 "query": {
@@ -64,10 +86,10 @@
                         "description": "",
                         "params": {
                             "fontSize": 10,
-                            "markdown": "### Azure Storage\n\n[Overview](#/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc) | [Blob](#/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc) | [File](#/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc) | [Table](#/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc) | [**Queue**](#/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc) ",
+                            "markdown": "[Overview](#/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc) | [Blob](#/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc) | [File](#/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc) | [Table](#/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc) | [**Queue**](#/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc) ",
                             "openLinksInNewTab": false
                         },
-                        "title": "Navigation Queue Storage Overview",
+                        "title": "Azure Storage — Queue Storage Overview",
                         "type": "markdown",
                         "uiState": {}
                     }
@@ -80,7 +102,7 @@
                     "y": 0
                 },
                 "panelIndex": "933a427d-a8b7-48ff-ac53-337f32b340ea",
-                "title": "Navigation Queue Storage Overview",
+                "title": "Azure Storage — Queue Storage Overview",
                 "type": "visualization",
                 "version": "8.7.0"
             },
@@ -118,7 +140,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.queue_capacity.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "Queue Capacity",
@@ -296,7 +318,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.queue_message_count.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "Queue Message Count",
@@ -433,7 +455,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.queue_count.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "Queue Count",
@@ -1647,6 +1669,11 @@
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
             "type": "index-pattern"
         },
+        {
+            "id": "metrics-*",
+            "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
+            "type": "index-pattern"
+        },        
         {
             "id": "metrics-*",
             "name": "controlGroup_13954387-48b2-4103-97e6-1d4ffcf73360:optionsListDataView",
diff --git a/packages/azure_metrics/kibana/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc.json b/packages/azure_metrics/kibana/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc.json
index e132f81b216..65ff0cc5a6b 100644
--- a/packages/azure_metrics/kibana/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc.json
+++ b/packages/azure_metrics/kibana/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc.json
@@ -9,7 +9,30 @@
         "description": "This dashboard shows metrics for different storage types in Azure.",
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
-                "filter": [],
+                "filter": [
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "storage_account",
+                            "disabled": false,
+                            "field": "data_stream.dataset",
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "azure.storage_account"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "azure.storage_account"
+                            }
+                        }
+                    }
+                ],
                 "query": {
                     "language": "kuery",
                     "query": ""
@@ -42,10 +65,10 @@
                         "description": "",
                         "params": {
                             "fontSize": 10,
-                            "markdown": "### Azure Storage\n\n[**Overview**](#/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc) | [Blob](#/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc) | [File](#/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc) | [Table](#/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc) | [Queue](#/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc) ",
+                            "markdown": "[**Overview**](#/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc) | [Blob](#/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc) | [File](#/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc) | [Table](#/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc) | [Queue](#/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc) ",
                             "openLinksInNewTab": false
                         },
-                        "title": "Navigation Storage Overview",
+                        "title": "Azure Storage — Overview",
                         "type": "markdown",
                         "uiState": {}
                     }
@@ -58,7 +81,7 @@
                     "y": 0
                 },
                 "panelIndex": "3e05fed8-0edd-4973-a640-3499c62b141d",
-                "title": "Navigation Storage Overview",
+                "title": "Azure Storage — Overview",
                 "type": "visualization",
                 "version": "8.7.0"
             },
@@ -96,7 +119,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.used_capacity.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "Used Capacity",
@@ -1785,6 +1808,11 @@
         "dashboard": "8.7.0"
     },
     "references": [
+        {
+            "id": "metrics-*",
+            "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+            "type": "index-pattern"
+        },        
         {
             "id": "metrics-*",
             "name": "controlGroup_4d6088e2-f470-4c13-b08f-cf6b06b13c6a:optionsListDataView",
diff --git a/packages/azure_metrics/kibana/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc.json b/packages/azure_metrics/kibana/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc.json
index 9176e1c920b..99e0456ade0 100644
--- a/packages/azure_metrics/kibana/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc.json
+++ b/packages/azure_metrics/kibana/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc.json
@@ -30,6 +30,28 @@
                                 "azure.namespace": "Microsoft.Storage/storageAccounts/blobServices"
                             }
                         }
+                    },
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "storage_account",
+                            "disabled": false,
+                            "field": "data_stream.dataset",
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "azure.storage_account"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "azure.storage_account"
+                            }
+                        }
                     }
                 ],
                 "query": {
@@ -64,10 +86,10 @@
                         "description": "",
                         "params": {
                             "fontSize": 10,
-                            "markdown": "### Azure Storage\n\n[Overview](#/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc) | [**Blob**](#/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc) | [File](#/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc) | [Table](#/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc) | [Queue](#/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc) ",
+                            "markdown": "[Overview](#/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc) | [**Blob**](#/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc) | [File](#/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc) | [Table](#/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc) | [Queue](#/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc) ",
                             "openLinksInNewTab": false
                         },
-                        "title": "Navigation Blob Storage Overview",
+                        "title": "Azure Storage — Blob Storage Overview",
                         "type": "markdown",
                         "uiState": {}
                     }
@@ -80,7 +102,7 @@
                     "y": 0
                 },
                 "panelIndex": "ed5f5642-c94a-481b-a8c2-7dfe4c6a4f05",
-                "title": "Navigation Blob Storage Overview",
+                "title": "Azure Storage — Blob Storage Overview",
                 "type": "visualization",
                 "version": "8.7.0"
             },
@@ -159,7 +181,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.blob_capacity.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "Blob Capacity",
@@ -296,7 +318,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.blob_count.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "Blob Count",
@@ -392,7 +414,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.container_count.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "Container Count",
@@ -1640,6 +1662,11 @@
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
             "type": "index-pattern"
         },
+        {
+            "id": "metrics-*",
+            "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
+            "type": "index-pattern"
+        },        
         {
             "id": "metrics-*",
             "name": "controlGroup_7eb82f60-7b2e-473f-960b-35b3fa5392d5:optionsListDataView",
diff --git a/packages/azure_metrics/kibana/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc.json b/packages/azure_metrics/kibana/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc.json
index 55081c6f8a3..f0cb06abf5d 100644
--- a/packages/azure_metrics/kibana/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc.json
+++ b/packages/azure_metrics/kibana/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc.json
@@ -30,6 +30,28 @@
                                 "azure.namespace": "Microsoft.Storage/storageAccounts/fileServices"
                             }
                         }
+                    },
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "storage_account",
+                            "disabled": false,
+                            "field": "data_stream.dataset",
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "azure.storage_account"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "azure.storage_account"
+                            }
+                        }
                     }
                 ],
                 "query": {
@@ -64,10 +86,10 @@
                         "description": "",
                         "params": {
                             "fontSize": 10,
-                            "markdown": "### Azure Storage\n\n[Overview](#/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc) | [Blob](#/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc) | [**File**](#/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc) | [Table](#/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc) | [Queue](#/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc) ",
+                            "markdown": "[Overview](#/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc) | [Blob](#/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc) | [**File**](#/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc) | [Table](#/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc) | [Queue](#/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc) ",
                             "openLinksInNewTab": false
                         },
-                        "title": "Navigation File Storage Overview",
+                        "title": "Azure Storage — File Storage Overview",
                         "type": "markdown",
                         "uiState": {}
                     }
@@ -80,7 +102,7 @@
                     "y": 0
                 },
                 "panelIndex": "ee131d2d-7ab5-4434-9e3b-230759c3e5ff",
-                "title": "Navigation File Storage Overview",
+                "title": "Azure Storage — File Storage Overview",
                 "type": "visualization",
                 "version": "8.7.0"
             },
@@ -159,7 +181,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.file_capacity.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "File Capacity",
@@ -255,7 +277,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.file_count.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "File Count",
@@ -433,7 +455,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.file_share_count.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "File Share Count",
@@ -923,7 +945,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.file_share_snapshot_count.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "File Share Snapshot Count",
@@ -1411,7 +1433,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.file_share_snapshot_size.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "File Share Snapshot Size",
@@ -1921,6 +1943,11 @@
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
             "type": "index-pattern"
         },
+        {
+            "id": "metrics-*",
+            "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
+            "type": "index-pattern"
+        },        
         {
             "id": "metrics-*",
             "name": "controlGroup_c7829894-f20c-4b19-ad2d-3a612701abc9:optionsListDataView",
diff --git a/packages/azure_metrics/kibana/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc.json b/packages/azure_metrics/kibana/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc.json
index ae9adf4e7b4..086d48496a5 100644
--- a/packages/azure_metrics/kibana/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc.json
+++ b/packages/azure_metrics/kibana/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc.json
@@ -30,6 +30,28 @@
                                 "azure.namespace": "Microsoft.Storage/storageAccounts/tableServices"
                             }
                         }
+                    },
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "storage_account",
+                            "disabled": false,
+                            "field": "data_stream.dataset",
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "azure.storage_account"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "azure.storage_account"
+                            }
+                        }
                     }
                 ],
                 "query": {
@@ -64,10 +86,10 @@
                         "description": "",
                         "params": {
                             "fontSize": 10,
-                            "markdown": "### Azure Storage\n\n[Overview](#/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc) | [Blob](#/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc) | [File](#/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc) | [**Table**](#/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc) | [Queue](#/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc) ",
+                            "markdown": "[Overview](#/dashboard/azure_metrics-1a151f80-32db-11ea-a83e-25b8612d00cc) | [Blob](#/dashboard/azure_metrics-b165ef60-32f7-11ea-a83e-25b8612d00cc) | [File](#/dashboard/azure_metrics-dff7a080-32f7-11ea-a83e-25b8612d00cc) | [**Table**](#/dashboard/azure_metrics-ff2fe020-32f7-11ea-a83e-25b8612d00cc) | [Queue](#/dashboard/azure_metrics-10efa340-32f8-11ea-a83e-25b8612d00cc) ",
                             "openLinksInNewTab": false
                         },
-                        "title": "Navigation Table Storage Overview",
+                        "title": "Azure Storage — Table Storage Overview",
                         "type": "markdown",
                         "uiState": {}
                     }
@@ -80,7 +102,7 @@
                     "y": 0
                 },
                 "panelIndex": "204cbabc-fafd-472c-b106-bd08f5262b1f",
-                "title": "Navigation Table Storage Overview",
+                "title": "Azure Storage — Table Storage Overview",
                 "type": "visualization",
                 "version": "8.7.0"
             },
@@ -159,7 +181,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.table_capacity.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "Table Capacity",
@@ -255,7 +277,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.table_count.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "Table Count",
@@ -433,7 +455,7 @@
                                                     "dataType": "number",
                                                     "filter": {
                                                         "language": "kuery",
-                                                        "query": ""
+                                                        "query": "azure.storage_account.table_entity_count.avg: *"
                                                     },
                                                     "isBucketed": false,
                                                     "label": "Table Entity Count",
@@ -1647,6 +1669,11 @@
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
             "type": "index-pattern"
         },
+        {
+            "id": "metrics-*",
+            "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
+            "type": "index-pattern"
+        },        
         {
             "id": "metrics-*",
             "name": "controlGroup_859278cd-7231-4483-9a14-5bd544d85949:optionsListDataView",
diff --git a/packages/azure_metrics/manifest.yml b/packages/azure_metrics/manifest.yml
index 74d8a25d44e..110cdcd144e 100644
--- a/packages/azure_metrics/manifest.yml
+++ b/packages/azure_metrics/manifest.yml
@@ -1,6 +1,6 @@
 name: azure_metrics
 title: Azure Resource Metrics
-version: 1.6.5
+version: 1.6.6
 description: Collect metrics from Azure resources with Elastic Agent.
 type: integration
 icons: