diff --git a/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml index 5125ce82cc..8c7c86f7aa 100644 --- a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 sidecar.istio.io/inject: "false" spec: serviceAccountName: default-splunk-otel-collector @@ -47,27 +47,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml index 0ce37d81fd..244891a9fc 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/default/rendered_manifests/configmap-cluster-receiver.yaml b/examples/default/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/default/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/default/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml index 840b317d9d..5ab0182540 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml @@ -47,6 +47,32 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + annotations: + - from: pod + key: splunk.com/sourcetype + - from: namespace + key: splunk.com/index + tag_name: com.splunk.index + - from: pod + key: splunk.com/index + tag_name: com.splunk.index + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name k8sattributes/metrics: extract: annotations: diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml index f430e30d8c..d969c7ba57 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 2ebe19c84fd799cfbd9504a0957789f9a289d04bc9a1a08712b09ea6a339c81f + checksum/config: 9a37a0501fd8b00ab0a64c6bb8fdb81f21e21ab4d3a50a23c4cba35f44a5ba86 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_PLATFORM_HEC_TOKEN valueFrom: secretKeyRef: diff --git a/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml index 190404b7d7..93097b6227 100644 --- a/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml index 461d874251..fa4f859bdb 100644 --- a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: c090a229396be782ca350ada8b83f622afca01a39a4238279b01b6780eaf7c1f + checksum/config: 2f5090d76bcf9c08dc4cdfe7821a375aa1bda5ae99ef7f2034096e9cac130a73 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml index 762b9f0728..156d40db65 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml @@ -33,6 +33,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml index 9a9def15dc..b6f7f16c23 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml @@ -33,7 +33,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: d78e0d008e7296fe1c3fa48154a5840e42560b5d8324d3264b164f9c928e3373 + checksum/config: c8f03daad2fec68be38d7cfdae387152d1c319d78c40eaea6626d3a7fea76bd3 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -53,15 +53,6 @@ spec: image: public.ecr.aws/amazonlinux/amazonlinux:latest imagePullPolicy: IfNotPresent command: ["bash", "-c", "/splunk-scripts/init-eks-fargate-cluster-receiver.sh"] - env: - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName volumeMounts: - name: init-eks-fargate-cluster-receiver-script mountPath: /splunk-scripts @@ -79,27 +70,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml index ea5d20dcdb..f491b0c736 100644 --- a/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml index ab75614dc6..a7b75d2240 100644 --- a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: b0f51497d57f09b27212e1e240b285b46ce5b0ae425a1e2b38a448342b955d19 + checksum/config: b650cf3108cb433a3481ffbad8e5fc537b19dae94e504de955096ecda58b66b7 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml index b7681e6268..69b20e6ae9 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml index ad2e3799e9..a7847dd670 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 09f2176d296fde148259746e522d9c8a9879a710249f7d8c0ac2158f86853290 + checksum/config: 52b6ca0aabd92fb5ec7f95c99901e56dc58650a1e517251d118b445a94f8ca7c spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml index b7681e6268..69b20e6ae9 100644 --- a/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml index ad2e3799e9..a7847dd670 100644 --- a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 09f2176d296fde148259746e522d9c8a9879a710249f7d8c0ac2158f86853290 + checksum/config: 52b6ca0aabd92fb5ec7f95c99901e56dc58650a1e517251d118b445a94f8ca7c spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml index 27859c200f..b5450934e3 100644 --- a/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml index 9830433968..712c050109 100644 --- a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: fc1948ab34d8173f04fa0f56f5988af51b3ae3867d0a45cf295a220e85c05676 + checksum/config: 3e84de6ea3a9275b36fb5d076b3e0fd13a2fc31ba2cfdaaa902f1ec08c08d361 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml index a7d0b506ca..76c24dcec7 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml index 45df7144c3..6733619ad2 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: d53af150853be9b03d554d64c43c83776cd5af4c906b7db6652460557dc27549 + checksum/config: 6ff3bf0a18bb6c3bdc99377943dfd6d02ab6f24c6e33248d1ad39327e082450b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml index 840b317d9d..5ab0182540 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml @@ -47,6 +47,32 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + annotations: + - from: pod + key: splunk.com/sourcetype + - from: namespace + key: splunk.com/index + tag_name: com.splunk.index + - from: pod + key: splunk.com/index + tag_name: com.splunk.index + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name k8sattributes/metrics: extract: annotations: diff --git a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml index f430e30d8c..d969c7ba57 100644 --- a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 2ebe19c84fd799cfbd9504a0957789f9a289d04bc9a1a08712b09ea6a339c81f + checksum/config: 9a37a0501fd8b00ab0a64c6bb8fdb81f21e21ab4d3a50a23c4cba35f44a5ba86 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_PLATFORM_HEC_TOKEN valueFrom: secretKeyRef: diff --git a/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml index f2a35b8601..60bf3ffde5 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -48,27 +48,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 840b317d9d..5ab0182540 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -47,6 +47,32 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + annotations: + - from: pod + key: splunk.com/sourcetype + - from: namespace + key: splunk.com/index + tag_name: com.splunk.index + - from: pod + key: splunk.com/index + tag_name: com.splunk.index + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name k8sattributes/metrics: extract: annotations: diff --git a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml index f430e30d8c..d969c7ba57 100644 --- a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 2ebe19c84fd799cfbd9504a0957789f9a289d04bc9a1a08712b09ea6a339c81f + checksum/config: 9a37a0501fd8b00ab0a64c6bb8fdb81f21e21ab4d3a50a23c4cba35f44a5ba86 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_PLATFORM_HEC_TOKEN valueFrom: secretKeyRef: diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml index 840b317d9d..5ab0182540 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml @@ -47,6 +47,32 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + annotations: + - from: pod + key: splunk.com/sourcetype + - from: namespace + key: splunk.com/index + tag_name: com.splunk.index + - from: pod + key: splunk.com/index + tag_name: com.splunk.index + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name k8sattributes/metrics: extract: annotations: diff --git a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml index f430e30d8c..d969c7ba57 100644 --- a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 2ebe19c84fd799cfbd9504a0957789f9a289d04bc9a1a08712b09ea6a339c81f + checksum/config: 9a37a0501fd8b00ab0a64c6bb8fdb81f21e21ab4d3a50a23c4cba35f44a5ba86 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_PLATFORM_HEC_TOKEN valueFrom: secretKeyRef: diff --git a/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml index 182cbf54ce..5ffe4a8f87 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml index 62bfb4767d..4682152c82 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ea4abbb36af6031e76cb8af5268707cb8449b3839b957f6206f342e8faa87ba8 + checksum/config: a1aedb9b02c0bc93226089b8fb37a24102f491f82a9834b29d2a05df6dec7cdc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml b/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml index 10ba07c70c..e6a8bda44b 100644 --- a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml index 193c4de474..a186484887 100644 --- a/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,6 +30,23 @@ data: processors: batch: send_batch_max_size: 32768 + k8sattributes/clusterReceiver: + extract: + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: resource_attribute + name: k8s.namespace.name + - sources: + - from: resource_attribute + name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml index b264176a7a..699605691c 100644 --- a/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b + checksum/config: f0d66afa34affef9aab4e83b6d3ccadde05213cbce7e190fb1ffebef6a8846c2 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,27 +46,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/functional_tests/testdata_histogram/expected/v1.29/controller_manager_metrics.yaml b/functional_tests/testdata_histogram/expected/v1.29/controller_manager_metrics.yaml index cf64577368..5504487d8b 100644 --- a/functional_tests/testdata_histogram/expected/v1.29/controller_manager_metrics.yaml +++ b/functional_tests/testdata_histogram/expected/v1.29/controller_manager_metrics.yaml @@ -4883,4 +4883,4 @@ resourceMetrics: name: node_ipam_controller_cidrset_allocation_tries_per_request scope: name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver - version: v0.110.0 + version: v0.109.0 diff --git a/functional_tests/testdata_histogram/expected/v1.29/coredns_metrics.yaml b/functional_tests/testdata_histogram/expected/v1.29/coredns_metrics.yaml index a379eb94dd..82b43fc357 100644 --- a/functional_tests/testdata_histogram/expected/v1.29/coredns_metrics.yaml +++ b/functional_tests/testdata_histogram/expected/v1.29/coredns_metrics.yaml @@ -388,4 +388,4 @@ resourceMetrics: name: coredns_kubernetes_rest_client_rate_limiter_duration_seconds scope: name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver - version: v0.110.0 + version: v0.109.0 diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl index 974927a7da..7a853dca1b 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl @@ -73,6 +73,7 @@ receivers: {{- end }} processors: + {{- include "splunk-otel-collector.k8sClusterReceiverAttributesProcessor" . | nindent 2 }} {{- include "splunk-otel-collector.otelMemoryLimiterConfig" . | nindent 2 }} {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml index 76ca03fbb6..108181e039 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml @@ -91,15 +91,6 @@ spec: image: public.ecr.aws/amazonlinux/amazonlinux:latest imagePullPolicy: IfNotPresent command: ["bash", "-c", "/splunk-scripts/init-eks-fargate-cluster-receiver.sh"] - env: - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName volumeMounts: - name: init-eks-fargate-cluster-receiver-script mountPath: /splunk-scripts @@ -132,27 +123,6 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "{{ include "splunk-otel-collector.convertMemToMib" $clusterReceiver.resources.limits.memory | int64 }}" - - name: K8S_NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: