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

Release 2.5.0 and add metric cluster for mac m1

This commit is contained in:
ga-ram 2022-12-30 15:10:36 +09:00
parent 62fd8704fb
commit 63264aa713
33 changed files with 304 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.env
View File

@ -1,9 +1,9 @@
PINPOINT_VERSION=2.4.2 PINPOINT_VERSION=2.5.0
SPRING_PROFILES=release SPRING_PROFILES=release
# Used to make collector ip fixed for external microservices which uses pinpoint agent with collector ip. # Used to make collector ip fixed for external microservices which uses pinpoint agent with collector ip.
PINPOINT_NETWORK_SUBNET=172.24.0.0/28 PINPOINT_NETWORK_SUBNET=172.24.0.0/27
COLLECTOR_FIXED_IP=172.24.0.11 COLLECTOR_FIXED_IP=172.24.0.30
#zookeeper information required #zookeeper information required
PINPOINT_ZOOKEEPER_ADDRESS=zoo1 PINPOINT_ZOOKEEPER_ADDRESS=zoo1
@ -155,3 +155,11 @@ FLINK_WEB_PORT=8081
### Pinpoint-quickstart ### Pinpoint-quickstart
APP_PORT=8085 APP_PORT=8085
### Pinpoint-pinot
PINPOINT_PINOT_JDBC_URL=jdbc:pinot://pinot-controller:9000
PINPOINT_PINOT_JDBC_USERNAME=admin
PINPOINT_PINOT_JDBC_PASSWORD=admin
### Pinpoint-kafka
PINPOINT_METRIC_KAFKA_BOOTSTRAP_SERVERS=pinpoint-kafka:9092

1
Readme.md
View File

@ -12,6 +12,7 @@ Installing Pinpoint with these docker files will take approximately 10min. to ch
It supports and helps you understand your application in a glance and allow you to build world-class, high-quality software. It supports and helps you understand your application in a glance and allow you to build world-class, high-quality software.
## Supported Tags ## Supported Tags
- 2.5.0
- 2.4.2 - 2.4.2
- 2.4.1 - 2.4.1
- 2.4.0 - 2.4.0

214
docker-compose-metric.yml Normal file
View File

