[naver/pinpoint#7444] release v2.1.2

Line number 49 and 50 order changes.

.env

@@ -1,11 +1,12 @@
-PINPOINT_VERSION=2.0.3
+PINPOINT_VERSION=2.1.2
 SPRING_PROFILES=release
+#zookeeper information required
+PINPOINT_ZOOKEEPER_ADDRESS=zoo1
 
 ### Pinpoint-Hbase
 
 PINPOINT_HBASE_NAME=pinpoint-hbase
 #config for hbase in external docker
-EXTERNAL_HBASE_PORT=2180
 
 ### Pinpoint-mysql
 MYSQL_ROOT_PASSWORD=root123
@@ -17,55 +18,58 @@ MYSQL_DATABASE=pinpoint
 
 PINPOINT_WEB_NAME=pinpoint-web
 
-WEB_PAGE_PORT=8079
+SERVER_PORT=8079
+
+WEB_LOGGING_LEVEL_ROOT=INFO
 
 CLUSTER_ENABLE=true
-#CLUSTER_WEB_TCP_PORT=9997
-CLUSTER_ZOOKEEPER_ADDRESS=zoo1
 
 ADMIN_PASSWORD=admin
 
-ANALYTICS=true
+#analytics
-
+CONFIG_SENDUSAGE=true
-HBASE_HOST=pinpoint-hbase
-HBASE_PORT=2181
-
-WEB_DEBUG_LEVEL=INFO
 
+#flink server information required if used
 BATCH_ENABLE=false
 BATCH_SERVER_IP=127.0.0.1
 BATCH_FLINK_SERVER=pinpoint-flink-jobmanager
 
 CONFIG_SHOW_APPLICATIONSTAT=true
 
-#mysql information required
+#mysql information required if used
-JDBC_DRIVER=com.mysql.jdbc.Driver
+JDBC_DRIVERCLASSNAME=com.mysql.jdbc.Driver
 JDBC_URL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
 JDBC_USERNAME=admin
 JDBC_PASSWORD=admin
 
-#mail server information required
+#mail server information required if used
-MAIL_SERVER_URL=smtp.gmail.com
+ALARM_MAIL_SERVER_URL=smtp.gmail.com
-MAIL_SERVER_PORT=587
+ALARM_MAIL_SERVER_PORT=587
-MAIL_SERVER_USERNAME=username
+ALARM_MAIL_SERVER_USERNAME=username
-MAIL_SERVER_PASSWORD=password
+ALARM_MAIL_SERVER_PASSWORD=password
-MAIL_SENDER_ADDRESS=pinpoint_operator@pinpoint.com
+ALARM_MAIL_SENDER_ADDRESS=pinpoint_operator@pinpoint.com
-MAIL_TRANSPORT_PROTOCOL=smtp
+ALARM_MAIL_TRANSPORT_PROTOCOL=smtp
-MAIL_SMTP_PORT=25
+ALARM_MAIL_SMTP_PORT=25
-MAIL_SMTP_AUTH=false
+ALARM_MAIL_SMTP_AUTH=false
-MAIL_SMTP_STARTTLS_ENABLE=false
+ALARM_MAIL_SMTP_STARTTLS_ENABLE=false
-MAIL_SMTP_STARTTLS_REQUIRED=false
+ALARM_MAIL_SMTP_STARTTLS_REQUIRED=false
-MAIL_DEBUG=false
+ALARM_MAIL_DEBUG=false
 
 
 ### Pinpoint-Collector
 
 PINPOINT_COLLECTOR_NAME=pinpoint-collector
 
-COLLECTOR_RECEIVER_AGENT_PORT=9991
+CLUSTER_ENABLE=true
-COLLECTOR_RECEIVER_METADATA_PORT=9991
+
-COLLECTOR_RECEIVER_STAT_PORT=9992
+COLLECTOR_LOGGING_LEVEL_ROOT=INFO
-COLLECTOR_RECEIVER_SPAN_PORT=9993
+
+#grpc
+COLLECTOR_RECEIVER_GRPC_AGENT_PORT=9991
+COLLECTOR_RECEIVER_GRPC_STAT_PORT=9992
+COLLECTOR_RECEIVER_GRPC_SPAN_PORT=9993
+
+#thrift
 COLLECTOR_RECEIVER_BASE_PORT=9994
 COLLECTOR_RECEIVER_STAT_UDP_PORT=9995
 COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996
@@ -73,8 +77,6 @@ COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996
 FLINK_CLUSTER_ENABLE=true
 FLINK_CLUSTER_ZOOKEEPER_ADDRESS=zoo1
 
-COLLECTOR_DEBUG_LEVEL=INFO
-
 
 ### Pinpoint-Agent
 

Readme.md

@@ -13,6 +13,9 @@ It supports and helps you understand your application in a glance and allow you
 
 ## Supported Tags
 
+ - 2.1.2
+ - 2.1.0
+ - 2.0.4
  - 2.0.3
  - 2.0.2
  - 2.0.1
@@ -46,8 +49,8 @@ If you'd like to bring up a previous release. Try with docker-compose file from
 
 ```
 git clone https://github.com/naver/pinpoint-docker.git
-git checkout {tag}
 cd pinpoint-docker
+git checkout {tag}
 docker-compose pull && docker-compose up -d
 ```
 

docker-compose.yml

@@ -17,8 +17,6 @@ services:
       - /home/pinpoint/hbase
       - /home/pinpoint/zookeeper
     expose:
-      # zookeeper
-      - "2181"
       # HBase Master API port
       - "60000"
       # HBase Master Web UI
@@ -28,12 +26,13 @@ services:
       # HBase Regionserver web UI
       - "16030"
     ports:
-      - "${EXTERNAL_HBASE_PORT:-2181}:2181"
       - "60000:60000"
       - "16010:16010"
       - "60020:60020"
       - "16030:16030"
     restart: always
+    depends_on:
+      - zoo1
 
   pinpoint-mysql:
     build:
@@ -72,42 +71,40 @@ services:
     depends_on:
       - pinpoint-hbase
       - pinpoint-mysql
+      - zoo1
     restart: always
     expose:
-      - "8080"
       - "9997"
     ports:
       - "9997:9997"
-      - "${WEB_PAGE_PORT:-8080}:8080"
+      - "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}"
     environment:
-      - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES},batch"
+      - SERVER_PORT=${SERVER_PORT}
-      - SPRING_PROFILES=${SPRING_PROFILES}
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
+      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
-      - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}
-      - ANALYTICS=${ANALYTICS}
+      - CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
-      - HBASE_HOST=${HBASE_HOST}
+      - LOGGING_LEVEL_ROOT=${WEB_LOGGING_LEVEL_ROOT}
-      - HBASE_PORT=${HBASE_PORT}
-      - DEBUG_LEVEL=${WEB_DEBUG_LEVEL}
       - CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT}
       - BATCH_ENABLE=${BATCH_ENABLE}
       - BATCH_SERVER_IP=${BATCH_SERVER_IP}
       - BATCH_FLINK_SERVER=${BATCH_FLINK_SERVER}
