Merge pull request #47860 from crassirostris/fluentd-log-to-stdio

Automatic merge from submit-queue (batch tested with PRs 47860, 47170) Make fluentd log to stdio instead of a dedicated file Lower verbosity also, to reduce volume of system logs exported to the backend. Fix https://github.com/kubernetes/kubernetes/issues/43772 /cc @piosz

Merge pull request #47860 from crassirostris/fluentd-log-to-stdio
93ef2f2f · Kubernetes Submit Queue · GitHub · 53a5ee79 · 1d1c1267 · 93ef2f2f
Commit 93ef2f2f authored Jun 26, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 26, 2017
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

fluentd-es-ds.yaml cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +4 -1

fluentd-gcp-ds.yaml cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +2 -2

No files found.
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
@@ -28,7 +28,10 @@ spec:
        command:
          - '/bin/sh'
          - '-c'
-          - '/usr/sbin/td-agent 2>&1 >> /var/log/fluentd.log'
+          - '/usr/sbin/td-agent $FLUENTD_ARGS'
+        env:
+        - name: FLUENTD_AGRS
+          value: -q
        resources:
          limits:
            memory: 200Mi

--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -36,10 +36,10 @@ spec:
        command:
          - '/bin/sh'
          - '-c'
-          - '/run.sh $FLUENTD_ARGS 2>&1 >>/var/log/fluentd.log'
+          - '/run.sh $FLUENTD_ARGS'
        env:
        - name: FLUENTD_ARGS
-          value: --no-supervisor
+          value: --no-supervisor -q
        resources:
          limits:
            memory: 300Mi