From 2b50157e4f2da0289cb9420d37224081b72986fa Mon Sep 17 00:00:00 2001 From: ga-ram Date: Fri, 3 Mar 2023 17:31:13 +0900 Subject: [PATCH] Release 2.5.1 --- .env | 2 +- Readme.md | 1 + docker-compose-metric-arm.yml | 65 ----------------------- pinpoint-agent-attach-example/java/.env | 2 +- pinpoint-agent-attach-example/tomcat/.env | 2 +- pinpoint-agent/.env | 2 +- pinpoint-agent/Dockerfile | 2 +- pinpoint-agent/Readme.md | 1 + pinpoint-batch/.env | 2 +- pinpoint-batch/Dockerfile | 2 +- pinpoint-batch/Readme.md | 1 + pinpoint-collector/.env | 2 +- pinpoint-collector/Dockerfile | 2 +- pinpoint-collector/Readme.md | 1 + pinpoint-flink/.env | 2 +- pinpoint-flink/Dockerfile | 2 +- pinpoint-flink/Readme.md | 1 + pinpoint-hbase/.env | 2 +- pinpoint-hbase/Dockerfile | 2 +- pinpoint-hbase/Readme.md | 1 + pinpoint-mysql/.env | 2 +- pinpoint-mysql/Dockerfile | 2 +- pinpoint-mysql/Readme.md | 1 + pinpoint-quickstart/.env | 2 +- pinpoint-quickstart/Readme.md | 1 + pinpoint-web/.env | 2 +- pinpoint-web/Dockerfile | 2 +- pinpoint-web/Readme.md | 1 + 28 files changed, 27 insertions(+), 83 deletions(-) delete mode 100644 docker-compose-metric-arm.yml diff --git a/.env b/.env index 32104e3..42af3d5 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.5.0 +PINPOINT_VERSION=2.5.1 SPRING_PROFILES=release # Used to make collector ip fixed for external microservices which uses pinpoint agent with collector ip. diff --git a/Readme.md b/Readme.md index 4deb44e..86eba99 100644 --- a/Readme.md +++ b/Readme.md @@ -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. ## Supported Tags + - 2.5.1 - 2.5.0 - 2.4.2 - 2.4.1 diff --git a/docker-compose-metric-arm.yml b/docker-compose-metric-arm.yml deleted file mode 100644 index ebe761c..0000000 --- a/docker-compose-metric-arm.yml +++ /dev/null @@ -1,65 +0,0 @@ -version: "3.6" - -services: - - 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 && - - 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-0 - - pinpoint-kafka-init - networks: - - pinpoint \ No newline at end of file diff --git a/pinpoint-agent-attach-example/java/.env b/pinpoint-agent-attach-example/java/.env index b79d46b..e2683ec 100644 --- a/pinpoint-agent-attach-example/java/.env +++ b/pinpoint-agent-attach-example/java/.env @@ -1,5 +1,5 @@ ### Pinpoint with Java -PINPOINT_VERSION=2.5.0 +PINPOINT_VERSION=2.5.1 SPRING_PROFILES=release AGENT_ID=java-app-in-docker APP_NAME=JavaAttachExample diff --git a/pinpoint-agent-attach-example/tomcat/.env b/pinpoint-agent-attach-example/tomcat/.env index 1218d83..9784295 100644 --- a/pinpoint-agent-attach-example/tomcat/.env +++ b/pinpoint-agent-attach-example/tomcat/.env @@ -1,5 +1,5 @@ ### Pinpoint with Tomcat -PINPOINT_VERSION=2.5.0 +PINPOINT_VERSION=2.5.1 SPRING_PROFILES=release APP_PORT=8085 AGENT_ID=app-in-docker diff --git a/pinpoint-agent/.env b/pinpoint-agent/.env index 668071c..e947587 100644 --- a/pinpoint-agent/.env +++ b/pinpoint-agent/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.5.0 +PINPOINT_VERSION=2.5.1 SPRING_PROFILES=release ### Pinpoint-Agent diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile index 4eaa9e8..77584aa 100644 --- a/pinpoint-agent/Dockerfile +++ b/pinpoint-agent/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.1} 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/ diff --git a/pinpoint-agent/Readme.md b/pinpoint-agent/Readme.md index d64cb70..169de6b 100644 --- a/pinpoint-agent/Readme.md +++ b/pinpoint-agent/Readme.md @@ -4,6 +4,7 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint application monitoring system. ## Supported Tags + - 2.5.1 - 2.5.0 - 2.4.2 - 2.4.1 diff --git a/pinpoint-batch/.env b/pinpoint-batch/.env index 44fcc5a..52d8370 100644 --- a/pinpoint-batch/.env +++ b/pinpoint-batch/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.5.0 +PINPOINT_VERSION=2.5.1 SPRING_PROFILES=release ### Pinpoint-Batch diff --git a/pinpoint-batch/Dockerfile b/pinpoint-batch/Dockerfile index 14b0693..f8c0268 100644 --- a/pinpoint-batch/Dockerfile +++ b/pinpoint-batch/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:11.0.16-jre-slim-buster -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.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 \ diff --git a/pinpoint-batch/Readme.md b/pinpoint-batch/Readme.md index 34db8fb..42ff79f 100644 --- a/pinpoint-batch/Readme.md +++ b/pinpoint-batch/Readme.md @@ -3,6 +3,7 @@ This Docker image contains the Pinpoint Batch component of the Pinpoint application monitoring system. ## Supported Tags + - 2.5.1 - 2.5.0 - 2.4.2 - 2.4.1 diff --git a/pinpoint-collector/.env b/pinpoint-collector/.env index 4e6d3a4..b2d7fe0 100644 --- a/pinpoint-collector/.env +++ b/pinpoint-collector/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.5.0 +PINPOINT_VERSION=2.5.1 SPRING_PROFILES=release ### Pinpoint-Collector diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index 23db443..20e6fd4 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:11.0.16-jre-slim-buster -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.1} 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 \ diff --git a/pinpoint-collector/Readme.md b/pinpoint-collector/Readme.md index d9ea365..54fae05 100644 --- a/pinpoint-collector/Readme.md +++ b/pinpoint-collector/Readme.md @@ -4,6 +4,7 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint application monitoring system. ## Supported Tags + - 2.5.1 - 2.5.0 - 2.4.2 - 2.4.1 diff --git a/pinpoint-flink/.env b/pinpoint-flink/.env index 4fd848d..6f33797 100644 --- a/pinpoint-flink/.env +++ b/pinpoint-flink/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.5.0 +PINPOINT_VERSION=2.5.1 ### Pinpoint-flink diff --git a/pinpoint-flink/Dockerfile b/pinpoint-flink/Dockerfile index 99c04b5..28e108b 100644 --- a/pinpoint-flink/Dockerfile +++ b/pinpoint-flink/Dockerfile @@ -1,5 +1,5 @@ FROM flink:1.14-java11 -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.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 \ diff --git a/pinpoint-flink/Readme.md b/pinpoint-flink/Readme.md index eb18c21..9e27ad0 100644 --- a/pinpoint-flink/Readme.md +++ b/pinpoint-flink/Readme.md @@ -4,6 +4,7 @@ This Docker image contains the Pinpoint Flink component of the Pinpoint application monitoring system. ## Supported Tags + - 2.5.1 - 2.5.0 - 2.4.2 - 2.4.1 diff --git a/pinpoint-hbase/.env b/pinpoint-hbase/.env index 84d75da..a20cecb 100644 --- a/pinpoint-hbase/.env +++ b/pinpoint-hbase/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.5.0 +PINPOINT_VERSION=2.5.1 ### Pinpoint-Hbase diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile index 86f50a0..71f213b 100644 --- a/pinpoint-hbase/Dockerfile +++ b/pinpoint-hbase/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:8u342-slim -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.1} ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase diff --git a/pinpoint-hbase/Readme.md b/pinpoint-hbase/Readme.md index 5684f8c..9f946bf 100644 --- a/pinpoint-hbase/Readme.md +++ b/pinpoint-hbase/Readme.md @@ -4,6 +4,7 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint application monitoring system. ## Supported Tags + - 2.5.1 - 2.5.0 - 2.4.2 - 2.4.1 diff --git a/pinpoint-mysql/.env b/pinpoint-mysql/.env index dd897e5..f8eb2eb 100644 --- a/pinpoint-mysql/.env +++ b/pinpoint-mysql/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.5.0 +PINPOINT_VERSION=2.5.1 ### Pinpoint-mysql MYSQL_ROOT_PASSWORD=root123 diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile index 23c44d1..eba2ac9 100644 --- a/pinpoint-mysql/Dockerfile +++ b/pinpoint-mysql/Dockerfile @@ -1,6 +1,6 @@ FROM mysql:8.0 -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.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 \ diff --git a/pinpoint-mysql/Readme.md b/pinpoint-mysql/Readme.md index a77500a..3b85c47 100644 --- a/pinpoint-mysql/Readme.md +++ b/pinpoint-mysql/Readme.md @@ -4,6 +4,7 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint application monitoring system. ## Supported Tags + - 2.5.1 - 2.5.0 - 2.4.2 - 2.4.1 diff --git a/pinpoint-quickstart/.env b/pinpoint-quickstart/.env index d93e319..50c322a 100644 --- a/pinpoint-quickstart/.env +++ b/pinpoint-quickstart/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.5.0 +PINPOINT_VERSION=2.5.1 SPRING_PROFILES=release ### Pinpoint-Agent diff --git a/pinpoint-quickstart/Readme.md b/pinpoint-quickstart/Readme.md index 74d49e4..0f29a38 100644 --- a/pinpoint-quickstart/Readme.md +++ b/pinpoint-quickstart/Readme.md @@ -4,6 +4,7 @@ This Docker image contains the Pinpoint Quickstart sample to test Pinpoint application monitoring system. ## Supported Tags + - 2.5.1 - 2.5.0 - 2.4.2 - 2.4.1 diff --git a/pinpoint-web/.env b/pinpoint-web/.env index 0145aa4..5b82ef6 100644 --- a/pinpoint-web/.env +++ b/pinpoint-web/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.5.0 +PINPOINT_VERSION=2.5.1 SPRING_PROFILES=release ### Pinpoint-Web diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index fba1d13..0e17b31 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:11.0.16-jre-slim-buster -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.1} 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 \ diff --git a/pinpoint-web/Readme.md b/pinpoint-web/Readme.md index 035f2dd..b1dd9ae 100644 --- a/pinpoint-web/Readme.md +++ b/pinpoint-web/Readme.md @@ -4,6 +4,7 @@ This Docker image contains the Pinpoint Web component of the Pinpoint application monitoring system. ## Supported Tags + - 2.5.1 - 2.5.0 - 2.4.2 - 2.4.1