From cfb8577324c2c5450599fec93be3258f56211bf9 Mon Sep 17 00:00:00 2001
From: Satnam Singh <satnam@google.com>
Date: Fri, 3 Apr 2015 14:55:00 -0700
Subject: [PATCH] Update Kibana to v1.2 which paramaterizes location of
 Elasticsearch

---
 cluster/addons/fluentd-elasticsearch/kibana-controller.yaml | 2 +-
 cluster/addons/fluentd-elasticsearch/kibana-image/Makefile  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
index 4ac54c643c6..d41fdf0b610 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
@@ -12,7 +12,7 @@ desiredState:
         id: kibana-viewer
         containers:
           - name: kibana-logging
-            image: gcr.io/google_containers/kibana:1.1
+            image: gcr.io/google_containers/kibana:1.2
             env: 
               - name: "ES_SCHEME"
                 value: "https"
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile b/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
index c658c7179ea..1721ddfc02e 100755
--- a/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
@@ -1,6 +1,6 @@
 .PHONY:	build push
 
-TAG = 1.1
+TAG = 1.2
 
 build:
 	docker build -t gcr.io/google_containers/kibana:$(TAG) .