[NO-ISSUE] Add logging properties

Updated supported tags

.env

@@ -1,12 +1,31 @@
-PINPOINT_VERSION=2.4.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.
+PINPOINT_NETWORK_SUBNET=172.24.0.0/27
+COLLECTOR_FIXED_IP=172.24.0.30
+
 #zookeeper information required
 PINPOINT_ZOOKEEPER_ADDRESS=zoo1
 
 ### Pinpoint-Hbase
 
 PINPOINT_HBASE_NAME=pinpoint-hbase
-#config for hbase in external docker
+AGENTINFO_TTL=31536000
+AGENTSTATV2_TTL=5184000
+APPSTATAGGRE_TTL=5184000
+APPINDEX_TTL=31536000
+AGENTLIFECYCLE_TTL=5184000
+AGENTEVENT_TTL=5184000
+STRINGMETADATA_TTL=15552000
+APIMETADATA_TTL=31536000
+SQLMETADATA_TTL=15552000
+TRACEV2_TTL=5184000
+APPTRACEINDEX_TTL=5184000
+APPMAPSTATCALLERV2_TTL=5184000
+APPMAPSTATCALLEV2_TTL=5184000
+APPMAPSTATSELFV2_TTL=5184000
+HOSTAPPMAPV2_TTL=5184000
 
 ### Pinpoint-mysql
 MYSQL_ROOT_PASSWORD=root123
@@ -29,11 +48,6 @@ 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
@@ -42,20 +56,6 @@ 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-Collector
 
 PINPOINT_COLLECTOR_NAME=pinpoint-collector
@@ -93,8 +93,6 @@ ADMIN_PASSWORD=admin
 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
@@ -135,8 +133,12 @@ COLLECTOR_TCP_PORT=9994
 COLLECTOR_STAT_PORT=9995
 COLLECTOR_SPAN_PORT=9996
 
-# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
-PROFILER_SAMPLING_RATE=1
+# 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
@@ -153,3 +155,11 @@ FLINK_WEB_PORT=8081
 ### Pinpoint-quickstart
 
 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

.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
@@ -28,21 +36,30 @@ 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@v1
+        uses: docker/setup-buildx-action@v2
+        
       - 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 }}
-          platforms: linux/amd64
+          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:
@@ -68,6 +79,17 @@ jobs:
       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
     with:

Readme.md

@@ -12,7 +12,16 @@ 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
+ - 2.4.0
  - 2.3.3
  - 2.3.2
  - 2.3.1
@@ -52,32 +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.
- - Pinpoint-Web Server
- - Pinpoint-Collector
- - Pinpoint-Agent
- - Pinpoint-Flink(to support certain feature)
- - Pinpoint-Zookeeper
- - Pinpoint-Hbase
- - Pinpoint-QuickStart(a sample application, 1.8.1+)
- - Pinpoint-Mysql(to support certain feature)
-This may take several minutes to download all necessary images.
+Below are the list of images provided by this project:
+ - [Pinpoint-Web Server](https://hub.docker.com/r/pinpointdocker/pinpoint-web)
+ - [Pinpoint-Collector](https://hub.docker.com/repository/docker/pinpointdocker/pinpoint-collector/)
+ - [Pinpoint-Agent](https://hub.docker.com/r/pinpointdocker/pinpoint-agent)
+ - [Pinpoint-Flink](https://hub.docker.com/r/pinpointdocker/pinpoint-flink)
+ - [Pinpoint-Hbase](https://hub.docker.com/r/pinpointdocker/pinpoint-hbase)
+ - [Pinpoint-QuickStart](https://hub.docker.com/r/pinpointdocker/pinpoint-quickstart): a sample application, v1.8.1+
+ - [Pinpoint-Mysql](https://hub.docker.com/r/pinpointdocker/pinpoint-mysql)
+ - [Pinpoint-Batch](https://hub.docker.com/r/pinpointdocker/pinpoint-batch): v2.4.0+
 
 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.
@@ -158,7 +185,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/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint-docker/issues).
 Contributions on the pinpoint-docker image is also always welcome.
 
 ## License

docker-compose-metric.yml

@@ -0,0 +1,216 @@
+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
+    volumes:
+      - pinot-kafka-volume:/var/lib/kafka/data
+
+  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
+    restart: unless-stopped
+    command: StartController -zkAddress pinot-zoo
+    depends_on:
+      - pinot-zoo
+    expose:
+      - "9000"
+    ports:
+      - "9000:9000"
+    networks:
+      - pinpoint
+    volumes:
+      - pinot-controller-volume:/tmp/data/controller
+
+  pinot-broker-0:
+    image: apachepinot/pinot:latest
+    restart: unless-stopped
+    command: StartBroker -zkAddress pinot-zoo
+    depends_on:
+      - pinot-controller
+    expose:
+      - "8099"
+    networks:
+      - pinpoint
+
+  pinot-server-0:
+    image: apachepinot/pinot:latest
+    restart: unless-stopped
+    command: StartServer -zkAddress pinot-zoo
+    depends_on:
+      - pinot-broker-0
+    expose:
+      - "8098"
+    networks:
+      - pinpoint
+    volumes:
+      - pinot-server-volume:/tmp/data/server
+
+  pinot-init:
+    image: apachepinot/pinot:latest
+    restart: "no"
+    entrypoint: >
+      sh -c "
+      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}/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-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-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-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/.*replicasPerPartition.*/    \"replicasPerPartition\": \"1\",/g' uriStatTable.json tagTable.json doubleTable.json dataTypeTable.json &&
+
+      /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
+
+  #zookeepers
+  pinot-zoo:
+    image: zookeeper:3.8.0-temurin
+    restart: always
+    expose:
+      - "2181"
+    networks:
+      - pinpoint
+    volumes:
+      - pinot-zoo-data:/data
+      - pinot-zoo-datalog:/datalog
+
+  telegraf:
+    image: telegraf:1.25.0
+    networks:
+      - pinpoint
+    depends_on:
+      - pinpoint-collector
+    entrypoint: >
+      sh -c "
+      curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/telegraf/pinpoint-telegraf.conf > telegraf.conf &&
+      sed -i 's/127.0.0.1/pinpoint-collector/g' telegraf.conf &&
+      telegraf -config telegraf.conf"
+
+volumes:
+  pinot-zoo-data:
+  pinot-zoo-datalog:
+  pinot-server-volume:
+  pinot-controller-volume:
+  pinot-kafka-volume:

docker-compose.yml

@@ -12,9 +12,24 @@ services:
     image: "pinpointdocker/pinpoint-hbase:${PINPOINT_VERSION}"
     networks:
       - pinpoint
-
+    environment:
+      - AGENTINFO_TTL=${AGENTINFO_TTL}
+      - AGENTSTATV2_TTL=${AGENTSTATV2_TTL}
+      - APPSTATAGGRE_TTL=${APPSTATAGGRE_TTL}
+      - APPINDEX_TTL=${APPINDEX_TTL}
+      - AGENTLIFECYCLE_TTL=${AGENTLIFECYCLE_TTL}
+      - AGENTEVENT_TTL=${AGENTEVENT_TTL}
+      - STRINGMETADATA_TTL=${STRINGMETADATA_TTL}
+      - APIMETADATA_TTL=${APIMETADATA_TTL}
+      - SQLMETADATA_TTL=${SQLMETADATA_TTL}
+      - TRACEV2_TTL=${TRACEV2_TTL}
+      - APPTRACEINDEX_TTL=${APPTRACEINDEX_TTL}
+      - APPMAPSTATCALLERV2_TTL=${APPMAPSTATCALLERV2_TTL}
+      - APPMAPSTATCALLEV2_TTL=${APPMAPSTATCALLEV2_TTL}
+      - APPMAPSTATSELFV2_TTL=${APPMAPSTATSELFV2_TTL}
+      - HOSTAPPMAPV2_TTL=${HOSTAPPMAPV2_TTL}
     volumes:
-      - /home/pinpoint/hbase
+      - hbase_data:/home/pinpoint/hbase
       - /home/pinpoint/zookeeper
     expose:
       # HBase Master API port
@@ -33,6 +48,11 @@ services:
     restart: always
     depends_on:
       - zoo1
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   pinpoint-mysql:
     build:
@@ -57,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:
@@ -77,38 +102,29 @@ 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},batch
+      - 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=${WEB_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
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   pinpoint-collector:
     build:
@@ -140,9 +156,9 @@ services:
       - "${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
+      pinpoint:
+        ipv4_address: ${COLLECTOR_FIXED_IP}
     environment:
       - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
       - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
@@ -150,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:
@@ -168,6 +189,11 @@ services:
       - pinpoint
     depends_on:
       - pinpoint-agent
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   pinpoint-batch:
     build:
@@ -192,8 +218,6 @@ services:
       - 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}
@@ -214,6 +238,11 @@ services:
       - "pinpoint-mysql:pinpoint-mysql"
     networks:
       - pinpoint
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   pinpoint-agent:
     build:
@@ -224,9 +253,7 @@ services:
 
     container_name: "${PINPOINT_AGENT_NAME}"
     image: "pinpointdocker/pinpoint-agent:${PINPOINT_VERSION}"
-
     restart: unless-stopped
-
     networks:
       - pinpoint
     volumes:
@@ -238,15 +265,24 @@ 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_RATE=${PROFILER_SAMPLING_RATE}
+      - 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}
       - DEBUG_LEVEL=${AGENT_DEBUG_LEVEL}
       - PROFILER_TRANSPORT_MODULE=${PROFILER_TRANSPORT_MODULE}
     depends_on:
       - pinpoint-collector
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   #zookeepers
   zoo1:
-    image: zookeeper:3.4
+    image: zookeeper:3.4.13
     restart: always
     hostname: zoo1
     expose:
@@ -260,9 +296,14 @@ 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
+    image: zookeeper:3.4.13
     restart: always
     hostname: zoo2
     expose:
@@ -276,9 +317,14 @@ 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
+    image: zookeeper:3.4.13
     restart: always
     hostname: zoo3
     expose:
@@ -292,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:
@@ -315,6 +366,11 @@ services:
       - pinpoint
     depends_on:
       - zoo1
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
   taskmanager:
     build:
@@ -343,11 +399,20 @@ services:
       - JOB_MANAGER_RPC_ADDRESS=jobmanager
     networks:
       - pinpoint
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "3"
+        max-size: "10m"
 
 volumes:
   data-volume:
   mysql_data:
+  hbase_data:
 
 networks:
   pinpoint:
     driver: bridge
+    ipam:
+      config:
+        - subnet: ${PINPOINT_NETWORK_SUBNET}

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

@@ -1,5 +1,20 @@
 ### Pinpoint with Java
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.5.3
 SPRING_PROFILES=release
-AGENT_ID=app-in-docker
-APP_NAME=quickapp
+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

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

@@ -1,5 +1,5 @@
 ### Pinpoint with Tomcat
-PINPOINT_VERSION=2.4.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.3.3
+PINPOINT_VERSION=2.5.3
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent
@@ -18,8 +18,28 @@ COLLECTOR_TCP_PORT=9994
 COLLECTOR_STAT_PORT=9995
 COLLECTOR_SPAN_PORT=9996
 
-# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
-PROFILER_SAMPLING_RATE=1
+# 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
+
 
 AGENT_ID=app-in-docker
 APP_NAME=quickapp

pinpoint-agent/Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.7
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.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,7 +4,12 @@
 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
  - 2.4.0
  - 2.3.3
  - 2.3.2
@@ -32,7 +37,7 @@ Please see [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-apm/p
 
 ## 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/pinpoint-apm/pinpoint-docker/issues).
 Contributions on the pinpoint-docker image is also always welcome.
 
 ## License

pinpoint-agent/build/scripts/configure-agent.sh

@@ -3,21 +3,25 @@ set -e
 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/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.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.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.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.rate=/ s/=.*/=${PROFILER_SAMPLING_RATE}/" /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/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/local/pinpoint.config /pinpoint-agent/profiles/release/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/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 "$@"

pinpoint-agent/docker-compose.yml

@@ -22,7 +22,11 @@ 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_RATE=${PROFILER_SAMPLING_RATE}
+      - 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}
       - DEBUG_LEVEL=${AGENT_DEBUG_LEVEL}
       - PROFILER_TRANSPORT_MODULE=${PROFILER_TRANSPORT_MODULE}
     networks:

pinpoint-batch/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.5.3
 SPRING_PROFILES=release
 
 ### Pinpoint-Batch
@@ -19,8 +19,6 @@ ADMIN_PASSWORD=admin
 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

pinpoint-batch/Dockerfile

@@ -1,6 +1,6 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim
+FROM openjdk:11.0.16-jre-slim-buster
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.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 \
@@ -9,7 +9,7 @@ RUN mkdir -p /pinpoint/config \
 COPY /build/config/pinpoint-batch.properties /pinpoint/config/
 COPY /build/scripts/start-batch.sh /pinpoint/scripts/
 
-RUN apk --no-cache add curl \
+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

pinpoint-batch/Readme.md

@@ -3,35 +3,19 @@
 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
  - 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.
 
 ## 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/pinpoint-apm/pinpoint-docker/issues).
 Contributions on the pinpoint-docker image is also always welcome.
 
 ## License

pinpoint-batch/docker-compose.yml

@@ -18,15 +18,13 @@ services:
       - "${BATCH_SERVER_PORT:-8079}:${BATCH_SERVER_PORT:-8079}"
     environment:
       - BATCH_SERVER_PORT=${BATCH_SERVER_PORT}
-      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
+      - 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}

pinpoint-collector/.env

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

pinpoint-collector/Dockerfile

@@ -1,6 +1,6 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim
+FROM openjdk:11.0.16-jre-slim-buster
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.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 \
@@ -8,10 +8,8 @@ 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.0-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
 
-RUN apk --no-cache add curl \
+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/config/pinpoint-collector.properties \
     && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar

pinpoint-collector/Dockerfile-metric

@@ -0,0 +1,19 @@
+FROM openjdk:11.0.16-jre-slim-buster
+
+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/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-${PINPOINT_VERSION}.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"]
+

pinpoint-collector/Readme.md

@@ -4,7 +4,15 @@
 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
  - 2.4.0
  - 2.3.3
  - 2.3.2
@@ -32,7 +40,7 @@ Please see [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-apm/p
 
 ## 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/pinpoint-apm/pinpoint-docker/issues).
 Contributions on the pinpoint-docker image is also always welcome.
 
 ## License

pinpoint-collector/build/scripts/start-collector-metric.sh

@@ -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

pinpoint-flink/.env

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

pinpoint-flink/Dockerfile

@@ -1,5 +1,5 @@
-FROM flink:1.14.2
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+FROM flink:1.14-java11
+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,7 +4,12 @@
 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
  - 2.4.0
  - 2.3.3
  - 2.3.2
@@ -15,7 +20,7 @@ Please see the [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-a
 
 ## 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/pinpoint-apm/pinpoint-docker/issues).
 Contributions on the pinpoint-docker image is also always welcome.
 
 ## License

pinpoint-flink/build/profiles/release/hbase.properties

@@ -14,6 +14,8 @@ 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

pinpoint-flink/docker-bin/docker-entrypoint.sh

@@ -2,13 +2,15 @@
 
 # In flink version < 1.11 we can't use "job cluster" because it's not yet available
 if [ "$1" = "standalone-job" ]; then
-  cd /build
-  zip -d pinpoint-flink-job.jar "profiles/release/*.properties"
-  sed -i -e "s/#PINPOINT_ZOOKEEPER_ADDRESS#/${PINPOINT_ZOOKEEPER_ADDRESS}/g" profiles/release/*
-  zip -r pinpoint-flink-job.jar profiles/
-  cd -
+  if [ -e /build/pinpoint-flink-job.jar ]; then
+    cd /build
+    zip -d pinpoint-flink-job.jar "profiles/release/*.properties"
+    sed -i -e "s/#PINPOINT_ZOOKEEPER_ADDRESS#/${PINPOINT_ZOOKEEPER_ADDRESS}/g" profiles/release/*
+    zip -r pinpoint-flink-job.jar profiles/
+    cd -
 
-  mv /build/pinpoint-flink-job.jar pinpoint-flink-job.jar
+    mv /build/pinpoint-flink-job.jar pinpoint-flink-job.jar
+  fi
   
   shift
 

pinpoint-hbase/.env

@@ -1,5 +1,5 @@
-PINPOINT_VERSION=2.4.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 java:8-jdk
+FROM openjdk:8u342-slim
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.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}
 
@@ -13,9 +13,12 @@ COPY hbase-site.xml hbase-site.xml
 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/
+COPY /build/scripts/configure-hbase.sh /usr/local/bin
 
-RUN chmod a+x /usr/local/bin/initialize-hbase.sh \
+RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
+    && chmod a+x /usr/local/bin/initialize-hbase.sh \
     && chmod a+x /usr/local/bin/check-table.sh \
+    && chmod a+x /usr/local/bin/configure-hbase.sh \
     && mkdir -p ${BASE_DIR} \
     && cd ${BASE_DIR} \
     && curl -fSL "${HBASE_REPOSITORY}/${HBASE_VERSION}/hbase-${HBASE_VERSION}-bin.tar.gz" -o hbase.tar.gz || curl -fSL "${HBASE_SUB_REPOSITORY}/${HBASE_VERSION}/hbase-${HBASE_VERSION}-bin.tar.gz" -o hbase.tar.gz \

pinpoint-hbase/Readme.md

@@ -4,7 +4,12 @@
 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
  - 2.4.0
  - 2.3.3
  - 2.3.2
@@ -32,7 +37,7 @@ Please see the [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-a
 
 ## 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/pinpoint-apm/pinpoint-docker/issues).
 Contributions on the pinpoint-docker image is also always welcome.
 
 ## License

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

@@ -3,6 +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
+    #${HBASE_HOME}/bin/hbase shell ${BASE_DIR}/hbase-update-ttl.hbase
 else
     sleep 15
     echo "create tables"

pinpoint-hbase/build/scripts/configure-hbase.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -e
+set -x
+cp ${BASE_DIR}/hbase-create.hbase ${BASE_DIR}/hbase-update-ttl.hbase
+
+sed -i "/AgentInfo/s/TTL => .[[:digit:]]*/TTL => ${AGENTINFO_TTL:-31536000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/AgentStatV2/s/TTL => .[[:digit:]]*/TTL => ${AGENTSTATV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/ApplicationStatAggre/s/TTL => .[[:digit:]]*/TTL => ${APPSTATAGGRE_TTL:-5184000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/ApplicationIndex/s/TTL => .[[:digit:]]*/TTL => ${APPINDEX_TTL:-31536000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/AgentLifeCycle/s/TTL => .[[:digit:]]*/TTL => ${AGENTLIFECYCLE_TTL:-5184000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/AgentEvent/s/TTL => .[[:digit:]]*/TTL => ${AGENTEVENT_TTL:-5184000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/StringMetaData/s/TTL => .[[:digit:]]*/TTL => ${STRINGMETADATA_TTL:-15552000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/ApiMetaData/s/TTL => .[[:digit:]]*/TTL => ${APIMETADATA_TTL:-31536000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/SqlMetaData_Ver2/s/TTL => .[[:digit:]]*/TTL => ${SQLMETADATA_TTL:-15552000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/TraceV2/s/TTL => .[[:digit:]]*/TTL => ${TRACEV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/ApplicationTraceIndex/s/TTL => .[[:digit:]]*/TTL => ${APPTRACEINDEX_TTL:-5184000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/ApplicationMapStatisticsCaller_Ver2/s/TTL => .[[:digit:]]*/TTL => ${APPMAPSTATCALLERV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/ApplicationMapStatisticsCallee_Ver2/s/TTL => .[[:digit:]]*/TTL => ${APPMAPSTATCALLEV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/ApplicationMapStatisticsSelf_Ver2/s/TTL => .[[:digit:]]*/TTL => ${APPMAPSTATSELFV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-create.hbase
+sed -i "/HostApplicationMap_Ver2/s/TTL => .[[:digit:]]*/TTL => ${HOSTAPPMAPV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-create.hbase
+
+sed -i "s/create/alter/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/AgentInfo/s/TTL => .[[:digit:]]*/TTL => ${AGENTINFO_TTL:-31536000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/AgentStatV2/s/TTL => .[[:digit:]]*/TTL => ${AGENTSTATV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/ApplicationStatAggre/s/TTL => .[[:digit:]]*/TTL => ${APPSTATAGGRE_TTL:-5184000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/ApplicationIndex/s/TTL => .[[:digit:]]*/TTL => ${APPINDEX_TTL:-31536000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/AgentLifeCycle/s/TTL => .[[:digit:]]*/TTL => ${AGENTLIFECYCLE_TTL:-5184000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/AgentEvent/s/TTL => .[[:digit:]]*/TTL => ${AGENTEVENT_TTL:-5184000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/StringMetaData/s/TTL => .[[:digit:]]*/TTL => ${STRINGMETADATA_TTL:-15552000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/ApiMetaData/s/TTL => .[[:digit:]]*/TTL => ${APIMETADATA_TTL:-31536000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/SqlMetaData_Ver2/s/TTL => .[[:digit:]]*/TTL => ${SQLMETADATA_TTL:-15552000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/TraceV2/s/TTL => .[[:digit:]]*/TTL => ${TRACEV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/ApplicationTraceIndex/s/TTL => .[[:digit:]]*/TTL => ${APPTRACEINDEX_TTL:-5184000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/ApplicationMapStatisticsCaller_Ver2/s/TTL => .[[:digit:]]*/TTL => ${APPMAPSTATCALLERV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/ApplicationMapStatisticsCallee_Ver2/s/TTL => .[[:digit:]]*/TTL => ${APPMAPSTATCALLEV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/ApplicationMapStatisticsSelf_Ver2/s/TTL => .[[:digit:]]*/TTL => ${APPMAPSTATSELFV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+sed -i "/HostApplicationMap_Ver2/s/TTL => .[[:digit:]]*/TTL => ${HOSTAPPMAPV2_TTL:-5184000}/g" ${BASE_DIR}/hbase-update-ttl.hbase
+
+exec "$@"

pinpoint-hbase/build/scripts/initialize-hbase.sh

@@ -2,4 +2,5 @@
 
 ${HBASE_HOME}/bin/start-hbase.sh
 
+/usr/local/bin/configure-hbase.sh
 /usr/local/bin/check-table.sh

pinpoint-mysql/.env

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

pinpoint-mysql/Dockerfile

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

pinpoint-mysql/Readme.md

@@ -4,7 +4,12 @@
 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
  - 2.4.0
  - 2.3.3
  - 2.3.2
@@ -32,7 +37,7 @@ Please see [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-apm/p
 
 ## 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/pinpoint-apm/pinpoint-docker/issues).
 Contributions on the pinpoint-docker image is also always welcome.
 
 ## License

pinpoint-quickstart/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.5.3
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent
@@ -12,8 +12,12 @@ PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=9991
 PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=9992
 PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=9993
 
-# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
-PROFILER_SAMPLING_RATE=1
+# 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

pinpoint-quickstart/Dockerfile

@@ -4,6 +4,8 @@ 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
 

pinpoint-quickstart/Readme.md

@@ -4,7 +4,12 @@
 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
  - 2.4.0
  - 2.3.3
  - 2.3.2
@@ -32,7 +37,7 @@ Please see the [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-a
 
 ## 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/pinpoint-apm/pinpoint-docker/issues).
 Contributions on the pinpoint-docker image is also always welcome.
 
 ## License

pinpoint-quickstart/docker-compose.yml

@@ -40,7 +40,11 @@ services:
       - COLLECTOR_TCP_PORT=${COLLECTOR_TCP_PORT}
       - COLLECTOR_STAT_PORT=${COLLECTOR_STAT_PORT}
       - COLLECTOR_SPAN_PORT=${COLLECTOR_SPAN_PORT}
-      - PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
+      - 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}
       - DEBUG_LEVEL=${AGENT_DEBUG_LEVEL}
 
 volumes:

pinpoint-web/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.5.3
 SPRING_PROFILES=release
 
 ### Pinpoint-Web
@@ -18,11 +18,6 @@ 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
@@ -30,16 +25,3 @@ 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-web/Dockerfile

@@ -1,6 +1,6 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim
+FROM openjdk:11.0.16-jre-slim-buster
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.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 \
@@ -8,10 +8,8 @@ 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.0-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
 
-RUN apk --no-cache add curl \
+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

pinpoint-web/Dockerfile-metric

@@ -0,0 +1,18 @@
+FROM openjdk:11.0.16-jre-slim-buster
+
+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
+
+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"]

pinpoint-web/Readme.md

@@ -4,7 +4,15 @@
 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
  - 2.4.0
  - 2.3.3
  - 2.3.2
@@ -32,7 +40,7 @@ Please see the [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-a
 
 ## 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/pinpoint-apm/pinpoint-docker/issues).
 Contributions on the pinpoint-docker image is also always welcome.
 
 ## License

pinpoint-web/docker-compose.yml

@@ -17,31 +17,17 @@ 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},batch
+      - 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=${WEB_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}