Skip to content

K
k3s
Unverified Commit ea2154fb authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #58658 from roberthbailey/fluentd-gcp

Automatic merge from submit-queue (batch tested with PRs 58697, 58658, 58676, 58674). 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>. Remove salt configuration from the fluentd-gcp configuration. Remove a bit of left-over salt. This was missed in https://github.com/kubernetes/kubernetes/pull/58248 xref: #49213 **Release note**: ```release-note NONE ```
parents 8d62044e 7cd213ae
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 11 deletions
cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
View file @ ea2154fb
......@@ -90,17 +90,6 @@ data:
</match>
system.input.conf: |-
# Example:
# 2015-12-21 23:17:22,066 [salt.state ][INFO ] Completed state [net.ipv4.ip_forward] at time 23:17:22.066081
<source>
type tail
format /^(?<time>[^ ]* [^ ,]*)[^\[]*\[[^\]]*\]\[(?<severity>[^ \]]*) *\] (?<message>.*)$/
time_format %Y-%m-%d %H:%M:%S
path /var/log/salt/minion
pos_file /var/log/gcp-salt.pos
tag salt
</source>
# Example:
# Dec 21 23:17:22 gke-foo-1-1-4b5cbd14-node-4eoj startupscript: Finished running startup script /var/run/google.startup.script
<source>
type tail
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment