Create Readme.md

Add pinpoint-batch build at release
Update JDK version
2022-05-31 13:50:44 +09:00 · 2022-05-31 13:45:40 +09:00 · 2022-05-31 12:28:44 +09:00 · 2022-05-31 12:28:44 +09:00 · 2022-05-31 12:27:29 +09:00 · 2022-04-20 18:11:02 +09:00
45 changed files with 683 additions and 136 deletions
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.4.0
 SPRING_PROFILES=release
 #zookeeper information required
 PINPOINT_ZOOKEEPER_ADDRESS=zoo1
@@ -18,7 +18,7 @@ MYSQL_DATABASE=pinpoint

 PINPOINT_WEB_NAME=pinpoint-web

-SERVER_PORT=8079
+WEB_SERVER_PORT=8080

 WEB_LOGGING_LEVEL_ROOT=INFO

@@ -77,6 +77,46 @@ COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996
 FLINK_CLUSTER_ENABLE=true
 FLINK_CLUSTER_ZOOKEEPER_ADDRESS=zoo1

+### Pinpoint-Batch
+
+PINPOINT_BATCH_NAME=pinpoint-batch
+
+BATCH_SERVER_PORT=8079
+
+BATCH_LOGGING_LEVEL_ROOT=INFO
+
+CLUSTER_ENABLE=true
+
+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
+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-Agent

@@ -112,4 +152,4 @@ FLINK_WEB_PORT=8081

 ### Pinpoint-quickstart

-APP_PORT=8000
+APP_PORT=8085
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -0,0 +1,56 @@
+name: Build And Push Docker Image
+
+on:
+  workflow_call:
+    inputs:
+      component:
+        required: true
+        type: string
+    secrets:
+      docker_username:
+        required: true
+      docker_token:
+        required: true
+      docker_password:
+        required: true
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.docker_username }}
+          password: ${{ secrets.docker_token }}
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: pinpointdocker/${{ inputs.component }}
+        
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./${{ inputs.component }}
+          platforms: linux/amd64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Update repo description
+        uses: peter-evans/dockerhub-description@v2
+        with:
+          username: ${{ secrets.docker_username }}
+          password: ${{ secrets.docker_password }}
+          repository: pinpointdocker/${{ inputs.component }}
+          readme-filepath: ./${{ inputs.component }}/Readme.md
+
+        
--- a/.github/workflows/release-images.yml
+++ b/.github/workflows/release-images.yml
@@ -0,0 +1,78 @@
+name: Release Images
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  agent:
+    uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
+    with:
+      component: pinpoint-agent
+    secrets:
+      docker_username: ${{ secrets.DOCKER_USERNAME }}
+      docker_token: ${{ secrets.DOCKER_TOKEN }}
+      docker_password: ${{ secrets.DOCKER_PASSWORD }}
+
+  collector:
+    uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
+    with:
+      component: pinpoint-collector
+    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:
+      component: pinpoint-flink
+    secrets:
+      docker_username: ${{ secrets.DOCKER_USERNAME }}
+      docker_token: ${{ secrets.DOCKER_TOKEN }}
+      docker_password: ${{ secrets.DOCKER_PASSWORD }}
+           
+  hbase:
+    uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
+    with:
+      component: pinpoint-hbase
+    secrets:
+      docker_username: ${{ secrets.DOCKER_USERNAME }}
+      docker_token: ${{ secrets.DOCKER_TOKEN }}
+      docker_password: ${{ secrets.DOCKER_PASSWORD }}
+          
+  mysql:
+    uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
+    with:
+      component: pinpoint-mysql
+    secrets:
+      docker_username: ${{ secrets.DOCKER_USERNAME }}
+      docker_token: ${{ secrets.DOCKER_TOKEN }}
+      docker_password: ${{ secrets.DOCKER_PASSWORD }}
+          
+  quickstart:
+    uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
+    with:
+      component: pinpoint-quickstart
+    secrets:
+      docker_username: ${{ secrets.DOCKER_USERNAME }}
+      docker_token: ${{ secrets.DOCKER_TOKEN }}
+      docker_password: ${{ secrets.DOCKER_PASSWORD }}
+          
+  web:
+    uses: pinpoint-apm/pinpoint-docker/.github/workflows/docker-image.yml@master
+    with:
+      component: pinpoint-web
+    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:
+      component: pinpoint-batch
+    secrets:
+      docker_username: ${{ secrets.DOCKER_USERNAME }}
+      docker_token: ${{ secrets.DOCKER_TOKEN }}
+      docker_password: ${{ secrets.DOCKER_PASSWORD }}
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .idea/
+*.iml
--- a/Readme.md
+++ b/Readme.md
@@ -1,18 +1,24 @@

