From 054caf1ff39e00358f89c71a516a61bde9c4edec Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Fri, 14 Sep 2018 15:31:03 +0900 Subject: [PATCH 01/13] update for release 1.8.0 --- .env | 2 +- Readme.md | 1 + pinpoint-agent-attach-example/java/.env | 2 +- pinpoint-agent-attach-example/tomcat/.env | 2 +- pinpoint-agent/.env | 2 +- pinpoint-agent/Dockerfile | 2 +- pinpoint-agent/Readme.md | 1 + pinpoint-collector/.env | 2 +- pinpoint-collector/Dockerfile | 2 +- pinpoint-collector/Readme.md | 1 + pinpoint-flink/.env | 2 +- pinpoint-hbase/.env | 2 +- pinpoint-hbase/Dockerfile | 2 +- pinpoint-hbase/Readme.md | 1 + pinpoint-quickstart/.env | 2 +- pinpoint-web/.env | 2 +- pinpoint-web/Dockerfile | 2 +- pinpoint-web/Readme.md | 1 + 18 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.env b/.env index a4242d4..8954fca 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.7.3 +PINPOINT_VERSION=1.8.0 ### Pinpoint-Hbase diff --git a/Readme.md b/Readme.md index 369cc6e..c3e839b 100644 --- a/Readme.md +++ b/Readme.md @@ -13,6 +13,7 @@ It supports and helps you understand your application in a glance and allow you ## Supported Tags + - 1.8.0 - 1.7.3 - 1.7.2 diff --git a/pinpoint-agent-attach-example/java/.env b/pinpoint-agent-attach-example/java/.env index 787821e..754c4de 100644 --- a/pinpoint-agent-attach-example/java/.env +++ b/pinpoint-agent-attach-example/java/.env @@ -1,4 +1,4 @@ ### Pinpoint with Java -PINPOINT_VERSION=1.7.3 +PINPOINT_VERSION=1.8.0 AGENT_ID=app-in-docker APP_NAME=quickapp \ No newline at end of file diff --git a/pinpoint-agent-attach-example/tomcat/.env b/pinpoint-agent-attach-example/tomcat/.env index 6fbdf96..ca1fbc0 100644 --- a/pinpoint-agent-attach-example/tomcat/.env +++ b/pinpoint-agent-attach-example/tomcat/.env @@ -1,5 +1,5 @@ ### Pinpoint with Tomcat -PINPOINT_VERSION=1.7.3 +PINPOINT_VERSION=1.8.0 APP_PORT=8000 AGENT_ID=app-in-docker APP_NAME=quickapp \ No newline at end of file diff --git a/pinpoint-agent/.env b/pinpoint-agent/.env index 397be74..f55abdc 100644 --- a/pinpoint-agent/.env +++ b/pinpoint-agent/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.7.3 +PINPOINT_VERSION=1.8.0 ### Pinpoint-Agent diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile index b3d010a..8deefb4 100644 --- a/pinpoint-agent/Dockerfile +++ b/pinpoint-agent/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.7.3} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz COPY /build/scripts/configure-agent.sh /usr/local/bin/ diff --git a/pinpoint-agent/Readme.md b/pinpoint-agent/Readme.md index 0e557c4..cc8317f 100644 --- a/pinpoint-agent/Readme.md +++ b/pinpoint-agent/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat ## Supported Tags + - 1.8.0 - 1.7.3 - 1.7.2 diff --git a/pinpoint-collector/.env b/pinpoint-collector/.env index 9148d8f..67196b7 100644 --- a/pinpoint-collector/.env +++ b/pinpoint-collector/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.7.3 +PINPOINT_VERSION=1.8.0 ### Pinpoint-Collector diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index 4fddfd6..2387bdc 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -2,7 +2,7 @@ FROM tomcat:8-jre8 LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.7.3} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war diff --git a/pinpoint-collector/Readme.md b/pinpoint-collector/Readme.md index d903c7d..13c46d2 100644 --- a/pinpoint-collector/Readme.md +++ b/pinpoint-collector/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl ## Supported Tags + - 1.8.0 - 1.7.3 - 1.7.2 diff --git a/pinpoint-flink/.env b/pinpoint-flink/.env index 1635ede..c59abf8 100644 --- a/pinpoint-flink/.env +++ b/pinpoint-flink/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.7.3 +PINPOINT_VERSION=1.8.0 ### Pinpoint-flink diff --git a/pinpoint-hbase/.env b/pinpoint-hbase/.env index 2df44ea..8be2aaf 100644 --- a/pinpoint-hbase/.env +++ b/pinpoint-hbase/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.7.3 +PINPOINT_VERSION=1.8.0 ### Pinpoint-Hbase diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile index 851c9e7..8533c4c 100644 --- a/pinpoint-hbase/Dockerfile +++ b/pinpoint-hbase/Dockerfile @@ -2,7 +2,7 @@ FROM java:8-jdk LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.7.3} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0} ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase diff --git a/pinpoint-hbase/Readme.md b/pinpoint-hbase/Readme.md index 3205816..d8228aa 100644 --- a/pinpoint-hbase/Readme.md +++ b/pinpoint-hbase/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat ## Supported Tags + - 1.8.0 - 1.7.3 - 1.7.2 diff --git a/pinpoint-quickstart/.env b/pinpoint-quickstart/.env index 8f245fe..2e4d076 100644 --- a/pinpoint-quickstart/.env +++ b/pinpoint-quickstart/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.7.3 +PINPOINT_VERSION=1.8.0 ### Pinpoint-Agent diff --git a/pinpoint-web/.env b/pinpoint-web/.env index 0086a72..5f766ac 100644 --- a/pinpoint-web/.env +++ b/pinpoint-web/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.7.3 +PINPOINT_VERSION=1.8.0 ### Pinpoint-Web diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index 8a223d9..e51d805 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -2,7 +2,7 @@ FROM tomcat:8-jre8 LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.7.3} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war COPY /build/scripts/start-web.sh /usr/local/bin/ diff --git a/pinpoint-web/Readme.md b/pinpoint-web/Readme.md index eb7dbd1..2d8ccec 100644 --- a/pinpoint-web/Readme.md +++ b/pinpoint-web/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio ## Supported Tags + - 1.8.0 - 1.7.3 - 1.7.2 From 58082ee69eb841063f5035ae2612d3a764e99adc Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Tue, 30 Oct 2018 18:23:18 +0900 Subject: [PATCH 02/13] update guide --- Readme.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Readme.md b/Readme.md index c3e839b..bf0fcac 100644 --- a/Readme.md +++ b/Readme.md @@ -41,10 +41,11 @@ This will install and run all services required to run all features in Pinpoint - Pinpoint-QuickStart(a sample application) This may take several minutes to download all necessary images. -You can modify `QuickStart` application part with your application to start monitoring. -(see [`Monitoring YOUR Application`](#monitoring-your-application) part for further details). +You can replace `QuickStart` application part with your application to start monitoring. + - check [`Testing QuickStart application`](#testing-quickstart-application) for a quick demo of pinpoint + - check [`Monitoring YOUR Application`](#monitoring-your-application) part for further details -### Flink configuration +### Flink configuration (optional) 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. @@ -60,7 +61,9 @@ 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) -Now you are ready to monitor the sample application(Pinpoint-QuickStart) provided. +### Testing QuickStart application + +Now you are ready to monitor the sample application(Pinpoint-QuickStart [port 8000](http://localhost:8000)) provided. If you can't find any connected application from Pinpoint-Web's first page([port 8079](http://localhost:8079) as default), don't panic and wait for a while. It will take some time for Pinpoint to retrieve the application's information when running for the first time. From 54504dc4ff21aadfea861b47cd89fe72ac86b5e6 Mon Sep 17 00:00:00 2001 From: Marcos Alexandre de Melo Medeiros Date: Tue, 18 Dec 2018 13:48:28 -0300 Subject: [PATCH 03/13] Send alarms by email Addition of mysql container with pinpoint database to allow the registration of users, groups and alarms. Including lib, implementation of AlarmMessageSender and settings in the pinpoint-web container to allow sending alert emails. --- docker-compose.yml | 43 ++++++++++++++++ pinpoint-mysql/Dockerfile | 11 +++++ pinpoint-web/Dockerfile | 6 ++- pinpoint-web/build/mail.zip | Bin 0 -> 3959 bytes pinpoint-web/build/scripts/start-web.sh | 63 ++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 pinpoint-mysql/Dockerfile create mode 100644 pinpoint-web/build/mail.zip diff --git a/docker-compose.yml b/docker-compose.yml index c7dc35c..fd58229 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,6 +35,30 @@ services: - "16030:16030" restart: always + pinpoint-mysql: + build: + context: ./pinpoint-mysql/ + dockerfile: Dockerfile + args: + - PINPOINT_VERSION=${PINPOINT_VERSION} + + container_name: pinpoint-mysql + restart: always + image: pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION} + hostname: pinpoint-mysql + ports: + - "13306:3306" + environment: + MYSQL_ROOT_PASSWORD: root123 + MYSQL_USER: admin + MYSQL_PASSWORD: admin + MYSQL_DATABASE: pinpoint + + volumes: + - mysql_data:/var/lib/mysql + networks: + - pinpoint + pinpoint-web: build: context: ./pinpoint-web/ @@ -47,6 +71,7 @@ services: depends_on: - pinpoint-hbase + - pinpoint-mysql restart: always expose: - "8080" @@ -66,6 +91,23 @@ services: - BATCH_ENABLE=${BATCH_ENABLE} - BATCH_SERVER_IP=${BATCH_SERVER_IP} - BATCH_FLINK_SERVER=${BATCH_FLINK_SERVER} + - 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_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='true' + links: + - "pinpoint-mysql:pinpoint-mysql" networks: - pinpoint @@ -215,6 +257,7 @@ services: volumes: data-volume: + mysql_data: networks: pinpoint: diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile new file mode 100644 index 0000000..dba9d2b --- /dev/null +++ b/pinpoint-mysql/Dockerfile @@ -0,0 +1,11 @@ +FROM mysql:5.7 + +ENV PINPOINT_VERSION=1.8.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" \ + && 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 diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index e51d805..e295197 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -6,12 +6,16 @@ ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${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"] diff --git a/pinpoint-web/build/mail.zip b/pinpoint-web/build/mail.zip new file mode 100644 index 0000000000000000000000000000000000000000..851516bf54f1f3cb8ce967a2b9430270b6c24b3a GIT binary patch literal 3959 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/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>/ \ +<\/beans>/' ${APPLICATION_CONTEXT_WEB_FILE} + + sed -i "/name=\"host\"/c\ " ${APPLICATION_CONTEXT_MAIL_FILE} + sed -i "/name=\"port\"/c\ " ${APPLICATION_CONTEXT_MAIL_FILE} + sed -i "/name=\"username\"/c\ " ${APPLICATION_CONTEXT_MAIL_FILE} + sed -i "/name=\"password\"/c\ " ${APPLICATION_CONTEXT_MAIL_FILE} + + if [ "$MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL" != "" ]; then + sed -i "/prop key=\"mail.transport.protocol\"/c\ ${MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL}" ${APPLICATION_CONTEXT_MAIL_FILE} + else + sed -i "/prop key=\"mail.transport.protocol\"/c\ " ${APPLICATION_CONTEXT_MAIL_FILE} + fi + + if [ "$MAIL_PROPERTIES_MAIL_SMTP_PORT" != "" ]; then + sed -i "/prop key=\"mail.smtp.port\"/c\ ${MAIL_PROPERTIES_MAIL_SMTP_PORT}" ${APPLICATION_CONTEXT_MAIL_FILE} + else + sed -i "/prop key=\"mail.smtp.port\"/c\ " ${APPLICATION_CONTEXT_MAIL_FILE} + fi + + if [ "$MAIL_PROPERTIES_MAIL_SMTP_AUTH" != "" ]; then + sed -i "/prop key=\"mail.smtp.auth\"/c\ ${MAIL_PROPERTIES_MAIL_SMTP_AUTH}" ${APPLICATION_CONTEXT_MAIL_FILE} + else + sed -i "/prop key=\"mail.smtp.auth\"/c\ " ${APPLICATION_CONTEXT_MAIL_FILE} + fi + + if [ "$MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE" != "" ]; then + sed -i "/prop key=\"mail.smtp.starttls.enable\"/c\ ${MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE}" ${APPLICATION_CONTEXT_MAIL_FILE} + else + sed -i "/prop key=\"mail.smtp.starttls.enable\"/c\ " ${APPLICATION_CONTEXT_MAIL_FILE} + fi + + if [ "$MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED" != "" ]; then + sed -i "/prop key=\"mail.smtp.starttls.required\"/c\ ${MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED}" ${APPLICATION_CONTEXT_MAIL_FILE} + else + sed -i "/prop key=\"mail.smtp.starttls.required\"/c\ " ${APPLICATION_CONTEXT_MAIL_FILE} + fi + + if [ "$MAIL_PROPERTIES_MAIL_DEBUG" != "" ]; then + sed -i "/prop key=\"mail.debug\"/c\ ${MAIL_PROPERTIES_MAIL_DEBUG}" ${APPLICATION_CONTEXT_MAIL_FILE} + else + sed -i "/prop key=\"mail.debug\"/c\ " ${APPLICATION_CONTEXT_MAIL_FILE} + fi + + if [ "$MAIL_PROPERTIES_MAIL_SMTP_FROM" != "" ]; then + sed -i "/prop key=\"mail.smtp.from\"/c\ ${MAIL_PROPERTIES_MAIL_SMTP_FROM}" ${APPLICATION_CONTEXT_MAIL_FILE} + else + sed -i "/prop key=\"mail.smtp.from\"/c\ " ${APPLICATION_CONTEXT_MAIL_FILE} + fi +fi exec /usr/local/tomcat/bin/catalina.sh run From 1d28f4dad31e9ea8a36a4045e5304af747a5de29 Mon Sep 17 00:00:00 2001 From: qudongfang Date: Thu, 13 Dec 2018 21:29:56 +0800 Subject: [PATCH 04/13] Update readme. --- Readme.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index bf0fcac..c1e7b27 100644 --- a/Readme.md +++ b/Readme.md @@ -17,6 +17,10 @@ It supports and helps you understand your application in a glance and allow you - 1.7.3 - 1.7.2 +## Requirements + +- [docker 18.02.0+](https://docs.docker.com/compose/compose-file/) + ## How to install Pinpoint? You can easily bring up an entire Dockerized Pinpoint(latest release) environment by using [Docker Compose](https://docs.docker.com/compose/) with any of the provided `docker-compose.yml` files as below. @@ -25,7 +29,7 @@ To monitor your agent see [configuration part](#configurations) for further deta ``` git clone https://github.com/naver/pinpoint-docker.git -cd Pinpoint-Docker +cd pinpoint-docker docker-compose pull && docker-compose up -d ``` If you'd like to bring up the previous release. Try with docker-compose file from other tags. From e88cdfe2d8f532afc290eb02c9f1d68a8ef37170 Mon Sep 17 00:00:00 2001 From: Marcos Alexandre de Melo Medeiros Date: Wed, 19 Dec 2018 15:09:07 -0300 Subject: [PATCH 05/13] Put parameters in .env files Put all the parameters in .env files Update readme file --- .env | 22 ++++++++++++++++++- Readme.md | 11 +++++++++- docker-compose.yml | 38 ++++++++++++++++----------------- pinpoint-mysql/.env | 1 + pinpoint-mysql/Dockerfile | 2 +- pinpoint-web/.env | 19 +++++++++++++++++ pinpoint-web/docker-compose.yml | 15 +++++++++++++ 7 files changed, 86 insertions(+), 22 deletions(-) create mode 100644 pinpoint-mysql/.env diff --git a/.env b/.env index 8954fca..07d7d4f 100644 --- a/.env +++ b/.env @@ -6,6 +6,11 @@ PINPOINT_HBASE_NAME=pinpoint-hbase #config for hbase in external docker EXTERNAL_HBASE_PORT=2180 +### Pinpoint-mysql +MYSQL_ROOT_PASSWORD=root123 +MYSQL_USER=admin +MYSQL_PASSWORD=admin +MYSQL_DATABASE=pinpoint ### Pinpoint-Web @@ -32,6 +37,21 @@ BATCH_FLINK_SERVER=pinpoint-flink-jobmanager CONFIG_SHOW_APPLICATIONSTAT=true +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_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 ### Pinpoint-Collector @@ -71,4 +91,4 @@ FLINK_WEB_PORT=8081 ### Pinpoint-quickstart -APP_PORT=8000 \ No newline at end of file +APP_PORT=8000 diff --git a/Readme.md b/Readme.md index bf0fcac..120b9ee 100644 --- a/Readme.md +++ b/Readme.md @@ -38,13 +38,22 @@ This will install and run all services required to run all features in Pinpoint - Pinpoint-Flink - Pinpoint-Zookeeper - Pinpoint-Hbase - - Pinpoint-QuickStart(a sample application) + - Pinpoint-QuickStart(a sample application) + - Pinpoint-Mysql This may take several minutes to download all necessary images. You can replace `QuickStart` application part with your application to start monitoring. - check [`Testing QuickStart application`](#testing-quickstart-application) for a quick demo of pinpoint - check [`Monitoring YOUR Application`](#monitoring-your-application) part for further details +### Mysql (optional) + +The Pinpoint-Mysql server is running on port 13306 and contains the data structure used to register users, groups, and alerts to be sent. + +To send email alerts, you must make BATCH_ENABLE=true and change the other mail-related environment variables (MAIL_HOST, MAIL_PORT, MAIL_USERNAME, MAIL_PASSWORD, MAIL_PROPERTIES_MAIL_SMTP_FROM, ...) to the Pinpoint-Web server in *.env* file. + +For more information see [Setting Alarm](http://naver.github.io/pinpoint/alarm.html) in Pinpoint documentation. + ### Flink configuration (optional) After all containers are started and ready to go. There is one more thing to do to use all existing features in Pinpoint. diff --git a/docker-compose.yml b/docker-compose.yml index fd58229..c194a3c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,10 +49,10 @@ services: ports: - "13306:3306" environment: - MYSQL_ROOT_PASSWORD: root123 - MYSQL_USER: admin - MYSQL_PASSWORD: admin - MYSQL_DATABASE: pinpoint + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} volumes: - mysql_data:/var/lib/mysql @@ -91,21 +91,21 @@ services: - BATCH_ENABLE=${BATCH_ENABLE} - BATCH_SERVER_IP=${BATCH_SERVER_IP} - BATCH_FLINK_SERVER=${BATCH_FLINK_SERVER} - - 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_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='true' + - JDBC_DRIVER=${JDBC_DRIVER} + - 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} links: - "pinpoint-mysql:pinpoint-mysql" networks: diff --git a/pinpoint-mysql/.env b/pinpoint-mysql/.env new file mode 100644 index 0000000..f54d43d --- /dev/null +++ b/pinpoint-mysql/.env @@ -0,0 +1 @@ +PINPOINT_VERSION=1.8.0 \ No newline at end of file diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile index dba9d2b..3d8f87f 100644 --- a/pinpoint-mysql/Dockerfile +++ b/pinpoint-mysql/Dockerfile @@ -1,6 +1,6 @@ FROM mysql:5.7 -ENV PINPOINT_VERSION=1.8.0 +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0} RUN apt update \ && apt-get install -y --no-install-recommends ca-certificates wget \ diff --git a/pinpoint-web/.env b/pinpoint-web/.env index 5f766ac..ff33195 100644 --- a/pinpoint-web/.env +++ b/pinpoint-web/.env @@ -26,3 +26,22 @@ BATCH_SERVER_IP=127.0.0.127 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= +JDBC_PASSWORD= + +#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= \ No newline at end of file diff --git a/pinpoint-web/docker-compose.yml b/pinpoint-web/docker-compose.yml index 4db45e3..d23b185 100644 --- a/pinpoint-web/docker-compose.yml +++ b/pinpoint-web/docker-compose.yml @@ -30,4 +30,19 @@ services: - BATCH_ENABLE=${BATCH_ENABLE} - BATCH_SERVER_IP=${BATCH_SERVER_IP} - BATCH_FLINK_SERVER=${BATCH_FLINK_SERVER} + - JDBC_DRIVER=${JDBC_DRIVER} + - 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} From dfe67e2e5e78a8dd53890508387d457f09b96d03 Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Thu, 20 Dec 2018 16:50:16 +0900 Subject: [PATCH 06/13] [#noissue] update readme on pinpoint-mysql --- Readme.md | 12 +++++++----- pinpoint-mysql/Readme.md | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 pinpoint-mysql/Readme.md diff --git a/Readme.md b/Readme.md index bb1f9e1..c867a4a 100644 --- a/Readme.md +++ b/Readme.md @@ -38,12 +38,12 @@ You can also just build the image with `docker-compose up -d` command without pu This will install and run all services required to run all features in Pinpoint in docker containers joined with same network. - Pinpoint-Web Server - Pinpoint-Collector - - Pinpoint-Agent(ready to be used) - - Pinpoint-Flink + - Pinpoint-Agent + - Pinpoint-Flink(just for certain feature) - Pinpoint-Zookeeper - Pinpoint-Hbase - Pinpoint-QuickStart(a sample application) - - Pinpoint-Mysql + - Pinpoint-Mysql(just for certain feature) This may take several minutes to download all necessary images. You can replace `QuickStart` application part with your application to start monitoring. @@ -52,14 +52,16 @@ You can replace `QuickStart` application part with your application to start mon ### Mysql (optional) -The Pinpoint-Mysql server is running on port 13306 and contains the data structure used to register users, groups, and alerts to be sent. +The Pinpoint-Mysql is necessary to use 'Alarm' feature. It's server is running on port 13306 and contains the data structure used to register users, groups, and alerts to be sent. To send email alerts, you must make BATCH_ENABLE=true and change the other mail-related environment variables (MAIL_HOST, MAIL_PORT, MAIL_USERNAME, MAIL_PASSWORD, MAIL_PROPERTIES_MAIL_SMTP_FROM, ...) to the Pinpoint-Web server in *.env* file. -For more information see [Setting Alarm](http://naver.github.io/pinpoint/alarm.html) in Pinpoint documentation. +For more information checkout [Setting Alarm](http://naver.github.io/pinpoint/alarm.html) in Pinpoint documentation. ### Flink configuration (optional) +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. diff --git a/pinpoint-mysql/Readme.md b/pinpoint-mysql/Readme.md new file mode 100644 index 0000000..91168c2 --- /dev/null +++ b/pinpoint-mysql/Readme.md @@ -0,0 +1,38 @@ + +## Pinpoint Mysql + +This Docker image contains the Pinpoint Mysql component of the Pinpoint application monitoring system. + +## Supported Tags + + - 1.8.0 + - 1.7.3 + - 1.7.2 + +Please see [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image. + +## Any Issues or Suggestions? + +Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/pinpoint/issues). +Contributions on the pinpoint-docker image is also always welcome. + +## License + +Pinpoint is licensed under the Apache License, Version 2.0. +See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text. + +``` +Copyright 2018 NAVER Corp. + +Licensed 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. +``` \ No newline at end of file From 6e863a52ac93e4511ec94eb6eeb3295b6a141ced Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Mon, 24 Dec 2018 11:42:11 +0900 Subject: [PATCH 07/13] [#5] supplements for mysql --- docker-compose.yml | 2 +- pinpoint-mysql/.env | 8 +++++++- pinpoint-mysql/docker-compose.yml | 25 +++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 pinpoint-mysql/docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml index c194a3c..84c419a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: container_name: pinpoint-mysql restart: always - image: pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION} + image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}" hostname: pinpoint-mysql ports: - "13306:3306" diff --git a/pinpoint-mysql/.env b/pinpoint-mysql/.env index f54d43d..ac6c27b 100644 --- a/pinpoint-mysql/.env +++ b/pinpoint-mysql/.env @@ -1 +1,7 @@ -PINPOINT_VERSION=1.8.0 \ No newline at end of file +PINPOINT_VERSION=1.8.0 + +### Pinpoint-mysql +MYSQL_ROOT_PASSWORD=root123 +MYSQL_USER=admin +MYSQL_PASSWORD=admin +MYSQL_DATABASE=pinpoint \ No newline at end of file diff --git a/pinpoint-mysql/docker-compose.yml b/pinpoint-mysql/docker-compose.yml new file mode 100644 index 0000000..2a04ccf --- /dev/null +++ b/pinpoint-mysql/docker-compose.yml @@ -0,0 +1,25 @@ +version: "3.6" + +services: + pinpoint-mysql: + build: + context: . + dockerfile: Dockerfile + args: + - PINPOINT_VERSION=${PINPOINT_VERSION} + + container_name: pinpoint-mysql + restart: always + image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}" + + hostname: pinpoint-mysql + ports: + - "13306:3306" + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + + volumes: + - ./var/lib/mysql From d2401c2858688900251dfb77a3aec3949121bfa3 Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Mon, 24 Dec 2018 12:51:32 +0900 Subject: [PATCH 08/13] [#5] disable until 1.8.1 release --- Readme.md | 8 ++++---- docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Readme.md b/Readme.md index c867a4a..40410ac 100644 --- a/Readme.md +++ b/Readme.md @@ -39,18 +39,18 @@ This will install and run all services required to run all features in Pinpoint - Pinpoint-Web Server - Pinpoint-Collector - Pinpoint-Agent - - Pinpoint-Flink(just for certain feature) + - Pinpoint-Flink(to support certain feature) - Pinpoint-Zookeeper - Pinpoint-Hbase - - Pinpoint-QuickStart(a sample application) - - Pinpoint-Mysql(just for certain feature) + - Pinpoint-QuickStart(a sample application, 1.8.1+) + - Pinpoint-Mysql(to support certain feature) This may take several minutes to download all necessary images. You can replace `QuickStart` application part with your application to start monitoring. - check [`Testing QuickStart application`](#testing-quickstart-application) for a quick demo of pinpoint - check [`Monitoring YOUR Application`](#monitoring-your-application) part for further details -### Mysql (optional) +### Mysql (optional, 1.8.1+) The Pinpoint-Mysql is necessary to use 'Alarm' feature. It's server is running on port 13306 and contains the data structure used to register users, groups, and alerts to be sent. diff --git a/docker-compose.yml b/docker-compose.yml index 84c419a..2b33d8c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: container_name: pinpoint-mysql restart: always - image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}" +# image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}" hostname: pinpoint-mysql ports: - "13306:3306" From aa88170e6500cba496f9fb356b7b4d6bde8b4363 Mon Sep 17 00:00:00 2001 From: jokimina Date: Sun, 23 Dec 2018 16:02:57 +0800 Subject: [PATCH 09/13] Fix pinpoint-hbase error "invalid volume specification" --- docker-compose.yml | 4 ++-- pinpoint-hbase/docker-compose.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2b33d8c..ccc9b53 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,8 +14,8 @@ services: - pinpoint volumes: - - ./home/pinpoint/hbase - - ./home/pinpoint/zookeeper + - /home/pinpoint/hbase + - /home/pinpoint/zookeeper expose: # zookeeper - "2181" diff --git a/pinpoint-hbase/docker-compose.yml b/pinpoint-hbase/docker-compose.yml index 6cad950..2e9583e 100644 --- a/pinpoint-hbase/docker-compose.yml +++ b/pinpoint-hbase/docker-compose.yml @@ -12,8 +12,8 @@ services: image: "pinpointdocker/pinpoint-hbase:${PINPOINT_VERSION}" volumes: - - ./home/pinpoint/hbase - - ./home/pinpoint/zookeeper + - /home/pinpoint/hbase + - /home/pinpoint/zookeeper expose: # zookeeper - "2181" @@ -31,4 +31,4 @@ services: - "16010:16010" - "60020:60020" - "16030:16030" - restart: always \ No newline at end of file + restart: always From ab9cad918c9028184ab8a83b3dee1a0fc3e71676 Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Thu, 17 Jan 2019 11:14:39 +0900 Subject: [PATCH 10/13] [#5] enable alarm --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ccc9b53..6375a12 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: container_name: pinpoint-mysql restart: always -# image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}" + image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}" hostname: pinpoint-mysql ports: - "13306:3306" From 8afcad07b29560570b0c04ff11f7fe60729cea80 Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Thu, 17 Jan 2019 11:29:26 +0900 Subject: [PATCH 11/13] [naver/pinpoint#5061] update for release 1.8.1 --- .env | 2 +- Readme.md | 13 +++++++++++-- pinpoint-agent-attach-example/java/.env | 2 +- pinpoint-agent-attach-example/tomcat/.env | 2 +- pinpoint-agent/.env | 2 +- pinpoint-agent/Dockerfile | 2 +- pinpoint-agent/Readme.md | 1 + pinpoint-collector/.env | 2 +- pinpoint-collector/Dockerfile | 2 +- pinpoint-collector/Readme.md | 1 + pinpoint-flink/.env | 2 +- pinpoint-hbase/.env | 2 +- pinpoint-hbase/Dockerfile | 2 +- pinpoint-hbase/Readme.md | 1 + pinpoint-mysql/.env | 2 +- pinpoint-mysql/Dockerfile | 2 +- pinpoint-mysql/Readme.md | 1 + pinpoint-quickstart/.env | 2 +- pinpoint-web/.env | 2 +- pinpoint-web/Dockerfile | 2 +- pinpoint-web/Readme.md | 1 + 21 files changed, 31 insertions(+), 17 deletions(-) diff --git a/.env b/.env index 07d7d4f..add6e88 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.0 +PINPOINT_VERSION=1.8.1 ### Pinpoint-Hbase diff --git a/Readme.md b/Readme.md index 40410ac..d7457ab 100644 --- a/Readme.md +++ b/Readme.md @@ -13,6 +13,7 @@ It supports and helps you understand your application in a glance and allow you ## Supported Tags + - 1.8.1 - 1.8.0 - 1.7.3 - 1.7.2 @@ -32,8 +33,16 @@ git clone https://github.com/naver/pinpoint-docker.git cd pinpoint-docker docker-compose pull && docker-compose up -d ``` -If you'd like to bring up the previous release. Try with docker-compose file from other tags. -You can also just build the image with `docker-compose up -d` command without pulling the image. But you can reduce the time to 1/3 by just downloading them. +If you'd like to bring up a previous release. Try with docker-compose file from other tags. + +``` +git clone https://github.com/naver/pinpoint-docker.git +git checkout {tag} +cd pinpoint-docker +docker-compose pull && docker-compose up -d +``` + +You can also build the image with `docker-compose up -d` command without pulling the image. But you can reduce the time to 1/3 by just downloading them. This will install and run all services required to run all features in Pinpoint in docker containers joined with same network. - Pinpoint-Web Server diff --git a/pinpoint-agent-attach-example/java/.env b/pinpoint-agent-attach-example/java/.env index 754c4de..8efd61f 100644 --- a/pinpoint-agent-attach-example/java/.env +++ b/pinpoint-agent-attach-example/java/.env @@ -1,4 +1,4 @@ ### Pinpoint with Java -PINPOINT_VERSION=1.8.0 +PINPOINT_VERSION=1.8.1 AGENT_ID=app-in-docker APP_NAME=quickapp \ No newline at end of file diff --git a/pinpoint-agent-attach-example/tomcat/.env b/pinpoint-agent-attach-example/tomcat/.env index ca1fbc0..4c44302 100644 --- a/pinpoint-agent-attach-example/tomcat/.env +++ b/pinpoint-agent-attach-example/tomcat/.env @@ -1,5 +1,5 @@ ### Pinpoint with Tomcat -PINPOINT_VERSION=1.8.0 +PINPOINT_VERSION=1.8.1 APP_PORT=8000 AGENT_ID=app-in-docker APP_NAME=quickapp \ No newline at end of file diff --git a/pinpoint-agent/.env b/pinpoint-agent/.env index f55abdc..96febaa 100644 --- a/pinpoint-agent/.env +++ b/pinpoint-agent/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.0 +PINPOINT_VERSION=1.8.1 ### Pinpoint-Agent diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile index 8deefb4..243bf94 100644 --- a/pinpoint-agent/Dockerfile +++ b/pinpoint-agent/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.1} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz COPY /build/scripts/configure-agent.sh /usr/local/bin/ diff --git a/pinpoint-agent/Readme.md b/pinpoint-agent/Readme.md index cc8317f..7b09569 100644 --- a/pinpoint-agent/Readme.md +++ b/pinpoint-agent/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat ## Supported Tags + - 1.8.1 - 1.8.0 - 1.7.3 - 1.7.2 diff --git a/pinpoint-collector/.env b/pinpoint-collector/.env index 67196b7..0c5d12e 100644 --- a/pinpoint-collector/.env +++ b/pinpoint-collector/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.0 +PINPOINT_VERSION=1.8.1 ### Pinpoint-Collector diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index 2387bdc..8c14aad 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -2,7 +2,7 @@ FROM tomcat:8-jre8 LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.1} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war diff --git a/pinpoint-collector/Readme.md b/pinpoint-collector/Readme.md index 13c46d2..bf20a2f 100644 --- a/pinpoint-collector/Readme.md +++ b/pinpoint-collector/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl ## Supported Tags + - 1.8.1 - 1.8.0 - 1.7.3 - 1.7.2 diff --git a/pinpoint-flink/.env b/pinpoint-flink/.env index c59abf8..1bfc470 100644 --- a/pinpoint-flink/.env +++ b/pinpoint-flink/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.0 +PINPOINT_VERSION=1.8.1 ### Pinpoint-flink diff --git a/pinpoint-hbase/.env b/pinpoint-hbase/.env index 8be2aaf..3338e93 100644 --- a/pinpoint-hbase/.env +++ b/pinpoint-hbase/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.0 +PINPOINT_VERSION=1.8.1 ### Pinpoint-Hbase diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile index 8533c4c..4403e6d 100644 --- a/pinpoint-hbase/Dockerfile +++ b/pinpoint-hbase/Dockerfile @@ -2,7 +2,7 @@ FROM java:8-jdk LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.1} ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase diff --git a/pinpoint-hbase/Readme.md b/pinpoint-hbase/Readme.md index d8228aa..e437a21 100644 --- a/pinpoint-hbase/Readme.md +++ b/pinpoint-hbase/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat ## Supported Tags + - 1.8.1 - 1.8.0 - 1.7.3 - 1.7.2 diff --git a/pinpoint-mysql/.env b/pinpoint-mysql/.env index ac6c27b..41e5824 100644 --- a/pinpoint-mysql/.env +++ b/pinpoint-mysql/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.0 +PINPOINT_VERSION=1.8.1 ### Pinpoint-mysql MYSQL_ROOT_PASSWORD=root123 diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile index 3d8f87f..752aa8d 100644 --- a/pinpoint-mysql/Dockerfile +++ b/pinpoint-mysql/Dockerfile @@ -1,6 +1,6 @@ FROM mysql:5.7 -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.1} RUN apt update \ && apt-get install -y --no-install-recommends ca-certificates wget \ diff --git a/pinpoint-mysql/Readme.md b/pinpoint-mysql/Readme.md index 91168c2..3e8d2d8 100644 --- a/pinpoint-mysql/Readme.md +++ b/pinpoint-mysql/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat ## Supported Tags + - 1.8.1 - 1.8.0 - 1.7.3 - 1.7.2 diff --git a/pinpoint-quickstart/.env b/pinpoint-quickstart/.env index 2e4d076..f47270b 100644 --- a/pinpoint-quickstart/.env +++ b/pinpoint-quickstart/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.0 +PINPOINT_VERSION=1.8.1 ### Pinpoint-Agent diff --git a/pinpoint-web/.env b/pinpoint-web/.env index ff33195..5d744d7 100644 --- a/pinpoint-web/.env +++ b/pinpoint-web/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.0 +PINPOINT_VERSION=1.8.1 ### Pinpoint-Web diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index e295197..b5af554 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -2,7 +2,7 @@ FROM tomcat:8-jre8 LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.1} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war COPY /build/scripts/start-web.sh /usr/local/bin/ diff --git a/pinpoint-web/Readme.md b/pinpoint-web/Readme.md index 2d8ccec..4e3fd5d 100644 --- a/pinpoint-web/Readme.md +++ b/pinpoint-web/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio ## Supported Tags + - 1.8.1 - 1.8.0 - 1.7.3 - 1.7.2 From cf1175ad8ee42f6dead4afdf2d9680ccc2ba3307 Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Tue, 12 Feb 2019 17:25:59 +0900 Subject: [PATCH 12/13] [naver/pinpoint#5231] update for release 1.8.2 --- .env | 2 +- Readme.md | 1 + pinpoint-agent-attach-example/java/.env | 2 +- pinpoint-agent-attach-example/tomcat/.env | 2 +- pinpoint-agent/.env | 2 +- pinpoint-agent/Dockerfile | 2 +- pinpoint-agent/Readme.md | 1 + pinpoint-collector/.env | 2 +- pinpoint-collector/Dockerfile | 2 +- pinpoint-collector/Readme.md | 1 + pinpoint-flink/.env | 2 +- pinpoint-hbase/.env | 2 +- pinpoint-hbase/Dockerfile | 2 +- pinpoint-hbase/Readme.md | 1 + pinpoint-mysql/.env | 2 +- pinpoint-mysql/Dockerfile | 2 +- pinpoint-mysql/Readme.md | 1 + pinpoint-quickstart/.env | 2 +- pinpoint-web/.env | 2 +- pinpoint-web/Dockerfile | 2 +- pinpoint-web/Readme.md | 1 + 21 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.env b/.env index add6e88..a32cc7e 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.1 +PINPOINT_VERSION=1.8.2 ### Pinpoint-Hbase diff --git a/Readme.md b/Readme.md index d7457ab..f0bccd8 100644 --- a/Readme.md +++ b/Readme.md @@ -13,6 +13,7 @@ It supports and helps you understand your application in a glance and allow you ## Supported Tags + - 1.8.2 - 1.8.1 - 1.8.0 - 1.7.3 diff --git a/pinpoint-agent-attach-example/java/.env b/pinpoint-agent-attach-example/java/.env index 8efd61f..30a1ad1 100644 --- a/pinpoint-agent-attach-example/java/.env +++ b/pinpoint-agent-attach-example/java/.env @@ -1,4 +1,4 @@ ### Pinpoint with Java -PINPOINT_VERSION=1.8.1 +PINPOINT_VERSION=1.8.2 AGENT_ID=app-in-docker APP_NAME=quickapp \ No newline at end of file diff --git a/pinpoint-agent-attach-example/tomcat/.env b/pinpoint-agent-attach-example/tomcat/.env index 4c44302..d55fbe8 100644 --- a/pinpoint-agent-attach-example/tomcat/.env +++ b/pinpoint-agent-attach-example/tomcat/.env @@ -1,5 +1,5 @@ ### Pinpoint with Tomcat -PINPOINT_VERSION=1.8.1 +PINPOINT_VERSION=1.8.2 APP_PORT=8000 AGENT_ID=app-in-docker APP_NAME=quickapp \ No newline at end of file diff --git a/pinpoint-agent/.env b/pinpoint-agent/.env index 96febaa..0494e08 100644 --- a/pinpoint-agent/.env +++ b/pinpoint-agent/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.1 +PINPOINT_VERSION=1.8.2 ### Pinpoint-Agent diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile index 243bf94..0ce4eb4 100644 --- a/pinpoint-agent/Dockerfile +++ b/pinpoint-agent/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.1} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.2} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz COPY /build/scripts/configure-agent.sh /usr/local/bin/ diff --git a/pinpoint-agent/Readme.md b/pinpoint-agent/Readme.md index 7b09569..6627744 100644 --- a/pinpoint-agent/Readme.md +++ b/pinpoint-agent/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat ## Supported Tags + - 1.8.2 - 1.8.1 - 1.8.0 - 1.7.3 diff --git a/pinpoint-collector/.env b/pinpoint-collector/.env index 0c5d12e..09ebd55 100644 --- a/pinpoint-collector/.env +++ b/pinpoint-collector/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.1 +PINPOINT_VERSION=1.8.2 ### Pinpoint-Collector diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index 8c14aad..7fe7ae6 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -2,7 +2,7 @@ FROM tomcat:8-jre8 LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.1} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.2} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war diff --git a/pinpoint-collector/Readme.md b/pinpoint-collector/Readme.md index bf20a2f..b73312d 100644 --- a/pinpoint-collector/Readme.md +++ b/pinpoint-collector/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl ## Supported Tags + - 1.8.2 - 1.8.1 - 1.8.0 - 1.7.3 diff --git a/pinpoint-flink/.env b/pinpoint-flink/.env index 1bfc470..9739e02 100644 --- a/pinpoint-flink/.env +++ b/pinpoint-flink/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.1 +PINPOINT_VERSION=1.8.2 ### Pinpoint-flink diff --git a/pinpoint-hbase/.env b/pinpoint-hbase/.env index 3338e93..e61b577 100644 --- a/pinpoint-hbase/.env +++ b/pinpoint-hbase/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.1 +PINPOINT_VERSION=1.8.2 ### Pinpoint-Hbase diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile index 4403e6d..e911a0c 100644 --- a/pinpoint-hbase/Dockerfile +++ b/pinpoint-hbase/Dockerfile @@ -2,7 +2,7 @@ FROM java:8-jdk LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.1} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.2} ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase diff --git a/pinpoint-hbase/Readme.md b/pinpoint-hbase/Readme.md index e437a21..84fba84 100644 --- a/pinpoint-hbase/Readme.md +++ b/pinpoint-hbase/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat ## Supported Tags + - 1.8.2 - 1.8.1 - 1.8.0 - 1.7.3 diff --git a/pinpoint-mysql/.env b/pinpoint-mysql/.env index 41e5824..06c754b 100644 --- a/pinpoint-mysql/.env +++ b/pinpoint-mysql/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.1 +PINPOINT_VERSION=1.8.2 ### Pinpoint-mysql MYSQL_ROOT_PASSWORD=root123 diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile index 752aa8d..8dde798 100644 --- a/pinpoint-mysql/Dockerfile +++ b/pinpoint-mysql/Dockerfile @@ -1,6 +1,6 @@ FROM mysql:5.7 -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.1} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.2} RUN apt update \ && apt-get install -y --no-install-recommends ca-certificates wget \ diff --git a/pinpoint-mysql/Readme.md b/pinpoint-mysql/Readme.md index 3e8d2d8..a950ac5 100644 --- a/pinpoint-mysql/Readme.md +++ b/pinpoint-mysql/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat ## Supported Tags + - 1.8.2 - 1.8.1 - 1.8.0 - 1.7.3 diff --git a/pinpoint-quickstart/.env b/pinpoint-quickstart/.env index f47270b..7ca757f 100644 --- a/pinpoint-quickstart/.env +++ b/pinpoint-quickstart/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.1 +PINPOINT_VERSION=1.8.2 ### Pinpoint-Agent diff --git a/pinpoint-web/.env b/pinpoint-web/.env index 5d744d7..52c3b3c 100644 --- a/pinpoint-web/.env +++ b/pinpoint-web/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=1.8.1 +PINPOINT_VERSION=1.8.2 ### Pinpoint-Web diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index b5af554..e88eb1f 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -2,7 +2,7 @@ FROM tomcat:8-jre8 LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.1} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.2} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war COPY /build/scripts/start-web.sh /usr/local/bin/ diff --git a/pinpoint-web/Readme.md b/pinpoint-web/Readme.md index 4e3fd5d..4d50388 100644 --- a/pinpoint-web/Readme.md +++ b/pinpoint-web/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio ## Supported Tags + - 1.8.2 - 1.8.1 - 1.8.0 - 1.7.3 From 588d5585becc97170c4309083bb5bef4247a9fd4 Mon Sep 17 00:00:00 2001 From: Marcos Alexandre de Melo Medeiros Date: Fri, 15 Feb 2019 08:27:16 -0300 Subject: [PATCH 13/13] Add ALARM_MAIL_SENDER_ADDRESS in pinpoint-docker/.env --- .env | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 0ba78ce..f961a67 100644 --- a/.env +++ b/.env @@ -41,11 +41,12 @@ JDBC_DRIVER=com.mysql.jdbc.Driver JDBC_URL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8 JDBC_USERNAME=admin JDBC_PASSWORD=admin -PINPOINT_URL=pinpoint.example.com -ALARM_MAIL_SERVER_URL=stmp.test.com -ALARM_MAIL_SERVER_PORT=123 -ALARM_MAIL_SERVER_USERNAME=user -ALARM_MAIL_SERVER_PASSWORD=pass +PINPOINT_URL=http://pinpoint.com +ALARM_MAIL_SERVER_URL=stmp.server.com +ALARM_MAIL_SERVER_PORT=583 +ALARM_MAIL_SERVER_USERNAME=pinpoint +ALARM_MAIL_SERVER_PASSWORD=pinpoint +ALARM_MAIL_SENDER_ADDRESS=pinpoint_operator@pinpoint.com ### Pinpoint-Collector