Merge pull request #7123 from satnam6502/logging

Propagate pod and container name for log files
2015-04-23 10:13:08 -07:00
parent 961cd710d7 2444c1f943
commit f9156c281a
15 changed files with 134 additions and 19 deletions
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest
@@ -2,7 +2,7 @@ version: v1beta2
 id: fluentd-to-elasticsearch
 containers:
  - name: fluentd-es
-    image: gcr.io/google_containers/fluentd-elasticsearch:1.3
+    image: gcr.io/google_containers/fluentd-elasticsearch:1.4
    env:
      - name: FLUENTD_ARGS
        value: -qq
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest
@@ -2,7 +2,7 @@ version: v1beta2
 id: fluentd-to-gcp
 containers:
  - name: fluentd-gcp
-    image: gcr.io/google_containers/fluentd-gcp:1.2
+    image: gcr.io/google_containers/fluentd-gcp:1.3
    volumeMounts:
      - name: containers
        mountPath: /var/lib/docker/containers