[#noissue] add profile to agent

[pinpoint-apm/pinpoint#7298 ] remove character
[#noissue] remove tailing full log
2020-10-16 14:46:40 +09:00 · 2020-10-16 11:33:46 +09:00 · 2020-10-13 00:30:56 +09:00 · 2020-10-13 00:30:56 +09:00 · 2020-10-12 22:26:00 +09:00 · 2020-09-29 10:11:45 +09:00
44 changed files with 539 additions and 305 deletions
--- a/.env
+++ b/.env
@@ -1,10 +1,12 @@
-PINPOINT_VERSION=1.8.3
+PINPOINT_VERSION=2.1.0
+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
@@ -16,47 +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
-
-HBASE_HOST=pinpoint-hbase
-HBASE_PORT=2181
-
-WEB_DEBUG_LEVEL=INFO
+#analytics
+CONFIG_SENDUSAGE=true

+#flink server information required if used
 BATCH_ENABLE=false
-BATCH_SERVER_IP=127.0.0.127
+BATCH_SERVER_IP=127.0.0.1
 BATCH_FLINK_SERVER=pinpoint-flink-jobmanager

 CONFIG_SHOW_APPLICATIONSTAT=true

-JDBC_DRIVER=com.mysql.jdbc.Driver
+#mysql information required if used
+JDBC_DRIVERCLASSNAME=com.mysql.jdbc.Driver
 JDBC_URL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
 JDBC_USERNAME=admin
 JDBC_PASSWORD=admin
-MAIL_HOST=stmp.test.com
-MAIL_PORT=123
-MAIL_USERNAME=user
-MAIL_PASSWORD=pass
-MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL=smtp
-MAIL_PROPERTIES_MAIL_SMTP_AUTH=true
-MAIL_PROPERTIES_MAIL_SMTP_PORT=587
-MAIL_PROPERTIES_MAIL_SMTP_FROM=test@example.com
-MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE=true
-MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED=true
-MAIL_PROPERTIES_MAIL_DEBUG=false
+
+#mail server information required if used
+ALARM_MAIL_SERVER_URL=smtp.gmail.com
+ALARM_MAIL_SERVER_PORT=587
+ALARM_MAIL_SERVER_USERNAME=username
+ALARM_MAIL_SERVER_PASSWORD=password
+ALARM_MAIL_SENDER_ADDRESS=pinpoint_operator@pinpoint.com
+ALARM_MAIL_TRANSPORT_PROTOCOL=smtp
+ALARM_MAIL_SMTP_PORT=25
+ALARM_MAIL_SMTP_AUTH=false
+ALARM_MAIL_SMTP_STARTTLS_ENABLE=false
+ALARM_MAIL_SMTP_STARTTLS_REQUIRED=false
+ALARM_MAIL_DEBUG=false
+

 ### Pinpoint-Collector

 PINPOINT_COLLECTOR_NAME=pinpoint-collector

+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
@@ -64,16 +77,24 @@ COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996
 FLINK_CLUSTER_ENABLE=true
 FLINK_CLUSTER_ZOOKEEPER_ADDRESS=zoo1

-COLLECTOR_DEBUG_LEVEL=INFO
-

 ### Pinpoint-Agent

 PINPOINT_AGENT_NAME=pinpoint-agent
+
+#network module(GRPC,THRIFT)
+PROFILER_TRANSPORT_MODULE=GRPC
+
+#collector information required
 COLLECTOR_IP=pinpoint-collector
+PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=9991
+PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=9991
+PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=9992
+PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=9993
 COLLECTOR_TCP_PORT=9994
 COLLECTOR_STAT_PORT=9995
 COLLECTOR_SPAN_PORT=9996
+
 # Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
 PROFILER_SAMPLING_RATE=1

--- a/Readme.md
+++ b/Readme.md
@@ -13,6 +13,15 @@ It supports and helps you understand your application in a glance and allow you

 ## Supported Tags

+ - 2.1.0
+ - 2.0.4
+ - 2.0.3
+ - 2.0.2
+ - 2.0.1
+   - Default transport module has changed from THRIFT to gRPC
+   - Spring profiler added (check [homepage](https://naver.github.io/pinpoint/2.0.1/installation.html#profiles) for more info)
+ - 1.8.5 
+ - 1.8.4
 - 1.8.3
 - 1.8.2
 - 1.8.1
@@ -39,8 +48,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
 ```

@@ -73,13 +82,12 @@ For more information checkout [Setting Alarm](http://naver.github.io/pinpoint/al

 The Pinpoint-Flink is necessary to use ['Application Inspector'](http://naver.github.io/pinpoint/applicationinspector.html) feature. 

-After all containers are started and ready to go. There is one more thing to do to use all existing features in Pinpoint.
-It's not mandatory, but to use all the features and since it's a simple task, let's take care of it.
+After all containers are started and ready to go. There is one more thing to do to use this features in Pinpoint.
+This feature is not mandatory, but since enabling this is a simple task, let's take care of it.

 Register a `job` on to pinpoint-flink server.  
 You can build the `job` from the [open-source of Pinpoint](https://github.com/naver/pinpoint), additional guide is [here](https://github.com/naver/pinpoint/blob/master/doc/application-inspector.md#application-inspector).   
-or  
-you can simply upload pre-built jar file under pinpoint-flink/build/pinpoint-flink-job-{pinpoint-version}.jar (beware of the version, it should matched with *PINPOINT_VERSION* in .env file)  
+  
 If anyone have solution to put the job file into flink image without doing manually, please let us know.

 Pinpoint-Flink server is running on [port 8081](http://localhost:8081/#/submit). From `submit new job` menu
@@ -87,6 +95,11 @@ Submit the jar file with *com.navercorp.pinpoint.flink.StatStreamingVer2Job* in

 ![Pinpoint](https://github.com/naver/pinpoint-docker/blob/master/docs/Pinpoint-Flink%20upload.png)

+### Alarm configuration (optional)
+
+You can check the [alarm guide document at the homepage](https://naver.github.io/pinpoint/alarm.html) for full understanding.
+But for the docker image, All is set. fillout variables under *#mail server information required* in `.env` file before starting the container 
+ 
 ### Testing QuickStart application
 
 Now you are ready to monitor the sample application(Pinpoint-QuickStart [port 8000](http://localhost:8000)) provided.
--- a/docker-compose.yml
+++ b/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:
@@ -47,7 +46,7 @@ services:
    image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}"
    hostname: pinpoint-mysql
    ports:
-      - "13306:3306"
+      - "3306:3306"
    environment:
      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
      - MYSQL_USER=${MYSQL_USER}
@@ -72,40 +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:
+      - SERVER_PORT=${SERVER_PORT}
+      - 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}
-      - HBASE_HOST=${HBASE_HOST}
-      - HBASE_PORT=${HBASE_PORT}
-      - DEBUG_LEVEL=${WEB_DEBUG_LEVEL}
+      - CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
+      - LOGGING_LEVEL_ROOT=${WEB_LOGGING_LEVEL_ROOT}
      - 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_HOST=${MAIL_HOST}
-      - MAIL_PORT=${MAIL_PORT}
-      - MAIL_USERNAME=${MAIL_USERNAME}
-      - MAIL_PASSWORD=${MAIL_PASSWORD}
-      - MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL=${MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL}
-      - MAIL_PROPERTIES_MAIL_SMTP_AUTH=${MAIL_PROPERTIES_MAIL_SMTP_AUTH}
-      - MAIL_PROPERTIES_MAIL_SMTP_PORT=${MAIL_PROPERTIES_MAIL_SMTP_PORT}
-      - MAIL_PROPERTIES_MAIL_SMTP_FROM=${MAIL_PROPERTIES_MAIL_SMTP_FROM}
-      - MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE=${MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE}
-      - MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED=${MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED}
-      - MAIL_PROPERTIES_MAIL_DEBUG=${MAIL_PROPERTIES_MAIL_DEBUG}
+      - ALARM_MAIL_SERVER_URL=${ALARM_MAIL_SERVER_URL}
+      - ALARM_MAIL_SERVER_PORT=${ALARM_MAIL_SERVER_PORT}
+      - ALARM_MAIL_SERVER_USERNAME=${ALARM_MAIL_SERVER_USERNAME}
+      - ALARM_MAIL_SERVER_PASSWORD=${ALARM_MAIL_SERVER_PASSWORD}
+      - ALARM_MAIL_SENDER_ADDRESS=${ALARM_MAIL_SENDER_ADDRESS}
+      - ALARM_MAIL_TRANSPORT_PROTOCOL=${ALARM_MAIL_TRANSPORT_PROTOCOL}
+      - ALARM_MAIL_SMTP_PORT=${ALARM_MAIL_SMTP_PORT}
+      - ALARM_MAIL_SMTP_AUTH=${ALARM_MAIL_SMTP_AUTH}
+      - ALARM_MAIL_SMTP_STARTTLS_ENABLE=${ALARM_MAIL_SMTP_STARTTLS_ENABLE}
+      - ALARM_MAIL_SMTP_STARTTLS_REQUIRED=${ALARM_MAIL_SMTP_STARTTLS_REQUIRED}
+      - ALARM_MAIL_DEBUG=${ALARM_MAIL_DEBUG}
    links:
      - "pinpoint-mysql:pinpoint-mysql"
    networks:
@@ -123,27 +122,34 @@ services:

    depends_on:
      - pinpoint-hbase
+      - zoo1
    restart: always
    expose:
+      - "9991"
+      - "9992"
+      - "9993"
      - "9994"
      - "9995"
      - "9996"
    ports:
+      - "${COLLECTOR_RECEIVER_GRPC_AGENT_PORT:-9991}:9991/tcp"
+      - "${COLLECTOR_RECEIVER_GRPC_STAT_PORT:-9992}:9992/tcp"
+      - "${COLLECTOR_RECEIVER_GRPC_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"
      - "${COLLECTOR_RECEIVER_STAT_UDP_PORT:-9995}:9995/udp"
      - "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/udp"
+
    networks:
      - pinpoint
    environment:
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
+      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
      - CLUSTER_ENABLE=${CLUSTER_ENABLE}
-      - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
-      - HBASE_HOST=${HBASE_HOST}
-      - HBASE_PORT=${HBASE_PORT}
+      - LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
      - FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE}
      - FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}
-      - DEBUG_LEVEL=${COLLECTOR_DEBUG_LEVEL}

  pinpoint-quickstart:
    build:
@@ -157,7 +163,7 @@ services:
    volumes:
      - data-volume:/pinpoint-agent
    environment:
-      JAVA_OPTS: "-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME}"
+      JAVA_OPTS: "-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME} -Dpinpoint.profiler.profiles.active=${SPRING_PROFILES}"
    networks:
      - pinpoint
    depends_on:
@@ -180,12 +186,15 @@ services:
    volumes:
      - data-volume:/pinpoint-agent
    environment:
+      - SPRING_PROFILES=${SPRING_PROFILES}
      - COLLECTOR_IP=${COLLECTOR_IP}
-      - COLLECTOR_TCP_PORT=${COLLECTOR_TCP_PORT}
-      - COLLECTOR_STAT_PORT=${COLLECTOR_STAT_PORT}
-      - COLLECTOR_SPAN_PORT=${COLLECTOR_SPAN_PORT}
+      - PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}
+      - PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}
+      - PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}
+      - PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}
      - PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
      - DEBUG_LEVEL=${AGENT_DEBUG_LEVEL}
+      - PROFILER_TRANSPORT_MODULE=${PROFILER_TRANSPORT_MODULE}
    depends_on:
      - pinpoint-collector

@@ -194,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
@@ -204,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
@@ -214,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
@@ -233,6 +260,8 @@ services:
      - JOB_MANAGER_RPC_ADDRESS=jobmanager
    networks:
      - pinpoint
+    depends_on:
+      - zoo1

  taskmanager:
    container_name: "${PINPOINT_FLINK_NAME}-taskmanager"
@@ -246,6 +275,7 @@ services:
      - "6122:6122"
      - "19994:19994"
    depends_on:
+      - zoo1
      - jobmanager
    command: taskmanager
    links:
--- a/pinpoint-agent-attach-example/java/.env
+++ b/pinpoint-agent-attach-example/java/.env
@@ -1,4 +1,5 @@
 ### Pinpoint with Java
-PINPOINT_VERSION=1.8.3
+PINPOINT_VERSION=2.1.0
+SPRING_PROFILES=release
 AGENT_ID=app-in-docker
 APP_NAME=quickapp
--- a/pinpoint-agent-attach-example/java/Dockerfile
+++ b/pinpoint-agent-attach-example/java/Dockerfile
@@ -5,7 +5,7 @@ LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 ARG PINPOINT_VERSION
 ARG AGENT_ID
 ARG APP_NAME
-ENV JAVA_OPTS="-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME}"
+ENV JAVA_OPTS="-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME} -Dspring.profiles.active=${SPRING_PROFILES}"

 RUN mkdir -p javasample
 COPY build/Sample.java javasample
--- a/pinpoint-agent-attach-example/java/docker-compose.yml
+++ b/pinpoint-agent-attach-example/java/docker-compose.yml
@@ -9,6 +9,7 @@ services:
        - PINPOINT_VERSION=${PINPOINT_VERSION}
        - AGENT_ID=${AGENT_ID}
        - APP_NAME=${APP_NAME}
+        - SPRING_PROFILES=${SPRING_PROFILES}
    container_name: "java"
    image: "Your Image"

--- a/pinpoint-agent-attach-example/tomcat/.env
+++ b/pinpoint-agent-attach-example/tomcat/.env
@@ -1,5 +1,6 @@
 ### Pinpoint with Tomcat
-PINPOINT_VERSION=1.8.3
+PINPOINT_VERSION=2.1.0
+SPRING_PROFILES=release
 APP_PORT=8000
 AGENT_ID=app-in-docker
 APP_NAME=quickapp
--- a/pinpoint-agent-attach-example/tomcat/docker-compose.yml
+++ b/pinpoint-agent-attach-example/tomcat/docker-compose.yml
@@ -13,7 +13,7 @@ services:
    volumes_from:
      - container:pinpoint-agent
    environment:
-      JAVA_OPTS: "-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME}"
+      JAVA_OPTS: "-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME} -Dspring.profiles.active=${SPRING_PROFILES}"
    command: catalina.sh run

 networks:
--- a/pinpoint-agent/.env
+++ b/pinpoint-agent/.env
@@ -1,13 +1,23 @@
-PINPOINT_VERSION=1.8.3
+PINPOINT_VERSION=2.1.0
+SPRING_PROFILES=release

 ### Pinpoint-Agent

 PINPOINT_AGENT_NAME=pinpoint-agent
+
+#network module(GRPC,THRIFT)
+PROFILER_TRANSPORT_MODULE=GRPC
+
 #collector information required
 COLLECTOR_IP=
+PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=9991
+PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=9991
+PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=9992
+PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=9993
 COLLECTOR_TCP_PORT=9994
 COLLECTOR_STAT_PORT=9995
 COLLECTOR_SPAN_PORT=9996
+
 # Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
 PROFILER_SAMPLING_RATE=1

--- a/pinpoint-agent/Dockerfile
+++ b/pinpoint-agent/Dockerfile
@@ -2,8 +2,8 @@ FROM alpine:3.7

 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"

-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.3}
-ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.0}
+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/

@@ -13,7 +13,7 @@ RUN apk add --update curl bash \
    && chmod -R o+x /pinpoint-agent \
    && curl -SL ${INSTALL_URL} -o pinpoint-agent.tar.gz \
    && gunzip pinpoint-agent.tar.gz \
-    && tar -xf pinpoint-agent.tar -C /pinpoint-agent \
+    && tar -xf pinpoint-agent.tar --strip 1 -C /pinpoint-agent \
    && rm pinpoint-agent.tar \
    && apk del curl \
    && rm /var/cache/apk/*
--- a/pinpoint-agent/Readme.md
+++ b/pinpoint-agent/Readme.md
@@ -5,6 +5,13 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat

 ## Supported Tags

+ - 2.1.0
+ - 2.0.4
+ - 2.0.3
+ - 2.0.2
+ - 2.0.1
+ - 1.8.5 
+ - 1.8.4
 - 1.8.3
 - 1.8.2
 - 1.8.1
--- a/pinpoint-agent/build/scripts/configure-agent.sh
+++ b/pinpoint-agent/build/scripts/configure-agent.sh
@@ -2,14 +2,22 @@
 set -e
 set -x

-sed -i "/profiler.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.collector.tcp.port=/ s/=.*/=${COLLECTOR_TCP_PORT}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.collector.stat.port=/ s/=.*/=${COLLECTOR_STAT_PORT}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.collector.span.port=/ s/=.*/=${COLLECTOR_SPAN_PORT}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.sampling.rate=/ s/=.*/=${PROFILER_SAMPLING_RATE}/" /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.config

-sed -i "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /pinpoint-agent/lib/log4j.xml
+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-root.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-root.config

-#ln -s  /pinpoint-agent /pinpoint-agent
+#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.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-root.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-root.config
+sed -i "/profiler.sampling.rate=/ s/=.*/=${PROFILER_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
+
+sed -i "/Root level=/ s/=.*/=\"${DEBUG_LEVEL}\">/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j2.xml

 exec "$@"
--- a/pinpoint-agent/docker-compose.yml
+++ b/pinpoint-agent/docker-compose.yml
@@ -18,11 +18,13 @@ services:
      - pinpoint-agent
    environment:
      - COLLECTOR_IP=${COLLECTOR_IP}
-      - COLLECTOR_TCP_PORT=${COLLECTOR_TCP_PORT}
-      - COLLECTOR_STAT_PORT=${COLLECTOR_STAT_PORT}
-      - COLLECTOR_SPAN_PORT=${COLLECTOR_SPAN_PORT}
+      - PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}
+      - PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}
+      - PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}
+      - PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}
      - PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
      - DEBUG_LEVEL=${AGENT_DEBUG_LEVEL}
+      - PROFILER_TRANSPORT_MODULE=${PROFILER_TRANSPORT_MODULE}
    networks:
      - pinpoint

--- a/pinpoint-collector/.env
+++ b/pinpoint-collector/.env
@@ -1,23 +1,28 @@
-PINPOINT_VERSION=1.8.3
+PINPOINT_VERSION=2.1.0
+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

+#zookeeper information required
+PINPOINT_ZOOKEEPER_ADDRESS=
+
+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

--- a/pinpoint-collector/Dockerfile
+++ b/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:-1.8.3}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.0}
+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/${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.0-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar

-RUN chmod a+x /usr/local/bin/start-collector.sh \
-    && curl -SL ${INSTALL_URL} -o pinpoint-collector.war \
-    && rm -rf /usr/local/tomcat/webapps \
-    && mkdir -p /usr/local/tomcat/webapps \
-    && 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
+RUN apk --no-cache add curl \
+    && chmod a+x /pinpoint/scripts/start-collector.sh \
+    && chmod a+x /pinpoint/config/pinpoint-collector.properties \
+    && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar

-ENTRYPOINT ["/usr/local/bin/start-collector.sh"]
+ENTRYPOINT ["sh", "/pinpoint/scripts/start-collector.sh"]

--- a/pinpoint-collector/Readme.md
+++ b/pinpoint-collector/Readme.md
@@ -5,6 +5,13 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl

 ## Supported Tags

+ - 2.1.0
+ - 2.0.4
+ - 2.0.3
+ - 2.0.2
+ - 2.0.1
+ - 1.8.5 
+ - 1.8.4
 - 1.8.3
 - 1.8.2
 - 1.8.1
--- a/pinpoint-collector/build/config/pinpoint-collector.properties
+++ b/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=
--- a/pinpoint-collector/build/scripts/start-collector.sh
+++ b/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
-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/hbase.properties
-sed -i "/hbase.client.port=/ s/=.*/=${HBASE_PORT}/" /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
-
-exec /usr/local/tomcat/bin/catalina.sh run
+exec java -jar /pinpoint/pinpoint-collector-boot.jar --spring.config.additional-location=/pinpoint/config/pinpoint-collector.properties
--- a/pinpoint-collector/docker-compose.yml
+++ b/pinpoint-collector/docker-compose.yml
@@ -13,10 +13,16 @@ services:

    restart: always
    expose:
+      - "9991"
+      - "9992"
+      - "9993"
      - "9994"
      - "9995"
      - "9996"
    ports:
+      - "${COLLECTOR_RECEIVER_GRPC_AGENT_PORT:-9991}:9991/tcp"
+      - "${COLLECTOR_RECEIVER_GRPC_STAT_PORT:-9992}:9992/tcp"
+      - "${COLLECTOR_RECEIVER_GRPC_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"
@@ -24,14 +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}
-      - HBASE_HOST=${HBASE_HOST}
-      - HBASE_PORT=${HBASE_PORT}
+      - LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
      - FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE}
      - FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}
-      - DEBUG_LEVEL=${COLLECTOR_DEBUG_LEVEL}
-
-networks:
-  pinpoint:
-    driver: bridge
--- a/pinpoint-flink/.env
+++ b/pinpoint-flink/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.3
+PINPOINT_VERSION=2.1.0

 ### Pinpoint-flink

--- a/pinpoint-flink/build/pinpoint-flink-job-1.7.2.jar
+++ b/pinpoint-flink/build/pinpoint-flink-job-1.7.2.jar
--- a/pinpoint-flink/build/pinpoint-flink-job-1.7.3.jar
+++ b/pinpoint-flink/build/pinpoint-flink-job-1.7.3.jar
--- a/pinpoint-hbase/.env
+++ b/pinpoint-hbase/.env
@@ -1,8 +1,8 @@
-PINPOINT_VERSION=1.8.3
+PINPOINT_VERSION=2.1.0

 ### Pinpoint-Hbase

 PINPOINT_HBASE_NAME=pinpoint-hbase
 #config for hbase in external docker
-EXTERNAL_HBASE_PORT=2180
+EXTERNAL_HBASE_PORT=2181

--- a/pinpoint-hbase/Dockerfile
+++ b/pinpoint-hbase/Dockerfile
@@ -2,7 +2,7 @@ FROM java:8-jdk

 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"

-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.3}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.0}

 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/${PINPOINT_VERSION}/hbase/scripts/hbase-create.hbase" -o ${BASE_DIR}/hbase-create.hbase \
-    && ${HBASE_HOME}/bin/start-hbase.sh \
-    && 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
+    && mv ../../hbase-env.sh ../../${HBASE_HOME}/conf/hbase-env.sh \
+    && curl -SL "https://raw.githubusercontent.com/naver/pinpoint/v${PINPOINT_VERSION}/hbase/scripts/hbase-create.hbase" -o ${BASE_DIR}/hbase-create.hbase 

 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
+
--- a/pinpoint-hbase/Readme.md
+++ b/pinpoint-hbase/Readme.md
@@ -5,6 +5,13 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat

 ## Supported Tags

+ - 2.1.0
+ - 2.0.4
+ - 2.0.3
+ - 2.0.2
+ - 2.0.1
+ - 1.8.5 
+ - 1.8.4
 - 1.8.3
 - 1.8.2
 - 1.8.1
--- a/pinpoint-hbase/build/scripts/check-table.sh
+++ b/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
--- a/pinpoint-hbase/build/scripts/initialize-hbase.sh
+++ b/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
--- a/pinpoint-hbase/docker-compose.yml
+++ b/pinpoint-hbase/docker-compose.yml
@@ -15,8 +15,8 @@ services:
      - /home/pinpoint/hbase
      - /home/pinpoint/zookeeper
    expose:
-      # zookeeper
-      - "2181"
+#      # zookeeper
+#      - "2181"
      # HBase Master API port
      - "60000"
      # HBase Master Web UI
--- a/pinpoint-hbase/hbase-env.sh
+++ b/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.
--- a/pinpoint-hbase/hbase-site.xml
+++ b/pinpoint-hbase/hbase-site.xml
@@ -4,8 +4,20 @@
        <value>file:///home/pinpoint/hbase</value>
    </property>
    <property>
-        <name>hbase.zookeeper.property.dataDir</name>
-        <value>/home/pinpoint/zookeeper</value>
+        <name>hbase.cluster.distributed</name>
+        <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>
--- a/pinpoint-mysql/.env
+++ b/pinpoint-mysql/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.3
+PINPOINT_VERSION=2.1.0

 ### Pinpoint-mysql
 MYSQL_ROOT_PASSWORD=root123
--- a/pinpoint-mysql/Dockerfile
+++ b/pinpoint-mysql/Dockerfile
@@ -1,11 +1,11 @@
 FROM mysql:5.7

-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.3}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.0}

 RUN apt update \ 
 	&& apt-get install -y --no-install-recommends ca-certificates wget \
-	&& wget -O /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql "https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql" \
-	&& wget -O /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql "https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-mysql.sql" \
+	&& wget -O /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql "https://raw.githubusercontent.com/naver/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql" \
+	&& wget -O /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql "https://raw.githubusercontent.com/naver/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-mysql.sql" \
 	&& sed -i '/^--/d' /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \
 	&& sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \
 	&& apt-get purge -y --auto-remove ca-certificates wget
--- a/pinpoint-mysql/Readme.md
+++ b/pinpoint-mysql/Readme.md
@@ -5,6 +5,13 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat

 ## Supported Tags
 
+ - 2.1.0
+ - 2.0.4
+ - 2.0.3
+ - 2.0.2
+ - 2.0.1
+ - 1.8.5
+ - 1.8.4
 - 1.8.3
 - 1.8.2
 - 1.8.1
--- a/pinpoint-mysql/docker-compose.yml
+++ b/pinpoint-mysql/docker-compose.yml
@@ -14,7 +14,7 @@ services:

    hostname: pinpoint-mysql
    ports:
-      - "13306:3306"
+      - "3306:3306"
    environment:
      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
      - MYSQL_USER=${MYSQL_USER}
--- a/pinpoint-quickstart/.env
+++ b/pinpoint-quickstart/.env
@@ -1,13 +1,17 @@
-PINPOINT_VERSION=1.8.3
+PINPOINT_VERSION=2.1.0
+SPRING_PROFILES=release

 ### Pinpoint-Agent

 PINPOINT_AGENT_NAME=pinpoint-agent
+
 #collector information required
 COLLECTOR_IP=
-COLLECTOR_TCP_PORT=9994
-COLLECTOR_STAT_PORT=9995
-COLLECTOR_SPAN_PORT=9996
+PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=9991
+PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=9991
+PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=9992
+PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=9993
+
 # Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
 PROFILER_SAMPLING_RATE=1

--- a/pinpoint-quickstart/docker-compose.yml
+++ b/pinpoint-quickstart/docker-compose.yml
@@ -13,7 +13,7 @@ services:
    volumes:
      - data-volume:/pinpoint-agent
    environment:
-      JAVA_OPTS: "-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME}"
+      JAVA_OPTS: "-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME} -Dpinpoint.profiler.profiles.active=${SPRING_PROFILES}"
    networks:
      - pinpoint
    depends_on:
--- a/pinpoint-web/.env
+++ b/pinpoint-web/.env
@@ -1,47 +1,45 @@
-PINPOINT_VERSION=1.8.3
+PINPOINT_VERSION=2.1.0
+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
-
-#hbase information required
-HBASE_HOST=
-HBASE_PORT=
-
-WEB_DEBUG_LEVEL=INFO
+#analytics
+CONFIG_SENDUSAGE=true

 #flink server information required if used
 BATCH_ENABLE=false
-BATCH_SERVER_IP=127.0.0.127
+BATCH_SERVER_IP=127.0.0.1
 BATCH_FLINK_SERVER=pinpoint-flink-jobmanager

 CONFIG_SHOW_APPLICATIONSTAT=true

-#mysql information required
-JDBC_DRIVER=com.mysql.jdbc.Driver
+#mysql information required if used
+JDBC_DRIVERCLASSNAME=com.mysql.jdbc.Driver
 JDBC_URL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
-JDBC_USERNAME=
-JDBC_PASSWORD=
+JDBC_USERNAME=admin
+JDBC_PASSWORD=admin

-#mail server information required
-MAIL_HOST=
-MAIL_PORT=
-MAIL_USERNAME=
-MAIL_PASSWORD=
-MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL=
-MAIL_PROPERTIES_MAIL_SMTP_AUTH=
-MAIL_PROPERTIES_MAIL_SMTP_PORT=
-MAIL_PROPERTIES_MAIL_SMTP_FROM=
-MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE=
-MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED=
-MAIL_PROPERTIES_MAIL_DEBUG=
+#mail server information required if used
+ALARM_MAIL_SERVER_URL=smtp.gmail.com
+ALARM_MAIL_SERVER_PORT=587
+ALARM_MAIL_SERVER_USERNAME=username
+ALARM_MAIL_SERVER_PASSWORD=password
+ALARM_MAIL_SENDER_ADDRESS=pinpoint_operator@pinpoint.com
+ALARM_MAIL_TRANSPORT_PROTOCOL=smtp
+ALARM_MAIL_SMTP_PORT=25
+ALARM_MAIL_SMTP_AUTH=false
+ALARM_MAIL_SMTP_STARTTLS_ENABLE=false
+ALARM_MAIL_SMTP_STARTTLS_REQUIRED=false
+ALARM_MAIL_DEBUG=false
--- a/pinpoint-web/Dockerfile
+++ b/pinpoint-web/Dockerfile
@@ -1,21 +1,22 @@
-FROM tomcat:8-jre8
+FROM openjdk:8-jdk-alpine

 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"

-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.3}
-ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.0}
+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/
-COPY /build/mail.zip /assets/mail.zip
+RUN mkdir -p /pinpoint/config \
+    && mkdir -p /pinpoint/scripts

-RUN chmod a+x /usr/local/bin/start-web.sh \
-    && curl -SL ${INSTALL_URL} -o pinpoint-web.war \
-    && rm -rf /usr/local/tomcat/webapps \
-    && mkdir -p /usr/local/tomcat/webapps \
-    && unzip pinpoint-web.war -d /usr/local/tomcat/webapps/ROOT \
-    && rm -rf pinpoint-web.war \
-    && curl -SL https://maven.java.net/content/repositories/releases/com/sun/mail/javax.mail/1.5.2/javax.mail-1.5.2.jar -o /usr/local/tomcat/webapps/ROOT/WEB-INF/lib/javax.mail-1.5.2.jar \
-    && unzip /assets/mail.zip -d /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/ \
-    && rm -rf /assets/mail.zip
+COPY /build/config/pinpoint-web.properties /pinpoint/config/
+COPY /build/scripts/start-web.sh /pinpoint/scripts/
+#temporary line for local test
+#COPY /pinpoint-web-boot-2.1.0-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar

-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"]
--- a/pinpoint-web/Readme.md
+++ b/pinpoint-web/Readme.md
@@ -5,6 +5,13 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio

 ## Supported Tags

+ - 2.1.0
+ - 2.0.4
+ - 2.0.3
+ - 2.0.2
+ - 2.0.1
+ - 1.8.5 
+ - 1.8.4
 - 1.8.3
 - 1.8.2
 - 1.8.1
--- a/pinpoint-web/build/config/pinpoint-web.properties
+++ b/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=
--- a/pinpoint-web/build/mail.zip
+++ b/pinpoint-web/build/mail.zip
--- a/pinpoint-web/build/scripts/start-web.sh
+++ b/pinpoint-web/build/scripts/start-web.sh
@@ -2,84 +2,4 @@
 set -e
 set -x

-sed -i "/cluster.enable=/ s/=.*/=${CLUSTER_ENABLE}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
-sed -i "/cluster.zookeeper.address=/ s/=.*/=${CLUSTER_ZOOKEEPER_ADDRESS}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
-#sed -i "/cluster.web.tcp.port=/ s/=.*/=${CLUSTER_WEB_TCP_PORT}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
-sed -i "/admin.password=/ s/=.*/=${ADMIN_PASSWORD}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
-sed -i "/config.sendUsage=/ s/=.*/=${ANALYTICS}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
-sed -i "/config.show.applicationStat=/ s/=.*/=${CONFIG_SHOW_APPLICATIONSTAT}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-web.properties
-
-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 "/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
-sed -i "/batch.flink.server=/ s/=.*/=${BATCH_FLINK_SERVER}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/batch.properties
-
-sed -i "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/log4j.xml
-
-WEB_INF_CLASSES_DIR=/usr/local/tomcat/webapps/ROOT/WEB-INF/classes
-APPLICATION_CONTEXT_WEB_FILE=${WEB_INF_CLASSES_DIR}/applicationContext-web.xml
-APPLICATION_CONTEXT_MAIL_FILE=${WEB_INF_CLASSES_DIR}/applicationContext-mail.xml
-
-echo -e "
-jdbc.driverClassName=${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}
-" > ${WEB_INF_CLASSES_DIR}/jdbc.properties
-
-sed -i '/classpath:applicationContext-mail.xml/d' ${APPLICATION_CONTEXT_WEB_FILE}
-if [ "$MAIL_HOST" != "" ]; then
-    sed -i 's/<\/beans>/    <import resource="classpath:applicationContext-mail.xml" \/>\
-<\/beans>/' ${APPLICATION_CONTEXT_WEB_FILE}
-	
-	sed -i "/name=\"host\"/c\                <property name=\"host\" value=\"${MAIL_HOST}\" />" ${APPLICATION_CONTEXT_MAIL_FILE}
-	sed -i "/name=\"port\"/c\                <property name=\"port\" value=\"${MAIL_PORT}\" />" ${APPLICATION_CONTEXT_MAIL_FILE}
-	sed -i "/name=\"username\"/c\                <property name=\"username\" value=\"${MAIL_USERNAME}\" />" ${APPLICATION_CONTEXT_MAIL_FILE}
-	sed -i "/name=\"password\"/c\                <property name=\"password\" value=\"${MAIL_PASSWORD}\" />" ${APPLICATION_CONTEXT_MAIL_FILE}
-	
-	if [ "$MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL" != "" ]; then
-		sed -i "/prop key=\"mail.transport.protocol\"/c\                                <prop key=\"mail.transport.protocol\">${MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL}</prop>" ${APPLICATION_CONTEXT_MAIL_FILE}
-	else
-		sed -i "/prop key=\"mail.transport.protocol\"/c\                                <!-- <prop key=\"mail.transport.protocol\">smtp</prop> -->" ${APPLICATION_CONTEXT_MAIL_FILE}
-	fi
-	
-	if [ "$MAIL_PROPERTIES_MAIL_SMTP_PORT" != "" ]; then
-		sed -i "/prop key=\"mail.smtp.port\"/c\                                <prop key=\"mail.smtp.port\">${MAIL_PROPERTIES_MAIL_SMTP_PORT}</prop>" ${APPLICATION_CONTEXT_MAIL_FILE}
-	else
-		sed -i "/prop key=\"mail.smtp.port\"/c\                                <!-- <prop key=\"mail.smtp.port\">25</prop> -->" ${APPLICATION_CONTEXT_MAIL_FILE}
-	fi
-	
-	if [ "$MAIL_PROPERTIES_MAIL_SMTP_AUTH" != "" ]; then
-		sed -i "/prop key=\"mail.smtp.auth\"/c\                                <prop key=\"mail.smtp.auth\">${MAIL_PROPERTIES_MAIL_SMTP_AUTH}</prop>" ${APPLICATION_CONTEXT_MAIL_FILE}
-	else
-		sed -i "/prop key=\"mail.smtp.auth\"/c\                                <!-- <prop key=\"mail.smtp.auth\">true</prop> -->" ${APPLICATION_CONTEXT_MAIL_FILE}
-	fi
-	
-	if [ "$MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE" != "" ]; then
-		sed -i "/prop key=\"mail.smtp.starttls.enable\"/c\                                <prop key=\"mail.smtp.starttls.enable\">${MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE}</prop>" ${APPLICATION_CONTEXT_MAIL_FILE}
-	else
-		sed -i "/prop key=\"mail.smtp.starttls.enable\"/c\                                <!-- <prop key=\"mail.smtp.starttls.enable\">true</prop> -->" ${APPLICATION_CONTEXT_MAIL_FILE}
-	fi
-	
-	if [ "$MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED" != "" ]; then
-		sed -i "/prop key=\"mail.smtp.starttls.required\"/c\                                <prop key=\"mail.smtp.starttls.required\">${MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED}</prop>" ${APPLICATION_CONTEXT_MAIL_FILE}
-	else
-		sed -i "/prop key=\"mail.smtp.starttls.required\"/c\                                <!-- <prop key=\"mail.smtp.starttls.required\">true</prop> -->" ${APPLICATION_CONTEXT_MAIL_FILE}
-	fi
-	
-	if [ "$MAIL_PROPERTIES_MAIL_DEBUG" != "" ]; then
-		sed -i "/prop key=\"mail.debug\"/c\                                <prop key=\"mail.debug\">${MAIL_PROPERTIES_MAIL_DEBUG}</prop>" ${APPLICATION_CONTEXT_MAIL_FILE}
-	else
-		sed -i "/prop key=\"mail.debug\"/c\                                <!-- <prop key=\"mail.debug\">true</prop> -->" ${APPLICATION_CONTEXT_MAIL_FILE}
-	fi
-	
-	if [ "$MAIL_PROPERTIES_MAIL_SMTP_FROM" != "" ]; then
-		sed -i "/prop key=\"mail.smtp.from\"/c\                                <prop key=\"mail.smtp.from\">${MAIL_PROPERTIES_MAIL_SMTP_FROM}</prop>" ${APPLICATION_CONTEXT_MAIL_FILE}
-	else
-		sed -i "/prop key=\"mail.smtp.from\"/c\                                <!-- <prop key=\"mail.smtp.from\">abc@example.com</prop> -->" ${APPLICATION_CONTEXT_MAIL_FILE}
-	fi
-fi
-
-exec /usr/local/tomcat/bin/catalina.sh run
+exec java -jar /pinpoint/pinpoint-web-boot.jar --spring.config.additional-location=/pinpoint/config/pinpoint-web.properties
--- a/pinpoint-web/docker-compose.yml
+++ b/pinpoint-web/docker-compose.yml
@@ -13,36 +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:
+      - SERVER_PORT=${SERVER_PORT}
+      - 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}
-      - HBASE_HOST=${HBASE_HOST}
-      - HBASE_PORT=${HBASE_PORT}
-      - DEBUG_LEVEL=${WEB_DEBUG_LEVEL}
+      - CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
+      - LOGGING_LEVEL_ROOT=${WEB_LOGGING_LEVEL_ROOT}
      - 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_HOST=${MAIL_HOST}
-      - MAIL_PORT=${MAIL_PORT}
-      - MAIL_USERNAME=${MAIL_USERNAME}
-      - MAIL_PASSWORD=${MAIL_PASSWORD}
-      - MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL=${MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL}
-      - MAIL_PROPERTIES_MAIL_SMTP_AUTH=${MAIL_PROPERTIES_MAIL_SMTP_AUTH}
-      - MAIL_PROPERTIES_MAIL_SMTP_PORT=${MAIL_PROPERTIES_MAIL_SMTP_PORT}
-      - MAIL_PROPERTIES_MAIL_SMTP_FROM=${MAIL_PROPERTIES_MAIL_SMTP_FROM}
-      - MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE=${MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE}
-      - MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED=${MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED}
-      - MAIL_PROPERTIES_MAIL_DEBUG=${MAIL_PROPERTIES_MAIL_DEBUG}
-
+      - ALARM_MAIL_SERVER_URL=${ALARM_MAIL_SERVER_URL}
+      - ALARM_MAIL_SERVER_PORT=${ALARM_MAIL_SERVER_PORT}
+      - ALARM_MAIL_SERVER_USERNAME=${ALARM_MAIL_SERVER_USERNAME}
+      - ALARM_MAIL_SERVER_PASSWORD=${ALARM_MAIL_SERVER_PASSWORD}
+      - ALARM_MAIL_SENDER_ADDRESS=${ALARM_MAIL_SENDER_ADDRESS}
+      - ALARM_MAIL_TRANSPORT_PROTOCOL=${ALARM_MAIL_TRANSPORT_PROTOCOL}
+      - ALARM_MAIL_SMTP_PORT=${ALARM_MAIL_SMTP_PORT}
+      - ALARM_MAIL_SMTP_AUTH=${ALARM_MAIL_SMTP_AUTH}
+      - ALARM_MAIL_SMTP_STARTTLS_ENABLE=${ALARM_MAIL_SMTP_STARTTLS_ENABLE}
+      - ALARM_MAIL_SMTP_STARTTLS_REQUIRED=${ALARM_MAIL_SMTP_STARTTLS_REQUIRED}
+      - ALARM_MAIL_DEBUG=${ALARM_MAIL_DEBUG}
--- a/pinpoint-zookeeper/docker-compose.yml
+++ b/pinpoint-zookeeper/docker-compose.yml
@@ -1,7 +1,5 @@
 version: "3.6"
-
-servidocker
-docker-compose pull && docker-compose upces:
+services:
  #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
Author	SHA1	Message	Date
Roy Kim	70f4c0a50a	[#noissue] add profile to agent	2020-10-16 14:46:40 +09:00
Roy Kim	774e74a263	[pinpoint-apm/pinpoint#7298 ] remove character	2020-10-16 11:33:46 +09:00
Roy Kim	d34c91418c	[#noissue] remove tailing full log	2020-10-13 00:30:56 +09:00
Roy Kim	e6bde6114d	[naver/pinpoint#7214 ] check last table in case interruption in table creation	2020-10-13 00:30:56 +09:00
Roy Kim	a01b34d9fe	[#89 ] fix env var ignoring bug	2020-10-12 22:26:00 +09:00
Roy Kim	558dcdb524	[#87 ] add default spring profiler value	2020-09-29 10:11:45 +09:00
Roy Kim	183778bda6	[#][naver/pinpoint#7243 ] release v2.1.0	2020-09-11 09:49:13 +09:00
Roy Kim	1e1c4f2fd1	[#noissue] update configs and typo	2020-09-11 09:25:30 +09:00
emiling	e15c6d3d48	Add checking if hbase table was created before	2020-09-10 22:09:14 +09:00
emiling	d2ad09deb8	Fix using external zookeeper ensemble in hbase	2020-09-10 22:09:14 +09:00
Roy Kim	e9e8d7bb1a	[#74 ] docker for applying spring boot to pinpoint-collector	2020-08-26 10:01:33 +09:00
Roy Kim	6bd53dcd9d	[#74 ] docker for applying spring boot to pinpoint-web	2020-08-26 10:01:33 +09:00
Roy Kim	d835497b06	[naver/pinpoint#7044 ] release v2.0.4	2020-07-23 17:29:27 +09:00
nibabooji	0a86da1c3a	[#naver/pinpoint-docker#69]Update Readme.md Line number 49 and 50 order changes.	2020-07-21 14:56:28 +09:00
Roy Kim	effff01184	[naver/pinpoint#6910 ] release v2.0.3	2020-06-19 13:54:53 +09:00
Roy Kim	cf73cb8fdc	[naver/pinpoint#6740 ] release v2.0.2	2020-04-29 12:20:43 +09:00
Roy Kim	29b24254d7	[#59 ] add default alarm feature	2020-04-02 13:06:12 +09:00
Roy Kim	0f271a1204	[#noissue] add update info	2020-04-01 10:55:34 +09:00
Roy Kim	958689031c	[#noissue] update readme	2020-04-01 10:55:34 +09:00
Roy Kim	c04acf9bca	[#53 ] change to tcp	2020-03-24 16:02:06 +09:00
Roy Kim	cc30618af8	[#53 ] expose thrift	2020-03-24 16:02:06 +09:00
Roy Kim	477fd5a665	[#naver/pinpoint#6598] fix to adapt spring profiles	2020-03-18 10:48:10 +09:00
Roy Kim	e56563c587	[#naver/pinpoint#6598] resolve tar issue	2020-03-18 10:37:14 +09:00
Roy Kim	3ea606f5df	[#naver/pinpoint#6598] add missing spring profile arg	2020-03-17 17:31:35 +09:00
Roy Kim	34cbc98aee	[#naver/pinpoint#6598] apply grpc	2020-03-17 17:31:35 +09:00
Roy Kim	bbc9d86f72	[#naver/pinpoint#6598] change hbase file location	2020-03-16 17:01:40 +09:00
Roy Kim	3748be1ab7	[#naver/pinpoint#6598] add spring profiles	2020-03-16 16:03:48 +09:00
Roy Kim	d26879d8f0	naver/pinpoint#6598 ] 2.0.1 release fix location	2020-03-16 13:00:42 +09:00
Roy Kim	bb0667b77a	[#noissue] merge lines	2020-03-16 11:41:18 +09:00
Roy Kim	3b8638280c	[naver/pinpoint#6598 ] change download location	2020-03-16 11:39:29 +09:00
Roy Kim	120e0ebffc	[naver/pinpoint#6598 ] 2.0.1 release	2020-03-13 20:27:52 +09:00
Roy Kim	336efecb9c	[naver/pinpoint#6585 ] update for release 2.0.0	2020-03-13 14:54:07 +09:00
Roy Kim	39b9e1e484	[naver/pinpoint#5998 ] update for release 1.8.5	2019-09-20 18:44:05 +09:00
Roy Kim	252f821dee	[naver/pinpoint#5602 ] update for release 1.8.4	2019-06-17 14:32:40 +09:00
Roy Kim	76fa2e939e	[#noissue] remove jar due to configuration differences	2019-05-15 19:56:57 +09:00
Roy Kim	9adcc6da1a	[naver/pinpoint#5602 ] add flink job jar	2019-05-15 14:42:22 +09:00