Merge pull request #13229 from a-robinson/fluent

Clean up the fluentd images to make them more debuggable

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"

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) .

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"

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.
 

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

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

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