Skip to content

Commit c670c05

Browse files
committed
minor change for logs configmap template
1 parent 70479c7 commit c670c05

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

charts/logan/templates/logs-configmap.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ data:
6262
@id {{ $name }}{{- ternary (print "_" $currWorker) "" $multiWorkersEnabled }}
6363
path_key tailed_path
6464
path {{ $logDefinition.path | required (printf "fluentd.kubernetesSystem.logs.%s.path is required" $name) }}
65-
pos_file {{ $.Values.fluentd.baseDir }}/oci_la_fluentd_outplugin/pos{{- ternary (print "/worker-" $currWorker) "" $multiWorkersEnabled }}/{{ $name }}.logs.pos
65+
pos_file {{ $.Values.fluentd.baseDir }}/oci_la_fluentd_outplugin/pos/{{ $name }}.logs.pos
6666
tag oci{{- ternary (print "." $currWorker) "" $multiWorkersEnabled }}.oke.{{ $name }}.*
6767
read_from_head "{{ $.Values.fluentd.tailPlugin.readFromHead }}"
6868
{{- if $logDefinition.encoding }}
@@ -165,7 +165,7 @@ data:
165165
@id {{ $name }}{{- ternary (print "_" $currWorker) "" $multiWorkersEnabled }}
166166
path_key tailed_path
167167
path {{ $logDefinition.path | required (printf "fluentd.linuxSystem.logs.%s.path is required" $name) }}
168-
pos_file {{ $.Values.fluentd.baseDir }}/oci_la_fluentd_outplugin/pos{{- ternary (print "/worker-" $currWorker) "" $multiWorkersEnabled }}/{{ $name }}.logs.pos
168+
pos_file {{ $.Values.fluentd.baseDir }}/oci_la_fluentd_outplugin/pos/{{ $name }}.logs.pos
169169
tag oci{{- ternary (print "." $currWorker) "" $multiWorkersEnabled }}.oke.{{ $name }}.*
170170
read_from_head "{{ $.Values.fluentd.tailPlugin.readFromHead }}"
171171
{{- if $logDefinition.encoding }}
@@ -240,7 +240,7 @@ data:
240240
@id in_tail_syslog{{- ternary (print "_" $currWorker) "" $multiWorkersEnabled }}
241241
path_key tailed_path
242242
path {{ required "fluentd.linuxSystem.logs.syslog.path is required" $.Values.fluentd.linuxSystem.logs.syslog.path }}
243-
pos_file {{ $.Values.fluentd.baseDir }}/oci_la_fluentd_outplugin/pos{{- ternary (print "/worker-" $currWorker) "" $multiWorkersEnabled }}/syslog.logs.pos
243+
pos_file {{ $.Values.fluentd.baseDir }}/oci_la_fluentd_outplugin/pos/syslog.logs.pos
244244
tag oci{{- ternary (print "." $currWorker) "" $multiWorkersEnabled }}.oke.syslog.messages.**
245245
read_from_head "{{ $.Values.fluentd.tailPlugin.readFromHead }}"
246246
{{- if $.Values.fluentd.linuxSystem.logs.syslog.encoding }}
@@ -365,7 +365,7 @@ data:
365365
@id {{ $name }}{{- ternary (print "_" $currWorker) "" $multiWorkersEnabled }}
366366
path_key tailed_path
367367
path {{ $logDefinition.path | required (printf "fluentd.customLogs.%s.path is required" $name) }}
368-
pos_file {{ $.Values.fluentd.baseDir }}/oci_la_fluentd_outplugin/pos{{- ternary (print "/worker-" $currWorker) "" $multiWorkersEnabled }}/{{ $name }}.logs.pos
368+
pos_file {{ $.Values.fluentd.baseDir }}/oci_la_fluentd_outplugin/pos/{{ $name }}.logs.pos
369369
tag oci{{- ternary (print "." $currWorker) "" $multiWorkersEnabled }}.oke.{{ $name }}.*
370370
read_from_head "{{ $.Values.fluentd.tailPlugin.readFromHead }}"
371371
{{- if $logDefinition.encoding }}
@@ -463,7 +463,7 @@ data:
463463
@id in_tail_containerlogs{{- ternary (print "_" $currWorker) "" $multiWorkersEnabled }}
464464
path_key tailed_path
465465
path {{ required "fluentd.genericContainerLogs.path is required" $.Values.fluentd.genericContainerLogs.path }}
466-
pos_file {{ $.Values.fluentd.baseDir }}/oci_la_fluentd_outplugin/pos{{- ternary (print "/worker-" $currWorker) "" $multiWorkersEnabled }}/containerlogs.logs.pos
466+
pos_file {{ $.Values.fluentd.baseDir }}/oci_la_fluentd_outplugin/pos/containerlogs.logs.pos
467467
tag oci{{- ternary (print "." $currWorker) "" $multiWorkersEnabled }}.oke.containerlogs.*
468468
read_from_head "{{ $.Values.fluentd.tailPlugin.readFromHead }}"
469469
# Modify the exclude path once a specific container log config is explictly defined to avoid duplicate collection.

0 commit comments

Comments
 (0)