diff --git a/metric-metadata/awscloudwatchlogsexporter.yaml b/metric-metadata/awscloudwatchlogsexporter.yaml
index ff2ec39..370faa1 100644
--- a/metric-metadata/awscloudwatchlogsexporter.yaml
+++ b/metric-metadata/awscloudwatchlogsexporter.yaml
@@ -6,4 +6,4 @@ status:
     beta: [logs]
   distributions: [contrib, observiq]
   codeowners:
-    active: [boostchicken]
+    active: [boostchicken, bryan-aguilar, rapphil]
diff --git a/metric-metadata/awsemfexporter.yaml b/metric-metadata/awsemfexporter.yaml
index 1c98370..582e408 100644
--- a/metric-metadata/awsemfexporter.yaml
+++ b/metric-metadata/awsemfexporter.yaml
@@ -6,4 +6,4 @@ status:
     beta: [metrics]
   distributions: [contrib, aws, observiq]
   codeowners:
-    active: [Aneurysm9, shaochengwang, mxiamxia]
+    active: [Aneurysm9, shaochengwang, mxiamxia, bryan-aguilar]
diff --git a/metric-metadata/datadogconnector.yaml b/metric-metadata/datadogconnector.yaml
index abf6fc4..f6b1f32 100644
--- a/metric-metadata/datadogconnector.yaml
+++ b/metric-metadata/datadogconnector.yaml
@@ -3,7 +3,7 @@ type: datadog
 status:
   class: connector
   stability:
-    alpha: [traces_to_metrics]
-  distributions: []
+    beta: [traces_to_metrics, traces_to_traces]
+  distributions: [contrib]
   codeowners:
     active: [mx-psi, gbbr, dineshg13]
diff --git a/metric-metadata/docker.yaml b/metric-metadata/docker.yaml
index 7c8fd5a..5407e20 100644
--- a/metric-metadata/docker.yaml
+++ b/metric-metadata/docker.yaml
@@ -1,13 +1,3 @@
-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
+status:
+  codeowners:
+    active: [rmfitzpatrick, jamesmoessis]
\ No newline at end of file
diff --git a/metric-metadata/dockerstatsreceiver.yaml b/metric-metadata/dockerstatsreceiver.yaml
index 1cd8890..815476c 100644
--- a/metric-metadata/dockerstatsreceiver.yaml
+++ b/metric-metadata/dockerstatsreceiver.yaml
@@ -132,19 +132,20 @@ metrics:
       monotonic: true
       aggregation_temporality: cumulative
   container.cpu.utilization:
-    enabled: false
+    enabled: true
     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: "Deprecated: use `container.cpu.utilization` metric instead. Percent of CPU used by the container."
+    enabled: false
+    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.
+      if_configured: >-
+        The metric is deprecated and will be removed in v0.89.0. Please use `container.cpu.utilization` instead. See
+        https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/dockerstatsreceiver#transition-to-cpu-utilization-metric-name-aligned-with-opentelemetry-specification
+        for more details.
     gauge:
       value_type: double
 
diff --git a/metric-metadata/filereceiver.yaml b/metric-metadata/filereceiver.yaml
index bc4cad5..fea0446 100644
--- a/metric-metadata/filereceiver.yaml
+++ b/metric-metadata/filereceiver.yaml
@@ -3,7 +3,7 @@ type: file
 status:
   class: receiver
   stability:
-    development: [metrics, traces, logs]
+    development: [metrics]
   distributions: [contrib]
   codeowners:
     active: [pmcollins, djaglowski]
diff --git a/metric-metadata/filestatsreceiver.yaml b/metric-metadata/filestatsreceiver.yaml
index e3ac398..7a83877 100644
--- a/metric-metadata/filestatsreceiver.yaml
+++ b/metric-metadata/filestatsreceiver.yaml
@@ -3,7 +3,7 @@ type: filestats
 status:
   class: receiver
   stability:
-    alpha: [metrics]
+    beta: [metrics]
   distributions: [contrib, sumo]
   codeowners:
     active: [atoulme]
diff --git a/metric-metadata/gcp.yaml b/metric-metadata/gcp.yaml
index 4cfe81b..b6ab6fc 100644
--- a/metric-metadata/gcp.yaml
+++ b/metric-metadata/gcp.yaml
@@ -44,7 +44,11 @@ resource_attributes:
     type: string
     enabled: true
   faas.id:
-    description: The faas.id
+    description: The faas.id.
+    type: string
+    enabled: true
+  faas.instance:
+    description: The faas.instance
     type: string
     enabled: true
   k8s.cluster.name:
diff --git a/metric-metadata/haproxyreceiver.yaml b/metric-metadata/haproxyreceiver.yaml
index a73a073..260f045 100644
--- a/metric-metadata/haproxyreceiver.yaml
+++ b/metric-metadata/haproxyreceiver.yaml
@@ -3,40 +3,16 @@ type: haproxy
 status:
   class: receiver
   stability:
-    alpha: [metrics]
+    beta: [metrics]
   distributions: [contrib, sumo]
   codeowners:
     active: [atoulme, MovieStoreGuy]
 
 resource_attributes:
-  haproxy.url:
-    description: The path to the HAProxy socket or HTTP URL.
-    enabled: true
-    type: string
-  haproxy.pid:
-    description: process id (0 for first instance, 1 for second, ...)
-    enabled: true
-    type: string
-  haproxy.sid:
-    description: server id (unique inside a proxy)
-    enabled: true
-    type: string
-  haproxy.iid:
-    description: unique proxy id
-    enabled: true
-    type: string
-  haproxy.type:
-    description: (0=frontend, 1=backend, 2=server, 3=socket/listener)
-    enabled: true
-    type: string
   haproxy.addr:
     description: address:port or "unix". IPv6 has brackets around the address.
     enabled: true
     type: string
-  haproxy.algo:
-    description: load balancing algorithm
-    enabled: true
-    type: string
   haproxy.proxy_name:
     description: Proxy name
     enabled: true
diff --git a/metric-metadata/honeycombmarkerexporter.yaml b/metric-metadata/honeycombmarkerexporter.yaml
new file mode 100644
index 0000000..51361e1
--- /dev/null
+++ b/metric-metadata/honeycombmarkerexporter.yaml
@@ -0,0 +1,9 @@
+type: honeycombmarker
+
+status:
+  class: exporter
+  stability:
+    development: [logs]
+  distributions: []
+  codeowners:
+    active: [TylerHelmuth, fchikwekwe]
diff --git a/metric-metadata/jaegerencodingextension.yaml b/metric-metadata/jaegerencodingextension.yaml
new file mode 100644
index 0000000..c125b82
--- /dev/null
+++ b/metric-metadata/jaegerencodingextension.yaml
@@ -0,0 +1,9 @@
+type: jaegerencoding
+
+status:
+  class: extension
+  stability:
+    development: [extension]
+  distributions: []
+  codeowners:
+    active: [MovieStoreGuy, atoulme]
\ No newline at end of file
diff --git a/metric-metadata/jsonlogencodingextension.yaml b/metric-metadata/jsonlogencodingextension.yaml
new file mode 100644
index 0000000..81b0d53
--- /dev/null
+++ b/metric-metadata/jsonlogencodingextension.yaml
@@ -0,0 +1,9 @@
+type: json_log_encoding
+
+status:
+  class: extension
+  stability:
+    development: [extension]
+  distributions: []
+  codeowners:
+    active: [VihasMakwana, atoulme]
diff --git a/metric-metadata/k8sattributesprocessor.yaml b/metric-metadata/k8sattributesprocessor.yaml
index 03e8a38..e891f2a 100644
--- a/metric-metadata/k8sattributesprocessor.yaml
+++ b/metric-metadata/k8sattributesprocessor.yaml
@@ -4,7 +4,7 @@ status:
   class: processor
   stability:
     beta: [logs, metrics, traces]
-  distributions: [contrib, splunk, observiq, sumo, redhat, aws]
+  distributions: [contrib, splunk, observiq, sumo, redhat, aws, grafana]
   codeowners:
     active: [dmitryax, rmfitzpatrick, fatsheep9146, TylerHelmuth]
 # resource attributes are exposed through a different configuration interface (extract::metadata).
diff --git a/metric-metadata/k8sclusterreceiver.yaml b/metric-metadata/k8sclusterreceiver.yaml
index 11f05cf..40fde1e 100644
--- a/metric-metadata/k8sclusterreceiver.yaml
+++ b/metric-metadata/k8sclusterreceiver.yaml
@@ -62,6 +62,11 @@ resource_attributes:
     type: string
     enabled: true
 
+  k8s.pod.qos_class:
+    description: "The k8s pod qos class name. One of Guaranteed, Burstable, BestEffort."
+    type: string
+    enabled: false
+
   k8s.replicaset.name:
     description: The k8s replicaset name
     type: string
@@ -172,11 +177,6 @@ resource_attributes:
     type: string
     enabled: true
 
-  opencensus.resourcetype:
-    description: The OpenCensus resource type.
-    type: string
-    enabled: true
-
 attributes:
   k8s.namespace.name:
     description: The k8s namespace name.
@@ -239,170 +239,170 @@ metrics:
   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
+    unit: "{restart}"
     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
+    unit: ""
     gauge:
       value_type: int
 
   k8s.pod.phase:
     enabled: true
     description: Current phase of the pod (1 - Pending, 2 - Running, 3 - Succeeded, 4 - Failed, 5 - Unknown)
-    unit: 1
+    unit: ""
     gauge:
       value_type: int
   k8s.pod.status_reason:
     enabled: false
     description: Current status reason of the pod (1 - Evicted, 2 - NodeAffinity, 3 - NodeLost, 4 - Shutdown, 5 - UnexpectedAdmissionError, 6 - Unknown)
-    unit: 1
+    unit: ""
     gauge:
       value_type: int
 
   k8s.deployment.desired:
     enabled: true
     description: Number of desired pods in this deployment
-    unit: 1
+    unit: "{pod}"
     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
+    unit: "{pod}"
     gauge:
      value_type: int
 
   k8s.cronjob.active_jobs:
     enabled: true
     description: The number of actively running jobs for a cronjob
-    unit: "1"
+    unit: "{job}"
     gauge:
       value_type: int
 
   k8s.daemonset.current_scheduled_nodes:
     enabled: true
     description: Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod
-    unit: "1"
+    unit: "{node}"
     gauge:
       value_type: int
   k8s.daemonset.desired_scheduled_nodes:
     enabled: true
     description: Number of nodes that should be running the daemon pod (including nodes currently running the daemon pod)
-    unit: "1"
+    unit: "{node}"
     gauge:
       value_type: int
   k8s.daemonset.misscheduled_nodes:
     enabled: true
     description: Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod
-    unit: "1"
+    unit: "{node}"
     gauge:
       value_type: int
   k8s.daemonset.ready_nodes:
     enabled: true
     description: Number of nodes that should be running the daemon pod and have one or more of the daemon pod running and ready
-    unit: "1"
+    unit: "{node}"
     gauge:
       value_type: int
 
   k8s.hpa.max_replicas:
     enabled: true
     description: Maximum number of replicas to which the autoscaler can scale up.
-    unit: 1
+    unit: "{pod}"
     gauge:
       value_type: int
 
   k8s.hpa.min_replicas:
     enabled: true
     description: Minimum number of replicas to which the autoscaler can scale up.
-    unit: 1
+    unit: "{pod}"
     gauge:
       value_type: int
 
   k8s.hpa.current_replicas:
     enabled: true
     description: Current number of pod replicas managed by this autoscaler.
