home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-24 04:06:34 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1651 from nstopkimsk/master

Browse Source 
modified configurations for docker to show realtime active thread chart correctly
This commit is contained in:
koo-taejin
2016-03-23 18:30:05 +09:00
parent 4297476b32 2040322f3e
commit e4d71a7d68
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
collector/start-collector.sh
+2
View File
@@ -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
docker-compose.yml
+4 -2
View File
@@ -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:
quickstart/bin/start-hbase.sh
+1 -1
View File
@@ -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
web/start-web.sh
+2 -1
View File
@@ -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