Skip to content

Commit 9becb9e

Browse files
authored
[chart] Replace deprecated filelog references with file_log (#2396)
* update config templates with file_log * make render * enforce no filelog references in config * add chloggen * remove unnecessary end * update more references, add chlog issue * changes requested by copilot * remove unrelated example from git
1 parent 8abb526 commit 9becb9e

44 files changed

Lines changed: 101 additions & 70 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: breaking
3+
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
4+
component: chart
5+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
6+
note: Rename all `filelog` receiver references to `file_log`
7+
# One or more tracking issues related to the change
8+
issues: [2396]
9+
# (Optional) One or more lines of additional information to render under the primary note.
10+
# These lines will be padded with 2 spaces and then inserted directly into the document.
11+
# Use pipe (|) for multiline entries.
12+
subtext: |
13+
The `filelog` alias has been deprecated in favor of `file_log` in the chart-generated configuration.
14+
Any Helm values or overrides that reference `filelog` (for example, `*.config.receivers.filelog`
15+
or pipelines that list `filelog` as a receiver) must be updated to use `file_log`.
16+
The chart will fail to be installed or upgraded if the deprecated alias is still referenced.

docs/advanced-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ Example of adding audit logs from Kubernetes host machines
582582
```yaml
583583
logsCollection:
584584
extraFileLogs:
585-
filelog/audit-log:
585+
file_log/audit-log:
586586
include: [/var/log/kubernetes/apiserver/audit.log]
587587
start_at: beginning
588588
include_file_path: true

docs/migration-from-sck.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ If you are using the `resources` option in SCK to limit/increase the CPU and mem
235235

236236
#### Extra files from host
237237

238-
For tailing files other than container or journald logs (that is, kube audit logs), configure `logsCollection.extraFileLogs` using this [filelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filelogreceiver) receiver configuration.
238+
For tailing files other than container or journald logs (that is, kube audit logs), configure `logsCollection.extraFileLogs` using this [file_log](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filelogreceiver) receiver configuration.
239239

240240
[SCK values.yaml snippet]
241241

@@ -255,7 +255,7 @@ logs:
255255
```yaml
256256
logsCollection:
257257
extraFileLogs:
258-
filelog/kube-audit:
258+
file_log/kube-audit:
259259
include: [/var/log/kube-apiserver-audit.log]
260260
start_at: beginning
261261
include_file_path: true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ data:
223223
override: true
224224
timeout: 15s
225225
receivers:
226-
filelog:
226+
file_log:
227227
encoding: utf-8
228228
exclude:
229229
- /var/log/pods/default_default-splunk-otel-collector*_*/otel-collector/*.log
@@ -528,7 +528,7 @@ data:
528528
- filter/exclude_logs_from_pod
529529
- filter/exclude_logs_from_node
530530
receivers:
531-
- filelog
531+
- file_log
532532
- otlp
533533
logs/entities:
534534
exporters:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-collector-agent
3232
release: default
3333
annotations:
34-
checksum/config: 8d6596ccaf0962c379be071620162f59da4d01fbacbd8b3badedc1497f8f4c45
34+
checksum/config: c600cf779c7c0c6ceb7c4d74b9a9b960946a23b9629686cc731a6084fc57c5a6
3535
kubectl.kubernetes.io/default-container: otel-collector
3636
spec:
3737
hostNetwork: true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ data:
172172
override: true
173173
timeout: 15s
174174
receivers:
175-
filelog:
175+
file_log:
176176
encoding: utf-8
177177
exclude:
178178
- /var/log/pods/default_default-splunk-otel-collector*_*/otel-collector/*.log
@@ -482,7 +482,7 @@ data:
482482
- resource
483483
- resource/logs
484484
receivers:
485-
- filelog
485+
- file_log
486486
- otlp
487487
logs/entities:
488488
exporters:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-collector-agent
3232
release: default
3333
annotations:
34-
checksum/config: 76f6533437421c8a52a2514ed49a26b5bee70190d993f7e8bddac2ad1280e41e
34+
checksum/config: c802a514bf46fd6a36d344b36d4a946fa3c85e4e08a51d7903cb3741affd0c6e
3535
kubectl.kubernetes.io/default-container: otel-collector
3636
spec:
3737
hostNetwork: true

examples/autodetect-istio-disable-histograms/rendered_manifests/configmap-agent.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ data:
207207
".")) where attributes["service.name"] == nil and cache["owner_name"] != nil
208208
and attributes["k8s.namespace.name"] != nil
209209
receivers:
210-
filelog:
210+
file_log:
211211
encoding: utf-8
212212
exclude:
213213
- /var/log/pods/default_default-splunk-otel-collector*_*/otel-collector/*.log
@@ -471,7 +471,7 @@ data:
471471
- transform/istio_service_name
472472
- resource/logs
473473
receivers:
474-
- filelog
474+
- file_log
475475
- otlp
476476
logs/entities:
477477
exporters:

examples/autodetect-istio-disable-histograms/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
release: default
3333
sidecar.istio.io/inject: "false"
3434
annotations:
35-
checksum/config: 0e16ebb6125afb39da1feaa6610c316b0ecfcfd5bdf8d24cf568c2e9dd8e3544
35+
checksum/config: a7af5b6b799029a652f27d4d3ad6bb873ead7c7f39459a1be934f8a703c3ab69
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ data:
212212
".")) where attributes["service.name"] == nil and cache["owner_name"] != nil
213213
and attributes["k8s.namespace.name"] != nil
214214
receivers:
215-
filelog:
215+
file_log:
216216
encoding: utf-8
217217
exclude:
218218
- /var/log/pods/default_default-splunk-otel-collector*_*/otel-collector/*.log
@@ -536,7 +536,7 @@ data:
536536
- transform/istio_service_name
537537
- resource/logs
538538
receivers:
539-
- filelog
539+
- file_log
540540
- otlp
541541
logs/entities:
542542
exporters:

0 commit comments

Comments
 (0)