.env

@@ -1,31 +1,11 @@
-PINPOINT_VERSION=2.5.3
+PINPOINT_VERSION=2.0.2
 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
-AGENTINFO_TTL=31536000
+#config for hbase in external docker
-AGENTSTATV2_TTL=5184000
+EXTERNAL_HBASE_PORT=2180
-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
@@ -37,39 +17,55 @@ MYSQL_DATABASE=pinpoint
 
 PINPOINT_WEB_NAME=pinpoint-web
 
-WEB_SERVER_PORT=8080
+WEB_PAGE_PORT=8079
-
-WEB_LOGGING_LEVEL_ROOT=INFO
 
 CLUSTER_ENABLE=true
+#CLUSTER_WEB_TCP_PORT=9997
+CLUSTER_ZOOKEEPER_ADDRESS=zoo1
 
 ADMIN_PASSWORD=admin
 
-#analytics
+ANALYTICS=true
-CONFIG_SENDUSAGE=true
+
+HBASE_HOST=pinpoint-hbase
+HBASE_PORT=2181
+
+WEB_DEBUG_LEVEL=INFO
+
+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
+#mysql information required
-JDBC_DRIVERCLASSNAME=com.mysql.jdbc.Driver
+JDBC_DRIVER=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
+MAIL_SERVER_URL=smtp.gmail.com
+MAIL_SERVER_PORT=587
+MAIL_SERVER_USERNAME=username
+MAIL_SERVER_PASSWORD=password
+MAIL_SENDER_ADDRESS=pinpoint_operator@pinpoint.com
+MAIL_TRANSPORT_PROTOCOL=smtp
+MAIL_SMTP_PORT=25
+MAIL_SMTP_AUTH=false
+MAIL_SMTP_STARTTLS_ENABLE=false
+MAIL_SMTP_STARTTLS_REQUIRED=false
+MAIL_DEBUG=false
+
+
 ### Pinpoint-Collector
 
 PINPOINT_COLLECTOR_NAME=pinpoint-collector
 
-CLUSTER_ENABLE=true
+COLLECTOR_RECEIVER_AGENT_PORT=9991
-
+COLLECTOR_RECEIVER_METADATA_PORT=9991
-COLLECTOR_LOGGING_LEVEL_ROOT=INFO
+COLLECTOR_RECEIVER_STAT_PORT=9992
-
+COLLECTOR_RECEIVER_SPAN_PORT=9993
-#grpc
-COLLECTOR_RECEIVER_GRPC_AGENT_PORT=9991
-COLLECTOR_RECEIVER_GRPC_STAT_PORT=9992
-COLLECTOR_RECEIVER_GRPC_SPAN_PORT=9993
-
-#thrift
 COLLECTOR_RECEIVER_BASE_PORT=9994
 COLLECTOR_RECEIVER_STAT_UDP_PORT=9995
 COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996
@@ -77,44 +73,8 @@ COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996
 FLINK_CLUSTER_ENABLE=true
 FLINK_CLUSTER_ZOOKEEPER_ADDRESS=zoo1
 
-### Pinpoint-Batch
+COLLECTOR_DEBUG_LEVEL=INFO
 
-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_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
 
@@ -133,12 +93,8 @@ COLLECTOR_TCP_PORT=9994
 COLLECTOR_STAT_PORT=9995
 COLLECTOR_SPAN_PORT=9996
 
-# Sampling Configurations
+# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
-PROFILER_SAMPLING_TYPE=COUNTING
+PROFILER_SAMPLING_RATE=1
-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
@@ -154,12 +110,4 @@ FLINK_WEB_PORT=8081
 
 ### Pinpoint-quickstart
 
-APP_PORT=8085
+APP_PORT=8000
-
-### 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

@@ -1,73 +0,0 @@
-name: Build And Push Docker Image
-
-on:
-  workflow_call:
-    inputs:
-      component:
-        required: true
-        type: string
-      dockerfile:
-        required: false
-        type: string
-        default: 'Dockerfile'
-      tag_postfix:
-        required: false
-        type: string
-        default: ''
-    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 QEMU
-        uses: docker/setup-qemu-action@v2
-             
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        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 }}${{ inputs.tag_postfix }}
-          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
-
-        

.github/workflows/release-images.yml

@@ -1,100 +0,0 @@
-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 }}
-          
-  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:
-      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 }}
-                    
-  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:
-      component: pinpoint-batch
-    secrets:
-      docker_username: ${{ secrets.DOCKER_USERNAME }}
-      docker_token: ${{ secrets.DOCKER_TOKEN }}
-      docker_password: ${{ secrets.DOCKER_PASSWORD }}

.gitignore

@@ -1,2 +1 @@
 .idea/
-*.iml

Readme.md

@@ -1,42 +1,22 @@
 
