From 2040322f3ef38c11809356108a1538aaf0a7a681 Mon Sep 17 00:00:00 2001
From: sungkwan kim <sungkwan.kim@navercorp.com>
Date: Wed, 23 Mar 2016 17:54:52 +0900
Subject: [PATCH] 1. modified configurations relating docker to show realtime
 active thread chart correctly. 2. modified hbase version of quickstart app.

---
 collector/start-collector.sh  | 2 ++
 docker-compose.yml            | 6 ++++--
 quickstart/bin/start-hbase.sh | 2 +-
 web/start-web.sh              | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/collector/start-collector.sh b/collector/start-collector.sh
index bad7ba140..05d40b2f2 100644
--- a/collector/start-collector.sh
+++ b/collector/start-collector.sh
@@ -3,6 +3,7 @@ set -e
 set -x
 
 CLUSTER_ENABLE=${CLUSTER_ENABLE:-false}
+CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS:-localhost}
 
 COLLECTOR_TCP_PORT=${COLLECTOR_TCP_PORT:-9994}
 COLLECTOR_UDP_STAT_LISTEN_PORT=${COLLECTOR_UDP_STAT_LISTEN_PORT:-9995}
@@ -17,6 +18,7 @@ cp /assets/pinpoint-collector.properties /usr/local/tomcat/webapps/ROOT/WEB-INF/
 cp /assets/hbase.properties /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/hbase.properties
 
 sed -i "s/cluster.enable=true/cluster.enable=${CLUSTER_ENABLE}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
+sed -i "s/cluster.zookeeper.address=localhost/cluster.zookeeper.address=${CLUSTER_ZOOKEEPER_ADDRESS}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
 
 sed -i "s/collector.tcpListenPort=9994/collector.tcpListenPort=${COLLECTOR_TCP_PORT}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
 sed -i "s/collector.udpStatListenPort=9995/collector.udpStatListenPort=${COLLECTOR_UDP_STAT_LISTEN_PORT}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
diff --git a/docker-compose.yml b/docker-compose.yml
index 192e1f0ed..2083ae812 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,8 @@ pinpoint-collector:
     COLLECTOR_TCP_PORT: 9994
     COLLECTOR_UDP_STAT_LISTEN_PORT: 9995
     COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996
-    CLUSTER_ENABLE: 'false'
+    CLUSTER_ENABLE: 'true'
+    CLUSTER_ZOOKEEPER_ADDRESS: hbase
     DISABLE_DEBUG: 'true'
   links:
     - pinpoint-hbase:hbase
@@ -46,7 +47,8 @@ pinpoint-web:
   environment:
     HBASE_HOST: hbase
     HBASE_PORT: 2181
-    CLUSTER_ENABLE: 'false'
+    CLUSTER_ENABLE: 'true'
+    CLUSTER_ZOOKEEPER_ADDRESS: hbase
     ADMIN_PASSWORD: admin123
     DISABLE_DEBUG: 'true'
   links:
diff --git a/quickstart/bin/start-hbase.sh b/quickstart/bin/start-hbase.sh
index c5d33b2f1..aa66938a8 100755
--- a/quickstart/bin/start-hbase.sh
+++ b/quickstart/bin/start-hbase.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-HBASE_VERSION=hbase-1.0.1
+HBASE_VERSION=hbase-1.0.3
 HBASE_FILE=$HBASE_VERSION-bin.tar.gz
 HBASE_DL_URL=http://apache.mirror.cdnetworks.com/hbase/$HBASE_VERSION/$HBASE_FILE
 HBASE_ARCHIVE_DL_URL=http://archive.apache.org/dist/hbase/$HBASE_VERSION/$HBASE_FILE
diff --git a/web/start-web.sh b/web/start-web.sh
index 597c33b34..d8e80c90a 100644
--- a/web/start-web.sh
+++ b/web/start-web.sh
@@ -3,7 +3,7 @@ set -e
 set -x
 
 CLUSTER_ENABLE=${CLUSTER_ENABLE:-false}
-
+CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS:-localhost}
 ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin}
 
 HBASE_HOST=${HBASE_HOST:-localhost}
@@ -15,6 +15,7 @@ cp /assets/pinpoint-web.properties /usr/local/tomcat/webapps/ROOT/WEB-INF/classe
 cp /assets/hbase.properties /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/hbase.properties
 
 sed -i "s/cluster.enable=true/cluster.enable=${CLUSTER_ENABLE}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
+sed -i "s/cluster.zookeeper.address=localhost/cluster.zookeeper.address=${CLUSTER_ZOOKEEPER_ADDRESS}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
 
 sed -i "s/admin.password=admin/admin.password=${ADMIN_PASSWORD}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties