diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf index 9d481ec54a0..89ea437e0f1 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf +++ b/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 -# The record reformer is used is discard the varlog.containers prefix and +# var.log.containers.synthetic-logger-0.25lps-pod_default-synth-lgr-997599971ee6366d4a5920d25b79286ad45ff37a74494f262e3bc98d909d0a7b.log +# 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. type tail format json time_key time - path /varlog/containers/*.log - pos_file /varlog/gcp-containers.log.pos + path /var/log/containers/*.log + pos_file /var/log/gcp-containers.log.pos time_format %Y-%m-%dT%H:%M:%S tag reform.* read_from_head true @@ -59,70 +56,70 @@ type record_reformer enable_ruby true - tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')} + tag kubernetes.${tag_suffix[4].split('-')[0..-2].join('-')} type tail format none - path /varlog/salt/minion - pos_file /varlog/gcp-salt.pos + path /var/log/salt/minion + pos_file /var/log/gcp-salt.pos tag salt type tail format none - path /varlog/startupscript.log - pos_file /varlog/gcp-startupscript.log.pos + path /var/log/startupscript.log + pos_file /var/log/gcp-startupscript.log.pos tag startupscript type tail format none - path /varlog/docker.log - pos_file /varlog/gcp-docker.log.pos + path /var/log/docker.log + pos_file /var/log/gcp-docker.log.pos tag docker type tail format none - path /varlog/etcd.log - pos_file /varlog/gcp-etcd.log.pos + path /var/log/etcd.log + pos_file /var/log/gcp-etcd.log.pos tag etcd type tail format none - path /varlog/kubelet.log - pos_file /varlog/gcp-kubelet.log.pos + path /var/log/kubelet.log + pos_file /var/log/gcp-kubelet.log.pos tag kubelet type tail format none - path /varlog/kube-apiserver.log - pos_file /varlog/gcp-kube-apiserver.log.pos + path /var/log/kube-apiserver.log + pos_file /var/log/gcp-kube-apiserver.log.pos tag kube-apiserver type tail format none - path /varlog/kube-controller-manager.log - pos_file /varlog/gcp-kube-controller-manager.log.pos + path /var/log/kube-controller-manager.log + pos_file /var/log/gcp-kube-controller-manager.log.pos tag kube-controller-manager type tail format none - path /varlog/kube-scheduler.log - pos_file /varlog/gcp-kube-scheduler.log.pos + path /var/log/kube-scheduler.log + pos_file /var/log/gcp-kube-scheduler.log.pos tag kube-scheduler diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml index 6eae4c8f699..14fb2f8f045 100644 --- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml +++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml @@ -16,15 +16,15 @@ spec: value: -q volumeMounts: - name: varlog - mountPath: /varlog - - name: containers + mountPath: /var/log + - name: varlibdockercontainers mountPath: /var/lib/docker/containers terminationGracePeriodSeconds: 30 volumes: - name: varlog hostPath: path: /var/log - - name: containers + - name: varlibdockercontainers hostPath: path: /var/lib/docker/containers diff --git a/docs/getting-started-guides/logging.md b/docs/getting-started-guides/logging.md index 95460f9de1d..967fe9caaf3 100644 --- a/docs/getting-started-guides/logging.md +++ b/docs/getting-started-guides/logging.md @@ -179,15 +179,15 @@ spec: value: -q volumeMounts: - name: varlog - mountPath: /varlog - - name: containers + mountPath: /var/log + - name: varlibdockercontainers mountPath: /var/lib/docker/containers terminationGracePeriodSeconds: 30 volumes: - name: varlog hostPath: path: /var/log - - name: containers + - name: varlibdockercontainers hostPath: path: /var/lib/docker/containers ```