-      - JDBC_DRIVER=${JDBC_DRIVER}
+      - JDBC_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
       - JDBC_URL=${JDBC_URL}
       - JDBC_USERNAME=${JDBC_USERNAME}
       - JDBC_PASSWORD=${JDBC_PASSWORD}
-      - MAIL_SERVER_URL=${MAIL_SERVER_URL}
+      - ALARM_MAIL_SERVER_URL=${ALARM_MAIL_SERVER_URL}
-      - MAIL_SERVER_PORT=${MAIL_SERVER_PORT}
+      - ALARM_MAIL_SERVER_PORT=${ALARM_MAIL_SERVER_PORT}
-      - MAIL_SERVER_USERNAME=${MAIL_SERVER_USERNAME}
+      - ALARM_MAIL_SERVER_USERNAME=${ALARM_MAIL_SERVER_USERNAME}
-      - MAIL_SERVER_PASSWORD=${MAIL_SERVER_PASSWORD}
+      - ALARM_MAIL_SERVER_PASSWORD=${ALARM_MAIL_SERVER_PASSWORD}
-      - MAIL_SENDER_ADDRESS=${MAIL_SENDER_ADDRESS}
+      - ALARM_MAIL_SENDER_ADDRESS=${ALARM_MAIL_SENDER_ADDRESS}
-      - MAIL_TRANSPORT_PROTOCOL=${MAIL_TRANSPORT_PROTOCOL}
+      - ALARM_MAIL_TRANSPORT_PROTOCOL=${ALARM_MAIL_TRANSPORT_PROTOCOL}
-      - MAIL_SMTP_PORT=${MAIL_SMTP_PORT}
+      - ALARM_MAIL_SMTP_PORT=${ALARM_MAIL_SMTP_PORT}
-      - MAIL_SMTP_AUTH=${MAIL_SMTP_AUTH}
+      - ALARM_MAIL_SMTP_AUTH=${ALARM_MAIL_SMTP_AUTH}
-      - MAIL_SMTP_STARTTLS_ENABLE=${MAIL_SMTP_STARTTLS_ENABLE}
+      - ALARM_MAIL_SMTP_STARTTLS_ENABLE=${ALARM_MAIL_SMTP_STARTTLS_ENABLE}
-      - MAIL_SMTP_STARTTLS_REQUIRED=${MAIL_SMTP_STARTTLS_REQUIRED}
+      - ALARM_MAIL_SMTP_STARTTLS_REQUIRED=${ALARM_MAIL_SMTP_STARTTLS_REQUIRED}
-      - MAIL_DEBUG=${MAIL_DEBUG}
+      - ALARM_MAIL_DEBUG=${ALARM_MAIL_DEBUG}
     links:
       - "pinpoint-mysql:pinpoint-mysql"
     networks:
@@ -125,6 +122,7 @@ services:
 
     depends_on:
       - pinpoint-hbase
+      - zoo1
     restart: always
     expose:
       - "9991"
@@ -134,10 +132,9 @@ services:
       - "9995"
       - "9996"
     ports:
-      - "${COLLECTOR_RECEIVER_AGENT_PORT:-9991}:9991/udp"
+      - "${COLLECTOR_RECEIVER_GRPC_AGENT_PORT:-9991}:9991/tcp"
-      - "${COLLECTOR_RECEIVER_METADATA_PORT:-9991}:9991/tcp"
+      - "${COLLECTOR_RECEIVER_GRPC_STAT_PORT:-9992}:9992/tcp"
-      - "${COLLECTOR_RECEIVER_STAT_PORT:-9992}:9992/tcp"
+      - "${COLLECTOR_RECEIVER_GRPC_SPAN_PORT:-9993}:9993/tcp"
-      - "${COLLECTOR_RECEIVER_SPAN_PORT:-9993}:9993/tcp"
       - "${COLLECTOR_RECEIVER_BASE_PORT:-9994}:9994"
       - "${COLLECTOR_RECEIVER_STAT_UDP_PORT:-9995}:9995/tcp"
       - "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/tcp"
@@ -147,15 +144,12 @@ services:
     networks:
       - pinpoint
     environment:
-      - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}"
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
-      - SPRING_PROFILES=${SPRING_PROFILES}
+      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
-      - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
+      - LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
-      - HBASE_HOST=${HBASE_HOST}
-      - HBASE_PORT=${HBASE_PORT}
       - FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE}
       - FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}
-      - DEBUG_LEVEL=${COLLECTOR_DEBUG_LEVEL}
 
   pinpoint-quickstart:
     build:
@@ -209,6 +203,12 @@ services:
     image: zookeeper:3.4
     restart: always
     hostname: zoo1
+    expose:
+      - "2181"
+      - "2888"
+      - "3888"
+    ports:
+      - "2181"
     environment:
       ZOO_MY_ID: 1
       ZOO_SERVERS: server.1=0.0.0.0:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
@@ -219,6 +219,12 @@ services:
     image: zookeeper:3.4
     restart: always
     hostname: zoo2
+    expose:
+      - "2181"
+      - "2888"
+      - "3888"
+    ports:
+      - "2181"
     environment:
       ZOO_MY_ID: 2
       ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=0.0.0.0:2888:3888 server.3=zoo3:2888:3888
@@ -229,6 +235,12 @@ services:
     image: zookeeper:3.4
     restart: always
     hostname: zoo3
+    expose:
+      - "2181"
+      - "2888"
+      - "3888"
+    ports:
+      - "2181"
     environment:
       ZOO_MY_ID: 3
       ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=0.0.0.0:2888:3888