-![Pinpoint](https://github.com/pinpoint-apm/pinpoint-docker/blob/master/docs/logo.png)
+![Pinpoint](https://github.com/naver/pinpoint-docker/blob/master/docs/logo.png)
 
 # Pinpoint-Docker for Pinpoint
 
-Official git repository of Dockerized components of the [Pinpoint Application Monitoring](https://github.com/pinpoint-apm/pinpoint).  
+Official git repository of Dockerized components of the [Pinpoint Application Monitoring](http://naver.github.io/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/pinpoint-apm/pinpoint), is the world's leading open-source application monitoring solution - trusted by millions of users around the globe.
+[Pinpoint](https://github.com/naver/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.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
- - 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
    - Default transport module has changed from THRIFT to gRPC
-   - Spring profiler added (check [homepage](https://pinpoint-apm.github.io/pinpoint/2.0.1/installation.html#profiles) for more info)
+   - Spring profiler added (check [homepage](https://naver.github.io/pinpoint/2.0.1/installation.html#profiles) for more info)
  - 1.8.5 
  - 1.8.4
  - 1.8.3
@@ -57,77 +37,70 @@ 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/pinpoint-apm/pinpoint-docker.git
+git clone https://github.com/naver/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 checkout {tag}
 cd pinpoint-docker
 docker-compose pull && docker-compose up -d
 ```
 
-Since [Pinpoint v2.5.0](https://github.com/pinpoint-apm/pinpoint/releases/tag/v2.5.0), URI Metric and Infrastructure Metric are added.
+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.
-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.
 
-```
+This will install and run all services required to run all features in Pinpoint in docker containers joined with same network.
-git clone https://github.com/pinpoint-apm/pinpoint-docker.git
+ - Pinpoint-Web Server
-cd pinpoint-docker
+ - Pinpoint-Collector
-docker-compose pull
+ - Pinpoint-Agent
-docker-compose -f docker-compose.yml -f docker-compose-metric.yml up -d
+ - Pinpoint-Flink(to support certain feature)
-```
+ - Pinpoint-Zookeeper
-
+ - Pinpoint-Hbase
-Docker images for Pinpoint web and Pinpoint collector is provided since **v2.5.1**, so above wouldn't work with v2.5.0 images.
+ - Pinpoint-QuickStart(a sample application, 1.8.1+)
-To use Pinpoint v2.5.0 metric modules, you need to checkout v2.5.0 and then build the images ahead with below command.
+ - Pinpoint-Mysql(to support certain feature)
-
+This may take several minutes to download all necessary images.
-```
-git clone https://github.com/pinpoint-apm/pinpoint-docker.git
-cd pinpoint-docker
-git checkout {tag}
-docker-compose -f docker-compose.yml -f docker-compose-metric.yml build
-```
-
-If you are not interested in metric modules, simply remove `-f docker-compose-metric.yml` in docker-compose commands.
-
-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.
 
 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://pinpoint-apm.github.io/pinpoint/alarm.html) in Pinpoint documentation.
+For more information checkout [Setting Alarm](http://naver.github.io/pinpoint/alarm.html) in Pinpoint documentation.
 
 ### Flink configuration (optional)
 
-The Pinpoint-Flink is necessary to use ['Application Inspector'](https://pinpoint-apm.github.io/pinpoint/applicationinspector.html) feature. 
+The Pinpoint-Flink is necessary to use ['Application Inspector'](http://naver.github.io/pinpoint/applicationinspector.html) feature. 
 
-After all containers are started and ready to go. Pinpoint-Flink server is running on [port 8081](http://localhost:8081/). 
+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)
 
 ### Alarm configuration (optional)
 
-You can check the [alarm guide document at the homepage](https://pinpoint-apm.github.io/pinpoint/alarm.html) for full understanding.
+You can check the [alarm guide document at the homepage](https://naver.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 8085](http://localhost:8085)) provided.
+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 8080](http://localhost:8080) as default), don't panic and wait for a while.
+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.
 It will take some time for Pinpoint to retrieve the application's information when running for the first time.
 
 ## Monitoring YOUR Application
@@ -135,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](https://pinpoint-apm.github.io/pinpoint/overview.html#architecture),
+If you are not familiar with Pinpoint concept, please read: [Overview](http://naver.github.io/pinpoint/overview.html#architecture),
-[Agents Installation](https://pinpoint-apm.github.io/pinpoint/installation.html#5-pinpoint-agent)
+[Agents Installation](http://naver.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/pinpoint-apm/pinpoint-docker/tree/master/pinpoint-agent-attach-example).  
+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/pinpoint-apm/pinpoint-docker/blob/master/docker-compose.yml) is attached to Pinpoint-Agent with docker-compose.
+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.
 
 We'll try to create more examples along the way.
 If anyone who can share their dockerfile, it's always welcome.
@@ -166,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:8080, Pinpoint-Batch:8079, Quickstart:8085 and Flink:8081 as configured in .env file)
+(Default ports are Pinpoint-Web:8079, Quickstart:8000 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/pinpoint-apm/pinpoint) or
+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/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).  
+[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).  
 Please note that only essential configuration options are adopted to pinpoint-docker(docker-compose). 
  
 ## logs 
@@ -185,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/pinpoint-apm/pinpoint-docker/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/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.
+See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
 
 ```
 Copyright 2018 NAVER Corp.

docker-compose-metric.yml

@@ -1,216 +0,0 @@
-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,26 +12,13 @@ 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:
-      - hbase_data:/home/pinpoint/hbase
+      - /home/pinpoint/hbase
       - /home/pinpoint/zookeeper
     expose:
+      # zookeeper
+      - "2181"
       # HBase Master API port
       - "60000"
       # HBase Master Web UI
@@ -41,18 +28,12 @@ services:
       # HBase Regionserver web UI
       - "16030"
     ports:
+      - "${EXTERNAL_HBASE_PORT:-2181}:2181"
       - "60000:60000"
       - "16010:16010"
       - "60020:60020"
       - "16030:16030"
     restart: always
-    depends_on:
-      - zoo1
-    logging:
-      driver: "json-file"
-      options:
-        max-file: "3"
-        max-size: "10m"
 
   pinpoint-mysql:
     build:
@@ -77,11 +58,6 @@ services:
       - mysql_data:/var/lib/mysql
     networks:
       - pinpoint
-    logging:
-      driver: "json-file"
-      options:
-        max-file: "3"
-        max-size: "10m"
 
   pinpoint-web:
     build:
@@ -96,35 +72,46 @@ services:
     depends_on:
       - pinpoint-hbase
       - pinpoint-mysql
-      - zoo1
     restart: always
     expose:
+      - "8080"
       - "9997"
     ports:
       - "9997:9997"
-      - "${WEB_SERVER_PORT:-8080}:8080"
+      - "${WEB_PAGE_PORT:-8080}:8080"
     environment:
-      - WEB_SERVER_PORT=${WEB_SERVER_PORT}
+      - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES},batch"
-      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
+      - SPRING_PROFILES=${SPRING_PROFILES}
-      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
+      - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}
-      - CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
+      - ANALYTICS=${ANALYTICS}
-      - LOGGING_LEVEL_ROOT=${WEB_LOGGING_LEVEL_ROOT}
+      - HBASE_HOST=${HBASE_HOST}
+      - HBASE_PORT=${HBASE_PORT}
+      - DEBUG_LEVEL=${WEB_DEBUG_LEVEL}
       - CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT}
-      - JDBC_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
+      - BATCH_ENABLE=${BATCH_ENABLE}
+      - BATCH_SERVER_IP=${BATCH_SERVER_IP}
+      - BATCH_FLINK_SERVER=${BATCH_FLINK_SERVER}
+      - JDBC_DRIVER=${JDBC_DRIVER}
       - JDBC_URL=${JDBC_URL}
       - JDBC_USERNAME=${JDBC_USERNAME}
       - JDBC_PASSWORD=${JDBC_PASSWORD}
+      - MAIL_SERVER_URL=${MAIL_SERVER_URL}
+      - MAIL_SERVER_PORT=${MAIL_SERVER_PORT}
+      - MAIL_SERVER_USERNAME=${MAIL_SERVER_USERNAME}
+      - MAIL_SERVER_PASSWORD=${MAIL_SERVER_PASSWORD}
+      - MAIL_SENDER_ADDRESS=${MAIL_SENDER_ADDRESS}
+      - MAIL_TRANSPORT_PROTOCOL=${MAIL_TRANSPORT_PROTOCOL}
+      - MAIL_SMTP_PORT=${MAIL_SMTP_PORT}
+      - MAIL_SMTP_AUTH=${MAIL_SMTP_AUTH}
+      - MAIL_SMTP_STARTTLS_ENABLE=${MAIL_SMTP_STARTTLS_ENABLE}
+      - MAIL_SMTP_STARTTLS_REQUIRED=${MAIL_SMTP_STARTTLS_REQUIRED}
+      - MAIL_DEBUG=${MAIL_DEBUG}
     links:
       - "pinpoint-mysql:pinpoint-mysql"
     networks:
       - pinpoint
-    logging:
-      driver: "json-file"
-      options:
-        max-file: "3"
-        max-size: "10m"
 
   pinpoint-collector:
     build:
@@ -138,7 +125,6 @@ services:
 
     depends_on:
       - pinpoint-hbase
-      - zoo1
     restart: always
     expose:
       - "9991"
@@ -148,29 +134,28 @@ services:
       - "9995"
       - "9996"
     ports:
-      - "${COLLECTOR_RECEIVER_GRPC_AGENT_PORT:-9991}:9991/tcp"
+      - "${COLLECTOR_RECEIVER_AGENT_PORT:-9991}:9991/udp"
-      - "${COLLECTOR_RECEIVER_GRPC_STAT_PORT:-9992}:9992/tcp"
+      - "${COLLECTOR_RECEIVER_METADATA_PORT:-9991}:9991/tcp"
-      - "${COLLECTOR_RECEIVER_GRPC_SPAN_PORT:-9993}:9993/tcp"
+      - "${COLLECTOR_RECEIVER_STAT_PORT:-9992}:9992/tcp"
+      - "${COLLECTOR_RECEIVER_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:
+      - pinpoint
-        ipv4_address: ${COLLECTOR_FIXED_IP}
     environment:
-      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
+      - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}"
-      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
+      - SPRING_PROFILES=${SPRING_PROFILES}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
-      - LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
+      - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
+      - HBASE_HOST=${HBASE_HOST}
+      - HBASE_PORT=${HBASE_PORT}
       - FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE}
       - FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}
-    logging:
+      - DEBUG_LEVEL=${COLLECTOR_DEBUG_LEVEL}
-      driver: "json-file"
-      options:
-        max-file: "3"
-        max-size: "10m"
 
   pinpoint-quickstart:
     build:
@@ -180,7 +165,7 @@ services:
     container_name: "pinpoint-quickstart"
     image: "pinpointdocker/pinpoint-quickstart"
     ports:
-      - "${APP_PORT:-8085}:8080"
+      - "${APP_PORT:-8080}:8080"
     volumes:
       - data-volume:/pinpoint-agent
     environment:
@@ -189,60 +174,6 @@ services:
       - pinpoint
     depends_on:
       - pinpoint-agent
-    logging:
-      driver: "json-file"
-      options:
-        max-file: "3"
-        max-size: "10m"
-
-  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_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-agent:
     build:
@@ -253,7 +184,9 @@ services:
 
     container_name: "${PINPOINT_AGENT_NAME}"
     image: "pinpointdocker/pinpoint-agent:${PINPOINT_VERSION}"
+
     restart: unless-stopped
+
     networks:
       - pinpoint
     volumes:
@@ -265,122 +198,60 @@ 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_TYPE=${PROFILER_SAMPLING_TYPE}
+      - PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
-      - 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.13
+    image: zookeeper:3.4
     restart: always
     hostname: zoo1
-    expose:
-      - "2181"
-      - "2888"
-      - "3888"
-    ports:
-      - "2181"
     environment:
       ZOO_MY_ID: 1
       ZOO_SERVERS: server.1=0.0.0.0:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
     networks:
       - pinpoint
-    logging:
-      driver: "json-file"
-      options:
-        max-file: "3"
-        max-size: "10m"
 
   zoo2:
-    image: zookeeper:3.4.13
+    image: zookeeper:3.4
     restart: always
     hostname: zoo2
-    expose:
-      - "2181"
-      - "2888"
-      - "3888"
-    ports:
-      - "2181"
     environment:
       ZOO_MY_ID: 2
       ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=0.0.0.0:2888:3888 server.3=zoo3:2888:3888
     networks:
       - pinpoint
-    logging:
-      driver: "json-file"
-      options:
-        max-file: "3"
-        max-size: "10m"
 
   zoo3:
-    image: zookeeper:3.4.13
+    image: zookeeper:3.4
     restart: always
     hostname: zoo3
-    expose:
-      - "2181"
-      - "2888"
-      - "3888"
-    ports:
-      - "2181"
     environment:
       ZOO_MY_ID: 3
       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:
-    build:
-      context: pinpoint-flink
-      dockerfile: Dockerfile
-      args:
-        - PINPOINT_VERSION=${PINPOINT_VERSION}
-
     container_name: "${PINPOINT_FLINK_NAME}-jobmanager"
-    image: "pinpointdocker/pinpoint-flink:${PINPOINT_VERSION}"
+    image: flink:1.3.1
     expose:
       - "6123"
     ports:
       - "${FLINK_WEB_PORT:-8081}:8081"
-    command: standalone-job -p 1 pinpoint-flink-job.jar -spring.profiles.active release
+    command: jobmanager
     environment:
       - JOB_MANAGER_RPC_ADDRESS=jobmanager
-      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
     networks:
       - pinpoint
-    depends_on:
-      - zoo1
-    logging:
-      driver: "json-file"
-      options:
-        max-file: "3"
-        max-size: "10m"
 
   taskmanager:
-    build:
-      context: pinpoint-flink
-      dockerfile: Dockerfile
-      args:
-        - PINPOINT_VERSION=${PINPOINT_VERSION}
-
     container_name: "${PINPOINT_FLINK_NAME}-taskmanager"
-    image: "pinpointdocker/pinpoint-flink:${PINPOINT_VERSION}"
+    image: flink:1.3.1
     expose:
       - "6121"
       - "6122"
@@ -390,7 +261,6 @@ services:
       - "6122:6122"
       - "19994:19994"
     depends_on:
-      - zoo1
       - jobmanager
     command: taskmanager
     links:
@@ -399,20 +269,11 @@ 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,20 +1,5 @@
 ### Pinpoint with Java
-PINPOINT_VERSION=2.5.3
+PINPOINT_VERSION=2.0.2
 SPRING_PROFILES=release
-AGENT_ID=java-app-in-docker
+AGENT_ID=app-in-docker
-APP_NAME=JavaAttachExample
+APP_NAME=quickapp
-
-
-#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/java/Dockerfile

@@ -1,5 +1,7 @@
 FROM java:8
 
+LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
+
 ARG PINPOINT_VERSION
 ARG AGENT_ID
 ARG APP_NAME

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

@@ -1,6 +1,6 @@
 ### Pinpoint with Tomcat
-PINPOINT_VERSION=2.5.3
+PINPOINT_VERSION=2.0.2
 SPRING_PROFILES=release
-APP_PORT=8085
+APP_PORT=8000
 AGENT_ID=app-in-docker
 APP_NAME=quickapp

pinpoint-agent-attach-example/tomcat/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     container_name: "tomcat"
     image: "Your Image"
     ports:
-      - "${APP_PORT:-8085}:8080"
+      - "${APP_PORT:-8080}:8080"
     volumes_from:
       - container:pinpoint-agent
     environment:

pinpoint-agent/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.5.3
+PINPOINT_VERSION=2.0.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent
@@ -18,28 +18,8 @@ COLLECTOR_TCP_PORT=9994
 COLLECTOR_STAT_PORT=9995
 COLLECTOR_SPAN_PORT=9996
 
-# Profiler Sampling Configurations
+# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
-# If this value set to COUNTING(default), sampling rate is 1/n.
+PROFILER_SAMPLING_RATE=1
-# 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,7 +1,9 @@
 FROM alpine:3.7
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
+LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
-ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
+
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.2}
+ARG INSTALL_URL=https://github.com/naver/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,24 +4,7 @@
 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
- - 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 
@@ -33,17 +16,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/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
+Please see [Pinpoint-Docker GitHub repository](https://github.com/naver/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-docker/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/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.
+See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
 
 ```
 Copyright 2018 NAVER Corp.

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

@@ -2,26 +2,24 @@
 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/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.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint-env.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.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.collector.tcp.port=/ s/=.*/=${COLLECTOR_TCP_PORT}/" /pinpoint-agent/pinpoint-root.config
+sed -i "/profiler.collector.tcp.port=/ s/=.*/=${COLLECTOR_TCP_PORT}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.collector.stat.port=/ s/=.*/=${COLLECTOR_STAT_PORT}/" /pinpoint-agent/pinpoint-root.config
+sed -i "/profiler.collector.stat.port=/ s/=.*/=${COLLECTOR_STAT_PORT}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.collector.span.port=/ s/=.*/=${COLLECTOR_SPAN_PORT}/" /pinpoint-agent/pinpoint-root.config
+sed -i "/profiler.collector.span.port=/ s/=.*/=${COLLECTOR_SPAN_PORT}/" /pinpoint-agent/pinpoint.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/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.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint-env.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.agent.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.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.metadata.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.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.stat.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.transport.grpc.span.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
+sed -i "/profiler.transport.grpc.span.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}/" /pinpoint-agent/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.rate=/ s/=.*/=${PROFILER_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint-env.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/local/log4j2.xml /pinpoint-agent/profiles/release/log4j2.xml
+sed -i "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j.xml
+
+#ln -s  /pinpoint-agent /pinpoint-agent
 
 exec "$@"

pinpoint-agent/docker-compose.yml

@@ -17,16 +17,13 @@ services:
     volumes:
       - pinpoint-agent
     environment:
+      - SPRING_PROFILES=${SPRING_PROFILES}
       - COLLECTOR_IP=${COLLECTOR_IP}
       - PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}
       - 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_TYPE=${PROFILER_SAMPLING_TYPE}
+      - PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
-      - 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,43 +0,0 @@
-PINPOINT_VERSION=2.5.3
-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_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-batch/Dockerfile

@@ -1,17 +0,0 @@
-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-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 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
-
-ENTRYPOINT ["sh", "/pinpoint/scripts/start-batch.sh"]

pinpoint-batch/Readme.md

@@ -1,40 +0,0 @@
-## Pinpoint Batch
-
-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
- 
-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-docker/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.
-```

pinpoint-batch/build/config/pinpoint-batch.properties

@@ -1,8 +0,0 @@
-##########
-# 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=

pinpoint-batch/build/scripts/start-batch.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-exec java -jar /pinpoint/pinpoint-batch.jar --spring.config.additional-location=/pinpoint/config/pinpoint-batch.properties

pinpoint-batch/docker-compose.yml

@@ -1,43 +0,0 @@
-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}
-      - 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_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}

pinpoint-collector/.env

@@ -1,28 +1,28 @@
-PINPOINT_VERSION=2.5.3
+PINPOINT_VERSION=2.0.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Collector
 
+CLUSTER_ENABLE=true
+#zookeeper information required
+CLUSTER_ZOOKEEPER_ADDRESS=
+
+#hbase information required
+HBASE_HOST=
+HBASE_PORT=
+
 PINPOINT_COLLECTOR_NAME=pinpoint-collector
 
-#zookeeper information required
+COLLECTOR_RECEIVER_AGENT_PORT=9991
-PINPOINT_ZOOKEEPER_ADDRESS=
+COLLECTOR_RECEIVER_METADATA_PORT=9991
-
+COLLECTOR_RECEIVER_STAT_PORT=9992
-CLUSTER_ENABLE=true
+COLLECTOR_RECEIVER_SPAN_PORT=9993
-
-COLLECTOR_LOGGING_LEVEL_ROOT=INFO
-
-#grpc
-COLLECTOR_RECEIVER_GRPC_AGENT_PORT=9991
-COLLECTOR_RECEIVER_GRPC_STAT_PORT=9992
-COLLECTOR_RECEIVER_GRPC_SPAN_PORT=9993
-
-#thrift
 COLLECTOR_RECEIVER_BASE_PORT=9994
 COLLECTOR_RECEIVER_STAT_UDP_PORT=9995
 COLLECTOR_RECEIVER_SPAN_UDP_PORT=9996
 
 FLINK_CLUSTER_ENABLE=true
-FLINK_CLUSTER_ZOOKEEPER_ADDRESS=
+FLINK_CLUSTER_ZOOKEEPER_ADDRESS=zoo1
 
+COLLECTOR_DEBUG_LEVEL=INFO
 

pinpoint-collector/Dockerfile

@@ -1,18 +1,23 @@
-FROM openjdk:11.0.16-jre-slim-buster
+FROM tomcat:8-jre8
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
+LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
-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 \
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.2}
-    && mkdir -p /pinpoint/scripts
 
