[naver/pinpoint#6740] release v2.0.2

.env

@@ -1,4 +1,5 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.2
+SPRING_PROFILES=release
 
 ### Pinpoint-Hbase
 
@@ -32,31 +33,39 @@ HBASE_PORT=2181
 WEB_DEBUG_LEVEL=INFO
 
 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
 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 server information required
-MAIL_USERNAME=user
+MAIL_SERVER_URL=smtp.gmail.com
-MAIL_PASSWORD=pass
+MAIL_SERVER_PORT=587
-MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL=smtp
+MAIL_SERVER_USERNAME=username
-MAIL_PROPERTIES_MAIL_SMTP_AUTH=true
+MAIL_SERVER_PASSWORD=password
-MAIL_PROPERTIES_MAIL_SMTP_PORT=587
+MAIL_SENDER_ADDRESS=pinpoint_operator@pinpoint.com
-MAIL_PROPERTIES_MAIL_SMTP_FROM=test@example.com
+MAIL_TRANSPORT_PROTOCOL=smtp
-MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE=true
+MAIL_SMTP_PORT=25
-MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED=true
+MAIL_SMTP_AUTH=false
-MAIL_PROPERTIES_MAIL_DEBUG=false
+MAIL_SMTP_STARTTLS_ENABLE=false
+MAIL_SMTP_STARTTLS_REQUIRED=false
+MAIL_DEBUG=false
+
 
 ### Pinpoint-Collector
 
 PINPOINT_COLLECTOR_NAME=pinpoint-collector
 
+COLLECTOR_RECEIVER_AGENT_PORT=9991
+COLLECTOR_RECEIVER_METADATA_PORT=9991
+COLLECTOR_RECEIVER_STAT_PORT=9992
+COLLECTOR_RECEIVER_SPAN_PORT=9993
 COLLECTOR_RECEIVER_BASE_PORT=9994
 COLLECTOR_RECEIVER_STAT_UDP_PORT=9995
 COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996
@@ -70,10 +79,20 @@ 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
 

Readme.md

@@ -13,6 +13,10 @@ It supports and helps you understand your application in a glance and allow you
 
 ## Supported Tags
 
+ - 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
@@ -87,6 +91,11 @@ Pinpoint-Flink server is running on [port 8081](http://localhost:8081/#/submit).
 Submit the jar file with *com.navercorp.pinpoint.flink.StatStreamingVer2Job* in entry class as below image.
 
 ![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
  

docker-compose.yml

@@ -47,7 +47,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}
@@ -80,6 +80,8 @@ services:
       - "9997:9997"
       - "${WEB_PAGE_PORT:-8080}:8080"
     environment:
+      - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES},batch"
+      - SPRING_PROFILES=${SPRING_PROFILES}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
       - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}
@@ -95,17 +97,17 @@ services:
       - JDBC_URL=${JDBC_URL}
       - JDBC_USERNAME=${JDBC_USERNAME}
       - JDBC_PASSWORD=${JDBC_PASSWORD}
