diff --git a/azure/Makefile.Common b/azure/Makefile.Common
index 2f27690..1d85561 100644
--- a/azure/Makefile.Common
+++ b/azure/Makefile.Common
@@ -19,7 +19,7 @@ destroy-terraform:
 
 .PHONY: run-collector
 run-collector:
-	docker run -d --name=$(EXAMPLE_NAME) -v ./:/conf/ -e AZURE_CLIENT_ID=${AZURE_CLIENT_ID} -e AZURE_CLIENT_SECRET=${AZURE_CLIENT_SECRET} -e AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID} -e AZURE_TENANT_ID=${AZURE_TENANT_ID} -e LS_ACCESS_TOKEN=${LS_ACCESS_TOKEN} otel/opentelemetry-collector-contrib:0.79.0 --config=/conf/collector.yaml
+	docker run -d --name=$(EXAMPLE_NAME) -v ./:/conf/ -e AZURE_CLIENT_ID=${AZURE_CLIENT_ID} -e AZURE_CLIENT_SECRET=${AZURE_CLIENT_SECRET} -e AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID} -e AZURE_TENANT_ID=${AZURE_TENANT_ID} -e LS_ACCESS_TOKEN=${LS_ACCESS_TOKEN} otel/opentelemetry-collector-contrib:0.81.0 --config=/conf/collector.yaml
 
 .PHONY: stop-collector
 stop-collector:
diff --git a/azure/README.md b/azure/README.md
index 216df26..5a30c90 100644
--- a/azure/README.md
+++ b/azure/README.md
@@ -39,7 +39,7 @@ Detailed description of available [Azure metrics per service](https://learn.micr
 
 Collector Azure Monitor receiver has to be configured to capture required Azure resources, [configuration description](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/azuremonitorreceiver#configuration).
 
-The following example configuration collects metrics from Kong and send them to Lightstep Observability:
+The following example configuration collects metrics from Azure and send them to Lightstep Observability:
 
 ```yaml
 receivers:
diff --git a/azure/compute_disks/dashboards/overview/main.tf b/azure/compute_disks/dashboards/overview/main.tf
index f94897b..ca147a6 100644
--- a/azure/compute_disks/dashboards/overview/main.tf
+++ b/azure/compute_disks/dashboards/overview/main.tf
@@ -15,7 +15,7 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Compute_disks Dashboard URL"
+  description = "OpenTelemetry Collector Compute Disks Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
diff --git a/azure/compute_virtualmachines/dashboards/overview/main.tf b/azure/compute_virtualmachines/dashboards/overview/main.tf
index 023ec40..a1f34f4 100644
--- a/azure/compute_virtualmachines/dashboards/overview/main.tf
+++ b/azure/compute_virtualmachines/dashboards/overview/main.tf
@@ -15,7 +15,7 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Compute_virtualmachines Dashboard URL"
+  description = "OpenTelemetry Collector Compute Virtual Machines Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
diff --git a/azure/containerregistry_registries/dashboards/overview/main.tf b/azure/containerregistry_registries/dashboards/overview/main.tf
index b1642ca..339dd32 100644
--- a/azure/containerregistry_registries/dashboards/overview/main.tf
+++ b/azure/containerregistry_registries/dashboards/overview/main.tf
@@ -15,7 +15,7 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Containerregistry_registries Dashboard URL"
+  description = "OpenTelemetry Collector Container Registry Registries Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
diff --git a/azure/containerservice_managedclusters/dashboards/overview/main.tf b/azure/containerservice_managedclusters/dashboards/overview/main.tf
index 61916aa..dc8ba08 100644
--- a/azure/containerservice_managedclusters/dashboards/overview/main.tf
+++ b/azure/containerservice_managedclusters/dashboards/overview/main.tf
@@ -15,7 +15,7 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Containerservice_managedclusters Dashboard URL"
+  description = "OpenTelemetry Collector Container Service Managed Clusters Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
@@ -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)) | 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)) | 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)) | 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)) | 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)) | 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_namespace == $metadata_namespace)) | 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_condition == $metadata_condition)) | delta | group_by [], sum
 EOT
     }
   }
@@ -199,46 +199,4 @@ EOT
     default_values           = []
     suggestion_attribute_key = "metadata_namespace"
   }
-
-  template_variable {
-    name                     = "metadata_node"
-    default_values           = []
-    suggestion_attribute_key = "metadata_node"
-  }
-
-  template_variable {
-    name                     = "metadata_nodepool"
-    default_values           = []
-    suggestion_attribute_key = "metadata_nodepool"
-  }
-
-  template_variable {
-    name                     = "metadata_phase"
-    default_values           = []
-    suggestion_attribute_key = "metadata_phase"
-  }
-
-  template_variable {
-    name                     = "metadata_pod"
-    default_values           = []
-    suggestion_attribute_key = "metadata_pod"
-  }
-
-  template_variable {
-    name                     = "metadata_requestkind"
-    default_values           = []
-    suggestion_attribute_key = "metadata_requestkind"
-  }
-
-  template_variable {
-    name                     = "metadata_status"
-    default_values           = []
-    suggestion_attribute_key = "metadata_status"
-  }
-
-  template_variable {
-    name                     = "metadata_status2"
-    default_values           = []
-    suggestion_attribute_key = "metadata_status2"
-  }
 }
diff --git a/azure/dbformariadb_servers/dashboards/overview/main.tf b/azure/dbformariadb_servers/dashboards/overview/main.tf
index 809481a..1381862 100644
--- a/azure/dbformariadb_servers/dashboards/overview/main.tf
+++ b/azure/dbformariadb_servers/dashboards/overview/main.tf
@@ -15,13 +15,13 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Dbformariadb_servers Dashboard URL"
+  description = "OpenTelemetry Collector MariaDB Servers Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
   project_name   = var.lightstep_project
   dashboard_name = "MariaDB Servers Metrics"
-  dashboard_description = "Monitor Dbformariadb_servers with this metrics overview dashboard."
+  dashboard_description = "Monitor MariaDB Servers with this metrics overview dashboard."
 
   chart {
     name = "Active Connections"
diff --git a/azure/dbformysql_flexibleservers/dashboards/overview/main.tf b/azure/dbformysql_flexibleservers/dashboards/overview/main.tf
index a812de6..57437a0 100644
--- a/azure/dbformysql_flexibleservers/dashboards/overview/main.tf
+++ b/azure/dbformysql_flexibleservers/dashboards/overview/main.tf
@@ -15,13 +15,13 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Dbformysql_flexibleservers Dashboard URL"
+  description = "OpenTelemetry Collector MySQL Flexible Servers Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
   project_name   = var.lightstep_project
-  dashboard_name = "DB Mysql Flexible Servers Metrics"
-  dashboard_description = "Monitor DB Mysql Flexible Servers with this metrics overview dashboard."
+  dashboard_name = "MySQL Flexible Servers Metrics"
+  dashboard_description = "Monitor MySQL Flexible Servers with this metrics overview dashboard."
 
   chart {
     name = "CPU %"
diff --git a/azure/dbformysql_servers/dashboards/overview/main.tf b/azure/dbformysql_servers/dashboards/overview/main.tf
index a0955a4..ffe3ed9 100644
--- a/azure/dbformysql_servers/dashboards/overview/main.tf
+++ b/azure/dbformysql_servers/dashboards/overview/main.tf
@@ -15,13 +15,13 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Dbformysql_servers Dashboard URL"
+  description = "OpenTelemetry Collector MySQL Servers Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
   project_name   = var.lightstep_project
-  dashboard_name = "DB Mysql Servers Metrics"
-  dashboard_description = "Monitor DB Mysql Servers with this metrics overview dashboard."
+  dashboard_name = "MySQL Servers Metrics"
+  dashboard_description = "Monitor MySQL Servers with this metrics overview dashboard."
 
   chart {
     name = "CPU %"
diff --git a/azure/dbforpostgresql_flexibleservers/dashboards/overview/main.tf b/azure/dbforpostgresql_flexibleservers/dashboards/overview/main.tf
index 7fd2017..875f203 100644
--- a/azure/dbforpostgresql_flexibleservers/dashboards/overview/main.tf
+++ b/azure/dbforpostgresql_flexibleservers/dashboards/overview/main.tf
@@ -15,13 +15,13 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Dbforpostgresql_flexibleservers Dashboard URL"
+  description = "OpenTelemetry Collector PostgreSQL Flexible Servers Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
   project_name   = var.lightstep_project
-  dashboard_name = "DB PostgreSQL Flexible Servers Metrics"
-  dashboard_description = "Monitor Dbforpostgresql_flexibleservers with this metrics overview dashboard."
+  dashboard_name = "PostgreSQL Flexible Servers Metrics"
+  dashboard_description = "Monitor PostgreSQL Flexible Servers with this metrics overview dashboard."
 
   chart {
     name = "Active Connections"
diff --git a/azure/dbforpostgresql_servers/dashboards/overview/main.tf b/azure/dbforpostgresql_servers/dashboards/overview/main.tf
index 06c9b42..2530210 100644
--- a/azure/dbforpostgresql_servers/dashboards/overview/main.tf
+++ b/azure/dbforpostgresql_servers/dashboards/overview/main.tf
@@ -15,13 +15,13 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Dbforpostgresql_servers Dashboard URL"
+  description = "OpenTelemetry Collector PostgreSQL Servers Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
   project_name   = var.lightstep_project
-  dashboard_name = "DB PostgreSQL Servers Metrics"
-  dashboard_description = "Monitor Dbforpostgresql_servers with this metrics overview dashboard."
+  dashboard_name = "PostgreSQL Servers Metrics"
+  dashboard_description = "Monitor PostgreSQL Servers with this metrics overview dashboard."
 
   chart {
     name = "Active Connections"
diff --git a/azure/documentdb_cassandraclusters/dashboards/overview/main.tf b/azure/documentdb_cassandraclusters/dashboards/overview/main.tf
index 7a6a61d..ae724de 100644
--- a/azure/documentdb_cassandraclusters/dashboards/overview/main.tf
+++ b/azure/documentdb_cassandraclusters/dashboards/overview/main.tf
@@ -15,13 +15,13 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Documentdb_cassandraclusters Dashboard URL"
+  description = "OpenTelemetry Collector DocumentDB Cassandra Clusters Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
   project_name   = var.lightstep_project
   dashboard_name = "DocumentDB Cassandra Clusters Metrics"
-  dashboard_description = "Monitor DocumentDB Cassandra Clusters with this metrics overview dashboard."
+  dashboard_description = "[Beta] Monitor DocumentDB Cassandra Clusters with this metrics overview dashboard."
 
   chart {
     name = "CPU"
@@ -33,7 +33,7 @@ resource "lightstep_dashboard" "otel_collector_dashboard" {
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_cpu_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_clusterresourcename == $metadata_clusterresourcename) && (metadata_datacenterresourcename == $metadata_datacenterresourcename) && (metadata_address == $metadata_address) && (metadata_kind == $metadata_kind) && (metadata_cpu == $metadata_cpu)) | delta | group_by [], sum
+metric azure_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_percent_mem_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_clusterresourcename == $metadata_clusterresourcename) && (metadata_datacenterresourcename == $metadata_datacenterresourcename) && (metadata_address == $metadata_address)) | delta | group_by [], sum
+metric azure_percent_mem_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_cassandra_client_request_failures_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node) && (metadata_request_type == $metadata_request_type)) | delta | group_by [], sum
+metric azure_cassandra_client_request_failures_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node)) | delta | group_by [], sum
 EOT
     }
   }
@@ -138,7 +138,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_disk_utilization_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_clusterresourcename == $metadata_clusterresourcename) && (metadata_datacenterresourcename == $metadata_datacenterresourcename) && (metadata_address == $metadata_address)) | delta | group_by [], sum
+metric azure_disk_utilization_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_cassandra_table_read_latency_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node) && (metadata_table == $metadata_table) && (metadata_keyspace == $metadata_keyspace)) | delta | group_by [], sum
+metric azure_cassandra_table_read_latency_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node)) | delta | group_by [], sum
 EOT
     }
   }
@@ -168,7 +168,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_cassandra_table_write_latency_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node) && (metadata_table == $metadata_table) && (metadata_keyspace == $metadata_keyspace)) | delta | group_by [], sum
+metric azure_cassandra_table_write_latency_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node)) | delta | group_by [], sum
 EOT
     }
   }
@@ -198,7 +198,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_cassandra_table_speculative_retries_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node) && (metadata_table == $metadata_table) && (metadata_keyspace == $metadata_keyspace)) | delta | group_by [], sum
+metric azure_cassandra_table_speculative_retries_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node)) | delta | group_by [], sum
 EOT
     }
   }
@@ -213,7 +213,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_cassandra_thread_pools_active_tasks_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node) && (metadata_pool_name == $metadata_pool_name) && (metadata_pool_type == $metadata_pool_type)) | delta | group_by [], sum
+metric azure_cassandra_thread_pools_active_tasks_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node)) | delta | group_by [], sum
 EOT
     }
   }
@@ -228,7 +228,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_cassandra_thread_pools_pending_tasks_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node) && (metadata_pool_name == $metadata_pool_name) && (metadata_pool_type == $metadata_pool_type)) | delta | group_by [], sum
+metric azure_cassandra_thread_pools_pending_tasks_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_cassandra_datacenter == $metadata_cassandra_datacenter) && (metadata_cassandra_node == $metadata_cassandra_node)) | delta | group_by [], sum
 EOT
     }
   }
@@ -257,12 +257,6 @@ EOT
     suggestion_attribute_key = "location"
   }
 
-  template_variable {
-    name                     = "metadata_address"
-    default_values           = []
-    suggestion_attribute_key = "metadata_address"
-  }
-
   template_variable {
     name                     = "metadata_cache_name"
     default_values           = []
@@ -280,58 +274,4 @@ EOT
     default_values           = []
     suggestion_attribute_key = "metadata_cassandra_node"
   }
-
-  template_variable {
-    name                     = "metadata_clusterresourcename"
-    default_values           = []
-    suggestion_attribute_key = "metadata_clusterresourcename"
-  }
-
-  template_variable {
-    name                     = "metadata_cpu"
-    default_values           = []
-    suggestion_attribute_key = "metadata_cpu"
-  }
-
-  template_variable {
-    name                     = "metadata_datacenterresourcename"
-    default_values           = []
-    suggestion_attribute_key = "metadata_datacenterresourcename"
-  }
-
-  template_variable {
-    name                     = "metadata_keyspace"
-    default_values           = []
-    suggestion_attribute_key = "metadata_keyspace"
-  }
-
-  template_variable {
-    name                     = "metadata_kind"
-    default_values           = []
-    suggestion_attribute_key = "metadata_kind"
-  }
-
-  template_variable {
-    name                     = "metadata_pool_name"
-    default_values           = []
-    suggestion_attribute_key = "metadata_pool_name"
-  }
-
-  template_variable {
-    name                     = "metadata_pool_type"
-    default_values           = []
-    suggestion_attribute_key = "metadata_pool_type"
-  }
-
-  template_variable {
-    name                     = "metadata_request_type"
-    default_values           = []
-    suggestion_attribute_key = "metadata_request_type"
-  }
-
-  template_variable {
-    name                     = "metadata_table"
-    default_values           = []
-    suggestion_attribute_key = "metadata_table"
-  }
 }
diff --git a/azure/documentdb_databaseaccounts/dashboards/overview/main.tf b/azure/documentdb_databaseaccounts/dashboards/overview/main.tf
index f8b896f..89ec763 100644
--- a/azure/documentdb_databaseaccounts/dashboards/overview/main.tf
+++ b/azure/documentdb_databaseaccounts/dashboards/overview/main.tf
@@ -15,7 +15,7 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Documentdb_databaseaccounts Dashboard URL"
+  description = "OpenTelemetry Collector DocumentDB Database Accounts Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
@@ -33,7 +33,7 @@ resource "lightstep_dashboard" "otel_collector_dashboard" {
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_totalrequests_count | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname) && (metadata_region == $metadata_region) && (metadata_statuscode == $metadata_statuscode) && (metadata_operationtype == $metadata_operationtype) && (metadata_status == $metadata_status) && (metadata_capacitytype == $metadata_capacitytype)) | delta | group_by [], sum
+metric azure_totalrequests_count | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname) && (metadata_region == $metadata_region)) | delta | group_by [], sum
 EOT
     }
   }
@@ -93,7 +93,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_serversidelatency_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname) && (metadata_region == $metadata_region) && (metadata_connectionmode == $metadata_connectionmode) && (metadata_operationtype == $metadata_operationtype) && (metadata_publicapitype == $metadata_publicapitype)) | delta | group_by [], sum
+metric azure_serversidelatency_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname) && (metadata_region == $metadata_region)) | delta | group_by [], sum
 EOT
     }
   }
@@ -108,7 +108,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_metadatarequests_count | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname) && (metadata_region == $metadata_region) && (metadata_statuscode == $metadata_statuscode) && (metadata_role == $metadata_role)) | delta | group_by [], sum
+metric azure_metadatarequests_count | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname) && (metadata_region == $metadata_region)) | delta | group_by [], sum
 EOT
     }
   }
@@ -123,7 +123,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_provisionedthroughput_maximum | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname) && (metadata_allowwrite == $metadata_allowwrite)) | delta | group_by [], sum
+metric azure_provisionedthroughput_maximum | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname)) | delta | group_by [], sum
 EOT
     }
   }
@@ -138,7 +138,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_serversidelatencydirect_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname) && (metadata_region == $metadata_region) && (metadata_connectionmode == $metadata_connectionmode) && (metadata_operationtype == $metadata_operationtype) && (metadata_publicapitype == $metadata_publicapitype) && (metadata_apitype == $metadata_apitype)) | delta | group_by [], sum
+metric azure_serversidelatencydirect_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname) && (metadata_region == $metadata_region)) | delta | group_by [], sum
 EOT
     }
   }
@@ -153,7 +153,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_totalrequestunits_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname) && (metadata_region == $metadata_region) && (metadata_statuscode == $metadata_statuscode) && (metadata_operationtype == $metadata_operationtype) && (metadata_status == $metadata_status) && (metadata_capacitytype == $metadata_capacitytype)) | delta | group_by [], sum
+metric azure_totalrequestunits_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_databasename == $metadata_databasename) && (metadata_collectionname == $metadata_collectionname) && (metadata_region == $metadata_region)) | delta | group_by [], sum
 EOT
     }
   }
@@ -168,7 +168,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_replicationlatency_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_sourceregion == $metadata_sourceregion) && (metadata_targetregion == $metadata_targetregion)) | delta | group_by [], sum
+metric azure_replicationlatency_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
     }
   }
@@ -213,7 +213,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_tabletablethroughputupdate_count | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_resourcename == $metadata_resourcename) && (metadata_apikind == $metadata_apikind) && (metadata_apikindresourcetype == $metadata_apikindresourcetype) && (metadata_isthroughputrequest == $metadata_isthroughputrequest)) | delta | group_by [], sum
+metric azure_tabletablethroughputupdate_count | 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
     }
   }
@@ -242,129 +242,21 @@ EOT
     suggestion_attribute_key = "location"
   }
 
-  template_variable {
-    name                     = "metadata_allowwrite"
-    default_values           = []
-    suggestion_attribute_key = "metadata_allowwrite"
-  }
-
-  template_variable {
-    name                     = "metadata_apikind"
-    default_values           = []
-    suggestion_attribute_key = "metadata_apikind"
-  }
-
-  template_variable {
-    name                     = "metadata_apikindresourcetype"
-    default_values           = []
-    suggestion_attribute_key = "metadata_apikindresourcetype"
-  }
-
-  template_variable {
-    name                     = "metadata_apitype"
-    default_values           = []
-    suggestion_attribute_key = "metadata_apitype"
-  }
-
-  template_variable {
-    name                     = "metadata_capacitytype"
-    default_values           = []
-    suggestion_attribute_key = "metadata_capacitytype"
-  }
-
   template_variable {
     name                     = "metadata_collectionname"
     default_values           = []
     suggestion_attribute_key = "metadata_collectionname"
   }
 
-  template_variable {
-    name                     = "metadata_collectionrid"
-    default_values           = []
-    suggestion_attribute_key = "metadata_collectionrid"
-  }
-
-  template_variable {
-    name                     = "metadata_connectionmode"
-    default_values           = []
-    suggestion_attribute_key = "metadata_connectionmode"
-  }
-
   template_variable {
     name                     = "metadata_databasename"
     default_values           = []
     suggestion_attribute_key = "metadata_databasename"
   }
 
-  template_variable {
-    name                     = "metadata_isthroughputrequest"
-    default_values           = []
-    suggestion_attribute_key = "metadata_isthroughputrequest"
-  }
-
-  template_variable {
-    name                     = "metadata_operationtype"
-    default_values           = []
-    suggestion_attribute_key = "metadata_operationtype"
-  }
-
-  template_variable {
-    name                     = "metadata_partitionkeyrangeid"
-    default_values           = []
-    suggestion_attribute_key = "metadata_partitionkeyrangeid"
-  }
-
-  template_variable {
-    name                     = "metadata_physicalpartitionid"
-    default_values           = []
-    suggestion_attribute_key = "metadata_physicalpartitionid"
-  }
-
-  template_variable {
-    name                     = "metadata_publicapitype"
-    default_values           = []
-    suggestion_attribute_key = "metadata_publicapitype"
-  }
-
   template_variable {
     name                     = "metadata_region"
     default_values           = []
     suggestion_attribute_key = "metadata_region"
   }
-
-  template_variable {
-    name                     = "metadata_resourcename"
-    default_values           = []
-    suggestion_attribute_key = "metadata_resourcename"
-  }
-
-  template_variable {
-    name                     = "metadata_role"
-    default_values           = []
-    suggestion_attribute_key = "metadata_role"
-  }
-
-  template_variable {
-    name                     = "metadata_sourceregion"
-    default_values           = []
-    suggestion_attribute_key = "metadata_sourceregion"
-  }
-
-  template_variable {
-    name                     = "metadata_status"
-    default_values           = []
-    suggestion_attribute_key = "metadata_status"
-  }
-
-  template_variable {
-    name                     = "metadata_statuscode"
-    default_values           = []
-    suggestion_attribute_key = "metadata_statuscode"
-  }
-
-  template_variable {
-    name                     = "metadata_targetregion"
-    default_values           = []
-    suggestion_attribute_key = "metadata_targetregion"
-  }
 }
diff --git a/azure/network_networkinterfaces/dashboards/overview/main.tf b/azure/network_networkinterfaces/dashboards/overview/main.tf
index 1bfdf0e..b1e899e 100644
--- a/azure/network_networkinterfaces/dashboards/overview/main.tf
+++ b/azure/network_networkinterfaces/dashboards/overview/main.tf
@@ -15,7 +15,7 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Network_networkinterfaces Dashboard URL"
+  description = "OpenTelemetry Collector Network Interfaces Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
diff --git a/azure/sql_managedinstances/dashboards/overview/main.tf b/azure/sql_managedinstances/dashboards/overview/main.tf
index 6a307d0..169ce33 100644
--- a/azure/sql_managedinstances/dashboards/overview/main.tf
+++ b/azure/sql_managedinstances/dashboards/overview/main.tf
@@ -15,13 +15,13 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Sql_managedinstances Dashboard URL"
+  description = "OpenTelemetry Collector SQL Managed Instances Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
   project_name   = var.lightstep_project
   dashboard_name = "SQL Managed Instances Metrics"
-  dashboard_description = "Monitor SQL Managed Instances with this metrics overview dashboard."
+  dashboard_description = "[Beta] Monitor SQL Managed Instances with this metrics overview dashboard."
 
   chart {
     name = "Avg CPU %"
diff --git a/azure/sql_servers_databases/dashboards/overview/main.tf b/azure/sql_servers_databases/dashboards/overview/main.tf
index bc2a55b..8c03741 100644
--- a/azure/sql_servers_databases/dashboards/overview/main.tf
+++ b/azure/sql_servers_databases/dashboards/overview/main.tf
@@ -15,7 +15,7 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Sql_servers_databases Dashboard URL"
+  description = "OpenTelemetry Collector SQL Servers Databases Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
diff --git a/azure/storage_storageaccounts/dashboards/overview/main.tf b/azure/storage_storageaccounts/dashboards/overview/main.tf
index 94b826a..26b3ffe 100644
--- a/azure/storage_storageaccounts/dashboards/overview/main.tf
+++ b/azure/storage_storageaccounts/dashboards/overview/main.tf
@@ -15,7 +15,7 @@ variable "lightstep_project" {
 
 output "dashboard_url" {
   value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
-  description = "OpenTelemetry Collector Storage_storageaccounts Dashboard URL"
+  description = "OpenTelemetry Collector Storage Accounts Dashboard URL"
 }
 
 resource "lightstep_dashboard" "otel_collector_dashboard" {
@@ -48,7 +48,7 @@ EOT
       display      = "line"
       hidden       = false
       query_string = <<EOT
-metric azure_transactions_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_responsetype == $metadata_responsetype) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication) && (metadata_transactiontype == $metadata_transactiontype)) | delta | group_by [], sum
+metric azure_transactions_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
 EOT
     }
   }
@@ -169,16 +169,4 @@ EOT
     default_values           = []
     suggestion_attribute_key = "metadata_geotype"
   }
-
-  template_variable {
-    name                     = "metadata_responsetype"
-    default_values           = []
-    suggestion_attribute_key = "metadata_responsetype"
-  }
-
-  template_variable {
-    name                     = "metadata_transactiontype"
-    default_values           = []
-    suggestion_attribute_key = "metadata_transactiontype"
-  }
 }
diff --git a/azure/storage_storageaccounts/example/tf/Makefile b/azure/storage_storageaccounts/examples/tf/Makefile
similarity index 92%
rename from azure/storage_storageaccounts/example/tf/Makefile
rename to azure/storage_storageaccounts/examples/tf/Makefile
index c582751..e1de79a 100644
--- a/azure/storage_storageaccounts/example/tf/Makefile
+++ b/azure/storage_storageaccounts/examples/tf/Makefile
@@ -19,7 +19,7 @@ destroy-terraform:
 
 .PHONY: run-collector
 run-collector:
-	docker run -d --name=azure-collector-storage -v ./:/conf/ -e AZURE_CLIENT_ID=${AZURE_CLIENT_ID} -e AZURE_CLIENT_SECRET=${AZURE_CLIENT_SECRET} -e AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID} -e AZURE_TENANT_ID=${AZURE_TENANT_ID} -e LS_ACCESS_TOKEN=${LS_ACCESS_TOKEN} otel/opentelemetry-collector-contrib:0.79.0 --config=/conf/collector.yaml
+	docker run -d --name=azure-collector-storage -v ./:/conf/ -e AZURE_CLIENT_ID=${AZURE_CLIENT_ID} -e AZURE_CLIENT_SECRET=${AZURE_CLIENT_SECRET} -e AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID} -e AZURE_TENANT_ID=${AZURE_TENANT_ID} -e LS_ACCESS_TOKEN=${LS_ACCESS_TOKEN} otel/opentelemetry-collector-contrib:0.81.0 --config=/conf/collector.yaml
 
 .PHONY: stop-collector
 stop-collector:
diff --git a/azure/storage_storageaccounts/example/tf/collector.yaml b/azure/storage_storageaccounts/examples/tf/collector.yaml
similarity index 100%
rename from azure/storage_storageaccounts/example/tf/collector.yaml
rename to azure/storage_storageaccounts/examples/tf/collector.yaml
diff --git a/azure/storage_storageaccounts/example/tf/main.tf b/azure/storage_storageaccounts/examples/tf/main.tf
similarity index 96%
rename from azure/storage_storageaccounts/example/tf/main.tf
rename to azure/storage_storageaccounts/examples/tf/main.tf
index 729287a..49417d3 100644
--- a/azure/storage_storageaccounts/example/tf/main.tf
+++ b/azure/storage_storageaccounts/examples/tf/main.tf
@@ -4,7 +4,7 @@ provider "azurerm" {
 
 variable "prefix" {
   description = "A prefix used for all resources in this example"
-  default = "example-storage-account"
+  default = "ex-storage-account"
 }
 
 resource "azurerm_resource_group" "example" {
diff --git a/azure/storage_storageaccounts_blobservices/dashboards/overview/main.tf b/azure/storage_storageaccounts_blobservices/dashboards/overview/main.tf
new file mode 100644
index 0000000..44aaed2
--- /dev/null
+++ b/azure/storage_storageaccounts_blobservices/dashboards/overview/main.tf
@@ -0,0 +1,202 @@
+terraform {
+  required_providers {
+    lightstep = {
+      source  = "lightstep/lightstep"
+      version = "~> 1.76.0"
+    }
+  }
+  required_version = ">= v1.0.11"
+}
+
+variable "lightstep_project" {
+  description = "Lightstep Project Name"
+  type        = string
+}
+
+output "dashboard_url" {
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
+  description = "OpenTelemetry Collector Storage Blob Services Dashboard URL"
+}
+
+resource "lightstep_dashboard" "otel_collector_dashboard" {
+  project_name   = var.lightstep_project
+  dashboard_name = "Storage Blob Services Metrics"
+  dashboard_description = "Monitor Storage Blob Services with this metrics overview dashboard."
+
+  chart {
+    name = "Availability"
+    rank = "0"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_availability_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Blob Capacity"
+    rank = "1"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_blobcapacity_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
+    }
+  }
+
+  chart {
+    name = "Egress"
+    rank = "2"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_egress_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Ingress"
+    rank = "3"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_ingress_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Transactions"
+    rank = "4"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_transactions_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Containers"
+    rank = "5"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_containercount_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
+    }
+  }
+
+  chart {
+    name = "Blobs"
+    rank = "6"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_blobcount_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
+    }
+  }
+
+  chart {
+    name = "Index Capacity"
+    rank = "7"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_indexcapacity_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
+    }
+  }
+
+  chart {
+    name = "Successful Server Latency"
+    rank = "8"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_successserverlatency_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  template_variable {
+    name                     = "azuremonitor_resource_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.resource_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_subscription_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.subscription_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_tenant_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.tenant_id"
+  }
+
+  template_variable {
+    name                     = "location"
+    default_values           = []
+    suggestion_attribute_key = "location"
+  }
+
+  template_variable {
+    name                     = "metadata_apiname"
+    default_values           = []
+    suggestion_attribute_key = "metadata_apiname"
+  }
+
+  template_variable {
+    name                     = "metadata_authentication"
+    default_values           = []
+    suggestion_attribute_key = "metadata_authentication"
+  }
+
+  template_variable {
+    name                     = "metadata_geotype"
+    default_values           = []
+    suggestion_attribute_key = "metadata_geotype"
+  }
+}
diff --git a/azure/storage_storageaccounts_blobservices/examples/tf/Makefile b/azure/storage_storageaccounts_blobservices/examples/tf/Makefile
new file mode 100644
index 0000000..e7a3418
--- /dev/null
+++ b/azure/storage_storageaccounts_blobservices/examples/tf/Makefile
@@ -0,0 +1,4 @@
+
+include ../../../Makefile.Common
+
+EXAMPLE_NAME = "azure-collector-storage-blob"
diff --git a/azure/storage_storageaccounts_blobservices/examples/tf/collector.yaml b/azure/storage_storageaccounts_blobservices/examples/tf/collector.yaml
new file mode 100644
index 0000000..a1ff293
--- /dev/null
+++ b/azure/storage_storageaccounts_blobservices/examples/tf/collector.yaml
@@ -0,0 +1,29 @@
+receivers:
+  azuremonitor:
+    subscription_id: "${AZURE_SUBSCRIPTION_ID}"
+    tenant_id: "${AZURE_TENANT_ID}"
+    client_id: "${AZURE_CLIENT_ID}"
+    client_secret: "${AZURE_CLIENT_SECRET}"
+    resource_groups:
+      - "examplestorageblob"
+    services:
+      - "Microsoft.Storage/storageAccounts/blobServices"
+    collection_interval: 10s
+
+exporters:
+  logging:
+    loglevel: debug
+  otlp/public:
+    endpoint: ingest.lightstep.com:443
+    headers:
+        "lightstep-access-token": "${LS_ACCESS_TOKEN}"
+
+processors:
+  batch:
+
+service:
+  pipelines:
+    metrics/azuremonitor:
+      receivers: [azuremonitor]
+      processors: [batch]
+      exporters: [logging, otlp/public]
diff --git a/azure/storage_storageaccounts_blobservices/examples/tf/main.tf b/azure/storage_storageaccounts_blobservices/examples/tf/main.tf
new file mode 100644
index 0000000..75f5121
--- /dev/null
+++ b/azure/storage_storageaccounts_blobservices/examples/tf/main.tf
@@ -0,0 +1,35 @@
+provider "azurerm" {
+  features {}
+}
+
+variable "prefix" {
+  description = "A prefix used for all resources in this example"
+  default = "exstorageblob"
+}
+
+resource "azurerm_resource_group" "example" {
+  name     = "${var.prefix}"
+  location = "East US"
+}
+
+resource "azurerm_storage_account" "example" {
+  name                     = "${var.prefix}sa"
+  resource_group_name      = azurerm_resource_group.example.name
+  location                 = azurerm_resource_group.example.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+resource "azurerm_storage_container" "example" {
+  name                  = "${var.prefix}container"
+  storage_account_name  = azurerm_storage_account.example.name
+  container_access_type = "private"
+}
+
+resource "azurerm_storage_blob" "example" {
+  name                   = "${var.prefix}-text_file.txt"
+  storage_account_name   = azurerm_storage_account.example.name
+  storage_container_name = azurerm_storage_container.example.name
+  type                   = "Block"
+  source_content         = "File content\n"
+}
diff --git a/azure/storage_storageaccounts_blobservices/metrics.csv b/azure/storage_storageaccounts_blobservices/metrics.csv
new file mode 100644
index 0000000..f55fda3
--- /dev/null
+++ b/azure/storage_storageaccounts_blobservices/metrics.csv
@@ -0,0 +1,12 @@
+Name,Description,Unit,DataType,Attributes,Default Aggregation
+azure_availability_average;azure_availability_count;azure_availability_maximum;azure_availability_minimum;azure_availability_total,"The percentage of availability for the storage service or the specified API operation. Availability is calculated by taking the TotalBillableRequests value and dividing it by the number of applicable requests, including those that produced unexpected errors. All unexpected errors result in reduced availability for the storage service or the specified API operation.",Percent,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,average
+azure_blobcapacity_average;azure_blobcapacity_count;azure_blobcapacity_maximum;azure_blobcapacity_minimum;azure_blobcapacity_total,The amount of storage used by the storage account's Blob service in bytes.,Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_blobtype;metadata_tier,average
+azure_egress_average;azure_egress_count;azure_egress_maximum;azure_egress_minimum;azure_egress_total,"The amount of egress data. This number includes egress to external client from Azure Storage as well as egress within Azure. As a result, this number does not reflect billable egress.",Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,total
+azure_ingress_average;azure_ingress_count;azure_ingress_maximum;azure_ingress_minimum;azure_ingress_total,"The amount of ingress data, in bytes. This number includes ingress from an external client into Azure Storage as well as ingress within Azure.",Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,total
+azure_transactions_average;azure_transactions_count;azure_transactions_maximum;azure_transactions_minimum;azure_transactions_total,"The number of requests made to a storage service or the specified API operation. This number includes successful and failed requests, as well as requests which produced errors. Use ResponseType dimension for the number of different type of response.",Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_responsetype;metadata_geotype;metadata_apiname;metadata_authentication;metadata_transactiontype,total
+azure_containercount_average;azure_containercount_count;azure_containercount_maximum;azure_containercount_minimum;azure_containercount_total,The number of containers in the storage account.,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location,average
+azure_blobcount_average;azure_blobcount_count;azure_blobcount_maximum;azure_blobcount_minimum;azure_blobcount_total,The number of blob objects stored in the storage account.,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_blobtype;metadata_tier,average
+azure_indexcapacity_average;azure_indexcapacity_count;azure_indexcapacity_maximum;azure_indexcapacity_minimum;azure_indexcapacity_total,The amount of storage used by Azure Data Lake Storage Gen2 hierarchical index.,Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location,average
+azure_successserverlatency_average;azure_successserverlatency_count;azure_successserverlatency_maximum;azure_successserverlatency_minimum;azure_successserverlatency_total,The average time used to process a successful request by Azure Storage. This value does not include the network latency specified in SuccessE2ELatency.,MilliSeconds,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,average
+azure_blobprovisionedsize_average;azure_blobprovisionedsize_count;azure_blobprovisionedsize_maximum;azure_blobprovisionedsize_minimum;azure_blobprovisionedsize_total,The amount of storage provisioned in the storage account's Blob service in bytes.,Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_blobtype;metadata_tier,average
+azure_successe2elatency_average;azure_successe2elatency_count;azure_successe2elatency_maximum;azure_successe2elatency_minimum;azure_successe2elatency_total,"The average end-to-end latency of successful requests made to a storage service or the specified API operation, in milliseconds. This value includes the required processing time within Azure Storage to read the request, send the response, and receive acknowledgment of the response.",MilliSeconds,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,average
diff --git a/azure/storage_storageaccounts_fileservices/dashboards/overview/main.tf b/azure/storage_storageaccounts_fileservices/dashboards/overview/main.tf
new file mode 100644
index 0000000..1dc1711
--- /dev/null
+++ b/azure/storage_storageaccounts_fileservices/dashboards/overview/main.tf
@@ -0,0 +1,202 @@
+terraform {
+  required_providers {
+    lightstep = {
+      source  = "lightstep/lightstep"
+      version = "~> 1.76.0"
+    }
+  }
+  required_version = ">= v1.0.11"
+}
+
+variable "lightstep_project" {
+  description = "Lightstep Project Name"
+  type        = string
+}
+
+output "dashboard_url" {
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
+  description = "OpenTelemetry Collector Storage File Services Dashboard URL"
+}
+
+resource "lightstep_dashboard" "otel_collector_dashboard" {
+  project_name   = var.lightstep_project
+  dashboard_name = "Storage File Services Metrics"
+  dashboard_description = "Monitor Storage File Services with this metrics overview dashboard."
+
+  chart {
+    name = "Availability"
+    rank = "0"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_availability_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication) && (metadata_fileshare == $metadata_fileshare)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Egress"
+    rank = "1"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_egress_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication) && (metadata_fileshare == $metadata_fileshare)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Ingress"
+    rank = "2"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_ingress_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication) && (metadata_fileshare == $metadata_fileshare)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Transactions"
+    rank = "3"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_transactions_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication) && (metadata_fileshare == $metadata_fileshare)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Successful Server Latency"
+    rank = "4"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_successserverlatency_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication) && (metadata_fileshare == $metadata_fileshare)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "File Capacity"
+    rank = "5"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_filecapacity_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_fileshare == $metadata_fileshare)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Files"
+    rank = "6"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_filecount_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_fileshare == $metadata_fileshare)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "File Share Capacity Quota"
+    rank = "7"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_filesharecapacityquota_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_fileshare == $metadata_fileshare)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "File Share Count"
+    rank = "8"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_filesharecount_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           = []
+    suggestion_attribute_key = "azuremonitor.resource_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_subscription_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.subscription_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_tenant_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.tenant_id"
+  }
+
+  template_variable {
+    name                     = "location"
+    default_values           = []
+    suggestion_attribute_key = "location"
+  }
+
+  template_variable {
+    name                     = "metadata_apiname"
+    default_values           = []
+    suggestion_attribute_key = "metadata_apiname"
+  }
+
+  template_variable {
+    name                     = "metadata_authentication"
+    default_values           = []
+    suggestion_attribute_key = "metadata_authentication"
+  }
+
+  template_variable {
+    name                     = "metadata_fileshare"
+    default_values           = []
+    suggestion_attribute_key = "metadata_fileshare"
+  }
+}
diff --git a/azure/storage_storageaccounts_fileservices/examples/tf/Makefile b/azure/storage_storageaccounts_fileservices/examples/tf/Makefile
new file mode 100644
index 0000000..3884f59
--- /dev/null
+++ b/azure/storage_storageaccounts_fileservices/examples/tf/Makefile
@@ -0,0 +1,4 @@
+
+include ../../../Makefile.Common
+
+EXAMPLE_NAME = "azure-collector-storage-file"
diff --git a/azure/storage_storageaccounts_fileservices/examples/tf/collector.yaml b/azure/storage_storageaccounts_fileservices/examples/tf/collector.yaml
new file mode 100644
index 0000000..6ba693b
--- /dev/null
+++ b/azure/storage_storageaccounts_fileservices/examples/tf/collector.yaml
@@ -0,0 +1,29 @@
+receivers:
+  azuremonitor:
+    subscription_id: "${AZURE_SUBSCRIPTION_ID}"
+    tenant_id: "${AZURE_TENANT_ID}"
+    client_id: "${AZURE_CLIENT_ID}"
+    client_secret: "${AZURE_CLIENT_SECRET}"
+    resource_groups:
+      - "examplestoragefile"
+    services:
+      - "Microsoft.Storage/storageAccounts/fileServices"
+    collection_interval: 60s
+
+exporters:
+  logging:
+    loglevel: debug
+  otlp/public:
+    endpoint: ingest.lightstep.com:443
+    headers:
+        "lightstep-access-token": "${LS_ACCESS_TOKEN}"
+
+processors:
+  batch:
+
+service:
+  pipelines:
+    metrics/azuremonitor:
+      receivers: [azuremonitor]
+      processors: [batch]
+      exporters: [logging, otlp/public]
diff --git a/azure/storage_storageaccounts_fileservices/examples/tf/main.tf b/azure/storage_storageaccounts_fileservices/examples/tf/main.tf
new file mode 100644
index 0000000..3088330
--- /dev/null
+++ b/azure/storage_storageaccounts_fileservices/examples/tf/main.tf
@@ -0,0 +1,32 @@
+provider "azurerm" {
+  features {}
+}
+
+variable "prefix" {
+  description = "A prefix used for all resources in this example"
+  default = "exstoragefile"
+}
+
+resource "azurerm_resource_group" "example" {
+  name     = "${var.prefix}"
+  location = "East US"
+}
+
+resource "azurerm_storage_account" "example" {
+  name                     = "${var.prefix}sa"
+  resource_group_name      = azurerm_resource_group.example.name
+  location                 = azurerm_resource_group.example.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+resource "azurerm_storage_share" "example" {
+  name                 = "${var.prefix}share"
+  storage_account_name = azurerm_storage_account.example.name
+  quota                = 50
+}
+
+resource "azurerm_storage_share_file" "example" {
+  name             = "${var.prefix}-text_file.txt"
+  storage_share_id = azurerm_storage_share.example.id
+}
diff --git a/azure/storage_storageaccounts_fileservices/metrics.csv b/azure/storage_storageaccounts_fileservices/metrics.csv
new file mode 100644
index 0000000..4aa2245
--- /dev/null
+++ b/azure/storage_storageaccounts_fileservices/metrics.csv
@@ -0,0 +1,14 @@
+Name,Description,Unit,DataType,Attributes,Default Aggregation
+azure_availability_average;azure_availability_count;azure_availability_maximum;azure_availability_minimum;azure_availability_total,"The percentage of availability for the storage service or the specified API operation. Availability is calculated by taking the TotalBillableRequests value and dividing it by the number of applicable requests, including those that produced unexpected errors. All unexpected errors result in reduced availability for the storage service or the specified API operation.",Percent,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication;metadata_fileshare,average
+azure_egress_average;azure_egress_count;azure_egress_maximum;azure_egress_minimum;azure_egress_total,"The amount of egress data. This number includes egress to external client from Azure Storage as well as egress within Azure. As a result, this number does not reflect billable egress.",Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication;metadata_fileshare,total
+azure_ingress_average;azure_ingress_count;azure_ingress_maximum;azure_ingress_minimum;azure_ingress_total,"The amount of ingress data, in bytes. This number includes ingress from an external client into Azure Storage as well as ingress within Azure.",Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication;metadata_fileshare,total
+azure_transactions_average;azure_transactions_count;azure_transactions_maximum;azure_transactions_minimum;azure_transactions_total,"The number of requests made to a storage service or the specified API operation. This number includes successful and failed requests, as well as requests which produced errors. Use ResponseType dimension for the number of different type of response.",Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_responsetype;metadata_geotype;metadata_apiname;metadata_authentication;metadata_fileshare;metadata_transactiontype,total
+azure_successserverlatency_average;azure_successserverlatency_count;azure_successserverlatency_maximum;azure_successserverlatency_minimum;azure_successserverlatency_total,The average time used to process a successful request by Azure Storage. This value does not include the network latency specified in SuccessE2ELatency.,MilliSeconds,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication;metadata_fileshare,average
+azure_filecapacity_average;azure_filecapacity_count;azure_filecapacity_maximum;azure_filecapacity_minimum;azure_filecapacity_total,The amount of File storage used by the storage account.,Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_fileshare;metadata_tier,average
+azure_filecount_average;azure_filecount_count;azure_filecount_maximum;azure_filecount_minimum;azure_filecount_total,The number of files in the storage account.,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_fileshare;metadata_tier,average
+azure_filesharecapacityquota_average;azure_filesharecapacityquota_count;azure_filesharecapacityquota_maximum;azure_filesharecapacityquota_minimum;azure_filesharecapacityquota_total,The upper limit on the amount of storage that can be used by Azure Files Service in bytes.,Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_fileshare,average
+azure_filesharecount_average;azure_filesharecount_count;azure_filesharecount_maximum;azure_filesharecount_minimum;azure_filesharecount_total,The number of file shares in the storage account.,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location,average
+azure_fileshareprovisionediops_average;azure_fileshareprovisionediops_count;azure_fileshareprovisionediops_maximum;azure_fileshareprovisionediops_minimum;azure_fileshareprovisionediops_total,The baseline number of provisioned IOPS for the premium file share in the premium files storage account. This number is calculated based on the provisioned size (quota) of the share capacity.,CountPerSecond,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_fileshare,average
+azure_filesharesnapshotcount_average;azure_filesharesnapshotcount_count;azure_filesharesnapshotcount_maximum;azure_filesharesnapshotcount_minimum;azure_filesharesnapshotcount_total,The number of snapshots present on the share in storage account's Files Service.,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_fileshare,average
+azure_filesharesnapshotsize_average;azure_filesharesnapshotsize_count;azure_filesharesnapshotsize_maximum;azure_filesharesnapshotsize_minimum;azure_filesharesnapshotsize_total,The amount of storage used by the snapshots in storage account's File service in bytes.,Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_fileshare,average
+azure_successe2elatency_average;azure_successe2elatency_count;azure_successe2elatency_maximum;azure_successe2elatency_minimum;azure_successe2elatency_total,"The average end-to-end latency of successful requests made to a storage service or the specified API operation, in milliseconds. This value includes the required processing time within Azure Storage to read the request, send the response, and receive acknowledgment of the response.",MilliSeconds,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication;metadata_fileshare,average
diff --git a/azure/storage_storageaccounts_objectreplicationpolicies/dashboards/overview/main.tf b/azure/storage_storageaccounts_objectreplicationpolicies/dashboards/overview/main.tf
new file mode 100644
index 0000000..e67ae5d
--- /dev/null
+++ b/azure/storage_storageaccounts_objectreplicationpolicies/dashboards/overview/main.tf
@@ -0,0 +1,85 @@
+terraform {
+  required_providers {
+    lightstep = {
+      source  = "lightstep/lightstep"
+      version = "~> 1.76.0"
+    }
+  }
+  required_version = ">= v1.0.11"
+}
+
+variable "lightstep_project" {
+  description = "Lightstep Project Name"
+  type        = string
+}
+
+output "dashboard_url" {
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
+  description = "OpenTelemetry Collector Storage Object Replication Policies Dashboard URL"
+}
+
+resource "lightstep_dashboard" "otel_collector_dashboard" {
+  project_name   = var.lightstep_project
+  dashboard_name = "Storage Object Replication Policies Metrics"
+  dashboard_description = "[Beta] Monitor Storage Object Replication Policies with this metrics overview dashboard."
+
+  chart {
+    name = "Pending Replication Bytes"
+    rank = "0"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_pendingbytesforreplication_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_timebucket == $metadata_timebucket)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Pending Replication Operations"
+    rank = "1"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_pendingoperationsforreplication_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_timebucket == $metadata_timebucket)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  template_variable {
+    name                     = "azuremonitor_resource_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.resource_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_subscription_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.subscription_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_tenant_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.tenant_id"
+  }
+
+  template_variable {
+    name                     = "location"
+    default_values           = []
+    suggestion_attribute_key = "location"
+  }
+
+  template_variable {
+    name                     = "metadata_timebucket"
+    default_values           = []
+    suggestion_attribute_key = "metadata_timebucket"
+  }
+}
diff --git a/azure/storage_storageaccounts_objectreplicationpolicies/examples/tf/Makefile b/azure/storage_storageaccounts_objectreplicationpolicies/examples/tf/Makefile
new file mode 100644
index 0000000..8ff01cd
--- /dev/null
+++ b/azure/storage_storageaccounts_objectreplicationpolicies/examples/tf/Makefile
@@ -0,0 +1,4 @@
+
+include ../../../Makefile.Common
+
+EXAMPLE_NAME = "azure-collector-storage-replica"
diff --git a/azure/storage_storageaccounts_objectreplicationpolicies/examples/tf/collector.yaml b/azure/storage_storageaccounts_objectreplicationpolicies/examples/tf/collector.yaml
new file mode 100644
index 0000000..876c8ee
--- /dev/null
+++ b/azure/storage_storageaccounts_objectreplicationpolicies/examples/tf/collector.yaml
@@ -0,0 +1,29 @@
+receivers:
+  azuremonitor:
+    subscription_id: "${AZURE_SUBSCRIPTION_ID}"
+    tenant_id: "${AZURE_TENANT_ID}"
+    client_id: "${AZURE_CLIENT_ID}"
+    client_secret: "${AZURE_CLIENT_SECRET}"
+    resource_groups:
+      - "exstoragereplica"
+    services:
+      - "Microsoft.Storage/storageAccounts/objectReplicationPolicies"
+    collection_interval: 60s
+
+exporters:
+  logging:
+    loglevel: debug
+  otlp/public:
+    endpoint: ingest.lightstep.com:443
+    headers:
+        "lightstep-access-token": "${LS_ACCESS_TOKEN}"
+
+processors:
+  batch:
+
+service:
+  pipelines:
+    metrics/azuremonitor:
+      receivers: [azuremonitor]
+      processors: [batch]
+      exporters: [logging, otlp/public]
diff --git a/azure/storage_storageaccounts_objectreplicationpolicies/examples/tf/main.tf b/azure/storage_storageaccounts_objectreplicationpolicies/examples/tf/main.tf
new file mode 100644
index 0000000..6b540a9
--- /dev/null
+++ b/azure/storage_storageaccounts_objectreplicationpolicies/examples/tf/main.tf
@@ -0,0 +1,63 @@
+provider "azurerm" {
+  features {}
+}
+
+variable "prefix" {
+  description = "A prefix used for all resources in this example"
+  default = "exstoragereplica"
+}
+
+resource "azurerm_resource_group" "src" {
+  name     = "${var.prefix}src"
+  location = "East US"
+}
+
+resource "azurerm_storage_account" "src" {
+  name                     = "${var.prefix}sasrc"
+  resource_group_name      = azurerm_resource_group.src.name
+  location                 = azurerm_resource_group.src.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+  blob_properties {
+    versioning_enabled  = true
+    change_feed_enabled = true
+  }
+}
+
+resource "azurerm_storage_container" "src" {
+  name                  = "${var.prefix}containersrc"
+  storage_account_name  = azurerm_storage_account.src.name
+  container_access_type = "private"
+}
+
+resource "azurerm_resource_group" "dst" {
+  name     = "${var.prefix}dst"
+  location = "East US"
+}
+
+resource "azurerm_storage_account" "dst" {
+  name                     = "${var.prefix}sadst"
+  resource_group_name      = azurerm_resource_group.dst.name
+  location                 = azurerm_resource_group.dst.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+  blob_properties {
+    versioning_enabled  = true
+    change_feed_enabled = true
+  }
+}
+
+resource "azurerm_storage_container" "dst" {
+  name                  = "${var.prefix}containerdst"
+  storage_account_name  = azurerm_storage_account.dst.name
+  container_access_type = "private"
+}
+
+resource "azurerm_storage_object_replication" "example" {
+  source_storage_account_id      = azurerm_storage_account.src.id
+  destination_storage_account_id = azurerm_storage_account.dst.id
+  rules {
+    source_container_name      = azurerm_storage_container.src.name
+    destination_container_name = azurerm_storage_container.dst.name
+  }
+}
diff --git a/azure/storage_storageaccounts_objectreplicationpolicies/metrics.csv b/azure/storage_storageaccounts_objectreplicationpolicies/metrics.csv
new file mode 100644
index 0000000..78c2090
--- /dev/null
+++ b/azure/storage_storageaccounts_objectreplicationpolicies/metrics.csv
@@ -0,0 +1,3 @@
+Name,Description,Unit,DataType,Attributes,Default Aggregation
+azure_pendingbytesforreplication_average;azure_pendingbytesforreplication_count;azure_pendingbytesforreplication_maximum;azure_pendingbytesforreplication_minimum;azure_pendingbytesforreplication_total,"The size in bytes of the blob object pending for replication, please note, this metric is in preview and is subject to change before becoming generally available",Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_timebucket,average
+azure_pendingoperationsforreplication_average;azure_pendingoperationsforreplication_count;azure_pendingoperationsforreplication_maximum;azure_pendingoperationsforreplication_minimum;azure_pendingoperationsforreplication_total,"The count of pending operations for replication, please note, this metric is in preview and is subject to change before becoming generally available",Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_timebucket,average
diff --git a/azure/storage_storageaccounts_queueservices/dashboards/overview/main.tf b/azure/storage_storageaccounts_queueservices/dashboards/overview/main.tf
new file mode 100644
index 0000000..e5feec2
--- /dev/null
+++ b/azure/storage_storageaccounts_queueservices/dashboards/overview/main.tf
@@ -0,0 +1,187 @@
+terraform {
+  required_providers {
+    lightstep = {
+      source  = "lightstep/lightstep"
+      version = "~> 1.76.0"
+    }
+  }
+  required_version = ">= v1.0.11"
+}
+
+variable "lightstep_project" {
+  description = "Lightstep Project Name"
+  type        = string
+}
+
+output "dashboard_url" {
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
+  description = "OpenTelemetry Collector Storage Queue Services Dashboard URL"
+}
+
+resource "lightstep_dashboard" "otel_collector_dashboard" {
+  project_name   = var.lightstep_project
+  dashboard_name = "Storage Queue Services Metrics"
+  dashboard_description = "Monitor Storage Queue Services with this metrics overview dashboard."
+
+  chart {
+    name = "Availability"
+    rank = "0"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_availability_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Egress"
+    rank = "1"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_egress_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Ingress"
+    rank = "2"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_ingress_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Successful Server Latency"
+    rank = "3"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_successserverlatency_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Transactions"
+    rank = "4"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_transactions_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Queue Messages"
+    rank = "5"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_queuemessagecount_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
+    }
+  }
+
+  chart {
+    name = "Queue Capacity"
+    rank = "6"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_queuecapacity_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
+    }
+  }
+
+  chart {
+    name = "Queue Count"
+    rank = "7"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_queuecount_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           = []
+    suggestion_attribute_key = "azuremonitor.resource_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_subscription_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.subscription_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_tenant_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.tenant_id"
+  }
+
+  template_variable {
+    name                     = "location"
+    default_values           = []
+    suggestion_attribute_key = "location"
+  }
+
+  template_variable {
+    name                     = "metadata_apiname"
+    default_values           = []
+    suggestion_attribute_key = "metadata_apiname"
+  }
+
+  template_variable {
+    name                     = "metadata_authentication"
+    default_values           = []
+    suggestion_attribute_key = "metadata_authentication"
+  }
+
+  template_variable {
+    name                     = "metadata_geotype"
+    default_values           = []
+    suggestion_attribute_key = "metadata_geotype"
+  }
+}
diff --git a/azure/storage_storageaccounts_queueservices/examples/tf/Makefile b/azure/storage_storageaccounts_queueservices/examples/tf/Makefile
new file mode 100644
index 0000000..40ce742
--- /dev/null
+++ b/azure/storage_storageaccounts_queueservices/examples/tf/Makefile
@@ -0,0 +1,4 @@
+
+include ../../../Makefile.Common
+
+EXAMPLE_NAME = "azure-collector-storage"
diff --git a/azure/storage_storageaccounts_queueservices/examples/tf/collector.yaml b/azure/storage_storageaccounts_queueservices/examples/tf/collector.yaml
new file mode 100644
index 0000000..8e971fe
--- /dev/null
+++ b/azure/storage_storageaccounts_queueservices/examples/tf/collector.yaml
@@ -0,0 +1,29 @@
+receivers:
+  azuremonitor:
+    subscription_id: "${AZURE_SUBSCRIPTION_ID}"
+    tenant_id: "${AZURE_TENANT_ID}"
+    client_id: "${AZURE_CLIENT_ID}"
+    client_secret: "${AZURE_CLIENT_SECRET}"
+    resource_groups:
+      - "exstoragequeue"
+    services:
+      - "Microsoft.Storage/storageAccounts/queueServices"
+    collection_interval: 60s
+
+exporters:
+  logging:
+    loglevel: debug
+  otlp/public:
+    endpoint: ingest.lightstep.com:443
+    headers:
+        "lightstep-access-token": "${LS_ACCESS_TOKEN}"
+
+processors:
+  batch:
+
+service:
+  pipelines:
+    metrics/azuremonitor:
+      receivers: [azuremonitor]
+      processors: [batch]
+      exporters: [logging, otlp/public]
diff --git a/azure/storage_storageaccounts_queueservices/examples/tf/main.tf b/azure/storage_storageaccounts_queueservices/examples/tf/main.tf
new file mode 100644
index 0000000..18ddb32
--- /dev/null
+++ b/azure/storage_storageaccounts_queueservices/examples/tf/main.tf
@@ -0,0 +1,26 @@
+provider "azurerm" {
+  features {}
+}
+
+variable "prefix" {
+  description = "A prefix used for all resources in this example"
+  default = "exstoragequeue"
+}
+
+resource "azurerm_resource_group" "example" {
+  name     = "${var.prefix}"
+  location = "East US"
+}
+
+resource "azurerm_storage_account" "example" {
+  name                     = "${var.prefix}sa"
+  resource_group_name      = azurerm_resource_group.example.name
+  location                 = azurerm_resource_group.example.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+resource "azurerm_storage_queue" "example" {
+  name                 = "${var.prefix}queue"
+  storage_account_name = azurerm_storage_account.example.name
+}
diff --git a/azure/storage_storageaccounts_queueservices/metrics.csv b/azure/storage_storageaccounts_queueservices/metrics.csv
new file mode 100644
index 0000000..f1a216e
--- /dev/null
+++ b/azure/storage_storageaccounts_queueservices/metrics.csv
@@ -0,0 +1,10 @@
+Name,Description,Unit,DataType,Attributes,Default Aggregation
+azure_availability_average;azure_availability_count;azure_availability_maximum;azure_availability_minimum;azure_availability_total,"The percentage of availability for the storage service or the specified API operation. Availability is calculated by taking the TotalBillableRequests value and dividing it by the number of applicable requests, including those that produced unexpected errors. All unexpected errors result in reduced availability for the storage service or the specified API operation.",Percent,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,average
+azure_egress_average;azure_egress_count;azure_egress_maximum;azure_egress_minimum;azure_egress_total,"The amount of egress data. This number includes egress to external client from Azure Storage as well as egress within Azure. As a result, this number does not reflect billable egress.",Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,total
+azure_ingress_average;azure_ingress_count;azure_ingress_maximum;azure_ingress_minimum;azure_ingress_total,"The amount of ingress data, in bytes. This number includes ingress from an external client into Azure Storage as well as ingress within Azure.",Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,total
+azure_successserverlatency_average;azure_successserverlatency_count;azure_successserverlatency_maximum;azure_successserverlatency_minimum;azure_successserverlatency_total,The average time used to process a successful request by Azure Storage. This value does not include the network latency specified in SuccessE2ELatency.,MilliSeconds,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,average
+azure_transactions_average;azure_transactions_count;azure_transactions_maximum;azure_transactions_minimum;azure_transactions_total,"The number of requests made to a storage service or the specified API operation. This number includes successful and failed requests, as well as requests which produced errors. Use ResponseType dimension for the number of different type of response.",Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_responsetype;metadata_geotype;metadata_apiname;metadata_authentication;metadata_transactiontype,total
+azure_queuemessagecount_average;azure_queuemessagecount_count;azure_queuemessagecount_maximum;azure_queuemessagecount_minimum;azure_queuemessagecount_total,The number of unexpired queue messages in the storage account.,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location,average
+azure_queuecapacity_average;azure_queuecapacity_count;azure_queuecapacity_maximum;azure_queuecapacity_minimum;azure_queuecapacity_total,The amount of Queue storage used by the storage account.,Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location,average
+azure_queuecount_average;azure_queuecount_count;azure_queuecount_maximum;azure_queuecount_minimum;azure_queuecount_total,The number of queues in the storage account.,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location,average
+azure_successe2elatency_average;azure_successe2elatency_count;azure_successe2elatency_maximum;azure_successe2elatency_minimum;azure_successe2elatency_total,"The average end-to-end latency of successful requests made to a storage service or the specified API operation, in milliseconds. This value includes the required processing time within Azure Storage to read the request, send the response, and receive acknowledgment of the response.",MilliSeconds,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,average
diff --git a/azure/storage_storageaccounts_storagetasks/dashboards/overview/main.tf b/azure/storage_storageaccounts_storagetasks/dashboards/overview/main.tf
new file mode 100644
index 0000000..fb5d69d
--- /dev/null
+++ b/azure/storage_storageaccounts_storagetasks/dashboards/overview/main.tf
@@ -0,0 +1,106 @@
+terraform {
+  required_providers {
+    lightstep = {
+      source  = "lightstep/lightstep"
+      version = "~> 1.76.0"
+    }
+  }
+  required_version = ">= v1.0.11"
+}
+
+variable "lightstep_project" {
+  description = "Lightstep Project Name"
+  type        = string
+}
+
+output "dashboard_url" {
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
+  description = "OpenTelemetry Collector Storage Tasks Dashboard URL"
+}
+
+resource "lightstep_dashboard" "otel_collector_dashboard" {
+  project_name   = var.lightstep_project
+  dashboard_name = "Storage Tasks Metrics"
+  dashboard_description = "[Beta] Monitor Storage Tasks with this metrics overview dashboard."
+
+  chart {
+    name = "Objects Operated Count"
+    rank = "0"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_objectsoperatedcount_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_accountname == $metadata_accountname) && (metadata_taskassignmentid == $metadata_taskassignmentid)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Objects Operation Failed Count"
+    rank = "1"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_objectsoperationfailedcount_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_accountname == $metadata_accountname) && (metadata_taskassignmentid == $metadata_taskassignmentid)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Objects Targeted Count"
+    rank = "2"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_objectstargetedcount_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_accountname == $metadata_accountname) && (metadata_taskassignmentid == $metadata_taskassignmentid)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  template_variable {
+    name                     = "azuremonitor_resource_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.resource_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_subscription_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.subscription_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_tenant_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.tenant_id"
+  }
+
+  template_variable {
+    name                     = "location"
+    default_values           = []
+    suggestion_attribute_key = "location"
+  }
+
+  template_variable {
+    name                     = "metadata_accountname"
+    default_values           = []
+    suggestion_attribute_key = "metadata_accountname"
+  }
+
+  template_variable {
+    name                     = "metadata_taskassignmentid"
+    default_values           = []
+    suggestion_attribute_key = "metadata_taskassignmentid"
+  }
+}
diff --git a/azure/storage_storageaccounts_storagetasks/metrics.csv b/azure/storage_storageaccounts_storagetasks/metrics.csv
new file mode 100644
index 0000000..fe49b42
--- /dev/null
+++ b/azure/storage_storageaccounts_storagetasks/metrics.csv
@@ -0,0 +1,4 @@
+Name,Description,Unit,DataType,Attributes,Default Aggregation
+azure_objectsoperatedcount_average;azure_objectsoperatedcount_count;azure_objectsoperatedcount_maximum;azure_objectsoperatedcount_minimum;azure_objectsoperatedcount_total,The number of objects operated in storage task,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_accountname;metadata_taskassignmentid,total
+azure_objectsoperationfailedcount_average;azure_objectsoperationfailedcount_count;azure_objectsoperationfailedcount_maximum;azure_objectsoperationfailedcount_minimum;azure_objectsoperationfailedcount_total,The number of objects failed in storage task,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_accountname;metadata_taskassignmentid,total
+azure_objectstargetedcount_average;azure_objectstargetedcount_count;azure_objectstargetedcount_maximum;azure_objectstargetedcount_minimum;azure_objectstargetedcount_total,The number of objects targeted in storage task,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_accountname;metadata_taskassignmentid,total
diff --git a/azure/storage_storageaccounts_tableservices/dashboards/overview/main.tf b/azure/storage_storageaccounts_tableservices/dashboards/overview/main.tf
new file mode 100644
index 0000000..c51eef5
--- /dev/null
+++ b/azure/storage_storageaccounts_tableservices/dashboards/overview/main.tf
@@ -0,0 +1,187 @@
+terraform {
+  required_providers {
+    lightstep = {
+      source  = "lightstep/lightstep"
+      version = "~> 1.76.0"
+    }
+  }
+  required_version = ">= v1.0.11"
+}
+
+variable "lightstep_project" {
+  description = "Lightstep Project Name"
+  type        = string
+}
+
+output "dashboard_url" {
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.otel_collector_dashboard.id}"
+  description = "OpenTelemetry Collector Storage Table Services Dashboard URL"
+}
+
+resource "lightstep_dashboard" "otel_collector_dashboard" {
+  project_name   = var.lightstep_project
+  dashboard_name = "Storage Table Services Metrics"
+  dashboard_description = "Monitor Storage Table Services with this metrics overview dashboard."
+
+  chart {
+    name = "Availability"
+    rank = "0"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_availability_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Egress"
+    rank = "1"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_egress_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Ingress"
+    rank = "2"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_ingress_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Success Server Latency"
+    rank = "3"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_successserverlatency_average | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  chart {
+    name = "Table Capacity"
+    rank = "4"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_tablecapacity_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
+    }
+  }
+
+  chart {
+    name = "Tables"
+    rank = "5"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_tablecount_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
+    }
+  }
+
+  chart {
+    name = "Table Entities"
+    rank = "6"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_tableentitycount_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
+    }
+  }
+
+  chart {
+    name = "Transactions"
+    rank = "7"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric azure_transactions_total | filter ((azuremonitor.subscription_id == $azuremonitor_subscription_id) && (azuremonitor.tenant_id == $azuremonitor_tenant_id) && (azuremonitor.resource_id == $azuremonitor_resource_id) && (location == $location) && (metadata_geotype == $metadata_geotype) && (metadata_apiname == $metadata_apiname) && (metadata_authentication == $metadata_authentication)) | delta | group_by [], sum
+EOT
+    }
+  }
+
+  template_variable {
+    name                     = "azuremonitor_resource_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.resource_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_subscription_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.subscription_id"
+  }
+
+  template_variable {
+    name                     = "azuremonitor_tenant_id"
+    default_values           = []
+    suggestion_attribute_key = "azuremonitor.tenant_id"
+  }
+
+  template_variable {
+    name                     = "location"
+    default_values           = []
+    suggestion_attribute_key = "location"
+  }
+
+  template_variable {
+    name                     = "metadata_apiname"
+    default_values           = []
+    suggestion_attribute_key = "metadata_apiname"
+  }
+
+  template_variable {
+    name                     = "metadata_authentication"
+    default_values           = []
+    suggestion_attribute_key = "metadata_authentication"
+  }
+
+  template_variable {
+    name                     = "metadata_geotype"
+    default_values           = []
+    suggestion_attribute_key = "metadata_geotype"
+  }
+}
diff --git a/azure/storage_storageaccounts_tableservices/examples/tf/Makefile b/azure/storage_storageaccounts_tableservices/examples/tf/Makefile
new file mode 100644
index 0000000..99b611a
--- /dev/null
+++ b/azure/storage_storageaccounts_tableservices/examples/tf/Makefile
@@ -0,0 +1,4 @@
+
+include ../../../Makefile.Common
+
+EXAMPLE_NAME = "azure-collector-storage-table"
diff --git a/azure/storage_storageaccounts_tableservices/examples/tf/collector.yaml b/azure/storage_storageaccounts_tableservices/examples/tf/collector.yaml
new file mode 100644
index 0000000..7193ce3
--- /dev/null
+++ b/azure/storage_storageaccounts_tableservices/examples/tf/collector.yaml
@@ -0,0 +1,29 @@
+receivers:
+  azuremonitor:
+    subscription_id: "${AZURE_SUBSCRIPTION_ID}"
+    tenant_id: "${AZURE_TENANT_ID}"
+    client_id: "${AZURE_CLIENT_ID}"
+    client_secret: "${AZURE_CLIENT_SECRET}"
+    resource_groups:
+      - "exstoragetable"
+    services:
+      - "Microsoft.Storage/storageAccounts/tableServices"
+    collection_interval: 60s
+
+exporters:
+  logging:
+    loglevel: debug
+  otlp/public:
+    endpoint: ingest.lightstep.com:443
+    headers:
+        "lightstep-access-token": "${LS_ACCESS_TOKEN}"
+
+processors:
+  batch:
+
+service:
+  pipelines:
+    metrics/azuremonitor:
+      receivers: [azuremonitor]
+      processors: [batch]
+      exporters: [logging, otlp/public]
diff --git a/azure/storage_storageaccounts_tableservices/examples/tf/main.tf b/azure/storage_storageaccounts_tableservices/examples/tf/main.tf
new file mode 100644
index 0000000..031418f
--- /dev/null
+++ b/azure/storage_storageaccounts_tableservices/examples/tf/main.tf
@@ -0,0 +1,26 @@
+provider "azurerm" {
+  features {}
+}
+
+variable "prefix" {
+  description = "A prefix used for all resources in this example"
+  default = "exstoragetable"
+}
+
+resource "azurerm_resource_group" "example" {
+  name     = "${var.prefix}"
+  location = "East US"
+}
+
+resource "azurerm_storage_account" "example" {
+  name                     = "${var.prefix}sa"
+  resource_group_name      = azurerm_resource_group.example.name
+  location                 = azurerm_resource_group.example.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+resource "azurerm_storage_table" "example" {
+  name                 = "${var.prefix}table"
+  storage_account_name = azurerm_storage_account.example.name
+}
diff --git a/azure/storage_storageaccounts_tableservices/metrics.csv b/azure/storage_storageaccounts_tableservices/metrics.csv
new file mode 100644
index 0000000..bcded6a
--- /dev/null
+++ b/azure/storage_storageaccounts_tableservices/metrics.csv
@@ -0,0 +1,10 @@
+Name,Description,Unit,DataType,Attributes,Default Aggregation
+azure_availability_average;azure_availability_count;azure_availability_maximum;azure_availability_minimum;azure_availability_total,"The percentage of availability for the storage service or the specified API operation. Availability is calculated by taking the TotalBillableRequests value and dividing it by the number of applicable requests, including those that produced unexpected errors. All unexpected errors result in reduced availability for the storage service or the specified API operation.",Percent,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,average
+azure_egress_average;azure_egress_count;azure_egress_maximum;azure_egress_minimum;azure_egress_total,"The amount of egress data. This number includes egress to external client from Azure Storage as well as egress within Azure. As a result, this number does not reflect billable egress.",Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,total
+azure_ingress_average;azure_ingress_count;azure_ingress_maximum;azure_ingress_minimum;azure_ingress_total,"The amount of ingress data, in bytes. This number includes ingress from an external client into Azure Storage as well as ingress within Azure.",Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,total
+azure_successserverlatency_average;azure_successserverlatency_count;azure_successserverlatency_maximum;azure_successserverlatency_minimum;azure_successserverlatency_total,The average time used to process a successful request by Azure Storage. This value does not include the network latency specified in SuccessE2ELatency.,MilliSeconds,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,average
+azure_tablecapacity_average;azure_tablecapacity_count;azure_tablecapacity_maximum;azure_tablecapacity_minimum;azure_tablecapacity_total,The amount of Table storage used by the storage account.,Bytes,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location,average
+azure_tablecount_average;azure_tablecount_count;azure_tablecount_maximum;azure_tablecount_minimum;azure_tablecount_total,The number of tables in the storage account.,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location,average
+azure_tableentitycount_average;azure_tableentitycount_count;azure_tableentitycount_maximum;azure_tableentitycount_minimum;azure_tableentitycount_total,The number of table entities in the storage account.,Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location,average
+azure_transactions_average;azure_transactions_count;azure_transactions_maximum;azure_transactions_minimum;azure_transactions_total,"The number of requests made to a storage service or the specified API operation. This number includes successful and failed requests, as well as requests which produced errors. Use ResponseType dimension for the number of different type of response.",Count,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_responsetype;metadata_geotype;metadata_apiname;metadata_authentication;metadata_transactiontype,total
+azure_successe2elatency_average;azure_successe2elatency_count;azure_successe2elatency_maximum;azure_successe2elatency_minimum;azure_successe2elatency_total,"The average end-to-end latency of successful requests made to a storage service or the specified API operation, in milliseconds. This value includes the required processing time within Azure Storage to read the request, send the response, and receive acknowledgment of the response.",MilliSeconds,Gauge,azuremonitor.subscription_id;azuremonitor.tenant_id;azuremonitor.resource_id;location;metadata_geotype;metadata_apiname;metadata_authentication,average