[NO-ISSUE] Add logging properties

.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.5.0
+PINPOINT_VERSION=2.5.3
 SPRING_PROFILES=release
 
 # Used to make collector ip fixed for external microservices which uses pinpoint agent with collector ip.

.github/workflows/docker-image.yml

@@ -6,6 +6,14 @@ on:
       component:
         required: true
         type: string
+      dockerfile:
+        required: false
+        type: string
+        default: 'Dockerfile'
+      tag_postfix:
+        required: false
+        type: string
+        default: ''
     secrets:
       docker_username:
         required: true
@@ -36,17 +44,22 @@ jobs:
         
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4.3.0
         with:
           images: pinpointdocker/${{ inputs.component }}
+          flavor: |
+            latest=auto
+            prefix=
+            suffix=${{ inputs.tag_postfix }}
         
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:
           context: ./${{ inputs.component }}
+          file: ./${{ inputs.component }}/${{ inputs.dockerfile }}
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}${{ inputs.tag_postfix }}
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Update repo description

.github/workflows/release-images.yml

@@ -23,6 +23,17 @@ jobs:
       docker_token: ${{ secrets.DOCKER_TOKEN }}
       docker_password: ${{ secrets.DOCKER_PASSWORD }}
           
+  collector-metric:
+    uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
+    with:
+      component: pinpoint-collector
+      dockerfile: Dockerfile-metric
+      tag_postfix: -metric
+    secrets:
+      docker_username: ${{ secrets.DOCKER_USERNAME }}
+      docker_token: ${{ secrets.DOCKER_TOKEN }}
+      docker_password: ${{ secrets.DOCKER_PASSWORD }}
+          
   flink:
     uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
     with:
@@ -67,6 +78,17 @@ jobs:
       docker_username: ${{ secrets.DOCKER_USERNAME }}
       docker_token: ${{ secrets.DOCKER_TOKEN }}
       docker_password: ${{ secrets.DOCKER_PASSWORD }}
+                    
+  web-metric:
+    uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
+    with:
+      component: pinpoint-web
+      dockerfile: Dockerfile-metric
+      tag_postfix: -metric
+    secrets:
+      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

Readme.md

@@ -12,6 +12,12 @@ 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.3-metric (for web and collector)
+ - 2.5.3
+ - 2.5.2-metric (for web and collector)
+ - 2.5.2
+ - 2.5.1-metric (for web and collector)
+ - 2.5.1
  - 2.5.0
  - 2.4.2
  - 2.4.1
