mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #67947 from saravanan30erd/fluentd-elasticsearch
Automatic merge from submit-queue (batch tested with PRs 67067, 67947). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fixes fluentd configuration params in fluentd-elasticsearch addon **What this PR does / why we need it**: - fixes the errors/warnings in fluentd configuration. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ``` 2018-08-28 11:40:50 +0000 [warn]: 'filters' parameter is deprecated: filters has been renamed as matches 2018-08-28 11:40:50 +0000 [warn]: 'filters' parameter is deprecated: filters has been renamed as matches 2018-08-28 11:40:50 +0000 [warn]: 'filters' parameter is deprecated: filters has been renamed as matches 2018-08-28 11:40:50 +0000 [warn]: 'filters' parameter is deprecated: filters has been renamed as matches 2018-08-28 11:40:50 +0000 [warn]: 'filters' parameter is deprecated: filters has been renamed as matches 2018-08-28 11:40:50 +0000 [warn]: parameter 'time_format' in <source> @id fluentd-containers.log @type tail path "/var/log/containers/*.log" pos_file "/var/log/es-containers.log.pos" time_format %Y-%m-%dT%H:%M:%S.%NZ tag "raw.kubernetes.*" read_from_head true <parse> @type "multi_format" <pattern> format json time_key "time" time_format "%Y-%m-%dT%H:%M:%S.%NZ" time_type string </pattern> <pattern> format /^(?<time>.+) (?<stream>stdout|stderr) [^ ]* (?<log>.*)$/ time_format "%Y-%m-%dT%H:%M:%S.%N%:z" expression ^(?<time>.+) (?<stream>stdout|stderr) [^ ]* (?<log>.*)$ ignorecase false multiline false </pattern> </parse> </source> is not used. ``` **Release note**: ```release-note fixes the errors/warnings in fluentd configuration ```
This commit is contained in:
commit
a2f4f585af
@ -115,7 +115,6 @@ data:
|
||||
@type tail
|
||||
path /var/log/containers/*.log
|
||||
pos_file /var/log/es-containers.log.pos
|
||||
time_format %Y-%m-%dT%H:%M:%S.%NZ
|
||||
tag raw.kubernetes.*
|
||||
read_from_head true
|
||||
<parse>
|
||||
@ -308,7 +307,7 @@ data:
|
||||
<source>
|
||||
@id journald-docker
|
||||
@type systemd
|
||||
filters [{ "_SYSTEMD_UNIT": "docker.service" }]
|
||||
matches [{ "_SYSTEMD_UNIT": "docker.service" }]
|
||||
<storage>
|
||||
@type local
|
||||
persistent true
|
||||
@ -321,7 +320,7 @@ data:
|
||||
<source>
|
||||
@id journald-container-runtime
|
||||
@type systemd
|
||||
filters [{ "_SYSTEMD_UNIT": "{{ container_runtime }}.service" }]
|
||||
matches [{ "_SYSTEMD_UNIT": "{{ container_runtime }}.service" }]
|
||||
<storage>
|
||||
@type local
|
||||
persistent true
|
||||
@ -334,7 +333,7 @@ data:
|
||||
<source>
|
||||
@id journald-kubelet
|
||||
@type systemd
|
||||
filters [{ "_SYSTEMD_UNIT": "kubelet.service" }]
|
||||
matches [{ "_SYSTEMD_UNIT": "kubelet.service" }]
|
||||
<storage>
|
||||
@type local
|
||||
persistent true
|
||||
@ -347,7 +346,7 @@ data:
|
||||
<source>
|
||||
@id journald-node-problem-detector
|
||||
@type systemd
|
||||
filters [{ "_SYSTEMD_UNIT": "node-problem-detector.service" }]
|
||||
matches [{ "_SYSTEMD_UNIT": "node-problem-detector.service" }]
|
||||
<storage>
|
||||
@type local
|
||||
persistent true
|
||||
@ -360,7 +359,7 @@ data:
|
||||
<source>
|
||||
@id kernel
|
||||
@type systemd
|
||||
filters [{ "_TRANSPORT": "kernel" }]
|
||||
matches [{ "_TRANSPORT": "kernel" }]
|
||||
<storage>
|
||||
@type local
|
||||
persistent true
|
||||
|
Loading…
Reference in New Issue
Block a user