Skip to content

Commit 7735135

Browse files
committed
update more references, add chlog issue
1 parent 50aabe3 commit 7735135

9 files changed

Lines changed: 16 additions & 16 deletions

File tree

.chloggen/fixdeprecatedaliasrefs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ component: chart
55
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
66
note: Rename all `filelog` receiver references to `file_log`
77
# One or more tracking issues related to the change
8-
issues: []
8+
issues: [2396]
99
# (Optional) One or more lines of additional information to render under the primary note.
1010
# These lines will be padded with 2 spaces and then inserted directly into the document.
1111
# Use pipe (|) for multiline entries.

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/only-logs-with-extra-file-logs/only-logs-with-extra-file-logs-values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ agent:
2020
mountPath: /var/log/catalina
2121
logsCollection:
2222
extraFileLogs:
23-
filelog/example-with-storage:
23+
file_log/example-with-storage:
2424
include:
2525
- /tmp/directory_one/*.log
2626
start_at: beginning
@@ -36,7 +36,7 @@ logsCollection:
3636
- from: attributes.volume_name
3737
to: resource["k8s.volume.name"]
3838
type: move
39-
filelog/example-without-storage:
39+
file_log/example-without-storage:
4040
include:
4141
- /var/log/catalina/catalina*.log
4242
start_at: beginning

examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ data:
253253
enabled: true
254254
start_at: beginning
255255
storage: file_storage
256-
filelog/example-with-storage:
256+
file_log/example-with-storage:
257257
include:
258258
- /tmp/directory_one/*.log
259259
include_file_name: false
@@ -269,7 +269,7 @@ data:
269269
host.name: EXPR(env("K8S_NODE_NAME"))
270270
start_at: beginning
271271
storage: file_storage
272-
filelog/example-without-storage:
272+
file_log/example-without-storage:
273273
include:
274274
- /var/log/catalina/catalina*.log
275275
include_file_name: false
@@ -338,8 +338,8 @@ data:
338338
- resourcedetection
339339
- resource
340340
receivers:
341-
- filelog/example-with-storage
342-
- filelog/example-without-storage
341+
- file_log/example-with-storage
342+
- file_log/example-without-storage
343343
telemetry:
344344
metrics:
345345
readers:

examples/only-logs-with-extra-file-logs/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: 87d53ed338babcc50630357b2c915f68e567c0e6252064965e8dc551ec12198d
34+
checksum/config: 18059f8e66dce24e8a6d7af398334ccaa9235e95850a5c2d546cb91f62e63650
3535
kubectl.kubernetes.io/default-container: otel-collector
3636
spec:
3737
hostNetwork: true

functional_tests/functional/testdata/expected_kind_values/expected_internal_metrics.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ resourceMetrics:
328328
stringValue: agent
329329
- key: receiver
330330
value:
331-
stringValue: filelog
331+
stringValue: file_log
332332
- key: server.port
333333
value:
334334
stringValue: "8889"
@@ -552,7 +552,7 @@ resourceMetrics:
552552
stringValue: agent
553553
- key: receiver
554554
value:
555-
stringValue: filelog
555+
stringValue: file_log
556556
- key: server.port
557557
value:
558558
stringValue: "8889"
@@ -7805,7 +7805,7 @@ resourceMetrics:
78057805
stringValue: agent
78067806
- key: receiver
78077807
value:
7808-
stringValue: filelog
7808+
stringValue: file_log
78097809
- key: server.port
78107810
value:
78117811
stringValue: "8889"

functional_tests/logs/no_drop_logs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func Test_NoDropLogs(t *testing.T) {
7373

7474
// entriesNum calculation logic:
7575
// - test log file contains 600 log lines
76-
// - filelog receiver batches 100 lines/request
76+
// - file_log receiver batches 100 lines/request
7777
// - for this test, I set the sender queue size to 3 requests; ie: 3 * 100 log messages, before the queue is full.
7878
// entriesNum = 600 / (3 * 100) = 2
7979
internal.WaitForLogs(t, 2, logsConsumer)

functional_tests/logs/testdata/no_drop_logs_values.yaml.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ agent:
2222
mountPath: /tmp/temp-log-test
2323
config:
2424
receivers:
25-
filelog:
25+
file_log:
2626
operators:
2727
encoding: utf-8
2828
include:

0 commit comments

Comments
 (0)