From f9d46cf23c4afa7f64479d48b739f4155cf655f0 Mon Sep 17 00:00:00 2001
From: Stanislaw Szydlo <stanislaw.szydlo@intel.com>
Date: Mon, 29 May 2017 16:12:52 +0200
Subject: [PATCH 1/2] Update 'fluentd-elasticsearch' image.

Plugins updated:
 - fluent-plugin-elasticsearch 1.5.0 -> 1.9.5
 - fluent-plugin-kubernetes_metadata 0.24.0 -> 0.27.0
---
 .../addons/fluentd-elasticsearch/fluentd-es-image/Makefile    | 2 +-
 .../addons/fluentd-elasticsearch/fluentd-es-image/build.sh    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index cc09d2bcc39..9747b5c504d 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -16,7 +16,7 @@
 
 PREFIX = gcr.io/google_containers
 IMAGE = fluentd-elasticsearch
-TAG = 1.22
+TAG = 1.23
 
 build:
 	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/build.sh b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/build.sh
index 004618e86c5..d0d9bbe6517 100755
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/build.sh
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/build.sh
@@ -30,8 +30,8 @@ sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /etc/in
 
 # Install the Elasticsearch Fluentd plug-in.
 # http://docs.fluentd.org/articles/plugin-management
-td-agent-gem install --no-document fluent-plugin-kubernetes_metadata_filter -v 0.24.0
-td-agent-gem install --no-document fluent-plugin-elasticsearch -v 1.5.0
+td-agent-gem install --no-document fluent-plugin-kubernetes_metadata_filter -v 0.27.0
+td-agent-gem install --no-document fluent-plugin-elasticsearch -v 1.9.5
 
 # Remove docs and postgres references
 rm -rf /opt/td-agent/embedded/share/doc \

From 9a02da7754a60a54226de796bfd10dab444a68d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Szyd=C5=82o?= <stanislaw.szydlo@intel.com>
Date: Mon, 29 May 2017 19:09:57 +0200
Subject: [PATCH 2/2] Update fluentd-es-ds.yaml

'fluentd-es-ds' container image ver. bump.
---
 cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
index 211291e38ad..769d384286a 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
       - name: fluentd-es
-        image: gcr.io/google_containers/fluentd-elasticsearch:1.22
+        image: gcr.io/google_containers/fluentd-elasticsearch:1.23
         command:
           - '/bin/sh'
           - '-c'