From 51b20d81e68360d109560023209b9018018a82e9 Mon Sep 17 00:00:00 2001 From: Junv Zhao Date: Thu, 13 Jul 2017 15:56:17 +0800 Subject: [PATCH 1/3] bump to 1.6.2 --- README.md | 2 +- docker-compose-example-app.yml | 4 ++-- docker-compose.yml | 8 ++++---- pinpoint-agent/Dockerfile | 2 +- pinpoint-collector/Dockerfile | 2 +- pinpoint-hbase/Dockerfile | 2 +- pinpoint-web/Dockerfile | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8ac2c6d..7f85eea 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ profiler.collector.tcp.port=9994 * The following script is a example for a spring boot application. ```shell -java -javaagent:/some-absolute-path/pinpoint-agent-1.6.1/pinpoint-bootstrap-1.6.1.jar -Dpinpoint.agentId=some-union-id -Dpinpoint.applicationName=some-name -jar build/libs/wise-log-1.0.0-SNAPSHOT.jar +java -javaagent:/some-absolute-path/pinpoint-agent-1.6.2/pinpoint-bootstrap-1.6.2.jar -Dpinpoint.agentId=some-union-id -Dpinpoint.applicationName=some-name -jar build/libs/wise-log-1.0.0-SNAPSHOT.jar ``` You can find more samples at: diff --git a/docker-compose-example-app.yml b/docker-compose-example-app.yml index 6a0b12f..c2a753b 100644 --- a/docker-compose-example-app.yml +++ b/docker-compose-example-app.yml @@ -6,10 +6,10 @@ rancher-server: ports: - 8080:8080 environment: - JAVA_OPTS: "-javaagent:/assets/pinpoint-agent/pinpoint-bootstrap-1.6.1.jar -Dpinpoint.agentId=app-in-docker -Dpinpoint.applicationName=app" + JAVA_OPTS: "-javaagent:/assets/pinpoint-agent/pinpoint-bootstrap-1.6.2.jar -Dpinpoint.agentId=app-in-docker -Dpinpoint.applicationName=app" pinpoint-agent: - image: wahyd4/pinpoint-agent:1.6.1 + image: wahyd4/pinpoint-agent:1.6.2 net: "none" restart: unless-stopped # volumes: diff --git a/docker-compose.yml b/docker-compose.yml index ae7d429..b725d29 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ pinpoint-hbase: container_name: pinpoint-hbase hostname: hbase - image: wahyd4/pinpoint-hbase:1.6.1 + image: wahyd4/pinpoint-hbase:1.6.2 restart: always expose: - "2181" @@ -13,7 +13,7 @@ pinpoint-hbase: pinpoint-collector: container_name: pinpoint-collector hostname: collector - image: wahyd4/pinpoint-collector:1.6.1 + image: wahyd4/pinpoint-collector:1.6.2 restart: always expose: - "9994" @@ -39,7 +39,7 @@ pinpoint-collector: pinpoint-web: container_name: pinpoint-web hostname: web - image: wahyd4/pinpoint-web:1.6.1 + image: wahyd4/pinpoint-web:1.6.2 restart: always expose: - "8080" @@ -56,7 +56,7 @@ pinpoint-web: # only example #pinpoint-agent: -# image: wahyd4/pinpoint-agent:1.6.1 +# image: wahyd4/pinpoint-agent:1.6.2 # net: "none" # restart: unless-stopped # volumes: diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile index 631b766..a033182 100644 --- a/pinpoint-agent/Dockerfile +++ b/pinpoint-agent/Dockerfile @@ -4,7 +4,7 @@ FROM alpine:3.5 -ENV PINPOINT_VERSION=1.6.1 +ENV PINPOINT_VERSION=1.6.2 ADD configure-agent.sh /usr/local/bin/ diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index bb43e15..3449a3b 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -4,7 +4,7 @@ FROM tomcat:8-jre8 -ENV PINPOINT_VERSION=1.6.1 +ENV PINPOINT_VERSION=1.6.2 ADD start-collector.sh /usr/local/bin/ diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile index 92ae5fa..9759421 100644 --- a/pinpoint-hbase/Dockerfile +++ b/pinpoint-hbase/Dockerfile @@ -7,7 +7,7 @@ FROM java:8-jdk ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ENV HBASE_VERSION=1.2.3 ENV HBASE_HOME=/opt/hbase/hbase-$HBASE_VERSION -ENV PINPOINT_VERSION=1.6.1 +ENV PINPOINT_VERSION=1.6.2 ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index e93f103..abbe54e 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -4,7 +4,7 @@ FROM tomcat:8-jre8 -ENV PINPOINT_VERSION=1.6.1 +ENV PINPOINT_VERSION=1.6.2 ADD start-web.sh /usr/local/bin/ From 700db17d44c3b435ad929ed562fbb900553f03d4 Mon Sep 17 00:00:00 2001 From: Junv Zhao Date: Thu, 13 Jul 2017 16:29:49 +0800 Subject: [PATCH 2/3] update readme --- README.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7f85eea..ad26d0d 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,21 @@ # docker-pinpoint -This repo contains the docker images for [Pinpoint](https://github.com/naver/pinpoint), or you can just use the docker compose file run pinpoint in seconds. + -### To build the images +- [docker-pinpoint](#docker-pinpoint) + - [Build the images](#build-the-images) + - [Run all the containers](#run-all-the-containers) + - [Add your own Java based application to be monitored.](#add-your-own-java-based-application-to-be-monitored) + + + +This repo contains all the docker images for [Pinpoint](https://github.com/naver/pinpoint), or you can just use the docker compose file run pinpoint in seconds. + +### Build the images * Go to a folder * `docker build -t repo-name:latest .` to build the image -### To run all containers +### Run all the containers ``` docker-compose up -d @@ -46,6 +55,9 @@ profiler.collector.tcp.port=9994 java -javaagent:/some-absolute-path/pinpoint-agent-1.6.2/pinpoint-bootstrap-1.6.2.jar -Dpinpoint.agentId=some-union-id -Dpinpoint.applicationName=some-name -jar build/libs/wise-log-1.0.0-SNAPSHOT.jar ``` + +You may need to download the pinpoint agent jar from + You can find more samples at: If you plan to use external volumes for hbase you should fill hbase first. From 39111be56bed76bfaf51ee606739f7b2d3eb3343 Mon Sep 17 00:00:00 2001 From: Junv Zhao Date: Thu, 13 Jul 2017 16:37:40 +0800 Subject: [PATCH 3/3] update readme with some words updating --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ad26d0d..e1164ff 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Open your browser and then go to ### Add your own Java based application to be monitored. -* Modify the `pinpoint.config` if you need. +* Download the pinpoint agent tar file from and then modify the `pinpoint.config` if you need. ``` ########################################################### @@ -52,12 +52,10 @@ profiler.collector.tcp.port=9994 * The following script is a example for a spring boot application. ```shell -java -javaagent:/some-absolute-path/pinpoint-agent-1.6.2/pinpoint-bootstrap-1.6.2.jar -Dpinpoint.agentId=some-union-id -Dpinpoint.applicationName=some-name -jar build/libs/wise-log-1.0.0-SNAPSHOT.jar +java -javaagent:/some-absolute-path/pinpoint-agent-1.6.2/pinpoint-bootstrap-1.6.2.jar -Dpinpoint.agentId=some-union-id -Dpinpoint.applicationName=some-name -jar build/libs/your-jar.jar ``` -You may need to download the pinpoint agent jar from - You can find more samples at: If you plan to use external volumes for hbase you should fill hbase first.