@@ -55,33 +61,50 @@ git clone https://github.com/pinpoint-apm/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. 
+
+Since [Pinpoint v2.5.0](https://github.com/pinpoint-apm/pinpoint/releases/tag/v2.5.0), URI Metric and Infrastructure Metric are added.
+These need Apache Pinot cluster to work and [docker-compose-metric.yml](https://github.com/pinpoint-apm/pinpoint-docker/blob/master/docker-compose-metric.yml) has been added to provide them.
+To use URI Metric and Infrastructure Metric, include `docker-compose-metric.yml` to bring up Pinpoint containers as decribed below.
+
+```
+git clone https://github.com/pinpoint-apm/pinpoint-docker.git
+cd pinpoint-docker
+docker-compose pull
+docker-compose -f docker-compose.yml -f docker-compose-metric.yml up -d
+```
+
+Docker images for Pinpoint web and Pinpoint collector is provided since **v2.5.1**, so above wouldn't work with v2.5.0 images.
+To use Pinpoint v2.5.0 metric modules, you need to checkout v2.5.0 and then build the images ahead with below command.
 
 ```
 git clone https://github.com/pinpoint-apm/pinpoint-docker.git
 cd pinpoint-docker
 git checkout {tag}
-docker-compose pull && docker-compose up -d
+docker-compose -f docker-compose.yml -f docker-compose-metric.yml build
 ```
 
-You can also build the image with `docker-compose up -d` command without pulling the image. But you can reduce the time to 1/3 by just downloading them.
+If you are not interested in metric modules, simply remove `-f docker-compose-metric.yml` in docker-compose commands.
 
-This will install and run all services required to run all features in Pinpoint in docker containers joined with same network.
+Below are the list of images provided by this project:
- - Pinpoint-Web Server
+ - [Pinpoint-Web Server](https://hub.docker.com/r/pinpointdocker/pinpoint-web)
- - Pinpoint-Collector
+ - [Pinpoint-Collector](https://hub.docker.com/repository/docker/pinpointdocker/pinpoint-collector/)
- - Pinpoint-Agent
+ - [Pinpoint-Agent](https://hub.docker.com/r/pinpointdocker/pinpoint-agent)
- - Pinpoint-Flink(to support certain feature)
+ - [Pinpoint-Flink](https://hub.docker.com/r/pinpointdocker/pinpoint-flink)
- - Pinpoint-Zookeeper
+ - [Pinpoint-Hbase](https://hub.docker.com/r/pinpointdocker/pinpoint-hbase)
- - Pinpoint-Hbase
+ - [Pinpoint-QuickStart](https://hub.docker.com/r/pinpointdocker/pinpoint-quickstart): a sample application, v1.8.1+
- - Pinpoint-QuickStart(a sample application, 1.8.1+)
+ - [Pinpoint-Mysql](https://hub.docker.com/r/pinpointdocker/pinpoint-mysql)
- - Pinpoint-Mysql(to support certain feature)
+ - [Pinpoint-Batch](https://hub.docker.com/r/pinpointdocker/pinpoint-batch): v2.4.0+
- - Pinpoint-Batch
-This may take several minutes to download all necessary images.
 
 You can replace `QuickStart` application part with your application to start monitoring.  
  - check [`Testing QuickStart application`](#testing-quickstart-application) for a quick demo of pinpoint
  - check [`Monitoring YOUR Application`](#monitoring-your-application) part for further details
 
+Below are the list of images required for this project:
+ - [Apache Zookeeper v3.4.13](https://hub.docker.com/_/zookeeper/tags?page=1&name=3.4.13): For Hbase and Pinpoint cluster
+ - [Apache Zookeeper v3.8.0](https://hub.docker.com/_/zookeeper/tags?page=1&name=3.8.0): For Pinot cluster 
+ - [Apache Pinot](https://hub.docker.com/r/apachepinot/pinot): Tested with v0.11.0 ~ v0.13.0. Please refer to `pinot-init` in `docker-compose-metric.yml` to further see tables and schema information for Pinpoint.
+ - [Kafka](https://hub.docker.com/r/ubuntu/kafka): Currently using 3.1-22.04_beta. Please refer to `pinpoint-kafka-init` in `docker-compose-metric.yml` to further see topics needed for Pinpoint.
+
 ### Mysql (optional, 1.8.1+)
 
 The Pinpoint-Mysql is necessary to use 'Alarm' feature. It's server is running on port 13306 and contains the data structure used to register users, groups, and alerts to be sent.

docker-compose-metric.yml

@@ -102,6 +102,8 @@ services:
       - ZOOKEEPER_HOST=pinot-zoo
     networks:
       - pinpoint
+    volumes:
+      - pinot-kafka-volume:/var/lib/kafka/data
 
   pinpoint-kafka-init:
     image: ubuntu/kafka:3.1-22.04_beta
@@ -117,7 +119,7 @@ services:
       - pinpoint
 
   pinot-controller:
-    image: apachepinot/pinot:latest-arm64
+    image: apachepinot/pinot:latest
     restart: unless-stopped
     command: StartController -zkAddress pinot-zoo
     depends_on:
@@ -128,9 +130,11 @@ services:
       - "9000:9000"
     networks:
       - pinpoint
+    volumes:
+      - pinot-controller-volume:/tmp/data/controller
 
   pinot-broker-0:
-    image: apachepinot/pinot:latest-arm64
+    image: apachepinot/pinot:latest
     restart: unless-stopped
     command: StartBroker -zkAddress pinot-zoo
     depends_on:
@@ -141,7 +145,7 @@ services:
       - pinpoint
 
   pinot-server-0:
-    image: apachepinot/pinot:latest-arm64
+    image: apachepinot/pinot:latest
     restart: unless-stopped
     command: StartServer -zkAddress pinot-zoo
     depends_on:
@@ -150,32 +154,32 @@ services:
       - "8098"
     networks:
       - pinpoint
+    volumes:
+      - pinot-server-volume:/tmp/data/server
 
   pinot-init:
-    image: apachepinot/pinot:latest-arm64
+    image: apachepinot/pinot:latest
     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}/uristat/uristat-common/src/main/pinot/pinot-uriStat-realtime-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}/uristat/uristat-common/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-realtime-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-realtime-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-realtime-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 's/.*replicasPerPartition.*/    \"replicasPerPartition\": \"1\",/g' uriStatTable.json tagTable.json doubleTable.json dataTypeTable.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
+      - pinot-server-0
       - pinpoint-kafka-init
     networks:
       - pinpoint
@@ -188,6 +192,9 @@ services:
       - "2181"
     networks:
       - pinpoint
+    volumes:
+      - pinot-zoo-data:/data
+      - pinot-zoo-datalog:/datalog
 
   telegraf:
     image: telegraf:1.25.0
@@ -197,18 +204,13 @@ services:
       - pinpoint-collector
     entrypoint: >
       sh -c "
-      echo '
+      curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/telegraf/pinpoint-telegraf.conf > telegraf.conf &&
-      [[inputs.cpu]]\
+      sed -i 's/127.0.0.1/pinpoint-collector/g' telegraf.conf &&
-        percpu = true\
+      telegraf -config telegraf.conf"
-        totalcpu = true\
-        collect_cpu_time = false\
-        report_active = false\
 
-      [[outputs.http]]\
+volumes:
-        url = \"http://pinpoint-collector:15200/telegraf\"\
+  pinot-zoo-data:
-        data_format = \"json\"\
+  pinot-zoo-datalog:
-        [outputs.http.headers]\
+  pinot-server-volume:
-          hostGroupName = \"pinpoint-docker\"\
+  pinot-controller-volume:
-          Content-Type = \"application/json\"\' > telegraf.conf &&
+  pinot-kafka-volume:
-      cat telegraf.conf &&
-      telegraf -config telegraf.conf"

docker-compose.yml

@@ -48,6 +48,11 @@ services:
     restart: always
     depends_on:
       - zoo1
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   pinpoint-mysql:
     build:
@@ -72,6 +77,11 @@ services:
       - mysql_data:/var/lib/mysql
     networks:
       - pinpoint
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   pinpoint-web:
     build:
@@ -92,7 +102,7 @@ services:
       - "9997"
     ports:
       - "9997:9997"
-      - "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
+      - "${WEB_SERVER_PORT:-8080}:8080"
     environment:
       - WEB_SERVER_PORT=${WEB_SERVER_PORT}
       - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
@@ -110,6 +120,11 @@ services:
       - "pinpoint-mysql:pinpoint-mysql"
     networks:
       - pinpoint
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   pinpoint-collector:
     build:
@@ -151,6 +166,11 @@ services:
       - LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
       - FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE}
       - FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   pinpoint-quickstart:
     build:
@@ -169,6 +189,11 @@ services:
       - pinpoint
     depends_on:
       - pinpoint-agent
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   pinpoint-batch:
     build:
@@ -213,6 +238,11 @@ services:
       - "pinpoint-mysql:pinpoint-mysql"
     networks:
       - pinpoint
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   pinpoint-agent:
     build:
@@ -244,6 +274,11 @@ services:
       - PROFILER_TRANSPORT_MODULE=${PROFILER_TRANSPORT_MODULE}
     depends_on:
       - pinpoint-collector
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   #zookeepers
   zoo1:
@@ -261,6 +296,11 @@ services:
       ZOO_SERVERS: server.1=0.0.0.0:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
     networks:
       - pinpoint
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   zoo2:
     image: zookeeper:3.4.13
@@ -277,6 +317,11 @@ services:
       ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=0.0.0.0:2888:3888 server.3=zoo3:2888:3888
     networks:
       - pinpoint
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   zoo3:
     image: zookeeper:3.4.13
@@ -293,6 +338,11 @@ services:
       ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=0.0.0.0:2888:3888
     networks:
       - pinpoint
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   ##flink
   jobmanager:
@@ -316,6 +366,11 @@ services:
       - pinpoint
     depends_on:
       - zoo1
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   taskmanager:
     build:
@@ -344,6 +399,11 @@ services:
       - JOB_MANAGER_RPC_ADDRESS=jobmanager
     networks:
       - pinpoint
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
 volumes:
   data-volume:

pinpoint-agent-attach-example/java/.env

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

pinpoint-agent-attach-example/tomcat/.env

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

pinpoint-agent/.env

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

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.3}
 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/

pinpoint-agent/Readme.md

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

pinpoint-batch/.env

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

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.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 \

pinpoint-batch/Readme.md

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

pinpoint-collector/.env

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

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.3}
 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 \

pinpoint-collector/Dockerfile-metric

@@ -1,8 +1,8 @@
 FROM openjdk:11.0.16-jre-slim-buster
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
 #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
+ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-${PINPOINT_VERSION}.jar
 
 RUN mkdir -p /pinpoint/config \
     && mkdir -p /pinpoint/scripts

pinpoint-collector/Readme.md

@@ -4,6 +4,12 @@
 This Docker image contains the Pinpoint Collector component of the Pinpoint application monitoring system.
 
 ## Supported Tags
+ - 2.5.3-metric
+ - 2.5.3
+ - 2.5.2
+ - 2.5.2-metric
+ - 2.5.1
+ - 2.5.1-metric
  - 2.5.0
  - 2.4.2
  - 2.4.1

pinpoint-flink/.env

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

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.3}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-flink-job-${PINPOINT_VERSION}.jar
 
 RUN apt-get update \

pinpoint-flink/Readme.md

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

pinpoint-hbase/.env

@@ -1,5 +1,5 @@
-PINPOINT_VERSION=2.5.0
+PINPOINT_VERSION=2.5.3
-
+HBASE_VERSION=1.2.6
 ### Pinpoint-Hbase
 
 PINPOINT_HBASE_NAME=pinpoint-hbase

pinpoint-hbase/Dockerfile

@@ -1,11 +1,11 @@
 FROM openjdk:8u342-slim
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
+ARG HBASE_VERSION=${HBASE_VERSION:-1.2.6}
 
 ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
 ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase
 
-ENV HBASE_VERSION=1.2.6
 ENV BASE_DIR=/opt/hbase
 ENV HBASE_HOME=${BASE_DIR}/hbase-${HBASE_VERSION}
 

pinpoint-hbase/Readme.md

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

pinpoint-hbase/build/scripts/check-table.sh

@@ -3,8 +3,8 @@
 if echo -e "exists 'HostApplicationMap_Ver2'" | ${HBASE_HOME}/bin/hbase shell 2>&1 | grep -q "does exist" 2>/dev/null
 then 
     echo "Tables already exist"
-    sleep 15
+    #sleep 15
-    ${HBASE_HOME}/bin/hbase shell ${BASE_DIR}/hbase-update-ttl.hbase
+    #${HBASE_HOME}/bin/hbase shell ${BASE_DIR}/hbase-update-ttl.hbase
 else
     sleep 15
     echo "create tables"

pinpoint-mysql/.env

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

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.3}
 
 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 \

pinpoint-mysql/Readme.md

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

pinpoint-quickstart/.env

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

pinpoint-quickstart/Readme.md

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

pinpoint-web/.env

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

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.3}
 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 \

pinpoint-web/Dockerfile-metric

@@ -1,8 +1,7 @@
 FROM openjdk:11.0.16-jre-slim-buster
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
-#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/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

pinpoint-web/Readme.md

@@ -4,6 +4,12 @@
 This Docker image contains the Pinpoint Web component of the Pinpoint application monitoring system.
 
 ## Supported Tags
+ - 2.5.3-metric
+ - 2.5.3
+ - 2.5.2
+ - 2.5.2-metric
+ - 2.5.1
+ - 2.5.1-metric
  - 2.5.0
  - 2.4.2
  - 2.4.1

pinpoint-web/docker-compose.yml

@@ -17,7 +17,7 @@ services:
       - "9997"
     ports:
       - "9997:9997"
-      - "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
+      - "${WEB_SERVER_PORT:-8080}:8080"
     environment:
       - WEB_SERVER_PORT=${WEB_SERVER_PORT}
       - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}