@ -0,0 +1,214 @@
version: "3.6"
services:
pinpoint-web:
build:
context: ./pinpoint-web
dockerfile: Dockerfile-metric
args:
- PINPOINT_VERSION=${PINPOINT_VERSION}
container_name: "${PINPOINT_WEB_NAME}"
image: "pinpointdocker/pinpoint-web:${PINPOINT_VERSION}-metric"
depends_on:
- pinpoint-hbase
- pinpoint-mysql
- zoo1
- pinpoint-kafka-init
- pinot-init
restart: always
expose:
- "9997"
ports:
- "9997:9997"
- "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
environment:
- WEB_SERVER_PORT=${WEB_SERVER_PORT}
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},metric
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
- CLUSTER_ENABLE=${CLUSTER_ENABLE}
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
- CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
- LOGGING_LEVEL_ROOT=${WEB_LOGGING_LEVEL_ROOT}
- CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT}
- JDBC_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
- JDBC_URL=${JDBC_URL}
- JDBC_USERNAME=${JDBC_USERNAME}
- JDBC_PASSWORD=${JDBC_PASSWORD}
- PINPOINT_PINOT_JDBC_URL=${PINPOINT_PINOT_JDBC_URL}
- PINPOINT_PINOT_JDBC_USERNAME=${PINPOINT_PINOT_JDBC_USERNAME}
- PINPOINT_PINOT_JDBC_PASSWORD=${PINPOINT_PINOT_JDBC_PASSWORD}
links:
- "pinpoint-mysql:pinpoint-mysql"
networks:
- pinpoint
pinpoint-collector:
build:
context: ./pinpoint-collector
dockerfile: Dockerfile-metric
args:
- PINPOINT_VERSION=${PINPOINT_VERSION}
container_name: "${PINPOINT_COLLECTOR_NAME}"
image: "pinpointdocker/pinpoint-collector:${PINPOINT_VERSION}-metric"
depends_on:
- pinpoint-hbase
- zoo1
- pinpoint-kafka-init
- pinot-init
restart: always
expose:
- "9991"
- "9992"
- "9993"
- "9994"
- "9995"
- "9996"
- "15200"
ports:
- "${COLLECTOR_RECEIVER_GRPC_AGENT_PORT:-9991}:9991/tcp"
- "${COLLECTOR_RECEIVER_GRPC_STAT_PORT:-9992}:9992/tcp"
- "${COLLECTOR_RECEIVER_GRPC_SPAN_PORT:-9993}:9993/tcp"
- "${COLLECTOR_RECEIVER_BASE_PORT:-9994}:9994"
- "${COLLECTOR_RECEIVER_STAT_UDP_PORT:-9995}:9995/tcp"
- "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/tcp"
- "${COLLECTOR_RECEIVER_STAT_UDP_PORT:-9995}:9995/udp"
- "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/udp"
networks:
pinpoint:
ipv4_address: ${COLLECTOR_FIXED_IP}
environment:
- SPRING_PROFILES_ACTIVE=local,metric
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
- CLUSTER_ENABLE=${CLUSTER_ENABLE}
- LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
- FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE}
- FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}
- PINPOINT_PINOT_JDBC_URL=${PINPOINT_PINOT_JDBC_URL}
- PINPOINT_PINOT_JDBC_USERNAME=${PINPOINT_PINOT_JDBC_USERNAME}
- PINPOINT_PINOT_JDBC_PASSWORD=${PINPOINT_PINOT_JDBC_PASSWORD}
- PINPOINT_METRIC_KAFKA_BOOTSTRAP_SERVERS=${PINPOINT_METRIC_KAFKA_BOOTSTRAP_SERVERS}
pinpoint-kafka:
image: ubuntu/kafka:3.1-22.04_beta
restart: unless-stopped
hostname: pinpoint-kafka
command: /etc/kafka/server.properties --override advertised.listeners=PLAINTEXT://pinpoint-kafka:9092
depends_on:
- pinot-zoo
expose:
- "9092"
environment:
- ZOOKEEPER_HOST=pinot-zoo
networks:
- pinpoint
pinpoint-kafka-init:
image: ubuntu/kafka:3.1-22.04_beta
restart: "no"
depends_on:
- pinpoint-kafka
entrypoint: >
sh -c "/opt/kafka/bin/kafka-topics.sh --create --topic url-stat --bootstrap-server pinpoint-kafka:9092 &&
/opt/kafka/bin/kafka-topics.sh --create --topic system-metric-data-type --bootstrap-server pinpoint-kafka:9092 &&
/opt/kafka/bin/kafka-topics.sh --create --topic system-metric-tag --bootstrap-server pinpoint-kafka:9092 &&
/opt/kafka/bin/kafka-topics.sh --create --topic system-metric-double --bootstrap-server pinpoint-kafka:9092"
networks:
- pinpoint
pinot-controller:
image: apachepinot/pinot:latest-arm64
restart: unless-stopped
command: StartController -zkAddress pinot-zoo
depends_on:
- pinot-zoo
expose:
- "9000"
ports:
- "9000:9000"
networks:
- pinpoint
pinot-broker-0:
image: apachepinot/pinot:latest-arm64
restart: unless-stopped
command: StartBroker -zkAddress pinot-zoo
depends_on:
- pinot-controller
expose:
- "8099"
networks:
- pinpoint
pinot-server-0:
image: apachepinot/pinot:latest-arm64
restart: unless-stopped
command: StartServer -zkAddress pinot-zoo
depends_on:
- pinot-broker-0
expose:
- "8098"
networks:
- pinpoint
pinot-init:
image: apachepinot/pinot:latest-arm64
restart: "no"
entrypoint: >
sh -c "
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-uriStat-table.json > uriStatTable.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-uriStat-schema.json > uriStatSchema.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-tag-table.json > tagTable.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-tag-schema.json > tagSchema.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-double-table.json > doubleTable.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-double-schema.json > doubleSchema.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-dataType-table.json > dataTypeTable.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-dataType-schema.json > dataTypeSchema.json &&
sed -i 's/localhost:19092/pinpoint-kafka:9092/g' uriStatTable.json tagTable.json doubleTable.json dataTypeTable.json &&
sed -i 's/uri-stat/url-stat/g' uriStatTable.json &&
sed -i '3,$$s/Double/DOUBLE/' doubleSchema.json &&
sleep 30 &&
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile uriStatSchema.json -realtimeTableConfigFile uriStatTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile tagSchema.json -realtimeTableConfigFile tagTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile doubleSchema.json -realtimeTableConfigFile doubleTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile dataTypeSchema.json -realtimeTableConfigFile dataTypeTable.json -controllerHost pinot-controller -controllerPort 9000 -exec"
depends_on:
- pinot-server
- pinpoint-kafka-init
networks:
- pinpoint
#zookeepers
pinot-zoo:
image: zookeeper:3.8.0-temurin
restart: always
expose:
- "2181"
networks:
- pinpoint
telegraf:
image: telegraf:1.25.0
networks:
- pinpoint
depends_on:
- pinpoint-collector
entrypoint: >
sh -c "
echo '
[[inputs.cpu]]\
percpu = true\
totalcpu = true\
collect_cpu_time = false\
report_active = false\
[[outputs.http]]\
url = \"http://pinpoint-collector:15200/telegraf\"\
data_format = \"json\"\
[outputs.http.headers]\
hostGroupName = \"pinpoint-docker\"\
Content-Type = \"application/json\"\' > telegraf.conf &&
cat telegraf.conf &&
telegraf -config telegraf.conf"

