From c30377745776641a7b64188488f3762a1593a70d Mon Sep 17 00:00:00 2001 From: Marcos Alexandre de Melo Medeiros Date: Tue, 11 Jul 2017 12:16:38 -0300 Subject: [PATCH 1/5] 1.6.2 --- docker-compose-example-app.yml | 4 +- docker-compose.yml | 165 ++++++++++++++++++++------------- pinpoint-agent/Dockerfile | 2 +- pinpoint-collector/Dockerfile | 4 +- pinpoint-hbase/Dockerfile | 4 +- pinpoint-mysql/Dockerfile | 6 ++ pinpoint-web/Dockerfile | 5 +- 7 files changed, 114 insertions(+), 76 deletions(-) create mode 100644 pinpoint-mysql/Dockerfile diff --git a/docker-compose-example-app.yml b/docker-compose-example-app.yml index 6a0b12f..c2a753b 100644 --- a/docker-compose-example-app.yml +++ b/docker-compose-example-app.yml @@ -6,10 +6,10 @@ rancher-server: ports: - 8080:8080 environment: - JAVA_OPTS: "-javaagent:/assets/pinpoint-agent/pinpoint-bootstrap-1.6.1.jar -Dpinpoint.agentId=app-in-docker -Dpinpoint.applicationName=app" + JAVA_OPTS: "-javaagent:/assets/pinpoint-agent/pinpoint-bootstrap-1.6.2.jar -Dpinpoint.agentId=app-in-docker -Dpinpoint.applicationName=app" pinpoint-agent: - image: wahyd4/pinpoint-agent:1.6.1 + image: wahyd4/pinpoint-agent:1.6.2 net: "none" restart: unless-stopped # volumes: diff --git a/docker-compose.yml b/docker-compose.yml index ae7d429..0a463a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,69 +1,102 @@ -pinpoint-hbase: - container_name: pinpoint-hbase - hostname: hbase - image: wahyd4/pinpoint-hbase:1.6.1 - restart: always - expose: - - "2181" - - "16010" - ports: - - "2181:2181" - - "16010:16010" +version: '2' +services: + pinpoint-hbase: + container_name: pinpoint-hbase + image: marcosamm/pinpoint-hbase:1.6.2 + restart: always + expose: + - "2181" + - "16010" + ports: + - "2181:2181" + - "16010:16010" + environment: + TZ: "America/Recife" + volumes: + - hbase_data:/home/pinpoint/hbase + - hbase_zookeeper_data:/home/pinpoint/zookeeper -pinpoint-collector: - container_name: pinpoint-collector - hostname: collector - image: wahyd4/pinpoint-collector:1.6.1 - restart: always - expose: - - "9994" - - "9995" - - "9996" - ports: - - "9994:9994" - - "9995:9995/tcp" - - "9996:9996/tcp" - - "9995:9995/udp" - - "9996:9996/udp" - environment: - HBASE_HOST: hbase - HBASE_PORT: 2181 - COLLECTOR_TCP_PORT: 9994 - COLLECTOR_UDP_STAT_LISTEN_PORT: 9995 - COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996 - CLUSTER_ENABLE: 'false' - DISABLE_DEBUG: 'true' - links: - - pinpoint-hbase:hbase + pinpoint-mysql: + container_name: pinpoint-mysql + restart: always + image: pinpointmysql:latest + ports: + - "13306:3306" + environment: + MYSQL_ROOT_PASSWORD: root123 + MYSQL_USER: admin + MYSQL_PASSWORD: admin + MYSQL_DATABASE: pinpoint + TZ: "America/Recife" + volumes: + - mysql_data:/var/lib/mysql + + pinpoint-collector: + depends_on: + - pinpoint-hbase + container_name: pinpoint-collector + image: marcosamm/pinpoint-collector:1.6.2 + restart: always + expose: + - "9994" + - "9995" + - "9996" + ports: + - "9994:9994" + - "9995:9995/tcp" + - "9996:9996/tcp" + - "9995:9995/udp" + - "9996:9996/udp" + environment: + HBASE_HOST: pinpoint-hbase + HBASE_PORT: 2181 + COLLECTOR_TCP_PORT: 9994 + COLLECTOR_UDP_STAT_LISTEN_PORT: 9995 + COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996 + CLUSTER_ENABLE: 'false' + CLUSTER_ZOOKEEPER_ADDRESS: pinpoint-hbase + DISABLE_DEBUG: 'true' + TZ: "America/Recife" + + pinpoint-web: + depends_on: + - pinpoint-hbase + - pinpoint-mysql + container_name: pinpoint-web + image: marcosamm/pinpoint-web:1.6.2 + restart: always + expose: + - "8080" + ports: + - "28080:8080" + environment: + HBASE_HOST: pinpoint-hbase + HBASE_PORT: 2181 + CLUSTER_ENABLE: 'false' + CLUSTER_ZOOKEEPER_ADDRESS: pinpoint-hbase + ADMIN_PASSWORD: admin123 + DISABLE_DEBUG: 'true' + JDBC_DRIVER: com.mysql.jdbc.Driver + JDBC_URL: jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8 + JDBC_USERNAME: admin + JDBC_PASSWORD: admin + TZ: "America/Recife" -pinpoint-web: - container_name: pinpoint-web - hostname: web - image: wahyd4/pinpoint-web:1.6.1 - restart: always - expose: - - "8080" - ports: - - "28080:8080" - environment: - HBASE_HOST: hbase - HBASE_PORT: 2181 - CLUSTER_ENABLE: 'false' - ADMIN_PASSWORD: admin123 - DISABLE_DEBUG: 'true' - links: - - pinpoint-hbase:hbase +volumes: + mysql_data: + hbase_data: + hbase_zookeeper_data: -# only example -#pinpoint-agent: -# image: wahyd4/pinpoint-agent:1.6.1 -# net: "none" -# restart: unless-stopped -# volumes: -# - /var/container_data/pinpoint-agent/log:/opt/app/pinpoint-agent/log:rw -# environment: -# COLLECTOR_IP: 192.168.99.100 -# COLLECTOR_TCP_PORT: 9994 -# COLLECTOR_UDP_STAT_LISTEN_PORT: 9995 -# COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996 -# DISABLE_DEBUG: 'true' +# only example +# pinpoint-agent: +# image: marcosamm/pinpoint-agent:1.6.2 +# net: "none" +# restart: unless-stopped +# volumes: +# - /var/container_data/pinpoint-agent/log:/opt/app/pinpoint-agent/log:rw +# environment: +# COLLECTOR_IP: 192.168.99.100 +# COLLECTOR_TCP_PORT: 9994 +# COLLECTOR_UDP_STAT_LISTEN_PORT: 9995 +# COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996 +# DISABLE_DEBUG: 'true' diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile index 631b766..a033182 100644 --- a/pinpoint-agent/Dockerfile +++ b/pinpoint-agent/Dockerfile @@ -4,7 +4,7 @@ FROM alpine:3.5 -ENV PINPOINT_VERSION=1.6.1 +ENV PINPOINT_VERSION=1.6.2 ADD configure-agent.sh /usr/local/bin/ diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index bb43e15..af34629 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -4,7 +4,7 @@ FROM tomcat:8-jre8 -ENV PINPOINT_VERSION=1.6.1 +ENV PINPOINT_VERSION=1.6.2 ADD start-collector.sh /usr/local/bin/ @@ -24,4 +24,4 @@ RUN chmod a+x /usr/local/bin/start-collector.sh \ EXPOSE 9994 9995 9996 -ENTRYPOINT ["/usr/local/bin/start-collector.sh"] +ENTRYPOINT ["/usr/local/bin/start-collector.sh"] \ No newline at end of file diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile index 92ae5fa..51cdb58 100644 --- a/pinpoint-hbase/Dockerfile +++ b/pinpoint-hbase/Dockerfile @@ -7,7 +7,7 @@ FROM java:8-jdk ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ENV HBASE_VERSION=1.2.3 ENV HBASE_HOME=/opt/hbase/hbase-$HBASE_VERSION -ENV PINPOINT_VERSION=1.6.1 +ENV PINPOINT_VERSION=1.6.2 ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase @@ -38,4 +38,4 @@ EXPOSE 60020 # HBase Regionserver web UI EXPOSE 16030 -ENTRYPOINT /opt/hbase/hbase-$HBASE_VERSION/bin/hbase master start +ENTRYPOINT /opt/hbase/hbase-$HBASE_VERSION/bin/hbase master start \ No newline at end of file diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile new file mode 100644 index 0000000..ca0e36f --- /dev/null +++ b/pinpoint-mysql/Dockerfile @@ -0,0 +1,6 @@ +FROM mysql:5.7 + +ENV PINPOINT_VERSION=1.6.2 + +ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql /docker-entrypoint-initdb.d +ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobReositorySchema-mysql.sql /docker-entrypoint-initdb.d \ No newline at end of file diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index e93f103..7a7e8e8 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -4,7 +4,7 @@ FROM tomcat:8-jre8 -ENV PINPOINT_VERSION=1.6.1 +ENV PINPOINT_VERSION=1.6.2 ADD start-web.sh /usr/local/bin/ @@ -20,5 +20,4 @@ RUN chmod a+x /usr/local/bin/start-web.sh \ EXPOSE 8080 -ENTRYPOINT ["/usr/local/bin/start-web.sh"] - +ENTRYPOINT ["/usr/local/bin/start-web.sh"] \ No newline at end of file From 54f24e03eb0c9a236569ed4b26c92072c3b7bafc Mon Sep 17 00:00:00 2001 From: Marcos Alexandre de Melo Medeiros Date: Tue, 11 Jul 2017 14:35:58 -0300 Subject: [PATCH 2/5] fix pinpoint-mysql --- .gitignore | 1 + docker-compose.yml | 2 +- pinpoint-mysql/Dockerfile | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d8fe4fa --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.project diff --git a/docker-compose.yml b/docker-compose.yml index 0a463a4..d854297 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: pinpoint-mysql: container_name: pinpoint-mysql restart: always - image: pinpointmysql:latest + image: marcosamm/pinpoint-mysql:1.6.2 ports: - "13306:3306" environment: diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile index ca0e36f..d775f9a 100644 --- a/pinpoint-mysql/Dockerfile +++ b/pinpoint-mysql/Dockerfile @@ -3,4 +3,5 @@ FROM mysql:5.7 ENV PINPOINT_VERSION=1.6.2 ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql /docker-entrypoint-initdb.d -ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobReositorySchema-mysql.sql /docker-entrypoint-initdb.d \ No newline at end of file +ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobReositorySchema-mysql.sql /docker-entrypoint-initdb.d +RUN chmod 0755 /docker-entrypoint-initdb.d/* \ No newline at end of file From 482a186c3d8c5b5de01d2758f4df1c800cb12b01 Mon Sep 17 00:00:00 2001 From: Marcos Alexandre de Melo Medeiros Date: Tue, 11 Jul 2017 16:35:57 -0300 Subject: [PATCH 3/5] fix --- pinpoint-mysql/CreateTableStatement-mysql.sql | 56 +++++++++++ pinpoint-mysql/Dockerfile | 5 +- .../SpringBatchJobReositorySchema-mysql.sql | 98 +++++++++++++++++++ 3 files changed, 156 insertions(+), 3 deletions(-) create mode 100644 pinpoint-mysql/CreateTableStatement-mysql.sql create mode 100644 pinpoint-mysql/SpringBatchJobReositorySchema-mysql.sql diff --git a/pinpoint-mysql/CreateTableStatement-mysql.sql b/pinpoint-mysql/CreateTableStatement-mysql.sql new file mode 100644 index 0000000..761493e --- /dev/null +++ b/pinpoint-mysql/CreateTableStatement-mysql.sql @@ -0,0 +1,56 @@ +CREATE TABLE `user_group` ( + `number` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `id` VARCHAR(30) NOT NULL, + PRIMARY KEY (`number`) +); +ALTER TABLE user_group ADD UNIQUE KEY id_idx (id); + +CREATE TABLE `user_group_member` ( + `number` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `user_group_id` VARCHAR(30) NOT NULL, + `member_id` VARCHAR(30) NOT NULL, + PRIMARY KEY (`number`) +); +ALTER TABLE user_group_member ADD UNIQUE KEY user_group_id_member_id_idx (`user_group_id`,`member_id`); + +CREATE TABLE `puser` ( + `number` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `user_id` VARCHAR(30) NOT NULL, + `name` VARCHAR(150) NOT NULL, + `department` VARCHAR(150) NOT NULL, + `phonenumber` VARCHAR(100), + `email` VARCHAR(100), + PRIMARY KEY (`number`) +); +ALTER TABLE puser ADD UNIQUE KEY user_id_idx (`user_id`); + +CREATE TABLE `alarm_rule` ( + `rule_id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `application_id` VARCHAR(30) NOT NULL, + `service_type` VARCHAR(30) NOT NULL, + `checker_name` VARCHAR(50) NOT NULL, + `threshold` INT(10) DEFAULT NULL, + `user_group_id` VARCHAR(30) NOT NULL, + `sms_send` CHAR(1) DEFAULT NULL, + `email_send` CHAR(1) DEFAULT NULL, + `notes` VARCHAR(100) DEFAULT NULL, + PRIMARY KEY (`rule_id`) +); +ALTER TABLE alarm_rule ADD UNIQUE KEY application_id_checker_name_user_group_id_idx (application_id, user_group_id, checker_name); + +CREATE TABLE `alarm_history` ( + `history_id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `application_id` VARCHAR(30) NOT NULL, + `checker_name` VARCHAR(50) NOT NULL, + `detected` CHAR(1) DEFAULT NULL, + `sequence_count` INT(10), + `timing_count` INT(10), + PRIMARY KEY (`history_id`) +); +ALTER TABLE alarm_history ADD UNIQUE KEY application_id_checker_name_idx (application_id, checker_name); + +CREATE TABLE `agent_statistics` ( + `agent_count` INT(10) UNSIGNED NOT NULL, + `date_val`DATETIME NOT NULL, + PRIMARY KEY (`date_val`) +); diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile index d775f9a..605a80c 100644 --- a/pinpoint-mysql/Dockerfile +++ b/pinpoint-mysql/Dockerfile @@ -2,6 +2,5 @@ FROM mysql:5.7 ENV PINPOINT_VERSION=1.6.2 -ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql /docker-entrypoint-initdb.d -ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobReositorySchema-mysql.sql /docker-entrypoint-initdb.d -RUN chmod 0755 /docker-entrypoint-initdb.d/* \ No newline at end of file +ADD CreateTableStatement-mysql.sql /docker-entrypoint-initdb.d +ADD SpringBatchJobReositorySchema-mysql.sql /docker-entrypoint-initdb.d \ No newline at end of file diff --git a/pinpoint-mysql/SpringBatchJobReositorySchema-mysql.sql b/pinpoint-mysql/SpringBatchJobReositorySchema-mysql.sql new file mode 100644 index 0000000..d6e61ba --- /dev/null +++ b/pinpoint-mysql/SpringBatchJobReositorySchema-mysql.sql @@ -0,0 +1,98 @@ +CREATE TABLE BATCH_JOB_INSTANCE ( + JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY , + VERSION BIGINT , + JOB_NAME VARCHAR(100) NOT NULL, + JOB_KEY VARCHAR(32) NOT NULL, + constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) +) ENGINE=InnoDB; + +CREATE TABLE BATCH_JOB_EXECUTION ( + JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY , + VERSION BIGINT , + JOB_INSTANCE_ID BIGINT NOT NULL, + CREATE_TIME DATETIME NOT NULL, + START_TIME DATETIME DEFAULT NULL , + END_TIME DATETIME DEFAULT NULL , + STATUS VARCHAR(10) , + EXIT_CODE VARCHAR(100) , + EXIT_MESSAGE VARCHAR(2500) , + LAST_UPDATED DATETIME, + constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) + references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) +) ENGINE=InnoDB; + +CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( + JOB_EXECUTION_ID BIGINT NOT NULL , + TYPE_CD VARCHAR(6) NOT NULL , + KEY_NAME VARCHAR(100) NOT NULL , + STRING_VAL VARCHAR(250) , + DATE_VAL DATETIME DEFAULT NULL , + LONG_VAL BIGINT , + DOUBLE_VAL DOUBLE PRECISION , + IDENTIFYING CHAR(1) NOT NULL , + constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) +) ENGINE=InnoDB; + +CREATE TABLE BATCH_STEP_EXECUTION ( + STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY , + VERSION BIGINT NOT NULL, + STEP_NAME VARCHAR(100) NOT NULL, + JOB_EXECUTION_ID BIGINT NOT NULL, + START_TIME DATETIME NOT NULL , + END_TIME DATETIME DEFAULT NULL , + STATUS VARCHAR(10) , + COMMIT_COUNT BIGINT , + READ_COUNT BIGINT , + FILTER_COUNT BIGINT , + WRITE_COUNT BIGINT , + READ_SKIP_COUNT BIGINT , + WRITE_SKIP_COUNT BIGINT , + PROCESS_SKIP_COUNT BIGINT , + ROLLBACK_COUNT BIGINT , + EXIT_CODE VARCHAR(100) , + EXIT_MESSAGE VARCHAR(2500) , + LAST_UPDATED DATETIME, + constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) +) ENGINE=InnoDB; + +CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( + STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, + SHORT_CONTEXT VARCHAR(2500) NOT NULL, + SERIALIZED_CONTEXT TEXT , + constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID) + references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID) +) ENGINE=InnoDB; + +CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT ( + JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, + SHORT_CONTEXT VARCHAR(2500) NOT NULL, + SERIALIZED_CONTEXT TEXT , + constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) +) ENGINE=InnoDB; + +CREATE TABLE BATCH_STEP_EXECUTION_SEQ ( + ID BIGINT NOT NULL, + UNIQUE_KEY CHAR(1) NOT NULL, + constraint UNIQUE_KEY_UN unique (UNIQUE_KEY) +) ENGINE=MYISAM; + +INSERT INTO BATCH_STEP_EXECUTION_SEQ values(0, '0'); + +CREATE TABLE BATCH_JOB_EXECUTION_SEQ ( + ID BIGINT NOT NULL, + UNIQUE_KEY CHAR(1) NOT NULL, + constraint UNIQUE_KEY_UN unique (UNIQUE_KEY) +) ENGINE=MYISAM; + +INSERT INTO BATCH_JOB_EXECUTION_SEQ values(0, '0'); + +CREATE TABLE BATCH_JOB_SEQ ( + ID BIGINT NOT NULL, + UNIQUE_KEY CHAR(1) NOT NULL, + constraint UNIQUE_KEY_UN unique (UNIQUE_KEY) +) ENGINE=MYISAM; + +INSERT INTO BATCH_JOB_SEQ values(0, '0'); From be4130b90ea4d47f433965e1a3908277aeba20a5 Mon Sep 17 00:00:00 2001 From: Marcos Alexandre de Melo Medeiros Date: Wed, 12 Jul 2017 23:53:34 -0300 Subject: [PATCH 4/5] fix users, user groups, and alarm configurations --- docker-compose.yml | 4 ++-- pinpoint-agent/configure-agent.sh | 4 +++- pinpoint-collector/start-collector.sh | 2 ++ pinpoint-mysql/Dockerfile | 5 +++-- pinpoint-web/start-web.sh | 15 ++++++++++++++- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d854297..ebebd90 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,7 +53,7 @@ services: 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: pinpoint-hbase DISABLE_DEBUG: 'true' TZ: "America/Recife" @@ -72,7 +72,7 @@ services: environment: HBASE_HOST: pinpoint-hbase HBASE_PORT: 2181 - CLUSTER_ENABLE: 'false' + CLUSTER_ENABLE: 'true' CLUSTER_ZOOKEEPER_ADDRESS: pinpoint-hbase ADMIN_PASSWORD: admin123 DISABLE_DEBUG: 'true' diff --git a/pinpoint-agent/configure-agent.sh b/pinpoint-agent/configure-agent.sh index 711f882..b9a60a0 100644 --- a/pinpoint-agent/configure-agent.sh +++ b/pinpoint-agent/configure-agent.sh @@ -18,5 +18,7 @@ sed -i "s/profiler.collector.stat.port=9995/profiler.collector.stat.port=${COLLE sed -i "s/profiler.collector.span.port=9996/profiler.collector.span.port=${COLLECTOR_UDP_SPAN_LISTEN_PORT}/g" /assets/pinpoint-agent/pinpoint.config if [ "$DISABLE_DEBUG" == "true" ]; then - sed -i 's/level value="DEBUG"/level value="INFO"/' /assets/lib/log4j.xml + sed -i 's/level value="DEBUG"/level value="INFO"/' /assets/pinpoint-agent/lib/log4j.xml fi + +exec tail -f /dev/null \ No newline at end of file diff --git a/pinpoint-collector/start-collector.sh b/pinpoint-collector/start-collector.sh index bad7ba1..05d40b2 100644 --- a/pinpoint-collector/start-collector.sh +++ b/pinpoint-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/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile index 605a80c..68f0ee9 100644 --- a/pinpoint-mysql/Dockerfile +++ b/pinpoint-mysql/Dockerfile @@ -2,5 +2,6 @@ FROM mysql:5.7 ENV PINPOINT_VERSION=1.6.2 -ADD CreateTableStatement-mysql.sql /docker-entrypoint-initdb.d -ADD SpringBatchJobReositorySchema-mysql.sql /docker-entrypoint-initdb.d \ No newline at end of file +ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql /docker-entrypoint-initdb.d +ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobReositorySchema-mysql.sql /docker-entrypoint-initdb.d +RUN chmod 0777 /docker-entrypoint-initdb.d/*.sql \ No newline at end of file diff --git a/pinpoint-web/start-web.sh b/pinpoint-web/start-web.sh index 25198b8..4aedf1f 100644 --- a/pinpoint-web/start-web.sh +++ b/pinpoint-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} @@ -11,10 +11,23 @@ HBASE_PORT=${HBASE_PORT:-2181} DISABLE_DEBUG=${DISABLE_DEBUG:-true} +JDBC_DRIVER=${JDBC_DRIVER:-com.mysql.jdbc.Driver} +JDBC_URL=${JDBC_URL:-jdbc:mysql://localhost:13306/pinpoint?characterEncoding=UTF-8} +JDBC_USERNAME=${JDBC_USERNAME:-admin} +JDBC_PASSWORD=${JDBC_PASSWORD:-admin} + +echo -e " +jdbc.driverClassName=${JDBC_DRIVER} +jdbc.url=${JDBC_URL} +jdbc.username=${JDBC_USERNAME} +jdbc.password=${JDBC_PASSWORD} +" > /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/jdbc.properties + cp /assets/pinpoint-web.properties /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties 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 From ed87a9dcfea708fdd1ded7ab91cf73601b14e63b Mon Sep 17 00:00:00 2001 From: Marcos Alexandre de Melo Medeiros Date: Thu, 13 Jul 2017 00:44:45 -0300 Subject: [PATCH 5/5] fix mysql database --- pinpoint-mysql/CreateTableStatement-mysql.sql | 2 +- pinpoint-mysql/Dockerfile | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pinpoint-mysql/CreateTableStatement-mysql.sql b/pinpoint-mysql/CreateTableStatement-mysql.sql index 761493e..a3bc6e5 100644 --- a/pinpoint-mysql/CreateTableStatement-mysql.sql +++ b/pinpoint-mysql/CreateTableStatement-mysql.sql @@ -1,5 +1,5 @@ CREATE TABLE `user_group` ( - `number` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `number` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, `id` VARCHAR(30) NOT NULL, PRIMARY KEY (`number`) ); diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile index 68f0ee9..2f3f134 100644 --- a/pinpoint-mysql/Dockerfile +++ b/pinpoint-mysql/Dockerfile @@ -1,7 +1,4 @@ FROM mysql:5.7 -ENV PINPOINT_VERSION=1.6.2 - -ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql /docker-entrypoint-initdb.d -ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobReositorySchema-mysql.sql /docker-entrypoint-initdb.d -RUN chmod 0777 /docker-entrypoint-initdb.d/*.sql \ No newline at end of file +ADD CreateTableStatement-mysql.sql /docker-entrypoint-initdb.d +ADD SpringBatchJobReositorySchema-mysql.sql /docker-entrypoint-initdb.d \ No newline at end of file