@@ -248,6 +260,8 @@ services:
       - JOB_MANAGER_RPC_ADDRESS=jobmanager
     networks:
       - pinpoint
+    depends_on:
+      - zoo1
 
   taskmanager:
     container_name: "${PINPOINT_FLINK_NAME}-taskmanager"
@@ -261,6 +275,7 @@ services:
       - "6122:6122"
       - "19994:19994"
     depends_on:
+      - zoo1
       - jobmanager
     command: taskmanager
     links:

pinpoint-agent-attach-example/java/.env

@@ -1,5 +1,5 @@
 ### Pinpoint with Java
-PINPOINT_VERSION=2.0.3
+PINPOINT_VERSION=2.1.2
 SPRING_PROFILES=release
 AGENT_ID=app-in-docker
 APP_NAME=quickapp

pinpoint-agent-attach-example/tomcat/.env

@@ -1,5 +1,5 @@
 ### Pinpoint with Tomcat
-PINPOINT_VERSION=2.0.3
+PINPOINT_VERSION=2.1.2
 SPRING_PROFILES=release
 APP_PORT=8000
 AGENT_ID=app-in-docker

pinpoint-agent/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.0.3
+PINPOINT_VERSION=2.1.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent

pinpoint-agent/Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.3}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.2}
 ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
 
 COPY /build/scripts/configure-agent.sh /usr/local/bin/

pinpoint-agent/Readme.md

@@ -5,6 +5,9 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.1.2
+ - 2.1.0
+ - 2.0.4
  - 2.0.3
  - 2.0.2
  - 2.0.1

pinpoint-agent/build/scripts/configure-agent.sh

@@ -2,24 +2,22 @@
 set -e
 set -x
 
-sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/pinpoint.config
+#sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint-env.config
+sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
 
-sed -i "/profiler.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
-sed -i "/profiler.collector.tcp.port=/ s/=.*/=${COLLECTOR_TCP_PORT}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.collector.tcp.port=/ s/=.*/=${COLLECTOR_TCP_PORT}/" /pinpoint-agent/pinpoint-root.config
-sed -i "/profiler.collector.stat.port=/ s/=.*/=${COLLECTOR_STAT_PORT}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.collector.stat.port=/ s/=.*/=${COLLECTOR_STAT_PORT}/" /pinpoint-agent/pinpoint-root.config
-sed -i "/profiler.collector.span.port=/ s/=.*/=${COLLECTOR_SPAN_PORT}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.collector.span.port=/ s/=.*/=${COLLECTOR_SPAN_PORT}/" /pinpoint-agent/pinpoint-root.config
 
-sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config
+#sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint-env.config
+sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
-sed -i "/profiler.transport.grpc.agent.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.transport.grpc.agent.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
-sed -i "/profiler.transport.grpc.metadata.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.transport.grpc.metadata.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
-sed -i "/profiler.transport.grpc.stat.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.transport.grpc.stat.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
-sed -i "/profiler.transport.grpc.span.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.transport.grpc.span.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
-sed -i "/profiler.sampling.rate=/ s/=.*/=${PROFILER_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint-env.config
+sed -i "/profiler.sampling.rate=/ s/=.*/=${PROFILER_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
 
-sed -i "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j.xml
+sed -i "/Root level=/ s/=.*/=\"${DEBUG_LEVEL}\">/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j2.xml
-
-#ln -s  /pinpoint-agent /pinpoint-agent
 
 exec "$@"

pinpoint-agent/docker-compose.yml

@@ -17,7 +17,6 @@ services:
     volumes:
       - pinpoint-agent
     environment:
-      - SPRING_PROFILES=${SPRING_PROFILES}
       - COLLECTOR_IP=${COLLECTOR_IP}
       - PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}
       - PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}

pinpoint-collector/.env

@@ -1,28 +1,28 @@
-PINPOINT_VERSION=2.0.3
+PINPOINT_VERSION=2.1.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Collector
 
-CLUSTER_ENABLE=true
-#zookeeper information required
-CLUSTER_ZOOKEEPER_ADDRESS=
-
-#hbase information required
-HBASE_HOST=
-HBASE_PORT=
-
 PINPOINT_COLLECTOR_NAME=pinpoint-collector
 
-COLLECTOR_RECEIVER_AGENT_PORT=9991
+#zookeeper information required
-COLLECTOR_RECEIVER_METADATA_PORT=9991
+PINPOINT_ZOOKEEPER_ADDRESS=
-COLLECTOR_RECEIVER_STAT_PORT=9992
+
-COLLECTOR_RECEIVER_SPAN_PORT=9993
+CLUSTER_ENABLE=true
+
+COLLECTOR_LOGGING_LEVEL_ROOT=INFO
+
+#grpc
+COLLECTOR_RECEIVER_GRPC_AGENT_PORT=9991
+COLLECTOR_RECEIVER_GRPC_STAT_PORT=9992
+COLLECTOR_RECEIVER_GRPC_SPAN_PORT=9993
+
+#thrift
 COLLECTOR_RECEIVER_BASE_PORT=9994
 COLLECTOR_RECEIVER_STAT_UDP_PORT=9995
 COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996
 
 FLINK_CLUSTER_ENABLE=true
-FLINK_CLUSTER_ZOOKEEPER_ADDRESS=zoo1
+FLINK_CLUSTER_ZOOKEEPER_ADDRESS=
 
-COLLECTOR_DEBUG_LEVEL=INFO
 

pinpoint-collector/Dockerfile

@@ -1,23 +1,22 @@
-FROM tomcat:8-jre8
+FROM openjdk:8-jdk-alpine
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.3}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.2}
+ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
 
-ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war
+RUN mkdir -p /pinpoint/config \
+    && mkdir -p /pinpoint/scripts
 
-COPY /build/scripts/start-collector.sh /usr/local/bin/
+COPY /build/config/pinpoint-collector.properties /pinpoint/config/
+COPY /build/scripts/start-collector.sh /pinpoint/scripts/
+#temporary line for local test
+#COPY /pinpoint-collector-boot-2.1.2-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
 
-RUN chmod a+x /usr/local/bin/start-collector.sh \
+RUN apk --no-cache add curl \
-    && curl -SL ${INSTALL_URL} -o pinpoint-collector.war \
+    && chmod a+x /pinpoint/scripts/start-collector.sh \
-    && rm -rf /usr/local/tomcat/webapps \
+    && chmod a+x /pinpoint/config/pinpoint-collector.properties \
-    && mkdir -p /usr/local/tomcat/webapps \
+    && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar
-    && unzip pinpoint-collector.war -d /usr/local/tomcat/webapps/ROOT \
-    && rm -rf pinpoint-collector.war \
-    && sed -i "s/8005/9005/g" /usr/local/tomcat/conf/server.xml \
-    && sed -i "s/8080/9080/g" /usr/local/tomcat/conf/server.xml \
-    && sed -i "s/8009/9009/g" /usr/local/tomcat/conf/server.xml \
-    && sed -i "s/8443/9443/g" /usr/local/tomcat/conf/server.xml
 
-ENTRYPOINT ["/usr/local/bin/start-collector.sh"]
+ENTRYPOINT ["sh", "/pinpoint/scripts/start-collector.sh"]
 

pinpoint-collector/Readme.md

@@ -5,6 +5,9 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl
 
 ## Supported Tags
 
+ - 2.1.2
+ - 2.1.0
+ - 2.0.4
  - 2.0.3
  - 2.0.2
  - 2.0.1

pinpoint-collector/build/config/pinpoint-collector.properties

@@ -0,0 +1,8 @@
+##########
+# another way of setting properties.
+# applied priority '.ENV' -> 'pinpoint-collector.properties'
+# property should be commented in docker-compose file to use
+# ex) PINPOINT_ZOOKEEPER_ADDRESS should be commented in docker-compose to use pinpoint.zookeeper.address below
+##########
+#
+#pinpoint.zookeeper.address=

pinpoint-collector/build/scripts/start-collector.sh

@@ -2,14 +2,4 @@
 set -e
 set -x
 
-sed -i "/cluster.enable=/ s/=.*/=${CLUSTER_ENABLE}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
+exec java -jar /pinpoint/pinpoint-collector-boot.jar --spring.config.additional-location=/pinpoint/config/pinpoint-collector.properties
-sed -i "/cluster.zookeeper.address=/ s/=.*/=${CLUSTER_ZOOKEEPER_ADDRESS}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
-sed -i "/flink.cluster.enable=/ s/=.*/=${FLINK_CLUSTER_ENABLE}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
-sed -i "/flink.cluster.zookeeper.address=/ s/=.*/=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
-
-sed -i "/hbase.client.host=/ s/=.*/=${HBASE_HOST}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/profiles/${SPRING_PROFILES}/hbase-env.properties
-sed -i "/hbase.client.port=/ s/=.*/=${HBASE_PORT}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/profiles/${SPRING_PROFILES}/hbase-env.properties
-
-sed -i "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/profiles/${SPRING_PROFILES}/log4j.xml
-
-exec /usr/local/tomcat/bin/catalina.sh run

pinpoint-collector/docker-compose.yml

@@ -20,10 +20,9 @@ services:
       - "9995"
       - "9996"
     ports:
-      - "${COLLECTOR_RECEIVER_AGENT_PORT:-9991}:9991/udp"
+      - "${COLLECTOR_RECEIVER_GRPC_AGENT_PORT:-9991}:9991/tcp"
-      - "${COLLECTOR_RECEIVER_METADATA_PORT:-9991}:9991/tcp"
+      - "${COLLECTOR_RECEIVER_GRPC_STAT_PORT:-9992}:9992/tcp"
-      - "${COLLECTOR_RECEIVER_STAT_PORT:-9992}:9992/tcp"
+      - "${COLLECTOR_RECEIVER_GRPC_SPAN_PORT:-9993}:9993/tcp"
-      - "${COLLECTOR_RECEIVER_SPAN_PORT:-9993}:9993/tcp"
       - "${COLLECTOR_RECEIVER_BASE_PORT:-9994}:9994"
       - "${COLLECTOR_RECEIVER_STAT_UDP_PORT:-9995}:9995/tcp"
       - "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/tcp"
@@ -31,15 +30,10 @@ services:
       - "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/udp"
 
     environment:
+      - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}"
       - SPRING_PROFILES=${SPRING_PROFILES}
+      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
-      - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
+      - LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
-      - HBASE_HOST=${HBASE_HOST}
-      - HBASE_PORT=${HBASE_PORT}
       - FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE}
       - FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}
-      - DEBUG_LEVEL=${COLLECTOR_DEBUG_LEVEL}
-
-networks:
-  pinpoint:
-    driver: bridge

pinpoint-flink/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.0.3
+PINPOINT_VERSION=2.1.2
 
 ### Pinpoint-flink
 

pinpoint-hbase/.env

@@ -1,8 +1,8 @@
-PINPOINT_VERSION=2.0.3
+PINPOINT_VERSION=2.1.2
 
 ### Pinpoint-Hbase
 
 PINPOINT_HBASE_NAME=pinpoint-hbase
 #config for hbase in external docker
-EXTERNAL_HBASE_PORT=2180
+EXTERNAL_HBASE_PORT=2181
 

pinpoint-hbase/Dockerfile

@@ -2,7 +2,7 @@ FROM java:8-jdk
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.3}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.2}
 
 ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
 ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase
@@ -11,22 +11,22 @@ ENV HBASE_VERSION=1.2.6
 ENV BASE_DIR=/opt/hbase
 ENV HBASE_HOME=${BASE_DIR}/hbase-${HBASE_VERSION}
 
-
 COPY hbase-site.xml hbase-site.xml
+COPY hbase-env.sh hbase-env.sh
+COPY /build/scripts/initialize-hbase.sh /usr/local/bin/
+COPY /build/scripts/check-table.sh /usr/local/bin/
 
-RUN mkdir -p ${BASE_DIR} \
+RUN chmod a+x /usr/local/bin/initialize-hbase.sh \
+    && chmod a+x /usr/local/bin/check-table.sh \
+    && mkdir -p ${BASE_DIR} \
     && cd ${BASE_DIR} \
     && curl -fSL "${HBASE_REPOSITORY}/${HBASE_VERSION}/hbase-${HBASE_VERSION}-bin.tar.gz" -o hbase.tar.gz || curl -fSL "${HBASE_SUB_REPOSITORY}/${HBASE_VERSION}/hbase-${HBASE_VERSION}-bin.tar.gz" -o hbase.tar.gz \
     && tar xfvz hbase.tar.gz \
     && mv ../../hbase-site.xml ../../${HBASE_HOME}/conf/hbase-site.xml \
-    && curl -SL "https://raw.githubusercontent.com/naver/pinpoint/v${PINPOINT_VERSION}/hbase/scripts/hbase-create.hbase" -o ${BASE_DIR}/hbase-create.hbase \
+    && mv ../../hbase-env.sh ../../${HBASE_HOME}/conf/hbase-env.sh \
-    && ${HBASE_HOME}/bin/start-hbase.sh \
+    && curl -SL "https://raw.githubusercontent.com/naver/pinpoint/v${PINPOINT_VERSION}/hbase/scripts/hbase-create.hbase" -o ${BASE_DIR}/hbase-create.hbase 
-    && sleep 10 \
-    && ${HBASE_HOME}/bin/hbase shell ${BASE_DIR}/hbase-create.hbase \
-    && ${HBASE_HOME}/bin/stop-hbase.sh \
-    && rm ${BASE_DIR}/hbase-create.hbase \
-    && rm -rf hbase.tar.gz
 
 VOLUME ["/home/pinpoint/hbase", "/home/pinpoint/zookeeper"]
 
-ENTRYPOINT ${BASE_DIR}/hbase-${HBASE_VERSION}/bin/hbase master start
+CMD /usr/local/bin/initialize-hbase.sh && tail -f /dev/null
+

pinpoint-hbase/Readme.md

@@ -5,6 +5,9 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.1.2
+ - 2.1.0
+ - 2.0.4
  - 2.0.3
  - 2.0.2
  - 2.0.1

pinpoint-hbase/build/scripts/check-table.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if echo -e "exists 'HostApplicationMap_Ver2'" | ${HBASE_HOME}/bin/hbase shell 2>&1 | grep -q "does exist" 2>/dev/null
+then 
+    echo "Tables already exist"
+else
+    sleep 15        
+    echo "create tables"
+    ${HBASE_HOME}/bin/hbase shell ${BASE_DIR}/hbase-create.hbase
+fi

pinpoint-hbase/build/scripts/initialize-hbase.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+${HBASE_HOME}/bin/start-hbase.sh
+
+/usr/local/bin/check-table.sh

pinpoint-hbase/docker-compose.yml

@@ -15,8 +15,8 @@ services:
       - /home/pinpoint/hbase
       - /home/pinpoint/zookeeper
     expose:
-      # zookeeper
+#      # zookeeper
-      - "2181"
+#      - "2181"
       # HBase Master API port
       - "60000"
       # HBase Master Web UI

pinpoint-hbase/hbase-env.sh

@@ -0,0 +1,138 @@
+
+#
+#/**
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements.  See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership.  The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License.  You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+
+# Set environment variables here.
+
+# This script sets variables multiple times over the course of starting an hbase process,
+# so try to keep things idempotent unless you want to take an even deeper look
+# into the startup scripts (bin/hbase, etc.)
+
+# The java implementation to use.  Java 1.7+ required.
+# export JAVA_HOME=/usr/java/jdk1.6.0/
+
+# Extra Java CLASSPATH elements.  Optional.
+# export HBASE_CLASSPATH=
+
+# The maximum amount of heap to use. Default is left to JVM default.
+# export HBASE_HEAPSIZE=1G
+
+# Uncomment below if you intend to use off heap cache. For example, to allocate 8G of 
+# offheap, set the value to "8G".
+# export HBASE_OFFHEAPSIZE=1G
+
+# Extra Java runtime options.
+# Below are what we set by default.  May only work with SUN JVM.
+# For more on why as well as other possible settings,
+# see http://wiki.apache.org/hadoop/PerformanceTuning
+export HBASE_OPTS="-XX:+UseConcMarkSweepGC"
+
+# Configure PermSize. Only needed in JDK7. You can safely remove it for JDK8+
+export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -XX:PermSize=128m -XX:MaxPermSize=128m"
+export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -XX:PermSize=128m -XX:MaxPermSize=128m"
+
+# Uncomment one of the below three options to enable java garbage collection logging for the server-side processes.
+
+# This enables basic gc logging to the .out file.
+# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
+
+# This enables basic gc logging to its own file.
+# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
+# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH>"
+
+# This enables basic GC logging to its own file with automatic log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+.
+# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
+# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH> -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M"
+
+# Uncomment one of the below three options to enable java garbage collection logging for the client processes.
+
+# This enables basic gc logging to the .out file.
+# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
+
+# This enables basic gc logging to its own file.
+# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
+# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH>"
+
+# This enables basic GC logging to its own file with automatic log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+.
+# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
+# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH> -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M"
+
+# See the package documentation for org.apache.hadoop.hbase.io.hfile for other configurations
+# needed setting up off-heap block caching. 
+
+# Uncomment and adjust to enable JMX exporting
+# See jmxremote.password and jmxremote.access in $JRE_HOME/lib/management to configure remote password access.
+# More details at: http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html
+# NOTE: HBase provides an alternative JMX implementation to fix the random ports issue, please see JMX
+# section in HBase Reference Guide for instructions.
+
+# export HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
+# export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10101"
+# export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10102"
+# export HBASE_THRIFT_OPTS="$HBASE_THRIFT_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10103"
+# export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10104"
+# export HBASE_REST_OPTS="$HBASE_REST_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10105"
+
+# File naming hosts on which HRegionServers will run.  $HBASE_HOME/conf/regionservers by default.
+# export HBASE_REGIONSERVERS=${HBASE_HOME}/conf/regionservers
+
+# Uncomment and adjust to keep all the Region Server pages mapped to be memory resident
+#HBASE_REGIONSERVER_MLOCK=true
+#HBASE_REGIONSERVER_UID="hbase"
+
+# File naming hosts on which backup HMaster will run.  $HBASE_HOME/conf/backup-masters by default.
+# export HBASE_BACKUP_MASTERS=${HBASE_HOME}/conf/backup-masters
+
+# Extra ssh options.  Empty by default.
+# export HBASE_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HBASE_CONF_DIR"
+
+# Where log files are stored.  $HBASE_HOME/logs by default.
+# export HBASE_LOG_DIR=${HBASE_HOME}/logs
+
+# Enable remote JDWP debugging of major HBase processes. Meant for Core Developers 
+# export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8070"
+# export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8071"
+# export HBASE_THRIFT_OPTS="$HBASE_THRIFT_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8072"
+# export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8073"
+
+# A string representing this instance of hbase. $USER by default.
+# export HBASE_IDENT_STRING=$USER
+
+# The scheduling priority for daemon processes.  See 'man nice'.
+# export HBASE_NICENESS=10
+
+# The directory where pid files are stored. /tmp by default.
+# export HBASE_PID_DIR=/var/hadoop/pids
+
+# Seconds to sleep between slave commands.  Unset by default.  This
+# can be useful in large clusters, where, e.g., slave rsyncs can
+# otherwise arrive faster than the master can service them.
+# export HBASE_SLAVE_SLEEP=0.1
+
+# Tell HBase whether it should manage it's own instance of Zookeeper or not.
+export HBASE_MANAGES_ZK=false
+
+# The default log rolling policy is RFA, where the log file is rolled as per the size defined for the 
+# RFA appender. Please refer to the log4j.properties file to see more details on this appender.
+# In case one needs to do log rolling on a date change, one should set the environment property
+# HBASE_ROOT_LOGGER to "<DESIRED_LOG LEVEL>,DRFA".
+# For example:
+# HBASE_ROOT_LOGGER=INFO,DRFA
+# The reason for changing default to RFA is to avoid the boundary case of filling out disk space as 
+# DRFA doesn't put any cap on the log size. Please refer to HBase-5655 for more context.

