diff --git a/.env b/.env index a32cc7e..4474e1b 100644 --- a/.env +++ b/.env @@ -28,6 +28,7 @@ ANALYTICS=true HBASE_HOST=pinpoint-hbase HBASE_PORT=2181 +HBASE_ZNODE_PARENT=/hbase WEB_DEBUG_LEVEL=INFO diff --git a/docker-compose.yml b/docker-compose.yml index 6375a12..c17a071 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -86,6 +86,7 @@ services: - ANALYTICS=${ANALYTICS} - HBASE_HOST=${HBASE_HOST} - HBASE_PORT=${HBASE_PORT} + - HBASE_ZNODE_PARENT=${HBASE_ZNODE_PARENT} - DEBUG_LEVEL=${WEB_DEBUG_LEVEL} - CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT} - BATCH_ENABLE=${BATCH_ENABLE} @@ -141,6 +142,7 @@ services: - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS} - HBASE_HOST=${HBASE_HOST} - HBASE_PORT=${HBASE_PORT} + - HBASE_ZNODE_PARENT=${HBASE_ZNODE_PARENT} - FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE} - FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS} - DEBUG_LEVEL=${COLLECTOR_DEBUG_LEVEL} diff --git a/pinpoint-collector/.env b/pinpoint-collector/.env index 09ebd55..510f634 100644 --- a/pinpoint-collector/.env +++ b/pinpoint-collector/.env @@ -9,6 +9,7 @@ CLUSTER_ZOOKEEPER_ADDRESS= #hbase information required HBASE_HOST= HBASE_PORT= +HBASE_ZNODE_PARENT=/hbase PINPOINT_COLLECTOR_NAME=pinpoint-collector diff --git a/pinpoint-collector/build/scripts/start-collector.sh b/pinpoint-collector/build/scripts/start-collector.sh index 99c7d54..09563f2 100644 --- a/pinpoint-collector/build/scripts/start-collector.sh +++ b/pinpoint-collector/build/scripts/start-collector.sh @@ -9,6 +9,7 @@ sed -i "/flink.cluster.zookeeper.address=/ s/=.*/=${FLINK_CLUSTER_ZOOKEEPER_ADDR sed -i "/hbase.client.host=/ s/=.*/=${HBASE_HOST}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/hbase.properties sed -i "/hbase.client.port=/ s/=.*/=${HBASE_PORT}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/hbase.properties +sed -i "/hbase.zookeeper.znode.parent=/ s/=.*/=\\${HBASE_ZNODE_PARENT}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/hbase.properties sed -i "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/log4j.xml diff --git a/pinpoint-collector/docker-compose.yml b/pinpoint-collector/docker-compose.yml index 38dc749..f5502ac 100644 --- a/pinpoint-collector/docker-compose.yml +++ b/pinpoint-collector/docker-compose.yml @@ -28,6 +28,7 @@ services: - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS} - HBASE_HOST=${HBASE_HOST} - HBASE_PORT=${HBASE_PORT} + - HBASE_ZNODE_PARENT=${HBASE_ZNODE_PARENT} - FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE} - FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS} - DEBUG_LEVEL=${COLLECTOR_DEBUG_LEVEL} diff --git a/pinpoint-web/.env b/pinpoint-web/.env index 52c3b3c..2e341b3 100644 --- a/pinpoint-web/.env +++ b/pinpoint-web/.env @@ -17,6 +17,7 @@ ANALYTICS=true #hbase information required HBASE_HOST= HBASE_PORT= +HBASE_ZNODE_PARENT=/hbase WEB_DEBUG_LEVEL=INFO diff --git a/pinpoint-web/build/scripts/start-web.sh b/pinpoint-web/build/scripts/start-web.sh index 39f9a15..5be11c8 100644 --- a/pinpoint-web/build/scripts/start-web.sh +++ b/pinpoint-web/build/scripts/start-web.sh @@ -11,6 +11,7 @@ sed -i "/config.show.applicationStat=/ s/=.*/=${CONFIG_SHOW_APPLICATIONSTAT}/" / sed -i "/hbase.client.host=/ s/=.*/=${HBASE_HOST}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/hbase.properties sed -i "/hbase.client.port=/ s/=.*/=${HBASE_PORT}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/hbase.properties +sed -i "/hbase.zookeeper.znode.parent=/ s/=.*/=\\${HBASE_ZNODE_PARENT}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/hbase.properties sed -i "/batch.enable=/ s/=.*/=${BATCH_ENABLE}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/batch.properties sed -i "/batch.server.ip=/ s/=.*/=${BATCH_SERVER_IP}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/batch.properties diff --git a/pinpoint-web/docker-compose.yml b/pinpoint-web/docker-compose.yml index d23b185..5b5438f 100644 --- a/pinpoint-web/docker-compose.yml +++ b/pinpoint-web/docker-compose.yml @@ -25,6 +25,7 @@ services: - ANALYTICS=${ANALYTICS} - HBASE_HOST=${HBASE_HOST} - HBASE_PORT=${HBASE_PORT} + - HBASE_ZNODE_PARENT=${HBASE_ZNODE_PARENT} - DEBUG_LEVEL=${WEB_DEBUG_LEVEL} - CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT} - BATCH_ENABLE=${BATCH_ENABLE}