-    unit: 1
+    unit: "{pod}"
     gauge:
       value_type: int
 
   k8s.hpa.desired_replicas:
     enabled: true
     description: Desired number of pod replicas managed by this autoscaler.
-    unit: 1
+    unit: "{pod}"
     gauge:
       value_type: int
 
   k8s.job.active_pods:
     enabled: true
     description: The number of actively running pods for a job
-    unit: "1"
+    unit: "{pod}"
     gauge:
       value_type: int
   k8s.job.desired_successful_pods:
     enabled: true
     description: The desired number of successfully finished pods the job should be run with
-    unit: "1"
+    unit: "{pod}"
     gauge:
       value_type: int
   k8s.job.failed_pods:
     enabled: true
     description: The number of pods which reached phase Failed for a job
-    unit: "1"
+    unit: "{pod}"
     gauge:
       value_type: int
   k8s.job.max_parallel_pods:
     enabled: true
     description: The max desired number of pods the job should run at any given time
-    unit: "1"
+    unit: "{pod}"
     gauge:
       value_type: int
   k8s.job.successful_pods:
     enabled: true
     description: The number of pods which reached phase Succeeded for a job
-    unit: "1"
+    unit: "{pod}"
     gauge:
       value_type: int
 
   k8s.namespace.phase:
     enabled: true
     description: The current phase of namespaces (1 for active and 0 for terminating)
-    unit: 1
+    unit: ""
     gauge:
       value_type: int
 
   k8s.replicaset.desired:
     enabled: true
     description: Number of desired pods in this replicaset
-    unit: "1"
+    unit: "{pod}"
     gauge:
       value_type: int
   k8s.replicaset.available:
     enabled: true
     description: Total number of available pods (ready for at least minReadySeconds) targeted by this replicaset
-    unit: "1"
+    unit: "{pod}"
     gauge:
       value_type: int
 
   k8s.replication_controller.desired:
     enabled: true
     description: Number of desired pods in this replication_controller
-    unit: 1
+    unit: "{pod}"
     gauge:
       value_type: int
   k8s.replication_controller.available:
     enabled: true
     description: Total number of available pods (ready for at least minReadySeconds) targeted by this replication_controller
-    unit: 1
+    unit: "{pod}"
     gauge:
       value_type: int
 
   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
+    unit: "{resource}"
     gauge:
       value_type: int
     attributes:
@@ -410,7 +410,7 @@ metrics:
   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
+    unit: "{resource}"
     gauge:
       value_type: int
     attributes:
@@ -419,35 +419,35 @@ metrics:
   k8s.statefulset.desired_pods:
     enabled: true
     description: Number of desired pods in the stateful set (the `spec.replicas` field)
-    unit: 1
+    unit: "{pod}"
     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
+    unit: "{pod}"
     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
+    unit: "{pod}"
     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
+    unit: "{pod}"
     gauge:
       value_type: int
 
   openshift.clusterquota.limit:
     enabled: true
     description: The configured upper limit for a particular resource.
-    unit: "1"
+    unit: "{resource}"
     gauge:
       value_type: int
     attributes:
@@ -455,7 +455,7 @@ metrics:
   openshift.clusterquota.used:
     enabled: true
     description: The usage for a particular resource with a configured limit.
-    unit: "1"
+    unit: "{resource}"
     gauge:
       value_type: int
     attributes:
@@ -463,7 +463,7 @@ metrics:
   openshift.appliedclusterquota.limit:
     enabled: true
     description: The upper limit for a particular resource in a specific namespace.
-    unit: "1"
+    unit: "{resource}"
     gauge:
       value_type: int
     attributes:
@@ -472,7 +472,7 @@ metrics:
   openshift.appliedclusterquota.used:
     enabled: true
     description: The usage for a particular resource in a specific namespace.
-    unit: "1"
+    unit: "{resource}"
     gauge:
       value_type: int
     attributes:
diff --git a/metric-metadata/k8snode.yaml b/metric-metadata/k8snode.yaml
new file mode 100644
index 0000000..fdda964
--- /dev/null
+++ b/metric-metadata/k8snode.yaml
@@ -0,0 +1,13 @@
+type: resourcedetectionprocessor/k8snode
+
+parent: resourcedetection
+
+resource_attributes:
+  k8s.node.uid:
+    description: The Kubernetes node UID
+    type: string
+    enabled: true
+  k8s.node.name:
+    description: The Kubernetes node name
+    type: string
+    enabled: true
\ No newline at end of file
diff --git a/metric-metadata/k8sobjectsreceiver.yaml b/metric-metadata/k8sobjectsreceiver.yaml
index bfd1c18..1b3be8e 100644
--- a/metric-metadata/k8sobjectsreceiver.yaml
+++ b/metric-metadata/k8sobjectsreceiver.yaml
@@ -3,7 +3,7 @@ type: k8sobjects
 status:
   class: receiver
   stability:
-    alpha: [logs]
+    beta: [logs]
   distributions: [contrib, splunk, sumo]
   codeowners:
     active: [dmitryax, hvaghani221, TylerHelmuth]
diff --git a/metric-metadata/kafka.yaml b/metric-metadata/kafka.yaml
new file mode 100644
index 0000000..3e8bf49
--- /dev/null
+++ b/metric-metadata/kafka.yaml
@@ -0,0 +1,3 @@
+status:
+  codeowners:
+    active: [pavolloffay, MovieStoreGuy]
\ No newline at end of file
diff --git a/metric-metadata/kineticaexporter.yaml b/metric-metadata/kineticaexporter.yaml
new file mode 100644
index 0000000..6313713
--- /dev/null
+++ b/metric-metadata/kineticaexporter.yaml
@@ -0,0 +1,9 @@
+type: kinetica
+
+status:
+  class: exporter
+  stability:
+    development: [metrics, traces, logs]
+  distributions: []
+  codeowners:
+    active: [am-kinetica, TylerHelmuth]
diff --git a/metric-metadata/kubeletstatsreceiver.yaml b/metric-metadata/kubeletstatsreceiver.yaml
index 19169c2..e384819 100644
--- a/metric-metadata/kubeletstatsreceiver.yaml
+++ b/metric-metadata/kubeletstatsreceiver.yaml
@@ -217,6 +217,34 @@ metrics:
     gauge:
       value_type: int
     attributes: []
+  k8s.pod.cpu_limit_utilization:
+    enabled: false
+    description: "Pod cpu utilization as a ratio of the pod's total container limits. If any container is missing a limit the metric is not emitted."
+    unit: 1
+    gauge:
+      value_type: double
+    attributes: [ ]
+  k8s.pod.cpu_request_utilization:
+    enabled: false
+    description: "Pod cpu utilization as a ratio of the pod's total container requests. If any container is missing a request the metric is not emitted."
+    unit: 1
+    gauge:
+      value_type: double
+    attributes: [ ]
+  k8s.pod.memory_limit_utilization:
+    enabled: false
+    description: "Pod memory utilization as a ratio of the pod's total container limits. If any container is missing a limit the metric is not emitted."
+    unit: 1
+    gauge:
+      value_type: double
+    attributes: [ ]
+  k8s.pod.memory_request_utilization:
+    enabled: false
+    description: "Pod memory utilization as a ratio of the pod's total container requests. If any container is missing a request the metric is not emitted."
+    unit: 1
+    gauge:
+      value_type: double
+    attributes: [ ]
   k8s.pod.memory.rss:
     enabled: true
     description: "Pod memory rss"
@@ -323,6 +351,34 @@ metrics:
     gauge:
       value_type: int
     attributes: []
