diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml index 1844037ad8b..8351958e9e1 100644 --- 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. diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile index 3465509479a..99f87e1f91c 100644 --- 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) . diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/fluent.conf b/cluster/addons/fluentd-gcp/fluentd-gcp-image/fluent.conf index 3c6b01e89e8..c94ca1231a4 100644 --- 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 + + type parser + format /^(?\w)(? + type record_reformer enable_ruby true diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml index db0ff46cc81..a9d789fc4c2 100644 --- 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.