Merge pull request #39151 from Crassirostris/fluentd-gcp-default-format

Automatic merge from submit-queue Try parse golang logs by default Glog by default logs to stderr, so Stackdriver Logging shows them all as errors. This PR makes fluentd try to parse messages using glog format and if succeeded, set timestamp and severity accordingly. CC @piosz @fgrzadkowski

Merge pull request #39151 from Crassirostris/fluentd-gcp-default-format
2d154999 · Kubernetes Submit Queue · GitHub · 2b7899ae · 51051029 · 2d154999
Commit 2d154999 authored Jan 03, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 03, 2017
4 changed files
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -2,23 +2,23 @@
 apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
-  name: fluentd-gcp-v1.30
+  name: fluentd-gcp-v1.31
  namespace: kube-system
  labels:
    k8s-app: fluentd-gcp
    kubernetes.io/cluster-service: "true"
-    version: v1.30
+    version: v1.31
 spec:
  template:
    metadata:
      labels:
        k8s-app: fluentd-gcp
        kubernetes.io/cluster-service: "true"
-        version: v1.30
+        version: v1.31
    spec:
      containers:
      - name: fluentd-gcp
-        image: gcr.io/google_containers/fluentd-gcp:1.30
+        image: gcr.io/google_containers/fluentd-gcp:1.31
        # If fluentd consumes its own logs, the following situation may happen:
        # fluentd fails to send a chunk to the server => writes it to the log =>
        # tries to send this message to the server => fails to send a chunk and so on.

--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
@@ -26,7 +26,7 @@
 .PHONY:	build push

 PREFIX=gcr.io/google_containers
-TAG = 1.30
+TAG = 1.31

 build:
 	docker build -t $(PREFIX)/fluentd-gcp:$(TAG) .

--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/fluent.conf
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/fluent.conf
@@ -52,6 +52,14 @@
  read_from_head true
 </source>

+<filter reform.**>
+  type parser
+  format /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<log>.*)/
+  reserve_data true
+  suppress_parse_error_log true
+  key_name log
+</filter>
+
 <match reform.**>
  type record_reformer
  enable_ruby true

--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -10,7 +10,7 @@ spec:
  dnsPolicy: Default
  containers:
  - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.30
+    image: gcr.io/google_containers/fluentd-gcp:1.31
    # If fluentd consumes its own logs, the following situation may happen:
    # fluentd fails to send a chunk to the server => writes it to the log =>
    # tries to send this message to the server => fails to send a chunk and so on.