Merge pull request #12045 from a-robinson/logs

Fix fluentd configs to collect etcd logs on the master
2015-07-30 17:36:46 -07:00
parent 51a7a38f67 69ab7026af
commit bfaa527139
7 changed files with 20 additions and 19 deletions
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
  containers:
  - name: fluentd-elasticsearch
-    image: gcr.io/google_containers/fluentd-elasticsearch:1.6
+    image: gcr.io/google_containers/fluentd-elasticsearch:1.7
    resources:
      limits:
        cpu: 100m
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
  containers:
  - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.9
+    image: gcr.io/google_containers/fluentd-gcp:1.10
    resources:
      limits:
        cpu: 100m