Skip to content

Commit 6aa7d2b

Browse files
atoulmeatoulme
authored
Revert "Remove envvars (#1408)" (#1411)
This reverts commit f6bb73a.
1 parent 0662515 commit 6aa7d2b

File tree

61 files changed

+568
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+568
-71
lines changed

‎.chloggen/removeenvvars.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎examples/add-filter-processor/rendered_manifests/configmap-agent.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ data:
296296
endpoint: 0.0.0.0:8006
297297
hostmetrics:
298298
collection_interval: 10s
299-
root_path: /hostfs
300299
scrapers:
301300
cpu: null
302301
disk: null

‎examples/add-filter-processor/rendered_manifests/daemonset.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 8d96029544401cc2cbc1056b52dc0046d77d4818325786682aec72c88f1c0eea
35+
checksum/config: b60f03e2dfef1bd8dda7ddbca00d86cbbba40adc64aa4091d4c6a7dd5253ed4d
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true
@@ -156,6 +156,24 @@ spec:
156156
secretKeyRef:
157157
name: default-splunk-otel-collector
158158
key: splunk_observability_access_token
159+
# Env variables for host metrics receiver
160+
- name: HOST_PROC
161+
value: /hostfs/proc
162+
- name: HOST_SYS
163+
value: /hostfs/sys
164+
- name: HOST_ETC
165+
value: /hostfs/etc
166+
- name: HOST_VAR
167+
value: /hostfs/var
168+
- name: HOST_RUN
169+
value: /hostfs/run
170+
- name: HOST_DEV
171+
value: /hostfs/dev
172+
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
173+
# is resolved fall back to previous gopsutil mountinfo path:
174+
# https://github.com/shirou/gopsutil/issues/1271
175+
- name: HOST_PROC_MOUNTINFO
176+
value: /proc/self/mountinfo
159177

160178
readinessProbe:
161179
httpGet:

‎examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ data:
245245
endpoint: 0.0.0.0:8006
246246
hostmetrics:
247247
collection_interval: 10s
248-
root_path: /hostfs
249248
scrapers:
250249
cpu: null
251250
disk: null

‎examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 8f0ec5f63cbf96dde426ccbf8c01622cccfcfd7b8ac2345b9ba103e855c0b367
35+
checksum/config: 96dba830eda6992101a8e61d6068439011ae330eb7bf79fe7190c6df8d4b7bc7
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true
@@ -156,6 +156,24 @@ spec:
156156
secretKeyRef:
157157
name: default-splunk-otel-collector
158158
key: splunk_observability_access_token
159+
# Env variables for host metrics receiver
160+
- name: HOST_PROC
161+
value: /hostfs/proc
162+
- name: HOST_SYS
163+
value: /hostfs/sys
164+
- name: HOST_ETC
165+
value: /hostfs/etc
166+
- name: HOST_VAR
167+
value: /hostfs/var
168+
- name: HOST_RUN
169+
value: /hostfs/run
170+
- name: HOST_DEV
171+
value: /hostfs/dev
172+
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
173+
# is resolved fall back to previous gopsutil mountinfo path:
174+
# https://github.com/shirou/gopsutil/issues/1271
175+
- name: HOST_PROC_MOUNTINFO
176+
value: /proc/self/mountinfo
159177

160178
readinessProbe:
161179
httpGet:

‎examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ data:
127127
receivers:
128128
hostmetrics:
129129
collection_interval: 10s
130-
root_path: /hostfs
131130
scrapers:
132131
cpu: null
133132
disk: null

‎examples/add-receiver-creator/rendered_manifests/daemonset.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 8fafd58559471b2e59711562a3f4adc3f73c7a37841af415a1526baff7a9435b
35+
checksum/config: 6d40b57a1ecf887ac56d9687346e494b0a3d57ff7fa74c7b0d99abec481906cb
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true
@@ -115,6 +115,24 @@ spec:
115115
secretKeyRef:
116116
name: default-splunk-otel-collector
117117
key: splunk_observability_access_token
118+
# Env variables for host metrics receiver
119+
- name: HOST_PROC
120+
value: /hostfs/proc
121+
- name: HOST_SYS
122+
value: /hostfs/sys
123+
- name: HOST_ETC
124+
value: /hostfs/etc
125+
- name: HOST_VAR
126+
value: /hostfs/var
127+
- name: HOST_RUN
128+
value: /hostfs/run
129+
- name: HOST_DEV
130+
value: /hostfs/dev
131+
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
132+
# is resolved fall back to previous gopsutil mountinfo path:
133+
# https://github.com/shirou/gopsutil/issues/1271
134+
- name: HOST_PROC_MOUNTINFO
135+
value: /proc/self/mountinfo
118136

119137
readinessProbe:
120138
httpGet:

‎examples/add-sampler/rendered_manifests/configmap-agent.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ data:
130130
receivers:
131131
hostmetrics:
132132
collection_interval: 10s
133-
root_path: /hostfs
134133
scrapers:
135134
cpu: null
136135
disk: null

‎examples/add-sampler/rendered_manifests/daemonset.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 79c9468691a3898084dbb7f14019a3280a3a01de9641072fc641e85a07706234
35+
checksum/config: d8596d0b067377a254ca78f0a4fb1e209124011e57788e22c5442ce24fa8db6c
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true
@@ -115,6 +115,24 @@ spec:
115115
secretKeyRef:
116116
name: default-splunk-otel-collector
117117
key: splunk_observability_access_token
118+
# Env variables for host metrics receiver
119+
- name: HOST_PROC
120+
value: /hostfs/proc
121+
- name: HOST_SYS
122+
value: /hostfs/sys
123+
- name: HOST_ETC
124+
value: /hostfs/etc
125+
- name: HOST_VAR
126+
value: /hostfs/var
127+
- name: HOST_RUN
128+
value: /hostfs/run
129+
- name: HOST_DEV
130+
value: /hostfs/dev
131+
# until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5879
132+
# is resolved fall back to previous gopsutil mountinfo path:
133+
# https://github.com/shirou/gopsutil/issues/1271
134+
- name: HOST_PROC_MOUNTINFO
135+
value: /proc/self/mountinfo
118136

119137
readinessProbe:
120138
httpGet:

‎examples/autodetect-istio/rendered_manifests/configmap-agent.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ data:
280280
endpoint: 0.0.0.0:8006
281281
hostmetrics:
282282
collection_interval: 10s
283-
root_path: /hostfs
284283
scrapers:
285284
cpu: null
286285
disk: null

0 commit comments

Comments
 (0)