Merge branch 'main' into otl-3707-aws-batch-worker

Author: akhileshsingh85

.chloggen/fixdeprecatedaliasrefs.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
+component: chart
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Rename all `filelog` receiver references to `file_log`
+# One or more tracking issues related to the change
+issues: [2396]
+# (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: |
+  The `filelog` alias has been deprecated in favor of `file_log` in the chart-generated configuration.
+  Any Helm values or overrides that reference `filelog` (for example, `*.config.receivers.filelog`
+  or pipelines that list `filelog` as a receiver) must be updated to use `file_log`.
+  The chart will fail to be installed or upgraded if the deprecated alias is still referenced.

docs/advanced-configuration.md

@@ -628,7 +628,7 @@ Example of adding audit logs from Kubernetes host machines
 ```yaml
 logsCollection:
   extraFileLogs:
-    filelog/audit-log:
+    file_log/audit-log:
       include: [/var/log/kubernetes/apiserver/audit.log]
       start_at: beginning
       include_file_path: true

docs/migration-from-sck.md

@@ -235,7 +235,7 @@ If you are using the `resources` option in SCK to limit/increase the CPU and mem
 
 #### Extra files from host
 
-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.
+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.
 
 [SCK values.yaml snippet]
 
@@ -255,7 +255,7 @@ logs:
 ```yaml
 logsCollection:
   extraFileLogs:
-    filelog/kube-audit:
+    file_log/kube-audit:
       include: [/var/log/kube-apiserver-audit.log]
       start_at: beginning
       include_file_path: true

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

@@ -223,7 +223,7 @@ data:
         override: true
         timeout: 15s
     receivers:
-      filelog:
+      file_log:
         encoding: utf-8
         exclude:
         - /var/log/pods/default_default-splunk-otel-collector*_*/otel-collector/*.log
@@ -528,7 +528,7 @@ data:
           - filter/exclude_logs_from_pod
           - filter/exclude_logs_from_node
           receivers:
-          - filelog
+          - file_log
           - otlp
         logs/entities:
           exporters:

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

@@ -31,7 +31,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 8d6596ccaf0962c379be071620162f59da4d01fbacbd8b3badedc1497f8f4c45
+        checksum/config: c600cf779c7c0c6ceb7c4d74b9a9b960946a23b9629686cc731a6084fc57c5a6
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

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

@@ -172,7 +172,7 @@ data:
         override: true
         timeout: 15s
     receivers:
-      filelog:
+      file_log:
         encoding: utf-8
         exclude:
         - /var/log/pods/default_default-splunk-otel-collector*_*/otel-collector/*.log
@@ -482,7 +482,7 @@ data:
           - resource
           - resource/logs
           receivers:
-          - filelog
+          - file_log
           - otlp
         logs/entities:
           exporters:

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

@@ -31,7 +31,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 76f6533437421c8a52a2514ed49a26b5bee70190d993f7e8bddac2ad1280e41e
+        checksum/config: c802a514bf46fd6a36d344b36d4a946fa3c85e4e08a51d7903cb3741affd0c6e
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

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

@@ -207,7 +207,7 @@ data:
             ".")) where attributes["service.name"] == nil and cache["owner_name"] != nil
             and attributes["k8s.namespace.name"] != nil
     receivers:
-      filelog:
+      file_log:
         encoding: utf-8
         exclude:
         - /var/log/pods/default_default-splunk-otel-collector*_*/otel-collector/*.log
@@ -471,7 +471,7 @@ data:
           - transform/istio_service_name
           - resource/logs
           receivers:
-          - filelog
+          - file_log
           - otlp
         logs/entities:
           exporters:

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

@@ -32,7 +32,7 @@ spec:
         release: default
         sidecar.istio.io/inject: "false"
       annotations:
-        checksum/config: 0e16ebb6125afb39da1feaa6610c316b0ecfcfd5bdf8d24cf568c2e9dd8e3544
+        checksum/config: a7af5b6b799029a652f27d4d3ad6bb873ead7c7f39459a1be934f8a703c3ab69
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

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

@@ -212,7 +212,7 @@ data:
             ".")) where attributes["service.name"] == nil and cache["owner_name"] != nil
             and attributes["k8s.namespace.name"] != nil
     receivers:
-      filelog:
+      file_log:
         encoding: utf-8
         exclude:
         - /var/log/pods/default_default-splunk-otel-collector*_*/otel-collector/*.log
@@ -536,7 +536,7 @@ data:
           - transform/istio_service_name
           - resource/logs
           receivers:
-          - filelog
+          - file_log
           - otlp
         logs/entities:
           exporters: