diff --git a/azure/dashboards/compute_disks/main.tf b/azure/dashboards/compute_disks/main.tf
index 624a023..ba07c50 100644
--- a/azure/dashboards/compute_disks/main.tf
+++ b/azure/dashboards/compute_disks/main.tf
@@ -33,7 +33,7 @@ resource "lightstep_dashboard" "otel_collector_dashboard" {
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_composite_disk_read_bytes/sec_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_composite_disk_read_bytes/sec_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -48,7 +48,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_composite_disk_read_operations/sec_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_composite_disk_read_operations/sec_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -63,7 +63,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_composite_disk_write_bytes/sec_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_composite_disk_write_bytes/sec_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -78,7 +78,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_composite_disk_write_operations/sec_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_composite_disk_write_operations/sec_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -93,13 +93,11 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_diskpaidburstiops_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_diskpaidburstiops_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
 
-
-
   template_variable {
     name                     = "azuremonitor_resource_id"
     default_values           = []
@@ -123,6 +121,4 @@ EOT
     default_values           = []
     suggestion_attribute_key = "location"
   }
-
-
-}
\ No newline at end of file
+}
diff --git a/azure/dashboards/compute_virtualmachines/main.tf b/azure/dashboards/compute_virtualmachines/main.tf
index b7dcd10..948e78c 100644
--- a/azure/dashboards/compute_virtualmachines/main.tf
+++ b/azure/dashboards/compute_virtualmachines/main.tf
@@ -33,7 +33,7 @@ resource "lightstep_dashboard" "otel_collector_dashboard" {
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_percentage_cpu_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_percentage_cpu_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -48,7 +48,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_available_memory_bytes_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_available_memory_bytes_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -63,7 +63,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_network_in_total | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_network_in_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -78,7 +78,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_network_out_total | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_network_out_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -93,7 +93,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_os_disk_bandwidth_consumed_percentage_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_lun == $metadata_lun) )  | delta | group_by [], sum
+metric azure_os_disk_bandwidth_consumed_percentage_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_lun == $metadata_lun)) | delta | group_by [], sum
 EOT
     }
   }
@@ -108,7 +108,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_cpu_credits_consumed_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_cpu_credits_consumed_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -123,7 +123,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_cpu_credits_remaining_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_cpu_credits_remaining_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -153,7 +153,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_data_disk_read_operations/sec_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_lun == $metadata_lun) )  | delta | group_by [], sum
+metric azure_data_disk_read_operations/sec_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_lun == $metadata_lun)) | delta | group_by [], sum
 EOT
     }
   }
@@ -168,7 +168,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_data_disk_write_bytes/sec_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_lun == $metadata_lun) )  | delta | group_by [], sum
+metric azure_data_disk_write_bytes/sec_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)   &&  (metadata_lun == $metadata_lun)) | delta | group_by [], sum
 EOT
     }
   }
@@ -183,7 +183,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_data_disk_write_operations/sec_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_lun == $metadata_lun) )  | delta | group_by [], sum
+metric azure_data_disk_write_operations/sec_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)   &&  (metadata_lun == $metadata_lun)) | delta | group_by [], sum
 EOT
     }
   }
@@ -198,7 +198,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_data_disk_bandwidth_consumed_percentage_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_lun == $metadata_lun) )  | delta | group_by [], sum
+metric azure_data_disk_bandwidth_consumed_percentage_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_lun == $metadata_lun)) | delta | group_by [], sum
 EOT
     }
   }
@@ -213,7 +213,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_data_disk_iops_consumed_percentage_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_lun == $metadata_lun) )  | delta | group_by [], sum
+metric azure_data_disk_iops_consumed_percentage_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_lun == $metadata_lun)) | delta | group_by [], sum
 EOT
     }
   }
@@ -228,7 +228,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_data_disk_max_burst_bandwidth_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_lun == $metadata_lun) )  | delta | group_by [], sum
+metric azure_data_disk_max_burst_bandwidth_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_lun == $metadata_lun)) | delta | group_by [], sum
 EOT
     }
   }
@@ -262,6 +262,4 @@ EOT
     default_values           = []
     suggestion_attribute_key = "metadata_lun"
   }
-
-
-}
\ No newline at end of file
+}
diff --git a/azure/dashboards/containerregistry_registries/main.tf b/azure/dashboards/containerregistry_registries/main.tf
index 2a159dc..13c59da 100644
--- a/azure/dashboards/containerregistry_registries/main.tf
+++ b/azure/dashboards/containerregistry_registries/main.tf
@@ -33,7 +33,7 @@ resource "lightstep_dashboard" "otel_collector_dashboard" {
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_agentpoolcputime_total | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_agentpoolcputime_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -48,7 +48,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_runduration_total | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_runduration_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -63,7 +63,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_storageused_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_geolocation == $metadata_geolocation) )  | delta | group_by [], sum
+metric azure_storageused_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geolocation == $metadata_geolocation)) | delta | group_by [], sum
 EOT
     }
   }
@@ -108,7 +108,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_totalpullcount_total | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_totalpullcount_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -123,13 +123,11 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_totalpushcount_total | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_totalpushcount_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
 
