[#noissue] add version change in flink

.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.2.2
 SPRING_PROFILES=release
 #zookeeper information required
 PINPOINT_ZOOKEEPER_ADDRESS=zoo1

.gitignore

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

Readme.md

@@ -13,6 +13,8 @@ It supports and helps you understand your application in a glance and allow you
 
 ## Supported Tags
 
+ - 2.2.2
+ - 2.2.1
  - 2.2.0
  - 2.1.2
  - 2.1.0
@@ -84,18 +86,7 @@ For more information checkout [Setting Alarm](http://naver.github.io/pinpoint/al
 
 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. There is one more thing to do to use this features in Pinpoint.
-This feature is not mandatory, but since enabling this is a simple task, let's take care of it.
-
-Register a `job` on to pinpoint-flink server.  
-You can build the `job` from the [open-source of Pinpoint](https://github.com/naver/pinpoint), additional guide is [here](https://github.com/naver/pinpoint/blob/master/doc/application-inspector.md#application-inspector).   
-  
-If anyone have solution to put the job file into flink image without doing manually, please let us know.
-
-Pinpoint-Flink server is running on [port 8081](http://localhost:8081/#/submit). From `submit new job` menu
-Submit the jar file with *com.navercorp.pinpoint.flink.StatStreamingVer2Job* in entry class as below image.
-
-![Pinpoint](https://github.com/naver/pinpoint-docker/blob/master/docs/Pinpoint-Flink%20upload.png)
+After all containers are started and ready to go. Pinpoint-Flink server is running on [port 8081](http://localhost:8081/). 
 
 ### Alarm configuration (optional)
 

docker-compose.yml

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

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

@@ -1,5 +1,5 @@
 ### Pinpoint with Java
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.2.2
 SPRING_PROFILES=release
 AGENT_ID=app-in-docker
 APP_NAME=quickapp

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

@@ -1,5 +1,5 @@
 ### Pinpoint with Tomcat
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.2.2
 SPRING_PROFILES=release
 APP_PORT=8000
 AGENT_ID=app-in-docker

pinpoint-agent/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.2.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent

pinpoint-agent/Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.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

@@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.2.2
+ - 2.2.1
  - 2.2.0
  - 2.1.2
  - 2.1.0

pinpoint-collector/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.2.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Collector

pinpoint-collector/Dockerfile

@@ -2,7 +2,7 @@ FROM openjdk:8-jdk-alpine
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.2}
 ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
 
 RUN mkdir -p /pinpoint/config \
@@ -11,7 +11,7 @@ RUN mkdir -p /pinpoint/config \
 COPY /build/config/pinpoint-collector.properties /pinpoint/config/
 COPY /build/scripts/start-collector.sh /pinpoint/scripts/
 #temporary line for local test
-#COPY /pinpoint-collector-boot-2.2.0-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
+#COPY /pinpoint-collector-boot-2.2.2-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
 
 RUN apk --no-cache add curl \
     && chmod a+x /pinpoint/scripts/start-collector.sh \

pinpoint-collector/Readme.md

@@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl
 
 ## Supported Tags
 
+ - 2.2.2
+ - 2.2.1
  - 2.2.0
  - 2.1.2
  - 2.1.0

pinpoint-flink/.env

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

pinpoint-flink/Dockerfile

@@ -0,0 +1,15 @@
+FROM flink:1.7
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.2}
+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/build/profiles/release/hbase.properties

@@ -1,21 +1,4 @@
-#
-# Copyright 2017 NAVER Corp.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# local
-hbase.client.host=pinpoint-hbase
+hbase.client.host=#PINPOINT_ZOOKEEPER_ADDRESS#
 hbase.client.port=2181
 
 # hbase default:/hbase

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

@@ -2,7 +2,7 @@
 collector.l4.ip=
 
 # base data receiver config  ---------------------------------------------------------------------
-collector.receiver.base.ip=pinpoint-flink-taskmanager
+collector.receiver.base.ip=0.0.0.0
 collector.receiver.base.port=19994
 
 # number of tcp worker threads
@@ -23,26 +23,24 @@ collector.agentEventWorker.threadSize=4
 # capacity of agent event worker queue
 collector.agentEventWorker.queueSize=1024
 
-statistics.flushPeriod=1000
-
 # -------------------------------------------------------------------------------------------------
 # The cluster related options are used to establish connections between the agent, collector, and web in order to send/receive data between them in real time.
 # You may enable additional features using this option (Ex : RealTime Active Thread Chart).
 # -------------------------------------------------------------------------------------------------
 # Usage : Set the following options for collector/web components that reside in the same cluster in order to enable this feature.
-# 1. cluster.enable (pinpoint-web.properties, pinpoint-flink.properties) - "true" to enable
-# 2. cluster.zookeeper.address (pinpoint-web.properties, pinpoint-flink.properties) - address of the ZooKeeper instance that will be used to manage the cluster
-# 3. cluster.web.tcp.port (pinpoint-web.properties) - any available port number (used to establish connection between web and collector)
+# 1. cluster.enable (pinpoint-web-root.properties, pinpoint-flink.properties) - "true" to enable
+# 2. cluster.zookeeper.address (pinpoint-web-root.properties, pinpoint-flink.properties) - address of the ZooKeeper instance that will be used to manage the cluster
+# 3. cluster.web.tcp.port (pinpoint-web-root.properties) - any available port number (used to establish connection between web and collector)
 # -------------------------------------------------------------------------------------------------
 # Please be aware of the following:
 #1. If the network between web, collector, and the agents are not stable, it is advisable not to use this feature.
 #2. We recommend using the cluster.web.tcp.port option. However, in cases where the collector is unable to establish connection to the web, you may reverse this and make the web establish connection to the collector.
-#   In this case, you must set cluster.connect.address (pinpoint-web.properties); and cluster.listen.ip, cluster.listen.port (pinpoint-flink.properties) accordingly.
-cluster.enable=true
-cluster.zookeeper.address=zoo1
+#   In this case, you must set cluster.connect.address (pinpoint-web-root.properties); and cluster.listen.ip, cluster.listen.port (pinpoint-flink.properties) accordingly.
+cluster.enable=false
+cluster.zookeeper.address=#PINPOINT_ZOOKEEPER_ADDRESS#
 cluster.zookeeper.sessiontimeout=30000
 cluster.listen.ip=
-cluster.listen.port=
+cluster.listen.port=-1
 
 #collector.admin.password=
 #collector.admin.api.rest.active=
@@ -52,11 +50,10 @@ collector.spanEvent.sequence.limit=10000
 
 # flink cluster
 flink.cluster.enable=true
-flink.cluster.zookeeper.address=zoo1
+flink.cluster.zookeeper.address=#PINPOINT_ZOOKEEPER_ADDRESS#
 flink.cluster.zookeeper.sessiontimeout=3000
 flink.cluster.zookeeper.retry.interval=5000
 flink.cluster.tcp.port=19994
 
 # flink env init
-flink.StreamExecutionEnvironment=
-flink.sourceFunction.Parallel=1
+flink.StreamExecutionEnvironment=server

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

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# In flink version < 1.11 we can't use "job cluster" because it's not yet available
+if [ "$1" = "standalone-job" ]; then
+  cd /build
+  zip -d pinpoint-flink-job.jar "profiles/release/*.properties"
+  sed -i -e "s/#PINPOINT_ZOOKEEPER_ADDRESS#/${PINPOINT_ZOOKEEPER_ADDRESS}/g" profiles/release/*
+  zip -r pinpoint-flink-job.jar profiles/
+  cd -
+
+  mv /build/pinpoint-flink-job.jar pinpoint-flink-job.jar
+
+  shift
+
+  /docker-entrypoint.sh jobmanager &
+  sleep 5
+  if ! flink list | grep 'RUNNING'; then
+    flink run $@
+  fi
+  wait
+else
+  exec /docker-entrypoint.sh $@
+fi

pinpoint-flink/docker-compose.yml

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

pinpoint-hbase/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.2.2
 
 ### Pinpoint-Hbase
 

pinpoint-hbase/Dockerfile

@@ -2,7 +2,7 @@ FROM java:8-jdk
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.2}
 
 ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
 ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase

pinpoint-hbase/Readme.md

@@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.2.2
+ - 2.2.1
  - 2.2.0
  - 2.1.2
  - 2.1.0

pinpoint-mysql/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.2.2
 
 ### Pinpoint-mysql
 MYSQL_ROOT_PASSWORD=root123

pinpoint-mysql/Dockerfile

@@ -1,6 +1,6 @@
 FROM mysql:5.7
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.2}
 
 RUN apt update \ 
 	&& apt-get install -y --no-install-recommends ca-certificates wget \

pinpoint-mysql/Readme.md

@@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.2.2
+ - 2.2.1
  - 2.2.0
  - 2.1.2
  - 2.1.0

pinpoint-quickstart/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.2.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent

pinpoint-web/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.2.0
+PINPOINT_VERSION=2.2.2
 SPRING_PROFILES=release
 
 ### Pinpoint-Web

pinpoint-web/Dockerfile

@@ -2,7 +2,7 @@ FROM openjdk:8-jdk-alpine
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.2}
 ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar
 
 RUN mkdir -p /pinpoint/config \
@@ -11,7 +11,7 @@ RUN mkdir -p /pinpoint/config \
 COPY /build/config/pinpoint-web.properties /pinpoint/config/
 COPY /build/scripts/start-web.sh /pinpoint/scripts/
 #temporary line for local test
-#COPY /pinpoint-web-boot-2.2.0-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
+#COPY /pinpoint-web-boot-2.2.2-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
 
 RUN apk --no-cache add curl \
     && chmod a+x /pinpoint/scripts/start-web.sh \

pinpoint-web/Readme.md

@@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio
 
 ## Supported Tags
 
+ - 2.2.2
+ - 2.2.1
  - 2.2.0
  - 2.1.2
  - 2.1.0