Merge pull request #13886 from a-robinson/logtags

Auto commit by PR queue bot

cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile

@@ -11,6 +11,8 @@ MAINTAINER Alex Robinson "arob@google.com"
 
 # Disable prompts from apt.
 ENV DEBIAN_FRONTEND noninteractive
+# Keeps unneeded configs from being installed along with fluentd.
+ENV DO_NOT_INSTALL_CATCH_ALL_CONFIG true
 
 RUN apt-get -q update && \
     apt-get install -y curl && \

cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile

@@ -14,7 +14,7 @@
 
 .PHONY:	kbuild kpush
 
-TAG = 1.12
+TAG = 1.13
 
 # Rules for building the test image for deployment to Dockerhub with user kubernetes.
 

cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf

@@ -1,7 +1,7 @@
 # This configuration file for Fluentd / td-agent is used
 # to watch changes to Docker log files that live in the
 # directory /var/lib/docker/containers/ and are symbolically
-# linked to from the /varlog directory using names that capture the
+# linked to from the /var/log directory using names that capture the
 # pod name and container name. These logs are then submitted to
 # Google Cloud Logging which assumes the installation of the cloud-logging plug-in.
 #
@@ -29,28 +29,25 @@
 #    synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log 
 #    -> 
 #    /var/lib/docker/containers/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b/997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b-json.log
-# The /var/log directory on the host is mapped to the /varlog directory in the container
+# The /var/log directory on the host is mapped to the /var/log directory in the container
 # running this instance of Fluentd and we end up collecting the file:
-#   /varlog/containers/synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log
+#   /var/log/containers/synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log
 # This results in the tag:
-#  varlog.containers.synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log
+#  var.log.containers.synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log
-# The record reformer is used is discard the varlog.containers prefix and
+# The record reformer is used is discard the var.log.containers prefix and
 # the Docker container ID suffix and "kubernetes." is pre-pended giving the
 # final tag which is ingested into Elasticsearch:
 #   kubernetes.synthetic-logger-0.25lps-pod_default-synth-lgr
 # This makes it easier for users to search for logs by pod name or by
 # the name of the Kubernetes container regardless of how many times the
 # Kubernetes pod has been restarted (resulting in a several Docker container IDs).
-# TODO: Propagate the labels associated with a container along with its logs
-# so users can query logs using labels as well as or instead of the pod name
-# and container name.
 
 <source>
   type tail
   format json
   time_key time
-  path /varlog/containers/*.log
+  path /var/log/containers/*.log
-  pos_file /varlog/gcp-containers.log.pos
+  pos_file /var/log/gcp-containers.log.pos
   time_format %Y-%m-%dT%H:%M:%S
   tag reform.*
   read_from_head true
@@ -59,83 +56,101 @@
 <match reform.**>
   type record_reformer
   enable_ruby true
-  tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
+  tag kubernetes.${tag_suffix[4].split('-')[0..-2].join('-')}
 </match>
 
 <source>
   type tail
   format none
-  path /varlog/salt/minion
+  path /var/log/salt/minion
-  pos_file /varlog/gcp-salt.pos
+  pos_file /var/log/gcp-salt.pos
   tag salt
 </source>
 
 <source>
   type tail
   format none
-  path /varlog/startupscript.log
+  path /var/log/startupscript.log
-  pos_file /varlog/gcp-startupscript.log.pos
+  pos_file /var/log/gcp-startupscript.log.pos
   tag startupscript
 </source>
 
 <source>
   type tail
   format none
-  path /varlog/docker.log
+  path /var/log/docker.log
-  pos_file /varlog/gcp-docker.log.pos
+  pos_file /var/log/gcp-docker.log.pos
   tag docker
 </source>
 
 <source>
   type tail
   format none
-  path /varlog/etcd.log
+  path /var/log/etcd.log
-  pos_file /varlog/gcp-etcd.log.pos
+  pos_file /var/log/gcp-etcd.log.pos
   tag etcd
 </source>
 
 <source>
   type tail
   format none
-  path /varlog/kubelet.log
+  path /var/log/kubelet.log
-  pos_file /varlog/gcp-kubelet.log.pos
+  pos_file /var/log/gcp-kubelet.log.pos
   tag kubelet
 </source>
 
 <source>
   type tail
   format none
-  path /varlog/kube-apiserver.log
+  path /var/log/kube-apiserver.log
-  pos_file /varlog/gcp-kube-apiserver.log.pos
+  pos_file /var/log/gcp-kube-apiserver.log.pos
   tag kube-apiserver
 </source>
 
 <source>
   type tail
   format none
-  path /varlog/kube-controller-manager.log
+  path /var/log/kube-controller-manager.log
-  pos_file /varlog/gcp-kube-controller-manager.log.pos
+  pos_file /var/log/gcp-kube-controller-manager.log.pos
   tag kube-controller-manager
 </source>
 
 <source>
   type tail
   format none
-  path /varlog/kube-scheduler.log
+  path /var/log/kube-scheduler.log
-  pos_file /varlog/gcp-kube-scheduler.log.pos
+  pos_file /var/log/gcp-kube-scheduler.log.pos
   tag kube-scheduler
 </source>
 
-<match **>
+# We use 2 output stanzas - one to handle the container logs and one to handle
+# the node daemon logs, the latter of which explicitly sends its logs to the
+# compute.googleapis.com service rather than container.googleapis.com to keep
+# them separate since most users don't care about the node logs.
+<match kubernetes.**>
   type google_cloud
   # Set the chunk limit conservatively to avoid exceeding the GCL limit
   # of 2MB per write request.
   buffer_chunk_limit 512K
-  # Cap buffer memory usage to 512KB/chunk * 128 chunks = 65 MB
+  # Cap the combined memory usage of this buffer and the one below to
-  buffer_queue_limit 128
+  # 512KB/chunk * (96 + 32) chunks = 65 MB
+  buffer_queue_limit 96
+  # Never wait more than 5 seconds before flushing logs in the non-error case.
   flush_interval 5s
   # Never wait longer than 5 minutes between retries.
   max_retry_wait 300
   # Disable the limit on the number of retries (retry forever).
   disable_retry_limit
 </match>
+
+# Keep a smaller buffer here since these logs are less important than the user's
+# container logs.
+<match **>
+  type google_cloud
+  detect_subservice false
+  buffer_chunk_limit 512K
+  buffer_queue_limit 32
+  flush_interval 5s
+  max_retry_wait 300
+  disable_retry_limit
+</match>

cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.12
+    image: gcr.io/google_containers/fluentd-gcp:1.13
     resources:
       limits:
         cpu: 100m
@@ -16,8 +16,8 @@ spec:
       value: -q
     volumeMounts:
     - name: varlog
-      mountPath: /varlog
+      mountPath: /var/log
-    - name: containers
+    - name: varlibdockercontainers
       mountPath: /var/lib/docker/containers
       readOnly: true
   terminationGracePeriodSeconds: 30
@@ -25,7 +25,7 @@ spec:
   - name: varlog
     hostPath:
       path: /var/log
-  - name: containers
+  - name: varlibdockercontainers
     hostPath:
       path: /var/lib/docker/containers
 

docs/getting-started-guides/logging.md

@@ -169,7 +169,7 @@ metadata:
 spec:
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.12
+    image: gcr.io/google_containers/fluentd-gcp:1.13
     resources:
       limits:
         cpu: 100m
@@ -179,8 +179,8 @@ spec:
       value: -q
     volumeMounts:
     - name: varlog
-      mountPath: /varlog
+      mountPath: /var/log
-    - name: containers
+    - name: varlibdockercontainers
       mountPath: /var/lib/docker/containers
       readOnly: true
   terminationGracePeriodSeconds: 30
@@ -188,7 +188,7 @@ spec:
   - name: varlog
     hostPath:
       path: /var/log
-  - name: containers
+  - name: varlibdockercontainers
     hostPath:
       path: /var/lib/docker/containers
 ```