4
docker-compose.yml
View File

@ -95,7 +95,7 @@ services:
- "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}" - "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
environment: environment:
- WEB_SERVER_PORT=${WEB_SERVER_PORT} - WEB_SERVER_PORT=${WEB_SERVER_PORT}
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS} - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
- CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ENABLE=${CLUSTER_ENABLE}
- ADMIN_PASSWORD=${ADMIN_PASSWORD} - ADMIN_PASSWORD=${ADMIN_PASSWORD}
@ -223,9 +223,7 @@ services:
container_name: "${PINPOINT_AGENT_NAME}" container_name: "${PINPOINT_AGENT_NAME}"
image: "pinpointdocker/pinpoint-agent:${PINPOINT_VERSION}" image: "pinpointdocker/pinpoint-agent:${PINPOINT_VERSION}"
restart: unless-stopped restart: unless-stopped
networks: networks:
- pinpoint - pinpoint
volumes: volumes:

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

@ -1,5 +1,5 @@
### Pinpoint with Java ### Pinpoint with Java
PINPOINT_VERSION=2.4.2 PINPOINT_VERSION=2.5.0
SPRING_PROFILES=release SPRING_PROFILES=release
AGENT_ID=java-app-in-docker AGENT_ID=java-app-in-docker
APP_NAME=JavaAttachExample APP_NAME=JavaAttachExample

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

@ -1,5 +1,5 @@
### Pinpoint with Tomcat ### Pinpoint with Tomcat
PINPOINT_VERSION=2.4.2 PINPOINT_VERSION=2.5.0
SPRING_PROFILES=release SPRING_PROFILES=release
APP_PORT=8085 APP_PORT=8085
AGENT_ID=app-in-docker AGENT_ID=app-in-docker

2
pinpoint-agent/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.4.2 PINPOINT_VERSION=2.5.0
SPRING_PROFILES=release SPRING_PROFILES=release
### Pinpoint-Agent ### Pinpoint-Agent

2
pinpoint-agent/Dockerfile
View File

@ -1,6 +1,6 @@
FROM alpine:3.7 FROM alpine:3.7
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
ARG INSTALL_URL=https://github.com/pinpoint-apm/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/

