Merge pull request #20630 from a-robinson/logparse

Auto commit by PR queue bot
2016-02-06 11:28:08 -08:00
parent 17c65cee35 e5c5f76402
commit d1b7fb3025
7 changed files with 69 additions and 19 deletions
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
  containers:
  - name: fluentd-elasticsearch
-    image: gcr.io/google_containers/fluentd-elasticsearch:1.13
+    image: gcr.io/google_containers/fluentd-elasticsearch:1.14
    resources:
      limits:
        cpu: 100m
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
  containers:
  - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.15
+    image: gcr.io/google_containers/fluentd-gcp:1.16
    resources:
      limits:
        cpu: 100m