-
-
   template_variable {
     name                     = "azuremonitor_resource_id"
     default_values           = []
@@ -159,6 +157,4 @@ EOT
     default_values           = []
     suggestion_attribute_key = "metadata_geolocation"
   }
-
-
-}
\ No newline at end of file
+}
diff --git a/azure/dashboards/containerservice_managedclusters/main.tf b/azure/dashboards/containerservice_managedclusters/main.tf
index 432782b..a22df95 100644
--- a/azure/dashboards/containerservice_managedclusters/main.tf
+++ b/azure/dashboards/containerservice_managedclusters/main.tf
@@ -33,7 +33,7 @@ resource "lightstep_dashboard" "otel_collector_dashboard" {
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_apiserver_current_inflight_requests_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_requestkind == $metadata_requestkind) )  | delta | group_by [], sum
+metric azure_apiserver_current_inflight_requests_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_requestkind == $metadata_requestkind)) | delta | group_by [], sum
 EOT
     }
   }
@@ -48,7 +48,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_node_cpu_usage_percentage_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_node == $metadata_node)   &&  (metadata_nodepool == $metadata_nodepool) )  | delta | group_by [], sum
+metric azure_node_cpu_usage_percentage_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_node == $metadata_node) && (metadata_nodepool == $metadata_nodepool)) | delta | group_by [], sum
 EOT
     }
   }
@@ -63,7 +63,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_kube_node_status_allocatable_cpu_cores_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_kube_node_status_allocatable_cpu_cores_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) &&  (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -78,7 +78,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_kube_node_status_allocatable_memory_bytes_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_kube_node_status_allocatable_memory_bytes_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -93,7 +93,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_node_network_in_bytes_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_node == $metadata_node)   &&  (metadata_nodepool == $metadata_nodepool) )  | delta | group_by [], sum
+metric azure_node_network_in_bytes_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_node == $metadata_node) && (metadata_nodepool == $metadata_nodepool)) | delta | group_by [], sum
 EOT
     }
   }
@@ -108,7 +108,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_node_network_out_bytes_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_node == $metadata_node)   &&  (metadata_nodepool == $metadata_nodepool) )  | delta | group_by [], sum
+metric azure_node_network_out_bytes_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_node == $metadata_node) && (metadata_nodepool == $metadata_nodepool)) | delta | group_by [], sum
 EOT
     }
   }
@@ -123,7 +123,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_kube_node_status_condition_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_condition == $metadata_condition)   &&  (metadata_status == $metadata_status)   &&  (metadata_status2 == $metadata_status2)   &&  (metadata_node == $metadata_node) )  | delta | group_by [], sum
+metric azure_kube_node_status_condition_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_condition == $metadata_condition) && (metadata_status == $metadata_status) && (metadata_status2 == $metadata_status2) && (metadata_node == $metadata_node)) | delta | group_by [], sum
 EOT
     }
   }
@@ -138,7 +138,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_kube_pod_status_phase_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_phase == $metadata_phase)   &&  (metadata_namespace == $metadata_namespace)   &&  (metadata_pod == $metadata_pod) )  | delta | group_by [], sum
+metric azure_kube_pod_status_phase_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_phase == $metadata_phase) && (metadata_namespace == $metadata_namespace) && (metadata_pod == $metadata_pod)) | delta | group_by [], sum
 EOT
     }
   }
@@ -153,7 +153,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_kube_pod_status_ready_average | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location)   &&  (metadata_namespace == $metadata_namespace)   &&  (metadata_pod == $metadata_pod)   &&  (metadata_condition == $metadata_condition) )  | delta | group_by [], sum
+metric azure_kube_pod_status_ready_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_namespace == $metadata_namespace) && (metadata_pod == $metadata_pod) && (metadata_condition == $metadata_condition)) | delta | group_by [], sum
 EOT
     }
   }
@@ -241,6 +241,4 @@ EOT
     default_values           = []
     suggestion_attribute_key = "metadata_status2"
   }
-
-
-}
\ No newline at end of file
+}
diff --git a/azure/dashboards/network_networkinterfaces/main.tf b/azure/dashboards/network_networkinterfaces/main.tf
index 171aab4..fe96531 100644
--- a/azure/dashboards/network_networkinterfaces/main.tf
+++ b/azure/dashboards/network_networkinterfaces/main.tf
@@ -33,7 +33,7 @@ resource "lightstep_dashboard" "otel_collector_dashboard" {
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_bytesreceivedrate_total | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_bytesreceivedrate_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -48,7 +48,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_bytessentrate_total | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_bytessentrate_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -63,7 +63,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_packetsreceivedrate_total | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_packetsreceivedrate_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -78,7 +78,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_packetssentrate_total | filter (  (azuremonitor.subscription_id == $azuremonitor_subscription_id)   &&  (azuremonitor.tenant_id == $azuremonitor_tenant_id)   &&  (azuremonitor.resource_id == $azuremonitor_resource_id)   &&  (location == $location) )  | delta | group_by [], sum
+metric azure_packetssentrate_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location)) | delta | group_by [], sum
 EOT
     }
   }
@@ -106,6 +106,4 @@ EOT
     default_values           = []
     suggestion_attribute_key = "location"
   }
-
-
-}
\ No newline at end of file
+}