-      - MAIL_HOST=${MAIL_HOST}
+      - MAIL_SERVER_URL=${MAIL_SERVER_URL}
-      - MAIL_PORT=${MAIL_PORT}
+      - MAIL_SERVER_PORT=${MAIL_SERVER_PORT}
-      - MAIL_USERNAME=${MAIL_USERNAME}
+      - MAIL_SERVER_USERNAME=${MAIL_SERVER_USERNAME}
-      - MAIL_PASSWORD=${MAIL_PASSWORD}
+      - MAIL_SERVER_PASSWORD=${MAIL_SERVER_PASSWORD}
-      - MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL=${MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL}
+      - MAIL_SENDER_ADDRESS=${MAIL_SENDER_ADDRESS}
-      - MAIL_PROPERTIES_MAIL_SMTP_AUTH=${MAIL_PROPERTIES_MAIL_SMTP_AUTH}
+      - MAIL_TRANSPORT_PROTOCOL=${MAIL_TRANSPORT_PROTOCOL}
-      - MAIL_PROPERTIES_MAIL_SMTP_PORT=${MAIL_PROPERTIES_MAIL_SMTP_PORT}
+      - MAIL_SMTP_PORT=${MAIL_SMTP_PORT}
-      - MAIL_PROPERTIES_MAIL_SMTP_FROM=${MAIL_PROPERTIES_MAIL_SMTP_FROM}
+      - MAIL_SMTP_AUTH=${MAIL_SMTP_AUTH}
-      - MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE=${MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE}
+      - MAIL_SMTP_STARTTLS_ENABLE=${MAIL_SMTP_STARTTLS_ENABLE}
-      - MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED=${MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED}
+      - MAIL_SMTP_STARTTLS_REQUIRED=${MAIL_SMTP_STARTTLS_REQUIRED}
-      - MAIL_PROPERTIES_MAIL_DEBUG=${MAIL_PROPERTIES_MAIL_DEBUG}
+      - MAIL_DEBUG=${MAIL_DEBUG}
     links:
       - "pinpoint-mysql:pinpoint-mysql"
     networks:
@@ -125,18 +127,28 @@ services:
       - pinpoint-hbase
     restart: always
     expose:
+      - "9991"
+      - "9992"
+      - "9993"
       - "9994"
       - "9995"
       - "9996"
     ports:
+      - "${COLLECTOR_RECEIVER_AGENT_PORT:-9991}:9991/udp"
+      - "${COLLECTOR_RECEIVER_METADATA_PORT:-9991}:9991/tcp"
+      - "${COLLECTOR_RECEIVER_STAT_PORT:-9992}:9992/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"
       - "${COLLECTOR_RECEIVER_STAT_UDP_PORT:-9995}:9995/udp"
       - "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/udp"
+
     networks:
       - pinpoint
     environment:
+      - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}"
+      - SPRING_PROFILES=${SPRING_PROFILES}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
       - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
       - HBASE_HOST=${HBASE_HOST}
@@ -157,7 +169,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 +192,15 @@ services:
     volumes:
       - data-volume:/pinpoint-agent
     environment:
+      - SPRING_PROFILES=${SPRING_PROFILES}
       - COLLECTOR_IP=${COLLECTOR_IP}
-      - COLLECTOR_TCP_PORT=${COLLECTOR_TCP_PORT}
+      - PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}
-      - COLLECTOR_STAT_PORT=${COLLECTOR_STAT_PORT}
+      - PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}
-      - COLLECTOR_SPAN_PORT=${COLLECTOR_SPAN_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
 

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

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

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

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"
 

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

@@ -1,5 +1,6 @@
 ### Pinpoint with Tomcat
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.2
+SPRING_PROFILES=release
 APP_PORT=8000
 AGENT_ID=app-in-docker
 APP_NAME=quickapp

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:

pinpoint-agent/.env

@@ -1,13 +1,23 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.2
+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
 

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

pinpoint-agent/Readme.md

@@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.0.2
+ - 2.0.1
  - 1.8.5 
  - 1.8.4
  - 1.8.3

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

@@ -2,13 +2,23 @@
 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/profiles/${SPRING_PROFILES}/pinpoint-env.config
+
 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 "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /pinpoint-agent/lib/log4j.xml
+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.agent.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.transport.grpc.metadata.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.transport.grpc.stat.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.transport.grpc.span.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
+sed -i "/profiler.sampling.rate=/ s/=.*/=${PROFILER_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint-env.config
+
+sed -i "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j.xml
 
 #ln -s  /pinpoint-agent /pinpoint-agent
 

pinpoint-agent/docker-compose.yml

@@ -17,12 +17,15 @@ services:
     volumes:
       - pinpoint-agent
     environment:
+      - SPRING_PROFILES=${SPRING_PROFILES}
       - COLLECTOR_IP=${COLLECTOR_IP}
-      - COLLECTOR_TCP_PORT=${COLLECTOR_TCP_PORT}
+      - PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}
-      - COLLECTOR_STAT_PORT=${COLLECTOR_STAT_PORT}
+      - PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}
-      - COLLECTOR_SPAN_PORT=${COLLECTOR_SPAN_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
 

pinpoint-collector/.env

@@ -1,4 +1,5 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.2
+SPRING_PROFILES=release
 
 ### Pinpoint-Collector
 
@@ -12,6 +13,10 @@ HBASE_PORT=
 
 PINPOINT_COLLECTOR_NAME=pinpoint-collector
 
+COLLECTOR_RECEIVER_AGENT_PORT=9991
+COLLECTOR_RECEIVER_METADATA_PORT=9991
+COLLECTOR_RECEIVER_STAT_PORT=9992
+COLLECTOR_RECEIVER_SPAN_PORT=9993
 COLLECTOR_RECEIVER_BASE_PORT=9994
 COLLECTOR_RECEIVER_STAT_UDP_PORT=9995
 COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996

pinpoint-collector/Dockerfile

@@ -2,9 +2,9 @@ FROM tomcat:8-jre8
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.5}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.2}
 
-ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war
+ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war
 
 COPY /build/scripts/start-collector.sh /usr/local/bin/
 

pinpoint-collector/Readme.md

@@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl
 
 ## Supported Tags
 
+ - 2.0.2
+ - 2.0.1
  - 1.8.5 
  - 1.8.4
  - 1.8.3

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

@@ -7,9 +7,9 @@ sed -i "/cluster.zookeeper.address=/ s/=.*/=${CLUSTER_ZOOKEEPER_ADDRESS}/g" /usr
 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.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/hbase.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/log4j.xml
+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
+exec /usr/local/tomcat/bin/catalina.sh run

pinpoint-collector/docker-compose.yml

@@ -13,10 +13,17 @@ services:
 
     restart: always
     expose:
+      - "9991"
+      - "9992"
+      - "9993"
       - "9994"
       - "9995"
       - "9996"
     ports:
+      - "${COLLECTOR_RECEIVER_AGENT_PORT:-9991}:9991/udp"
+      - "${COLLECTOR_RECEIVER_METADATA_PORT:-9991}:9991/tcp"
+      - "${COLLECTOR_RECEIVER_STAT_PORT:-9992}:9992/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"
@@ -24,6 +31,7 @@ services:
       - "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/udp"
 
     environment:
+      - SPRING_PROFILES=${SPRING_PROFILES}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
       - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
       - HBASE_HOST=${HBASE_HOST}

pinpoint-flink/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.2
 
 ### Pinpoint-flink
 

pinpoint-hbase/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.2
 
 ### Pinpoint-Hbase
 

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.5}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.2}
 
 ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
 ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase
@@ -19,7 +19,7 @@ RUN mkdir -p ${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 \
+    && curl -SL "https://raw.githubusercontent.com/naver/pinpoint/v${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 \

pinpoint-hbase/Readme.md

@@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.0.2
+ - 2.0.1
  - 1.8.5 
  - 1.8.4
  - 1.8.3

pinpoint-mysql/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.2
 
 ### Pinpoint-mysql
 MYSQL_ROOT_PASSWORD=root123

pinpoint-mysql/Dockerfile

@@ -1,11 +1,11 @@
 FROM mysql:5.7
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.5}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.2}
 
 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/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/$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-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

pinpoint-mysql/Readme.md

@@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat
 
 ## Supported Tags
  
+ - 2.0.2
+ - 2.0.1
  - 1.8.5
  - 1.8.4
  - 1.8.3

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}

pinpoint-quickstart/.env

@@ -1,13 +1,17 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.2
+SPRING_PROFILES=release
 
 ### Pinpoint-Agent
 
 PINPOINT_AGENT_NAME=pinpoint-agent
+
 #collector information required
 COLLECTOR_IP=
-COLLECTOR_TCP_PORT=9994
+PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=9991
-COLLECTOR_STAT_PORT=9995
+PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=9991
-COLLECTOR_SPAN_PORT=9996
+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
 

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:

pinpoint-web/.env

@@ -1,4 +1,5 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.2
+SPRING_PROFILES=release
 
 ### Pinpoint-Web
 
