Skip to content

Commit 1e9a339

Browse files
committed
fix conflicts
1 parent 9e6c1bc commit 1e9a339

File tree

1 file changed

+22
-27
lines changed
  • docs/registry/attributes

1 file changed

+22
-27
lines changed

docs/registry/attributes/k8s.md

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,40 +38,35 @@ Kubernetes resource attributes.
3838
| <a id="k8s-hpa-scaletargetref-name" href="#k8s-hpa-scaletargetref-name">`k8s.hpa.scaletargetref.name`</a> | string | The name of the target resource to scale for the HorizontalPodAutoscaler. [11] | `my-deployment`; `my-statefulset` | ![Development](https://img.shields.io/badge/-development-blue) |
3939
| <a id="k8s-hpa-uid" href="#k8s-hpa-uid">`k8s.hpa.uid`</a> | string | The UID of the horizontal pod autoscaler. | `275ecb36-5aa8-4c2a-9c47-d8bb681b9aff` | ![Development](https://img.shields.io/badge/-development-blue) |
4040
| <a id="k8s-hugepage-size" href="#k8s-hugepage-size">`k8s.hugepage.size`</a> | string | The size (identifier) of the K8s huge page. | `2Mi` | ![Development](https://img.shields.io/badge/-development-blue) |
41-
| <a id="k8s-job-annotation" href="#k8s-job-annotation">`k8s.job.annotation.<key>`</a> | string | The annotation placed on the Job, the `<key>` being the annotation name, the value being the annotation value, even if the value is empty. [11] | `1`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
42-
| <a id="k8s-job-label" href="#k8s-job-label">`k8s.job.label.<key>`</a> | string | The label placed on the Job, the `<key>` being the label name, the value being the label value, even if the value is empty. [12] | `ci`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
41+
| <a id="k8s-job-annotation" href="#k8s-job-annotation">`k8s.job.annotation.<key>`</a> | string | The annotation key-value pairs placed on the Job. [12] | `k8s.job.annotation.number=1`; `k8s.job.annotation.data=` | ![Development](https://img.shields.io/badge/-development-blue) |
42+
| <a id="k8s-job-label" href="#k8s-job-label">`k8s.job.label.<key>`</a> | string | The label key-value pairs placed on the Job. [13] | `k8s.job.label.jobtype=ci`; `k8s.job.label.automated=` | ![Development](https://img.shields.io/badge/-development-blue) |
4343
| <a id="k8s-job-name" href="#k8s-job-name">`k8s.job.name`</a> | string | The name of the Job. | `opentelemetry` | ![Development](https://img.shields.io/badge/-development-blue) |
4444
| <a id="k8s-job-uid" href="#k8s-job-uid">`k8s.job.uid`</a> | string | The UID of the Job. | `275ecb36-5aa8-4c2a-9c47-d8bb681b9aff` | ![Development](https://img.shields.io/badge/-development-blue) |
4545
| <a id="k8s-namespace-annotation" href="#k8s-namespace-annotation">`k8s.namespace.annotation.<key>`</a> | string | The annotation placed on the Namespace, the `<key>` being the annotation name, the value being the annotation value, even if the value is empty. [13] | `0`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
4646
| <a id="k8s-namespace-label" href="#k8s-namespace-label">`k8s.namespace.label.<key>`</a> | string | The label placed on the Namespace, the `<key>` being the label name, the value being the label value, even if the value is empty. [14] | `default`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
4747
| <a id="k8s-namespace-name" href="#k8s-namespace-name">`k8s.namespace.name`</a> | string | The name of the namespace that the pod is running in. | `default` | ![Development](https://img.shields.io/badge/-development-blue) |
4848
| <a id="k8s-namespace-phase" href="#k8s-namespace-phase">`k8s.namespace.phase`</a> | string | The phase of the K8s namespace. [16] | `active`; `terminating` | ![Development](https://img.shields.io/badge/-development-blue) |
4949
| <a id="k8s-node-annotation" href="#k8s-node-annotation">`k8s.node.annotation.<key>`</a> | string | The annotation placed on the Node, the `<key>` being the annotation name, the value being the annotation value, even if the value is empty. [17] | `0`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
50-
| <a id="k8s-node-label" href="#k8s-node-label">`k8s.node.label.<key>`</a> | string | The label placed on the Node, the `<key>` being the label name, the value being the label value, even if the value is empty. [18] | `arm64`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
51-
| <a id="k8s-namespace-phase" href="#k8s-namespace-phase">`k8s.namespace.phase`</a> | string | The phase of the K8s namespace. [15] | `active`; `terminating` | ![Development](https://img.shields.io/badge/-development-blue) |
52-
| <a id="k8s-node-annotation" href="#k8s-node-annotation">`k8s.node.annotation.<key>`</a> | string | The annotation placed on the Node, the `<key>` being the annotation name, the value being the annotation value, even if the value is empty. [16] | `0`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
53-
| <a id="k8s-node-condition-status" href="#k8s-node-condition-status">`k8s.node.condition.status`</a> | string | The status of the condition, one of True, False, Unknown. [17] | `true`; `false`; `unknown` | ![Development](https://img.shields.io/badge/-development-blue) |
54-
| <a id="k8s-node-condition-type" href="#k8s-node-condition-type">`k8s.node.condition.type`</a> | string | The condition type of a K8s Node. [18] | `Ready`; `DiskPressure` | ![Development](https://img.shields.io/badge/-development-blue) |
55-
| <a id="k8s-node-label" href="#k8s-node-label">`k8s.node.label.<key>`</a> | string | The label placed on the Node, the `<key>` being the label name, the value being the label value, even if the value is empty. [19] | `arm64`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
50+
| <a id="k8s-node-condition-status" href="#k8s-node-condition-status">`k8s.node.condition.status`</a> | string | The status of the condition, one of True, False, Unknown. [18] | `true`; `false`; `unknown` | ![Development](https://img.shields.io/badge/-development-blue) |
51+
| <a id="k8s-node-condition-type" href="#k8s-node-condition-type">`k8s.node.condition.type`</a> | string | The condition type of a K8s Node. [19] | `Ready`; `DiskPressure` | ![Development](https://img.shields.io/badge/-development-blue) |
52+
| <a id="k8s-node-label" href="#k8s-node-label">`k8s.node.label.<key>`</a> | string | The label placed on the Node, the `<key>` being the label name, the value being the label value, even if the value is empty. [20] | `arm64`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
5653
| <a id="k8s-node-name" href="#k8s-node-name">`k8s.node.name`</a> | string | The name of the Node. | `node-1` | ![Development](https://img.shields.io/badge/-development-blue) |
5754
| <a id="k8s-node-uid" href="#k8s-node-uid">`k8s.node.uid`</a> | string | The UID of the Node. | `1eb3a0c6-0477-4080-a9cb-0cb7db65c6a2` | ![Development](https://img.shields.io/badge/-development-blue) |
58-
| <a id="k8s-pod-annotation" href="#k8s-pod-annotation">`k8s.pod.annotation.<key>`</a> | string | The annotation placed on the Pod, the `<key>` being the annotation name, the value being the annotation value. [19] | `true`; `x64`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
59-
| <a id="k8s-pod-label" href="#k8s-pod-label">`k8s.pod.label.<key>`</a> | string | The label placed on the Pod, the `<key>` being the label name, the value being the label value. [20] | `my-app`; `x64`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
60-
| <a id="k8s-pod-annotation" href="#k8s-pod-annotation">`k8s.pod.annotation.<key>`</a> | string | The annotation placed on the Pod, the `<key>` being the annotation name, the value being the annotation value. [20] | `true`; `x64`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
61-
| <a id="k8s-pod-label" href="#k8s-pod-label">`k8s.pod.label.<key>`</a> | string | The label placed on the Pod, the `<key>` being the label name, the value being the label value. [21] | `my-app`; `x64`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
55+
| <a id="k8s-pod-annotation" href="#k8s-pod-annotation">`k8s.pod.annotation.<key>`</a> | string | The annotation placed on the Pod, the `<key>` being the annotation name, the value being the annotation value. [21] | `true`; `x64`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
56+
| <a id="k8s-pod-label" href="#k8s-pod-label">`k8s.pod.label.<key>`</a> | string | The label placed on the Pod, the `<key>` being the label name, the value being the label value. [22] | `my-app`; `x64`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
6257
| <a id="k8s-pod-name" href="#k8s-pod-name">`k8s.pod.name`</a> | string | The name of the Pod. | `opentelemetry-pod-autoconf` | ![Development](https://img.shields.io/badge/-development-blue) |
6358
| <a id="k8s-pod-uid" href="#k8s-pod-uid">`k8s.pod.uid`</a> | string | The UID of the Pod. | `275ecb36-5aa8-4c2a-9c47-d8bb681b9aff` | ![Development](https://img.shields.io/badge/-development-blue) |
64-
| <a id="k8s-replicaset-annotation" href="#k8s-replicaset-annotation">`k8s.replicaset.annotation.<key>`</a> | string | The annotation placed on the ReplicaSet, the `<key>` being the annotation name, the value being the annotation value, even if the value is empty. [22] | `0`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
65-
| <a id="k8s-replicaset-label" href="#k8s-replicaset-label">`k8s.replicaset.label.<key>`</a> | string | The label placed on the ReplicaSet, the `<key>` being the label name, the value being the label value, even if the value is empty. [23] | `guestbook`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
59+
| <a id="k8s-replicaset-annotation" href="#k8s-replicaset-annotation">`k8s.replicaset.annotation.<key>`</a> | string | The annotation key-value pairs placed on the ReplicaSet. [23] | `k8s.replicaset.annotation.replicas=0`; `k8s.replicaset.annotation.data=` | ![Development](https://img.shields.io/badge/-development-blue) |
60+
| <a id="k8s-replicaset-label" href="#k8s-replicaset-label">`k8s.replicaset.label.<key>`</a> | string | The label key-value pairs placed on the ReplicaSet. [24] | `k8s.replicaset.label.app=guestbook`; `k8s.replicaset.label.injected=` | ![Development](https://img.shields.io/badge/-development-blue) |
6661
| <a id="k8s-replicaset-name" href="#k8s-replicaset-name">`k8s.replicaset.name`</a> | string | The name of the ReplicaSet. | `opentelemetry` | ![Development](https://img.shields.io/badge/-development-blue) |
6762
| <a id="k8s-replicaset-uid" href="#k8s-replicaset-uid">`k8s.replicaset.uid`</a> | string | The UID of the ReplicaSet. | `275ecb36-5aa8-4c2a-9c47-d8bb681b9aff` | ![Development](https://img.shields.io/badge/-development-blue) |
6863
| <a id="k8s-replicationcontroller-name" href="#k8s-replicationcontroller-name">`k8s.replicationcontroller.name`</a> | string | The name of the replication controller. | `opentelemetry` | ![Development](https://img.shields.io/badge/-development-blue) |
6964
| <a id="k8s-replicationcontroller-uid" href="#k8s-replicationcontroller-uid">`k8s.replicationcontroller.uid`</a> | string | The UID of the replication controller. | `275ecb36-5aa8-4c2a-9c47-d8bb681b9aff` | ![Development](https://img.shields.io/badge/-development-blue) |
7065
| <a id="k8s-resourcequota-name" href="#k8s-resourcequota-name">`k8s.resourcequota.name`</a> | string | The name of the resource quota. | `opentelemetry` | ![Development](https://img.shields.io/badge/-development-blue) |
71-
| <a id="k8s-resourcequota-resource-name" href="#k8s-resourcequota-resource-name">`k8s.resourcequota.resource_name`</a> | string | The name of the K8s resource a resource quota defines. [24] | `count/replicationcontrollers` | ![Development](https://img.shields.io/badge/-development-blue) |
66+
| <a id="k8s-resourcequota-resource-name" href="#k8s-resourcequota-resource-name">`k8s.resourcequota.resource_name`</a> | string | The name of the K8s resource a resource quota defines. [25] | `count/replicationcontrollers` | ![Development](https://img.shields.io/badge/-development-blue) |
7267
| <a id="k8s-resourcequota-uid" href="#k8s-resourcequota-uid">`k8s.resourcequota.uid`</a> | string | The UID of the resource quota. | `275ecb36-5aa8-4c2a-9c47-d8bb681b9aff` | ![Development](https://img.shields.io/badge/-development-blue) |
73-
| <a id="k8s-statefulset-annotation" href="#k8s-statefulset-annotation">`k8s.statefulset.annotation.<key>`</a> | string | The annotation placed on the StatefulSet, the `<key>` being the annotation name, the value being the annotation value, even if the value is empty. [25] | `1`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
74-
| <a id="k8s-statefulset-label" href="#k8s-statefulset-label">`k8s.statefulset.label.<key>`</a> | string | The label placed on the StatefulSet, the `<key>` being the label name, the value being the label value, even if the value is empty. [26] | `guestbook`; `` | ![Development](https://img.shields.io/badge/-development-blue) |
68+
| <a id="k8s-statefulset-annotation" href="#k8s-statefulset-annotation">`k8s.statefulset.annotation.<key>`</a> | string | The annotation key-value pairs placed on the StatefulSet. [26] | `k8s.statefulset.annotation.replicas=1`; `k8s.statefulset.annotation.data=` | ![Development](https://img.shields.io/badge/-development-blue) |
69+
| <a id="k8s-statefulset-label" href="#k8s-statefulset-label">`k8s.statefulset.label.<key>`</a> | string | The label key-value pairs placed on the StatefulSet. [27] | `k8s.statefulset.label.app=guestbook`; `k8s.statefulset.label.injected=` | ![Development](https://img.shields.io/badge/-development-blue) |
7570
| <a id="k8s-statefulset-name" href="#k8s-statefulset-name">`k8s.statefulset.name`</a> | string | The name of the StatefulSet. | `opentelemetry` | ![Development](https://img.shields.io/badge/-development-blue) |
7671
| <a id="k8s-statefulset-uid" href="#k8s-statefulset-uid">`k8s.statefulset.uid`</a> | string | The UID of the StatefulSet. | `275ecb36-5aa8-4c2a-9c47-d8bb681b9aff` | ![Development](https://img.shields.io/badge/-development-blue) |
7772
| <a id="k8s-storageclass-name" href="#k8s-storageclass-name">`k8s.storageclass.name`</a> | string | The name of K8s [StorageClass](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#storageclass-v1-storage-k8s-io) object. | `gold.storageclass.storage.k8s.io` | ![Development](https://img.shields.io/badge/-development-blue) |
@@ -189,10 +184,10 @@ conflict.
189184
- An annotation `data` with empty string value SHOULD be recorded as
190185
the `k8s.node.annotation.data` attribute with value `""`.
191186

192-
**[17] `k8s.node.condition.status`:** This attribute aligns with the `status` field of the
187+
**[18] `k8s.node.condition.status`:** This attribute aligns with the `status` field of the
193188
[NodeCondition](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#nodecondition-v1-core)
194189

195-
**[18] `k8s.node.condition.type`:** K8s Node conditions as described
190+
**[19] `k8s.node.condition.type`:** K8s Node conditions as described
196191
by [K8s documentation](https://v1-32.docs.kubernetes.io/docs/reference/node/node-status/#condition).
197192

198193
This attribute aligns with the `type` field of the
@@ -202,14 +197,14 @@ The set of possible values is not limited to those listed here. Managed Kubernet
202197
or custom controllers MAY introduce additional node condition types.
203198
When this occurs, the exact value as reported by the Kubernetes API SHOULD be used.
204199

205-
**[19] `k8s.node.label.<key>`:** Examples:
200+
**[20] `k8s.node.label.<key>`:** Examples:
206201

207202
- A label `kubernetes.io/arch` with value `arm64` SHOULD be recorded
208203
as the `k8s.node.label.kubernetes.io/arch` attribute with value `"arm64"`.
209204
- A label `data` with empty string value SHOULD be recorded as
210205
the `k8s.node.label.data` attribute with value `""`.
211206

212-
**[20] `k8s.pod.annotation.<key>`:** Examples:
207+
**[21] `k8s.pod.annotation.<key>`:** Examples:
213208

214209
- An annotation `kubernetes.io/enforce-mountable-secrets` with value `true` SHOULD be recorded as
215210
the `k8s.pod.annotation.kubernetes.io/enforce-mountable-secrets` attribute with value `"true"`.
@@ -218,7 +213,7 @@ When this occurs, the exact value as reported by the Kubernetes API SHOULD be us
218213
- An annotation `data` with empty string value SHOULD be recorded as
219214
the `k8s.pod.annotation.data` attribute with value `""`.
220215

221-
**[21] `k8s.pod.label.<key>`:** Examples:
216+
**[22] `k8s.pod.label.<key>`:** Examples:
222217

223218
- A label `app` with value `my-app` SHOULD be recorded as
224219
the `k8s.pod.label.app` attribute with value `"my-app"`.
@@ -227,30 +222,30 @@ When this occurs, the exact value as reported by the Kubernetes API SHOULD be us
227222
- A label `data` with empty string value SHOULD be recorded as
228223
the `k8s.pod.label.data` attribute with value `""`.
229224

230-
**[22] `k8s.replicaset.annotation.<key>`:** Examples:
225+
**[23] `k8s.replicaset.annotation.<key>`:** Examples:
231226

232227
- A label `replicas` with value `0` SHOULD be recorded
233228
as the `k8s.replicaset.annotation.replicas` attribute with value `"0"`.
234229
- A label `data` with empty string value SHOULD be recorded as
235230
the `k8s.replicaset.annotation.data` attribute with value `""`.
236231

237-
**[23] `k8s.replicaset.label.<key>`:** Examples:
232+
**[24] `k8s.replicaset.label.<key>`:** Examples:
238233

239234
- A label `app` with value `guestbook` SHOULD be recorded
240235
as the `k8s.replicaset.label.app` attribute with value `"guestbook"`.
241236
- A label `injected` with empty string value SHOULD be recorded as
242237
the `k8s.replicaset.label.injected` attribute with value `""`.
243238

244-
**[24] `k8s.resourcequota.resource_name`:** The value for this attribute can be either the full `count/<resource>[.<group>]` string (e.g., count/deployments.apps, count/pods), or, for certain core Kubernetes resources, just the resource name (e.g., pods, services, configmaps). Both forms are supported by Kubernetes for object count quotas. See [Kubernetes Resource Quotas documentation](https://kubernetes.io/docs/concepts/policy/resource-quotas/#object-count-quota) for more details.
239+
**[25] `k8s.resourcequota.resource_name`:** The value for this attribute can be either the full `count/<resource>[.<group>]` string (e.g., count/deployments.apps, count/pods), or, for certain core Kubernetes resources, just the resource name (e.g., pods, services, configmaps). Both forms are supported by Kubernetes for object count quotas. See [Kubernetes Resource Quotas documentation](https://kubernetes.io/docs/concepts/policy/resource-quotas/#object-count-quota) for more details.
245240

246-
**[25] `k8s.statefulset.annotation.<key>`:** Examples:
241+
**[26] `k8s.statefulset.annotation.<key>`:** Examples:
247242

248243
- A label `replicas` with value `1` SHOULD be recorded
249244
as the `k8s.statefulset.annotation.replicas` attribute with value `"1"`.
250245
- A label `data` with empty string value SHOULD be recorded as
251246
the `k8s.statefulset.annotation.data` attribute with value `""`.
252247

253-
**[26] `k8s.statefulset.label.<key>`:** Examples:
248+
**[27] `k8s.statefulset.label.<key>`:** Examples:
254249

255250
- A label `replicas` with value `0` SHOULD be recorded
256251
as the `k8s.statefulset.label.app` attribute with value `"guestbook"`.

0 commit comments

Comments
 (0)