[#noissue] update configs and typo
This commit is contained in:
parent
e15c6d3d48
commit
1e1c4f2fd1
1
.env
1
.env
|
@ -7,7 +7,6 @@ PINPOINT_ZOOKEEPER_ADDRESS=zoo1
|
||||||
|
|
||||||
PINPOINT_HBASE_NAME=pinpoint-hbase
|
PINPOINT_HBASE_NAME=pinpoint-hbase
|
||||||
#config for hbase in external docker
|
#config for hbase in external docker
|
||||||
EXTERNAL_HBASE_PORT=2181
|
|
||||||
|
|
||||||
### Pinpoint-mysql
|
### Pinpoint-mysql
|
||||||
MYSQL_ROOT_PASSWORD=root123
|
MYSQL_ROOT_PASSWORD=root123
|
||||||
|
|
|
@ -71,7 +71,6 @@ services:
|
||||||
- pinpoint-mysql
|
- pinpoint-mysql
|
||||||
restart: always
|
restart: always
|
||||||
expose:
|
expose:
|
||||||
- "${SERVER_PORT:-8080}"
|
|
||||||
- "9997"
|
- "9997"
|
||||||
ports:
|
ports:
|
||||||
- "9997:9997"
|
- "9997:9997"
|
||||||
|
|
|
@ -2,24 +2,22 @@
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/pinpoint.config
|
#sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/pinpoint.config
|
||||||
sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint-env.config
|
sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
|
||||||
|
|
||||||
sed -i "/profiler.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config
|
sed -i "/profiler.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
|
||||||
sed -i "/profiler.collector.tcp.port=/ s/=.*/=${COLLECTOR_TCP_PORT}/" /pinpoint-agent/pinpoint.config
|
sed -i "/profiler.collector.tcp.port=/ s/=.*/=${COLLECTOR_TCP_PORT}/" /pinpoint-agent/pinpoint-root.config
|
||||||
sed -i "/profiler.collector.stat.port=/ s/=.*/=${COLLECTOR_STAT_PORT}/" /pinpoint-agent/pinpoint.config
|
sed -i "/profiler.collector.stat.port=/ s/=.*/=${COLLECTOR_STAT_PORT}/" /pinpoint-agent/pinpoint-root.config
|
||||||
sed -i "/profiler.collector.span.port=/ s/=.*/=${COLLECTOR_SPAN_PORT}/" /pinpoint-agent/pinpoint.config
|
sed -i "/profiler.collector.span.port=/ s/=.*/=${COLLECTOR_SPAN_PORT}/" /pinpoint-agent/pinpoint-root.config
|
||||||
|
|
||||||
sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config
|
#sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config
|
||||||
sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint-env.config
|
sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
|
||||||
sed -i "/profiler.transport.grpc.agent.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
|
sed -i "/profiler.transport.grpc.agent.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
|
||||||
sed -i "/profiler.transport.grpc.metadata.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
|
sed -i "/profiler.transport.grpc.metadata.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
|
||||||
sed -i "/profiler.transport.grpc.stat.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
|
sed -i "/profiler.transport.grpc.stat.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
|
||||||
sed -i "/profiler.transport.grpc.span.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint.config
|
sed -i "/profiler.transport.grpc.span.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
|
||||||
sed -i "/profiler.sampling.rate=/ s/=.*/=${PROFILER_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint-env.config
|
sed -i "/profiler.sampling.rate=/ s/=.*/=${PROFILER_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
|
||||||
|
|
||||||
sed -i "/level value=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j.xml
|
sed -i "/Root level=/ s/=.*/=\"${DEBUG_LEVEL}\"\/>/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j2.xml
|
||||||
|
|
||||||
#ln -s /pinpoint-agent /pinpoint-agent
|
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
|
@ -4,7 +4,7 @@ LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
|
||||||
|
|
||||||
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.4}
|
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.4}
|
||||||
|
|
||||||
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.war
|
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
|
||||||
|
|
||||||
RUN mkdir -p /pinpoint/config \
|
RUN mkdir -p /pinpoint/config \
|
||||||
&& mkdir -p /pinpoint/scripts
|
&& mkdir -p /pinpoint/scripts
|
||||||
|
@ -14,7 +14,8 @@ COPY /build/scripts/start-collector.sh /pinpoint/scripts/
|
||||||
#temporary line for local test
|
#temporary line for local test
|
||||||
#COPY /pinpoint-collector-boot-2.1.0-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
|
#COPY /pinpoint-collector-boot-2.1.0-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
|
||||||
|
|
||||||
RUN chmod a+x /pinpoint/scripts/start-collector.sh \
|
RUN apk --no-cache add curl \
|
||||||
|
&& chmod a+x /pinpoint/scripts/start-collector.sh \
|
||||||
&& chmod a+x /pinpoint/config/pinpoint-collector.properties \
|
&& chmod a+x /pinpoint/config/pinpoint-collector.properties \
|
||||||
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar
|
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar
|
||||||
|
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
exec java -jar /pinpoint/pinpoint-collector-boot.jar --spring.config.additional-location=/pinpoint/config/pinpoint-web.properties
|
exec java -jar /pinpoint/pinpoint-collector-boot.jar --spring.config.additional-location=/pinpoint/config/pinpoint-collector.properties
|
|
@ -15,8 +15,8 @@ services:
|
||||||
- /home/pinpoint/hbase
|
- /home/pinpoint/hbase
|
||||||
- /home/pinpoint/zookeeper
|
- /home/pinpoint/zookeeper
|
||||||
expose:
|
expose:
|
||||||
# zookeeper
|
# # zookeeper
|
||||||
- "2181"
|
# - "2181"
|
||||||
# HBase Master API port
|
# HBase Master API port
|
||||||
- "60000"
|
- "60000"
|
||||||
# HBase Master Web UI
|
# HBase Master Web UI
|
||||||
|
|
|
@ -13,7 +13,8 @@ COPY /build/scripts/start-web.sh /pinpoint/scripts/
|
||||||
#temporary line for local test
|
#temporary line for local test
|
||||||
#COPY /pinpoint-web-boot-2.1.0-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
|
#COPY /pinpoint-web-boot-2.1.0-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
|
||||||
|
|
||||||
RUN chmod a+x /pinpoint/scripts/start-web.sh \
|
RUN apk --no-cache add curl \
|
||||||
|
&& chmod a+x /pinpoint/scripts/start-web.sh \
|
||||||
&& chmod a+x /pinpoint/config/pinpoint-web.properties \
|
&& chmod a+x /pinpoint/config/pinpoint-web.properties \
|
||||||
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-web-boot.jar
|
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-web-boot.jar
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue