Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pinpoint-apm/pinpoint-docker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.0.1
Choose a base ref
...
head repository: pinpoint-apm/pinpoint-docker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 812 additions and 1,149 deletions.
  1. +110 −40 .env
  2. +73 −0 .github/workflows/docker-image.yml
  3. +100 −0 .github/workflows/release-images.yml
  4. +2 −1 .gitignore
  5. +54 −56 Readme.md
  6. +247 −0 docker-compose-metric.yml
  7. +165 −90 docker-compose.yml
  8. BIN docs/Pinpoint-Flink upload.png
  9. +18 −3 pinpoint-agent-attach-example/java/.env
  10. +0 −2 pinpoint-agent-attach-example/java/Dockerfile
  11. +2 −2 pinpoint-agent-attach-example/tomcat/.env
  12. +1 −1 pinpoint-agent-attach-example/tomcat/docker-compose.yml
  13. +0 −27 pinpoint-agent/.env
  14. +0 −24 pinpoint-agent/Dockerfile
  15. +0 −44 pinpoint-agent/Readme.md
  16. +0 −25 pinpoint-agent/build/scripts/configure-agent.sh
  17. +0 −40 pinpoint-agent/docker-compose.yml
  18. +0 −28 pinpoint-collector/.env
  19. +0 −23 pinpoint-collector/Dockerfile
  20. +0 −44 pinpoint-collector/Readme.md
  21. +0 −15 pinpoint-collector/build/scripts/start-collector.sh
  22. +0 −45 pinpoint-collector/docker-compose.yml
  23. +0 −7 pinpoint-flink/.env
  24. +0 −45 pinpoint-flink/build/hbase.properties
  25. +0 −62 pinpoint-flink/build/pinpoint-flink.properties
  26. +0 −45 pinpoint-flink/docker-compose.yml
  27. +0 −8 pinpoint-hbase/.env
  28. +0 −32 pinpoint-hbase/Dockerfile
  29. +0 −34 pinpoint-hbase/docker-compose.yml
  30. +0 −18 pinpoint-hbase/hbase-site.xml
  31. +0 −7 pinpoint-mysql/.env
  32. +0 −11 pinpoint-mysql/Dockerfile
  33. +0 −44 pinpoint-mysql/Readme.md
  34. +0 −25 pinpoint-mysql/docker-compose.yml
  35. +8 −4 pinpoint-quickstart/.env
  36. +2 −2 pinpoint-quickstart/Dockerfile
  37. +24 −6 {pinpoint-hbase → pinpoint-quickstart}/Readme.md
  38. +6 −2 pinpoint-quickstart/docker-compose.yml
  39. +0 −49 pinpoint-web/.env
  40. +0 −21 pinpoint-web/Dockerfile
  41. +0 −44 pinpoint-web/Readme.md
  42. BIN pinpoint-web/build/mail.zip
  43. +0 −85 pinpoint-web/build/scripts/start-web.sh
  44. +0 −50 pinpoint-web/docker-compose.yml
  45. +0 −38 pinpoint-zookeeper/docker-compose.yml
150 changes: 110 additions & 40 deletions .env
Original file line number Diff line number Diff line change
@@ -1,11 +1,31 @@
PINPOINT_VERSION=2.0.1
PINPOINT_VERSION=latest
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
#config for hbase in external docker
EXTERNAL_HBASE_PORT=2180
AGENTINFO_TTL=31536000
AGENTSTATV2_TTL=5184000
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
@@ -17,61 +37,93 @@ MYSQL_DATABASE=pinpoint

PINPOINT_WEB_NAME=pinpoint-web

WEB_PAGE_PORT=8079
WEB_SERVER_PORT=8080

WEB_LOGGING_LEVEL_ROOT=INFO

CLUSTER_ENABLE=true
#CLUSTER_WEB_TCP_PORT=9997
CLUSTER_ZOOKEEPER_ADDRESS=zoo1

ADMIN_PASSWORD=admin
PINPOINT_MODULES_WEB_LOGIN=
WEB_SECURITY_AUTH_USER="alice:foo,bob:bar"
WEB_SECURITY_AUTH_ADMIN="eve:baz"
WEB_SECURITY_AUTH_JWT_SECRETKEY=__PINPOINT_JWT_SECRET__