+  k8s.container.cpu_limit_utilization:
+    enabled: false
+    description: "Container cpu utilization as a ratio of the container's limits"
+    unit: 1
+    gauge:
+      value_type: double
+    attributes: [ ]
+  k8s.container.cpu_request_utilization:
+    enabled: false
+    description: "Container cpu utilization as a ratio of the container's requests"
+    unit: 1
+    gauge:
+      value_type: double
+    attributes: [ ]
+  k8s.container.memory_limit_utilization:
+    enabled: false
+    description: "Container memory utilization as a ratio of the container's limits"
+    unit: 1
+    gauge:
+      value_type: double
+    attributes: [ ]
+  k8s.container.memory_request_utilization:
+    enabled: false
+    description: "Container memory utilization as a ratio of the container's requests"
+    unit: 1
+    gauge:
+      value_type: double
+    attributes: [ ]
   container.memory.rss:
     enabled: true
     description: "Container memory rss"
diff --git a/metric-metadata/loadbalancingexporter.yaml b/metric-metadata/loadbalancingexporter.yaml
index 52635ae..7d8166a 100644
--- a/metric-metadata/loadbalancingexporter.yaml
+++ b/metric-metadata/loadbalancingexporter.yaml
@@ -4,6 +4,7 @@ status:
   class: exporter
   stability:
     beta: [traces, logs]
+    development: [metrics]
   distributions:
   - contrib
   - grafana
diff --git a/metric-metadata/probabilisticsamplerprocessor.yaml b/metric-metadata/probabilisticsamplerprocessor.yaml
index 40692f5..ada3cb0 100644
--- a/metric-metadata/probabilisticsamplerprocessor.yaml
+++ b/metric-metadata/probabilisticsamplerprocessor.yaml
@@ -5,6 +5,6 @@ status:
   stability:
     beta: [traces]
     alpha: [logs]
-  distributions: [core, contrib, observiq, splunk, sumo, aws]
+  distributions: [core, contrib, observiq, splunk, sumo, aws, grafana]
   codeowners:
-    active: [jpkrohling]
\ No newline at end of file
+    active: [jpkrohling]
diff --git a/metric-metadata/redisreceiver.yaml b/metric-metadata/redisreceiver.yaml
index 64628fb..6a6aa03 100644
--- a/metric-metadata/redisreceiver.yaml
+++ b/metric-metadata/redisreceiver.yaml
@@ -45,6 +45,13 @@ attributes:
   cmd:
     description: Redis command name
     type: string
+  percentile:
+    description: Percentile
+    type: string
+    enum:
+      - p50
+      - p99
+      - p99.9
 
 metrics:
   redis.maxmemory:
@@ -84,6 +91,14 @@ metrics:
       aggregation_temporality: cumulative
     attributes: [cmd]
 
+  redis.cmd.latency:
+    enabled: false
+    description: Command execution latency
+    unit: s
+    gauge:
+      value_type: double
+    attributes: [cmd, percentile]
+
   redis.uptime:
     enabled: true
     description: Number of seconds since Redis server start
diff --git a/metric-metadata/routingconnector.yaml b/metric-metadata/routingconnector.yaml
index 5ad00df..b65774a 100644
--- a/metric-metadata/routingconnector.yaml
+++ b/metric-metadata/routingconnector.yaml
@@ -3,7 +3,7 @@ type: routing
 status:
   class: connector
   stability:
-    development: [traces_to_traces, metrics_to_metrics, logs_to_logs]
+    alpha: [traces_to_traces, metrics_to_metrics, logs_to_logs]
   distributions: [contrib]
   codeowners:
     active: [jpkrohling, mwear]
diff --git a/metric-metadata/servicegraphconnector.yaml b/metric-metadata/servicegraphconnector.yaml
index cb3ab56..b6475eb 100644
--- a/metric-metadata/servicegraphconnector.yaml
+++ b/metric-metadata/servicegraphconnector.yaml
@@ -4,6 +4,6 @@ status:
   class: connector
   stability:
     alpha: [traces_to_metrics]
-  distributions: [contrib, sumo]
+  distributions: [contrib, sumo, grafana]
   codeowners:
     active: [jpkrohling, mapno]
diff --git a/metric-metadata/skywalkingreceiver.yaml b/metric-metadata/skywalkingreceiver.yaml
index 76b1806..43edd9e 100644
--- a/metric-metadata/skywalkingreceiver.yaml
+++ b/metric-metadata/skywalkingreceiver.yaml
@@ -3,6 +3,7 @@ type: skywalking
 status:
   class: receiver
   stability:
+    development: [metrics]
     beta: [traces]
   distributions: [contrib, sumo]
   codeowners:
diff --git a/metric-metadata/splunkenterprisereceiver.yaml b/metric-metadata/splunkenterprisereceiver.yaml
index eb44938..acee22f 100644
--- a/metric-metadata/splunkenterprisereceiver.yaml
+++ b/metric-metadata/splunkenterprisereceiver.yaml
@@ -6,4 +6,102 @@ status:
     development: [metrics]
   distributions:
   codeowners:
-    active: [shalper2, MovieStoreGuy]
\ No newline at end of file
+    active: [shalper2, MovieStoreGuy]
+
+attributes:
+  splunk.index.name:
+    description: The name of the index reporting a specific KPI
+    type: string
+  splunk.indexer.status:
+    description: The status message reported for a specific object
+    type: string
+  splunk.bucket.dir:
+    description: The bucket super-directory (home, cold, thawed) for each index
+    type: string
+  splunk.queue.name:
+    description: The name of the queue reporting a specific KPI
+    type: string  
+
+metrics:
+  splunk.license.index.usage:
+    enabled: true
+    description: Gauge tracking the indexed license usage per index
+    unit: By
+    gauge:
+      value_type: int 
+    attributes: [splunk.index.name]
+  # 'services/server/introspection/indexer'
+  splunk.indexer.throughput:
+    enabled: true
+    description: Gauge tracking average bytes per second throughput of indexer
+    unit: By/s
+    gauge:
+      value_type: double
+    # attribute `status` can be one of the following `normal`, `throttled`, `stopped`
+    attributes: [splunk.indexer.status]
+  # 'services/data/indexes-extended'
+  splunk.data.indexes.extended.total.size:
+    enabled: true
+    description: Size in bytes on disk of this index
+    unit: By
+    gauge:
+      value_type: int
+    attributes: [splunk.index.name]
+  splunk.data.indexes.extended.event.count:
+    enabled: true
+    description: Count of events for index, excluding frozen events. Approximately equal to the event_count sum of all buckets.
+    unit: '{events}'
+    gauge:
+      value_type: int
+    attributes: [splunk.index.name]
+  splunk.data.indexes.extended.bucket.count:
+    enabled: true
+    description: Count of buckets per index
+    unit: '{buckets}'
+    gauge:
+      value_type: int
+    attributes: [splunk.index.name]
+  splunk.data.indexes.extended.raw.size:
+    enabled: true
+    description: Size in bytes on disk of the <bucket>/rawdata/ directories of all buckets in this index, excluding frozen
+    unit: By
+    gauge:
+      value_type: int
+    attributes: [splunk.index.name]
+  ## Broken down `bucket_dirs`
+  splunk.data.indexes.extended.bucket.event.count:
+    enabled: false
+    description: Count of events in this bucket super-directory
+    unit: '{events}'
+    gauge:
+      value_type: int
+    attributes: [splunk.index.name, splunk.bucket.dir]
+  splunk.data.indexes.extended.bucket.hot.count:
+    enabled: false
+    description: (If size > 0) Number of hot buckets
+    unit: '{buckets}'
+    gauge:
+      value_type: int
+    attributes: [splunk.index.name, splunk.bucket.dir]
+  splunk.data.indexes.extended.bucket.warm.count:
+    enabled: false
+    description: (If size > 0) Number of warm buckets
+    unit: '{buckets}'
+    gauge:
+      value_type: int
+    attributes: [splunk.index.name, splunk.bucket.dir]  
+  #'services/server/introspection/queues' 
+  splunk.server.introspection.queues.current:
+    enabled: true
+    description: Gauge tracking current length of queue
+    unit: '{queues}'
+    gauge:
+      value_type: int
+    attributes: [splunk.queue.name]
+  splunk.server.introspection.queues.current.bytes:
+    enabled: true
+    description: Gauge tracking current bytes waiting in queue
+    unit: By
+    gauge:
+      value_type: int
+    attributes: [splunk.queue.name] 
\ No newline at end of file
diff --git a/metric-metadata/system.yaml b/metric-metadata/system.yaml
index f342043..8cc1b76 100644
--- a/metric-metadata/system.yaml
+++ b/metric-metadata/system.yaml
@@ -23,3 +23,27 @@ resource_attributes:
     description: The host.arch
     type: string
     enabled: false
