Update docker-image.yml

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

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

docker-compose-metric.yml

@@ -117,7 +117,7 @@ services:
       - pinpoint
 
   pinot-controller:
-    image: apachepinot/pinot:latest-arm64
+    image: apachepinot/pinot:latest
     restart: unless-stopped
     command: StartController -zkAddress pinot-zoo
     depends_on:
@@ -130,7 +130,7 @@ services:
       - pinpoint
 
   pinot-broker-0:
-    image: apachepinot/pinot:latest-arm64
+    image: apachepinot/pinot:latest
     restart: unless-stopped
     command: StartBroker -zkAddress pinot-zoo
     depends_on:
@@ -141,7 +141,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:
@@ -152,30 +152,28 @@ services:
       - pinpoint
 
   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": "[0-9*]"/"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
@@ -197,18 +195,6 @@ 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\
-        totalcpu = true\
-        collect_cpu_time = false\
-        report_active = false\
-
-      [[outputs.http]]\
-        url = \"http://pinpoint-collector:15200/telegraf\"\
-        data_format = \"json\"\
-        [outputs.http.headers]\
-          hostGroupName = \"pinpoint-docker\"\
-          Content-Type = \"application/json\"\' > telegraf.conf &&
-      cat telegraf.conf &&
       telegraf -config telegraf.conf"

docker-compose.yml

@@ -92,7 +92,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}

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

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

pinpoint-agent/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.5.0
+PINPOINT_VERSION=2.5.1
 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.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/

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

pinpoint-batch/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.5.0
+PINPOINT_VERSION=2.5.1
 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.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 \

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

pinpoint-collector/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.5.0
+PINPOINT_VERSION=2.5.1
 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.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 \

pinpoint-collector/Dockerfile-metric

@@ -2,7 +2,7 @@ FROM openjdk:11.0.16-jre-slim-buster
 
 ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
 #ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-${PINPOINT_VERSION}.jar
-ARG INSTALL_URL=https://github.com/ga-ram/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-2.5.0.jar
+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,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

pinpoint-flink/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.5.0
+PINPOINT_VERSION=2.5.1
 
 ### 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.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 \

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

pinpoint-hbase/.env

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

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

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

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

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

pinpoint-quickstart/.env

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

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

pinpoint-web/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.5.0
+PINPOINT_VERSION=2.5.1
 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.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 \

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

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}