pinpoint-hbase/hbase-site.xml

@@ -4,9 +4,21 @@
         <value>file:///home/pinpoint/hbase</value>
     </property>
     <property>
-        <name>hbase.zookeeper.property.dataDir</name>
+        <name>hbase.cluster.distributed</name>
-        <value>/home/pinpoint/zookeeper</value>
+        <value>true</value>
     </property>
+     <property>
+        <name>zookeeper.znode.parent</name>
+        <value>/hbase</value>
+    </property>
+    <property>
+        <name>hbase.zookeeper.quorum</name>
+        <value>zoo1,zoo2,zoo3</value>
+    </property>
+    <property>
+		<name>hbase.zookeeper.property.clientPort</name>
+		<value>2181</value> 
+	</property> 
     <property>
         <name>hbase.master.port</name>
         <value>60000</value>

pinpoint-mysql/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.0.3
+PINPOINT_VERSION=2.1.2
 
 ### Pinpoint-mysql
 MYSQL_ROOT_PASSWORD=root123

pinpoint-mysql/Dockerfile

@@ -1,6 +1,6 @@
 FROM mysql:5.7
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.3}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.2}
 
 RUN apt update \ 
 	&& apt-get install -y --no-install-recommends ca-certificates wget \

pinpoint-mysql/Readme.md

@@ -5,6 +5,9 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.1.2
+ - 2.1.0
+ - 2.0.4
  - 2.0.3
  - 2.0.2
  - 2.0.1

pinpoint-quickstart/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.0.3
+PINPOINT_VERSION=2.1.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent

pinpoint-web/.env

@@ -1,48 +1,45 @@
-PINPOINT_VERSION=2.0.3
+PINPOINT_VERSION=2.1.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Web
 
 PINPOINT_WEB_NAME=pinpoint-web
 
-WEB_PAGE_PORT=8079
+SERVER_PORT=8079
+#zookeeper information required
+PINPOINT_ZOOKEEPER_ADDRESS=
+
+WEB_LOGGING_LEVEL_ROOT=INFO
 
 CLUSTER_ENABLE=true
-#zookeeper information required
-CLUSTER_ZOOKEEPER_ADDRESS=
 
 ADMIN_PASSWORD=admin
 
-ANALYTICS=true
+#analytics
-
+CONFIG_SENDUSAGE=true
-#hbase information required
-HBASE_HOST=
-HBASE_PORT=
-
-WEB_DEBUG_LEVEL=INFO
 
 #flink server information required if used
-BATCH_ENABLE=true
+BATCH_ENABLE=false
 BATCH_SERVER_IP=127.0.0.1
 BATCH_FLINK_SERVER=pinpoint-flink-jobmanager
 
 CONFIG_SHOW_APPLICATIONSTAT=true
 
-#mysql information required
+#mysql information required if used
-JDBC_DRIVER=com.mysql.jdbc.Driver
+JDBC_DRIVERCLASSNAME=com.mysql.jdbc.Driver
 JDBC_URL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
 JDBC_USERNAME=admin
 JDBC_PASSWORD=admin
 
-#mail server information required
+#mail server information required if used
-MAIL_SERVER_URL=smtp.gmail.com
+ALARM_MAIL_SERVER_URL=smtp.gmail.com
-MAIL_SERVER_PORT=587
+ALARM_MAIL_SERVER_PORT=587
-MAIL_SERVER_USERNAME=username
+ALARM_MAIL_SERVER_USERNAME=username
-MAIL_SERVER_PASSWORD=password
+ALARM_MAIL_SERVER_PASSWORD=password
-MAIL_SENDER_ADDRESS=pinpoint_operator@pinpoint.com
+ALARM_MAIL_SENDER_ADDRESS=pinpoint_operator@pinpoint.com
-MAIL_TRANSPORT_PROTOCOL=smtp
+ALARM_MAIL_TRANSPORT_PROTOCOL=smtp
-MAIL_SMTP_PORT=25
+ALARM_MAIL_SMTP_PORT=25
-MAIL_SMTP_AUTH=false
+ALARM_MAIL_SMTP_AUTH=false
-MAIL_SMTP_STARTTLS_ENABLE=false
+ALARM_MAIL_SMTP_STARTTLS_ENABLE=false
-MAIL_SMTP_STARTTLS_REQUIRED=false
+ALARM_MAIL_SMTP_STARTTLS_REQUIRED=false
-MAIL_DEBUG=false
+ALARM_MAIL_DEBUG=false

pinpoint-web/Dockerfile

@@ -1,17 +1,22 @@
-FROM tomcat:8-jre8
+FROM openjdk:8-jdk-alpine
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.3}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.2}
-ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war
+ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar
 
-COPY /build/scripts/start-web.sh /usr/local/bin/
+RUN mkdir -p /pinpoint/config \
+    && mkdir -p /pinpoint/scripts
 
