From e65f0aafd5814a8c8223857b63016047b10ea3f3 Mon Sep 17 00:00:00 2001
From: Satnam Singh <satnam@google.com>
Date: Wed, 29 Apr 2015 18:21:43 -0700
Subject: [PATCH] Trim cluster log tags to pod name and container name

---
 .../fluentd-elasticsearch/fluentd-es-image/Dockerfile     | 3 +++
 .../fluentd-elasticsearch/fluentd-es-image/Makefile       | 2 +-
 .../fluentd-elasticsearch/fluentd-es-image/td-agent.conf  | 8 +++++++-
 cluster/saltbase/salt/fluentd-es/fluentd-es.json          | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
index 666f84a649..7c03c3bc1a 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
@@ -33,6 +33,9 @@ RUN sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /et
 # Install the Elasticsearch Fluentd plug-in.
 RUN /usr/sbin/td-agent-gem install fluent-plugin-elasticsearch
 
+# Install the record reformer plugin.
+RUN /usr/sbin/td-agent-gem install fluent-plugin-record-reformer
+
 # Copy the Fluentd configuration file.
 COPY td-agent.conf /etc/td-agent/td-agent.conf
 
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index e607e69cb7..8f15b26ac3 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -1,7 +1,7 @@
 .PHONY:	build push
 
 IMAGE = fluentd-elasticsearch
-TAG = 1.4
+TAG = 1.5
 
 build:	
 	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
index 58257988a6..b46d9b52ad 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
@@ -40,10 +40,16 @@
   path /varlog/containers/*.log
   pos_file /varlog/es-containers.log.pos
   time_format %Y-%m-%dT%H:%M:%S
-  tag kubernetes.*
+  tag reform.*
   read_from_head true
 </source>
 
+<match reform.**>
+  type record_reformer
+  enable_ruby true
+  tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
+</match>
+
 <match kubernetes.**>
    type elasticsearch
    log_level info
diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.json b/cluster/saltbase/salt/fluentd-es/fluentd-es.json
index a7a765267d..1d6fa4ac43 100644
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.json
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.json
@@ -5,7 +5,7 @@
  "spec": {
    "containers": [
      { "name": "fluentd-elasticsearch",
-       "image": "gcr.io/google_containers/fluentd-elasticsearch:1.4",
+       "image": "gcr.io/google_containers/fluentd-elasticsearch:1.5",
        "env": [
          { "name": "FLUENTD_ARGS",
            "value": "-qq"}