diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile index a49300c48cf..0ba7f117245 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile @@ -40,4 +40,4 @@ RUN /usr/sbin/td-agent-gem install fluent-plugin-record-reformer COPY td-agent.conf /etc/td-agent/td-agent.conf # Run the Fluentd service. -CMD /usr/sbin/td-agent "$FLUENTD_ARGS" > /var/log/td-agent/td-agent.log +CMD /usr/sbin/td-agent "$FLUENTD_ARGS" diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index 528866c4d21..7a364d6e114 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile @@ -1,7 +1,7 @@ .PHONY: build push IMAGE = fluentd-elasticsearch -TAG = 1.9 +TAG = 1.10 build: docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) . diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile index 2554df06112..ff6836ba9a7 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile @@ -17,11 +17,14 @@ RUN apt-get -q update && \ apt-get clean && \ curl -s https://storage.googleapis.com/signals-agents/logging/google-fluentd-install.sh | sudo bash -# Copy the Fluentd configuration file for logging Docker container logs. -COPY google-fluentd.conf /etc/google-fluentd/google-fluentd.conf - # Install the record reformer plugin. RUN /usr/sbin/google-fluentd-gem install fluent-plugin-record-reformer +# Remove the misleading log file that gets generated when the agent is installed +RUN rm -rf /var/log/google-fluentd + +# Copy the Fluentd configuration file for logging Docker container logs. +COPY google-fluentd.conf /etc/google-fluentd/google-fluentd.conf + # Start Fluentd to pick up our config that watches Docker container logs. -CMD /usr/sbin/google-fluentd "$FLUENTD_ARGS" > /var/log/google-fluentd.log +CMD /usr/sbin/google-fluentd "$FLUENTD_ARGS" diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile index f0ae8833ecc..cfbe2def814 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile @@ -14,7 +14,7 @@ .PHONY: kbuild kpush -TAG = 1.11 +TAG = 1.12 # Rules for building the test image for deployment to Dockerhub with user kubernetes. diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml index 1b34e084396..e1fda84eacd 100644 --- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml +++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml @@ -12,7 +12,7 @@ spec: cpu: 100m env: - name: "FLUENTD_ARGS" - value: "-qq" + value: "-q" volumeMounts: - name: varlog mountPath: /varlog diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml index 31ba54acb7a..6eae4c8f699 100644 --- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml +++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml @@ -6,14 +6,14 @@ metadata: spec: containers: - name: fluentd-cloud-logging - image: gcr.io/google_containers/fluentd-gcp:1.11 + image: gcr.io/google_containers/fluentd-gcp:1.12 resources: limits: cpu: 100m memory: 200Mi env: - name: FLUENTD_ARGS - value: -qq + value: -q volumeMounts: - name: varlog mountPath: /varlog diff --git a/docs/getting-started-guides/logging.md b/docs/getting-started-guides/logging.md index 2d61fa0cc87..95460f9de1d 100644 --- a/docs/getting-started-guides/logging.md +++ b/docs/getting-started-guides/logging.md @@ -169,14 +169,14 @@ metadata: spec: containers: - name: fluentd-cloud-logging - image: gcr.io/google_containers/fluentd-gcp:1.11 + image: gcr.io/google_containers/fluentd-gcp:1.12 resources: limits: cpu: 100m memory: 200Mi env: - name: FLUENTD_ARGS - value: -qq + value: -q volumeMounts: - name: varlog mountPath: /varlog