Clean up unused environment variables, fix collector ip for external agent use.
This commit is contained in:
parent
7e10083877
commit
d40dd89496
26
.env
26
.env
|
@ -1,5 +1,10 @@
|
|||
PINPOINT_VERSION=2.4.1
|
||||
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/28
|
||||
COLLECTOR_FIXED_IP=172.24.0.11
|
||||
|
||||
#zookeeper information required
|
||||
PINPOINT_ZOOKEEPER_ADDRESS=zoo1
|
||||
|
||||
|
@ -29,11 +34,6 @@ ADMIN_PASSWORD=admin
|
|||
#analytics
|
||||
CONFIG_SENDUSAGE=true
|
||||
|
||||
#flink server information required if used
|
||||
BATCH_ENABLE=false
|
||||
BATCH_SERVER_IP=127.0.0.1
|
||||
BATCH_FLINK_SERVER=pinpoint-flink-jobmanager
|
||||
|
||||
CONFIG_SHOW_APPLICATIONSTAT=true
|
||||
|
||||
#mysql information required if used
|
||||
|
@ -42,20 +42,6 @@ JDBC_URL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
|
|||
JDBC_USERNAME=admin
|
||||
JDBC_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-Collector
|
||||
|
||||
PINPOINT_COLLECTOR_NAME=pinpoint-collector
|
||||
|
@ -93,8 +79,6 @@ ADMIN_PASSWORD=admin
|
|||
CONFIG_SENDUSAGE=true
|
||||
|
||||
#flink server information required if used
|
||||
BATCH_ENABLE=false
|
||||
BATCH_SERVER_IP=127.0.0.1
|
||||
BATCH_FLINK_SERVER=pinpoint-flink-jobmanager
|
||||
|
||||
CONFIG_SHOW_APPLICATIONSTAT=true
|
||||
|
|
|
@ -87,24 +87,10 @@ services:
|
|||
- CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
|
||||
- LOGGING_LEVEL_ROOT=${WEB_LOGGING_LEVEL_ROOT}
|
||||
- CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT}
|
||||
- BATCH_ENABLE=${BATCH_ENABLE}
|
||||
- BATCH_SERVER_IP=${BATCH_SERVER_IP}
|
||||
- BATCH_FLINK_SERVER=${BATCH_FLINK_SERVER}
|
||||
- JDBC_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
|
||||
- JDBC_URL=${JDBC_URL}
|
||||
- JDBC_USERNAME=${JDBC_USERNAME}
|
||||
- JDBC_PASSWORD=${JDBC_PASSWORD}
|
||||
- ALARM_MAIL_SERVER_URL=${ALARM_MAIL_SERVER_URL}
|
||||
- ALARM_MAIL_SERVER_PORT=${ALARM_MAIL_SERVER_PORT}
|
||||
- ALARM_MAIL_SERVER_USERNAME=${ALARM_MAIL_SERVER_USERNAME}
|
||||
- ALARM_MAIL_SERVER_PASSWORD=${ALARM_MAIL_SERVER_PASSWORD}
|
||||
- ALARM_MAIL_SENDER_ADDRESS=${ALARM_MAIL_SENDER_ADDRESS}
|
||||
- ALARM_MAIL_TRANSPORT_PROTOCOL=${ALARM_MAIL_TRANSPORT_PROTOCOL}
|
||||
- ALARM_MAIL_SMTP_PORT=${ALARM_MAIL_SMTP_PORT}
|
||||
- ALARM_MAIL_SMTP_AUTH=${ALARM_MAIL_SMTP_AUTH}
|
||||
- ALARM_MAIL_SMTP_STARTTLS_ENABLE=${ALARM_MAIL_SMTP_STARTTLS_ENABLE}
|
||||
- ALARM_MAIL_SMTP_STARTTLS_REQUIRED=${ALARM_MAIL_SMTP_STARTTLS_REQUIRED}
|
||||
- ALARM_MAIL_DEBUG=${ALARM_MAIL_DEBUG}
|
||||
links:
|
||||
- "pinpoint-mysql:pinpoint-mysql"
|
||||
networks:
|
||||
|
@ -140,9 +126,9 @@ services:
|
|||
- "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/tcp"
|
||||
- "${COLLECTOR_RECEIVER_STAT_UDP_PORT:-9995}:9995/udp"
|
||||
- "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/udp"
|
||||
|
||||
networks:
|
||||
- pinpoint
|
||||
pinpoint:
|
||||
ipv4_address: ${COLLECTOR_FIXED_IP}
|
||||
environment:
|
||||
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
|
||||
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
|
||||
|
@ -192,8 +178,6 @@ services:
|
|||
- CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
|
||||
- LOGGING_LEVEL_ROOT=${BATCH_LOGGING_LEVEL_ROOT}
|
||||
- CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT}
|
||||
- BATCH_ENABLE=${BATCH_ENABLE}
|
||||
- BATCH_SERVER_IP=${BATCH_SERVER_IP}
|
||||
- BATCH_FLINK_SERVER=${BATCH_FLINK_SERVER}
|
||||
- JDBC_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
|
||||
- JDBC_URL=${JDBC_URL}
|
||||
|
@ -356,3 +340,6 @@ volumes:
|
|||
networks:
|
||||
pinpoint:
|
||||
driver: bridge
|
||||
ipam:
|
||||
config:
|
||||
- subnet: ${PINPOINT_NETWORK_SUBNET}
|
||||
|
|
|
@ -19,8 +19,6 @@ ADMIN_PASSWORD=admin
|
|||
CONFIG_SENDUSAGE=true
|
||||
|
||||
#flink server information required if used
|
||||
BATCH_ENABLE=false
|
||||
BATCH_SERVER_IP=127.0.0.1
|
||||
BATCH_FLINK_SERVER=pinpoint-flink-jobmanager
|
||||
|
||||
CONFIG_SHOW_APPLICATIONSTAT=true
|
||||
|
|
|
@ -18,15 +18,13 @@ services:
|
|||
- "${BATCH_SERVER_PORT:-8079}:${BATCH_SERVER_PORT:-8079}"
|
||||
environment:
|
||||
- BATCH_SERVER_PORT=${BATCH_SERVER_PORT}
|
||||
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
|
||||
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
|
||||
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
|
||||
- CLUSTER_ENABLE=${CLUSTER_ENABLE}
|
||||
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
|
||||
- CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
|
||||
- LOGGING_LEVEL_ROOT=${BATCH_LOGGING_LEVEL_ROOT}
|
||||
- CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT}
|
||||
- BATCH_ENABLE=${BATCH_ENABLE}
|
||||
- BATCH_SERVER_IP=${BATCH_SERVER_IP}
|
||||
- BATCH_FLINK_SERVER=${BATCH_FLINK_SERVER}
|
||||
- JDBC_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
|
||||
- JDBC_URL=${JDBC_URL}
|
||||
|
|
|
@ -18,28 +18,10 @@ ADMIN_PASSWORD=admin
|
|||
#analytics
|
||||
CONFIG_SENDUSAGE=true
|
||||
|
||||
#flink server information required if used
|
||||
BATCH_ENABLE=false
|
||||
BATCH_SERVER_IP=127.0.0.1
|
||||
BATCH_FLINK_SERVER=pinpoint-flink-jobmanager
|
||||
|
||||
CONFIG_SHOW_APPLICATIONSTAT=true
|
||||
|
||||
#mysql information required if used
|
||||
JDBC_DRIVERCLASSNAME=com.mysql.jdbc.Driver
|
||||
JDBC_URL=jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
|
||||
JDBC_USERNAME=admin
|
||||
JDBC_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
|
||||
JDBC_PASSWORD=admin
|
|
@ -20,28 +20,14 @@ services:
|
|||
- "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
|
||||
environment:
|
||||
- WEB_SERVER_PORT=${WEB_SERVER_PORT}
|
||||
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
|
||||
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
|
||||
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
|
||||
- CLUSTER_ENABLE=${CLUSTER_ENABLE}
|
||||
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
|
||||
- CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
|
||||
- LOGGING_LEVEL_ROOT=${WEB_LOGGING_LEVEL_ROOT}
|
||||
- CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT}
|
||||
- BATCH_ENABLE=${BATCH_ENABLE}
|
||||
- BATCH_SERVER_IP=${BATCH_SERVER_IP}
|
||||
- BATCH_FLINK_SERVER=${BATCH_FLINK_SERVER}
|
||||
- JDBC_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
|
||||
- JDBC_URL=${JDBC_URL}
|
||||
- JDBC_USERNAME=${JDBC_USERNAME}
|
||||
- JDBC_PASSWORD=${JDBC_PASSWORD}
|
||||
- ALARM_MAIL_SERVER_URL=${ALARM_MAIL_SERVER_URL}
|
||||
- ALARM_MAIL_SERVER_PORT=${ALARM_MAIL_SERVER_PORT}
|
||||
- ALARM_MAIL_SERVER_USERNAME=${ALARM_MAIL_SERVER_USERNAME}
|
||||
- ALARM_MAIL_SERVER_PASSWORD=${ALARM_MAIL_SERVER_PASSWORD}
|
||||
- ALARM_MAIL_SENDER_ADDRESS=${ALARM_MAIL_SENDER_ADDRESS}
|
||||
- ALARM_MAIL_TRANSPORT_PROTOCOL=${ALARM_MAIL_TRANSPORT_PROTOCOL}
|
||||
- ALARM_MAIL_SMTP_PORT=${ALARM_MAIL_SMTP_PORT}
|
||||
- ALARM_MAIL_SMTP_AUTH=${ALARM_MAIL_SMTP_AUTH}
|
||||
- ALARM_MAIL_SMTP_STARTTLS_ENABLE=${ALARM_MAIL_SMTP_STARTTLS_ENABLE}
|
||||
- ALARM_MAIL_SMTP_STARTTLS_REQUIRED=${ALARM_MAIL_SMTP_STARTTLS_REQUIRED}
|
||||
- ALARM_MAIL_DEBUG=${ALARM_MAIL_DEBUG}
|
||||
- JDBC_PASSWORD=${JDBC_PASSWORD}
|
Loading…
Reference in New Issue