-![Pinpoint](https://github.com/naver/pinpoint-docker/blob/master/docs/logo.png)
+![Pinpoint](https://github.com/pinpoint-apm/pinpoint-docker/blob/master/docs/logo.png)

 # Pinpoint-Docker for Pinpoint

-Official git repository of Dockerized components of the [Pinpoint Application Monitoring](http://naver.github.io/pinpoint/).  
+Official git repository of Dockerized components of the [Pinpoint Application Monitoring](https://github.com/pinpoint-apm/pinpoint).  
 Installing Pinpoint with these docker files will take approximately 10min. to check out the features of pinpoint.

 ## What is Pinpoint

-[Pinpoint](https://github.com/naver/pinpoint), is the world's leading open-source application monitoring solution - trusted by millions of users around the globe.
+[Pinpoint](https://github.com/pinpoint-apm/pinpoint), is the world's leading open-source application monitoring solution - trusted by millions of users around the globe.
 It supports and helps you understand your application in a glance and allow you to build world-class, high-quality software.

 ## Supported Tags

+ - 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
@@ -21,7 +27,7 @@ It supports and helps you understand your application in a glance and allow you
 - 2.0.2
 - 2.0.1
   - Default transport module has changed from THRIFT to gRPC
-   - Spring profiler added (check [homepage](https://naver.github.io/pinpoint/2.0.1/installation.html#profiles) for more info)
+   - Spring profiler added (check [homepage](https://pinpoint-apm.github.io/pinpoint/2.0.1/installation.html#profiles) for more info)
 - 1.8.5 
 - 1.8.4
 - 1.8.3
@@ -42,14 +48,14 @@ With `docker-compose.yml` under *Pinpoint-Docker* folder brings up all the envir
 To monitor your agent see [configuration part](#configurations) for further details.  

 ```
-git clone https://github.com/naver/pinpoint-docker.git
+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. 

 ```
-git clone https://github.com/naver/pinpoint-docker.git
+git clone https://github.com/pinpoint-apm/pinpoint-docker.git
 cd pinpoint-docker
 git checkout {tag}
 docker-compose pull && docker-compose up -d
@@ -78,34 +84,23 @@ The Pinpoint-Mysql is necessary to use 'Alarm' feature. It's server is running o

 To send email alerts, you must make BATCH_ENABLE=true and change the other mail-related environment variables (MAIL_HOST, MAIL_PORT, MAIL_USERNAME, MAIL_PASSWORD, MAIL_PROPERTIES_MAIL_SMTP_FROM, ...) to the Pinpoint-Web server in *.env* file.

-For more information checkout [Setting Alarm](http://naver.github.io/pinpoint/alarm.html) in Pinpoint documentation.
+For more information checkout [Setting Alarm](http://pinpoint-apm.github.io/pinpoint/alarm.html) in Pinpoint documentation.

 ### Flink configuration (optional)

-The Pinpoint-Flink is necessary to use ['Application Inspector'](http://naver.github.io/pinpoint/applicationinspector.html) feature. 
+The Pinpoint-Flink is necessary to use ['Application Inspector'](https://pinpoint-apm.github.io/pinpoint/applicationinspector.html) feature. 

-After all containers are started and ready to go. There is one more thing to do to use this features in Pinpoint.
-This feature is not mandatory, but since enabling this is a simple task, let's take care of it.
-
-Register a `job` on to pinpoint-flink server.  
-You can build the `job` from the [open-source of Pinpoint](https://github.com/naver/pinpoint), additional guide is [here](https://github.com/naver/pinpoint/blob/master/doc/application-inspector.md#application-inspector).   
-  
-If anyone have solution to put the job file into flink image without doing manually, please let us know.
-
-Pinpoint-Flink server is running on [port 8081](http://localhost:8081/#/submit). From `submit new job` menu
-Submit the jar file with *com.navercorp.pinpoint.flink.StatStreamingVer2Job* in entry class as below image.
-
-![Pinpoint](https://github.com/naver/pinpoint-docker/blob/master/docs/Pinpoint-Flink%20upload.png)
+After all containers are started and ready to go. Pinpoint-Flink server is running on [port 8081](http://localhost:8081/). 

 ### Alarm configuration (optional)

-You can check the [alarm guide document at the homepage](https://naver.github.io/pinpoint/alarm.html) for full understanding.
+You can check the [alarm guide document at the homepage](https://pinpoint-apm.github.io/pinpoint/alarm.html) for full understanding.
 But for the docker image, All is set. fillout variables under *#mail server information required* in `.env` file before starting the container 
 
 ### Testing QuickStart application
 
-Now you are ready to monitor the sample application(Pinpoint-QuickStart [port 8000](http://localhost:8000)) provided.
-If you can't find any connected application from Pinpoint-Web's first page([port 8079](http://localhost:8079) as default), don't panic and wait for a while.
+Now you are ready to monitor the sample application(Pinpoint-QuickStart [port 8085](http://localhost:8085)) provided.
+If you can't find any connected application from Pinpoint-Web's first page([port 8080](http://localhost:8080) as default), don't panic and wait for a while.
 It will take some time for Pinpoint to retrieve the application's information when running for the first time.

 ## Monitoring YOUR Application
@@ -113,13 +108,13 @@ It will take some time for Pinpoint to retrieve the application's information wh
 Pinpoint-Agent only prepares required libraries for triggering Pinpoint-Agent.
 Running and configuring agents is manual action done by the user, but don't worry it's very simple.

-If you are not familiar with Pinpoint concept, please read: [Overview](http://naver.github.io/pinpoint/overview.html#architecture),
-[Agents Installation](http://naver.github.io/pinpoint/installation.html#5-pinpoint-agent)
+If you are not familiar with Pinpoint concept, please read: [Overview](https://pinpoint-apm.github.io/pinpoint/overview.html#architecture),
+[Agents Installation](https://pinpoint-apm.github.io/pinpoint/installation.html#5-pinpoint-agent)

 **You will need to attach *Pinpoint-Agent* to your application.**

-Running Pinpoint-Agent docker-compose separately, Examples are [here](https://github.com/naver/pinpoint-docker/tree/master/pinpoint-agent-attach-example).  
-Otherwise, you can check how [Pinpoint-Quickstart](https://github.com/naver/pinpoint-docker/blob/master/docker-compose.yml) is attached to Pinpoint-Agent with docker-compose.
+Running Pinpoint-Agent docker-compose separately, Examples are [here](https://github.com/pinpoint-apm/pinpoint-docker/tree/master/pinpoint-agent-attach-example).  
+Otherwise, you can check how [Pinpoint-Quickstart](https://github.com/pinpoint-apm/pinpoint-docker/blob/master/docker-compose.yml) is attached to Pinpoint-Agent with docker-compose.

 We'll try to create more examples along the way.
 If anyone who can share their dockerfile, it's always welcome.
@@ -144,12 +139,12 @@ Configuration relies on supplying `docker-compose` with environment variables de
 With `docker-compose` in this repository. You can create stand-alone containers that are needed to run most of the features in Pinpoint.

 **Ports** can be also configured in .env file.
-(Default ports are Pinpoint-Web:8079, Quickstart:8000 and Flink:8081 as configured in .env file)
+(Default ports are Pinpoint-Web:8080, Pinpoint-Batch:8079, Quickstart:8085 and Flink:8081 as configured in .env file)

 Pinpoint-Zookeeper is just an example of using zookeeper image. You can modify docker-compose files to suit your needs.

-For more specific details on what the values represents in *.env* file. Please check [Pinpoint Github Repository](https://github.com/naver/pinpoint) or
-[Pinpoint Web properties](https://github.com/naver/pinpoint/blob/master/web/src/main/resources/pinpoint-web.properties), [Pinpoint Collector properties](https://github.com/naver/pinpoint/blob/master/collector/src/main/resources/pinpoint-collector.properties), [Pinpoint Agent configuration](https://github.com/naver/pinpoint/blob/master/agent/src/main/resources-release/pinpoint.config).  
+For more specific details on what the values represents in *.env* file. Please check [Pinpoint Github Repository](https://github.com/pinpoint-apm/pinpoint) or
+[Pinpoint Web properties](https://github.com/pinpoint-apm/pinpoint/blob/master/web/src/main/resources/pinpoint-web-root.properties), [Pinpoint Collector properties](httpshttps://github.com/pinpoint-apm/pinpoint/blob/master/collector/src/main/resources/pinpoint-collector-root.properties), [Pinpoint Agent configuration](https://github.com/pinpoint-apm/pinpoint/blob/master/agent/src/main/resources/pinpoint-root.config).  
 Please note that only essential configuration options are adopted to pinpoint-docker(docker-compose). 
 
 ## logs 
@@ -163,12 +158,12 @@ 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/naver/pinpoint/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
 Contributions on the pinpoint-docker image is also always welcome.

 ## License
 Pinpoint is licensed under the Apache License, Version 2.0.
-See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
+See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.

 ```
 Copyright 2018 NAVER Corp.
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -77,9 +77,9 @@ services:
      - "9997"
    ports:
      - "9997:9997"
-      - "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}"
+      - "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
    environment:
-      - SERVER_PORT=${SERVER_PORT}
+      - WEB_SERVER_PORT=${WEB_SERVER_PORT}
      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
      - CLUSTER_ENABLE=${CLUSTER_ENABLE}
@@ -159,7 +159,7 @@ services:
    container_name: "pinpoint-quickstart"
    image: "pinpointdocker/pinpoint-quickstart"
    ports:
-      - "${APP_PORT:-8080}:8080"
+      - "${APP_PORT:-8085}:8080"
    volumes:
      - data-volume:/pinpoint-agent
    environment:
@@ -169,6 +169,52 @@ services:
    depends_on:
      - pinpoint-agent

+  pinpoint-batch:
+    build:
+      context: ./pinpoint-batch/
+      dockerfile: Dockerfile
+      args:
+        - PINPOINT_VERSION=${PINPOINT_VERSION}
+
+    container_name: "${PINPOINT_BATCH_NAME}"
+    image: "pinpointdocker/pinpoint-batch:${PINPOINT_VERSION}"
+    depends_on:
+      - pinpoint-hbase
+      - pinpoint-mysql
+      - zoo1
+    restart: always
+    environment:
+      - BATCH_SERVER_PORT=${BATCH_SERVER_PORT}
+      - 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}
+      - 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
+
  pinpoint-agent:
    build:
      context: ./pinpoint-agent/
@@ -249,23 +295,36 @@ services:

  ##flink
  jobmanager:
+    build:
+      context: pinpoint-flink
+      dockerfile: Dockerfile
+      args:
+        - PINPOINT_VERSION=${PINPOINT_VERSION}
+
    container_name: "${PINPOINT_FLINK_NAME}-jobmanager"
-    image: flink:1.3.1
+    image: "pinpointdocker/pinpoint-flink:${PINPOINT_VERSION}"
    expose:
      - "6123"
    ports:
      - "${FLINK_WEB_PORT:-8081}:8081"
-    command: jobmanager
+    command: standalone-job -p 1 pinpoint-flink-job.jar -spring.profiles.active release
    environment:
      - JOB_MANAGER_RPC_ADDRESS=jobmanager
+      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
    networks:
      - pinpoint
    depends_on:
      - zoo1

  taskmanager:
+    build:
+      context: pinpoint-flink
+      dockerfile: Dockerfile
+      args:
+        - PINPOINT_VERSION=${PINPOINT_VERSION}
+
    container_name: "${PINPOINT_FLINK_NAME}-taskmanager"
-    image: flink:1.3.1
+    image: "pinpointdocker/pinpoint-flink:${PINPOINT_VERSION}"
    expose:
      - "6121"
      - "6122"
--- a/docs/Pinpoint-Flink
+++ b/docs/Pinpoint-Flink
--- a/pinpoint-agent-attach-example/java/.env
+++ b/pinpoint-agent-attach-example/java/.env
@@ -1,5 +1,5 @@
 ### Pinpoint with Java
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.4.0
 SPRING_PROFILES=release
 AGENT_ID=app-in-docker
 APP_NAME=quickapp
--- a/pinpoint-agent-attach-example/java/Dockerfile
+++ b/pinpoint-agent-attach-example/java/Dockerfile
@@ -1,7 +1,5 @@
 FROM java:8

-LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
-
 ARG PINPOINT_VERSION
 ARG AGENT_ID
 ARG APP_NAME
--- a/pinpoint-agent-attach-example/tomcat/.env
+++ b/pinpoint-agent-attach-example/tomcat/.env
@@ -1,6 +1,6 @@
 ### Pinpoint with Tomcat
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.4.0
 SPRING_PROFILES=release
-APP_PORT=8000
+APP_PORT=8085
 AGENT_ID=app-in-docker
 APP_NAME=quickapp
--- a/pinpoint-agent-attach-example/tomcat/docker-compose.yml
+++ b/pinpoint-agent-attach-example/tomcat/docker-compose.yml
@@ -9,7 +9,7 @@ services:
    container_name: "tomcat"
    image: "Your Image"
    ports:
-      - "${APP_PORT:-8080}:8080"
+      - "${APP_PORT:-8085}:8080"
    volumes_from:
      - container:pinpoint-agent
    environment:
--- a/pinpoint-agent/.env
+++ b/pinpoint-agent/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.3.3
 SPRING_PROFILES=release

 ### Pinpoint-Agent
--- a/pinpoint-agent/Dockerfile
+++ b/pinpoint-agent/Dockerfile
@@ -1,9 +1,7 @@
 FROM alpine:3.7

-LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
-
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.0}
-ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+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/

--- a/pinpoint-agent/Readme.md
+++ b/pinpoint-agent/Readme.md
@@ -5,6 +5,13 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat

 ## Supported Tags

+ - 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
@@ -21,17 +28,17 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat
 - 1.7.3
 - 1.7.2
 
-Please see [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image.
+Please see [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/naver/pinpoint/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
 Contributions on the pinpoint-docker image is also always welcome.

 ## License

 Pinpoint is licensed under the Apache License, Version 2.0.
-See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
+See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.

 ```
 Copyright 2018 NAVER Corp.
--- a/pinpoint-batch/.env
+++ b/pinpoint-batch/.env
@@ -0,0 +1,45 @@
+PINPOINT_VERSION=2.4.0
+SPRING_PROFILES=release
+
+### Pinpoint-Batch
+
+PINPOINT_BATCH_NAME=pinpoint-batch
+
+BATCH_SERVER_PORT=8079
+#zookeeper information required
+PINPOINT_ZOOKEEPER_ADDRESS=
+
+BATCH_LOGGING_LEVEL_ROOT=INFO
+
+CLUSTER_ENABLE=true
+
+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
+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
--- a/pinpoint-batch/Dockerfile
+++ b/pinpoint-batch/Dockerfile
@@ -0,0 +1,17 @@
+FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim
+
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-batch-${PINPOINT_VERSION}.jar
+
+RUN mkdir -p /pinpoint/config \
+    && mkdir -p /pinpoint/scripts
+
+COPY /build/config/pinpoint-batch.properties /pinpoint/config/
+COPY /build/scripts/start-batch.sh /pinpoint/scripts/
+
+RUN apk --no-cache add curl \
+    && 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
+
+ENTRYPOINT ["sh", "/pinpoint/scripts/start-batch.sh"]
--- a/pinpoint-batch/Readme.md
+++ b/pinpoint-batch/Readme.md
@@ -0,0 +1,56 @@
+## Pinpoint Batch
+
+This Docker image contains the Pinpoint Batch component of the Pinpoint application monitoring system.
+
+## Supported Tags
+
+ - 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).
+Contributions on the pinpoint-docker image is also always welcome.
+
+## License
+
+Pinpoint is licensed under the Apache License, Version 2.0.
+See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
+
+```
+Copyright 2018 NAVER Corp.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```
--- a/pinpoint-batch/build/config/pinpoint-batch.properties
+++ b/pinpoint-batch/build/config/pinpoint-batch.properties
@@ -0,0 +1,8 @@
+##########
+# another way of setting properties.
+# applied priority '.ENV' -> 'pinpoint-web.properties'
+# property should be commented in docker-compose file to use
+# ex) PINPOINT_ZOOKEEPER_ADDRESS should be commented in docker-compose to use pinpoint.zookeeper.address below
+##########
+
+pinpoint.zookeeper.address=
--- a/pinpoint-batch/build/scripts/start-batch.sh
+++ b/pinpoint-batch/build/scripts/start-batch.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+set -x
+
+exec java -jar /pinpoint/pinpoint-batch.jar --spring.config.additional-location=/pinpoint/config/pinpoint-batch.properties
--- a/pinpoint-batch/docker-compose.yml
+++ b/pinpoint-batch/docker-compose.yml
@@ -0,0 +1,45 @@
+version: "3.6"
+
+services:
+  pinpoint-batch:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        - PINPOINT_VERSION=${PINPOINT_VERSION}
+
+    container_name: "${PINPOINT_BATCH_NAME}"
+    image: "pinpointdocker/pinpoint-batch:${PINPOINT_VERSION}"
+
+    restart: always
+    expose:
+      - "${BATCH_SERVER_PORT:-8079}"
+    ports:
+      - "${BATCH_SERVER_PORT:-8079}:${BATCH_SERVER_PORT:-8079}"
+    environment:
+      - BATCH_SERVER_PORT=${BATCH_SERVER_PORT}
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
+      - 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}
+      - 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}
--- a/pinpoint-collector/.env
+++ b/pinpoint-collector/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.4.0
 SPRING_PROFILES=release

 ### Pinpoint-Collector
--- a/pinpoint-collector/Dockerfile
+++ b/pinpoint-collector/Dockerfile
@@ -1,9 +1,7 @@
-FROM openjdk:8-jdk-alpine
+FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim

-LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
-
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.0}
-ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+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 \
    && mkdir -p /pinpoint/scripts
@@ -11,7 +9,7 @@ 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.2.0-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
+#COPY /pinpoint-collector-boot-2.4.0-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar

 RUN apk --no-cache add curl \
    && chmod a+x /pinpoint/scripts/start-collector.sh \
--- a/pinpoint-collector/Readme.md
+++ b/pinpoint-collector/Readme.md
@@ -5,6 +5,13 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl

 ## Supported Tags

+ - 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
@@ -21,17 +28,17 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl
 - 1.7.3
 - 1.7.2
 
-Please see [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image.
+Please see [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/naver/pinpoint/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
 Contributions on the pinpoint-docker image is also always welcome.

 ## License

 Pinpoint is licensed under the Apache License, Version 2.0.
-See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
+See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.

 ```
 Copyright 2018 NAVER Corp.
--- a/pinpoint-flink/.env
+++ b/pinpoint-flink/.env
@@ -1,7 +1,8 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.4.0

 ### Pinpoint-flink

+PINPOINT_ZOOKEEPER_ADDRESS=zookeeper
 PINPOINT_FLINK_NAME=pinpoint-flink
 FLINK_WEB_PORT=8081

--- a/pinpoint-flink/Dockerfile
+++ b/pinpoint-flink/Dockerfile
@@ -0,0 +1,15 @@
+FROM flink:1.14.2
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-flink-job-${PINPOINT_VERSION}.jar
+
+RUN apt-get update \
+ && apt-get install --no-install-recommends -y zip \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/* \
+ && mkdir -p /build \
+ && curl -SL ${INSTALL_URL} -o /build/pinpoint-flink-job.jar
+
+COPY build/ /build/
+COPY docker-bin/ /docker-bin/
+ENTRYPOINT ["/docker-bin/docker-entrypoint.sh"]
+
--- a/pinpoint-flink/Readme.md
+++ b/pinpoint-flink/Readme.md
@@ -0,0 +1,40 @@
+
+## Pinpoint Flink
+
+This Docker image contains the Pinpoint Flink component of the Pinpoint application monitoring system.
+
+## Supported Tags
+
+ - 2.4.0
+ - 2.3.3
+ - 2.3.2
+ - 2.3.1
+ - 2.3.0
+ 
+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).
+Contributions on the pinpoint-docker image is also always welcome.
+
+## License
+
+Pinpoint is licensed under the Apache License, Version 2.0.
+See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
+
+```
+Copyright 2018 NAVER Corp.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```
--- a/pinpoint-flink/build/profiles/release/hbase.properties
+++ b/pinpoint-flink/build/profiles/release/hbase.properties
@@ -1,21 +1,4 @@
-#
-# Copyright 2017 NAVER Corp.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# local
-hbase.client.host=pinpoint-hbase
+hbase.client.host=#PINPOINT_ZOOKEEPER_ADDRESS#
 hbase.client.port=2181

 # hbase default:/hbase
--- a/pinpoint-flink/build/profiles/release/pinpoint-flink.properties
+++ b/pinpoint-flink/build/profiles/release/pinpoint-flink.properties
@@ -2,7 +2,7 @@
 collector.l4.ip=

 # base data receiver config  ---------------------------------------------------------------------
-collector.receiver.base.ip=pinpoint-flink-taskmanager
+collector.receiver.base.ip=0.0.0.0
 collector.receiver.base.port=19994

 # number of tcp worker threads
@@ -23,26 +23,24 @@ collector.agentEventWorker.threadSize=4
 # capacity of agent event worker queue
 collector.agentEventWorker.queueSize=1024

-statistics.flushPeriod=1000
-
 # -------------------------------------------------------------------------------------------------
 # The cluster related options are used to establish connections between the agent, collector, and web in order to send/receive data between them in real time.
 # You may enable additional features using this option (Ex : RealTime Active Thread Chart).
 # -------------------------------------------------------------------------------------------------
 # Usage : Set the following options for collector/web components that reside in the same cluster in order to enable this feature.
-# 1. cluster.enable (pinpoint-web.properties, pinpoint-flink.properties) - "true" to enable
-# 2. cluster.zookeeper.address (pinpoint-web.properties, pinpoint-flink.properties) - address of the ZooKeeper instance that will be used to manage the cluster
-# 3. cluster.web.tcp.port (pinpoint-web.properties) - any available port number (used to establish connection between web and collector)
+# 1. cluster.enable (pinpoint-web-root.properties, pinpoint-flink.properties) - "true" to enable
+# 2. cluster.zookeeper.address (pinpoint-web-root.properties, pinpoint-flink.properties) - address of the ZooKeeper instance that will be used to manage the cluster
+# 3. cluster.web.tcp.port (pinpoint-web-root.properties) - any available port number (used to establish connection between web and collector)
 # -------------------------------------------------------------------------------------------------
 # Please be aware of the following:
 #1. If the network between web, collector, and the agents are not stable, it is advisable not to use this feature.
 #2. We recommend using the cluster.web.tcp.port option. However, in cases where the collector is unable to establish connection to the web, you may reverse this and make the web establish connection to the collector.
-#   In this case, you must set cluster.connect.address (pinpoint-web.properties); and cluster.listen.ip, cluster.listen.port (pinpoint-flink.properties) accordingly.
-cluster.enable=true
-cluster.zookeeper.address=zoo1
+#   In this case, you must set cluster.connect.address (pinpoint-web-root.properties); and cluster.listen.ip, cluster.listen.port (pinpoint-flink.properties) accordingly.
+cluster.enable=false
+cluster.zookeeper.address=#PINPOINT_ZOOKEEPER_ADDRESS#
 cluster.zookeeper.sessiontimeout=30000
 cluster.listen.ip=
-cluster.listen.port=
+cluster.listen.port=-1

 #collector.admin.password=
 #collector.admin.api.rest.active=
@@ -52,11 +50,10 @@ collector.spanEvent.sequence.limit=10000

 # flink cluster
 flink.cluster.enable=true
-flink.cluster.zookeeper.address=zoo1
+flink.cluster.zookeeper.address=#PINPOINT_ZOOKEEPER_ADDRESS#
 flink.cluster.zookeeper.sessiontimeout=3000
 flink.cluster.zookeeper.retry.interval=5000
 flink.cluster.tcp.port=19994

 # flink env init
-flink.StreamExecutionEnvironment=
-flink.sourceFunction.Parallel=1
+flink.StreamExecutionEnvironment=server
--- a/pinpoint-flink/docker-bin/docker-entrypoint.sh
+++ b/pinpoint-flink/docker-bin/docker-entrypoint.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# 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 -
+
+  mv /build/pinpoint-flink-job.jar pinpoint-flink-job.jar
+
+  shift
+
+  /docker-entrypoint.sh jobmanager &
+  sleep 5
+  if ! flink list | grep 'RUNNING'; then
+    flink run $@
+  fi
+  wait
+else
+  exec /docker-entrypoint.sh $@
+fi
--- a/pinpoint-flink/docker-compose.yml
+++ b/pinpoint-flink/docker-compose.yml
@@ -7,21 +7,24 @@ version: "3.6"
 services:
  ##flink
  jobmanager:
+    build: Dockerfile
    container_name: "${PINPOINT_FLINK_NAME}-jobmanager"
-    image: flink:1.3.1
+    image: ${PINPOINT_FLINK_NAME}-flink:dev
    expose:
      - "6123"
    ports:
      - "${FLINK_WEB_PORT:-8081}:8081"
-    command: jobmanager
+    command: standalone-job -p 1 pinpoint-flink-job.jar -spring.profiles.active release
    environment:
      - JOB_MANAGER_RPC_ADDRESS=jobmanager
+      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
    networks:
      - pinpoint

  taskmanager:
+    build: Dockerfile
    container_name: "${PINPOINT_FLINK_NAME}-taskmanager"
-    image: flink:1.3.1
+    image: ${PINPOINT_FLINK_NAME}-flink:dev
    expose:
      - "6121"
      - "6122"
--- a/pinpoint-hbase/.env
+++ b/pinpoint-hbase/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.4.0

 ### Pinpoint-Hbase

--- a/pinpoint-hbase/Dockerfile
+++ b/pinpoint-hbase/Dockerfile
@@ -1,8 +1,6 @@
 FROM java:8-jdk

-LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
-
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}

 ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
 ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase
@@ -24,7 +22,7 @@ RUN chmod a+x /usr/local/bin/initialize-hbase.sh \
    && tar xfvz hbase.tar.gz \
    && mv ../../hbase-site.xml ../../${HBASE_HOME}/conf/hbase-site.xml \
    && mv ../../hbase-env.sh ../../${HBASE_HOME}/conf/hbase-env.sh \
-    && curl -SL "https://raw.githubusercontent.com/naver/pinpoint/v${PINPOINT_VERSION}/hbase/scripts/hbase-create.hbase" -o ${BASE_DIR}/hbase-create.hbase 
+    && curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/hbase/scripts/hbase-create.hbase" -o ${BASE_DIR}/hbase-create.hbase

 VOLUME ["/home/pinpoint/hbase", "/home/pinpoint/zookeeper"]

--- a/pinpoint-hbase/Readme.md
+++ b/pinpoint-hbase/Readme.md
@@ -5,6 +5,13 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat

 ## Supported Tags

+ - 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
@@ -21,17 +28,17 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat
 - 1.7.3
 - 1.7.2
 
-Please see the [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image.
+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/naver/pinpoint/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
 Contributions on the pinpoint-docker image is also always welcome.

 ## License

 Pinpoint is licensed under the Apache License, Version 2.0.
-See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
+See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.

 ```
 Copyright 2018 NAVER Corp.
--- a/pinpoint-mysql/.env
+++ b/pinpoint-mysql/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.4.0

 ### Pinpoint-mysql
 MYSQL_ROOT_PASSWORD=root123
--- a/pinpoint-mysql/Dockerfile
+++ b/pinpoint-mysql/Dockerfile
@@ -1,11 +1,11 @@
 FROM mysql:5.7

-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}

 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/naver/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/naver/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-mysql.sql" \
+	&& 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" \
 	&& 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
--- a/pinpoint-mysql/Readme.md
+++ b/pinpoint-mysql/Readme.md
@@ -5,6 +5,13 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat

 ## Supported Tags

+ - 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
@@ -21,17 +28,17 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat
 - 1.7.3
 - 1.7.2
 
-Please see [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image.
+Please see [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/naver/pinpoint/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
 Contributions on the pinpoint-docker image is also always welcome.

 ## License

 Pinpoint is licensed under the Apache License, Version 2.0.
-See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
+See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.

 ```
 Copyright 2018 NAVER Corp.
--- a/pinpoint-mysql/docker-compose.yml
+++ b/pinpoint-mysql/docker-compose.yml
@@ -22,4 +22,4 @@ services:
      - MYSQL_DATABASE=${MYSQL_DATABASE}

    volumes:
-      - ./var/lib/mysql
+      - /var/lib/mysql
--- a/pinpoint-quickstart/.env
+++ b/pinpoint-quickstart/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.4.0
 SPRING_PROFILES=release

 ### Pinpoint-Agent
@@ -23,4 +23,4 @@ AGENT_DEBUG_LEVEL=INFO

 ### Pinpoint-quickstart

-APP_PORT=8000
+APP_PORT=8085
--- a/pinpoint-quickstart/Dockerfile
+++ b/pinpoint-quickstart/Dockerfile
@@ -1,7 +1,5 @@
 FROM tomcat:8-jre8

-LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
-
 COPY /build/pinpoint-quickstart-testapp.war quickstart.war

 RUN rm -rf /usr/local/tomcat/webapps \
--- a/pinpoint-quickstart/Readme.md
+++ b/pinpoint-quickstart/Readme.md
@@ -0,0 +1,57 @@
+
+## Pinpoint Quickstart
+
+This Docker image contains the Pinpoint Quickstart sample to test Pinpoint application monitoring system.
+
+## Supported Tags
+
+ - 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).
+Contributions on the pinpoint-docker image is also always welcome.
+
+## License
+
+Pinpoint is licensed under the Apache License, Version 2.0.
+See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.
+
+```
+Copyright 2018 NAVER Corp.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```
--- a/pinpoint-quickstart/docker-compose.yml
+++ b/pinpoint-quickstart/docker-compose.yml
@@ -9,7 +9,7 @@ services:
    container_name: "pinpoint-quickstart"
    image: "pinpointdocker/pinpoint-quickstart"
    ports:
-      - "${APP_PORT:-8080}:8080"
+      - "${APP_PORT:-8085}:8080"
    volumes:
      - data-volume:/pinpoint-agent
    environment:
--- a/pinpoint-web/.env
+++ b/pinpoint-web/.env
@@ -1,11 +1,11 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.4.0
 SPRING_PROFILES=release

 ### Pinpoint-Web

 PINPOINT_WEB_NAME=pinpoint-web

-SERVER_PORT=8079
+WEB_SERVER_PORT=8080
 #zookeeper information required
 PINPOINT_ZOOKEEPER_ADDRESS=

--- a/pinpoint-web/Dockerfile
+++ b/pinpoint-web/Dockerfile
@@ -1,9 +1,7 @@
-FROM openjdk:8-jdk-alpine
+FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim

-LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
-
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.0}
-ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+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 \
    && mkdir -p /pinpoint/scripts
@@ -11,7 +9,7 @@ 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.2.0-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
+#COPY /pinpoint-web-boot-2.4.0-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar

 RUN apk --no-cache add curl \
    && chmod a+x /pinpoint/scripts/start-web.sh \
--- a/pinpoint-web/Readme.md
+++ b/pinpoint-web/Readme.md
@@ -5,6 +5,13 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio

 ## Supported Tags

+ - 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
@@ -21,17 +28,17 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio
 - 1.7.3
 - 1.7.2
 
-Please see the [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image.
+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/naver/pinpoint/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
 Contributions on the pinpoint-docker image is also always welcome.

 ## License

 Pinpoint is licensed under the Apache License, Version 2.0.
-See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
+See [LICENSE](https://github.com/pinpoint-apm/pinpoint/blob/master/LICENSE) for full license text.

 ```
 Copyright 2018 NAVER Corp.
--- a/pinpoint-web/docker-compose.yml
+++ b/pinpoint-web/docker-compose.yml
@@ -13,13 +13,13 @@ services:

    restart: always
    expose:
-      - "${SERVER_PORT:-8080}"
+      - "${WEB_SERVER_PORT:-8080}"
      - "9997"
    ports:
      - "9997:9997"
-      - "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}"
+      - "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
    environment:
-      - SERVER_PORT=${SERVER_PORT}
+      - WEB_SERVER_PORT=${WEB_SERVER_PORT}
      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
      - CLUSTER_ENABLE=${CLUSTER_ENABLE}
Author	SHA1	Message	Date
ga-ram	371f421ce7	Create Readme.md	2022-05-31 13:50:44 +09:00
ga-ram	2d3ce11e0c	Add pinpoint-batch build at release	2022-05-31 13:45:40 +09:00
ga-ram	4dec6a5913	Update JDK version	2022-05-31 12:28:44 +09:00
ga-ram	8eface18ad	Release 2.4.0	2022-05-31 12:28:44 +09:00
koo.taejin	0da267c489	[#noissue] Remove invalid character in docker-compose.yml Docker does not allow relative path in anonymous volumes for container path.	2022-05-31 12:27:29 +09:00
ga-ram	750af1ec73	[#130 ] Add batch container	2022-04-20 18:11:02 +09:00
Ga Lam CHOI	c44873185a	Release 2.3.3	2021-12-23 14:19:23 +09:00
Ga Lam CHOI	ed16a3b842	Updated document	2021-12-14 15:35:00 +09:00
Ga Lam CHOI	74401262f2	Fix typo	2021-12-14 14:26:01 +09:00
Ga Lam CHOI	2a0a9c5061	Release 2.3.2	2021-12-14 11:37:28 +09:00
ga-ram	3c19543b15	Add workflows to build and commit images to docker hub	2021-11-12 10:47:42 +09:00
Ga Lam CHOI	cb59c2d7d0	Release 2.3.1	2021-11-12 10:47:42 +09:00
SungWook Kim	3e9dae2963	release 2.3.0	2021-08-17 11:43:11 +09:00
Kyujin Nam	04d2f4ffda	Fix broken link	2021-06-23 08:34:00 +09:00
ga-ram	69a8a1d0f6	Update links for Readme.md	2021-05-28 18:33:41 +09:00
SungWook Kim	c8a0edf3be	[#noissue] add version change in flink	2021-03-25 18:11:13 +09:00
RoyKim	23a3a8a7a7	[naver/pinpoint#7710 ] release v2.2.2	2021-03-25 17:16:27 +09:00
RoysRoise	cd15b323fb	update gitignore for iml files	2021-03-25 17:06:51 +09:00
Charles DELFLY	2103143626	Remove useless properties file for pinpoint job	2021-03-25 16:50:51 +09:00
Charles DELFLY	da8c83ec78	Fix flink image name	2021-03-25 16:50:51 +09:00
Charles DELFLY	a9c323c81d	Fix issue if job manager restart and task is already present.	2021-03-25 16:50:51 +09:00
Charles DELFLY	744a748e81	Update to flink version 1.7	2021-03-25 16:50:51 +09:00
Charles DELFLY	77b55c8e53	Load job when jobmanager startup	2021-03-25 16:50:51 +09:00
Roy Kim	aeedca1a15	[naver/pinpoint#7566 ] release v2.2.1	2021-01-25 12:05:12 +09:00