MyoaEngineering
/
pinpoint-docker-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#130] Add batch container

This commit is contained in:
ga-ram 2022-04-20 16:31:50 +09:00
parent c44873185a
commit 750af1ec73
24 changed files with 233 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
.env
View File

@ -18,7 +18,7 @@ MYSQL_DATABASE=pinpoint
PINPOINT_WEB_NAME=pinpoint-web PINPOINT_WEB_NAME=pinpoint-web
SERVER_PORT=8079 WEB_SERVER_PORT=8080
WEB_LOGGING_LEVEL_ROOT=INFO WEB_LOGGING_LEVEL_ROOT=INFO
@ -77,6 +77,46 @@ COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996
FLINK_CLUSTER_ENABLE=true FLINK_CLUSTER_ENABLE=true
FLINK_CLUSTER_ZOOKEEPER_ADDRESS=zoo1 FLINK_CLUSTER_ZOOKEEPER_ADDRESS=zoo1
### Pinpoint-Batch
PINPOINT_BATCH_NAME=pinpoint-batch
BATCH_SERVER_PORT=8079
BATCH_LOGGING_LEVEL_ROOT=INFO
CLUSTER_ENABLE=true
ADMIN_PASSWORD=admin
#analytics
CONFIG_SENDUSAGE=true
#flink server information required if used
BATCH_ENABLE=false
BATCH_SERVER_IP=127.0.0.1
BATCH_FLINK_SERVER=pinpoint-flink-jobmanager
CONFIG_SHOW_APPLICATIONSTAT=true
#mysql information required 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 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-Agent ### Pinpoint-Agent
@ -112,4 +152,4 @@ FLINK_WEB_PORT=8081
### Pinpoint-quickstart ### Pinpoint-quickstart
APP_PORT=8000 APP_PORT=8085

12
Readme.md
View File

@ -1,5 +1,5 @@
![Pinpoint](https://github.com/naver/pinpoint-docker/blob/master/docs/logo.png) ![Pinpoint](https://github.com/pinpoint-apm/pinpoint-docker/blob/master/docs/logo.png)
# Pinpoint-Docker for Pinpoint # Pinpoint-Docker for Pinpoint
@ -48,14 +48,14 @@ With `docker-compose.yml` under *Pinpoint-Docker* folder brings up all the envir
To monitor your agent see [configuration part](#configurations) for further details. To monitor your agent see [configuration part](#configurations) for further details.
``` ```
git clone https://github.com/naver/pinpoint-docker.git git clone https://github.com/pinpoint-apm/pinpoint-docker.git
cd pinpoint-docker cd pinpoint-docker
docker-compose pull && docker-compose up -d docker-compose pull && docker-compose up -d
``` ```
If you'd like to bring up a previous release. Try with docker-compose file from other tags. 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 clone https://github.com/pinpoint-apm/pinpoint-docker.git
cd pinpoint-docker cd pinpoint-docker
git checkout {tag} git checkout {tag}
docker-compose pull && docker-compose up -d docker-compose pull && docker-compose up -d
@ -99,8 +99,8 @@ But for the docker image, All is set. fillout variables under *#mail server info
### Testing QuickStart application ### Testing QuickStart application
Now you are ready to monitor the sample application(Pinpoint-QuickStart [port 8000](http://localhost:8000)) provided. Now you are ready to monitor the sample application(Pinpoint-QuickStart [port 8085](http://localhost:8085)) 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. If you can't find any connected application from Pinpoint-Web's first page([port 8080](http://localhost:8080) 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. It will take some time for Pinpoint to retrieve the application's information when running for the first time.
## Monitoring YOUR Application ## Monitoring YOUR Application
@ -139,7 +139,7 @@ Configuration relies on supplying `docker-compose` with environment variables de
With `docker-compose` in this repository. You can create stand-alone containers that are needed to run most of the features in Pinpoint. With `docker-compose` in this repository. You can create stand-alone containers that are needed to run most of the features in Pinpoint.
**Ports** can be also configured in .env file. **Ports** can be also configured in .env file.
(Default ports are Pinpoint-Web:8079, Quickstart:8000 and Flink:8081 as configured in .env file) (Default ports are Pinpoint-Web:8080, Pinpoint-Batch:8079, Quickstart:8085 and Flink:8081 as configured in .env file)
Pinpoint-Zookeeper is just an example of using zookeeper image. You can modify docker-compose files to suit your needs. Pinpoint-Zookeeper is just an example of using zookeeper image. You can modify docker-compose files to suit your needs.

46
docker-compose.yml
View File

@ -77,9 +77,9 @@ services:
- "9997" - "9997"
ports: ports:
- "9997:9997" - "9997:9997"
- "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}" - "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
environment: environment:
- SERVER_PORT=${SERVER_PORT} - WEB_SERVER_PORT=${WEB_SERVER_PORT}
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS} - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
- CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ENABLE=${CLUSTER_ENABLE}
@ -159,7 +159,7 @@ services:
container_name: "pinpoint-quickstart" container_name: "pinpoint-quickstart"
image: "pinpointdocker/pinpoint-quickstart" image: "pinpointdocker/pinpoint-quickstart"
ports: ports:
- "${APP_PORT:-8080}:8080" - "${APP_PORT:-8085}:8080"
volumes: volumes:
- data-volume:/pinpoint-agent - data-volume:/pinpoint-agent
environment: environment:
@ -169,6 +169,46 @@ services:
depends_on: depends_on:
- pinpoint-agent - pinpoint-agent
pinpoint-batch:
container_name: "${PINPOINT_BATCH_NAME}"
image: "pinpointdocker/pinpoint-batch:${IMAGE_VERSION}"
depends_on:
- pinpoint-hbase
- pinpoint-mysql
- zoo1
restart: always
environment:
- BATCH_SERVER_PORT=${BATCH_SERVER_PORT}
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
- CLUSTER_ENABLE=${CLUSTER_ENABLE}
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
- CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
- LOGGING_LEVEL_ROOT=${BATCH_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_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
- JDBC_URL=${JDBC_URL}
- JDBC_USERNAME=${JDBC_USERNAME}
- JDBC_PASSWORD=${JDBC_PASSWORD}
- 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:
- pinpoint
pinpoint-agent: pinpoint-agent:
build: build:
context: ./pinpoint-agent/ context: ./pinpoint-agent/

2
pinpoint-agent-attach-example/tomcat/.env
View File

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

2
pinpoint-agent-attach-example/tomcat/docker-compose.yml
View File

@ -9,7 +9,7 @@ services:
container_name: "tomcat" container_name: "tomcat"
image: "Your Image" image: "Your Image"
ports: ports:
- "${APP_PORT:-8080}:8080" - "${APP_PORT:-8085}:8080"
volumes_from: volumes_from:
- container:pinpoint-agent - container:pinpoint-agent
environment: environment:

2
pinpoint-agent/Dockerfile
View File

@ -1,7 +1,7 @@
FROM alpine:3.7 FROM alpine:3.7
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3}
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
COPY /build/scripts/configure-agent.sh /usr/local/bin/ COPY /build/scripts/configure-agent.sh /usr/local/bin/

6
pinpoint-agent/Readme.md
View File

@ -27,17 +27,17 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat
- 1.7.3 - 1.7.3
- 1.7.2 - 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. Please see [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
## Any Issues or Suggestions? ## Any Issues or Suggestions?
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/pinpoint/issues). Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
Contributions on the pinpoint-docker image is also always welcome. Contributions on the pinpoint-docker image is also always welcome.
## License ## License
Pinpoint is licensed under the Apache License, Version 2.0. Pinpoint is licensed under the Apache License, Version 2.0.
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text. See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
``` ```
Copyright 2018 NAVER Corp. Copyright 2018 NAVER Corp.

45
pinpoint-batch/.env Normal file
View File

@ -0,0 +1,45 @@
PINPOINT_VERSION=2.3.3
SPRING_PROFILES=release
### Pinpoint-Batch
PINPOINT_BATCH_NAME=pinpoint-batch
BATCH_SERVER_PORT=8079
#zookeeper information required
PINPOINT_ZOOKEEPER_ADDRESS=
BATCH_LOGGING_LEVEL_ROOT=INFO
CLUSTER_ENABLE=true
ADMIN_PASSWORD=admin
#analytics
CONFIG_SENDUSAGE=true
#flink server information required if used
BATCH_ENABLE=false
BATCH_SERVER_IP=127.0.0.1
BATCH_FLINK_SERVER=pinpoint-flink-jobmanager
CONFIG_SHOW_APPLICATIONSTAT=true
#mysql information required 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 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

17
pinpoint-batch/Dockerfile Normal file
View File

@ -0,0 +1,17 @@
FROM openjdk:8-jdk-alpine
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-batch-${PINPOINT_VERSION}.jar
RUN mkdir -p /pinpoint/config \
&& mkdir -p /pinpoint/scripts
COPY /build/config/pinpoint-batch.properties /pinpoint/config/
COPY /build/scripts/start-batch.sh /pinpoint/scripts/
RUN apk --no-cache add curl \
&& chmod a+x /pinpoint/scripts/start-batch.sh \
&& chmod a+x /pinpoint/config/pinpoint-batch.properties \
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-batch.jar
ENTRYPOINT ["sh", "/pinpoint/scripts/start-batch.sh"]

45
pinpoint-batch/docker-compose.yml Normal file
View File

@ -0,0 +1,45 @@
version: "3.6"
services:
pinpoint-batch:
build:
context: .
dockerfile: Dockerfile
args:
- PINPOINT_VERSION=${PINPOINT_VERSION}
container_name: "${PINPOINT_BATCH_NAME}"
image: "pinpointdocker/pinpoint-batch:${PINPOINT_VERSION}"
restart: always
expose:
- "${BATCH_SERVER_PORT:-8079}"
ports:
- "${BATCH_SERVER_PORT:-8079}:${BATCH_SERVER_PORT:-8079}"
environment:
- BATCH_SERVER_PORT=${BATCH_SERVER_PORT}
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
- CLUSTER_ENABLE=${CLUSTER_ENABLE}
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
- CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
- LOGGING_LEVEL_ROOT=${BATCH_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_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
- JDBC_URL=${JDBC_URL}
- JDBC_USERNAME=${JDBC_USERNAME}
- JDBC_PASSWORD=${JDBC_PASSWORD}
- 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}

2
pinpoint-collector/Dockerfile
View File

@ -1,7 +1,7 @@
FROM openjdk:8-jdk-alpine FROM openjdk:8-jdk-alpine
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3}
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/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
RUN mkdir -p /pinpoint/config \ RUN mkdir -p /pinpoint/config \
&& mkdir -p /pinpoint/scripts && mkdir -p /pinpoint/scripts

6
pinpoint-collector/Readme.md
View File

@ -27,17 +27,17 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl
- 1.7.3 - 1.7.3
- 1.7.2 - 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. Please see [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
## Any Issues or Suggestions? ## Any Issues or Suggestions?
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/pinpoint/issues). Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
Contributions on the pinpoint-docker image is also always welcome. Contributions on the pinpoint-docker image is also always welcome.
## License ## License
Pinpoint is licensed under the Apache License, Version 2.0. Pinpoint is licensed under the Apache License, Version 2.0.
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text. See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
``` ```
Copyright 2018 NAVER Corp. Copyright 2018 NAVER Corp.

6
pinpoint-flink/Readme.md
View File

@ -10,17 +10,17 @@ This Docker image contains the Pinpoint Flink component of the Pinpoint applicat
- 2.3.1 - 2.3.1
- 2.3.0 - 2.3.0
Please see the [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image. Please see the [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
## Any Issues or Suggestions? ## Any Issues or Suggestions?
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/pinpoint/issues). Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
Contributions on the pinpoint-docker image is also always welcome. Contributions on the pinpoint-docker image is also always welcome.
## License ## License
Pinpoint is licensed under the Apache License, Version 2.0. Pinpoint is licensed under the Apache License, Version 2.0.
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text. See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
``` ```
Copyright 2018 NAVER Corp. Copyright 2018 NAVER Corp.

2
pinpoint-hbase/Dockerfile
View File

@ -22,7 +22,7 @@ RUN chmod a+x /usr/local/bin/initialize-hbase.sh \
&& tar xfvz hbase.tar.gz \ && tar xfvz hbase.tar.gz \
&& mv ../../hbase-site.xml ../../${HBASE_HOME}/conf/hbase-site.xml \ && mv ../../hbase-site.xml ../../${HBASE_HOME}/conf/hbase-site.xml \
&& mv ../../hbase-env.sh ../../${HBASE_HOME}/conf/hbase-env.sh \ && 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 && curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/hbase/scripts/hbase-create.hbase" -o ${BASE_DIR}/hbase-create.hbase
VOLUME ["/home/pinpoint/hbase", "/home/pinpoint/zookeeper"] VOLUME ["/home/pinpoint/hbase", "/home/pinpoint/zookeeper"]

6
pinpoint-hbase/Readme.md
View File

@ -27,17 +27,17 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat
- 1.7.3 - 1.7.3
- 1.7.2 - 1.7.2
Please see the [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image. Please see the [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
## Any Issues or Suggestions? ## Any Issues or Suggestions?
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/pinpoint/issues). Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
Contributions on the pinpoint-docker image is also always welcome. Contributions on the pinpoint-docker image is also always welcome.
## License ## License
Pinpoint is licensed under the Apache License, Version 2.0. Pinpoint is licensed under the Apache License, Version 2.0.
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text. See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
``` ```
Copyright 2018 NAVER Corp. Copyright 2018 NAVER Corp.

4
pinpoint-mysql/Dockerfile
View File

@ -4,8 +4,8 @@ ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3}
RUN apt update \ RUN apt update \
&& apt-get install -y --no-install-recommends ca-certificates wget \ && 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/v$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql" \ && wget -O /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql "https://raw.githubusercontent.com/pinpoint-apm/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" \ && wget -O /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql "https://raw.githubusercontent.com/pinpoint-apm/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/CreateTableStatement-mysql.sql \
&& sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \ && sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \
&& apt-get purge -y --auto-remove ca-certificates wget && apt-get purge -y --auto-remove ca-certificates wget

6
pinpoint-mysql/Readme.md
View File

@ -27,17 +27,17 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat
- 1.7.3 - 1.7.3
- 1.7.2 - 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. Please see [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
## Any Issues or Suggestions? ## Any Issues or Suggestions?
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/pinpoint/issues). Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
Contributions on the pinpoint-docker image is also always welcome. Contributions on the pinpoint-docker image is also always welcome.
## License ## License
Pinpoint is licensed under the Apache License, Version 2.0. Pinpoint is licensed under the Apache License, Version 2.0.
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text. See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
``` ```
Copyright 2018 NAVER Corp. Copyright 2018 NAVER Corp.

2
pinpoint-quickstart/.env
View File

@ -23,4 +23,4 @@ AGENT_DEBUG_LEVEL=INFO
### Pinpoint-quickstart ### Pinpoint-quickstart
APP_PORT=8000 APP_PORT=8085

6
pinpoint-quickstart/Readme.md
View File

@ -27,17 +27,17 @@ This Docker image contains the Pinpoint Quickstart sample to test Pinpoint appli
- 1.7.3 - 1.7.3
- 1.7.2 - 1.7.2
Please see the [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image. Please see the [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
## Any Issues or Suggestions? ## Any Issues or Suggestions?
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/pinpoint/issues). Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
Contributions on the pinpoint-docker image is also always welcome. Contributions on the pinpoint-docker image is also always welcome.
## License ## License
Pinpoint is licensed under the Apache License, Version 2.0. Pinpoint is licensed under the Apache License, Version 2.0.
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text. See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
``` ```
Copyright 2018 NAVER Corp. Copyright 2018 NAVER Corp.

2
pinpoint-quickstart/docker-compose.yml
View File

@ -9,7 +9,7 @@ services:
container_name: "pinpoint-quickstart" container_name: "pinpoint-quickstart"
image: "pinpointdocker/pinpoint-quickstart" image: "pinpointdocker/pinpoint-quickstart"
ports: ports:
- "${APP_PORT:-8080}:8080" - "${APP_PORT:-8085}:8080"
volumes: volumes:
- data-volume:/pinpoint-agent - data-volume:/pinpoint-agent
environment: environment:

2
pinpoint-web/.env
View File

@ -5,7 +5,7 @@ SPRING_PROFILES=release
PINPOINT_WEB_NAME=pinpoint-web PINPOINT_WEB_NAME=pinpoint-web
SERVER_PORT=8079 WEB_SERVER_PORT=8080
#zookeeper information required #zookeeper information required
PINPOINT_ZOOKEEPER_ADDRESS= PINPOINT_ZOOKEEPER_ADDRESS=

2
pinpoint-web/Dockerfile
View File

@ -1,7 +1,7 @@
FROM openjdk:8-jdk-alpine FROM openjdk:8-jdk-alpine
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3}
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar
RUN mkdir -p /pinpoint/config \ RUN mkdir -p /pinpoint/config \
&& mkdir -p /pinpoint/scripts && mkdir -p /pinpoint/scripts

6
pinpoint-web/Readme.md
View File

@ -27,17 +27,17 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio
- 1.7.3 - 1.7.3
- 1.7.2 - 1.7.2
Please see the [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image. Please see the [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
## Any Issues or Suggestions? ## Any Issues or Suggestions?
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/pinpoint/issues). Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
Contributions on the pinpoint-docker image is also always welcome. Contributions on the pinpoint-docker image is also always welcome.
## License ## License
Pinpoint is licensed under the Apache License, Version 2.0. Pinpoint is licensed under the Apache License, Version 2.0.
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text. See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
``` ```
Copyright 2018 NAVER Corp. Copyright 2018 NAVER Corp.

6
pinpoint-web/docker-compose.yml
View File

@ -13,13 +13,13 @@ services:
restart: always restart: always
expose: expose:
- "${SERVER_PORT:-8080}" - "${WEB_SERVER_PORT:-8080}"
- "9997" - "9997"
ports: ports:
- "9997:9997" - "9997:9997"
- "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}" - "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
environment: environment:
- SERVER_PORT=${SERVER_PORT} - WEB_SERVER_PORT=${WEB_SERVER_PORT}
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS} - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
- CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ENABLE=${CLUSTER_ENABLE}