+  host.cpu.vendor.id:
+    description: The host.cpu.vendor.id
+    type: string
+    enabled: false
+  host.cpu.family:
+    description: The host.cpu.family
+    type: int
+    enabled: false
+  host.cpu.model.id:
+    description: The host.cpu.model.id
+    type: int
+    enabled: false
+  host.cpu.model.name:
+    description: The host.cpu.model.name
+    type: string
+    enabled: false
+  host.cpu.stepping:
+    description: The host.cpu.stepping
+    type: int
+    enabled: false
+  host.cpu.cache.l2.size:
+    description: The host.cpu.cache.l2.size
+    type: int
+    enabled: false
diff --git a/metric-metadata/textencodingextension.yaml b/metric-metadata/textencodingextension.yaml
new file mode 100644
index 0000000..fe066ea
--- /dev/null
+++ b/metric-metadata/textencodingextension.yaml
@@ -0,0 +1,9 @@
+type: textencoding
+
+status:
+  class: extension
+  stability:
+    development: [extension]
+  distributions: []
+  codeowners:
+    active: [MovieStoreGuy, atoulme]
\ No newline at end of file
diff --git a/metric-metadata/transformprocessor.yaml b/metric-metadata/transformprocessor.yaml
index fb4e77c..efed23a 100644
--- a/metric-metadata/transformprocessor.yaml
+++ b/metric-metadata/transformprocessor.yaml
@@ -4,7 +4,7 @@ status:
   class: processor
   stability:
     alpha: [traces, metrics, logs]
-  distributions: [contrib, splunk, observiq, sumo]
+  distributions: [contrib, splunk, observiq, sumo, grafana]
   warnings: [Unsound Transformations, Identity Conflict, Orphaned Telemetry, Other]
   codeowners:
-    active: [TylerHelmuth, kentquirk, bogdandrutu, evan-bradley]
\ No newline at end of file
+    active: [TylerHelmuth, kentquirk, bogdandrutu, evan-bradley]
diff --git a/metric-metadata/windowseventlogreceiver.yaml b/metric-metadata/windowseventlogreceiver.yaml
index 847cbff..1a4ed56 100644
--- a/metric-metadata/windowseventlogreceiver.yaml
+++ b/metric-metadata/windowseventlogreceiver.yaml
@@ -6,4 +6,4 @@ status:
     alpha: [logs]
   distributions: [splunk, observiq, sumo]
   codeowners:
-    active: [djaglowski, armstrmi]
\ No newline at end of file
+    active: [djaglowski, armstrmi, pjanotti]
\ No newline at end of file
diff --git a/metric-metadata/zipkinencodingextension.yaml b/metric-metadata/zipkinencodingextension.yaml
new file mode 100644
index 0000000..f977863
--- /dev/null
+++ b/metric-metadata/zipkinencodingextension.yaml
@@ -0,0 +1,9 @@
+type: zipkinencoding
+
+status:
+  class: extension
+  stability:
+    development: [extension]
+  distributions: []
+  codeowners:
+    active: [MovieStoreGuy, dao-jun]
\ No newline at end of file