8 Commits
1.7.2 ... 1.8.0

Author SHA1 Message Date
Roy Kim
9b0f932567 Merge pull request #2 from RoySRose/UpdateDocker1.8.0
update for release 1.8.0
2018-09-14 15:32:40 +09:00
Roy Kim
6cc4e1a2b1 update for release 1.8.0 2018-09-14 15:31:03 +09:00
Roy Kim
2c45a0ae2c Merge pull request #1 from RoySRose/Guide
[#noissue] update guide
2018-08-20 14:09:49 +09:00
Roy Kim
b95fb925c9 [#noissue] update guide 2018-08-20 14:08:57 +09:00
Roy Kim
5c6afeb604 Update readme 2018-08-13 07:43:31 +09:00
Roy Kim
0b4d97bfd6 Initial updates 2018-05-14 13:25:29 +09:00
Roy Kim
5e475d1a1a support 1.7.3 2018-05-11 19:24:47 +09:00
Roy Kim
a1c214352d Initial updates 2018-05-11 18:56:50 +09:00
20 changed files with 188 additions and 24 deletions

2
.env
View File

@@ -1,4 +1,4 @@
PINPOINT_VERSION=1.7.2 PINPOINT_VERSION=1.8.0
### Pinpoint-Hbase ### Pinpoint-Hbase

View File

@@ -4,6 +4,7 @@
# Pinpoint-Docker for Pinpoint # Pinpoint-Docker for Pinpoint
Official git repository of Dockerized components of the [Pinpoint Application Monitoring](http://naver.github.io/pinpoint/). Official git repository of Dockerized components of the [Pinpoint Application Monitoring](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 ## What is Pinpoint
@@ -11,20 +12,24 @@ Official git repository of Dockerized components of the [Pinpoint Application Mo
It supports and helps you understand your application in a glance and allow you to build world-class, high-quality software. It supports and helps you understand your application in a glance and allow you to build world-class, high-quality software.
## Supported Tags ## Supported Tags
- 1.8.0
- 1.7.3 - 1.7.3
- 1.7.2 - 1.7.2
## How to install Pinpoint? ## How to install Pinpoint?
You can easily bring up an entire Dockerized Pinpoint environment by using [Docker Compose](https://docs.docker.com/compose/) with any of the provided `docker-compose.yml` files as below. 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.
With `docker-compose.yml` under *Pinpoint-Docker* folder brings up all the environment attached with Pinpoint-QuickStart(sample app). With `docker-compose.yml` under *Pinpoint-Docker* folder brings up all the environment attached with Pinpoint-QuickStart(sample app).
To monitor your agent see [configuration part](#Configuration) for further details. To monitor your agent see [configuration part](#configurations) for further details.
``` ```
git clone https://github.com/naver/pinpoint-docker.git git clone https://github.com/naver/pinpoint-docker.git
cd Pinpoint-Docker cd Pinpoint-Docker
docker-compose pull && docker-compose up -d 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.
You can also just 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.
This will install and run all services required to run all features in Pinpoint in docker containers joined with same network. 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-Web Server
@@ -37,7 +42,9 @@ This will install and run all services required to run all features in Pinpoint
This may take several minutes to download all necessary images. This may take several minutes to download all necessary images.
You can modify `QuickStart` application part with your application to start monitoring. You can modify `QuickStart` application part with your application to start monitoring.
(see [`Monitoring YOUR Application`](https://github.com/naver/pinpoint-docker#monitoring-your-application) part for further details). (see [`Monitoring YOUR Application`](#monitoring-your-application) part for further details).
### Flink configuration
After all containers are started and ready to go. There is one more thing to do to use all existing features in Pinpoint. 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. It's not mandatory, but to use all the features and since it's a simple task, let's take care of it.
@@ -70,6 +77,15 @@ If you are not familiar with Pinpoint concept, please read: [Overview](http://na
Running Pinpoint-Agent docker-compose separately, Examples are [here](https://github.com/naver/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/naver/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.
## Distributed System
Until now, every components are in one docker, single-node approach, which is excellent for test and development.
It provides an easy way to prototype new ideas and use cases, as well as try out new functionality and the latest Pinpoint releases.
Its not intended nor supported for production use.
You can use `docker-compose` and `.env` files under each folder to install the modules separately into several servers. You can use `docker-compose` and `.env` files under each folder to install the modules separately into several servers.
If containers are separated, ip configurations in `.env` must be changed within. If containers are separated, ip configurations in `.env` must be changed within.
@@ -78,9 +94,6 @@ You can remove *pinpoint-agent* and *pinpoint-quickstart* from docker-compose.ym
And create another docker-compose.yml just like one under pinpoint-quickstart folder to run your application. And create another docker-compose.yml just like one under pinpoint-quickstart folder to run your application.
Finally, since agent needs to acknowledge the collector ip. collector ip needs to be changed in .env. Finally, since agent needs to acknowledge the collector ip. collector ip needs to be changed in .env.
We'll try to create more examples along the way.
If anyone who can share their dockerfile, it's always welcome.
## Configurations ## Configurations
Configuration relies on supplying `docker-compose` with environment variables defined in `.env` file. So it's recommended to change variables only from `.env` file. Configuration relies on supplying `docker-compose` with environment variables defined in `.env` file. So it's recommended to change variables only from `.env` file.
@@ -93,7 +106,7 @@ Pinpoint-Zookeeper is just an example of using zookeeper image. You can modify d
For more specific details on what the values represents in *.env* file. Please check [Pinpoint Github Repository](https://github.com/naver/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/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). [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. Please note that only essential configuration options are adopted to pinpoint-docker(docker-compose).
## logs ## logs
@@ -111,7 +124,7 @@ Contributions on the pinpoint-docker image is also always welcome.
## License ## License
Pinpoint is licensed under the Apache License, Version 2.0. Pinpoint is licensed under the Apache License, Version 2.0.
See [LICENSE](LICENSE) for full license text. See [LICENSE](https://github.com/naver/pinpoint/blob/master/LICENSE) for full license text.
``` ```
Copyright 2018 NAVER Corp. Copyright 2018 NAVER Corp.

View File

@@ -1,4 +1,4 @@
### Pinpoint with Java ### Pinpoint with Java
PINPOINT_VERSION=1.7.2 PINPOINT_VERSION=1.8.0
AGENT_ID=app-in-docker AGENT_ID=app-in-docker
APP_NAME=quickapp APP_NAME=quickapp

View File

@@ -1,5 +1,5 @@
### Pinpoint with Tomcat ### Pinpoint with Tomcat
PINPOINT_VERSION=1.7.2 PINPOINT_VERSION=1.8.0
APP_PORT=8000 APP_PORT=8000
AGENT_ID=app-in-docker AGENT_ID=app-in-docker
APP_NAME=quickapp APP_NAME=quickapp

View File

@@ -1,4 +1,4 @@
PINPOINT_VERSION=1.7.2 PINPOINT_VERSION=1.8.0
### Pinpoint-Agent ### Pinpoint-Agent

View File

@@ -2,7 +2,7 @@ FROM alpine:3.7
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>" LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.7.2} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0}
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
COPY /build/scripts/configure-agent.sh /usr/local/bin/ COPY /build/scripts/configure-agent.sh /usr/local/bin/

38
pinpoint-agent/Readme.md Normal file
View File

@@ -0,0 +1,38 @@
## Pinpoint Agent
This Docker image contains the Pinpoint Agent 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.
```

View File

@@ -1,4 +1,4 @@
PINPOINT_VERSION=1.7.2 PINPOINT_VERSION=1.8.0
### Pinpoint-Collector ### Pinpoint-Collector

View File

@@ -2,7 +2,7 @@ FROM tomcat:8-jre8
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>" LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.7.2} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0}
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war

View File

@@ -0,0 +1,38 @@
## Pinpoint Collector
This Docker image contains the Pinpoint Collector 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.
```

View File

@@ -1,4 +1,4 @@
PINPOINT_VERSION=1.7.2 PINPOINT_VERSION=1.8.0
### Pinpoint-flink ### Pinpoint-flink

Binary file not shown.

View File

@@ -2,7 +2,7 @@ version: "3.6"
## ##
#to use this separately will require pinpoint-flink-job-{version}.jar built #to use this separately will require pinpoint-flink-job-{version}.jar built
#from pinpoint-flink module with correct properties under hbase.properties, pinpoint-flink.properties #from pinpoint-flink module with correct properties under hbase.properties, pinpoint-flink.properties
#sample configs used to build pinpoint-flink/build/pinpoint-flink-job-1.7.2.jar is under build folder #sample configs used to build pinpoint-flink/build/pinpoint-flink-job-{version}.jar is under build folder
## ##
services: services:
##flink ##flink

View File

@@ -1,4 +1,4 @@
PINPOINT_VERSION=1.7.2 PINPOINT_VERSION=1.8.0
### Pinpoint-Hbase ### Pinpoint-Hbase

View File

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

38
pinpoint-hbase/Readme.md Normal file
View File

@@ -0,0 +1,38 @@
## Pinpoint Hbase
This Docker image contains the Pinpoint Hbase component of the Pinpoint application monitoring system.
## Supported Tags
- 1.8.0
- 1.7.3
- 1.7.2
Please see the [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image.
## 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.
```

View File

@@ -1,4 +1,4 @@
PINPOINT_VERSION=1.7.2 PINPOINT_VERSION=1.8.0
### Pinpoint-Agent ### Pinpoint-Agent

View File

@@ -1,4 +1,4 @@
PINPOINT_VERSION=1.7.2 PINPOINT_VERSION=1.8.0
### Pinpoint-Web ### Pinpoint-Web

View File

@@ -2,7 +2,7 @@ FROM tomcat:8-jre8
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>" LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.7.2} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0}
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war
COPY /build/scripts/start-web.sh /usr/local/bin/ COPY /build/scripts/start-web.sh /usr/local/bin/

View File

@@ -1 +1,38 @@
readme for web
## Pinpoint Web
This Docker image contains the Pinpoint Web component of the Pinpoint application monitoring system.
## Supported Tags
- 1.8.0
- 1.7.3
- 1.7.2
Please see the [Pinpoint-Docker GitHub repository](https://github.com/naver/pinpoint-docker) for further information on how to run, configure and build this image.
## 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.
```