Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring after #1481 - removing not needed env variables #1540

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+181 −886
Open

Refactoring after #1481 - removing not needed env variables #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95d89f7
remove not needed env variables
pszkamruk-splunk Feb 5, 2025
9355660
make render
pszkamruk-splunk Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .chloggen/refactoring-removing-not-needed-environmental-variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
component: clusterReceiver
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: clusterReceiver refactor by removing unnecessary environmental variables after introducing the k8sAttributesProcessor to clusterReceiver, and improve the configuration for the metrics k8sAttributesProcessor

# One or more tracking issues related to the change
issues: [1540]
# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
1 change: 1 addition & 0 deletions examples/add-filter-processor/rendered_manifests/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ data:
- k8s.node.name
- k8s.pod.name
- k8s.pod.uid
- k8s.pod.ip
- container.id
- container.image.name
- container.image.tag
Expand Down
9 changes: 0 additions & 9 deletions examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,6 @@ data:
- action: insert
key: k8s.node.name
value: ${K8S_NODE_NAME}
- action: insert
key: k8s.pod.name
value: ${K8S_POD_NAME}
- action: insert
key: k8s.pod.uid
value: ${K8S_POD_UID}
- action: insert
key: k8s.namespace.name
value: ${K8S_NAMESPACE}
resource/add_mode:
attributes:
- action: insert
Expand Down
2 changes: 1 addition & 1 deletion examples/add-filter-processor/rendered_manifests/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: e881b03d9e52b770bdae0905a06a9bf05d0b90f0baf735dd66309b9623849eae
checksum/config: be86b91b6614fb14865078de55ab855fecdecd837c8e100f3173c3c89baccff9
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
19 changes: 1 addition & 18 deletions examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8
checksum/config: ab4d49962c0d97151ddf075a55415a06495912f386c1a20355f795c16157d0be
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand All @@ -50,23 +50,6 @@ spec:
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:
Expand Down
1 change: 1 addition & 0 deletions examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ data:
- k8s.node.name
- k8s.pod.name
- k8s.pod.uid
- k8s.pod.ip
- container.id
- container.image.name
- container.image.tag
Expand Down
9 changes: 0 additions & 9 deletions examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,6 @@ data:
- action: insert
key: k8s.node.name
value: ${K8S_NODE_NAME}
- action: insert
key: k8s.pod.name
value: ${K8S_POD_NAME}
- action: insert
key: k8s.pod.uid
value: ${K8S_POD_UID}
- action: insert
key: k8s.namespace.name
value: ${K8S_NAMESPACE}
resource/add_mode:
attributes:
- action: insert
Expand Down
2 changes: 1 addition & 1 deletion examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 9d7bc9b2dc86c6f1fbfda895a9cdecc2142aa77419fc568cfe3ce27947143bdb
checksum/config: a0f82342f1e60a1db6a90ed1d6d04330d24289f196dd42f5cd1dbd07ff354821
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
19 changes: 1 addition & 18 deletions examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8
checksum/config: ab4d49962c0d97151ddf075a55415a06495912f386c1a20355f795c16157d0be
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand All @@ -50,23 +50,6 @@ spec:
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:
Expand Down
1 change: 1 addition & 0 deletions examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ data:
- k8s.node.name
- k8s.pod.name
- k8s.pod.uid
- k8s.pod.ip
- container.id
- container.image.name
- container.image.tag
Expand Down
9 changes: 0 additions & 9 deletions examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,6 @@ data:
- action: insert
key: k8s.node.name
value: ${K8S_NODE_NAME}
- action: insert
key: k8s.pod.name
value: ${K8S_POD_NAME}
- action: insert
key: k8s.pod.uid
value: ${K8S_POD_UID}
- action: insert
key: k8s.namespace.name
value: ${K8S_NAMESPACE}
resource/add_mode:
attributes:
- action: insert
Expand Down
2 changes: 1 addition & 1 deletion examples/add-receiver-creator/rendered_manifests/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 4906709b9d935ca9acf53fb68b3d73dcf1e30f8e0f8c593d3f3f57de8e371454
checksum/config: 473ce326ca062fb96cde78297e2da0d067d53cae300ca52937b7d29513b83c79
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
19 changes: 1 addition & 18 deletions examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8
checksum/config: ab4d49962c0d97151ddf075a55415a06495912f386c1a20355f795c16157d0be
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand All @@ -50,23 +50,6 @@ spec:
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:
Expand Down
1 change: 1 addition & 0 deletions examples/add-sampler/rendered_manifests/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ data:
- k8s.node.name
- k8s.pod.name
- k8s.pod.uid
- k8s.pod.ip
- container.id
- container.image.name
- container.image.tag
Expand Down
9 changes: 0 additions & 9 deletions examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,6 @@ data:
- action: insert
key: k8s.node.name
value: ${K8S_NODE_NAME}
- action: insert
key: k8s.pod.name
value: ${K8S_POD_NAME}
- action: insert
key: k8s.pod.uid
value: ${K8S_POD_UID}
- action: insert
key: k8s.namespace.name
value: ${K8S_NAMESPACE}
resource/add_mode:
attributes:
- action: insert
Expand Down
2 changes: 1 addition & 1 deletion examples/add-sampler/rendered_manifests/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: a2aff2e7ab61b5023a94d3890060d9179dd4b54075b87d287a61a45dce05ec54
checksum/config: 71d7b6414c337ca870b9e33a2c0e23e258f420d882afc16512cd6200559cc48c
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
19 changes: 1 addition & 18 deletions examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8
checksum/config: ab4d49962c0d97151ddf075a55415a06495912f386c1a20355f795c16157d0be
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand All @@ -50,23 +50,6 @@ spec:
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:
Expand Down
1 change: 1 addition & 0 deletions examples/autodetect-istio/rendered_manifests/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ data:
- k8s.node.name
- k8s.pod.name
- k8s.pod.uid
- k8s.pod.ip
- container.id
- container.image.name
- container.image.tag
Expand Down
9 changes: 0 additions & 9 deletions examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,6 @@ data:
- action: insert
key: k8s.node.name
value: ${K8S_NODE_NAME}
- action: insert
key: k8s.pod.name
value: ${K8S_POD_NAME}
- action: insert
key: k8s.pod.uid
value: ${K8S_POD_UID}
- action: insert
key: k8s.namespace.name
value: ${K8S_NAMESPACE}
resource/add_mode:
attributes:
- action: insert
Expand Down
2 changes: 1 addition & 1 deletion examples/autodetect-istio/rendered_manifests/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 78f50f8dc786d855d30fa3c86deb33d1d3d045f9457a983bd6843566a55f0d39
checksum/config: d9c869c658c16c14d9b52411af1efab8d257149dbdb7d89aac63fbbaa330e902
kubectl.kubernetes.io/default-container: otel-collector
sidecar.istio.io/inject: "false"
spec:
Expand Down
19 changes: 1 addition & 18 deletions examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8
checksum/config: ab4d49962c0d97151ddf075a55415a06495912f386c1a20355f795c16157d0be
sidecar.istio.io/inject: "false"
spec:
serviceAccountName: default-splunk-otel-collector
Expand All @@ -51,23 +51,6 @@ spec:
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:
Expand Down
1 change: 1 addition & 0 deletions examples/collector-agent-only/rendered_manifests/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ data:
- k8s.node.name
- k8s.pod.name
- k8s.pod.uid
- k8s.pod.ip
- container.id
- container.image.name
- container.image.tag
Expand Down
2 changes: 1 addition & 1 deletion examples/collector-agent-only/rendered_manifests/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 5eb71401eb3a1d4c94103254afa7361a1bbaedd05ef9374123e822239e593b35
checksum/config: 578374eba11ab610de9ec3fe0f17a3674f3b42a3de1d08d3762c995476b60bef
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
1 change: 1 addition & 0 deletions examples/collector-all-modes/rendered_manifests/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ data:
- k8s.node.name
- k8s.pod.name
- k8s.pod.uid
- k8s.pod.ip
- container.id
- container.image.name
- container.image.tag
Expand Down
9 changes: 0 additions & 9 deletions examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,6 @@ data:
- action: insert
key: k8s.node.name
value: ${K8S_NODE_NAME}
- action: insert
key: k8s.pod.name
value: ${K8S_POD_NAME}
- action: insert
key: k8s.pod.uid
value: ${K8S_POD_UID}
- action: insert
key: k8s.namespace.name
value: ${K8S_NAMESPACE}
resource/add_mode:
attributes:
- action: insert
Expand Down
1 change: 1 addition & 0 deletions examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ data:
- k8s.node.name
- k8s.pod.name
- k8s.pod.uid
- k8s.pod.ip
- container.id
- container.image.name
- container.image.tag
Expand Down
Loading
Loading