Compare commits
1 Commits
2.4.1
...
revert-123
| Author | SHA1 | Date | |
|---|---|---|---|
|
cbd4ea436c |
54
.env
54
.env
@@ -1,4 +1,4 @@
|
||||
PINPOINT_VERSION=2.4.1
|
||||
PINPOINT_VERSION=2.3.1
|
||||
SPRING_PROFILES=release
|
||||
#zookeeper information required
|
||||
PINPOINT_ZOOKEEPER_ADDRESS=zoo1
|
||||
@@ -18,7 +18,7 @@ MYSQL_DATABASE=pinpoint
|
||||
|
||||
PINPOINT_WEB_NAME=pinpoint-web
|
||||
|
||||
WEB_SERVER_PORT=8080
|
||||
SERVER_PORT=8079
|
||||
|
||||
WEB_LOGGING_LEVEL_ROOT=INFO
|
||||
|
||||
@@ -77,46 +77,6 @@ COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996
|
||||
FLINK_CLUSTER_ENABLE=true
|
||||
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
|
||||
|
||||
@@ -135,12 +95,8 @@ COLLECTOR_TCP_PORT=9994
|
||||
COLLECTOR_STAT_PORT=9995
|
||||
COLLECTOR_SPAN_PORT=9996
|
||||
|
||||
# Sampling Configurations
|
||||
PROFILER_SAMPLING_TYPE=COUNTING
|
||||
PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=1
|
||||
PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=100
|
||||
PROFILER_SAMPLING_NEW_THROUGHPUT=0
|
||||
PROFILER_SAMPLING_CONTINUE_THROUGHPUT=0
|
||||
# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
|
||||
PROFILER_SAMPLING_RATE=1
|
||||
|
||||
AGENT_ID=app-in-docker
|
||||
APP_NAME=quickapp
|
||||
@@ -156,4 +112,4 @@ FLINK_WEB_PORT=8081
|
||||
|
||||
### Pinpoint-quickstart
|
||||
|
||||
APP_PORT=8085
|
||||
APP_PORT=8000
|
||||
|
||||
8
.github/workflows/docker-image.yml
vendored
8
.github/workflows/docker-image.yml
vendored
@@ -28,12 +28,8 @@ jobs:
|
||||
username: ${{ secrets.docker_username }}
|
||||
password: ${{ secrets.docker_token }}
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v2
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
uses: docker/setup-buildx-action@v1
|
||||
- name: Extract metadata (tags, labels) for Docker
|
||||
id: meta
|
||||
uses: docker/metadata-action@v3
|
||||
@@ -44,7 +40,7 @@ jobs:
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
context: ./${{ inputs.component }}
|
||||
platforms: linux/amd64,linux/arm64
|
||||
platforms: linux/amd64
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
||||
9
.github/workflows/release-images.yml
vendored
9
.github/workflows/release-images.yml
vendored
@@ -67,12 +67,3 @@ jobs:
|
||||
docker_username: ${{ secrets.DOCKER_USERNAME }}
|
||||
docker_token: ${{ secrets.DOCKER_TOKEN }}
|
||||
docker_password: ${{ secrets.DOCKER_PASSWORD }}
|
||||
|
||||
batch:
|
||||
uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
|
||||
with:
|
||||
component: pinpoint-batch
|
||||
secrets:
|
||||
docker_username: ${{ secrets.DOCKER_USERNAME }}
|
||||
docker_token: ${{ secrets.DOCKER_TOKEN }}
|
||||
docker_password: ${{ secrets.DOCKER_PASSWORD }}
|
||||
|
||||
18
Readme.md
18
Readme.md
@@ -1,5 +1,5 @@
|
||||
|
||||
|
||||
|
||||
|
||||
# Pinpoint-Docker for Pinpoint
|
||||
|
||||
@@ -13,10 +13,6 @@ It supports and helps you understand your application in a glance and allow you
|
||||
|
||||
## Supported Tags
|
||||
|
||||
- 2.4.1
|
||||
- 2.4.0
|
||||
- 2.3.3
|
||||
- 2.3.2
|
||||
- 2.3.1
|
||||
- 2.3.0
|
||||
- 2.2.2
|
||||
@@ -50,14 +46,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.
|
||||
|
||||
```
|
||||
git clone https://github.com/pinpoint-apm/pinpoint-docker.git
|
||||
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 a previous release. Try with docker-compose file from other tags.
|
||||
|
||||
```
|
||||
git clone https://github.com/pinpoint-apm/pinpoint-docker.git
|
||||
git clone https://github.com/naver/pinpoint-docker.git
|
||||
cd pinpoint-docker
|
||||
git checkout {tag}
|
||||
docker-compose pull && docker-compose up -d
|
||||
@@ -101,8 +97,8 @@ But for the docker image, All is set. fillout variables under *#mail server info
|
||||
|
||||
### Testing QuickStart application
|
||||
|
||||
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 8080](http://localhost:8080) as default), don't panic and wait for a while.
|
||||
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.
|
||||
|
||||
## Monitoring YOUR Application
|
||||
@@ -141,7 +137,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.
|
||||
|
||||
**Ports** can be also configured in .env file.
|
||||
(Default ports are Pinpoint-Web:8080, Pinpoint-Batch:8079, Quickstart:8085 and Flink:8081 as configured in .env file)
|
||||
(Default ports are Pinpoint-Web:8079, Quickstart:8000 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.
|
||||
|
||||
@@ -160,7 +156,7 @@ You can also easily change the log level from *.env* file.
|
||||
|
||||
## Any Issues or Suggestions?
|
||||
|
||||
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint-docker/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.
|
||||
|
||||
## License
|
||||
|
||||
@@ -77,9 +77,9 @@ services:
|
||||
- "9997"
|
||||
ports:
|
||||
- "9997:9997"
|
||||
- "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
|
||||
- "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}"
|
||||
environment:
|
||||
- WEB_SERVER_PORT=${WEB_SERVER_PORT}
|
||||
- SERVER_PORT=${SERVER_PORT}
|
||||
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
|
||||
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
|
||||
- CLUSTER_ENABLE=${CLUSTER_ENABLE}
|
||||
@@ -159,7 +159,7 @@ services:
|
||||
container_name: "pinpoint-quickstart"
|
||||
image: "pinpointdocker/pinpoint-quickstart"
|
||||
ports:
|
||||
- "${APP_PORT:-8085}:8080"
|
||||
- "${APP_PORT:-8080}:8080"
|
||||
volumes:
|
||||
- data-volume:/pinpoint-agent
|
||||
environment:
|
||||
@@ -169,52 +169,6 @@ services:
|
||||
depends_on:
|
||||
- pinpoint-agent
|
||||
|
||||
pinpoint-batch:
|
||||
build:
|
||||
context: ./pinpoint-batch/
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
- PINPOINT_VERSION=${PINPOINT_VERSION}
|
||||
|
||||
container_name: "${PINPOINT_BATCH_NAME}"
|
||||
image: "pinpointdocker/pinpoint-batch:${PINPOINT_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:
|
||||
build:
|
||||
context: ./pinpoint-agent/
|
||||
@@ -238,11 +192,7 @@ services:
|
||||
- PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}
|
||||
- PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}
|
||||
- PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}
|
||||
- PROFILER_SAMPLING_TYPE=${PROFILER_SAMPLING_TYPE}
|
||||
- PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}
|
||||
- PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}
|
||||
- PROFILER_SAMPLING_NEW_THROUGHPUT=${PROFILER_SAMPLING_NEW_THROUGHPUT}
|
||||
- PROFILER_SAMPLING_CONTINUE_THROUGHPUT=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}
|
||||
- PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
|
||||
- DEBUG_LEVEL=${AGENT_DEBUG_LEVEL}
|
||||
- PROFILER_TRANSPORT_MODULE=${PROFILER_TRANSPORT_MODULE}
|
||||
depends_on:
|
||||
@@ -250,7 +200,7 @@ services:
|
||||
|
||||
#zookeepers
|
||||
zoo1:
|
||||
image: zookeeper:3.4.13
|
||||
image: zookeeper:3.4
|
||||
restart: always
|
||||
hostname: zoo1
|
||||
expose:
|
||||
@@ -266,7 +216,7 @@ services:
|
||||
- pinpoint
|
||||
|
||||
zoo2:
|
||||
image: zookeeper:3.4.13
|
||||
image: zookeeper:3.4
|
||||
restart: always
|
||||
hostname: zoo2
|
||||
expose:
|
||||
@@ -282,7 +232,7 @@ services:
|
||||
- pinpoint
|
||||
|
||||
zoo3:
|
||||
image: zookeeper:3.4.13
|
||||
image: zookeeper:3.4
|
||||
restart: always
|
||||
hostname: zoo3
|
||||
expose:
|
||||
|
||||
@@ -1,20 +1,5 @@
|
||||
### Pinpoint with Java
|
||||
PINPOINT_VERSION=2.4.1
|
||||
PINPOINT_VERSION=2.3.1
|
||||
SPRING_PROFILES=release
|
||||
AGENT_ID=java-app-in-docker
|
||||
APP_NAME=JavaAttachExample
|
||||
|
||||
|
||||
#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
|
||||
|
||||
# Sampling configurations
|
||||
PROFILER_SAMPLING_TYPE=COUNTING
|
||||
PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=1
|
||||
PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=100
|
||||
PROFILER_SAMPLING_NEW_THROUGHPUT=0
|
||||
PROFILER_SAMPLING_CONTINUE_THROUGHPUT=0
|
||||
AGENT_ID=app-in-docker
|
||||
APP_NAME=quickapp
|
||||
@@ -1,5 +1,7 @@
|
||||
FROM java:8
|
||||
|
||||
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
|
||||
|
||||
ARG PINPOINT_VERSION
|
||||
ARG AGENT_ID
|
||||
ARG APP_NAME
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
### Pinpoint with Tomcat
|
||||
PINPOINT_VERSION=2.4.1
|
||||
PINPOINT_VERSION=2.3.1
|
||||
SPRING_PROFILES=release
|
||||
APP_PORT=8085
|
||||
APP_PORT=8000
|
||||
AGENT_ID=app-in-docker
|
||||
APP_NAME=quickapp
|
||||
@@ -9,7 +9,7 @@ services:
|
||||
container_name: "tomcat"
|
||||
image: "Your Image"
|
||||
ports:
|
||||
- "${APP_PORT:-8085}:8080"
|
||||
- "${APP_PORT:-8080}:8080"
|
||||
volumes_from:
|
||||
- container:pinpoint-agent
|
||||
environment:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
PINPOINT_VERSION=2.4.1
|
||||
PINPOINT_VERSION=2.3.1
|
||||
SPRING_PROFILES=release
|
||||
|
||||
### Pinpoint-Agent
|
||||
@@ -18,28 +18,8 @@ COLLECTOR_TCP_PORT=9994
|
||||
COLLECTOR_STAT_PORT=9995
|
||||
COLLECTOR_SPAN_PORT=9996
|
||||
|
||||
# Profiler Sampling Configurations
|
||||
# If this value set to COUNTING(default), sampling rate is 1/n.
|
||||
# If this value set to PERCENT, sampling rate is n%.
|
||||
PROFILER_SAMPLING_TYPE=COUNTING
|
||||
|
||||
# depend on profiler.samplging.rate.type,
|
||||
|
||||
# if it's COUNTING(the default), then 1 out of n transactions will be sampled where n is the rate.
|
||||
# eg. 1: 100% 20: 5% 50: 2% 100: 1%
|
||||
PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=1
|
||||
|
||||
# if it's PERCENT, then first x transactions out of y transactions will be sampled.
|
||||
# Support from 100% to 0.01%
|
||||
# eg. 100: 100% 50: 50% 5: 5% 0.01: 0.01%
|
||||
PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=100
|
||||
|
||||
# Permits per second, if throughput is 0, it is unlimited.
|
||||
# "New" is a transaction that is newly traced.
|
||||
PROFILER_SAMPLING_NEW_THROUGHPUT=0
|
||||
# "Continue" is a transaction that is already being tracked.
|
||||
PROFILER_SAMPLING_CONTINUE_THROUGHPUT=0
|
||||
|
||||
# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
|
||||
PROFILER_SAMPLING_RATE=1
|
||||
|
||||
AGENT_ID=app-in-docker
|
||||
APP_NAME=quickapp
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
FROM alpine:3.7
|
||||
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
|
||||
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
|
||||
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
|
||||
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1}
|
||||
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/
|
||||
|
||||
|
||||
@@ -5,10 +5,6 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat
|
||||
|
||||
## Supported Tags
|
||||
|
||||
- 2.4.1
|
||||
- 2.4.0
|
||||
- 2.3.3
|
||||
- 2.3.2
|
||||
- 2.3.1
|
||||
- 2.3.0
|
||||
- 2.2.2
|
||||
@@ -29,17 +25,17 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat
|
||||
- 1.7.3
|
||||
- 1.7.2
|
||||
|
||||
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.
|
||||
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/pinpoint-apm/pinpoint/issues).
|
||||
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/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
|
||||
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
|
||||
|
||||
```
|
||||
Copyright 2018 NAVER Corp.
|
||||
|
||||
@@ -16,11 +16,7 @@ sed -i "/profiler.transport.grpc.agent.collector.port=/ s/=.*/=${PROFILER_TRANSP
|
||||
sed -i "/profiler.transport.grpc.metadata.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
|
||||
sed -i "/profiler.transport.grpc.stat.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
|
||||
sed -i "/profiler.transport.grpc.span.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
|
||||
sed -i "/profiler.sampling.type=/ s/=.*/=${PROFILER_SAMPLING_TYPE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
|
||||
sed -i "/profiler.sampling.counting.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
|
||||
sed -i "/profiler.sampling.percent.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
|
||||
sed -i "/profiler.sampling.new.throughput=/ s/=.*/=${PROFILER_SAMPLING_NEW_THROUGHPUT}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
|
||||
sed -i "/profiler.sampling.continue.throughput=/ s/=.*/=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
|
||||
sed -i "/profiler.sampling.rate=/ s/=.*/=${PROFILER_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
|
||||
|
||||
sed -i "/Root level=/ s/=.*/=\"${DEBUG_LEVEL}\">/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j2.xml
|
||||
|
||||
|
||||
@@ -22,11 +22,7 @@ services:
|
||||
- PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}
|
||||
- PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}
|
||||
- PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}
|
||||
- PROFILER_SAMPLING_TYPE=${PROFILER_SAMPLING_TYPE}
|
||||
- PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}
|
||||
- PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}
|
||||
- PROFILER_SAMPLING_NEW_THROUGHPUT=${PROFILER_SAMPLING_NEW_THROUGHPUT}
|
||||
- PROFILER_SAMPLING_CONTINUE_THROUGHPUT=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}
|
||||
- PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
|
||||
- DEBUG_LEVEL=${AGENT_DEBUG_LEVEL}
|
||||
- PROFILER_TRANSPORT_MODULE=${PROFILER_TRANSPORT_MODULE}
|
||||
networks:
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
PINPOINT_VERSION=2.4.1
|
||||
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
|
||||
@@ -1,17 +0,0 @@
|
||||
FROM openjdk:11.0.16-jre-slim-buster
|
||||
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
|
||||
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 apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
|
||||
&& 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"]
|
||||
@@ -1,36 +0,0 @@
|
||||
## Pinpoint Batch
|
||||
|
||||
This Docker image contains the Pinpoint Batch component of the Pinpoint application monitoring system.
|
||||
|
||||
## Supported Tags
|
||||
|
||||
- 2.4.1
|
||||
- 2.4.0
|
||||
|
||||
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?
|
||||
|
||||
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.
|
||||
|
||||
## License
|
||||
|
||||
Pinpoint is licensed under the Apache License, Version 2.0.
|
||||
See [LICENSE](https://github.com/pinpoint-apm/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.
|
||||
```
|
||||
@@ -1,8 +0,0 @@
|
||||
##########
|
||||
# another way of setting properties.
|
||||
# applied priority '.ENV' -> 'pinpoint-web.properties'
|
||||
# property should be commented in docker-compose file to use
|
||||
# ex) PINPOINT_ZOOKEEPER_ADDRESS should be commented in docker-compose to use pinpoint.zookeeper.address below
|
||||
##########
|
||||
|
||||
pinpoint.zookeeper.address=
|
||||
@@ -1,5 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
set -x
|
||||
|
||||
exec java -jar /pinpoint/pinpoint-batch.jar --spring.config.additional-location=/pinpoint/config/pinpoint-batch.properties
|
||||
@@ -1,45 +0,0 @@
|
||||
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}
|
||||
@@ -1,4 +1,4 @@
|
||||
PINPOINT_VERSION=2.4.1
|
||||
PINPOINT_VERSION=2.3.1
|
||||
SPRING_PROFILES=release
|
||||
|
||||
### Pinpoint-Collector
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
FROM openjdk:11.0.16-jre-slim-buster
|
||||
FROM openjdk:8-jdk-alpine
|
||||
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
|
||||
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
|
||||
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
|
||||
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1}
|
||||
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
|
||||
|
||||
RUN mkdir -p /pinpoint/config \
|
||||
&& mkdir -p /pinpoint/scripts
|
||||
@@ -9,9 +11,9 @@ RUN mkdir -p /pinpoint/config \
|
||||
COPY /build/config/pinpoint-collector.properties /pinpoint/config/
|
||||
COPY /build/scripts/start-collector.sh /pinpoint/scripts/
|
||||
#temporary line for local test
|
||||
#COPY /pinpoint-collector-boot-2.4.1-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
|
||||
#COPY /pinpoint-collector-boot-2.3.1-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
|
||||
|
||||
RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
|
||||
RUN apk --no-cache add curl \
|
||||
&& chmod a+x /pinpoint/scripts/start-collector.sh \
|
||||
&& chmod a+x /pinpoint/config/pinpoint-collector.properties \
|
||||
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar
|
||||
|
||||
@@ -4,11 +4,6 @@
|
||||
This Docker image contains the Pinpoint Collector component of the Pinpoint application monitoring system.
|
||||
|
||||
## Supported Tags
|
||||
|
||||
- 2.4.1
|
||||
- 2.4.0
|
||||
- 2.3.3
|
||||
- 2.3.2
|
||||
- 2.3.1
|
||||
- 2.3.0
|
||||
- 2.2.2
|
||||
@@ -29,17 +24,17 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl
|
||||
- 1.7.3
|
||||
- 1.7.2
|
||||
|
||||
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.
|
||||
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/pinpoint-apm/pinpoint/issues).
|
||||
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/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
|
||||
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
|
||||
|
||||
```
|
||||
Copyright 2018 NAVER Corp.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
PINPOINT_VERSION=2.4.1
|
||||
PINPOINT_VERSION=2.3.1
|
||||
|
||||
### Pinpoint-flink
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
FROM flink:1.14-java11
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
|
||||
FROM flink:1.7
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1}
|
||||
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-flink-job-${PINPOINT_VERSION}.jar
|
||||
|
||||
RUN apt-get update \
|
||||
|
||||
@@ -1,28 +1,41 @@
|
||||
|
||||
## Pinpoint Flink
|
||||
## Pinpoint Hbase
|
||||
|
||||
This Docker image contains the Pinpoint Flink component of the Pinpoint application monitoring system.
|
||||
This Docker image contains the Pinpoint Hbase component of the Pinpoint application monitoring system.
|
||||
|
||||
## Supported Tags
|
||||
|
||||
- 2.4.1
|
||||
- 2.4.0
|
||||
- 2.3.3
|
||||
- 2.3.2
|
||||
- 2.3.1
|
||||
- 2.3.0
|
||||
- 2.2.2
|
||||
- 2.2.1
|
||||
- 2.2.0
|
||||
- 2.1.2
|
||||
- 2.1.0
|
||||
- 2.0.4
|
||||
- 2.0.3
|
||||
- 2.0.2
|
||||
- 2.0.1
|
||||
- 1.8.5
|
||||
- 1.8.4
|
||||
- 1.8.3
|
||||
- 1.8.2
|
||||
- 1.8.1
|
||||
- 1.8.0
|
||||
- 1.7.3
|
||||
- 1.7.2
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
## Any Issues or Suggestions?
|
||||
|
||||
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
|
||||
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/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
|
||||
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
|
||||
|
||||
```
|
||||
Copyright 2018 NAVER Corp.
|
||||
|
||||
@@ -14,8 +14,6 @@ hbase.ipc.client.tcpnodelay=true
|
||||
hbase.rpc.timeout=10000
|
||||
# hbase default:Integer.MAX_VALUE
|
||||
hbase.client.operation.timeout=10000
|
||||
# hbase default: 20m
|
||||
hbase.client.meta.operation.timeout=10000
|
||||
|
||||
# hbase socket read timeout. default: 200000
|
||||
hbase.ipc.client.socket.timeout.read=20000
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
PINPOINT_VERSION=2.4.1
|
||||
PINPOINT_VERSION=2.3.1
|
||||
|
||||
### Pinpoint-Hbase
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
FROM openjdk:8u342-slim
|
||||
FROM java:8-jdk
|
||||
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
|
||||
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
|
||||
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1}
|
||||
|
||||
ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
|
||||
ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase
|
||||
@@ -14,8 +16,7 @@ COPY hbase-env.sh hbase-env.sh
|
||||
COPY /build/scripts/initialize-hbase.sh /usr/local/bin/
|
||||
COPY /build/scripts/check-table.sh /usr/local/bin/
|
||||
|
||||
RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
|
||||
&& chmod a+x /usr/local/bin/initialize-hbase.sh \
|
||||
RUN chmod a+x /usr/local/bin/initialize-hbase.sh \
|
||||
&& chmod a+x /usr/local/bin/check-table.sh \
|
||||
&& mkdir -p ${BASE_DIR} \
|
||||
&& cd ${BASE_DIR} \
|
||||
@@ -23,7 +24,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get
|
||||
&& tar xfvz hbase.tar.gz \
|
||||
&& mv ../../hbase-site.xml ../../${HBASE_HOME}/conf/hbase-site.xml \
|
||||
&& mv ../../hbase-env.sh ../../${HBASE_HOME}/conf/hbase-env.sh \
|
||||
&& curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${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
|
||||
|
||||
VOLUME ["/home/pinpoint/hbase", "/home/pinpoint/zookeeper"]
|
||||
|
||||
|
||||
@@ -5,10 +5,6 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat
|
||||
|
||||
## Supported Tags
|
||||
|
||||
- 2.4.1
|
||||
- 2.4.0
|
||||
- 2.3.3
|
||||
- 2.3.2
|
||||
- 2.3.1
|
||||
- 2.3.0
|
||||
- 2.2.2
|
||||
@@ -29,17 +25,17 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat
|
||||
- 1.7.3
|
||||
- 1.7.2
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
## Any Issues or Suggestions?
|
||||
|
||||
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
|
||||
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/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
|
||||
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
|
||||
|
||||
```
|
||||
Copyright 2018 NAVER Corp.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
PINPOINT_VERSION=2.4.1
|
||||
PINPOINT_VERSION=2.3.1
|
||||
|
||||
### Pinpoint-mysql
|
||||
MYSQL_ROOT_PASSWORD=root123
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
FROM mysql:8.0
|
||||
FROM mysql:5.7
|
||||
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1}
|
||||
|
||||
RUN curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql" -o /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \
|
||||
&& curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-mysql.sql" -o /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \
|
||||
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/v$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql" \
|
||||
&& wget -O /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql "https://raw.githubusercontent.com/naver/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-mysql.sql" \
|
||||
&& sed -i '/^--/d' /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \
|
||||
&& sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql
|
||||
&& sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \
|
||||
&& apt-get purge -y --auto-remove ca-certificates wget
|
||||
|
||||
@@ -5,10 +5,6 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat
|
||||
|
||||
## Supported Tags
|
||||
|
||||
- 2.4.1
|
||||
- 2.4.0
|
||||
- 2.3.3
|
||||
- 2.3.2
|
||||
- 2.3.1
|
||||
- 2.3.0
|
||||
- 2.2.2
|
||||
@@ -29,17 +25,17 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat
|
||||
- 1.7.3
|
||||
- 1.7.2
|
||||
|
||||
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.
|
||||
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/pinpoint-apm/pinpoint/issues).
|
||||
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/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
|
||||
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
|
||||
|
||||
```
|
||||
Copyright 2018 NAVER Corp.
|
||||
|
||||
@@ -22,4 +22,4 @@ services:
|
||||
- MYSQL_DATABASE=${MYSQL_DATABASE}
|
||||
|
||||
volumes:
|
||||
- /var/lib/mysql
|
||||
- ./var/lib/mysql
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
PINPOINT_VERSION=2.4.1
|
||||
PINPOINT_VERSION=2.3.1
|
||||
SPRING_PROFILES=release
|
||||
|
||||
### Pinpoint-Agent
|
||||
@@ -12,12 +12,8 @@ PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=9991
|
||||
PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=9992
|
||||
PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=9993
|
||||
|
||||
# Sampling Configurations
|
||||
PROFILER_SAMPLING_TYPE=COUNTING
|
||||
PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=1
|
||||
PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=100
|
||||
PROFILER_SAMPLING_NEW_THROUGHPUT=0
|
||||
PROFILER_SAMPLING_CONTINUE_THROUGHPUT=0
|
||||
# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
|
||||
PROFILER_SAMPLING_RATE=1
|
||||
|
||||
AGENT_ID=app-in-docker
|
||||
APP_NAME=quickapp
|
||||
@@ -27,4 +23,4 @@ AGENT_DEBUG_LEVEL=INFO
|
||||
|
||||
### Pinpoint-quickstart
|
||||
|
||||
APP_PORT=8085
|
||||
APP_PORT=8000
|
||||
@@ -1,11 +1,11 @@
|
||||
FROM tomcat:8-jre8
|
||||
|
||||
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
|
||||
|
||||
COPY /build/pinpoint-quickstart-testapp.war quickstart.war
|
||||
|
||||
RUN rm -rf /usr/local/tomcat/webapps \
|
||||
&& mkdir -p /usr/local/tomcat/webapps \
|
||||
&& apt-get update \
|
||||
&& apt-get install --no-install-recommends -y unzip\
|
||||
&& unzip quickstart.war -d /usr/local/tomcat/webapps/ROOT \
|
||||
&& rm -rf quickstart.war
|
||||
|
||||
|
||||
@@ -5,10 +5,6 @@ This Docker image contains the Pinpoint Quickstart sample to test Pinpoint appli
|
||||
|
||||
## Supported Tags
|
||||
|
||||
- 2.4.1
|
||||
- 2.4.0
|
||||
- 2.3.3
|
||||
- 2.3.2
|
||||
- 2.3.1
|
||||
- 2.3.0
|
||||
- 2.2.2
|
||||
@@ -29,17 +25,17 @@ This Docker image contains the Pinpoint Quickstart sample to test Pinpoint appli
|
||||
- 1.7.3
|
||||
- 1.7.2
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
## Any Issues or Suggestions?
|
||||
|
||||
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
|
||||
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/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
|
||||
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
|
||||
|
||||
```
|
||||
Copyright 2018 NAVER Corp.
|
||||
|
||||
@@ -9,7 +9,7 @@ services:
|
||||
container_name: "pinpoint-quickstart"
|
||||
image: "pinpointdocker/pinpoint-quickstart"
|
||||
ports:
|
||||
- "${APP_PORT:-8085}:8080"
|
||||
- "${APP_PORT:-8080}:8080"
|
||||
volumes:
|
||||
- data-volume:/pinpoint-agent
|
||||
environment:
|
||||
@@ -40,11 +40,7 @@ services:
|
||||
- COLLECTOR_TCP_PORT=${COLLECTOR_TCP_PORT}
|
||||
- COLLECTOR_STAT_PORT=${COLLECTOR_STAT_PORT}
|
||||
- COLLECTOR_SPAN_PORT=${COLLECTOR_SPAN_PORT}
|
||||
- PROFILER_SAMPLING_TYPE=${PROFILER_SAMPLING_TYPE}
|
||||
- PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}
|
||||
- PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}
|
||||
- PROFILER_SAMPLING_NEW_THROUGHPUT=${PROFILER_SAMPLING_NEW_THROUGHPUT}
|
||||
- PROFILER_SAMPLING_CONTINUE_THROUGHPUT=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}
|
||||
- PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
|
||||
- DEBUG_LEVEL=${AGENT_DEBUG_LEVEL}
|
||||
|
||||
volumes:
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
PINPOINT_VERSION=2.4.1
|
||||
PINPOINT_VERSION=2.3.1
|
||||
SPRING_PROFILES=release
|
||||
|
||||
### Pinpoint-Web
|
||||
|
||||
PINPOINT_WEB_NAME=pinpoint-web
|
||||
|
||||
WEB_SERVER_PORT=8080
|
||||
SERVER_PORT=8079
|
||||
#zookeeper information required
|
||||
PINPOINT_ZOOKEEPER_ADDRESS=
|
||||
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
FROM openjdk:11.0.16-jre-slim-buster
|
||||
FROM openjdk:8-jdk-alpine
|
||||
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
|
||||
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar
|
||||
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
|
||||
|
||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1}
|
||||
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar
|
||||
|
||||
RUN mkdir -p /pinpoint/config \
|
||||
&& mkdir -p /pinpoint/scripts
|
||||
@@ -9,9 +11,9 @@ RUN mkdir -p /pinpoint/config \
|
||||
COPY /build/config/pinpoint-web.properties /pinpoint/config/
|
||||
COPY /build/scripts/start-web.sh /pinpoint/scripts/
|
||||
#temporary line for local test
|
||||
#COPY /pinpoint-web-boot-2.4.1-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
|
||||
#COPY /pinpoint-web-boot-2.3.1-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
|
||||
|
||||
RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
|
||||
RUN apk --no-cache add curl \
|
||||
&& chmod a+x /pinpoint/scripts/start-web.sh \
|
||||
&& chmod a+x /pinpoint/config/pinpoint-web.properties \
|
||||
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-web-boot.jar
|
||||
|
||||
@@ -5,10 +5,6 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio
|
||||
|
||||
## Supported Tags
|
||||
|
||||
- 2.4.1
|
||||
- 2.4.0
|
||||
- 2.3.3
|
||||
- 2.3.2
|
||||
- 2.3.1
|
||||
- 2.3.0
|
||||
- 2.2.2
|
||||
@@ -29,17 +25,17 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio
|
||||
- 1.7.3
|
||||
- 1.7.2
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
## Any Issues or Suggestions?
|
||||
|
||||
Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
|
||||
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/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
|
||||
See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
|
||||
|
||||
```
|
||||
Copyright 2018 NAVER Corp.
|
||||
|
||||
@@ -13,13 +13,13 @@ services:
|
||||
|
||||
restart: always
|
||||
expose:
|
||||
- "${WEB_SERVER_PORT:-8080}"
|
||||
- "${SERVER_PORT:-8080}"
|
||||
- "9997"
|
||||
ports:
|
||||
- "9997:9997"
|
||||
- "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
|
||||
- "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}"
|
||||
environment:
|
||||
- WEB_SERVER_PORT=${WEB_SERVER_PORT}
|
||||
- SERVER_PORT=${SERVER_PORT}
|
||||
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
|
||||
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
|
||||
- CLUSTER_ENABLE=${CLUSTER_ENABLE}
|
||||
|
||||
Reference in New Issue
Block a user