diff --git a/import_metric_metadata.sh b/import_metric_metadata.sh
old mode 100644
new mode 100755
diff --git a/metric-metadata/activedirectorydsreceiver.yaml b/metric-metadata/activedirectorydsreceiver.yaml
index 169e7f2..92b9d3e 100644
--- a/metric-metadata/activedirectorydsreceiver.yaml
+++ b/metric-metadata/activedirectorydsreceiver.yaml
@@ -1,4 +1,10 @@
-name: activedirectorydsreceiver
+type: active_directory_ds
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 attributes:
   direction:
diff --git a/metric-metadata/aerospikereceiver.yaml b/metric-metadata/aerospikereceiver.yaml
index 070a926..6624461 100644
--- a/metric-metadata/aerospikereceiver.yaml
+++ b/metric-metadata/aerospikereceiver.yaml
@@ -1,4 +1,10 @@
-name: aerospikereceiver
+type: aerospike
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
   aerospike.node.name:
@@ -132,9 +138,10 @@ metrics:
       monotonic: false
       aggregation: cumulative
   aerospike.node.query.tracked:
-    enabled: true 
+    enabled: true
     description: Number of queries tracked by the system.
     extended_documentation: Number of queries which ran more than query untracked_time (default 1 sec), Aerospike metric query_tracked
+    unit: '{queries}'
     sum:
       value_type: int
       input_type: string
diff --git a/metric-metadata/aks.yaml b/metric-metadata/aks.yaml
new file mode 100644
index 0000000..c006586
--- /dev/null
+++ b/metric-metadata/aks.yaml
@@ -0,0 +1,13 @@
+type: resourcedetectionprocessor/aks
+
+parent: resourcedetection
+
+resource_attributes:
+  cloud.provider:
+    description: The cloud.provider
+    type: string
+    enabled: true
+  cloud.platform:
+    description: The cloud.platform
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/alibabacloudlogserviceexporter.yaml b/metric-metadata/alibabacloudlogserviceexporter.yaml
new file mode 100644
index 0000000..68fa1f6
--- /dev/null
+++ b/metric-metadata/alibabacloudlogserviceexporter.yaml
@@ -0,0 +1,7 @@
+type: alibabacloud_logservice
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/apachereceiver.yaml b/metric-metadata/apachereceiver.yaml
index 10ab12c..41ac9c1 100644
--- a/metric-metadata/apachereceiver.yaml
+++ b/metric-metadata/apachereceiver.yaml
@@ -1,4 +1,10 @@
-name: apachereceiver
+type: apache
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
     apache.server.name:
diff --git a/metric-metadata/apachesparkreceiver.yaml b/metric-metadata/apachesparkreceiver.yaml
new file mode 100644
index 0000000..2409917
--- /dev/null
+++ b/metric-metadata/apachesparkreceiver.yaml
@@ -0,0 +1,688 @@
+type: apachespark
+
+status:
+  class: receiver
+  stability: 
+    development: [metrics]
+  distributions: [contrib]
+
+resource_attributes:
+  spark.application.id:
+    description: The ID of the application for which the metric was recorded.
+    type: string
+    enabled: true
+  spark.application.name:
+    description: The name of the application for which the metric was recorded.
+    type: string
+    enabled: true
+  spark.stage.id:
+    description: The ID of the application stage for which the metric was recorded.
+    type: int
+    enabled: true
+  spark.stage.attempt.id:
+    description: The ID of the stage attempt for which the metric was recorded.
+    type: int
+  spark.executor.id:
+    description: The ID of the executor for which the metric was recorded.
+    type: string
+    enabled: true
+  spark.job.id:
+    description: The ID of the job for which the metric was recorded.
+    type: int
+    enabled: true
+
+attributes:
+  stage_active:
+    name_override: active
+    description: Whether the stage for which the metric was recorded is active.
+    type: bool
+  stage_complete:
+    name_override: complete
+    description: Whether the stage for which the metric was recorded is complete.
+    type: bool
+  stage_pending:
+    name_override: pending
+    description: Whether the stage for which the metric was recorded is pending.
+    type: bool
+  stage_failed:
+    name_override: failed
+    description: Whether the stage for which the metric was recorded is failed.
+    type: bool
+  stage_task_result:
+    name_override: result
+    description: The result of the stage tasks for which the metric was recorded.
+    type: string
+    enum:
+      - completed
+      - failed
+      - killed
+  executor_task_result:
+    name_override: result
+    description: The result of the executor tasks for which the metric was recorded.
+    type: string
+    enum:
+      - completed
+      - failed
+  job_result:
+    name_override: result
+    description: The result of the job stages or tasks for which the metric was recorded.
+    type: string
+    enum:
+      - completed
+      - failed
+      - skipped
+  direction:
+    description: Whether the metric is in regards to input or output operations.
+    type: string
+    enum:
+      - in
+      - out
+  source:
+    description: The source from which data was fetched for the metric.
+    type: string
+    enum:
+      - local
+      - remote
+  location:
+    description: The location of the memory for which the metric was recorded..
+    type: string
+    enum:
+      - on_heap
+      - off_heap
+  state:
+    description: The state of the memory for which the metric was recorded.
+    type: string
+    enum:
+      - used
+      - free
+  scheduler_status:
+    name_override: status
+    description: The status of the DAGScheduler stages for which the metric was recorded.
+    type: string
+    enum:
+      - waiting
+      - running
+  pool_memory_type:
+    name_override: type
+    description: The type of pool memory for which the metric was recorded.
+    type: string
+    enum:
+      - direct
+      - mapped
+  gc_type:
+    description: The type of the garbage collection performed for the metric.
+    type: string
+    enum:
+      - major
+      - minor
+
+metrics:
+  #stage
+  spark.stage.status:
+    description: A one-hot encoding representing the status of this stage.
+    enabled: true
+    sum:
+      monotonic: false
+      aggregation: cumulative
+      value_type: int
+    unit: "{ status }"
+    attributes:
+      [stage_active, stage_complete, stage_pending, stage_failed]
+  spark.stage.task.active:
+    description: Number of active tasks in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: "{ task }"
+    attributes: []
+  spark.stage.task.result:
+    description: Number of tasks with a specific result in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ task }"
+    attributes:
+      [stage_task_result]
+  spark.stage.executor.run_time:
+    description: Amount of time spent by the executor in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: ms
+    attributes: []
+  spark.stage.executor.cpu_time:
+    description: CPU time spent by the executor in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: ns
+    attributes: []
+  spark.stage.task.result_size:
+    description: The amount of data transmitted back to the driver by all the tasks in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: bytes
+    attributes: []
+  spark.stage.jvm_gc_time:
+    description: The amount of time the JVM spent on garbage collection in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: ms
+    attributes: []
+  spark.stage.memory.spilled:
+    description: The amount of memory moved to disk due to size constraints (spilled) in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: bytes
+    attributes: []
+  spark.stage.disk.spilled:
+    description: The amount of disk space used for storing portions of overly large data chunks that couldn't fit in memory in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: bytes
+    attributes: []
+  spark.stage.memory.peak:
+    description: Peak memory used by internal data structures created during shuffles, aggregations and joins in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: bytes
+    attributes: []
+  spark.stage.io.size:
+    description: Amount of data written and read at this stage.
+    enabled: true
+    sum: 
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: bytes
+    attributes:
+      [direction]
+  spark.stage.io.records:
+    description: Number of records written and read in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ record }"
+    attributes:
+      [direction]
+  spark.stage.shuffle.blocks_fetched:
+    description: Number of blocks fetched in shuffle operations in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ block }"
+    attributes:
+      [source]
+  spark.stage.shuffle.fetch_wait_time:
+    description: Time spent in this stage waiting for remote shuffle blocks.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: ms
+    attributes: []
+  spark.stage.shuffle.io.disk:
+    description: Amount of data read to disk in shuffle operations (sometimes required for large blocks, as opposed to the default behavior of reading into memory).
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: bytes
+    attributes: []
+  spark.stage.shuffle.io.read.size:
+    description: Amount of data read in shuffle operations in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: bytes
+    attributes:
+      [source]
+  spark.stage.shuffle.io.write.size:
+    description: Amount of data written in shuffle operations in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: bytes
+    attributes:
+      []
+  spark.stage.shuffle.io.records:
+    description: Number of records written or read in shuffle operations in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ record }"
+    attributes:
+      [direction]
+  spark.stage.shuffle.write_time:
+    description: Time spent blocking on writes to disk or buffer cache in this stage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: ns
+    attributes: []
+  #executor
+  spark.executor.memory.usage:
+    description: Storage memory used by this executor.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: bytes
+    attributes: []
+  spark.executor.disk.usage:
+    description: Disk space used by this executor for RDD storage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: bytes
+    attributes: []
+  spark.executor.task.limit:
+    description: Maximum number of tasks that can run concurrently in this executor.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: "{ task }"
+    attributes: []
+  spark.executor.task.active:
+    description: Number of tasks currently running in this executor.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: "{ task }"
+    attributes: []
+  spark.executor.task.result:
+    description: Number of tasks with a specific result in this executor.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ task }"
+    attributes: [executor_task_result]
+  spark.executor.time:
+    description: Elapsed time the JVM spent executing tasks in this executor.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: ms
+    attributes: []
+  spark.executor.gc_time:
+    description: Elapsed time the JVM spent in garbage collection in this executor.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: ms
+    attributes: []
+  spark.executor.input_size:
+    description: Amount of data input for this executor.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: bytes
+    attributes: []
+  spark.executor.shuffle.io.size:
+    description: Amount of data written and read during shuffle operations for this executor.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: bytes
+    attributes: [direction]
+  spark.executor.storage_memory.usage:
+    description: The executor's storage memory usage.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: bytes
+    attributes: [location, state]
+  #job
+  spark.job.task.active:
+    description: Number of active tasks in this job.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: "{ task }"
+    attributes: []
+  spark.job.task.result:
+    description: Number of tasks with a specific result in this job.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ task }"
+    attributes: [job_result]
+  spark.job.stage.active:
+    description: Number of active stages in this job.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: "{ task }"
+    attributes: []
+  spark.job.stage.result:
+    description: Number of stages with a specific result in this job.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ task }"
+    attributes: [job_result]
+  # metrics
+  spark.driver.block_manager.disk.usage:
+    description: Disk space used by the BlockManager.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: mb
+    attributes: []
+  spark.driver.block_manager.memory.usage:
+    description: Memory usage for the driver's BlockManager.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: mb
+    attributes: [location, state]
+  spark.driver.hive_external_catalog.file_cache_hits:
+    description: Number of file cache hits on the HiveExternalCatalog.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ hit }"
+    attributes: []
+  spark.driver.hive_external_catalog.files_discovered:
+    description: Number of files discovered while listing the partitions of a table in the Hive metastore
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ file }"
+    attributes: []
+  spark.driver.hive_external_catalog.hive_client_calls:
+    description: Number of calls to the underlying Hive Metastore client made by the Spark application.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ call }"
+    attributes: []
+  spark.driver.hive_external_catalog.parallel_listing_jobs:
+    description: Number of parallel listing jobs initiated by the HiveExternalCatalog when listing partitions of a table.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ listing_job }"
+    attributes: []
+  spark.driver.hive_external_catalog.partitions_fetched:
+    description: Table partitions fetched by the HiveExternalCatalog.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ partition }"
+    attributes: []
+  spark.driver.code_generator.compilation.count:
+    description: Number of source code compilation operations performed by the CodeGenerator.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ compilation }"
+    attributes: []
+  spark.driver.code_generator.compilation.average_time:
+    description: Average time spent during CodeGenerator source code compilation operations.
+    enabled: true
+    gauge:
+      value_type: double
+    unit: ms
+    attributes: []
+  spark.driver.code_generator.generated_class.count:
+    description: Number of classes generated by the CodeGenerator.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ class }"
+    attributes: []
+  spark.driver.code_generator.generated_class.average_size:
+    description: Average class size of the classes generated by the CodeGenerator.
+    enabled: true
+    gauge:
+      value_type: double
+    unit: bytes
+    attributes: []
+  spark.driver.code_generator.generated_method.count:
+    description: Number of methods generated by the CodeGenerator.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ method }"
+    attributes: []
+  spark.driver.code_generator.generated_method.average_size:
+    description: Average method size of the classes generated by the CodeGenerator.
+    enabled: true
+    gauge:
+      value_type: double
+    unit: bytes
+    attributes: []
+  spark.driver.code_generator.source_code.operations:
+    description: Number of source code generation operations performed by the CodeGenerator.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ operation }"
+    attributes: []
+  spark.driver.code_generator.source_code.average_size:
+    description: Average size of the source code generated by a CodeGenerator code generation operation.
+    enabled: true
+    gauge:
+      value_type: double
+    unit: bytes
+    attributes: []
+  spark.driver.dag_scheduler.job.active:
+    description: Number of active jobs currently being processed by the DAGScheduler.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: "{ job }"
+    attributes: []
+  spark.driver.dag_scheduler.job.count:
+    description: Number of jobs that have been submitted to the DAGScheduler.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ job }"
+    attributes: []
+  spark.driver.dag_scheduler.stage.failed:
+    description: Number of failed stages run by the DAGScheduler.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ stage }"
+    attributes: []
+  spark.driver.dag_scheduler.stage.count:
+    description: Number of stages the DAGScheduler is either running or needs to run.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: "{ stage }"
+    attributes: [scheduler_status]
+  spark.driver.live_listener_bus.posted:
+    description: Number of events that have been posted on the LiveListenerBus.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ event }"
+    attributes: []
+  spark.driver.live_listener_bus.processing_time.average:
+    description: Average time taken for the LiveListenerBus to process an event posted to it.
+    enabled: true
+    gauge:
+      value_type: double
+    unit: ms
+    attributes: []
+  spark.driver.live_listener_bus.dropped:
+    description: Number of events that have been dropped by the LiveListenerBus.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ event }"
+    attributes: []
+  spark.driver.live_listener_bus.queue_size:
+    description: Number of events currently waiting to be processed by the LiveListenerBus.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: "{ event }"
+    attributes: []
+  spark.driver.jvm_cpu_time:
+    description: Current CPU time taken by the Spark driver.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: ns
+    attributes: []
+  spark.driver.executor.memory.jvm:
+    description: Amount of memory used by the driver's JVM.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: bytes
+    attributes: [location]
+  spark.driver.executor.memory.execution:
+    description: Amount of execution memory currently used by the driver.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: bytes
+    attributes: [location]
+  spark.driver.executor.memory.storage:
+    description: Amount of storage memory currently used by the driver.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: bytes
+    attributes: [location]
+  spark.driver.executor.memory.pool:
+    description: Amount of pool memory currently used by the driver.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: false
+      value_type: int
+    unit: bytes
+    attributes: [pool_memory_type]
+  spark.driver.executor.gc.operations:
+    description: Number of garbage collection operations performed by the driver.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: "{ gc_operation }"
+    attributes: [gc_type]
+  spark.driver.executor.gc.time:
+    description: Total elapsed time during garbage collection operations performed by the driver.
+    enabled: true
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+    unit: ms
+    attributes: [gc_type]
diff --git a/metric-metadata/asapauthextension.yaml b/metric-metadata/asapauthextension.yaml
new file mode 100644
index 0000000..70f37b5
--- /dev/null
+++ b/metric-metadata/asapauthextension.yaml
@@ -0,0 +1,7 @@
+type: asapclient
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, sumo]
diff --git a/metric-metadata/attributesprocessor.yaml b/metric-metadata/attributesprocessor.yaml
new file mode 100644
index 0000000..808c939
--- /dev/null
+++ b/metric-metadata/attributesprocessor.yaml
@@ -0,0 +1,8 @@
+type: attributes
+
+status:
+  class: processor
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [core, contrib, splunk, observiq, sumo, aws, redhat]
+  warnings: [Identity Conflict]
diff --git a/metric-metadata/awscloudwatchlogsexporter.yaml b/metric-metadata/awscloudwatchlogsexporter.yaml
new file mode 100644
index 0000000..c5d58fd
--- /dev/null
+++ b/metric-metadata/awscloudwatchlogsexporter.yaml
@@ -0,0 +1,7 @@
+type: awscloudwatchlogs
+
+status:
+  class: exporter
+  stability:
+    beta: [logs]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/awscloudwatchmetricsreceiver.yaml b/metric-metadata/awscloudwatchmetricsreceiver.yaml
new file mode 100644
index 0000000..f2c2b83
--- /dev/null
+++ b/metric-metadata/awscloudwatchmetricsreceiver.yaml
@@ -0,0 +1,7 @@
+type: awscloudwatchmetrics
+
+status:
+  class: receiver
+  stability:
+    development: [metrics]
+  distributions: [contrib]
diff --git a/metric-metadata/awscloudwatchreceiver.yaml b/metric-metadata/awscloudwatchreceiver.yaml
new file mode 100644
index 0000000..86f281a
--- /dev/null
+++ b/metric-metadata/awscloudwatchreceiver.yaml
@@ -0,0 +1,8 @@
+type: awscloudwatch
+
+status:
+  class: receiver
+  stability:
+    alpha: [logs]
+  distributions: [contrib, observiq, sumo]
+
diff --git a/metric-metadata/awscontainerinsightreceiver.yaml b/metric-metadata/awscontainerinsightreceiver.yaml
new file mode 100644
index 0000000..7298a70
--- /dev/null
+++ b/metric-metadata/awscontainerinsightreceiver.yaml
@@ -0,0 +1,8 @@
+type: awscontainerinsightreceiver
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, aws, observiq, sumo]
+  warnings: [Other]
diff --git a/metric-metadata/awsecscontainermetricsreceiver.yaml b/metric-metadata/awsecscontainermetricsreceiver.yaml
new file mode 100644
index 0000000..a503a72
--- /dev/null
+++ b/metric-metadata/awsecscontainermetricsreceiver.yaml
@@ -0,0 +1,8 @@
+type: awsecscontainermetrics
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, aws, observiq, sumo]
+
diff --git a/metric-metadata/awsemfexporter.yaml b/metric-metadata/awsemfexporter.yaml
new file mode 100644
index 0000000..625461c
--- /dev/null
+++ b/metric-metadata/awsemfexporter.yaml
@@ -0,0 +1,7 @@
+type: awsemf
+
+status:
+  class: exporter
+  stability:
+    beta: [metrics]
+  distributions: [contrib, aws, observiq]
diff --git a/metric-metadata/awsfirehosereceiver.yaml b/metric-metadata/awsfirehosereceiver.yaml
new file mode 100644
index 0000000..7539733
--- /dev/null
+++ b/metric-metadata/awsfirehosereceiver.yaml
@@ -0,0 +1,8 @@
+type: awsfirehose
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, observiq, sumo]
+
diff --git a/metric-metadata/awskinesisexporter.yaml b/metric-metadata/awskinesisexporter.yaml
new file mode 100644
index 0000000..3d974ef
--- /dev/null
+++ b/metric-metadata/awskinesisexporter.yaml
@@ -0,0 +1,7 @@
+type: awskinesis
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/awsproxy.yaml b/metric-metadata/awsproxy.yaml
new file mode 100644
index 0000000..a2a0ddb
--- /dev/null
+++ b/metric-metadata/awsproxy.yaml
@@ -0,0 +1,7 @@
+type: awsproxy
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, aws, sumo]
diff --git a/metric-metadata/awss3exporter.yaml b/metric-metadata/awss3exporter.yaml
new file mode 100644
index 0000000..8616063
--- /dev/null
+++ b/metric-metadata/awss3exporter.yaml
@@ -0,0 +1,7 @@
+type: awss3
+
+status:
+  class: exporter
+  stability:
+    alpha: [traces, metrics, logs]
+  distributions: [contrib, observiq, sumo]
diff --git a/metric-metadata/awsxrayexporter.yaml b/metric-metadata/awsxrayexporter.yaml
new file mode 100644
index 0000000..ac771c4
--- /dev/null
+++ b/metric-metadata/awsxrayexporter.yaml
@@ -0,0 +1,7 @@
+type: awsxray
+
+status:
+  class: exporter
+  stability:
+    beta: [traces]
+  distributions: [contrib, aws, observiq]
diff --git a/metric-metadata/awsxrayreceiver.yaml b/metric-metadata/awsxrayreceiver.yaml
new file mode 100644
index 0000000..bb56594
--- /dev/null
+++ b/metric-metadata/awsxrayreceiver.yaml
@@ -0,0 +1,7 @@
+type: awsxray
+
+status:
+  class: receiver
+  stability:
+    beta: [traces]
+  distributions: [contrib, aws, observiq, sumo]
diff --git a/metric-metadata/azure.yaml b/metric-metadata/azure.yaml
new file mode 100644
index 0000000..f49e03d
--- /dev/null
+++ b/metric-metadata/azure.yaml
@@ -0,0 +1,45 @@
+type: resourcedetectionprocessor/azure
+
+parent: resourcedetection
+
+resource_attributes:
+  cloud.provider:
+    description: The cloud.provider
+    type: string
+    enabled: true
+  cloud.platform:
+    description: The cloud.platform
+    type: string
+    enabled: true
+  cloud.region:
+    description: The cloud.region
+    type: string
+    enabled: true
+  cloud.account.id:
+    description: The cloud.account.id
+    type: string
+    enabled: true
+  host.name:
+    description: The hostname
+    type: string
+    enabled: true
+  host.id:
+    description: The host.id
+    type: string
+    enabled: true
+  azure.resourcegroup.name:
+    description: The azure.resourcegroup.name
+    enabled: true
+    type: string
+  azure.vm.name:
+    description: The azure.vm.name
+    enabled: true
+    type: string
+  azure.vm.scaleset.name:
+    description: The azure.vm.scaleset.name
+    enabled: true
+    type: string
+  azure.vm.size:
+    description: The azure.vm.size
+    enabled: true
+    type: string
\ No newline at end of file
diff --git a/metric-metadata/azureblobreceiver.yaml b/metric-metadata/azureblobreceiver.yaml
new file mode 100644
index 0000000..9302c4f
--- /dev/null
+++ b/metric-metadata/azureblobreceiver.yaml
@@ -0,0 +1,8 @@
+type: azureblob
+
+status:
+  class: receiver
+  stability:
+    development: [logs, traces]
+  distributions: [contrib]
+  
diff --git a/metric-metadata/azuredataexplorerexporter.yaml b/metric-metadata/azuredataexplorerexporter.yaml
new file mode 100644
index 0000000..27ec9ec
--- /dev/null
+++ b/metric-metadata/azuredataexplorerexporter.yaml
@@ -0,0 +1,7 @@
+type: azuredataexplorer
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib]
\ No newline at end of file
diff --git a/metric-metadata/azureeventhubreceiver.yaml b/metric-metadata/azureeventhubreceiver.yaml
new file mode 100644
index 0000000..0c725e5
--- /dev/null
+++ b/metric-metadata/azureeventhubreceiver.yaml
@@ -0,0 +1,7 @@
+type: azureeventhub
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics, logs]
+  distributions: [contrib, splunk, observiq, sumo]
diff --git a/metric-metadata/azuremonitorexporter.yaml b/metric-metadata/azuremonitorexporter.yaml
new file mode 100644
index 0000000..9373988
--- /dev/null
+++ b/metric-metadata/azuremonitorexporter.yaml
@@ -0,0 +1,7 @@
+type: azuremonitor
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, observiq]
\ No newline at end of file
diff --git a/metric-metadata/azuremonitorreceiver.yaml b/metric-metadata/azuremonitorreceiver.yaml
new file mode 100644
index 0000000..8f6d2f5
--- /dev/null
+++ b/metric-metadata/azuremonitorreceiver.yaml
@@ -0,0 +1,15 @@
+type: azuremonitor
+
+status:
+  class: receiver
+  stability:
+    development: [metrics]
+  distributions: [contrib]
+
+resource_attributes:
+  azuremonitor.tenant_id:
+    description: Azure tenant ID
+    type: string
+  azuremonitor.subscription_id:
+    description: Azure subscription ID
+    type: string
diff --git a/metric-metadata/basicauthextension.yaml b/metric-metadata/basicauthextension.yaml
new file mode 100644
index 0000000..3d264b1
--- /dev/null
+++ b/metric-metadata/basicauthextension.yaml
@@ -0,0 +1,7 @@
+type: basicauth
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, observiq, sumo, redhat]
diff --git a/metric-metadata/bearertokenauthextension.yaml b/metric-metadata/bearertokenauthextension.yaml
new file mode 100644
index 0000000..55798ae
--- /dev/null
+++ b/metric-metadata/bearertokenauthextension.yaml
@@ -0,0 +1,7 @@
+type: bearertokenauth
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, observiq, sumo, redhat]
diff --git a/metric-metadata/bigipreceiver.yaml b/metric-metadata/bigipreceiver.yaml
index 3fac119..b6973e2 100644
--- a/metric-metadata/bigipreceiver.yaml
+++ b/metric-metadata/bigipreceiver.yaml
@@ -1,4 +1,10 @@
-name: bigipreceiver
+type: bigip
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
   bigip.virtual_server.name:
diff --git a/metric-metadata/carbonexporter.yaml b/metric-metadata/carbonexporter.yaml
new file mode 100644
index 0000000..a430e70
--- /dev/null
+++ b/metric-metadata/carbonexporter.yaml
@@ -0,0 +1,7 @@
+type: carbon
+
+status:
+  class: exporter
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
diff --git a/metric-metadata/carbonreceiver.yaml b/metric-metadata/carbonreceiver.yaml
new file mode 100644
index 0000000..f199e92
--- /dev/null
+++ b/metric-metadata/carbonreceiver.yaml
@@ -0,0 +1,8 @@
+type: carbon
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/cassandraexporter.yaml b/metric-metadata/cassandraexporter.yaml
new file mode 100644
index 0000000..437118f
--- /dev/null
+++ b/metric-metadata/cassandraexporter.yaml
@@ -0,0 +1,8 @@
+type: cassandra
+
+status:
+  class: exporter
+  stability:
+    alpha: [traces, logs]
+  distributions: [contrib]
+
diff --git a/metric-metadata/chronyreceiver.yaml b/metric-metadata/chronyreceiver.yaml
index 11c1094..4763ba1 100644
--- a/metric-metadata/chronyreceiver.yaml
+++ b/metric-metadata/chronyreceiver.yaml
@@ -1,5 +1,11 @@
 ---
-name: chrony receiver
+type: chrony
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib]
 
 attributes:
   leap.status:
diff --git a/metric-metadata/clickhouseexporter.yaml b/metric-metadata/clickhouseexporter.yaml
new file mode 100644
index 0000000..82f23fa
--- /dev/null
+++ b/metric-metadata/clickhouseexporter.yaml
@@ -0,0 +1,7 @@
+type: clickhouse
+
+status:
+  class: exporter
+  stability:
+    alpha: [traces, metrics, logs]
+  distributions: [contrib]
diff --git a/metric-metadata/cloudflarereceiver.yaml b/metric-metadata/cloudflarereceiver.yaml
new file mode 100644
index 0000000..4aab0f4
--- /dev/null
+++ b/metric-metadata/cloudflarereceiver.yaml
@@ -0,0 +1,8 @@
+type: cloudflare
+
+status:
+  class: receiver
+  stability:
+    alpha: [logs]
+  distributions: [contrib, observiq, sumo]
+
diff --git a/metric-metadata/cloudfoundryreceiver.yaml b/metric-metadata/cloudfoundryreceiver.yaml
new file mode 100644
index 0000000..89d8345
--- /dev/null
+++ b/metric-metadata/cloudfoundryreceiver.yaml
@@ -0,0 +1,8 @@
+type: cloudfoundry
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/collectdreceiver.yaml b/metric-metadata/collectdreceiver.yaml
new file mode 100644
index 0000000..09249d9
--- /dev/null
+++ b/metric-metadata/collectdreceiver.yaml
@@ -0,0 +1,8 @@
+type: collectd
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/consul.yaml b/metric-metadata/consul.yaml
new file mode 100644
index 0000000..337b0dc
--- /dev/null
+++ b/metric-metadata/consul.yaml
@@ -0,0 +1,45 @@
+type: resourcedetectionprocessor/consul
+
+parent: resourcedetection
+
+resource_attributes:
+  cloud.provider:
+    description: The cloud.provider
+    type: string
+    enabled: true
+  cloud.platform:
+    description: The cloud.platform
+    type: string
+    enabled: true
+  cloud.region:
+    description: The cloud.region
+    type: string
+    enabled: true
+  cloud.account.id:
+    description: The cloud.account.id
+    type: string
+    enabled: true
+  host.name:
+    description: The hostname
+    type: string
+    enabled: true
+  host.id:
+    description: The host.id
+    type: string
+    enabled: true
+  azure.resourcegroup.name:
+    description: The azure.resourcegroup.name
+    enabled: true
+    type: string
+  azure.vm.name:
+    description: The azure.vm.name
+    enabled: true
+    type: string
+  azure.vm.scaleset.name:
+    description: The azure.vm.scaleset.name
+    enabled: true
+    type: string
+  azure.vm.size:
+    description: The azure.vm.size
+    enabled: true
+    type: string
\ No newline at end of file
diff --git a/metric-metadata/container.yaml b/metric-metadata/container.yaml
new file mode 100644
index 0000000..c50b4b8
--- /dev/null
+++ b/metric-metadata/container.yaml
@@ -0,0 +1,113 @@
+type: k8s/container
+
+sem_conv_version: 1.18.0
+
+parent: k8s_cluster
+
+resource_attributes:
+  container.id:
+    description: The container id.
+    type: string
+    enabled: true
+
+  container.image.name:
+    description: The container image name
+    type: string
+    enabled: true
+
+  container.image.tag:
+    description: The container image tag
+    type: string
+    enabled: true
+
+  k8s.container.name:
+    description: The k8s container name
+    type: string
+    enabled: true
+
+  k8s.namespace.name:
+    description: The k8s namespace name
+    type: string
+    enabled: true
+
+  k8s.node.name:
+    description: The k8s node name
+    type: string
+    enabled: true
+
+  k8s.pod.name:
+    description: The k8s pod name
+    type: string
+    enabled: true
+
+  k8s.pod.uid:
+    description: The k8s pod uid
+    type: string
+    enabled: true
+
+  opencensus.resourcetype:
+    description: The OpenCensus resource type.
+    type: string
+    enabled: true
+
+metrics:
+  k8s.container.cpu_request:
+    enabled: true
+    description: Resource requested for the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core for details
+    unit: "{cpu}"
+    gauge:
+      value_type: double
+  k8s.container.cpu_limit:
+    enabled: true
+    description: Maximum resource limit set for the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core for details
+    unit: "{cpu}"
+    gauge:
+      value_type: double
+  k8s.container.memory_request:
+    enabled: true
+    description: Resource requested for the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core for details
+    unit: "By"
+    gauge:
+      value_type: int
+  k8s.container.memory_limit:
+    enabled: true
+    description: Maximum resource limit set for the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core for details
+    unit: "By"
+    gauge:
+      value_type: int
+  k8s.container.storage_request:
+    enabled: true
+    description: Resource requested for the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core for details
+    unit: "By"
+    gauge:
+      value_type: int
+  k8s.container.storage_limit:
+    enabled: true
+    description: Maximum resource limit set for the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core for details
+    unit: "By"
+    gauge:
+      value_type: int
+  k8s.container.ephemeralstorage_request:
+    enabled: true
+    description: Resource requested for the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core for details
+    unit: "By"
+    gauge:
+      value_type: int
+  k8s.container.ephemeralstorage_limit:
+    enabled: true
+    description: Maximum resource limit set for the container. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core for details
+    unit: "By"
+    gauge:
+      value_type: int
+  k8s.container.restarts:
+    enabled: true
+    description: How many times the container has restarted in the recent past. This value is pulled directly from the K8s API and the value can go indefinitely high and be reset to 0 at any time depending on how your kubelet is configured to prune dead containers. It is best to not depend too much on the exact value but rather look at it as either == 0, in which case you can conclude there were no restarts in the recent past, or > 0, in which case you can conclude there were restarts in the recent past, and not try and analyze the value beyond that.
+    unit: 1
+    gauge:
+      value_type: int
+  k8s.container.ready:
+    enabled: true
+    description: Whether a container has passed its readiness probe (0 for no, 1 for yes)
+    unit: 1
+    gauge:
+      value_type: int
\ No newline at end of file
diff --git a/metric-metadata/coralogixexporter.yaml b/metric-metadata/coralogixexporter.yaml
new file mode 100644
index 0000000..de5451e
--- /dev/null
+++ b/metric-metadata/coralogixexporter.yaml
@@ -0,0 +1,8 @@
+type: coralogix
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics]
+    alpha: [logs]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/couchdbreceiver.yaml b/metric-metadata/couchdbreceiver.yaml
index 8e8117c..fba4ecb 100644
--- a/metric-metadata/couchdbreceiver.yaml
+++ b/metric-metadata/couchdbreceiver.yaml
@@ -1,4 +1,10 @@
-name: couchdbreceiver
+type: couchdb
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib,observiq, sumo]
 
 resource_attributes:
   couchdb.node.name:
diff --git a/metric-metadata/countconnector.yaml b/metric-metadata/countconnector.yaml
new file mode 100644
index 0000000..48358f5
--- /dev/null
+++ b/metric-metadata/countconnector.yaml
@@ -0,0 +1,7 @@
+type: count
+
+status:
+  class: connector
+  stability:
+    development: [traces_to_metrics, metrics_to_metrics, logs_to_metrics]
+  distributions: [contrib, sumo]
diff --git a/metric-metadata/cpuscraper.yaml b/metric-metadata/cpuscraper.yaml
index db9f039..675cb7e 100644
--- a/metric-metadata/cpuscraper.yaml
+++ b/metric-metadata/cpuscraper.yaml
@@ -1,4 +1,6 @@
-name: hostmetricsreceiver/cpu
+type: hostmetricsreceiver/cpu
+
+parent: hostmetrics
 
 sem_conv_version: 1.9.0
 
diff --git a/metric-metadata/cumulativetodeltaprocessor.yaml b/metric-metadata/cumulativetodeltaprocessor.yaml
new file mode 100644
index 0000000..634d7c5
--- /dev/null
+++ b/metric-metadata/cumulativetodeltaprocessor.yaml
@@ -0,0 +1,8 @@
+type: cumulativetodelta
+
+status:
+  class: processor
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo, aws]
+  warnings: [Statefulness]
diff --git a/metric-metadata/datadogexporter.yaml b/metric-metadata/datadogexporter.yaml
new file mode 100644
index 0000000..6207451
--- /dev/null
+++ b/metric-metadata/datadogexporter.yaml
@@ -0,0 +1,8 @@
+type: datadog
+
+status:
+  class: exporter
+  stability:
+    alpha: [logs]
+    beta: [traces, metrics]
+  distributions: [contrib, aws, observiq]
diff --git a/metric-metadata/datadogprocessor.yaml b/metric-metadata/datadogprocessor.yaml
new file mode 100644
index 0000000..01618af
--- /dev/null
+++ b/metric-metadata/datadogprocessor.yaml
@@ -0,0 +1,7 @@
+type: datadog
+
+status:
+  class: processor
+  stability:
+    beta: [traces]
+  distributions: [contrib]
diff --git a/metric-metadata/datadogreceiver.yaml b/metric-metadata/datadogreceiver.yaml
new file mode 100644
index 0000000..16788dc
--- /dev/null
+++ b/metric-metadata/datadogreceiver.yaml
@@ -0,0 +1,8 @@
+type: datadog
+
+status:
+  class: receiver
+  stability:
+    alpha: [traces]
+  distributions: [contrib, sumo]
+  
diff --git a/metric-metadata/datasetexporter.yaml b/metric-metadata/datasetexporter.yaml
new file mode 100644
index 0000000..b7abd4c
--- /dev/null
+++ b/metric-metadata/datasetexporter.yaml
@@ -0,0 +1,7 @@
+type: dataset
+
+status:
+  class: exporter
+  stability:
+    alpha: [logs, traces]
+  distributions: [contrib]
diff --git a/metric-metadata/dbstorage.yaml b/metric-metadata/dbstorage.yaml
new file mode 100644
index 0000000..41d299e
--- /dev/null
+++ b/metric-metadata/dbstorage.yaml
@@ -0,0 +1,7 @@
+type: db_storage
+
+status:
+  class: extension
+  stability:
+    alpha: [extension]
+  distributions: [contrib, sumo]
diff --git a/metric-metadata/deltatorateprocessor.yaml b/metric-metadata/deltatorateprocessor.yaml
new file mode 100644
index 0000000..f14b755
--- /dev/null
+++ b/metric-metadata/deltatorateprocessor.yaml
@@ -0,0 +1,7 @@
+type: deltatorate
+
+status:
+  class: processor
+  stability:
+    development: [metrics]
+  distributions: [contrib, observiq, sumo, aws]
diff --git a/metric-metadata/deployment.yaml b/metric-metadata/deployment.yaml
new file mode 100644
index 0000000..cd3d55d
--- /dev/null
+++ b/metric-metadata/deployment.yaml
@@ -0,0 +1,41 @@
+type: k8s/deployment
+
+parent: k8s_cluster
+
+sem_conv_version: 1.18.0
+
+resource_attributes:
+  k8s.deployment.uid:
+    description: The UID of the Deployment.
+    type: string
+    enabled: true
+
+  k8s.deployment.name:
+    description: The name of the Deployment.
+    type: string
+    enabled: true
+
+  k8s.namespace.name:
+    description: The name of the namespace that the pod is running in.
+    type: string
+    enabled: true
+
+  opencensus.resourcetype:
+    description: The OpenCensus resource type.
+    type: string
+    enabled: true
+
+metrics:
+  k8s.deployment.desired:
+    enabled: true
+    description: Number of desired pods in this deployment
+    unit: 1
+    gauge:
+      value_type: int
+
+  k8s.deployment.available:
+    enabled: true
+    description: Total number of available pods (ready for at least minReadySeconds) targeted by this deployment
+    unit: 1
+    gauge:
+      value_type: int
diff --git a/metric-metadata/diskscraper.yaml b/metric-metadata/diskscraper.yaml
index 4ce5a55..91f0c60 100644
--- a/metric-metadata/diskscraper.yaml
+++ b/metric-metadata/diskscraper.yaml
@@ -1,4 +1,6 @@
-name: hostmetricsreceiver/disk
+type: hostmetricsreceiver/disk
+
+parent: hostmetrics
 
 sem_conv_version: 1.9.0
 