@@ -21,8 +22,8 @@ HBASE_PORT=
 WEB_DEBUG_LEVEL=INFO
 
 #flink server information required if used
-BATCH_ENABLE=false
+BATCH_ENABLE=true
-BATCH_SERVER_IP=127.0.0.127
+BATCH_SERVER_IP=127.0.0.1
 BATCH_FLINK_SERVER=pinpoint-flink-jobmanager
 
 CONFIG_SHOW_APPLICATIONSTAT=true
@@ -30,18 +31,18 @@ CONFIG_SHOW_APPLICATIONSTAT=true
 #mysql information required
 JDBC_DRIVER=com.mysql.jdbc.Driver
 JDBC_URL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
-JDBC_USERNAME=
+JDBC_USERNAME=admin
-JDBC_PASSWORD=
+JDBC_PASSWORD=admin
 
 #mail server information required
-MAIL_HOST=
+MAIL_SERVER_URL=smtp.gmail.com
-MAIL_PORT=
+MAIL_SERVER_PORT=587
-MAIL_USERNAME=
+MAIL_SERVER_USERNAME=username
-MAIL_PASSWORD=
+MAIL_SERVER_PASSWORD=password
-MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL=
+MAIL_SENDER_ADDRESS=pinpoint_operator@pinpoint.com
-MAIL_PROPERTIES_MAIL_SMTP_AUTH=
+MAIL_TRANSPORT_PROTOCOL=smtp
-MAIL_PROPERTIES_MAIL_SMTP_PORT=
+MAIL_SMTP_PORT=25
-MAIL_PROPERTIES_MAIL_SMTP_FROM=
+MAIL_SMTP_AUTH=false
-MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE=
+MAIL_SMTP_STARTTLS_ENABLE=false
-MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED=
+MAIL_SMTP_STARTTLS_REQUIRED=false
-MAIL_PROPERTIES_MAIL_DEBUG=
+MAIL_DEBUG=false

pinpoint-web/Dockerfile

@@ -2,20 +2,16 @@ FROM tomcat:8-jre8
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.5}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.2}
-ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war
+ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war
 
 COPY /build/scripts/start-web.sh /usr/local/bin/
-COPY /build/mail.zip /assets/mail.zip
 
 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 \
+    && 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
 
 ENTRYPOINT ["/usr/local/bin/start-web.sh"]

pinpoint-web/Readme.md

@@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio
 
 ## Supported Tags
 
+ - 2.0.2
+ - 2.0.1
  - 1.8.5 
  - 1.8.4
  - 1.8.3

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

@@ -2,84 +2,43 @@
 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_WEB_PROPERTIES=${WEB_INF_CLASSES_DIR}/pinpoint-web.properties
-APPLICATION_CONTEXT_MAIL_FILE=${WEB_INF_CLASSES_DIR}/applicationContext-mail.xml
+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
 