1
pinpoint-agent/Readme.md
View File

@ -4,6 +4,7 @@
This Docker image contains the Pinpoint Agent component of the Pinpoint application monitoring system. This Docker image contains the Pinpoint Agent component of the Pinpoint application monitoring system.
## Supported Tags ## Supported Tags
- 2.5.0
- 2.4.2 - 2.4.2
- 2.4.1 - 2.4.1
- 2.4.0 - 2.4.0

18
pinpoint-agent/build/scripts/configure-agent.sh
View File

@ -3,25 +3,25 @@ set -e
set -x set -x
#sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/pinpoint.config #sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/pinpoint.config
sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
sed -i "/profiler.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config sed -i "/profiler.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
sed -i "/profiler.collector.tcp.port=/ s/=.*/=${COLLECTOR_TCP_PORT}/" /pinpoint-agent/pinpoint-root.config sed -i "/profiler.collector.tcp.port=/ s/=.*/=${COLLECTOR_TCP_PORT}/" /pinpoint-agent/pinpoint-root.config
sed -i "/profiler.collector.stat.port=/ s/=.*/=${COLLECTOR_STAT_PORT}/" /pinpoint-agent/pinpoint-root.config sed -i "/profiler.collector.stat.port=/ s/=.*/=${COLLECTOR_STAT_PORT}/" /pinpoint-agent/pinpoint-root.config
sed -i "/profiler.collector.span.port=/ s/=.*/=${COLLECTOR_SPAN_PORT}/" /pinpoint-agent/pinpoint-root.config sed -i "/profiler.collector.span.port=/ s/=.*/=${COLLECTOR_SPAN_PORT}/" /pinpoint-agent/pinpoint-root.config
#sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config #sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config
sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
sed -i "/profiler.transport.grpc.agent.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config sed -i "/profiler.transport.grpc.agent.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
sed -i "/profiler.transport.grpc.metadata.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config sed -i "/profiler.transport.grpc.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.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.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.type=/ s/=.*/=${PROFILER_SAMPLING_TYPE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/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.counting.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/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.percent.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
sed -i "/profiler.sampling.new.throughput=/ s/=.*/=${PROFILER_SAMPLING_NEW_THROUGHPUT}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config sed -i "/profiler.sampling.new.throughput=/ s/=.*/=${PROFILER_SAMPLING_NEW_THROUGHPUT}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
sed -i "/profiler.sampling.continue.throughput=/ s/=.*/=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config sed -i "/profiler.sampling.continue.throughput=/ s/=.*/=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
sed -i "/Root level=/ s/=.*/=\"${DEBUG_LEVEL}\">/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j2.xml sed -i "/Root level=/ s/=.*/=\"${DEBUG_LEVEL}\">/g" /pinpoint-agent/profiles/local/log4j2.xml /pinpoint-agent/profiles/release/log4j2.xml
exec "$@" exec "$@"

2
pinpoint-batch/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.4.2 PINPOINT_VERSION=2.5.0
SPRING_PROFILES=release SPRING_PROFILES=release
### Pinpoint-Batch ### Pinpoint-Batch

2
pinpoint-batch/Dockerfile
View File

@ -1,6 +1,6 @@
FROM openjdk:11.0.16-jre-slim-buster FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-batch-${PINPOINT_VERSION}.jar ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-batch-${PINPOINT_VERSION}.jar
RUN mkdir -p /pinpoint/config \ RUN mkdir -p /pinpoint/config \

1
pinpoint-batch/Readme.md
View File

@ -3,6 +3,7 @@
This Docker image contains the Pinpoint Batch component of the Pinpoint application monitoring system. This Docker image contains the Pinpoint Batch component of the Pinpoint application monitoring system.
## Supported Tags ## Supported Tags
- 2.5.0
- 2.4.2 - 2.4.2
- 2.4.1 - 2.4.1
- 2.4.0 - 2.4.0

2
pinpoint-collector/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.4.2 PINPOINT_VERSION=2.5.0
SPRING_PROFILES=release SPRING_PROFILES=release
### Pinpoint-Collector ### Pinpoint-Collector

4
pinpoint-collector/Dockerfile
View File

@ -1,6 +1,6 @@
FROM openjdk:11.0.16-jre-slim-buster FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
ARG INSTALL_URL=https://github.com/pinpoint-apm/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 \
@ -8,8 +8,6 @@ RUN mkdir -p /pinpoint/config \
COPY /build/config/pinpoint-collector.properties /pinpoint/config/ COPY /build/config/pinpoint-collector.properties /pinpoint/config/
COPY /build/scripts/start-collector.sh /pinpoint/scripts/ COPY /build/scripts/start-collector.sh /pinpoint/scripts/
#temporary line for local test
#COPY /pinpoint-collector-boot-2.4.2-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \ RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
&& chmod a+x /pinpoint/scripts/start-collector.sh \ && chmod a+x /pinpoint/scripts/start-collector.sh \

19
pinpoint-collector/Dockerfile-metric Normal file
View File

@ -0,0 +1,19 @@
FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
#ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-${PINPOINT_VERSION}.jar
ARG INSTALL_URL=https://github.com/ga-ram/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-2.5.0.jar
RUN mkdir -p /pinpoint/config \
&& mkdir -p /pinpoint/scripts
COPY /build/config/pinpoint-collector.properties /pinpoint/config/
COPY /build/scripts/start-collector-metric.sh /pinpoint/scripts/
RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
&& chmod a+x /pinpoint/scripts/start-collector-metric.sh \
&& chmod a+x /pinpoint/config/pinpoint-collector.properties \
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar
ENTRYPOINT ["sh", "/pinpoint/scripts/start-collector-metric.sh"]

1
pinpoint-collector/Readme.md
View File

@ -4,6 +4,7 @@
This Docker image contains the Pinpoint Collector component of the Pinpoint application monitoring system. This Docker image contains the Pinpoint Collector component of the Pinpoint application monitoring system.
## Supported Tags ## Supported Tags
- 2.5.0
- 2.4.2 - 2.4.2
- 2.4.1 - 2.4.1
- 2.4.0 - 2.4.0

5
pinpoint-collector/build/scripts/start-collector-metric.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/bash
set -e
set -x
exec java -jar /pinpoint/pinpoint-collector-boot.jar --spring.config.additional-location=/pinpoint/config/pinpoint-collector.properties --pinpoint.collector.type=ALL

2
pinpoint-flink/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.4.2 PINPOINT_VERSION=2.5.0
### Pinpoint-flink ### Pinpoint-flink

2
pinpoint-flink/Dockerfile
View File

@ -1,5 +1,5 @@
FROM flink:1.14-java11 FROM flink:1.14-java11
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-flink-job-${PINPOINT_VERSION}.jar ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-flink-job-${PINPOINT_VERSION}.jar
RUN apt-get update \ RUN apt-get update \

1
pinpoint-flink/Readme.md
View File

@ -4,6 +4,7 @@
This Docker image contains the Pinpoint Flink component of the Pinpoint application monitoring system. This Docker image contains the Pinpoint Flink component of the Pinpoint application monitoring system.
## Supported Tags ## Supported Tags
- 2.5.0
- 2.4.2 - 2.4.2
- 2.4.1 - 2.4.1
- 2.4.0 - 2.4.0

2
pinpoint-hbase/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.4.2 PINPOINT_VERSION=2.5.0
### Pinpoint-Hbase ### Pinpoint-Hbase

2
pinpoint-hbase/Dockerfile
View File

@ -1,6 +1,6 @@
FROM openjdk:8u342-slim FROM openjdk:8u342-slim
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase

1
pinpoint-hbase/Readme.md
View File

@ -4,6 +4,7 @@
This Docker image contains the Pinpoint Hbase component of the Pinpoint application monitoring system. This Docker image contains the Pinpoint Hbase component of the Pinpoint application monitoring system.
## Supported Tags ## Supported Tags
- 2.5.0
- 2.4.2 - 2.4.2
- 2.4.1 - 2.4.1
- 2.4.0 - 2.4.0

2
pinpoint-mysql/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.4.2 PINPOINT_VERSION=2.5.0
### Pinpoint-mysql ### Pinpoint-mysql
MYSQL_ROOT_PASSWORD=root123 MYSQL_ROOT_PASSWORD=root123

2
pinpoint-mysql/Dockerfile
View File

@ -1,6 +1,6 @@
FROM mysql:8.0 FROM mysql:8.0
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
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 \ 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 \ && 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 \

1
pinpoint-mysql/Readme.md
View File

@ -4,6 +4,7 @@
This Docker image contains the Pinpoint Mysql component of the Pinpoint application monitoring system. This Docker image contains the Pinpoint Mysql component of the Pinpoint application monitoring system.
## Supported Tags ## Supported Tags
- 2.5.0
- 2.4.2 - 2.4.2
- 2.4.1 - 2.4.1
- 2.4.0 - 2.4.0

2
pinpoint-quickstart/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.4.2 PINPOINT_VERSION=2.5.0
SPRING_PROFILES=release SPRING_PROFILES=release
### Pinpoint-Agent ### Pinpoint-Agent

1
pinpoint-quickstart/Readme.md
View File

@ -4,6 +4,7 @@
This Docker image contains the Pinpoint Quickstart sample to test Pinpoint application monitoring system. This Docker image contains the Pinpoint Quickstart sample to test Pinpoint application monitoring system.
## Supported Tags ## Supported Tags
- 2.5.0
- 2.4.2 - 2.4.2
- 2.4.1 - 2.4.1
- 2.4.0 - 2.4.0

2
pinpoint-web/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.4.2 PINPOINT_VERSION=2.5.0
SPRING_PROFILES=release SPRING_PROFILES=release
### Pinpoint-Web ### Pinpoint-Web

4
pinpoint-web/Dockerfile
View File

@ -1,6 +1,6 @@
FROM openjdk:11.0.16-jre-slim-buster FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
ARG INSTALL_URL=https://github.com/pinpoint-apm/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 \
@ -8,8 +8,6 @@ RUN mkdir -p /pinpoint/config \
COPY /build/config/pinpoint-web.properties /pinpoint/config/ COPY /build/config/pinpoint-web.properties /pinpoint/config/
COPY /build/scripts/start-web.sh /pinpoint/scripts/ COPY /build/scripts/start-web.sh /pinpoint/scripts/
#temporary line for local test
#COPY /pinpoint-web-boot-2.4.2-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \ RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
&& chmod a+x /pinpoint/scripts/start-web.sh \ && chmod a+x /pinpoint/scripts/start-web.sh \

19
pinpoint-web/Dockerfile-metric Normal file
View File

@ -0,0 +1,19 @@
FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
#ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-starter-boot-${PINPOINT_VERSION}.jar
ARG INSTALL_URL=https://github.com/ga-ram/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-starter-boot-2.5.0.jar
RUN mkdir -p /pinpoint/config \
&& mkdir -p /pinpoint/scripts
COPY /build/config/pinpoint-web.properties /pinpoint/config/
COPY /build/scripts/start-web.sh /pinpoint/scripts/
RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
&& chmod a+x /pinpoint/scripts/start-web.sh \
&& chmod a+x /pinpoint/config/pinpoint-web.properties \
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-web-boot.jar
#entry point to start-web.sh for future use.
ENTRYPOINT ["sh", "/pinpoint/scripts/start-web.sh"]

1
pinpoint-web/Readme.md
View File

@ -4,6 +4,7 @@
This Docker image contains the Pinpoint Web component of the Pinpoint application monitoring system. This Docker image contains the Pinpoint Web component of the Pinpoint application monitoring system.
## Supported Tags ## Supported Tags
- 2.5.0
- 2.4.2 - 2.4.2
- 2.4.1 - 2.4.1
- 2.4.0 - 2.4.0