-RUN chmod a+x /usr/local/bin/start-web.sh \
+COPY /build/config/pinpoint-web.properties /pinpoint/config/
-    && curl -SL ${INSTALL_URL} -o pinpoint-web.war \
+COPY /build/scripts/start-web.sh /pinpoint/scripts/
-    && rm -rf /usr/local/tomcat/webapps \
+#temporary line for local test
-    && mkdir -p /usr/local/tomcat/webapps \
+#COPY /pinpoint-web-boot-2.1.2-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
-    && unzip pinpoint-web.war -d /usr/local/tomcat/webapps/ROOT \
-    && rm -rf pinpoint-web.war
 
-ENTRYPOINT ["/usr/local/bin/start-web.sh"]
+RUN apk --no-cache add curl \
+    && chmod a+x /pinpoint/scripts/start-web.sh \
+    && chmod a+x /pinpoint/config/pinpoint-web.properties \
+    && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-web-boot.jar
+
+#entry point to start-web.sh for future use.
+ENTRYPOINT ["sh", "/pinpoint/scripts/start-web.sh"]

pinpoint-web/Readme.md

@@ -5,6 +5,9 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio
 
 ## Supported Tags
 
+ - 2.1.2
+ - 2.1.0
+ - 2.0.4
  - 2.0.3
  - 2.0.2
  - 2.0.1

pinpoint-web/build/config/pinpoint-web.properties

@@ -0,0 +1,8 @@
+##########
+# another way of setting properties.
+# applied priority '.ENV' -> 'pinpoint-web.properties'
+# property should be commented in docker-compose file to use
+# ex) PINPOINT_ZOOKEEPER_ADDRESS should be commented in docker-compose to use pinpoint.zookeeper.address below
+##########
+
+pinpoint.zookeeper.address=

pinpoint-web/build/scripts/start-web.sh

@@ -2,43 +2,4 @@
 set -e
 set -x
 
-WEB_INF_CLASSES_DIR=/usr/local/tomcat/webapps/ROOT/WEB-INF/classes
+exec java -jar /pinpoint/pinpoint-web-boot.jar --spring.config.additional-location=/pinpoint/config/pinpoint-web.properties
-APPLICATION_WEB_PROPERTIES=${WEB_INF_CLASSES_DIR}/pinpoint-web.properties
-APPLICATION_HBASE_PROPERTIES=${WEB_INF_CLASSES_DIR}/profiles/${SPRING_PROFILES}/hbase-env.properties
-APPLICATION_BATCH_PROPERTIES=${WEB_INF_CLASSES_DIR}/batch.properties
-APPLICATION_JDBC_PROPERTIES=${WEB_INF_CLASSES_DIR}/jdbc.properties
-
-sed -i "/cluster.enable=/ s/=.*/=${CLUSTER_ENABLE}/" ${APPLICATION_WEB_PROPERTIES}
-#sed -i "/cluster.zookeeper.address=/ s/=.*/=${CLUSTER_ZOOKEEPER_ADDRESS}/g" ${APPLICATION_WEB_PROPERTIES}
-#sed -i "/cluster.web.tcp.port=/ s/=.*/=${CLUSTER_WEB_TCP_PORT}/" ${APPLICATION_WEB_PROPERTIES}
-sed -i "/admin.password=/ s/=.*/=${ADMIN_PASSWORD}/" ${APPLICATION_WEB_PROPERTIES}
-sed -i "/config.sendUsage=/ s/=.*/=${ANALYTICS}/" ${APPLICATION_WEB_PROPERTIES}
-sed -i "/config.show.applicationStat=/ s/=.*/=${CONFIG_SHOW_APPLICATIONSTAT}/" ${APPLICATION_WEB_PROPERTIES}
-
-sed -i "/hbase.client.host=/ s/=.*/=${HBASE_HOST}/" ${APPLICATION_HBASE_PROPERTIES}
-sed -i "/hbase.client.port=/ s/=.*/=${HBASE_PORT}/" ${APPLICATION_HBASE_PROPERTIES}
-
-sed -i "/batch.enable=/ s/=.*/=${BATCH_ENABLE}/" ${APPLICATION_BATCH_PROPERTIES}
-sed -i "/batch.server.ip=/ s/=.*/=${BATCH_SERVER_IP}/" ${APPLICATION_BATCH_PROPERTIES}
-sed -i "/batch.flink.server=/ s/=.*/=${BATCH_FLINK_SERVER}/" ${APPLICATION_BATCH_PROPERTIES}
-
-sed -i "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/profiles/${SPRING_PROFILES}/log4j.xml
-sed -i "/jdbc.driverClassName=/ s/=.*/=${JDBC_DRIVER:-com.mysql.jdbc.Driver}/" ${APPLICATION_JDBC_PROPERTIES}
-sed -i "/jdbc.url=/ s/=.*/=${JDBC_URL//\//\\/}/" ${APPLICATION_JDBC_PROPERTIES}
-sed -i "/jdbc.username=/ s/=.*/=${JDBC_USERNAME:-admin}/" ${APPLICATION_JDBC_PROPERTIES}
-sed -i "/jdbc.password=/ s/=.*/=${JDBC_PASSWORD:-admin}/" ${APPLICATION_JDBC_PROPERTIES}
-
-sed -i "/alarm.mail.server.url=/ s/=.*/=${MAIL_SERVER_URL}/" ${APPLICATION_BATCH_PROPERTIES}
-sed -i "/alarm.mail.server.port=/ s/=.*/=${MAIL_SERVER_PORT:-587}/" ${APPLICATION_BATCH_PROPERTIES}
-sed -i "/alarm.mail.server.username=/ s/=.*/=${MAIL_SERVER_USERNAME}/" ${APPLICATION_BATCH_PROPERTIES}
-sed -i "/alarm.mail.server.password=/ s/=.*/=${MAIL_SERVER_PASSWORD}/" ${APPLICATION_BATCH_PROPERTIES}
-sed -i "/alarm.mail.sender.address=/ s/=.*/=${MAIL_SENDER_ADDRESS:-pinpoint_operator@pinpoint.com}/" ${APPLICATION_BATCH_PROPERTIES}
-
-sed -i "/alarm.mail.transport.protocol=/ s/=.*/=${MAIL_TRANSPORT_PROTOCOL:-smtp}/" ${APPLICATION_BATCH_PROPERTIES}
-sed -i "/alarm.mail.smtp.port=/ s/=.*/=${MAIL_SMTP_PORT:-587}/" ${APPLICATION_BATCH_PROPERTIES}
-sed -i "/alarm.mail.smtp.auth=/ s/=.*/=${MAIL_SMTP_AUTH:-false}/" ${APPLICATION_BATCH_PROPERTIES}
-sed -i "/alarm.mail.smtp.starttls.enable=/ s/=.*/=${MAIL_SMTP_STARTTLS_ENABLE:-false}/" ${APPLICATION_BATCH_PROPERTIES}
-sed -i "/alarm.mail.smtp.starttls.required=/ s/=.*/=${MAIL_SMTP_STARTTLS_REQUIRED:-false}/" ${APPLICATION_BATCH_PROPERTIES}
-sed -i "/alarm.mail.debug=/ s/=.*/=${MAIL_DEBUG:-false}/" ${APPLICATION_BATCH_PROPERTIES}
-
-exec /usr/local/tomcat/bin/catalina.sh run

