diff --git a/src/Promitor.Parsers.Prometheus.Core/PrometheusMetricsParser.cs b/src/Promitor.Parsers.Prometheus.Core/PrometheusMetricsParser.cs
index 8478b0f..9726a4e 100644
--- a/src/Promitor.Parsers.Prometheus.Core/PrometheusMetricsParser.cs
+++ b/src/Promitor.Parsers.Prometheus.Core/PrometheusMetricsParser.cs
@@ -11,7 +11,7 @@ namespace Promitor.Parsers.Prometheus.Core
     public class PrometheusMetricsParser
     {
         const string MetricInfoRegex = @"# (\w+) (\w*) (.*)";
-        const string MeasurementRegex = @"(.+){(.*)} (-?\d+(?:\.\d*)*) (\d*)";
+        const string MeasurementRegex = @"(.+){(.*)} ((?:-?\d+(?:\.\d*)*)*(?:NaN)*) (\d*)";
 
         public static async Task<List<IMetric>> ParseAsync(Stream rawMetricsStream)
         {
diff --git a/src/Promitor.Parsers.Prometheus.Tests/Samples/raw-metrics.txt b/src/Promitor.Parsers.Prometheus.Tests/Samples/raw-metrics.txt
index c1dd758..a4c349a 100644
--- a/src/Promitor.Parsers.Prometheus.Tests/Samples/raw-metrics.txt
+++ b/src/Promitor.Parsers.Prometheus.Tests/Samples/raw-metrics.txt
@@ -174,4 +174,12 @@ promitor_scrape_success{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscri
 promitor_scrape_success{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscription_id="0f9d7fea-99e8-4768-8672-06a28514f77e",resource_type="AppPlan",resource_name="ASP-azuredeprecation-8c62",resource_group="azure-deprecation",metric_name="promitor_demo_appplan_percentage_cpu_discovered"} 1 1626681380413
 promitor_scrape_success{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscription_id="0f9d7fea-99e8-4768-8672-06a28514f77e",resource_type="AutomationAccount",resource_name="promitor-resource-discovery-1",resource_group="promitor-testing-resource-discovery-eu",metric_name="promitor_demo_automation_update_deployment_runs"} 1 1626681424606
 promitor_scrape_success{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscription_id="0f9d7fea-99e8-4768-8672-06a28514f77e",resource_type="StorageAccount",resource_name="promitordatalake",resource_group="promitor-sources",metric_name="azure_storage_account_capacity_discovery"} 1 1626681378171
-promitor_scrape_success{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscription_id="0f9d7fea-99e8-4768-8672-06a28514f77e",resource_type="LogicApp",resource_name="azure-deprecation-twitter-new-notice",resource_group="azure-deprecation",metric_name="azure_logic_apps_failed_run_discovery"} 1 1626681425997
\ No newline at end of file
+promitor_scrape_success{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscription_id="0f9d7fea-99e8-4768-8672-06a28514f77e",resource_type="LogicApp",resource_name="azure-deprecation-twitter-new-notice",resource_group="azure-deprecation",metric_name="azure_logic_apps_failed_run_discovery"} 1 1626681425997
+# HELP azure_storage_account_capacity_discovery The average capacity used in the storage account
+# TYPE azure_storage_account_capacity_discovery gauge
+azure_storage_account_capacity_discovery{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscription_id="0f9d7fea-99e8-4768-8672-06a28514f77e",resource_uri="subscriptions/0f9d7fea-99e8-4768-8672-06a28514f77e/resourceGroups/cloud-shell-storage-eastus/providers/Microsoft.Storage/storageAccounts/cs20f9d7fea99e8x4768x867",resource_group="cloud-shell-storage-eastus",instance_name="cs20f9d7fea99e8x4768x867",geo="china",environment="dev"} 5372143956 1626853388001
+azure_storage_account_capacity_discovery{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscription_id="0f9d7fea-99e8-4768-8672-06a28514f77e",resource_uri="subscriptions/0f9d7fea-99e8-4768-8672-06a28514f77e/resourceGroups/promitor/providers/Microsoft.Storage/storageAccounts/promitor",resource_group="promitor",instance_name="promitor",geo="china",environment="dev"} 27166178 1626853387928
+azure_storage_account_capacity_discovery{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscription_id="0f9d7fea-99e8-4768-8672-06a28514f77e",resource_uri="subscriptions/0f9d7fea-99e8-4768-8672-06a28514f77e/resourceGroups/promitor/providers/Microsoft.Storage/storageAccounts/sqlvah2u4xyvba5u4i",resource_group="promitor",instance_name="sqlvah2u4xyvba5u4i",geo="china",environment="dev"} 15984560 1626853387707
+azure_storage_account_capacity_discovery{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscription_id="0f9d7fea-99e8-4768-8672-06a28514f77e",resource_uri="subscriptions/0f9d7fea-99e8-4768-8672-06a28514f77e/resourceGroups/azure-deprecation/providers/Microsoft.Storage/storageAccounts/storageaccountazure8896",resource_group="azure-deprecation",instance_name="storageaccountazure8896",geo="china",environment="dev"} 6604977 1626853387756
+azure_storage_account_capacity_discovery{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscription_id="0f9d7fea-99e8-4768-8672-06a28514f77e",resource_uri="subscriptions/0f9d7fea-99e8-4768-8672-06a28514f77e/resourceGroups/promitor-sources/providers/Microsoft.Storage/storageAccounts/promitordatalake",resource_group="promitor-sources",instance_name="promitordatalake",geo="china",environment="dev"} 6768488 1626853388206
+azure_storage_account_capacity_discovery{tenant_id="c8819874-9e56-4e3f-b1a8-1c0325138f27",subscription_id="0f9d7fea-99e8-4768-8672-06a28514f77e",resource_uri="subscriptions/0f9d7fea-99e8-4768-8672-06a28514f77e/resourceGroups/azure-deprecation/providers/Microsoft.Storage/storageAccounts/storageaccountazurea0a1",resource_group="azure-deprecation",instance_name="storageaccountazurea0a1",geo="china",environment="dev"} NaN 1626853387766
\ No newline at end of file