ANALYTICS=true

HBASE_HOST=pinpoint-hbase
HBASE_PORT=2181

WEB_DEBUG_LEVEL=INFO

BATCH_ENABLE=false
BATCH_SERVER_IP=127.0.0.127
BATCH_FLINK_SERVER=pinpoint-flink-jobmanager
#analytics
CONFIG_SENDUSAGE=true

CONFIG_SHOW_APPLICATIONSTAT=true

JDBC_DRIVER=com.mysql.jdbc.Driver
JDBC_URL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
JDBC_USERNAME=admin
JDBC_PASSWORD=admin
MAIL_HOST=stmp.test.com
MAIL_PORT=123
MAIL_USERNAME=user
MAIL_PASSWORD=pass
MAIL_PROPERTIES_MAIL_TRANSPORT_PROTOCOL=smtp
MAIL_PROPERTIES_MAIL_SMTP_AUTH=true
MAIL_PROPERTIES_MAIL_SMTP_PORT=587
MAIL_PROPERTIES_MAIL_SMTP_FROM=test@example.com
MAIL_PROPERTIES_MAIL_STARTTLS_ENABLE=true
MAIL_PROPERTIES_MAIL_STARTTLS_REQUIRED=true
MAIL_PROPERTIES_MAIL_DEBUG=false

#mysql information required if used
JDBC_DRIVERCLASSNAME=com.mysql.jdbc.Driver
SPRING_DATASOURCE_HIKARI_JDBCURL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
SPRING_DATASOURCE_HIKARI_USERNAME=admin
SPRING_DATASOURCE_HIKARI_PASSWORD=admin
SPRING_METADATASOURCE_HIKARI_JDBCURL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
SPRING_METADATASOURCE_HIKARI_USERNAME=admin
SPRING_METADATASOURCE_HIKARI_PASSWORD=admin

### Pinpoint-Collector

PINPOINT_COLLECTOR_NAME=pinpoint-collector

COLLECTOR_RECEIVER_AGENT_PORT=9991
COLLECTOR_RECEIVER_METADATA_PORT=9991
COLLECTOR_RECEIVER_STAT_PORT=9992
COLLECTOR_RECEIVER_SPAN_PORT=9993
CLUSTER_ENABLE=true

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=zoo1

COLLECTOR_DEBUG_LEVEL=INFO
### Pinpoint-Batch

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

#data source information required if used
SPRING_DATASOURCE_HIKARI_JDBCURL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
SPRING_DATASOURCE_HIKARI_USERNAME=admin
SPRING_DATASOURCE_HIKARI_PASSWORD=admin
SPRING_METADATASOURCE_HIKARI_JDBCURL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
SPRING_METADATASOURCE_HIKARI_USERNAME=admin
SPRING_METADATASOURCE_HIKARI_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

@@ -90,8 +142,12 @@ COLLECTOR_TCP_PORT=9994
COLLECTOR_STAT_PORT=9995
COLLECTOR_SPAN_PORT=9996

# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
PROFILER_SAMPLING_RATE=1
# 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

AGENT_ID=app-in-docker
APP_NAME=quickapp
@@ -107,4 +163,18 @@ FLINK_WEB_PORT=8081

### Pinpoint-quickstart

APP_PORT=8000
APP_PORT=8085

### Pinpoint-pinot
SPRING_PINOTDATASOURCE_PINOT_JDBCURL=jdbc:pinot://pinot-controller:9000
SPRING_PINOTDATASOURCE_PINOT_USERNAME=admin
SPRING_PINOTDATASOURCE_PINOT_PASSWORD=admin

### Pinpoint-kafka
PINPOINT_METRIC_KAFKA_BOOTSTRAP_SERVERS=pinpoint-kafka:9092

### Pinpoint redis
SPRING_DATA_REDIS_HOST=pinpoint-redis
SPRING_DATA_REDIS_PORT=6379
SPRING_DATA_REDIS_USERNAME=default
SPRING_DATA_REDIS_PASSWORD=
73 changes: 73 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
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


100 changes: 100 additions & 0 deletions .github/workflows/release-images.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
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 }}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.idea/
.idea/
*.iml
Loading