Merge pull request #22539 from a-robinson/newf

Auto commit by PR queue bot

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

@@ -31,7 +31,7 @@ ENV DO_NOT_INSTALL_CATCH_ALL_CONFIG true
 RUN apt-get -q update && \
     apt-get install -y curl && \
     apt-get clean && \
-    curl -s https://storage.googleapis.com/signals-agents/logging/google-fluentd-install.sh | sudo bash
+    curl -s https://dl.google.com/cloudagents/install-logging-agent.sh | bash
 
 # Install the record reformer plugin.
 RUN /usr/sbin/google-fluentd-gem install fluent-plugin-record-reformer

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

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

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

@@ -120,6 +120,7 @@
 <source>
   type tail
   format multiline
+  multiline_flush_interval 5s
   format_firstline /^\w\d{4}/
   format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
   time_format %m%d %H:%M:%S.%N
@@ -133,6 +134,7 @@
 <source>
   type tail
   format multiline
+  multiline_flush_interval 5s
   format_firstline /^\w\d{4}/
   format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
   time_format %m%d %H:%M:%S.%N
@@ -146,6 +148,7 @@
 <source>
   type tail
   format multiline
+  multiline_flush_interval 5s
   format_firstline /^\w\d{4}/
   format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
   time_format %m%d %H:%M:%S.%N
@@ -159,6 +162,7 @@
 <source>
   type tail
   format multiline
+  multiline_flush_interval 5s
   format_firstline /^\w\d{4}/
   format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
   time_format %m%d %H:%M:%S.%N

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

@@ -9,7 +9,7 @@ spec:
   dnsPolicy: Default
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.17
+    image: gcr.io/google_containers/fluentd-gcp:1.18
     resources:
       limits:
         memory: 200Mi