From 8302dd084d69cd3b7859b0401366c15930cd1f95 Mon Sep 17 00:00:00 2001 From: qudongfang Date: Thu, 13 Dec 2018 21:29:56 +0800 Subject: [PATCH 1/4] Update readme. --- Readme.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index bf0fcac..c1e7b27 100644 --- a/Readme.md +++ b/Readme.md @@ -17,6 +17,10 @@ It supports and helps you understand your application in a glance and allow you - 1.7.3 - 1.7.2 +## Requirements + +- [docker 18.02.0+](https://docs.docker.com/compose/compose-file/) + ## How to install Pinpoint? You can easily bring up an entire Dockerized Pinpoint(latest release) environment by using [Docker Compose](https://docs.docker.com/compose/) with any of the provided `docker-compose.yml` files as below. @@ -25,7 +29,7 @@ To monitor your agent see [configuration part](#configurations) for further deta ``` git clone https://github.com/naver/pinpoint-docker.git -cd Pinpoint-Docker +cd pinpoint-docker docker-compose pull && docker-compose up -d ``` If you'd like to bring up the previous release. Try with docker-compose file from other tags. From 35d0b8ecd350341e56941ad9d0747a355478bd50 Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Thu, 20 Dec 2018 16:50:16 +0900 Subject: [PATCH 2/4] [#noissue] update readme on pinpoint-mysql --- Readme.md | 12 +++++++----- pinpoint-mysql/Readme.md | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 pinpoint-mysql/Readme.md diff --git a/Readme.md b/Readme.md index bb1f9e1..c867a4a 100644 --- a/Readme.md +++ b/Readme.md @@ -38,12 +38,12 @@ You can also just build the image with `docker-compose up -d` command without pu This will install and run all services required to run all features in Pinpoint in docker containers joined with same network. - Pinpoint-Web Server - Pinpoint-Collector - - Pinpoint-Agent(ready to be used) - - Pinpoint-Flink + - Pinpoint-Agent + - Pinpoint-Flink(just for certain feature) - Pinpoint-Zookeeper - Pinpoint-Hbase - Pinpoint-QuickStart(a sample application) - - Pinpoint-Mysql + - Pinpoint-Mysql(just for certain feature) This may take several minutes to download all necessary images. You can replace `QuickStart` application part with your application to start monitoring. @@ -52,14 +52,16 @@ You can replace `QuickStart` application part with your application to start mon ### Mysql (optional) -The Pinpoint-Mysql server is running on port 13306 and contains the data structure used to register users, groups, and alerts to be sent. +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 see [Setting Alarm](http://naver.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'](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 all existing features in Pinpoint. It's not mandatory, but to use all the features and since it's a simple task, let's take care of it. diff --git a/pinpoint-mysql/Readme.md b/pinpoint-mysql/Readme.md new file mode 100644 index 0000000..91168c2 --- /dev/null +++ b/pinpoint-mysql/Readme.md @@ -0,0 +1,38 @@ + +## Pinpoint Mysql + +This Docker image contains the Pinpoint Mysql component of the Pinpoint application monitoring system. + +## Supported Tags + + - 1.8.0 + - 1.7.3 + - 1.7.2 + +Please see [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image. + +## Any Issues or Suggestions? + +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/naver/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. +``` \ No newline at end of file From c5a34e9d2074ee07e4080b2c953d4a32e5ba1d6c Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Mon, 24 Dec 2018 11:42:11 +0900 Subject: [PATCH 3/4] [#5] supplements for mysql --- docker-compose.yml | 2 +- pinpoint-mysql/.env | 8 +++++++- pinpoint-mysql/docker-compose.yml | 25 +++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 pinpoint-mysql/docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml index c194a3c..84c419a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: container_name: pinpoint-mysql restart: always - image: pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION} + image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}" hostname: pinpoint-mysql ports: - "13306:3306" diff --git a/pinpoint-mysql/.env b/pinpoint-mysql/.env index f54d43d..ac6c27b 100644 --- a/pinpoint-mysql/.env +++ b/pinpoint-mysql/.env @@ -1 +1,7 @@ -PINPOINT_VERSION=1.8.0 \ No newline at end of file +PINPOINT_VERSION=1.8.0 + +### Pinpoint-mysql +MYSQL_ROOT_PASSWORD=root123 +MYSQL_USER=admin +MYSQL_PASSWORD=admin +MYSQL_DATABASE=pinpoint \ No newline at end of file diff --git a/pinpoint-mysql/docker-compose.yml b/pinpoint-mysql/docker-compose.yml new file mode 100644 index 0000000..2a04ccf --- /dev/null +++ b/pinpoint-mysql/docker-compose.yml @@ -0,0 +1,25 @@ +version: "3.6" + +services: + pinpoint-mysql: + build: + context: . + dockerfile: Dockerfile + args: + - PINPOINT_VERSION=${PINPOINT_VERSION} + + container_name: pinpoint-mysql + restart: always + image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}" + + hostname: pinpoint-mysql + ports: + - "13306:3306" + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + + volumes: + - ./var/lib/mysql From 1e46c9c25b034b791a15884aaedd016aa8388786 Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Mon, 24 Dec 2018 12:51:32 +0900 Subject: [PATCH 4/4] [#5] disable until 1.8.1 release --- Readme.md | 8 ++++---- docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Readme.md b/Readme.md index c867a4a..40410ac 100644 --- a/Readme.md +++ b/Readme.md @@ -39,18 +39,18 @@ This will install and run all services required to run all features in Pinpoint - Pinpoint-Web Server - Pinpoint-Collector - Pinpoint-Agent - - Pinpoint-Flink(just for certain feature) + - Pinpoint-Flink(to support certain feature) - Pinpoint-Zookeeper - Pinpoint-Hbase - - Pinpoint-QuickStart(a sample application) - - Pinpoint-Mysql(just for certain feature) + - Pinpoint-QuickStart(a sample application, 1.8.1+) + - Pinpoint-Mysql(to support certain feature) This may take several minutes to download all necessary images. 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 -### Mysql (optional) +### 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. diff --git a/docker-compose.yml b/docker-compose.yml index 84c419a..2b33d8c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: container_name: pinpoint-mysql restart: always - image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}" +# image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}" hostname: pinpoint-mysql ports: - "13306:3306"