diff --git a/metric-metadata/docker.yaml b/metric-metadata/docker.yaml
new file mode 100644
index 0000000..7c8fd5a
--- /dev/null
+++ b/metric-metadata/docker.yaml
@@ -0,0 +1,13 @@
+type: resourcedetectionprocessor/docker
+
+parent: resourcedetection
+
+resource_attributes:
+  host.name:
+    description: The host.name
+    type: string
+    enabled: true
+  os.type:
+    description: The os.type
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/dockerobserver.yaml b/metric-metadata/dockerobserver.yaml
new file mode 100644
index 0000000..01a7af5
--- /dev/null
+++ b/metric-metadata/dockerobserver.yaml
@@ -0,0 +1,7 @@
+type: docker_observer
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, splunk, sumo]
diff --git a/metric-metadata/dockerstatsreceiver.yaml b/metric-metadata/dockerstatsreceiver.yaml
index 4469603..a586aee 100644
--- a/metric-metadata/dockerstatsreceiver.yaml
+++ b/metric-metadata/dockerstatsreceiver.yaml
@@ -1,4 +1,10 @@
-name: dockerstatsreceiver
+type: docker_stats
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 sem_conv_version: 1.6.1
 
@@ -24,6 +30,14 @@ resource_attributes:
     description: "The hostname of the container."
     type: string
     enabled: true
+  container.image.id:
+    description: "The ID of the container image."
+    type: string
+    enabled: false
+  container.command_line:
+    description: "The full command executed by the container."
+    type: string
+    enabled: false
 
 attributes:
   core:
@@ -83,7 +97,7 @@ metrics:
       aggregation: cumulative
   container.cpu.usage.percpu:
     enabled: false
-    description: "Per-core CPU usage by the container."
+    description: "Per-core CPU usage by the container (Only available with cgroups v1)."
     unit: ns
     sum:
       value_type: int
@@ -115,10 +129,20 @@ metrics:
       value_type: int
       monotonic: true
       aggregation: cumulative
+  container.cpu.utilization:
+    enabled: false
+    description: "Percent of CPU used by the container."
+    unit: "1"
+    warnings:
+      if_enabled_not_set: This metric will be enabled by default in v0.82.0.
+    gauge:
+      value_type: double
   container.cpu.percent:
     enabled: true
-    description: "Percent of CPU used by the container."
+    description: "Deprecated: use `container.cpu.utilization` metric instead. Percent of CPU used by the container."
     unit: "1"
+    warnings:
+      if_enabled: This metric will be disabled in v0.82.0 and removed in v0.85.0.
     gauge:
       value_type: double
 
@@ -134,7 +158,7 @@ metrics:
       monotonic: false
   container.memory.usage.total:
     enabled: true
-    description: "Memory usage of the container. This excludes the total cache."
+    description: "Memory usage of the container. This excludes the cache."
     unit: By
     sum:
       value_type: int
@@ -156,7 +180,7 @@ metrics:
       value_type: double
   container.memory.cache:
     enabled: false
-    description: "The amount of memory used by the processes of this control group that can be associated precisely with a block on a block device."
+    description: "The amount of memory used by the processes of this control group that can be associated precisely with a block on a block device (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -164,7 +188,7 @@ metrics:
       monotonic: false
   container.memory.rss:
     enabled: false
-    description: "The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps."
+    description: "The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -172,7 +196,7 @@ metrics:
       monotonic: false
   container.memory.rss_huge:
     enabled: false
-    description: "Number of bytes of anonymous transparent hugepages in this cgroup."
+    description: "Number of bytes of anonymous transparent hugepages in this cgroup (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -180,7 +204,7 @@ metrics:
       monotonic: false
   container.memory.dirty:
     enabled: false
-    description: "Bytes that are waiting to get written back to the disk, from this cgroup."
+    description: "Bytes that are waiting to get written back to the disk, from this cgroup (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -188,7 +212,7 @@ metrics:
       monotonic: false
   container.memory.writeback:
     enabled: false
-    description: "Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup."
+    description: "Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -196,7 +220,7 @@ metrics:
       monotonic: false
   container.memory.mapped_file:
     enabled: false
-    description: "Indicates the amount of memory mapped by the processes in the control group."
+    description: "Indicates the amount of memory mapped by the processes in the control group (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -204,7 +228,7 @@ metrics:
       monotonic: false
   container.memory.pgpgin:
     enabled: false
-    description: "Number of pages read from disk by the cgroup."
+    description: "Number of pages read from disk by the cgroup (Only available with cgroups v1)."
     extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/memory.txt)."
     unit: "{operations}"
     sum:
@@ -213,21 +237,13 @@ metrics:
       monotonic: true
   container.memory.pgpgout:
     enabled: false
-    description: "Number of pages written to disk by the cgroup."
+    description: "Number of pages written to disk by the cgroup (Only available with cgroups v1)."
     extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/memory.txt)."
     unit: "{operations}"
     sum:
       value_type: int
       aggregation: cumulative
       monotonic: true
-  container.memory.swap:
-    enabled: false
-    description: "The amount of swap currently used by the processes in this cgroup."
-    unit: By
-    sum:
-      value_type: int
-      aggregation: cumulative
-      monotonic: false
   container.memory.pgfault:
     enabled: false
     description: "Indicate the number of times that a process of the cgroup triggered a page fault."
@@ -288,7 +304,7 @@ metrics:
       monotonic: false
   container.memory.hierarchical_memory_limit:
     enabled: false
-    description: "The maximum amount of physical memory that can be used by the processes of this control group."
+    description: "The maximum amount of physical memory that can be used by the processes of this control group (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -296,7 +312,7 @@ metrics:
       monotonic: false
   container.memory.hierarchical_memsw_limit:
     enabled: false
-    description: "The maximum amount of RAM + swap that can be used by the processes of this control group."
+    description: "The maximum amount of RAM + swap that can be used by the processes of this control group (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -304,7 +320,7 @@ metrics:
       monotonic: false
   container.memory.total_cache:
     enabled: true
-    description: "Total amount of memory used by the processes of this cgroup (and descendants) that can be associated with a block on a block device. Also accounts for memory used by tmpfs."
+    description: "Total amount of memory used by the processes of this cgroup (and descendants) that can be associated with a block on a block device. Also accounts for memory used by tmpfs (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -312,7 +328,7 @@ metrics:
       monotonic: false
   container.memory.total_rss:
     enabled: false
-    description: "The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps. Includes descendant cgroups."
+    description: "The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps. Includes descendant cgroups (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -320,7 +336,7 @@ metrics:
       monotonic: false
   container.memory.total_rss_huge:
     enabled: false
-    description: "Number of bytes of anonymous transparent hugepages in this cgroup and descendant cgroups."
+    description: "Number of bytes of anonymous transparent hugepages in this cgroup and descendant cgroups (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -328,7 +344,7 @@ metrics:
       monotonic: false
   container.memory.total_dirty:
     enabled: false
-    description: "Bytes that are waiting to get written back to the disk, from this cgroup and descendants."
+    description: "Bytes that are waiting to get written back to the disk, from this cgroup and descendants (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -336,7 +352,7 @@ metrics:
       monotonic: false
   container.memory.total_writeback:
     enabled: false
-    description: "Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup and descendants."
+    description: "Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup and descendants (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -344,7 +360,7 @@ metrics:
       monotonic: false
   container.memory.total_mapped_file:
     enabled: false
-    description: "Indicates the amount of memory mapped by the processes in the control group and descendant groups."
+    description: "Indicates the amount of memory mapped by the processes in the control group and descendant groups (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -352,7 +368,7 @@ metrics:
       monotonic: false
   container.memory.total_pgpgin:
     enabled: false
-    description: "Number of pages read from disk by the cgroup and descendant groups."
+    description: "Number of pages read from disk by the cgroup and descendant groups (Only available with cgroups v1)."
     unit: "{operations}"
     sum:
       value_type: int
@@ -360,23 +376,15 @@ metrics:
       monotonic: true
   container.memory.total_pgpgout:
     enabled: false
-    description: "Number of pages written to disk by the cgroup and descendant groups."
+    description: "Number of pages written to disk by the cgroup and descendant groups (Only available with cgroups v1)."
     unit: "{operations}"
     sum:
       value_type: int
       aggregation: cumulative
       monotonic: true
-  container.memory.total_swap:
-    enabled: false
-    description: "The amount of swap currently used by the processes in this cgroup and descendant groups."
-    unit: By
-    sum:
-      value_type: int
-      aggregation: cumulative
-      monotonic: false
   container.memory.total_pgfault:
     enabled: false
-    description: "Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a page fault."
+    description: "Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a page fault (Only available with cgroups v1)."
     unit: "{faults}"
     sum:
       value_type: int
@@ -384,7 +392,7 @@ metrics:
       monotonic: true
   container.memory.total_pgmajfault:
     enabled: false
-    description: "Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a major fault."
+    description: "Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a major fault (Only available with cgroups v1)."
     unit: "{faults}"
     sum:
       value_type: int
@@ -392,7 +400,7 @@ metrics:
       monotonic: true
   container.memory.total_inactive_anon:
     enabled: false
-    description: "The amount of anonymous memory that has been identified as inactive by the kernel. Includes descendant cgroups."
+    description: "The amount of anonymous memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -400,7 +408,7 @@ metrics:
       monotonic: false
   container.memory.total_active_anon:
     enabled: false
-    description: "The amount of anonymous memory that has been identified as active by the kernel. Includes descendant cgroups."
+    description: "The amount of anonymous memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1)."
     unit: By
     sum:
       value_type: int
@@ -408,7 +416,7 @@ metrics:
       monotonic: false
   container.memory.total_inactive_file:
     enabled: false
-    description: "Cache memory that has been identified as inactive by the kernel. Includes descendant cgroups."
+    description: "Cache memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1)."
     extended_documentation: "[More docs](https://docs.docker.com/config/containers/runmetrics/)."
     unit: By
     sum:
@@ -417,7 +425,7 @@ metrics:
       monotonic: false
   container.memory.total_active_file:
     enabled: false
-    description: "Cache memory that has been identified as active by the kernel. Includes descendant cgroups."
+    description: "Cache memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1)."
     extended_documentation: "[More docs](https://docs.docker.com/config/containers/runmetrics/)."
     unit: By
     sum:
@@ -426,7 +434,25 @@ metrics:
       monotonic: false
   container.memory.total_unevictable:
     enabled: false
-    description: "The amount of memory that cannot be reclaimed. Includes descendant cgroups."
+    description: "The amount of memory that cannot be reclaimed. Includes descendant cgroups (Only available with cgroups v1)."
+    unit: By
+    sum:
+      value_type: int
+      aggregation: cumulative
+      monotonic: false
+  container.memory.anon:
+    enabled: false
+    description: "Amount of memory used in anonymous mappings such as brk(), sbrk(), and mmap(MAP_ANONYMOUS) (Only available with cgroups v2)."
+    extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v2.txt)"
+    unit: By
+    sum:
+      value_type: int
+      aggregation: cumulative
+      monotonic: false
+  container.memory.file:
+    enabled: true
+    description: "Amount of memory used to cache filesystem data, including tmpfs and shared memory (Only available with cgroups v2)."
+    extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v2.txt)"
     unit: By
     sum:
       value_type: int
@@ -434,10 +460,10 @@ metrics:
       monotonic: false
 
 
-  # BlockIO
+  # BlockIO (cgroup v1) and IO (cgroup v2) controllers
   container.blockio.io_merged_recursive:
     enabled: false
-    description: "Number of bios/requests merged into requests belonging to this cgroup and its descendant cgroups."
+    description: "Number of bios/requests merged into requests belonging to this cgroup and its descendant cgroups (Only available with cgroups v1)."
     extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt)."
     unit: "{operations}"
     sum:
@@ -448,10 +474,9 @@ metrics:
       - device_major
       - device_minor
       - operation
-
   container.blockio.io_queued_recursive:
     enabled: false
-    description: "Number of requests queued up for this cgroup and its descendant cgroups."
+    description: "Number of requests queued up for this cgroup and its descendant cgroups (Only available with cgroups v1)."
     extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt)."
     unit: "{operations}"
     sum:
@@ -462,11 +487,13 @@ metrics:
       - device_major
       - device_minor
       - operation
-
   container.blockio.io_service_bytes_recursive:
     enabled: true
     description: "Number of bytes transferred to/from the disk by the group and descendant groups."
-    extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt)."
+    extended_documentation: >-
+      More docs
+      for [cgroups v1](https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt)
+      and [cgroups v2](https://www.kernel.org/doc/Documentation/cgroup-v2.txt)
     unit: By
     sum:
       value_type: int
@@ -476,10 +503,9 @@ metrics:
       - device_major
       - device_minor
       - operation
-
   container.blockio.io_service_time_recursive:
     enabled: false
-    description: "Total amount of time in nanoseconds between request dispatch and request completion for the IOs done by this cgroup and descendant cgroups."
+    description: "Total amount of time in nanoseconds between request dispatch and request completion for the IOs done by this cgroup and descendant cgroups (Only available with cgroups v1)."
     extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt)."
     unit: ns
     sum:
@@ -490,10 +516,9 @@ metrics:
       - device_major
       - device_minor
       - operation
-
   container.blockio.io_serviced_recursive:
     enabled: false
-    description: "Number of IOs (bio) issued to the disk by the group and descendant groups."
+    description: "Number of IOs (bio) issued to the disk by the group and descendant groups (Only available with cgroups v1)."
     extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt)."
     unit: "{operations}"
     sum:
@@ -504,10 +529,9 @@ metrics:
       - device_major
       - device_minor
       - operation
-
   container.blockio.io_time_recursive:
     enabled: false
-    description: "Disk time allocated to cgroup (and descendant cgroups) per device in milliseconds."
+    description: "Disk time allocated to cgroup (and descendant cgroups) per device in milliseconds (Only available with cgroups v1)."
     extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt)."
     unit: ms
     sum:
@@ -518,10 +542,9 @@ metrics:
       - device_major
       - device_minor
       - operation
-
   container.blockio.io_wait_time_recursive:
     enabled: false
-    description: "Total amount of time the IOs for this cgroup (and descendant cgroups) spent waiting in the scheduler queues for service."
+    description: "Total amount of time the IOs for this cgroup (and descendant cgroups) spent waiting in the scheduler queues for service (Only available with cgroups v1)."
     extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt)."
     unit: ns
     sum:
@@ -532,10 +555,9 @@ metrics:
       - device_major
       - device_minor
       - operation
-
   container.blockio.sectors_recursive:
     enabled: false
-    description: "Number of sectors transferred to/from disk by the group and descendant groups."
+    description: "Number of sectors transferred to/from disk by the group and descendant groups (Only available with cgroups v1)."
     extended_documentation: "[More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt)."
     unit: "{sectors}"
     sum:
@@ -628,3 +650,32 @@ metrics:
       aggregation: cumulative
     attributes:
       - interface
+
+  # Pids
+  container.pids.count:
+    enabled: false
+    description: "Number of pids in the container's cgroup."
+    extended_documentation: "It requires docker API 1.23 or higher and kernel version >= 4.3 with pids cgroup supported. [More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/pids.txt)"
+    unit: "{pids}"
+    sum:
+      value_type: int
+      aggregation: cumulative
+      monotonic: false
+
+  container.pids.limit:
+    enabled: false
+    description: "Maximum number of pids in the container's cgroup."
+    extended_documentation: "It requires docker API 1.23 or higher and kernel version >= 4.3 with pids cgroup supported. [More docs](https://www.kernel.org/doc/Documentation/cgroup-v1/pids.txt)"
+    unit: "{pids}"
+    sum:
+      value_type: int
+      aggregation: cumulative
+      monotonic: false
+
+  # Base
+  container.uptime:
+    enabled: false
+    description: "Time elapsed since container start time."
+    unit: s
+    gauge:
+      value_type: double
diff --git a/metric-metadata/dynatraceexporter.yaml b/metric-metadata/dynatraceexporter.yaml
new file mode 100644
index 0000000..225d6de
--- /dev/null
+++ b/metric-metadata/dynatraceexporter.yaml
@@ -0,0 +1,7 @@
+type: dynatrace
+
+status:
+  class: exporter
+  stability:
+    beta: [metrics]
+  distributions: [contrib, aws, observiq]
diff --git a/metric-metadata/ec2.yaml b/metric-metadata/ec2.yaml
new file mode 100644
index 0000000..ae31e6c
--- /dev/null
+++ b/metric-metadata/ec2.yaml
@@ -0,0 +1,41 @@
+type: resourcedetectionprocessor/ec2
+
+parent: resourcedetection
+
+resource_attributes:
+  host.name:
+    description: The hostname
+    type: string
+    enabled: true
+  host.id:
+    description: The host.id
+    type: string
+    enabled: true
+  cloud.provider:
+    description: The cloud provider
+    type: string
+    enabled: true
+  cloud.account.id:
+    description: The cloud account id
+    type: string
+    enabled: true
+  cloud.platform:
+    description: The cloud platform
+    type: string
+    enabled: true
+  cloud.region:
+    description: The cloud region
+    type: string
+    enabled: true
+  cloud.availability_zone:
+    description: The cloud availability zone
+    type: string
+    enabled: true
+  host.image.id:
+    description: The host image id
+    type: string
+    enabled: true
+  host.type:
+    description: The host id
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/ecs.yaml b/metric-metadata/ecs.yaml
new file mode 100644
index 0000000..7b11b00
--- /dev/null
+++ b/metric-metadata/ecs.yaml
@@ -0,0 +1,61 @@
+type: resourcedetectionprocessor/ecs
+
+parent: resourcedetection
+
+resource_attributes:
+  cloud.provider:
+    description: The cloud.provider
+    type: string
+    enabled: true
+  cloud.platform:
+    description: The cloud.platform
+    type: string
+    enabled: true
+  cloud.account.id:
+    description: The cloud.account.id
+    type: string
+    enabled: true
+  cloud.region:
+    description: The cloud.region
+    type: string
+    enabled: true
+  cloud.availability_zone:
+    description: The cloud.availability_zone
+    type: string
+    enabled: true
+  aws.ecs.cluster.arn:
+    description: The aws.ecs.cluster.arn
+    type: string
+    enabled: true
+  aws.ecs.task.arn:
+    description: The aws.ecs.task.arn
+    type: string
+    enabled: true
+  aws.ecs.task.family:
+    description: The aws.ecs.task.family
+    type: string
+    enabled: true
+  aws.ecs.task.revision:
+    description: The aws.ecs.task.revision
+    type: string
+    enabled: true
+  aws.ecs.launchtype:
+    description: The aws.ecs.launchtype
+    type: string
+    enabled: true
+  aws.log.group.names:
+    description: The aws.log.group.names
+    type: string
+    enabled: true
+  aws.log.group.arns:
+    description: The aws.log.group.arns
+    type: string
+    enabled: true
+  aws.log.stream.names:
+    description: The aws.log.stream.names
+    type: string
+    enabled: true
+  aws.log.stream.arns:
+    description: The aws.log.stream.arns
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/ecsobserver.yaml b/metric-metadata/ecsobserver.yaml
new file mode 100644
index 0000000..112b98b
--- /dev/null
+++ b/metric-metadata/ecsobserver.yaml
@@ -0,0 +1,7 @@
+type: ecs_observer
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, aws, splunk, sumo]
diff --git a/metric-metadata/ecstaskobserver.yaml b/metric-metadata/ecstaskobserver.yaml
new file mode 100644
index 0000000..7a7fd5d
--- /dev/null
+++ b/metric-metadata/ecstaskobserver.yaml
@@ -0,0 +1,7 @@
+type: ecs_task_observer
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, splunk, sumo]
diff --git a/metric-metadata/eks.yaml b/metric-metadata/eks.yaml
new file mode 100644
index 0000000..e544e7c
--- /dev/null
+++ b/metric-metadata/eks.yaml
@@ -0,0 +1,13 @@
+type: resourcedetectionprocessor/eks
+
+parent: resourcedetection
+
+resource_attributes:
+  cloud.provider:
+    description: The cloud.provider
+    type: string
+    enabled: true
+  cloud.platform:
+    description: The cloud.platform
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/elasticbeanstalk.yaml b/metric-metadata/elasticbeanstalk.yaml
new file mode 100644
index 0000000..0414b1a
--- /dev/null
+++ b/metric-metadata/elasticbeanstalk.yaml
@@ -0,0 +1,25 @@
+type: resourcedetectionprocessor/elastic_beanstalk
+
+parent: resourcedetection
+
+resource_attributes:
+  cloud.provider:
+    description: The cloud.provider
+    type: string
+    enabled: true
+  cloud.platform:
+    description: The cloud.platform
+    type: string
+    enabled: true
+  deployment.environment:
+    description: The deployment.environment
+    type: string
+    enabled: true
+  service.instance.id:
+    description: The service.instance.id
+    type: string
+    enabled: true
+  service.version:
+    description: The service.version
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/elasticsearchexporter.yaml b/metric-metadata/elasticsearchexporter.yaml
new file mode 100644
index 0000000..a205251
--- /dev/null
+++ b/metric-metadata/elasticsearchexporter.yaml
@@ -0,0 +1,7 @@
+type: elasticsearch
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, logs]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/elasticsearchreceiver.yaml b/metric-metadata/elasticsearchreceiver.yaml
index 07f1a07..14ad7b1 100644
--- a/metric-metadata/elasticsearchreceiver.yaml
+++ b/metric-metadata/elasticsearchreceiver.yaml
@@ -1,4 +1,10 @@
-name: elasticsearchreceiver
+type: elasticsearch
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
   elasticsearch.cluster.name:
diff --git a/metric-metadata/expvarreceiver.yaml b/metric-metadata/expvarreceiver.yaml
index 47b59a9..1ae5a1c 100644
--- a/metric-metadata/expvarreceiver.yaml
+++ b/metric-metadata/expvarreceiver.yaml
@@ -1,4 +1,10 @@
-name: expvarreceiver
+type: expvar
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, sumo]
 
 metrics:
   process.runtime.memstats.total_alloc:
diff --git a/metric-metadata/f5cloudexporter.yaml b/metric-metadata/f5cloudexporter.yaml
new file mode 100644
index 0000000..36e92b4
--- /dev/null
+++ b/metric-metadata/f5cloudexporter.yaml
@@ -0,0 +1,7 @@
+type: f5cloud
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/fileexporter.yaml b/metric-metadata/fileexporter.yaml
new file mode 100644
index 0000000..4cf98e4
--- /dev/null
+++ b/metric-metadata/fileexporter.yaml
@@ -0,0 +1,7 @@
+type: file
+
+status:
+  class: exporter
+  stability:
+    alpha: [traces, metrics, logs]
+  distributions: [core, contrib, observiq, splunk, sumo, aws]
diff --git a/metric-metadata/filelogreceiver.yaml b/metric-metadata/filelogreceiver.yaml
new file mode 100644
index 0000000..8973756
--- /dev/null
+++ b/metric-metadata/filelogreceiver.yaml
@@ -0,0 +1,8 @@
+type: filelog
+
+status:
+  class: receiver
+  stability:
+    beta: [logs]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/filereceiver.yaml b/metric-metadata/filereceiver.yaml
new file mode 100644
index 0000000..60a582b
--- /dev/null
+++ b/metric-metadata/filereceiver.yaml
@@ -0,0 +1,8 @@
+type: file
+
+status:
+  class: receiver
+  stability:
+    development: [metrics, traces, logs]
+  distributions: [contrib]
+  
diff --git a/metric-metadata/filestatsreceiver.yaml b/metric-metadata/filestatsreceiver.yaml
new file mode 100644
index 0000000..3aa24b7
--- /dev/null
+++ b/metric-metadata/filestatsreceiver.yaml
@@ -0,0 +1,57 @@
+type: filestats
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, sumo]
+
+
+resource_attributes:
+  file.name:
+    description: The name of the file
+    enabled: true
+    type: string
+  file.path:
+    description: The absolute path of the file
+    enabled: false
+    type: string
+
+attributes:
+  file.permissions:
+    description: the permissions associated with the file, using an octal format.
+    type: string
+
+metrics:
+  file.mtime:
+    description: Elapsed time since the last modification of the file or folder, in seconds since Epoch.
+    enabled: true
+    sum:
+      monotonic: false
+      aggregation: cumulative
+      value_type: int
+    unit: "s"
+  file.ctime:
+    description: Elapsed time since the last change of the file or folder, in seconds since Epoch. In addition to `file.mtime`, this metric tracks metadata changes such as permissions or renaming the file.
+    enabled: false
+    sum:
+      monotonic: false
+      aggregation: cumulative
+      value_type: int
+    unit: "s"
+    attributes:
+      - file.permissions
+  file.atime:
+    description: Elapsed time since last access of the file or folder, in seconds since Epoch.
+    enabled: false
+    sum:
+      monotonic: false
+      aggregation: cumulative
+      value_type: int
+    unit: "s"
+  file.size:
+    description: The size of the file or folder, in bytes.
+    enabled: true
+    gauge:
+      value_type: int
+    unit: "b"
diff --git a/metric-metadata/filestorage.yaml b/metric-metadata/filestorage.yaml
new file mode 100644
index 0000000..65b01d0
--- /dev/null
+++ b/metric-metadata/filestorage.yaml
@@ -0,0 +1,7 @@
+type: file_storage
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, observiq, splunk, sumo]
diff --git a/metric-metadata/filesystemscraper.yaml b/metric-metadata/filesystemscraper.yaml
index a81e74f..4b8f8e3 100644
--- a/metric-metadata/filesystemscraper.yaml
+++ b/metric-metadata/filesystemscraper.yaml
@@ -1,4 +1,6 @@
-name: hostmetricsreceiver/filesystem
+type: hostmetricsreceiver/filesystem
+
+parent: hostmetrics
 
 sem_conv_version: 1.9.0
 
diff --git a/metric-metadata/filterprocessor.yaml b/metric-metadata/filterprocessor.yaml
new file mode 100644
index 0000000..47f1a39
--- /dev/null
+++ b/metric-metadata/filterprocessor.yaml
@@ -0,0 +1,8 @@
+type: filter
+
+status:
+  class: processor
+  stability:
+    alpha: [traces, metrics, logs]
+  distributions: [core, contrib, splunk, observiq, sumo, aws, redhat]
+  warnings: [Orphaned Telemetry, Other]
diff --git a/metric-metadata/flinkmetricsreceiver.yaml b/metric-metadata/flinkmetricsreceiver.yaml
index 8b2df33..09282f9 100644
--- a/metric-metadata/flinkmetricsreceiver.yaml
+++ b/metric-metadata/flinkmetricsreceiver.yaml
@@ -1,4 +1,10 @@
-name: flinkmetricsreceiver
+type: flinkmetrics
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib,observiq, sumo]
 
 resource_attributes:
   # These resource attributes are Flinks system scope variables, which contains context information about metrics. These are required to uniquely identify incoming metrics as the same job can run multiple times concurrently. See https://nightlies.apache.org/flink/flink-docs-release-1.14/docs/ops/metrics/#system-scope for more information.
@@ -39,7 +45,7 @@ attributes:
     type: string
     enum: [ PS_MarkSweep, PS_Scavenge, G1_Young_Generation, G1_Old_Generation ]
   checkpoint:
-    description: The number of checkpoints completed or that failed. 
+    description: The number of checkpoints completed or that failed.
     type: string
     enum: [ completed, failed ]
   record:
diff --git a/metric-metadata/fluentforwardreceiver.yaml b/metric-metadata/fluentforwardreceiver.yaml
new file mode 100644
index 0000000..596f82e
--- /dev/null
+++ b/metric-metadata/fluentforwardreceiver.yaml
@@ -0,0 +1,8 @@
+type: fluentforward
+
+status:
+  class: receiver
+  stability:
+    beta: [logs]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/gcp.yaml b/metric-metadata/gcp.yaml
new file mode 100644
index 0000000..100feaf
--- /dev/null
+++ b/metric-metadata/gcp.yaml
@@ -0,0 +1,53 @@
+type: resourcedetectionprocessor/gcp
+
+parent: resourcedetection
+
+resource_attributes:
+  host.name:
+    description: The host.name
+    type: string
+    enabled: true
+  host.id:
+    description: The host.id
+    type: string
+    enabled: true
+  host.type:
+    description: The host.type
+    type: string
+    enabled: true
+  cloud.provider:
+    description: The cloud.provider
+    type: string
+    enabled: true
+  cloud.platform:
+    description: The cloud.platform
+    type: string
+    enabled: true
+  cloud.account.id:
+    description: The cloud.account.id
+    type: string
+    enabled: true
+  cloud.region:
+    description: The cloud.region
+    type: string
+    enabled: true
+  cloud.availability_zone:
+    description: The cloud.availability_zone
+    type: string
+    enabled: true
+  faas.name:
+    description: faas.name
+    type: string
+    enabled: true
+  faas.version:
+    description: The faas.version
+    type: string
+    enabled: true
+  faas.id:
+    description: The faas.id
+    type: string
+    enabled: true
+  k8s.cluster.name:
+    description: The k8s.cluster.name
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/googlecloudexporter.yaml b/metric-metadata/googlecloudexporter.yaml
new file mode 100644
index 0000000..57ca7d7
--- /dev/null
+++ b/metric-metadata/googlecloudexporter.yaml
@@ -0,0 +1,7 @@
+type: googlecloud
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/googlecloudpubsubexporter.yaml b/metric-metadata/googlecloudpubsubexporter.yaml
new file mode 100644
index 0000000..a5f916e
--- /dev/null
+++ b/metric-metadata/googlecloudpubsubexporter.yaml
@@ -0,0 +1,7 @@
+type: googlecloudpubsub
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/googlecloudpubsubreceiver.yaml b/metric-metadata/googlecloudpubsubreceiver.yaml
new file mode 100644
index 0000000..d310fc5
--- /dev/null
+++ b/metric-metadata/googlecloudpubsubreceiver.yaml
@@ -0,0 +1,8 @@
+type: googlecloudpubsub
+
+status:
+  class: receiver
+  stability:
+    beta: [traces, logs, metrics]
+  distributions: [observiq, sumo]
+
diff --git a/metric-metadata/googlecloudspannerreceiver.yaml b/metric-metadata/googlecloudspannerreceiver.yaml
new file mode 100644
index 0000000..fe834ca
--- /dev/null
+++ b/metric-metadata/googlecloudspannerreceiver.yaml
@@ -0,0 +1,8 @@
+type: googlecloudspanner
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
+
diff --git a/metric-metadata/googlemanagedprometheusexporter.yaml b/metric-metadata/googlemanagedprometheusexporter.yaml
new file mode 100644
index 0000000..6d81854
--- /dev/null
+++ b/metric-metadata/googlemanagedprometheusexporter.yaml
@@ -0,0 +1,7 @@
+type: googlemanagedprometheus
+
+status:
+  class: exporter
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/groupbyattrsprocessor.yaml b/metric-metadata/groupbyattrsprocessor.yaml
new file mode 100644
index 0000000..fe9bbfe
--- /dev/null
+++ b/metric-metadata/groupbyattrsprocessor.yaml
@@ -0,0 +1,8 @@
+type: groupbyattrs
+
+status:
+  class: processor
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, splunk, observiq, sumo]
+  warnings: []
diff --git a/metric-metadata/groupbytraceprocessor.yaml b/metric-metadata/groupbytraceprocessor.yaml
new file mode 100644
index 0000000..cc2219d
--- /dev/null
+++ b/metric-metadata/groupbytraceprocessor.yaml
@@ -0,0 +1,8 @@
+type: groupbytrace
+
+status:
+  class: processor
+  stability:
+    beta: [traces]
+  distributions: [contrib, observiq, sumo, aws]
+  warnings: [Statefulness]
diff --git a/metric-metadata/haproxyreceiver.yaml b/metric-metadata/haproxyreceiver.yaml
index 456f89d..96abe32 100644
--- a/metric-metadata/haproxyreceiver.yaml
+++ b/metric-metadata/haproxyreceiver.yaml
@@ -1,4 +1,10 @@
-name: haproxyreceiver
+type: haproxy
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, sumo]
 
 resource_attributes:
   haproxy.url:
diff --git a/metric-metadata/headerssetterextension.yaml b/metric-metadata/headerssetterextension.yaml
new file mode 100644
index 0000000..a4b6f75
--- /dev/null
+++ b/metric-metadata/headerssetterextension.yaml
@@ -0,0 +1,7 @@
+type: headers_setter
+
+status:
+  class: extension
+  stability:
+    alpha: [extension]
+  distributions: [contrib, sumo]
diff --git a/metric-metadata/healthcheckextension.yaml b/metric-metadata/healthcheckextension.yaml
new file mode 100644
index 0000000..01c5206
--- /dev/null
+++ b/metric-metadata/healthcheckextension.yaml
@@ -0,0 +1,7 @@
+type: health_check
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [core, contrib, splunk, observiq, sumo, aws, redhat]
diff --git a/metric-metadata/heroku.yaml b/metric-metadata/heroku.yaml
new file mode 100644
index 0000000..5b913b6
--- /dev/null
+++ b/metric-metadata/heroku.yaml
@@ -0,0 +1,37 @@
+type: resourcedetectionprocessor/heroku
+
+parent: resourcedetection
+
+resource_attributes:
+  cloud.provider:
+    description: The cloud.provider
+    enabled: true
+    type: string
+  heroku.app.id:
+    description: The heroku.app.id
+    enabled: true
+    type: string
+  heroku.app.name:
+    description: The heroku.app.name
+    enabled: true
+    type: string
+  heroku.dyno.id:
+    description: The heroku.dyno.id
+    enabled: true
+    type: string
+  heroku.release.commit:
+    description: The heroku.release.commit
+    enabled: true
+    type: string
+  heroku.release.creation_timestamp:
+    description: The heroku.release.creation_timestamp
+    enabled: true
+    type: string
+  heroku.release.version:
+    description: The heroku.release.version
+    enabled: true
+    type: string
+  service.instance.id:
+    description: The service.instance.id
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/hostmetricsreceiver.yaml b/metric-metadata/hostmetricsreceiver.yaml
new file mode 100644
index 0000000..5fa75f1
--- /dev/null
+++ b/metric-metadata/hostmetricsreceiver.yaml
@@ -0,0 +1,8 @@
+type: hostmetrics
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [core, contrib, observiq, splunk, sumo]
+  
diff --git a/metric-metadata/hostobserver.yaml b/metric-metadata/hostobserver.yaml
new file mode 100644
index 0000000..f870c12
--- /dev/null
+++ b/metric-metadata/hostobserver.yaml
@@ -0,0 +1,7 @@
+type: host_observer
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, splunk, sumo]
diff --git a/metric-metadata/hpa.yaml b/metric-metadata/hpa.yaml
new file mode 100644
index 0000000..12f8964
--- /dev/null
+++ b/metric-metadata/hpa.yaml
@@ -0,0 +1,50 @@
+type: k8s/hpa
+
+parent: k8s_cluster
+
+sem_conv_version: 1.9.0
+
+resource_attributes:
+  k8s.hpa.uid:
+    description: The k8s hpa uid.
+    type: string
+    enabled: true
+
+  k8s.hpa.name:
+    description: The k8s hpa name.
+    type: string
+    enabled: true
+
+  k8s.namespace.name:
+    description: The name of the namespace that the pod is running in.
+    type: string
+    enabled: true
+
+metrics:
+  k8s.hpa.max_replicas:
+    enabled: true
+    description: Maximum number of replicas to which the autoscaler can scale up.
+    unit: 1
+    gauge:
+      value_type: int
+
+  k8s.hpa.min_replicas:
+    enabled: true
+    description: Minimum number of replicas to which the autoscaler can scale up.
+    unit: 1
+    gauge:
+      value_type: int
+
+  k8s.hpa.current_replicas:
+    enabled: true
+    description: Current number of pod replicas managed by this autoscaler.
+    unit: 1
+    gauge:
+      value_type: int
+
+  k8s.hpa.desired_replicas:
+    enabled: true
+    description: Desired number of pod replicas managed by this autoscaler.
+    unit: 1
+    gauge:
+      value_type: int
diff --git a/metric-metadata/httpcheckreceiver.yaml b/metric-metadata/httpcheckreceiver.yaml
index 3347709..8b310d9 100644
--- a/metric-metadata/httpcheckreceiver.yaml
+++ b/metric-metadata/httpcheckreceiver.yaml
@@ -1,4 +1,11 @@
-name: httpcheckreceiver
+type: httpcheck
+
+status:
+  class: receiver
+  stability:
+    development: [metrics]
+  distributions: [contrib, sumo]
+  warnings: []
 
 resource_attributes:
 
diff --git a/metric-metadata/httpforwarder.yaml b/metric-metadata/httpforwarder.yaml
new file mode 100644
index 0000000..e27797b
--- /dev/null
+++ b/metric-metadata/httpforwarder.yaml
@@ -0,0 +1,7 @@
+type: http_forwarder
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, splunk, sumo]
diff --git a/metric-metadata/iisreceiver.yaml b/metric-metadata/iisreceiver.yaml
index 2e85251..7d64888 100644
--- a/metric-metadata/iisreceiver.yaml
+++ b/metric-metadata/iisreceiver.yaml
@@ -1,4 +1,10 @@
-name: iisreceiver
+type: iis
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
   iis.site:
diff --git a/metric-metadata/influxdbexporter.yaml b/metric-metadata/influxdbexporter.yaml
new file mode 100644
index 0000000..e82ec75
--- /dev/null
+++ b/metric-metadata/influxdbexporter.yaml
@@ -0,0 +1,7 @@
+type: influxdb
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/influxdbreceiver.yaml b/metric-metadata/influxdbreceiver.yaml
new file mode 100644
index 0000000..78d4d92
--- /dev/null
+++ b/metric-metadata/influxdbreceiver.yaml
@@ -0,0 +1,8 @@
+type: influxdb
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
+
diff --git a/metric-metadata/instanaexporter.yaml b/metric-metadata/instanaexporter.yaml
new file mode 100644
index 0000000..29d635a
--- /dev/null
+++ b/metric-metadata/instanaexporter.yaml
@@ -0,0 +1,7 @@
+type: instana
+
+status:
+  class: exporter
+  stability:
+    alpha: [traces]
+  distributions: [contrib]
diff --git a/metric-metadata/jaegerexporter.yaml b/metric-metadata/jaegerexporter.yaml
new file mode 100644
index 0000000..535cae3
--- /dev/null
+++ b/metric-metadata/jaegerexporter.yaml
@@ -0,0 +1,7 @@
+type: jaeger
+
+status:
+  class: exporter
+  stability:
+    deprecated: [traces]
+  distributions: [core, contrib, redhat]
diff --git a/metric-metadata/jaegerreceiver.yaml b/metric-metadata/jaegerreceiver.yaml
new file mode 100644
index 0000000..d626c8d
--- /dev/null
+++ b/metric-metadata/jaegerreceiver.yaml
@@ -0,0 +1,7 @@
+type: jaeger
+
+status:
+  class: receiver
+  stability:
+    beta: [traces]
+  distributions: [core, contrib, splunk, observiq, sumo, aws, redhat]
diff --git a/metric-metadata/jaegerremotesampling.yaml b/metric-metadata/jaegerremotesampling.yaml
new file mode 100644
index 0000000..f18d851
--- /dev/null
+++ b/metric-metadata/jaegerremotesampling.yaml
@@ -0,0 +1,7 @@
+type: jaegerremotesampling
+
+status:
+  class: extension
+  stability:
+    alpha: [extension]
+  distributions: [contrib, sumo, redhat]
diff --git a/metric-metadata/jaegerthrifthttpexporter.yaml b/metric-metadata/jaegerthrifthttpexporter.yaml
new file mode 100644
index 0000000..3a1a464
--- /dev/null
+++ b/metric-metadata/jaegerthrifthttpexporter.yaml
@@ -0,0 +1,7 @@
+type: jaeger_thrift
+
+status:
+  class: exporter
+  stability:
+    deprecated: [traces]
+  distributions: [contrib]
diff --git a/metric-metadata/jmxreceiver.yaml b/metric-metadata/jmxreceiver.yaml
new file mode 100644
index 0000000..75eef98
--- /dev/null
+++ b/metric-metadata/jmxreceiver.yaml
@@ -0,0 +1,8 @@
+type: jmx
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/journaldreceiver.yaml b/metric-metadata/journaldreceiver.yaml
new file mode 100644
index 0000000..d7d6bf8
--- /dev/null
+++ b/metric-metadata/journaldreceiver.yaml
@@ -0,0 +1,8 @@
+type: journald
+
+status:
+  class: receiver
+  stability:
+    alpha: [logs]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/k8sattributesprocessor.yaml b/metric-metadata/k8sattributesprocessor.yaml
new file mode 100644
index 0000000..a1412be
--- /dev/null
+++ b/metric-metadata/k8sattributesprocessor.yaml
@@ -0,0 +1,94 @@
+type: k8sattributes
+
+status:
+  class: processor
+  stability:
+    beta: [logs, metrics, traces]
+  distributions: [contrib, splunk, observiq, sumo, redhat]
+
+# resource attributes are exposed through a different configuration interface (extract::metadata).
+resource_attributes:
+  k8s.namespace.name:
+    description: The name of the namespace that the pod is running in.
+    type: string
+    enabled: true
+  k8s.pod.name:
+    description: The name of the Pod.
+    type: string
+    enabled: true
+  k8s.pod.uid:
+    description: The UID of the Pod.
+    type: string
+    enabled: true
+  k8s.pod.hostname:
+    description: The hostname of the Pod.
+    type: string
+    enabled: false
+  k8s.pod.start_time:
+    description: The start time of the Pod.
+    type: string
+    enabled: true
+  k8s.deployment.name:
+    description: The name of the Deployment.
+    type: string
+    enabled: true
+  k8s.deployment.uid:
+    description: The UID of the Deployment.
+    type: string
+    enabled: false
+  k8s.replicaset.name:
+    description: The name of the ReplicaSet.
+    type: string
+    enabled: false
+  k8s.replicaset.uid:
+    description: The UID of the ReplicaSet.
+    type: string
+    enabled: false
+  k8s.daemonset.name:
+    description: The name of the DaemonSet.
+    type: string
+    enabled: false
+  k8s.daemonset.uid:
+    description: The UID of the DaemonSet.
+    type: string
+    enabled: false
+  k8s.statefulset.name:
+    description: The name of the StatefulSet.
+    type: string
+    enabled: false
+  k8s.statefulset.uid:
+    description: The UID of the StatefulSet.
+    type: string
+    enabled: false
+  k8s.container.name:
+    description: The name of the Container in a Pod template. Requires container.id.
+    type: string
+    enabled: false
+  k8s.job.name:
+    description: The name of the Job.
+    type: string
+    enabled: false
+  k8s.job.uid:
+    description: The UID of the Job.
+    type: string
+    enabled: false
+  k8s.cronjob.name:
+    description: The name of the CronJob.
+    type: string
+    enabled: false
+  k8s.node.name:
+    description: The name of the Node.
+    type: string
+    enabled: true
+  container.id:
+    description: Container ID. Usually a UUID, as for example used to identify Docker containers. The UUID might be abbreviated. Requires k8s.container.restart_count.
+    type: string
+    enabled: false
+  container.image.name:
+    description: Name of the image the container was built on. Requires container.id or k8s.container.name.
+    type: string
+    enabled: true
+  container.image.tag:
+    description: Container image tag. Requires container.id or k8s.container.name.
+    type: string
+    enabled: true
diff --git a/metric-metadata/k8sclusterreceiver.yaml b/metric-metadata/k8sclusterreceiver.yaml
new file mode 100644
index 0000000..e88c6fd
--- /dev/null
+++ b/metric-metadata/k8sclusterreceiver.yaml
@@ -0,0 +1,8 @@
+type: k8s_cluster
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/k8seventsreceiver.yaml b/metric-metadata/k8seventsreceiver.yaml
new file mode 100644
index 0000000..411997b
--- /dev/null
+++ b/metric-metadata/k8seventsreceiver.yaml
@@ -0,0 +1,8 @@
+type: k8s_events
+
+status:
+  class: receiver
+  stability:
+    alpha: [logs]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/k8sobjectsreceiver.yaml b/metric-metadata/k8sobjectsreceiver.yaml
new file mode 100644
index 0000000..3fb1ea8
--- /dev/null
+++ b/metric-metadata/k8sobjectsreceiver.yaml
@@ -0,0 +1,8 @@
+type: k8sobjects
+
+status:
+  class: receiver
+  stability:
+    alpha: [logs]
+  distributions: [contrib, splunk, sumo]
+  
diff --git a/metric-metadata/k8sobserver.yaml b/metric-metadata/k8sobserver.yaml
new file mode 100644
index 0000000..1ac7723
--- /dev/null
+++ b/metric-metadata/k8sobserver.yaml
@@ -0,0 +1,7 @@
+type: k8s_observer
+
+status:
+  class: extension
+  stability:
+    alpha: [extension]
+  distributions: [contrib, splunk, sumo]
diff --git a/metric-metadata/kafkaexporter.yaml b/metric-metadata/kafkaexporter.yaml
new file mode 100644
index 0000000..18b56e8
--- /dev/null
+++ b/metric-metadata/kafkaexporter.yaml
@@ -0,0 +1,7 @@
+type: kafka
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, observiq, splunk, sumo, aws]
diff --git a/metric-metadata/kafkametricsreceiver.yaml b/metric-metadata/kafkametricsreceiver.yaml
index 36378b5..06c79be 100644
--- a/metric-metadata/kafkametricsreceiver.yaml
+++ b/metric-metadata/kafkametricsreceiver.yaml
@@ -1,4 +1,10 @@
-name: kafkametricsreceiver
+type: kafkametrics
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, splunk, sumo]
 
 attributes:
   topic:
@@ -12,20 +18,24 @@ attributes:
     type: string
 
 metrics:
-#  brokers scraper
+  #  brokers scraper
   kafka.brokers:
     enabled: true
     description: Number of brokers in the cluster.
     unit: "{brokers}"
-    gauge:
+    sum:
+      monotonic: false
       value_type: int
-#  topics scraper
+      aggregation: cumulative
+  #  topics scraper
   kafka.topic.partitions:
     enabled: true
     description: Number of partitions in topic.
     unit: "{partitions}"
-    gauge:
+    sum:
+      monotonic: false
       value_type: int
+      aggregation: cumulative
     attributes: [topic]
   kafka.partition.current_offset:
     enabled: true
@@ -45,23 +55,29 @@ metrics:
     enabled: true
     description: Number of replicas for partition of topic
     unit: "{replicas}"
-    gauge:
+    sum:
+      monotonic: false
       value_type: int
+      aggregation: cumulative
     attributes: [topic, partition]
   kafka.partition.replicas_in_sync:
     enabled: true
     description: Number of synchronized replicas of partition
     unit: "{replicas}"
-    gauge:
+    sum:
+      monotonic: false
       value_type: int
+      aggregation: cumulative
     attributes: [topic, partition]
-#  consumers scraper
+  #  consumers scraper
   kafka.consumer_group.members:
     enabled: true
     description: Count of members in the consumer group
     unit: "{members}"
-    gauge:
+    sum:
+      monotonic: false
       value_type: int
+      aggregation: cumulative
     attributes: [group]
   kafka.consumer_group.offset:
     enabled: true
@@ -90,4 +106,4 @@ metrics:
     unit: 1
     gauge:
       value_type: int
-    attributes: [group, topic]
+    attributes: [group, topic]
\ No newline at end of file
diff --git a/metric-metadata/kafkareceiver.yaml b/metric-metadata/kafkareceiver.yaml
new file mode 100644
index 0000000..4b13f00
--- /dev/null
+++ b/metric-metadata/kafkareceiver.yaml
@@ -0,0 +1,8 @@
+type: kafka
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics, logs, traces]
+  distributions: [contrib, splunk, observiq, sumo, aws]
+
diff --git a/metric-metadata/kubeletstatsreceiver.yaml b/metric-metadata/kubeletstatsreceiver.yaml
index 170f8c9..6b52492 100644
--- a/metric-metadata/kubeletstatsreceiver.yaml
+++ b/metric-metadata/kubeletstatsreceiver.yaml
@@ -1,4 +1,10 @@
-name: kubeletstatsreceiver
+type: kubeletstats
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, splunk, sumo]
 
 resource_attributes:
   k8s.node.name:
diff --git a/metric-metadata/lambda.yaml b/metric-metadata/lambda.yaml
new file mode 100644
index 0000000..b71eb7e
--- /dev/null
+++ b/metric-metadata/lambda.yaml
@@ -0,0 +1,41 @@
+type: resourcedetectionprocessor/lambda
+
+parent: resourcedetection
+
+resource_attributes:
+  cloud.provider:
+    description: The cloud.provider
+    type: string
+    enabled: true
+  cloud.platform:
+    description: The cloud.platform
+    type: string
+    enabled: true
+  cloud.region:
+    description: The cloud.region
+    type: string
+    enabled: true
+  aws.log.group.names:
+    description: The aws.log.group.names
+    type: string
+    enabled: true
+  aws.log.stream.names:
+    description: The aws.log.stream.names
+    type: string
+    enabled: true
+  faas.name:
+    description: faas.name
+    type: string
+    enabled: true
+  faas.version:
+    description: The faas.version
+    type: string
+    enabled: true
+  faas.instance:
+    description: The faas.instance
+    type: string
+    enabled: true
+  faas.max_memory:
+    description: The faas.max_memory
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/loadbalancingexporter.yaml b/metric-metadata/loadbalancingexporter.yaml
new file mode 100644
index 0000000..1bbe21e
--- /dev/null
+++ b/metric-metadata/loadbalancingexporter.yaml
@@ -0,0 +1,7 @@
+type: loadbalancing
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, logs]
+  distributions: [contrib, observiq, sumo]
diff --git a/metric-metadata/loadscraper.yaml b/metric-metadata/loadscraper.yaml
index c70adb3..a3f1abf 100644
--- a/metric-metadata/loadscraper.yaml
+++ b/metric-metadata/loadscraper.yaml
@@ -1,4 +1,6 @@
-name: hostmetricsreceiver/load
+type: hostmetricsreceiver/load
+
+parent: hostmetrics
 
 sem_conv_version: 1.9.0
 
diff --git a/metric-metadata/logicmonitorexporter.yaml b/metric-metadata/logicmonitorexporter.yaml
new file mode 100644
index 0000000..4915e47
--- /dev/null
+++ b/metric-metadata/logicmonitorexporter.yaml
@@ -0,0 +1,7 @@
+type: logicmonitor
+
+status:
+  class: exporter
+  stability:
+    alpha: [traces, logs]
+  distributions: [contrib]
diff --git a/metric-metadata/logstransformprocessor.yaml b/metric-metadata/logstransformprocessor.yaml
new file mode 100644
index 0000000..e18438a
--- /dev/null
+++ b/metric-metadata/logstransformprocessor.yaml
@@ -0,0 +1,7 @@
+type: logstransform
+
+status:
+  class: processor
+  stability:
+    development: [logs]
+  distributions: [observiq, splunk, sumo]
diff --git a/metric-metadata/logzioexporter.yaml b/metric-metadata/logzioexporter.yaml
new file mode 100644
index 0000000..26962f4
--- /dev/null
+++ b/metric-metadata/logzioexporter.yaml
@@ -0,0 +1,7 @@
+type: logzio
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, logs]
+  distributions: [contrib, observiq, aws]
diff --git a/metric-metadata/lokiexporter.yaml b/metric-metadata/lokiexporter.yaml
new file mode 100644
index 0000000..2286115
--- /dev/null
+++ b/metric-metadata/lokiexporter.yaml
@@ -0,0 +1,7 @@
+type: loki
+
+status:
+  class: exporter
+  stability:
+    beta: [logs]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/lokireceiver.yaml b/metric-metadata/lokireceiver.yaml
new file mode 100644
index 0000000..2267820
--- /dev/null
+++ b/metric-metadata/lokireceiver.yaml
@@ -0,0 +1,7 @@
+type: loki
+
+status:
+  class: receiver
+  stability:
+    alpha: [logs]
+  distributions: [contrib, sumo]
diff --git a/metric-metadata/mdatagen.yaml b/metric-metadata/mdatagen.yaml
index 6ec457e..054ca38 100644
--- a/metric-metadata/mdatagen.yaml
+++ b/metric-metadata/mdatagen.yaml
@@ -1,9 +1,19 @@
 # Sample metric metadata file with all available configurations.
 
-name: testreceiver
+type: file
 
 sem_conv_version: 1.9.0
 
+status:
+  class: receiver
+  stability:
+    development: [logs]
+    beta: [traces]
+    stable: [metrics]
+  distributions: [contrib]
+  warnings:
+    - Any additional information that should be brought to the consumer's attention
+
 resource_attributes:
   string.resource.attr:
     description: Resource attribute with any string value.
@@ -21,6 +31,16 @@ resource_attributes:
     type: string
     enabled: false
 
+  slice.resource.attr:
+    description: Resource attribute with a slice value.
+    type: slice
+    enabled: true
+
+  map.resource.attr:
+    description: Resource attribute with a map value.
+    type: map 
+    enabled: true
+
 attributes:
   string_attr:
     description: Attribute with any string value.
@@ -40,6 +60,14 @@ attributes:
     description: Attribute with a boolean value.
     type: bool
 
+  slice_attr:
+    description: Attribute with a slice value.
+    type: slice
+
+  map_attr:
+    description: Attribute with a map value.
+    type: map
+
 metrics:
   default.metric:
     enabled: true
@@ -50,7 +78,7 @@ metrics:
       value_type: int
       monotonic: true
       aggregation: cumulative
-    attributes: [string_attr, overridden_int_attr, enum_attr]
+    attributes: [string_attr, overridden_int_attr, enum_attr, slice_attr, map_attr]
     warnings:
       if_enabled_not_set: This metric will be disabled by default soon.
 
diff --git a/metric-metadata/memcachedreceiver.yaml b/metric-metadata/memcachedreceiver.yaml
index c65d72c..777d627 100644
--- a/metric-metadata/memcachedreceiver.yaml
+++ b/metric-metadata/memcachedreceiver.yaml
@@ -1,4 +1,10 @@
-name: memcachedreceiver
+type: memcached
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 attributes:
   command:
diff --git a/metric-metadata/memoryscraper.yaml b/metric-metadata/memoryscraper.yaml
index 319986f..b7596c8 100644
--- a/metric-metadata/memoryscraper.yaml
+++ b/metric-metadata/memoryscraper.yaml
@@ -1,4 +1,6 @@
-name: hostmetricsreceiver/memory
+type: hostmetricsreceiver/memory
+
+parent: hostmetrics
 
 sem_conv_version: 1.9.0
 
diff --git a/metric-metadata/metadataconfig.yaml b/metric-metadata/metadataconfig.yaml
index 2cfa0e8..a5c6ebd 100644
--- a/metric-metadata/metadataconfig.yaml
+++ b/metric-metadata/metadataconfig.yaml
@@ -519,3 +519,22 @@ metadata:
         data:
           type: "gauge"
         unit: "second"
+#
+# -------------------------------------------- Table Size Stats ------------------------------------------------------
+#
+  - name: "hourly table size stats"
+    query: "SELECT * FROM SPANNER_SYS.TABLE_SIZES_STATS_1HOUR WHERE INTERVAL_END = @pullTimestamp ORDER BY INTERVAL_END DESC, USED_BYTES DESC"
+    metric_name_prefix: "database/spanner/table_sizes/top/"
+    timestamp_column_name: "INTERVAL_END"
+    high_cardinality: true
+    labels:
+      - name: "table_name"
+        column_name: "TABLE_NAME"
+        value_type: "string"
+    metrics:
+      - name: "used_bytes"
+        column_name: "USED_BYTES"
+        value_type: "float"
+        data:
+          type: "gauge"
+        unit: "byte"
diff --git a/metric-metadata/metricsgenerationprocessor.yaml b/metric-metadata/metricsgenerationprocessor.yaml
new file mode 100644
index 0000000..b1863e9
--- /dev/null
+++ b/metric-metadata/metricsgenerationprocessor.yaml
@@ -0,0 +1,7 @@
+type: experimental_metricsgeneration
+
+status:
+  class: processor
+  stability:
+    development: [metrics]
+  distributions: [contrib, sumo, aws]
diff --git a/metric-metadata/metricstransformprocessor.yaml b/metric-metadata/metricstransformprocessor.yaml
new file mode 100644
index 0000000..4031fa3
--- /dev/null
+++ b/metric-metadata/metricstransformprocessor.yaml
@@ -0,0 +1,7 @@
+type: metricstransform
+
+status:
+  class: processor
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, splunk, sumo, aws]
diff --git a/metric-metadata/mezmoexporter.yaml b/metric-metadata/mezmoexporter.yaml
new file mode 100644
index 0000000..5955db6
--- /dev/null
+++ b/metric-metadata/mezmoexporter.yaml
@@ -0,0 +1,7 @@
+type: mezmo
+
+status:
+  class: exporter
+  stability:
+    beta: [logs]
+  distributions: [contrib]
diff --git a/metric-metadata/mongodbatlasreceiver.yaml b/metric-metadata/mongodbatlasreceiver.yaml
index 8e127cd..e5cb5ea 100644
--- a/metric-metadata/mongodbatlasreceiver.yaml
+++ b/metric-metadata/mongodbatlasreceiver.yaml
@@ -1,4 +1,10 @@
-name: mongoatlasreceiver
+type: mongodbatlas
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics, logs]
+  distributions: [contrib, splunk, observiq, sumo]
 
 resource_attributes:
   mongodb_atlas.org_name:
@@ -17,6 +23,14 @@ resource_attributes:
     description: Hostname of the process
     enabled: true
     type: string
+  mongodb_atlas.user.alias:
+    description: User-friendly hostname of the cluster node
+    enabled: false
+    type: string
+  mongodb_atlas.cluster.name:
+    description: Cluster Name
+    enabled: false
+    type: string
   mongodb_atlas.process.port:
     description: Port process is bound to
     enabled: true
@@ -340,14 +354,6 @@ metrics:
     attributes: [document_status]
     gauge:
       value_type: double
-  mongodbatlas.process.fts.cpu.usage:
-    enabled: true
-    description: Full text search CPU (%)
-    extended_documentation: Aggregate of MongoDB Metrics FTS_PROCESS_CPU_USER, FTS_PROCESS_CPU_KERNEL
-    unit: 1
-    attributes: [cpu_state]
-    gauge:
-      value_type: double
   mongodbatlas.process.global_lock:
     enabled: true
     description: Number and status of locks
@@ -619,18 +625,16 @@ metrics:
       value_type: double
   mongodbatlas.disk.partition.utilization.max:
     enabled: true
-    description: Disk partition utilization (%)
+    description: The maximum percentage of time during which requests are being issued to and serviced by the partition.
     extended_documentation: MongoDB Metrics MAX_DISK_PARTITION_UTILIZATION
     unit: 1
-    attributes: [disk_status]
     gauge:
       value_type: double
   mongodbatlas.disk.partition.utilization.average:
     enabled: true
-    description: Disk partition utilization (%)
+    description: The percentage of time during which requests are being issued to and serviced by the partition.
     extended_documentation: MongoDB Metrics DISK_PARTITION_UTILIZATION
     unit: 1
-    attributes: [disk_status]
     gauge:
       value_type: double
   mongodbatlas.disk.partition.latency.max:
@@ -701,6 +705,7 @@ metrics:
   mongodbatlas.system.fts.cpu.usage:
     enabled: true
     description: Full-text search (%)
+    extended_documentation: Aggregate of MongoDB Metrics FTS_PROCESS_CPU_USER, FTS_PROCESS_CPU_KERNEL
     unit: 1
     attributes: [cpu_state]
     gauge:
diff --git a/metric-metadata/mongodbreceiver.yaml b/metric-metadata/mongodbreceiver.yaml
index 2cf63d9..fcd3b1b 100644
--- a/metric-metadata/mongodbreceiver.yaml
+++ b/metric-metadata/mongodbreceiver.yaml
@@ -1,4 +1,10 @@
-name: mongodbreceiver
+type: mongodb
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
   database:
@@ -102,7 +108,7 @@ metrics:
       monotonic: false
     attributes: [database]
   mongodb.connection.count:
-    description: The number of connections. 
+    description: The number of connections.
     unit: "{connections}"
     enabled: true
     sum:
@@ -191,7 +197,7 @@ metrics:
     attributes: [ operation ]
   mongodb.storage.size:
     description: The total amount of storage allocated to this collection.
-    extended_documentation: If collection data is compressed it reflects the compressed size. 
+    extended_documentation: If collection data is compressed it reflects the compressed size.
     unit: By
     enabled: true
     sum:
@@ -209,7 +215,7 @@ metrics:
       monotonic: false
     attributes: []
   mongodb.index.access.count:
-    description: The number of times an index has been accessed. 
+    description: The number of times an index has been accessed.
     unit: "{accesses}"
     enabled: true
     sum:
diff --git a/metric-metadata/mysqlreceiver.yaml b/metric-metadata/mysqlreceiver.yaml
index 0f51b36..15e420d 100644
--- a/metric-metadata/mysqlreceiver.yaml
+++ b/metric-metadata/mysqlreceiver.yaml
@@ -1,4 +1,10 @@
-name: mysqlreceiver
+type: mysql
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
   mysql.instance.endpoint:
@@ -35,7 +41,7 @@ attributes:
     name_override: error
     description: The connection error type.
     type: string
-    enum: [accept, internal, max_connections, peer_address, select, tcpwrap]
+    enum: [accept, internal, max_connections, peer_address, select, tcpwrap, aborted, aborted_clients, locked]
   handler:
     name_override: kind
     description: The handler types.
@@ -392,6 +398,15 @@ metrics:
       monotonic: true
       aggregation: cumulative
     attributes: [opened_resources]
+  mysql.uptime:
+    enabled: true
+    description: The number of seconds that the server has been up.
+    unit: s
+    sum:
+      value_type: int
+      input_type: string
+      monotonic: true
+      aggregation: cumulative
   mysql.table.lock_wait.read.count:
     enabled: false
     description: The total table lock wait read events.
@@ -429,8 +444,8 @@ metrics:
       aggregation: cumulative
     attributes: [schema, table_name, write_lock_type]
   mysql.locked_connects:
-    enabled: true
-    description: The number of attempts to connect to locked user accounts.
+    enabled: false
+    description: "[DEPRECATED] The number of attempts to connect to locked user accounts."
     unit: 1
     sum:
       value_type: int
diff --git a/metric-metadata/namespace.yaml b/metric-metadata/namespace.yaml
new file mode 100644
index 0000000..c63baa0
--- /dev/null
+++ b/metric-metadata/namespace.yaml
@@ -0,0 +1,29 @@
+type: k8s/namespace
+
+parent: k8s_cluster
+
+sem_conv_version: 1.18.0
+
+resource_attributes:
+  k8s.namespace.uid:
+    description: The k8s namespace uid.
+    type: string
+    enabled: true
+
+  k8s.namespace.name:
+    description: The k8s namespace name.
+    type: string
+    enabled: true
+
+  opencensus.resourcetype:
+    description: The OpenCensus resource type.
+    type: string
+    enabled: true
+
+metrics:
+  k8s.namespace.phase:
+    enabled: true
+    description: The current phase of namespaces (1 for active and 0 for terminating)
+    unit: 1
+    gauge:
+      value_type: int
\ No newline at end of file
diff --git a/metric-metadata/networkscraper.yaml b/metric-metadata/networkscraper.yaml
index f2c0782..4f02a2c 100644
--- a/metric-metadata/networkscraper.yaml
+++ b/metric-metadata/networkscraper.yaml
@@ -1,4 +1,6 @@
-name: hostmetricsreceiver/network
+type: hostmetricsreceiver/network
+
+parent: hostmetrics
 
 sem_conv_version: 1.9.0
 
diff --git a/metric-metadata/nginxreceiver.yaml b/metric-metadata/nginxreceiver.yaml
index 69fa92c..b74cb1a 100644
--- a/metric-metadata/nginxreceiver.yaml
+++ b/metric-metadata/nginxreceiver.yaml
@@ -1,4 +1,10 @@
-name: nginxreceiver
+type: nginx
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 attributes:
   state:
@@ -42,6 +48,17 @@ metrics:
     enabled: true
     description: The current number of nginx connections by state
     unit: connections
+    sum:
+      value_type: int
+      monotonic: false
+      aggregation: cumulative
+    attributes: [state]
+
+# Old version of metric, to be removed when featuregate is stable
+  temp.connections_current:
+    enabled: true # must be enabled by default in order to apply necessary MetricBuilder option
+    description: Temporary placeholder for old version of nginx.connections_current. See featuregate 'nginx.connections_as_sum'.
+    unit: connections
     gauge:
       value_type: int
     attributes: [state]
diff --git a/metric-metadata/node.yaml b/metric-metadata/node.yaml
new file mode 100644
index 0000000..02c45be
--- /dev/null
+++ b/metric-metadata/node.yaml
@@ -0,0 +1,83 @@
+type: k8s/node
+
+parent: k8s_cluster
+
+sem_conv_version: 1.18.0
+
+resource_attributes:
+  k8s.node.uid:
+    description: The k8s node uid.
+    type: string
+    enabled: true
+
+  k8s.node.name:
+    description: The k8s node name.
+    type: string
+    enabled: true
+
+  opencensus.resourcetype:
+    description: The OpenCensus resource type.
+    type: string
+    enabled: true
+
+metrics:
+  k8s.node.condition_ready:
+    enabled: true
+    description: Whether this node is Ready (1), not Ready (0) or in an unknown state (-1)
+    unit: 1
+    gauge:
+      value_type: int
+  k8s.node.condition_memory_pressure:
+    enabled: true
+    description: Whether this node is MemoryPressure (1), not MemoryPressure (0) or in an unknown state (-1)
+    unit: 1
+    gauge:
+      value_type: int
+  k8s.node.condition_disk_pressure:
+    enabled: true
+    description: Whether this node is DiskPressure (1), not DiskPressure (0) or in an unknown state (-1)
+    unit: 1
+    gauge:
+      value_type: int
+  k8s.node.condition_pid_pressure:
+    enabled: true
+    description: Whether this node is PidPressure (1), not PidPressure (0) or in an unknown state (-1)
+    unit: 1
+    gauge:
+      value_type: int
+  k8s.node.condition_network_unavailable:
+    enabled: true
+    description: Whether this node is NetworkUnavailable (1), not NetworkUnavailable (0) or in an unknown state (-1)
+    unit: 1
+    gauge:
+      value_type: int
+  k8s.node.allocatable_cpu:
+    enabled: true
+    description: How many CPU cores remaining that the node can allocate to pods
+    unit: "{cores}"
+    gauge:
+      value_type: double
+  k8s.node.allocatable_memory:
+    enabled: true
+    description: How many bytes of RAM memory remaining that the node can allocate to pods
+    unit: "By"
+    gauge:
+      value_type: int
+  k8s.node.allocatable_ephemeral_storage:
+    enabled: true
+    description: How many bytes of ephemeral storage remaining that the node can allocate to pods
+    unit: "By"
+    gauge:
+      value_type: int
+  k8s.node.allocatable_storage:
+    enabled: true
+    description: How many bytes of storage remaining that the node can allocate to pods
+    unit: "By"
+    gauge:
+      value_type: int
+  k8s.node.allocatable_pods:
+    enabled: true
+    description: How many pods remaining the node can allocate
+    unit: "{pods}"
+    gauge:
+      value_type: int
\ No newline at end of file
diff --git a/metric-metadata/nsxtreceiver.yaml b/metric-metadata/nsxtreceiver.yaml
index ada611f..3ea7ab9 100644
--- a/metric-metadata/nsxtreceiver.yaml
+++ b/metric-metadata/nsxtreceiver.yaml
@@ -1,5 +1,11 @@
-name: nsxtreceiver
+type: nsxt
 
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, sumo]
+  
 resource_attributes:
   nsxt.node.name:
     description: The name of the NSX Node.
diff --git a/metric-metadata/oauth2clientauthextension.yaml b/metric-metadata/oauth2clientauthextension.yaml
new file mode 100644
index 0000000..584a503
--- /dev/null
+++ b/metric-metadata/oauth2clientauthextension.yaml
@@ -0,0 +1,7 @@
+type: oauth2client
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, sumo, redhat]
diff --git a/metric-metadata/oidcauthextension.yaml b/metric-metadata/oidcauthextension.yaml
new file mode 100644
index 0000000..fe8cd21
--- /dev/null
+++ b/metric-metadata/oidcauthextension.yaml
@@ -0,0 +1,7 @@
+type: oidc
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, observiq, sumo]
diff --git a/metric-metadata/opencensusexporter.yaml b/metric-metadata/opencensusexporter.yaml
new file mode 100644
index 0000000..addd0aa
--- /dev/null
+++ b/metric-metadata/opencensusexporter.yaml
@@ -0,0 +1,7 @@
+type: opencensus
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics]
+  distributions: [contrib, observiq]
diff --git a/metric-metadata/opencensusreceiver.yaml b/metric-metadata/opencensusreceiver.yaml
new file mode 100644
index 0000000..6a6a57a
--- /dev/null
+++ b/metric-metadata/opencensusreceiver.yaml
@@ -0,0 +1,7 @@
+type: opencensus
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics, traces]
+  distributions: [core, contrib, observiq, sumo, redhat]
diff --git a/metric-metadata/openshift.yaml b/metric-metadata/openshift.yaml
new file mode 100644
index 0000000..edfcb52
--- /dev/null
+++ b/metric-metadata/openshift.yaml
@@ -0,0 +1,21 @@
+type: resourcedetectionprocessor/openshift
+
+parent: resourcedetection
+
+resource_attributes:
+  cloud.provider:
+    description: The cloud.provider
+    type: string
+    enabled: true
+  cloud.platform:
+    description: The cloud.platform
+    type: string
+    enabled: true
+  cloud.region:
+    description: The cloud.region
+    type: string
+    enabled: true
+  k8s.cluster.name:
+    description: The k8s.cluster.name
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/oracledbreceiver.yaml b/metric-metadata/oracledbreceiver.yaml
index 3b6934c..df698ac 100644
--- a/metric-metadata/oracledbreceiver.yaml
+++ b/metric-metadata/oracledbreceiver.yaml
@@ -1,4 +1,10 @@
-name: oracledbreceiver
+type: oracledb
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, splunk]
 
 resource_attributes:
   oracledb.instance.name:
@@ -140,14 +146,14 @@ metrics:
       input_type: string
     unit: "{processes}"
   oracledb.processes.limit:
-    description: Maximum limit of active processes.
+    description: Maximum limit of active processes, -1 if unlimited.
     enabled: true
     gauge:
       value_type: int
       input_type: string
     unit: "{processes}"
   oracledb.sessions.limit:
-    description: Maximum limit of active sessions.
+    description: Maximum limit of active sessions, -1 if unlimited.
     enabled: true
     gauge:
       value_type: int
@@ -161,7 +167,7 @@ metrics:
       input_type: string
     unit: "{locks}"
   oracledb.enqueue_locks.limit:
-    description: Maximum limit of active enqueue locks.
+    description: Maximum limit of active enqueue locks, -1 if unlimited.
     enabled: true
     gauge:
       value_type: int
@@ -175,7 +181,7 @@ metrics:
       input_type: string
     unit: "{locks}"
   oracledb.dml_locks.limit:
-    description: Maximum limit of active DML (Data Manipulation Language) locks.
+    description: Maximum limit of active DML (Data Manipulation Language) locks, -1 if unlimited.
     enabled: true
     gauge:
       value_type: int
@@ -189,7 +195,7 @@ metrics:
       input_type: string
     unit: "{resources}"
   oracledb.enqueue_resources.limit:
-    description: Maximum limit of active enqueue resources.
+    description: Maximum limit of active enqueue resources, -1 if unlimited.
     enabled: true
     gauge:
       value_type: int
@@ -203,7 +209,7 @@ metrics:
       input_type: string
     unit: "{transactions}"
   oracledb.transactions.limit:
-    description: Maximum limit of active transactions.
+    description: Maximum limit of active transactions, -1 if unlimited.
     enabled: true
     gauge:
       value_type: int
@@ -212,11 +218,10 @@ metrics:
   oracledb.tablespace_size.limit:
     attributes:
       - tablespace_name
-    description: Maximum size of tablespace in bytes.
+    description: Maximum size of tablespace in bytes, -1 if unlimited.
     enabled: true
     gauge:
       value_type: int
-      input_type: string
     unit: By
   oracledb.tablespace_size.usage:
     attributes:
@@ -227,3 +232,21 @@ metrics:
       value_type: int
       input_type: string
     unit: By
+  oracledb.db_block_gets:
+    description: Number of times a current block was requested from the buffer cache.
+    enabled: false
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+      input_type: string
+    unit: "{gets}"
+  oracledb.consistent_gets:
+    description: Number of times a consistent read was requested for a block from the buffer cache.
+    enabled: false
+    sum:
+      aggregation: cumulative
+      monotonic: true
+      value_type: int
+      input_type: string
+    unit: "{gets}"
\ No newline at end of file
diff --git a/metric-metadata/otlpjsonfilereceiver.yaml b/metric-metadata/otlpjsonfilereceiver.yaml
new file mode 100644
index 0000000..1d7df40
--- /dev/null
+++ b/metric-metadata/otlpjsonfilereceiver.yaml
@@ -0,0 +1,7 @@
+type: otlpjsonfile
+
+status:
+  class: receiver
+  stability:
+    alpha: [traces, metrics, logs]
+  distributions: [contrib, sumo]
diff --git a/metric-metadata/pagingscraper.yaml b/metric-metadata/pagingscraper.yaml
index 7650596..76e2de2 100644
--- a/metric-metadata/pagingscraper.yaml
+++ b/metric-metadata/pagingscraper.yaml
@@ -1,4 +1,6 @@
-name: hostmetricsreceiver/paging
+type: hostmetricsreceiver/paging
+
+parent: hostmetrics
 
 sem_conv_version: 1.9.0
 
diff --git a/metric-metadata/parquetexporter.yaml b/metric-metadata/parquetexporter.yaml
new file mode 100644
index 0000000..bbf29de
--- /dev/null
+++ b/metric-metadata/parquetexporter.yaml
@@ -0,0 +1,7 @@
+type: parquet
+
+status:
+  class: exporter
+  stability:
+    development: [traces, metrics, logs]
+  distributions: [contrib]
diff --git a/metric-metadata/pod.yaml b/metric-metadata/pod.yaml
new file mode 100644
index 0000000..a4c3c08
--- /dev/null
+++ b/metric-metadata/pod.yaml
@@ -0,0 +1,39 @@
+type: k8s/pod
+
+sem_conv_version: 1.18.0
+
+parent: k8s_cluster
+
+resource_attributes:
+  k8s.namespace.name:
+    description: The k8s namespace name.
+    type: string
+    enabled: true
+
+  k8s.node.name:
+    description: The k8s node name.
+    type: string
+    enabled: true
+
+  k8s.pod.name:
+    description: The k8s pod name.
+    type: string
+    enabled: true
+
+  k8s.pod.uid:
+    description: The k8s pod uid.
+    type: string
+    enabled: true
+
+  opencensus.resourcetype:
+    description: The OpenCensus resource type.
+    type: string
+    enabled: true
+
+metrics:
+  k8s.pod.phase:
+    enabled: true
+    description: Current phase of the pod (1 - Pending, 2 - Running, 3 - Succeeded, 4 - Failed, 5 - Unknown)
+    unit: 1
+    gauge:
+      value_type: int
\ No newline at end of file
diff --git a/metric-metadata/podmanreceiver.yaml b/metric-metadata/podmanreceiver.yaml
new file mode 100644
index 0000000..c6ac5f3
--- /dev/null
+++ b/metric-metadata/podmanreceiver.yaml
@@ -0,0 +1,8 @@
+type: podman_stats
+
+status:
+  class: receiver
+  stability:
+    development: [metrics]
+  distributions: [contrib, observiq, sumo]
+
diff --git a/metric-metadata/postgresqlreceiver.yaml b/metric-metadata/postgresqlreceiver.yaml
index 75f1ef6..e097e39 100644
--- a/metric-metadata/postgresqlreceiver.yaml
+++ b/metric-metadata/postgresqlreceiver.yaml
@@ -1,4 +1,10 @@
-name: postgresqlreceiver
+type: postgresql
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, splunk, observiq, sumo]
 
 resource_attributes:
   postgresql.database.name:
@@ -120,6 +126,7 @@ metrics:
       aggregation: cumulative
       monotonic: true
       value_type: int
+    unit: 1
   postgresql.blocks_read:
     enabled: true
     description: The number of blocks read.
@@ -229,6 +236,7 @@ metrics:
       aggregation: cumulative
       monotonic: false
       value_type: int
+    unit: "{table}"
   postgresql.table.size:
     attributes: []
     description: Disk space used by a table.
diff --git a/metric-metadata/pprofextension.yaml b/metric-metadata/pprofextension.yaml
new file mode 100644
index 0000000..6a2d57c
--- /dev/null
+++ b/metric-metadata/pprofextension.yaml
@@ -0,0 +1,7 @@
+type: pprof
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [core, contrib, splunk, observiq, sumo, aws, redhat]
diff --git a/metric-metadata/probabilisticsamplerprocessor.yaml b/metric-metadata/probabilisticsamplerprocessor.yaml
new file mode 100644
index 0000000..ae3bae8
--- /dev/null
+++ b/metric-metadata/probabilisticsamplerprocessor.yaml
@@ -0,0 +1,8 @@
+type: probabilistic_sampler
+
+status:
+  class: processor
+  stability:
+    beta: [traces]
+    alpha: [logs]
+  distributions: [core, contrib, observiq, splunk, sumo, aws]
diff --git a/metric-metadata/processesscraper.yaml b/metric-metadata/processesscraper.yaml
index 3af43ce..008cdac 100644
--- a/metric-metadata/processesscraper.yaml
+++ b/metric-metadata/processesscraper.yaml
@@ -1,4 +1,6 @@
-name: hostmetricsreceiver/processes
+type: hostmetricsreceiver/processes
+
+parent: hostmetrics
 
 sem_conv_version: 1.9.0
 
diff --git a/metric-metadata/processscraper.yaml b/metric-metadata/processscraper.yaml
index 1b22eba..802739a 100644
--- a/metric-metadata/processscraper.yaml
+++ b/metric-metadata/processscraper.yaml
@@ -1,4 +1,6 @@
-name: hostmetricsreceiver/process
+type: hostmetricsreceiver/process
+
+parent: hostmetrics
 
 sem_conv_version: 1.9.0
 
@@ -90,20 +92,6 @@ metrics:
       value_type: double
     attributes: [state]
 
-  process.memory.physical_usage:
-    enabled: false
-    description: "[DEPRECATED] Use `process.memory.usage` metric instead. The amount of physical memory in use."
-    warnings:
-      if_configured: >-
-        The metric is deprecated and will be removed in v0.72.0. Please use `process.memory.usage` instead. See
-        https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/hostmetricsreceiver#transition-to-process-memory-metric-names-aligned-with-opentelemetry-specification
-        for more details.
-    unit: By
-    sum:
-      value_type: int
-      aggregation: cumulative
-      monotonic: false
-
   process.memory.usage:
     enabled: true
     description: The amount of physical memory in use.
@@ -113,20 +101,6 @@ metrics:
       aggregation: cumulative
       monotonic: false
 
-  process.memory.virtual_usage:
-    enabled: false
-    description: "[DEPRECATED] Use `process.memory.virtual` metric instead. Virtual memory size."
-    warnings:
-      if_configured: >-
-        The metric is deprecated and will be removed in v0.72.0. Please use `process.memory.virtual` metric instead. See 
-        https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/hostmetricsreceiver#transition-to-process-memory-metric-names-aligned-with-opentelemetry-specification
-        for more details.
-    unit: By
-    sum:
-      value_type: int
-      aggregation: cumulative
-      monotonic: false
-
   process.memory.virtual:
     enabled: true
     description: Virtual memory size.
@@ -155,7 +129,8 @@ metrics:
 
   process.paging.faults:
     enabled: false
-    description: Number of page faults the process has made. This metric is only available on Linux.
+    description: Number of page faults the process has made.
+    extended_documentation: This metric is only available on Linux.
     unit: "{faults}"
     sum:
       value_type: int
@@ -165,7 +140,8 @@ metrics:
 
   process.signals_pending:
     enabled: false
-    description: Number of pending signals for the process. This metric is only available on Linux.
+    description: Number of pending signals for the process.
+    extended_documentation: This metric is only available on Linux.
     unit: "{signals}"
     sum:
       value_type: int
@@ -184,6 +160,17 @@ metrics:
   process.open_file_descriptors:
     enabled: false
     description: Number of file descriptors in use by the process.
+    extended_documentation: This metric is only available on Linux.
+    unit: '{count}'
+    sum:
+      value_type: int
+      aggregation: cumulative
+      monotonic: false
+
+  process.handles:
+    enabled: false
+    description: Number of handles held by the process.
+    extended_documentation: This metric is only available on Windows.
     unit: '{count}'
     sum:
       value_type: int
@@ -193,6 +180,7 @@ metrics:
   process.context_switches:
     enabled: false
     description: Number of times the process has been context switched.
+    extended_documentation: This metric is only available on Linux.
     unit: '{count}'
     sum:
       value_type: int
diff --git a/metric-metadata/prometheusexecreceiver.yaml b/metric-metadata/prometheusexecreceiver.yaml
new file mode 100644
index 0000000..8e038b3
--- /dev/null
+++ b/metric-metadata/prometheusexecreceiver.yaml
@@ -0,0 +1,8 @@
+type: prometheus_exec
+
+status:
+  class: receiver
+  stability:
+    deprecated: [metrics]
+  distributions: [splunk]
+  
diff --git a/metric-metadata/prometheusexporter.yaml b/metric-metadata/prometheusexporter.yaml
new file mode 100644
index 0000000..3d2512d
--- /dev/null
+++ b/metric-metadata/prometheusexporter.yaml
@@ -0,0 +1,7 @@
+type: prometheus
+
+status:
+  class: exporter
+  stability:
+    beta: [metrics]
+  distributions: [core, contrib, observiq, sumo, aws, redhat]
diff --git a/metric-metadata/prometheusreceiver.yaml b/metric-metadata/prometheusreceiver.yaml
new file mode 100644
index 0000000..ddedfea
--- /dev/null
+++ b/metric-metadata/prometheusreceiver.yaml
@@ -0,0 +1,8 @@
+type: prometheus
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [core, contrib, splunk, observiq, sumo, aws]
+
diff --git a/metric-metadata/prometheusremotewriteexporter.yaml b/metric-metadata/prometheusremotewriteexporter.yaml
new file mode 100644
index 0000000..96903a1
--- /dev/null
+++ b/metric-metadata/prometheusremotewriteexporter.yaml
@@ -0,0 +1,7 @@
+type: prometheusremotewrite
+
+status:
+  class: exporter
+  stability:
+    beta: [metrics]
+  distributions: [core, contrib, aws, observiq]
diff --git a/metric-metadata/pulsarexporter.yaml b/metric-metadata/pulsarexporter.yaml
new file mode 100644
index 0000000..993b2ae
--- /dev/null
+++ b/metric-metadata/pulsarexporter.yaml
@@ -0,0 +1,7 @@
+type: pulsar
+
+status:
+  class: exporter
+  stability:
+    alpha: [traces, metrics, logs]
+  distributions: [contrib]
diff --git a/metric-metadata/pulsarreceiver.yaml b/metric-metadata/pulsarreceiver.yaml
new file mode 100644
index 0000000..8daf59d
--- /dev/null
+++ b/metric-metadata/pulsarreceiver.yaml
@@ -0,0 +1,8 @@
+type: pulsar
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics, traces, logs]
+  distributions: [contrib]
+  
diff --git a/metric-metadata/purefareceiver.yaml b/metric-metadata/purefareceiver.yaml
new file mode 100644
index 0000000..ce8f4c7
--- /dev/null
+++ b/metric-metadata/purefareceiver.yaml
@@ -0,0 +1,8 @@
+type: purefa
+
+status:
+  class: receiver
+  stability:
+    development: [metrics]
+  distributions: [contrib, sumo]
+  
diff --git a/metric-metadata/purefbreceiver.yaml b/metric-metadata/purefbreceiver.yaml
new file mode 100644
index 0000000..497b6aa
--- /dev/null
+++ b/metric-metadata/purefbreceiver.yaml
@@ -0,0 +1,8 @@
+type: purefb
+
+status:
+  class: receiver
+  stability:
+    development: [metrics]
+  distributions: [contrib, sumo]
+  
diff --git a/metric-metadata/rabbitmqreceiver.yaml b/metric-metadata/rabbitmqreceiver.yaml
index bf15678..0d87ba1 100644
--- a/metric-metadata/rabbitmqreceiver.yaml
+++ b/metric-metadata/rabbitmqreceiver.yaml
@@ -1,4 +1,10 @@
-name: rabbitmqreceiver
+type: rabbitmq
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
   rabbitmq.queue.name:
diff --git a/metric-metadata/receivercreator.yaml b/metric-metadata/receivercreator.yaml
new file mode 100644
index 0000000..9d488db
--- /dev/null
+++ b/metric-metadata/receivercreator.yaml
@@ -0,0 +1,8 @@
+type: receiver_creator
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+    alpha: [logs, traces]
+  distributions: [contrib, splunk, sumo]
diff --git a/metric-metadata/redactionprocessor.yaml b/metric-metadata/redactionprocessor.yaml
new file mode 100644
index 0000000..5a54c83
--- /dev/null
+++ b/metric-metadata/redactionprocessor.yaml
@@ -0,0 +1,7 @@
+type: redaction
+
+status:
+  class: processor
+  stability:
+    beta: [traces]
+  distributions: [contrib, sumo]
diff --git a/metric-metadata/redisreceiver.yaml b/metric-metadata/redisreceiver.yaml
index 71797e9..a25e3eb 100644
--- a/metric-metadata/redisreceiver.yaml
+++ b/metric-metadata/redisreceiver.yaml
@@ -1,11 +1,17 @@
-name: redisreceiver
+type: redis
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, splunk, observiq, sumo]
 
 resource_attributes:
   redis.version:
     description: Redis server's version.
     enabled: true
     type: string
-    
+
 attributes:
   state:
     description: Redis CPU usage state
@@ -24,7 +30,7 @@ attributes:
       - sys_main_thread
       - user
       - user_children
-      - user_main_thread 
+      - user_main_thread
   db:
     description: Redis database identifier
     type: string
@@ -106,14 +112,14 @@ metrics:
   redis.clients.max_input_buffer:
     enabled: true
     description: Biggest input buffer among current client connections
-    unit: ""
+    unit: "By"
     gauge:
       value_type: int
 
   redis.clients.max_output_buffer:
     enabled: true
     description: Longest output list among current client connections
-    unit: ""
+    unit: "By"
     gauge:
       value_type: int
 
@@ -278,14 +284,14 @@ metrics:
   redis.replication.backlog_first_byte_offset:
     enabled: true
     description: The master offset of the replication backlog buffer
-    unit: ""
+    unit: "By"
     gauge:
       value_type: int
 
   redis.replication.offset:
     enabled: true
     description: The server's current replication offset
-    unit: ""
+    unit: "By"
     gauge:
       value_type: int
 
diff --git a/metric-metadata/remoteobserverprocessor.yaml b/metric-metadata/remoteobserverprocessor.yaml
new file mode 100644
index 0000000..95c1d32
--- /dev/null
+++ b/metric-metadata/remoteobserverprocessor.yaml
@@ -0,0 +1,7 @@
+type: remoteobserver
+
+status:
+  class: processor
+  stability:
+    alpha: [logs, metrics, traces]
+  distributions: []
diff --git a/metric-metadata/resourcedetectionprocessor.yaml b/metric-metadata/resourcedetectionprocessor.yaml
new file mode 100644
index 0000000..80bbdb1
--- /dev/null
+++ b/metric-metadata/resourcedetectionprocessor.yaml
@@ -0,0 +1,7 @@
+type: resourcedetection
+
+status:
+  class: processor
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, splunk, observiq, sumo, aws, redhat]
diff --git a/metric-metadata/resourceprocessor.yaml b/metric-metadata/resourceprocessor.yaml
new file mode 100644
index 0000000..ba66533
--- /dev/null
+++ b/metric-metadata/resourceprocessor.yaml
@@ -0,0 +1,7 @@
+type: resource
+
+status:
+  class: processor
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [core, contrib, splunk, observiq, sumo, aws, redhat]
diff --git a/metric-metadata/resourcequota.yaml b/metric-metadata/resourcequota.yaml
new file mode 100644
index 0000000..02a98dc
--- /dev/null
+++ b/metric-metadata/resourcequota.yaml
@@ -0,0 +1,51 @@
+type: k8s/resourcequota
+
+parent: k8s_cluster
+
+sem_conv_version: 1.18.0
+
+resource_attributes:
+  k8s.resourcequota.uid:
+    description: The k8s resourcequota uid.
+    type: string
+    enabled: true
+
+  k8s.resourcequota.name:
+    description: The k8s resourcequota name.
+    type: string
+    enabled: true
+
+  k8s.namespace.name:
+    description: The name of the namespace that the pod is running in.
+    type: string
+    enabled: true
+
+  opencensus.resourcetype:
+    description: The OpenCensus resource type.
+    type: string
+    enabled: true
+
+attributes:
+  resource:
+    description: the name of the resource on which the quota is applied
+    type: string
+    enabled: true
+
+metrics:
+  k8s.resource_quota.hard_limit:
+    enabled: true
+    description: The upper limit for a particular resource in a specific namespace. Will only be sent if a quota is specified. CPU requests/limits will be sent as millicores
+    unit: 1
+    gauge:
+      value_type: int
+    attributes:
+      - resource
+
+  k8s.resource_quota.used:
+    enabled: true
+    description: The usage for a particular resource in a specific namespace. Will only be sent if a quota is specified. CPU requests/limits will be sent as millicores
+    unit: 1
+    gauge:
+      value_type: int
+    attributes:
+      - resource
diff --git a/metric-metadata/riakreceiver.yaml b/metric-metadata/riakreceiver.yaml
index 952cf13..b9c29eb 100644
--- a/metric-metadata/riakreceiver.yaml
+++ b/metric-metadata/riakreceiver.yaml
@@ -1,4 +1,10 @@
-name: riakreceiver
+type: riak
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
   riak.node.name:
diff --git a/metric-metadata/routingprocessor.yaml b/metric-metadata/routingprocessor.yaml
new file mode 100644
index 0000000..630f1fe
--- /dev/null
+++ b/metric-metadata/routingprocessor.yaml
@@ -0,0 +1,7 @@
+type: routing
+
+status:
+  class: processor
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, observiq, splunk, sumo, redhat]
diff --git a/metric-metadata/saphanareceiver.yaml b/metric-metadata/saphanareceiver.yaml
index d66437d..f57ec1b 100644
--- a/metric-metadata/saphanareceiver.yaml
+++ b/metric-metadata/saphanareceiver.yaml
@@ -1,4 +1,11 @@
-name: saphanareceiver
+type: saphana
+
+status:
+  class: receiver
+  stability:
+    development: [metrics]
+  distributions: [contrib, observiq, sumo]
+
 resource_attributes:
   saphana.host:
     type: string
diff --git a/metric-metadata/sapmexporter.yaml b/metric-metadata/sapmexporter.yaml
new file mode 100644
index 0000000..ead2f45
--- /dev/null
+++ b/metric-metadata/sapmexporter.yaml
@@ -0,0 +1,7 @@
+type: sapm
+
+status:
+  class: exporter
+  stability:
+    beta: [traces]
+  distributions: [contrib, splunk, observiq, aws]
diff --git a/metric-metadata/sapmreceiver.yaml b/metric-metadata/sapmreceiver.yaml
new file mode 100644
index 0000000..e5112b7
--- /dev/null
+++ b/metric-metadata/sapmreceiver.yaml
@@ -0,0 +1,7 @@
+type: sapm
+
+status:
+  class: receiver
+  stability:
+    beta: [traces]
+  distributions: [contrib, splunk, observiq, sumo]
diff --git a/metric-metadata/schemaprocessor.yaml b/metric-metadata/schemaprocessor.yaml
new file mode 100644
index 0000000..31f8374
--- /dev/null
+++ b/metric-metadata/schemaprocessor.yaml
@@ -0,0 +1,7 @@
+type: schema
+
+status:
+  class: processor
+  stability:
+    development: [traces, metrics, logs]
+  distributions: [sumo]
diff --git a/metric-metadata/sentryexporter.yaml b/metric-metadata/sentryexporter.yaml
new file mode 100644
index 0000000..8820b35
--- /dev/null
+++ b/metric-metadata/sentryexporter.yaml
@@ -0,0 +1,7 @@
+type: sentry
+
+status:
+  class: exporter
+  stability:
+    beta: [traces]
+  distributions: [contrib]
diff --git a/metric-metadata/servicegraphconnector.yaml b/metric-metadata/servicegraphconnector.yaml
new file mode 100644
index 0000000..ef39f2d
--- /dev/null
+++ b/metric-metadata/servicegraphconnector.yaml
@@ -0,0 +1,7 @@
+type: servicegraph
+
+status:
+  class: connector
+  stability:
+    alpha: [traces_to_metrics]
+  distributions: [contrib, sumo]
diff --git a/metric-metadata/servicegraphprocessor.yaml b/metric-metadata/servicegraphprocessor.yaml
new file mode 100644
index 0000000..862f716
--- /dev/null
+++ b/metric-metadata/servicegraphprocessor.yaml
@@ -0,0 +1,8 @@
+type: servicegraph
+
+status:
+  class: processor
+  stability:
+    alpha: [traces]
+  distributions: [contrib, sumo]
+  warnings: []
diff --git a/metric-metadata/signalfxexporter.yaml b/metric-metadata/signalfxexporter.yaml
new file mode 100644
index 0000000..d65db12
--- /dev/null
+++ b/metric-metadata/signalfxexporter.yaml
@@ -0,0 +1,7 @@
+type: signalfx
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, splunk, observiq, aws]
diff --git a/metric-metadata/signalfxreceiver.yaml b/metric-metadata/signalfxreceiver.yaml
new file mode 100644
index 0000000..7a7b4a0
--- /dev/null
+++ b/metric-metadata/signalfxreceiver.yaml
@@ -0,0 +1,7 @@
+type: signalfx
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics, logs]
+  distributions: [contrib, splunk, sumo]
diff --git a/metric-metadata/sigv4authextension.yaml b/metric-metadata/sigv4authextension.yaml
new file mode 100644
index 0000000..501b3f5
--- /dev/null
+++ b/metric-metadata/sigv4authextension.yaml
@@ -0,0 +1,7 @@
+type: sigv4auth
+
+status:
+  class: extension
+  stability:
+    beta: [extension]
+  distributions: [contrib, aws, sumo]
diff --git a/metric-metadata/simpleprometheusreceiver.yaml b/metric-metadata/simpleprometheusreceiver.yaml
new file mode 100644
index 0000000..3c23ca9
--- /dev/null
+++ b/metric-metadata/simpleprometheusreceiver.yaml
@@ -0,0 +1,8 @@
+type: prometheus_simple
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/skywalkingexporter.yaml b/metric-metadata/skywalkingexporter.yaml
new file mode 100644
index 0000000..30ed076
--- /dev/null
+++ b/metric-metadata/skywalkingexporter.yaml
@@ -0,0 +1,7 @@
+type: skywalking
+
+status:
+  class: exporter
+  stability:
+    beta: [metrics, logs]
+  distributions: [contrib]
diff --git a/metric-metadata/skywalkingreceiver.yaml b/metric-metadata/skywalkingreceiver.yaml
new file mode 100644
index 0000000..71de6ab
--- /dev/null
+++ b/metric-metadata/skywalkingreceiver.yaml
@@ -0,0 +1,8 @@
+type: skywalking
+
+status:
+  class: receiver
+  stability:
+    beta: [traces]
+  distributions: [contrib, sumo]
+  
diff --git a/metric-metadata/snmpreceiver.yaml b/metric-metadata/snmpreceiver.yaml
new file mode 100644
index 0000000..b4fd019
--- /dev/null
+++ b/metric-metadata/snmpreceiver.yaml
@@ -0,0 +1,7 @@
+type: snmp
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, sumo]
diff --git a/metric-metadata/snowflakereceiver.yaml b/metric-metadata/snowflakereceiver.yaml
index 1068bcd..b444777 100644
--- a/metric-metadata/snowflakereceiver.yaml
+++ b/metric-metadata/snowflakereceiver.yaml
@@ -1,4 +1,11 @@
-name: snowflakereceiver
+type: snowflake
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib]
+
 
 # every meter will have these attributes
 resource_attributes:
diff --git a/metric-metadata/solacereceiver.yaml b/metric-metadata/solacereceiver.yaml
new file mode 100644
index 0000000..aefd792
--- /dev/null
+++ b/metric-metadata/solacereceiver.yaml
@@ -0,0 +1,8 @@
+type: solace
+
+status:
+  class: receiver
+  stability:
+    beta: [traces]
+  distributions: [contrib, sumo]
+  
diff --git a/metric-metadata/spanmetricsconnector.yaml b/metric-metadata/spanmetricsconnector.yaml
new file mode 100644
index 0000000..67c8a76
--- /dev/null
+++ b/metric-metadata/spanmetricsconnector.yaml
@@ -0,0 +1,7 @@
+type: spanmetrics
+
+status:
+  class: connector
+  stability:
+    alpha: [traces_to_metrics]
+  distributions: [contrib, sumo]
diff --git a/metric-metadata/spanmetricsprocessor.yaml b/metric-metadata/spanmetricsprocessor.yaml
new file mode 100644
index 0000000..48fd8e7
--- /dev/null
+++ b/metric-metadata/spanmetricsprocessor.yaml
@@ -0,0 +1,7 @@
+type: spanmetrics
+
+status:
+  class: processor
+  stability:
+    deprecated: [traces]
+  distributions: [contrib, observiq, splunk, sumo]
diff --git a/metric-metadata/spanprocessor.yaml b/metric-metadata/spanprocessor.yaml
new file mode 100644
index 0000000..6fac613
--- /dev/null
+++ b/metric-metadata/spanprocessor.yaml
@@ -0,0 +1,7 @@
+type: span
+
+status:
+  class: processor
+  stability:
+    alpha: [traces]
+  distributions: [core, contrib, observiq, splunk, sumo, aws, redhat]
diff --git a/metric-metadata/splunkenterprisereceiver.yaml b/metric-metadata/splunkenterprisereceiver.yaml
new file mode 100644
index 0000000..113d061
--- /dev/null
+++ b/metric-metadata/splunkenterprisereceiver.yaml
@@ -0,0 +1,7 @@
+type: splunkenterprise
+
+status:
+  class: receiver
+  stability:
+    development: [metrics]
+  distributions:
diff --git a/metric-metadata/splunkhecexporter.yaml b/metric-metadata/splunkhecexporter.yaml
new file mode 100644
index 0000000..f3ebc9d
--- /dev/null
+++ b/metric-metadata/splunkhecexporter.yaml
@@ -0,0 +1,7 @@
+type: splunk_hec
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics, logs]
+  distributions: [contrib, splunk, observiq]
\ No newline at end of file
diff --git a/metric-metadata/splunkhecreceiver.yaml b/metric-metadata/splunkhecreceiver.yaml
new file mode 100644
index 0000000..7bd17ce
--- /dev/null
+++ b/metric-metadata/splunkhecreceiver.yaml
@@ -0,0 +1,7 @@
+type: splunk_hec
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics, logs]
+  distributions: [contrib, splunk, sumo]
diff --git a/metric-metadata/sqlqueryreceiver.yaml b/metric-metadata/sqlqueryreceiver.yaml
new file mode 100644
index 0000000..5b0a6e1
--- /dev/null
+++ b/metric-metadata/sqlqueryreceiver.yaml
@@ -0,0 +1,8 @@
+type: sqlquery
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+    development: [logs]
+  distributions: [contrib, splunk, observiq, sumo]
diff --git a/metric-metadata/sqlserverreceiver.yaml b/metric-metadata/sqlserverreceiver.yaml
index 21abe34..5b8d23a 100644
--- a/metric-metadata/sqlserverreceiver.yaml
+++ b/metric-metadata/sqlserverreceiver.yaml
@@ -1,10 +1,24 @@
-name: sqlserverreceiver
+type: sqlserver
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
   sqlserver.database.name:
     description: The name of the SQL Server database.
     enabled: true
     type: string
+  sqlserver.instance.name:
+    description: The name of the SQL Server instance being monitored.
+    enabled: false
+    type: string
+  sqlserver.computer.name:
+    description: The name of the SQL Server instance being monitored.
+    enabled: false
+    type: string
 
 attributes:
   page.operations:
diff --git a/metric-metadata/sshcheckreceiver.yaml b/metric-metadata/sshcheckreceiver.yaml
new file mode 100644
index 0000000..c2db4ac
--- /dev/null
+++ b/metric-metadata/sshcheckreceiver.yaml
@@ -0,0 +1,65 @@
+type: sshcheck
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, sumo]
+  
+resource_attributes:
+  ssh.endpoint:
+    description: Full SSH endpoint
+    type: string
+
+attributes:
+  error.message:
+    description: Error message recorded during check
+    type: string
+
+metrics:
+  sshcheck.status:
+    description: 1 if the SSH client successfully connected, otherwise 0.
+    enabled: true
+    sum:
+      value_type: int
+      aggregation: cumulative
+      monotonic: false
+    unit: 1
+  sshcheck.duration:
+    description: Measures the duration of SSH connection.
+    enabled: true
+    gauge:
+      value_type: int
+    unit: ms
+  sshcheck.error:
+    description: Records errors occurring during SSH check.
+    enabled: true
+    sum:
+      value_type: int
+      aggregation: cumulative
+      monotonic: false
+    unit: "{error}"
+    attributes: [error.message]
+  sshcheck.sftp_status:
+    description: 1 if the SFTP server replied to request, otherwise 0.
+    enabled: false
+    sum:
+      value_type: int
+      aggregation: cumulative
+      monotonic: false
+    unit: 1
+  sshcheck.sftp_duration:
+    description: Measures SFTP request duration.
+    enabled: false
+    gauge:
+      value_type: int
+    unit: ms
+  sshcheck.sftp_error:
+    description: Records errors occurring during SFTP check.
+    enabled: false
+    sum:
+      value_type: int
+      aggregation: cumulative
+      monotonic: false
+    unit: "{error}"
+    attributes: [error.message]
diff --git a/metric-metadata/statefulset.yaml b/metric-metadata/statefulset.yaml
new file mode 100644
index 0000000..1f98e67
--- /dev/null
+++ b/metric-metadata/statefulset.yaml
@@ -0,0 +1,55 @@
+type: k8s/statefulset
+
+parent: k8s_cluster
+
+sem_conv_version: 1.18.0
+
+resource_attributes:
+  k8s.statefulset.uid:
+    description: The k8s statefulset uid.
+    type: string
+    enabled: true
+
+  k8s.statefulset.name:
+    description: The k8s statefulset name.
+    type: string
+    enabled: true
+
+  k8s.namespace.name:
+    description: The name of the namespace that the pod is running in.
+    type: string
+    enabled: true
+
+  opencensus.resourcetype:
+    description: The OpenCensus resource type.
+    type: string
+    enabled: true
+
+metrics:
+  k8s.statefulset.desired_pods:
+    enabled: true
+    description: Number of desired pods in the stateful set (the `spec.replicas` field)
+    unit: 1
+    gauge:
+      value_type: int
+
+  k8s.statefulset.ready_pods:
+    enabled: true
+    description: Number of pods created by the stateful set that have the `Ready` condition
+    unit: 1
+    gauge:
+      value_type: int
+
+  k8s.statefulset.current_pods:
+    enabled: true
+    description: The number of pods created by the StatefulSet controller from the StatefulSet version
+    unit: 1
+    gauge:
+      value_type: int
+
+  k8s.statefulset.updated_pods:
+    enabled: true
+    description: Number of pods created by the StatefulSet controller from the StatefulSet version
+    unit: 1
+    gauge:
+      value_type: int
diff --git a/metric-metadata/statsdreceiver.yaml b/metric-metadata/statsdreceiver.yaml
new file mode 100644
index 0000000..0e2c8ba
--- /dev/null
+++ b/metric-metadata/statsdreceiver.yaml
@@ -0,0 +1,7 @@
+type: statsd
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, splunk, sumo, aws]
diff --git a/metric-metadata/sumologicexporter.yaml b/metric-metadata/sumologicexporter.yaml
new file mode 100644
index 0000000..be04cc0
--- /dev/null
+++ b/metric-metadata/sumologicexporter.yaml
@@ -0,0 +1,7 @@
+type: sumologic
+
+status:
+  class: exporter
+  stability:
+    beta: [metrics, logs]
+  distributions: [contrib]
diff --git a/metric-metadata/syslogexporter.yaml b/metric-metadata/syslogexporter.yaml
new file mode 100644
index 0000000..d4f1293
--- /dev/null
+++ b/metric-metadata/syslogexporter.yaml
@@ -0,0 +1,6 @@
+type: syslog
+
+status:
+  class: exporter
+  stability: 
+    development: [logs]
diff --git a/metric-metadata/syslogreceiver.yaml b/metric-metadata/syslogreceiver.yaml
new file mode 100644
index 0000000..821ad98
--- /dev/null
+++ b/metric-metadata/syslogreceiver.yaml
@@ -0,0 +1,8 @@
+type: syslog
+
+status:
+  class: receiver
+  stability:
+    alpha: [logs]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/system.yaml b/metric-metadata/system.yaml
new file mode 100644
index 0000000..c237e42
--- /dev/null
+++ b/metric-metadata/system.yaml
@@ -0,0 +1,17 @@
+type: resourcedetectionprocessor/system
+
+parent: resourcedetection
+
+resource_attributes:
+  host.name:
+    description: The host.name
+    type: string
+    enabled: true
+  host.id:
+    description: The host.id
+    type: string
+    enabled: true
+  os.type:
+    description: The os.type
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/tailsamplingprocessor.yaml b/metric-metadata/tailsamplingprocessor.yaml
new file mode 100644
index 0000000..3d23ee7
--- /dev/null
+++ b/metric-metadata/tailsamplingprocessor.yaml
@@ -0,0 +1,7 @@
+type: tail_sampling
+
+status:
+  class: processor
+  stability:
+    beta: [traces]
+  distributions: [contrib, observiq, splunk, sumo, aws]
diff --git a/metric-metadata/tanzuobservabilityexporter.yaml b/metric-metadata/tanzuobservabilityexporter.yaml
new file mode 100644
index 0000000..de07f7f
--- /dev/null
+++ b/metric-metadata/tanzuobservabilityexporter.yaml
@@ -0,0 +1,7 @@
+type: tanzuobservability
+
+status:
+  class: exporter
+  stability:
+    beta: [traces, metrics]
+  distributions: [contrib]
diff --git a/metric-metadata/tcplogreceiver.yaml b/metric-metadata/tcplogreceiver.yaml
new file mode 100644
index 0000000..b9c1c8e
--- /dev/null
+++ b/metric-metadata/tcplogreceiver.yaml
@@ -0,0 +1,8 @@
+type: tcplog
+
+status:
+  class: receiver
+  stability:
+    alpha: [logs]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/telemetrygen.yaml b/metric-metadata/telemetrygen.yaml
new file mode 100644
index 0000000..80089ed
--- /dev/null
+++ b/metric-metadata/telemetrygen.yaml
@@ -0,0 +1,7 @@
+type: telemetrygen
+
+status:
+  class: cmd
+  stability:
+    alpha: [traces]
+    development: [metrics, logs]
diff --git a/metric-metadata/tencentcloudlogserviceexporter.yaml b/metric-metadata/tencentcloudlogserviceexporter.yaml
new file mode 100644
index 0000000..add0af4
--- /dev/null
+++ b/metric-metadata/tencentcloudlogserviceexporter.yaml
@@ -0,0 +1,8 @@
+type: tencentcloud_logservice
+
+status:
+  class: exporter
+  stability:
+    beta: [logs]
+  distributions: [contrib]
+
diff --git a/metric-metadata/transformprocessor.yaml b/metric-metadata/transformprocessor.yaml
new file mode 100644
index 0000000..14f1b1a
--- /dev/null
+++ b/metric-metadata/transformprocessor.yaml
@@ -0,0 +1,8 @@
+type: transform
+
+status:
+  class: processor
+  stability:
+    alpha: [traces, metrics, logs]
+  distributions: [contrib, splunk, observiq, sumo]
+  warnings: [Unsound Transformations, Identity Conflict, Orphaned Telemetry, Other]
diff --git a/metric-metadata/udplogreceiver.yaml b/metric-metadata/udplogreceiver.yaml
new file mode 100644
index 0000000..aed7e39
--- /dev/null
+++ b/metric-metadata/udplogreceiver.yaml
@@ -0,0 +1,8 @@
+type: udplog
+
+status:
+  class: receiver
+  stability:
+    alpha: [logs]
+  distributions: [contrib, observiq, sumo]
+
diff --git a/metric-metadata/vcenterreceiver.yaml b/metric-metadata/vcenterreceiver.yaml
index 7891098..5f83ba5 100644
--- a/metric-metadata/vcenterreceiver.yaml
+++ b/metric-metadata/vcenterreceiver.yaml
@@ -1,4 +1,10 @@
-name: vcenterreceiver
+type: vcenter
+
+status:
+  class: receiver
+  stability:
+    alpha: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
   vcenter.cluster.name:
@@ -154,7 +160,7 @@ metrics:
     attributes: []
   vcenter.host.cpu.usage:
     enabled: true
-    description: The amount of CPU in Hz used by the host.
+    description: The amount of CPU used by the host.
     unit: "MHz"
     sum:
       monotonic: false
@@ -382,3 +388,26 @@ metrics:
       aggregation: cumulative
     attributes: []
     extended_documentation: As measured over the most recent 20s interval.
+  vcenter.vm.cpu.utilization:
+    enabled: true
+    description: The CPU utilization of the VM.
+    unit: "%"
+    gauge:
+      value_type: double
+    attributes: []
+  vcenter.vm.cpu.usage:
+    enabled: true
+    description: The amount of CPU used by the VM.
+    unit: "MHz"
+    sum:
+      monotonic: false
+      value_type: int
+      aggregation: cumulative
+    attributes: []
+  vcenter.vm.memory.utilization:
+    enabled: false
+    description: The memory utilization of the VM.
+    unit: "%"
+    gauge:
+      value_type: double
+    attributes: []
diff --git a/metric-metadata/wavefrontreceiver.yaml b/metric-metadata/wavefrontreceiver.yaml
new file mode 100644
index 0000000..094b2aa
--- /dev/null
+++ b/metric-metadata/wavefrontreceiver.yaml
@@ -0,0 +1,9 @@
+type: wavefront
+
+status:
+  class: receiver
+  stability:
+    unmaintained: [metrics]
+  distributions: [contrib, sumo]
+  
+
diff --git a/metric-metadata/webhookeventreceiver.yaml b/metric-metadata/webhookeventreceiver.yaml
new file mode 100644
index 0000000..d321239
--- /dev/null
+++ b/metric-metadata/webhookeventreceiver.yaml
@@ -0,0 +1,8 @@
+type: webhookevent
+
+status:
+  class: receiver
+  stability:
+    alpha: [logs]
+  distributions:
+  
diff --git a/metric-metadata/windowseventlogreceiver.yaml b/metric-metadata/windowseventlogreceiver.yaml
new file mode 100644
index 0000000..0ffcf7d
--- /dev/null
+++ b/metric-metadata/windowseventlogreceiver.yaml
@@ -0,0 +1,8 @@
+type: windowseventlog
+
+status:
+  class: receiver
+  stability:
+    alpha: [logs]
+  distributions: [splunk, observiq, sumo]
+
diff --git a/metric-metadata/windowsperfcountersreceiver.yaml b/metric-metadata/windowsperfcountersreceiver.yaml
new file mode 100644
index 0000000..df77c75
--- /dev/null
+++ b/metric-metadata/windowsperfcountersreceiver.yaml
@@ -0,0 +1,8 @@
+type: windowsperfcounters
+
+status:
+  class: receiver
+  stability:
+    beta: [metrics]
+  distributions: [contrib, splunk, observiq, sumo]
+
diff --git a/metric-metadata/zipkinexporter.yaml b/metric-metadata/zipkinexporter.yaml
new file mode 100644
index 0000000..e97b285
--- /dev/null
+++ b/metric-metadata/zipkinexporter.yaml
@@ -0,0 +1,8 @@
+type: zipkin
+
+status:
+  class: exporter
+  stability:
+    beta: [traces]
+  distributions: [core, contrib, observiq]
+
diff --git a/metric-metadata/zipkinreceiver.yaml b/metric-metadata/zipkinreceiver.yaml
new file mode 100644
index 0000000..13b1ed9
--- /dev/null
+++ b/metric-metadata/zipkinreceiver.yaml
@@ -0,0 +1,7 @@
+type: zipkin
+
+status:
+  class: receiver
+  stability:
+    beta: [traces]
+  distributions: [core, contrib, splunk, observiq, sumo, aws, redhat]
diff --git a/metric-metadata/zookeeperreceiver.yaml b/metric-metadata/zookeeperreceiver.yaml
index 9d2bae0..81e89fd 100644
--- a/metric-metadata/zookeeperreceiver.yaml
+++ b/metric-metadata/zookeeperreceiver.yaml
@@ -1,4 +1,10 @@
-name: zookeeperreceiver
+type: zookeeper
+
+status:
+  class: receiver
+  stability:
+    development: [metrics]
+  distributions: [contrib, observiq, sumo]
 
 resource_attributes:
   server.state:
@@ -139,3 +145,9 @@ metrics:
       value_type: int
       monotonic: true
       aggregation: cumulative
+  zookeeper.ruok:
+    enabled: true
+    description: Response from zookeeper ruok command
+    unit: 1
+    gauge:
+      value_type: int