-COPY /build/config/pinpoint-collector.properties /pinpoint/config/
+ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war
-COPY /build/scripts/start-collector.sh /pinpoint/scripts/
 
-RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
+COPY /build/scripts/start-collector.sh /usr/local/bin/
-    && 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
 
-ENTRYPOINT ["sh", "/pinpoint/scripts/start-collector.sh"]
+RUN chmod a+x /usr/local/bin/start-collector.sh \
+    && curl -SL ${INSTALL_URL} -o pinpoint-collector.war \
+    && rm -rf /usr/local/tomcat/webapps \
+    && mkdir -p /usr/local/tomcat/webapps \
+    && unzip pinpoint-collector.war -d /usr/local/tomcat/webapps/ROOT \
+    && rm -rf pinpoint-collector.war \
+    && sed -i "s/8005/9005/g" /usr/local/tomcat/conf/server.xml \
+    && sed -i "s/8080/9080/g" /usr/local/tomcat/conf/server.xml \
+    && sed -i "s/8009/9009/g" /usr/local/tomcat/conf/server.xml \
+    && sed -i "s/8443/9443/g" /usr/local/tomcat/conf/server.xml
+
+ENTRYPOINT ["/usr/local/bin/start-collector.sh"]
 

pinpoint-collector/Dockerfile-metric