-echo -e "
+sed -i "/cluster.enable=/ s/=.*/=${CLUSTER_ENABLE}/" ${APPLICATION_WEB_PROPERTIES}
-jdbc.driverClassName=${JDBC_DRIVER:-com.mysql.jdbc.Driver}
+#sed -i "/cluster.zookeeper.address=/ s/=.*/=${CLUSTER_ZOOKEEPER_ADDRESS}/g" ${APPLICATION_WEB_PROPERTIES}
-jdbc.url=${JDBC_URL:-jdbc:mysql://localhost:13306/pinpoint?characterEncoding=UTF-8}
+#sed -i "/cluster.web.tcp.port=/ s/=.*/=${CLUSTER_WEB_TCP_PORT}/" ${APPLICATION_WEB_PROPERTIES}
-jdbc.username=${JDBC_USERNAME:-admin}
+sed -i "/admin.password=/ s/=.*/=${ADMIN_PASSWORD}/" ${APPLICATION_WEB_PROPERTIES}
-jdbc.password=${JDBC_PASSWORD:-admin}
+sed -i "/config.sendUsage=/ s/=.*/=${ANALYTICS}/" ${APPLICATION_WEB_PROPERTIES}
-" > ${WEB_INF_CLASSES_DIR}/jdbc.properties
+sed -i "/config.show.applicationStat=/ s/=.*/=${CONFIG_SHOW_APPLICATIONSTAT}/" ${APPLICATION_WEB_PROPERTIES}
 
-sed -i '/classpath:applicationContext-mail.xml/d' ${APPLICATION_CONTEXT_WEB_FILE}
+sed -i "/hbase.client.host=/ s/=.*/=${HBASE_HOST}/" ${APPLICATION_HBASE_PROPERTIES}
-if [ "$MAIL_HOST" != "" ]; then
+sed -i "/hbase.client.port=/ s/=.*/=${HBASE_PORT}/" ${APPLICATION_HBASE_PROPERTIES}
-    sed -i 's/<\/beans>/    <import resource="classpath:applicationContext-mail.xml" \/>\
+
-<\/beans>/' ${APPLICATION_CONTEXT_WEB_FILE}
+sed -i "/batch.enable=/ s/=.*/=${BATCH_ENABLE}/" ${APPLICATION_BATCH_PROPERTIES}
-	
+sed -i "/batch.server.ip=/ s/=.*/=${BATCH_SERVER_IP}/" ${APPLICATION_BATCH_PROPERTIES}
-	sed -i "/name=\"host\"/c\                <property name=\"host\" value=\"${MAIL_HOST}\" />" ${APPLICATION_CONTEXT_MAIL_FILE}
+sed -i "/batch.flink.server=/ s/=.*/=${BATCH_FLINK_SERVER}/" ${APPLICATION_BATCH_PROPERTIES}
-	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 "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/profiles/${SPRING_PROFILES}/log4j.xml
-	sed -i "/name=\"password\"/c\                <property name=\"password\" value=\"${MAIL_PASSWORD}\" />" ${APPLICATION_CONTEXT_MAIL_FILE}
+sed -i "/jdbc.driverClassName=/ s/=.*/=${JDBC_DRIVER:-com.mysql.jdbc.Driver}/" ${APPLICATION_JDBC_PROPERTIES}
-	
+sed -i "/jdbc.url=/ s/=.*/=${JDBC_URL//\//\\/}/" ${APPLICATION_JDBC_PROPERTIES}
-	if [ "$MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL" != "" ]; then
+sed -i "/jdbc.username=/ s/=.*/=${JDBC_USERNAME:-admin}/" ${APPLICATION_JDBC_PROPERTIES}
-		sed -i "/prop key=\"mail.transport.protocol\"/c\                                <prop key=\"mail.transport.protocol\">${MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL}</prop>" ${APPLICATION_CONTEXT_MAIL_FILE}
+sed -i "/jdbc.password=/ s/=.*/=${JDBC_PASSWORD:-admin}/" ${APPLICATION_JDBC_PROPERTIES}
-	else
+
-		sed -i "/prop key=\"mail.transport.protocol\"/c\                                <!-- <prop key=\"mail.transport.protocol\">smtp</prop> -->" ${APPLICATION_CONTEXT_MAIL_FILE}
+sed -i "/alarm.mail.server.url=/ s/=.*/=${MAIL_SERVER_URL}/" ${APPLICATION_BATCH_PROPERTIES}
-	fi
+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}
-	if [ "$MAIL_PROPERTIES_MAIL_SMTP_PORT" != "" ]; then
+sed -i "/alarm.mail.server.password=/ s/=.*/=${MAIL_SERVER_PASSWORD}/" ${APPLICATION_BATCH_PROPERTIES}
-		sed -i "/prop key=\"mail.smtp.port\"/c\                                <prop key=\"mail.smtp.port\">${MAIL_PROPERTIES_MAIL_SMTP_PORT}</prop>" ${APPLICATION_CONTEXT_MAIL_FILE}
+sed -i "/alarm.mail.sender.address=/ s/=.*/=${MAIL_SENDER_ADDRESS:-pinpoint_operator@pinpoint.com}/" ${APPLICATION_BATCH_PROPERTIES}
-	else
+
-		sed -i "/prop key=\"mail.smtp.port\"/c\                                <!-- <prop key=\"mail.smtp.port\">25</prop> -->" ${APPLICATION_CONTEXT_MAIL_FILE}
+sed -i "/alarm.mail.transport.protocol=/ s/=.*/=${MAIL_TRANSPORT_PROTOCOL:-smtp}/" ${APPLICATION_BATCH_PROPERTIES}
-	fi
+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}
-	if [ "$MAIL_PROPERTIES_MAIL_SMTP_AUTH" != "" ]; then
+sed -i "/alarm.mail.smtp.starttls.enable=/ s/=.*/=${MAIL_SMTP_STARTTLS_ENABLE:-false}/" ${APPLICATION_BATCH_PROPERTIES}
-		sed -i "/prop key=\"mail.smtp.auth\"/c\                                <prop key=\"mail.smtp.auth\">${MAIL_PROPERTIES_MAIL_SMTP_AUTH}</prop>" ${APPLICATION_CONTEXT_MAIL_FILE}
+sed -i "/alarm.mail.smtp.starttls.required=/ s/=.*/=${MAIL_SMTP_STARTTLS_REQUIRED:-false}/" ${APPLICATION_BATCH_PROPERTIES}
-	else
+sed -i "/alarm.mail.debug=/ s/=.*/=${MAIL_DEBUG:-false}/" ${APPLICATION_BATCH_PROPERTIES}
-		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