pinpoint-web/docker-compose.yml

@@ -13,37 +13,35 @@ services:
 
     restart: always
     expose:
-      - "8080"
+      - "${SERVER_PORT:-8080}"
       - "9997"
     ports:
       - "9997:9997"
-      - "${WEB_PAGE_PORT:-8080}:8080"
+      - "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}"
     environment:
-      - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES},batch"
+      - SERVER_PORT=${SERVER_PORT}
-      - SPRING_PROFILES=${SPRING_PROFILES}
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
+      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
-      - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}
-      - ANALYTICS=${ANALYTICS}
+      - CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
-      - HBASE_HOST=${HBASE_HOST}
+      - LOGGING_LEVEL_ROOT=${WEB_LOGGING_LEVEL_ROOT}
-      - HBASE_PORT=${HBASE_PORT}
-      - DEBUG_LEVEL=${WEB_DEBUG_LEVEL}
       - CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT}
       - BATCH_ENABLE=${BATCH_ENABLE}
       - BATCH_SERVER_IP=${BATCH_SERVER_IP}
       - BATCH_FLINK_SERVER=${BATCH_FLINK_SERVER}
-      - JDBC_DRIVER=${JDBC_DRIVER}
+      - JDBC_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
       - JDBC_URL=${JDBC_URL}
       - JDBC_USERNAME=${JDBC_USERNAME}
       - JDBC_PASSWORD=${JDBC_PASSWORD}
-      - MAIL_SERVER_URL=${MAIL_SERVER_URL}
+      - ALARM_MAIL_SERVER_URL=${ALARM_MAIL_SERVER_URL}
-      - MAIL_SERVER_PORT=${MAIL_SERVER_PORT}
+      - ALARM_MAIL_SERVER_PORT=${ALARM_MAIL_SERVER_PORT}
-      - MAIL_SERVER_USERNAME=${MAIL_SERVER_USERNAME}
+      - ALARM_MAIL_SERVER_USERNAME=${ALARM_MAIL_SERVER_USERNAME}
-      - MAIL_SERVER_PASSWORD=${MAIL_SERVER_PASSWORD}
+      - ALARM_MAIL_SERVER_PASSWORD=${ALARM_MAIL_SERVER_PASSWORD}
-      - MAIL_SENDER_ADDRESS=${MAIL_SENDER_ADDRESS}
+      - ALARM_MAIL_SENDER_ADDRESS=${ALARM_MAIL_SENDER_ADDRESS}
-      - MAIL_TRANSPORT_PROTOCOL=${MAIL_TRANSPORT_PROTOCOL}
+      - ALARM_MAIL_TRANSPORT_PROTOCOL=${ALARM_MAIL_TRANSPORT_PROTOCOL}
-      - MAIL_SMTP_PORT=${MAIL_SMTP_PORT}
+      - ALARM_MAIL_SMTP_PORT=${ALARM_MAIL_SMTP_PORT}
-      - MAIL_SMTP_AUTH=${MAIL_SMTP_AUTH}
+      - ALARM_MAIL_SMTP_AUTH=${ALARM_MAIL_SMTP_AUTH}
-      - MAIL_SMTP_STARTTLS_ENABLE=${MAIL_SMTP_STARTTLS_ENABLE}
+      - ALARM_MAIL_SMTP_STARTTLS_ENABLE=${ALARM_MAIL_SMTP_STARTTLS_ENABLE}
-      - MAIL_SMTP_STARTTLS_REQUIRED=${MAIL_SMTP_STARTTLS_REQUIRED}
+      - ALARM_MAIL_SMTP_STARTTLS_REQUIRED=${ALARM_MAIL_SMTP_STARTTLS_REQUIRED}
-      - MAIL_DEBUG=${MAIL_DEBUG}
+      - ALARM_MAIL_DEBUG=${ALARM_MAIL_DEBUG}

pinpoint-zookeeper/docker-compose.yml

@@ -1,7 +1,5 @@
 version: "3.6"
-
+services:
-servidocker
-docker-compose pull && docker-compose upces:
   #zookeepers
   zoo1:
     image: zookeeper:3.4
@@ -10,9 +8,14 @@ docker-compose pull && docker-compose upces:
     environment:
       ZOO_MY_ID: 1
       ZOO_SERVERS: server.1=0.0.0.0:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
+    expose:
+      - "2181"
+      - "2888"
+      - "3888"
+    ports:
+      - "2181"
     networks:
       - pinpoint
-
   zoo2:
     image: zookeeper:3.4
     restart: always
@@ -20,9 +23,14 @@ docker-compose pull && docker-compose upces:
     environment:
       ZOO_MY_ID: 2
       ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=0.0.0.0:2888:3888 server.3=zoo3:2888:3888
+    expose:
+      - "2181"
+      - "2888"
+      - "3888"
+    ports:
+      - "2181"
     networks:
       - pinpoint
-
   zoo3:
     image: zookeeper:3.4
     restart: always
@@ -30,9 +38,14 @@ docker-compose pull && docker-compose upces:
     environment:
       ZOO_MY_ID: 3
       ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=0.0.0.0:2888:3888
+    expose:
+      - "2181"
+      - "2888"
+      - "3888"
+    ports:
+      - "2181"
     networks:
       - pinpoint
-
 networks:
   pinpoint:
     driver: bridge