@@ -1,19 +0,0 @@
-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,27 +4,7 @@
 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
- - 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 
@@ -36,17 +16,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/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
+Please see [Pinpoint-Docker GitHub repository](https://github.com/naver/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-docker/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/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.
+See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
 
 ```
 Copyright 2018 NAVER Corp.

pinpoint-collector/build/config/pinpoint-collector.properties

@@ -1,8 +0,0 @@
-##########
-# another way of setting properties.
-# applied priority '.ENV' -> 'pinpoint-collector.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=

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

@@ -1,5 +0,0 @@
-#!/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-collector/build/scripts/start-collector.sh

@@ -2,4 +2,14 @@
 set -e
 set -x
 
-exec java -jar /pinpoint/pinpoint-collector-boot.jar --spring.config.additional-location=/pinpoint/config/pinpoint-collector.properties
+sed -i "/cluster.enable=/ s/=.*/=${CLUSTER_ENABLE}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
+sed -i "/cluster.zookeeper.address=/ s/=.*/=${CLUSTER_ZOOKEEPER_ADDRESS}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
+sed -i "/flink.cluster.enable=/ s/=.*/=${FLINK_CLUSTER_ENABLE}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
+sed -i "/flink.cluster.zookeeper.address=/ s/=.*/=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pinpoint-collector.properties
+
+sed -i "/hbase.client.host=/ s/=.*/=${HBASE_HOST}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/profiles/${SPRING_PROFILES}/hbase-env.properties
+sed -i "/hbase.client.port=/ s/=.*/=${HBASE_PORT}/" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/profiles/${SPRING_PROFILES}/hbase-env.properties
+
+sed -i "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/profiles/${SPRING_PROFILES}/log4j.xml
+
+exec /usr/local/tomcat/bin/catalina.sh run

pinpoint-collector/docker-compose.yml

@@ -20,9 +20,10 @@ services:
       - "9995"
       - "9996"
     ports:
-      - "${COLLECTOR_RECEIVER_GRPC_AGENT_PORT:-9991}:9991/tcp"
+      - "${COLLECTOR_RECEIVER_AGENT_PORT:-9991}:9991/udp"
-      - "${COLLECTOR_RECEIVER_GRPC_STAT_PORT:-9992}:9992/tcp"
+      - "${COLLECTOR_RECEIVER_METADATA_PORT:-9991}:9991/tcp"
-      - "${COLLECTOR_RECEIVER_GRPC_SPAN_PORT:-9993}:9993/tcp"
+      - "${COLLECTOR_RECEIVER_STAT_PORT:-9992}:9992/tcp"
+      - "${COLLECTOR_RECEIVER_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"
@@ -30,10 +31,15 @@ services:
       - "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/udp"
 
     environment:
-      - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}"
       - SPRING_PROFILES=${SPRING_PROFILES}
-      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
-      - LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
+      - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
+      - HBASE_HOST=${HBASE_HOST}
+      - HBASE_PORT=${HBASE_PORT}
       - FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE}
       - FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}
+      - DEBUG_LEVEL=${COLLECTOR_DEBUG_LEVEL}
+
+networks:
+  pinpoint:
+    driver: bridge

pinpoint-flink/.env

@@ -1,8 +1,7 @@
-PINPOINT_VERSION=2.5.3
+PINPOINT_VERSION=2.0.2
 
 ### Pinpoint-flink
 
-PINPOINT_ZOOKEEPER_ADDRESS=zookeeper
 PINPOINT_FLINK_NAME=pinpoint-flink
 FLINK_WEB_PORT=8081
 

pinpoint-flink/Dockerfile

@@ -1,15 +0,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 \
- && 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"]
-

pinpoint-flink/Readme.md

@@ -1,45 +0,0 @@
-
-## Pinpoint Flink
-
-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
- - 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-docker/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.
-```

pinpoint-flink/build/hbase.properties

@@ -1,4 +1,21 @@
-hbase.client.host=#PINPOINT_ZOOKEEPER_ADDRESS#
+#
+# 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.port=2181
 
 # hbase default:/hbase
@@ -14,8 +31,6 @@ 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/build/pinpoint-flink.properties

@@ -2,7 +2,7 @@
 collector.l4.ip=
 
 # base data receiver config  ---------------------------------------------------------------------
-collector.receiver.base.ip=0.0.0.0
+collector.receiver.base.ip=pinpoint-flink-taskmanager
 collector.receiver.base.port=19994
 
 # number of tcp worker threads
@@ -23,24 +23,26 @@ 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-root.properties, pinpoint-flink.properties) - "true" to enable
+# 1. cluster.enable (pinpoint-web.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
+# 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-root.properties) - any available port number (used to establish connection between web and collector)
+# 3. cluster.web.tcp.port (pinpoint-web.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-root.properties); and cluster.listen.ip, cluster.listen.port (pinpoint-flink.properties) accordingly.
+#   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=false
+cluster.enable=true
-cluster.zookeeper.address=#PINPOINT_ZOOKEEPER_ADDRESS#
+cluster.zookeeper.address=zoo1
 cluster.zookeeper.sessiontimeout=30000
 cluster.listen.ip=
-cluster.listen.port=-1
+cluster.listen.port=
 
 #collector.admin.password=
 #collector.admin.api.rest.active=
@@ -50,10 +52,11 @@ collector.spanEvent.sequence.limit=10000
 
 # flink cluster
 flink.cluster.enable=true
-flink.cluster.zookeeper.address=#PINPOINT_ZOOKEEPER_ADDRESS#
+flink.cluster.zookeeper.address=zoo1
 flink.cluster.zookeeper.sessiontimeout=3000
 flink.cluster.zookeeper.retry.interval=5000
 flink.cluster.tcp.port=19994
 
 # flink env init
-flink.StreamExecutionEnvironment=server
+flink.StreamExecutionEnvironment=
+flink.sourceFunction.Parallel=1

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

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# In flink version < 1.11 we can't use "job cluster" because it's not yet available
-if [ "$1" = "standalone-job" ]; then
-  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
-  fi
-  
-  shift
-
-  /docker-entrypoint.sh jobmanager &
-  sleep 5
-  if ! flink list | grep 'RUNNING'; then
-    flink run $@
-  fi
-  wait
-else
-  exec /docker-entrypoint.sh $@
-fi

pinpoint-flink/docker-compose.yml

@@ -7,24 +7,21 @@ version: "3.6"
 services:
   ##flink
   jobmanager:
-    build: Dockerfile
     container_name: "${PINPOINT_FLINK_NAME}-jobmanager"
-    image: ${PINPOINT_FLINK_NAME}-flink:dev
+    image: flink:1.3.1
     expose:
       - "6123"
     ports:
       - "${FLINK_WEB_PORT:-8081}:8081"
-    command: standalone-job -p 1 pinpoint-flink-job.jar -spring.profiles.active release
+    command: jobmanager
     environment:
       - JOB_MANAGER_RPC_ADDRESS=jobmanager
-      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
     networks:
       - pinpoint
 
   taskmanager:
-    build: Dockerfile
     container_name: "${PINPOINT_FLINK_NAME}-taskmanager"
-    image: ${PINPOINT_FLINK_NAME}-flink:dev
+    image: flink:1.3.1
     expose:
       - "6121"
       - "6122"

pinpoint-hbase/.env

@@ -1,8 +1,8 @@
-PINPOINT_VERSION=2.5.3
+PINPOINT_VERSION=2.0.2
-HBASE_VERSION=1.2.6
+
 ### Pinpoint-Hbase
 
 PINPOINT_HBASE_NAME=pinpoint-hbase
 #config for hbase in external docker
-EXTERNAL_HBASE_PORT=2181
+EXTERNAL_HBASE_PORT=2180
 

pinpoint-hbase/Dockerfile

@@ -1,33 +1,32 @@
-FROM openjdk:8u342-slim
+FROM java:8-jdk
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
+LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
-ARG HBASE_VERSION=${HBASE_VERSION:-1.2.6}
+
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.2}
 
 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}
 
-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 apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
+COPY hbase-site.xml hbase-site.xml
-    && chmod a+x /usr/local/bin/initialize-hbase.sh \
+
-    && chmod a+x /usr/local/bin/check-table.sh \
+RUN mkdir -p ${BASE_DIR} \
-    && 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 \
     && 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
+    && ${HBASE_HOME}/bin/start-hbase.sh \
+    && sleep 10 \
+    && ${HBASE_HOME}/bin/hbase shell ${BASE_DIR}/hbase-create.hbase \
+    && ${HBASE_HOME}/bin/stop-hbase.sh \
+    && rm ${BASE_DIR}/hbase-create.hbase \
+    && rm -rf hbase.tar.gz
 
 VOLUME ["/home/pinpoint/hbase", "/home/pinpoint/zookeeper"]
 
-CMD /usr/local/bin/initialize-hbase.sh && tail -f /dev/null
+ENTRYPOINT ${BASE_DIR}/hbase-${HBASE_VERSION}/bin/hbase master start
-

pinpoint-hbase/Readme.md

@@ -4,24 +4,7 @@
 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
- - 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 
@@ -33,17 +16,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/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
+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.
 
 ## Any Issues or Suggestions?
 
-Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint-docker/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/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.
+See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
 
 ```
 Copyright 2018 NAVER Corp.

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

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-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"
-    ${HBASE_HOME}/bin/hbase shell ${BASE_DIR}/hbase-create.hbase
-fi

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

@@ -1,39 +0,0 @@
-#!/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

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-${HBASE_HOME}/bin/start-hbase.sh
-
-/usr/local/bin/configure-hbase.sh
-/usr/local/bin/check-table.sh

pinpoint-hbase/docker-compose.yml

@@ -15,8 +15,8 @@ services:
       - /home/pinpoint/hbase
       - /home/pinpoint/zookeeper
     expose:
-#      # zookeeper
+      # zookeeper
-#      - "2181"
+      - "2181"
       # HBase Master API port
       - "60000"
       # HBase Master Web UI

pinpoint-hbase/hbase-env.sh

@@ -1,138 +0,0 @@
-
-#
-#/**
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements.  See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership.  The ASF licenses this file
-# * to you 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.
-# */
-
-# Set environment variables here.
-
-# This script sets variables multiple times over the course of starting an hbase process,
-# so try to keep things idempotent unless you want to take an even deeper look
-# into the startup scripts (bin/hbase, etc.)
-
-# The java implementation to use.  Java 1.7+ required.
-# export JAVA_HOME=/usr/java/jdk1.6.0/
-
-# Extra Java CLASSPATH elements.  Optional.
-# export HBASE_CLASSPATH=
-
-# The maximum amount of heap to use. Default is left to JVM default.
-# export HBASE_HEAPSIZE=1G
-
-# Uncomment below if you intend to use off heap cache. For example, to allocate 8G of 
-# offheap, set the value to "8G".
-# export HBASE_OFFHEAPSIZE=1G
-
-# Extra Java runtime options.
-# Below are what we set by default.  May only work with SUN JVM.
-# For more on why as well as other possible settings,
-# see http://wiki.apache.org/hadoop/PerformanceTuning
-export HBASE_OPTS="-XX:+UseConcMarkSweepGC"
-
-# Configure PermSize. Only needed in JDK7. You can safely remove it for JDK8+
-export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -XX:PermSize=128m -XX:MaxPermSize=128m"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -XX:PermSize=128m -XX:MaxPermSize=128m"
-
-# Uncomment one of the below three options to enable java garbage collection logging for the server-side processes.
-
-# This enables basic gc logging to the .out file.
-# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
-
-# This enables basic gc logging to its own file.
-# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
-# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH>"
-
-# This enables basic GC logging to its own file with automatic log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+.
-# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
-# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH> -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M"
-
-# Uncomment one of the below three options to enable java garbage collection logging for the client processes.
-
-# This enables basic gc logging to the .out file.
-# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
-
-# This enables basic gc logging to its own file.
-# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
-# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH>"
-
-# This enables basic GC logging to its own file with automatic log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+.
-# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
-# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH> -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M"
-
-# See the package documentation for org.apache.hadoop.hbase.io.hfile for other configurations
-# needed setting up off-heap block caching. 
-
-# Uncomment and adjust to enable JMX exporting
-# See jmxremote.password and jmxremote.access in $JRE_HOME/lib/management to configure remote password access.
-# More details at: http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html
-# NOTE: HBase provides an alternative JMX implementation to fix the random ports issue, please see JMX
-# section in HBase Reference Guide for instructions.
-
-# export HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
-# export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10101"
-# export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10102"
-# export HBASE_THRIFT_OPTS="$HBASE_THRIFT_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10103"
-# export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10104"
-# export HBASE_REST_OPTS="$HBASE_REST_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10105"
-
-# File naming hosts on which HRegionServers will run.  $HBASE_HOME/conf/regionservers by default.
-# export HBASE_REGIONSERVERS=${HBASE_HOME}/conf/regionservers
-
-# Uncomment and adjust to keep all the Region Server pages mapped to be memory resident
-#HBASE_REGIONSERVER_MLOCK=true
-#HBASE_REGIONSERVER_UID="hbase"
-
-# File naming hosts on which backup HMaster will run.  $HBASE_HOME/conf/backup-masters by default.
-# export HBASE_BACKUP_MASTERS=${HBASE_HOME}/conf/backup-masters
-
-# Extra ssh options.  Empty by default.
-# export HBASE_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HBASE_CONF_DIR"
-
-# Where log files are stored.  $HBASE_HOME/logs by default.
-# export HBASE_LOG_DIR=${HBASE_HOME}/logs
-
-# Enable remote JDWP debugging of major HBase processes. Meant for Core Developers 
-# export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8070"
-# export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8071"
-# export HBASE_THRIFT_OPTS="$HBASE_THRIFT_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8072"
-# export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8073"
-
-# A string representing this instance of hbase. $USER by default.
-# export HBASE_IDENT_STRING=$USER
-
-# The scheduling priority for daemon processes.  See 'man nice'.
-# export HBASE_NICENESS=10
-
-# The directory where pid files are stored. /tmp by default.
-# export HBASE_PID_DIR=/var/hadoop/pids
-
-# Seconds to sleep between slave commands.  Unset by default.  This
-# can be useful in large clusters, where, e.g., slave rsyncs can
-# otherwise arrive faster than the master can service them.
-# export HBASE_SLAVE_SLEEP=0.1
-
-# Tell HBase whether it should manage it's own instance of Zookeeper or not.
-export HBASE_MANAGES_ZK=false
-
-# The default log rolling policy is RFA, where the log file is rolled as per the size defined for the 
-# RFA appender. Please refer to the log4j.properties file to see more details on this appender.
-# In case one needs to do log rolling on a date change, one should set the environment property
-# HBASE_ROOT_LOGGER to "<DESIRED_LOG LEVEL>,DRFA".
-# For example:
-# HBASE_ROOT_LOGGER=INFO,DRFA
-# The reason for changing default to RFA is to avoid the boundary case of filling out disk space as 
-# DRFA doesn't put any cap on the log size. Please refer to HBase-5655 for more context.

pinpoint-hbase/hbase-site.xml

@@ -4,20 +4,8 @@
         <value>file:///home/pinpoint/hbase</value>
     </property>
     <property>
-        <name>hbase.cluster.distributed</name>
+        <name>hbase.zookeeper.property.dataDir</name>
-        <value>true</value>
+        <value>/home/pinpoint/zookeeper</value>
-    </property>
-     <property>
-        <name>zookeeper.znode.parent</name>
-        <value>/hbase</value>
-    </property>
-    <property>
-        <name>hbase.zookeeper.quorum</name>
-        <value>zoo1,zoo2,zoo3</value>
-    </property>
-    <property>
-		<name>hbase.zookeeper.property.clientPort</name>
-		<value>2181</value> 
     </property>
     <property>
         <name>hbase.master.port</name>

pinpoint-mysql/.env

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

pinpoint-mysql/Dockerfile

@@ -1,8 +1,11 @@
-FROM mysql:8.0
+FROM mysql:5.7
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.2}
 
-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 \
+RUN apt update \ 
-	&& 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 \
+	&& 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" \
 	&& sed -i '/^--/d' /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \
-	&& sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql
+	&& sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \
+	&& apt-get purge -y --auto-remove ca-certificates wget

pinpoint-mysql/Readme.md

@@ -4,24 +4,7 @@
 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
- - 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
@@ -33,17 +16,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/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
+Please see [Pinpoint-Docker GitHub repository](https://github.com/naver/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-docker/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/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.
+See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
 
 ```
 Copyright 2018 NAVER Corp.

pinpoint-mysql/docker-compose.yml

@@ -22,4 +22,4 @@ services:
       - MYSQL_DATABASE=${MYSQL_DATABASE}
 
     volumes:
-      - /var/lib/mysql
+      - ./var/lib/mysql

pinpoint-quickstart/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.5.3
+PINPOINT_VERSION=2.0.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent
@@ -12,12 +12,8 @@ PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=9991
 PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=9992
 PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=9993
 
-# Sampling Configurations
+# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
-PROFILER_SAMPLING_TYPE=COUNTING
+PROFILER_SAMPLING_RATE=1
-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
@@ -27,4 +23,4 @@ AGENT_DEBUG_LEVEL=INFO
 
 ### Pinpoint-quickstart
 
-APP_PORT=8085
+APP_PORT=8000

pinpoint-quickstart/Dockerfile

@@ -1,11 +1,11 @@
 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 \
     && 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

@@ -1,62 +0,0 @@
-
-## Pinpoint Quickstart
-
-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
- - 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-docker/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.
-```

pinpoint-quickstart/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     container_name: "pinpoint-quickstart"
     image: "pinpointdocker/pinpoint-quickstart"
     ports:
-      - "${APP_PORT:-8085}:8080"
+      - "${APP_PORT:-8080}:8080"
     volumes:
       - data-volume:/pinpoint-agent
     environment:
@@ -40,11 +40,7 @@ services:
       - COLLECTOR_TCP_PORT=${COLLECTOR_TCP_PORT}
       - COLLECTOR_STAT_PORT=${COLLECTOR_STAT_PORT}
       - COLLECTOR_SPAN_PORT=${COLLECTOR_SPAN_PORT}
-      - PROFILER_SAMPLING_TYPE=${PROFILER_SAMPLING_TYPE} 
+      - PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
-      - 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,27 +1,48 @@
-PINPOINT_VERSION=2.5.3
+PINPOINT_VERSION=2.0.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Web
 
 PINPOINT_WEB_NAME=pinpoint-web
 
-WEB_SERVER_PORT=8080
+WEB_PAGE_PORT=8079
-#zookeeper information required
-PINPOINT_ZOOKEEPER_ADDRESS=
-
-WEB_LOGGING_LEVEL_ROOT=INFO
 
 CLUSTER_ENABLE=true
+#zookeeper information required
+CLUSTER_ZOOKEEPER_ADDRESS=
 
 ADMIN_PASSWORD=admin
 
-#analytics
+ANALYTICS=true
-CONFIG_SENDUSAGE=true
+
+#hbase information required
+HBASE_HOST=
+HBASE_PORT=
+
+WEB_DEBUG_LEVEL=INFO
+
+#flink server information required if used
+BATCH_ENABLE=true
+BATCH_SERVER_IP=127.0.0.1
+BATCH_FLINK_SERVER=pinpoint-flink-jobmanager
 
 CONFIG_SHOW_APPLICATIONSTAT=true
 
-#mysql information required if used
+#mysql information required
-JDBC_DRIVERCLASSNAME=com.mysql.jdbc.Driver
+JDBC_DRIVER=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
+MAIL_SERVER_URL=smtp.gmail.com
+MAIL_SERVER_PORT=587
+MAIL_SERVER_USERNAME=username
+MAIL_SERVER_PASSWORD=password
+MAIL_SENDER_ADDRESS=pinpoint_operator@pinpoint.com
+MAIL_TRANSPORT_PROTOCOL=smtp
+MAIL_SMTP_PORT=25
+MAIL_SMTP_AUTH=false
+MAIL_SMTP_STARTTLS_ENABLE=false
+MAIL_SMTP_STARTTLS_REQUIRED=false
+MAIL_DEBUG=false

pinpoint-web/Dockerfile

@@ -1,18 +1,17 @@
-FROM openjdk:11.0.16-jre-slim-buster
+FROM tomcat:8-jre8
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
+LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
-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 \
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.2}
-    && mkdir -p /pinpoint/scripts
+ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war
 
-COPY /build/config/pinpoint-web.properties /pinpoint/config/
+COPY /build/scripts/start-web.sh /usr/local/bin/
-COPY /build/scripts/start-web.sh /pinpoint/scripts/
 
-RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
+RUN chmod a+x /usr/local/bin/start-web.sh \
-    && chmod a+x /pinpoint/scripts/start-web.sh \
+    && curl -SL ${INSTALL_URL} -o pinpoint-web.war \
-    && chmod a+x /pinpoint/config/pinpoint-web.properties \
+    && rm -rf /usr/local/tomcat/webapps \
-    && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-web-boot.jar
+    && mkdir -p /usr/local/tomcat/webapps \
+    && unzip pinpoint-web.war -d /usr/local/tomcat/webapps/ROOT \
+    && rm -rf pinpoint-web.war
 
-#entry point to start-web.sh for future use.
+ENTRYPOINT ["/usr/local/bin/start-web.sh"]
-ENTRYPOINT ["sh", "/pinpoint/scripts/start-web.sh"]

pinpoint-web/Dockerfile-metric

@@ -1,18 +0,0 @@
-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,27 +4,7 @@
 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
- - 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 
@@ -36,17 +16,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/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
+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.
 
 ## Any Issues or Suggestions?
 
-Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint-docker/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/naver/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.
+See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
 
 ```
 Copyright 2018 NAVER Corp.

pinpoint-web/build/config/pinpoint-web.properties

@@ -1,8 +0,0 @@
-##########
-# 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=

pinpoint-web/build/scripts/start-web.sh

@@ -2,4 +2,43 @@
 set -e
 set -x
 
-exec java -jar /pinpoint/pinpoint-web-boot.jar --spring.config.additional-location=/pinpoint/config/pinpoint-web.properties
+WEB_INF_CLASSES_DIR=/usr/local/tomcat/webapps/ROOT/WEB-INF/classes
+APPLICATION_WEB_PROPERTIES=${WEB_INF_CLASSES_DIR}/pinpoint-web.properties
+APPLICATION_HBASE_PROPERTIES=${WEB_INF_CLASSES_DIR}/profiles/${SPRING_PROFILES}/hbase-env.properties
+APPLICATION_BATCH_PROPERTIES=${WEB_INF_CLASSES_DIR}/batch.properties
+APPLICATION_JDBC_PROPERTIES=${WEB_INF_CLASSES_DIR}/jdbc.properties
+
+sed -i "/cluster.enable=/ s/=.*/=${CLUSTER_ENABLE}/" ${APPLICATION_WEB_PROPERTIES}
+#sed -i "/cluster.zookeeper.address=/ s/=.*/=${CLUSTER_ZOOKEEPER_ADDRESS}/g" ${APPLICATION_WEB_PROPERTIES}
+#sed -i "/cluster.web.tcp.port=/ s/=.*/=${CLUSTER_WEB_TCP_PORT}/" ${APPLICATION_WEB_PROPERTIES}
+sed -i "/admin.password=/ s/=.*/=${ADMIN_PASSWORD}/" ${APPLICATION_WEB_PROPERTIES}
+sed -i "/config.sendUsage=/ s/=.*/=${ANALYTICS}/" ${APPLICATION_WEB_PROPERTIES}
+sed -i "/config.show.applicationStat=/ s/=.*/=${CONFIG_SHOW_APPLICATIONSTAT}/" ${APPLICATION_WEB_PROPERTIES}
+
+sed -i "/hbase.client.host=/ s/=.*/=${HBASE_HOST}/" ${APPLICATION_HBASE_PROPERTIES}
+sed -i "/hbase.client.port=/ s/=.*/=${HBASE_PORT}/" ${APPLICATION_HBASE_PROPERTIES}
+
+sed -i "/batch.enable=/ s/=.*/=${BATCH_ENABLE}/" ${APPLICATION_BATCH_PROPERTIES}
+sed -i "/batch.server.ip=/ s/=.*/=${BATCH_SERVER_IP}/" ${APPLICATION_BATCH_PROPERTIES}
+sed -i "/batch.flink.server=/ s/=.*/=${BATCH_FLINK_SERVER}/" ${APPLICATION_BATCH_PROPERTIES}
+
+sed -i "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/profiles/${SPRING_PROFILES}/log4j.xml
+sed -i "/jdbc.driverClassName=/ s/=.*/=${JDBC_DRIVER:-com.mysql.jdbc.Driver}/" ${APPLICATION_JDBC_PROPERTIES}
+sed -i "/jdbc.url=/ s/=.*/=${JDBC_URL//\//\\/}/" ${APPLICATION_JDBC_PROPERTIES}
+sed -i "/jdbc.username=/ s/=.*/=${JDBC_USERNAME:-admin}/" ${APPLICATION_JDBC_PROPERTIES}
+sed -i "/jdbc.password=/ s/=.*/=${JDBC_PASSWORD:-admin}/" ${APPLICATION_JDBC_PROPERTIES}
+
+sed -i "/alarm.mail.server.url=/ s/=.*/=${MAIL_SERVER_URL}/" ${APPLICATION_BATCH_PROPERTIES}
+sed -i "/alarm.mail.server.port=/ s/=.*/=${MAIL_SERVER_PORT:-587}/" ${APPLICATION_BATCH_PROPERTIES}
+sed -i "/alarm.mail.server.username=/ s/=.*/=${MAIL_SERVER_USERNAME}/" ${APPLICATION_BATCH_PROPERTIES}
+sed -i "/alarm.mail.server.password=/ s/=.*/=${MAIL_SERVER_PASSWORD}/" ${APPLICATION_BATCH_PROPERTIES}
+sed -i "/alarm.mail.sender.address=/ s/=.*/=${MAIL_SENDER_ADDRESS:-pinpoint_operator@pinpoint.com}/" ${APPLICATION_BATCH_PROPERTIES}
+
+sed -i "/alarm.mail.transport.protocol=/ s/=.*/=${MAIL_TRANSPORT_PROTOCOL:-smtp}/" ${APPLICATION_BATCH_PROPERTIES}
+sed -i "/alarm.mail.smtp.port=/ s/=.*/=${MAIL_SMTP_PORT:-587}/" ${APPLICATION_BATCH_PROPERTIES}
+sed -i "/alarm.mail.smtp.auth=/ s/=.*/=${MAIL_SMTP_AUTH:-false}/" ${APPLICATION_BATCH_PROPERTIES}
+sed -i "/alarm.mail.smtp.starttls.enable=/ s/=.*/=${MAIL_SMTP_STARTTLS_ENABLE:-false}/" ${APPLICATION_BATCH_PROPERTIES}
+sed -i "/alarm.mail.smtp.starttls.required=/ s/=.*/=${MAIL_SMTP_STARTTLS_REQUIRED:-false}/" ${APPLICATION_BATCH_PROPERTIES}
+sed -i "/alarm.mail.debug=/ s/=.*/=${MAIL_DEBUG:-false}/" ${APPLICATION_BATCH_PROPERTIES}
+
+exec /usr/local/tomcat/bin/catalina.sh run

pinpoint-web/docker-compose.yml

@@ -13,21 +13,37 @@ services:
 
     restart: always
     expose:
-      - "${WEB_SERVER_PORT:-8080}"
+      - "8080"
       - "9997"
     ports:
       - "9997:9997"
-      - "${WEB_SERVER_PORT:-8080}:8080"
+      - "${WEB_PAGE_PORT:-8080}:8080"
     environment:
-      - WEB_SERVER_PORT=${WEB_SERVER_PORT}
+      - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES},batch"
-      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
+      - SPRING_PROFILES=${SPRING_PROFILES}
-      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
+      - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}
-      - CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
+      - ANALYTICS=${ANALYTICS}
-      - LOGGING_LEVEL_ROOT=${WEB_LOGGING_LEVEL_ROOT}
+      - HBASE_HOST=${HBASE_HOST}
+      - HBASE_PORT=${HBASE_PORT}
+      - DEBUG_LEVEL=${WEB_DEBUG_LEVEL}
       - CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT}
-      - JDBC_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
+      - BATCH_ENABLE=${BATCH_ENABLE}
+      - BATCH_SERVER_IP=${BATCH_SERVER_IP}
+      - BATCH_FLINK_SERVER=${BATCH_FLINK_SERVER}
+      - JDBC_DRIVER=${JDBC_DRIVER}
       - JDBC_URL=${JDBC_URL}
       - JDBC_USERNAME=${JDBC_USERNAME}
       - JDBC_PASSWORD=${JDBC_PASSWORD}
+      - MAIL_SERVER_URL=${MAIL_SERVER_URL}
+      - MAIL_SERVER_PORT=${MAIL_SERVER_PORT}
+      - MAIL_SERVER_USERNAME=${MAIL_SERVER_USERNAME}
+      - MAIL_SERVER_PASSWORD=${MAIL_SERVER_PASSWORD}
+      - MAIL_SENDER_ADDRESS=${MAIL_SENDER_ADDRESS}
+      - MAIL_TRANSPORT_PROTOCOL=${MAIL_TRANSPORT_PROTOCOL}
+      - MAIL_SMTP_PORT=${MAIL_SMTP_PORT}
+      - MAIL_SMTP_AUTH=${MAIL_SMTP_AUTH}
+      - MAIL_SMTP_STARTTLS_ENABLE=${MAIL_SMTP_STARTTLS_ENABLE}
+      - MAIL_SMTP_STARTTLS_REQUIRED=${MAIL_SMTP_STARTTLS_REQUIRED}
+      - MAIL_DEBUG=${MAIL_DEBUG}

pinpoint-zookeeper/docker-compose.yml

@@ -1,5 +1,7 @@
 version: "3.6"
-services:
+
+servidocker
+docker-compose pull && docker-compose upces:
   #zookeepers
   zoo1:
     image: zookeeper:3.4
@@ -8,14 +10,9 @@ services:
     environment:
       ZOO_MY_ID: 1
       ZOO_SERVERS: server.1=0.0.0.0:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
-    expose:
-      - "2181"
-      - "2888"
-      - "3888"
-    ports:
-      - "2181"
     networks:
       - pinpoint
+
   zoo2:
     image: zookeeper:3.4
     restart: always
@@ -23,14 +20,9 @@ services:
     environment:
       ZOO_MY_ID: 2
       ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=0.0.0.0:2888:3888 server.3=zoo3:2888:3888
-    expose:
-      - "2181"
-      - "2888"
-      - "3888"
-    ports:
-      - "2181"
     networks:
       - pinpoint
+
   zoo3:
     image: zookeeper:3.4
     restart: always
@@ -38,14 +30,9 @@ services:
     environment:
       ZOO_MY_ID: 3
       ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=0.0.0.0:2888:3888
-    expose:
-      - "2181"
-      - "2888"
-      - "3888"
-    ports:
-      - "2181"
     networks:
       - pinpoint
+
 networks:
   pinpoint:
     driver: bridge