pinpoint-web/docker-compose.yml

@@ -19,6 +19,8 @@ services:
       - "9997:9997"
       - "${WEB_PAGE_PORT:-8080}:8080"
     environment:
+      - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES},batch"
+      - SPRING_PROFILES=${SPRING_PROFILES}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
       - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}
@@ -34,15 +36,14 @@ services:
       - JDBC_URL=${JDBC_URL}
       - JDBC_USERNAME=${JDBC_USERNAME}
       - JDBC_PASSWORD=${JDBC_PASSWORD}
-      - MAIL_HOST=${MAIL_HOST}
+      - MAIL_SERVER_URL=${MAIL_SERVER_URL}
-      - MAIL_PORT=${MAIL_PORT}
+      - MAIL_SERVER_PORT=${MAIL_SERVER_PORT}
-      - MAIL_USERNAME=${MAIL_USERNAME}
+      - MAIL_SERVER_USERNAME=${MAIL_SERVER_USERNAME}
-      - MAIL_PASSWORD=${MAIL_PASSWORD}
+      - MAIL_SERVER_PASSWORD=${MAIL_SERVER_PASSWORD}
-      - MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL=${MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL}
+      - MAIL_SENDER_ADDRESS=${MAIL_SENDER_ADDRESS}
-      - MAIL_PROPERTIES_MAIL_SMTP_AUTH=${MAIL_PROPERTIES_MAIL_SMTP_AUTH}
+      - MAIL_TRANSPORT_PROTOCOL=${MAIL_TRANSPORT_PROTOCOL}
-      - MAIL_PROPERTIES_MAIL_SMTP_PORT=${MAIL_PROPERTIES_MAIL_SMTP_PORT}
+      - MAIL_SMTP_PORT=${MAIL_SMTP_PORT}
-      - MAIL_PROPERTIES_MAIL_SMTP_FROM=${MAIL_PROPERTIES_MAIL_SMTP_FROM}
+      - MAIL_SMTP_AUTH=${MAIL_SMTP_AUTH}
-      - MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE=${MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE}
+      - MAIL_SMTP_STARTTLS_ENABLE=${MAIL_SMTP_STARTTLS_ENABLE}
-      - MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED=${MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED}
+      - MAIL_SMTP_STARTTLS_REQUIRED=${MAIL_SMTP_STARTTLS_REQUIRED}
-      - MAIL_PROPERTIES_MAIL_DEBUG=${MAIL_PROPERTIES_MAIL_DEBUG}
+      - MAIL_DEBUG=${MAIL_DEBUG}
-