Remove workaround settings

This commit is contained in:
ga-ram 2023-03-03 17:26:09 +09:00
parent 8e5462cfb7
commit 6f784d54e2
4 changed files with 74 additions and 24 deletions

View File

@ -0,0 +1,65 @@
version: "3.6"
services:
pinot-controller:
image: apachepinot/pinot:latest-arm64
restart: unless-stopped
command: StartController -zkAddress pinot-zoo
depends_on:
- pinot-zoo
expose:
- "9000"
ports:
- "9000:9000"
networks:
- pinpoint
pinot-broker-0:
image: apachepinot/pinot:latest-arm64
restart: unless-stopped
command: StartBroker -zkAddress pinot-zoo
depends_on:
- pinot-controller
expose:
- "8099"
networks:
- pinpoint
pinot-server-0:
image: apachepinot/pinot:latest-arm64
restart: unless-stopped
command: StartServer -zkAddress pinot-zoo
depends_on:
- pinot-broker-0
expose:
- "8098"
networks:
- pinpoint
pinot-init:
image: apachepinot/pinot:latest-arm64
restart: "no"
entrypoint: >
sh -c "
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-uriStat-table.json > uriStatTable.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-uriStat-schema.json > uriStatSchema.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-tag-table.json > tagTable.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-tag-schema.json > tagSchema.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-double-table.json > doubleTable.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-double-schema.json > doubleSchema.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-dataType-table.json > dataTypeTable.json &&
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-dataType-schema.json > dataTypeSchema.json &&
sed -i 's/localhost:19092/pinpoint-kafka:9092/g' uriStatTable.json tagTable.json doubleTable.json dataTypeTable.json &&
sleep 30 &&
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile uriStatSchema.json -realtimeTableConfigFile uriStatTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile tagSchema.json -realtimeTableConfigFile tagTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile doubleSchema.json -realtimeTableConfigFile doubleTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile dataTypeSchema.json -realtimeTableConfigFile dataTypeTable.json -controllerHost pinot-controller -controllerPort 9000 -exec"
depends_on:
- pinot-server-0
- pinpoint-kafka-init
networks:
- pinpoint

View File

@ -117,7 +117,7 @@ services:
- pinpoint - pinpoint
pinot-controller: pinot-controller:
image: apachepinot/pinot:latest-arm64 image: apachepinot/pinot:latest
restart: unless-stopped restart: unless-stopped
command: StartController -zkAddress pinot-zoo command: StartController -zkAddress pinot-zoo
depends_on: depends_on:
@ -130,7 +130,7 @@ services:
- pinpoint - pinpoint
pinot-broker-0: pinot-broker-0:
image: apachepinot/pinot:latest-arm64 image: apachepinot/pinot:latest
restart: unless-stopped restart: unless-stopped
command: StartBroker -zkAddress pinot-zoo command: StartBroker -zkAddress pinot-zoo
depends_on: depends_on:
@ -141,7 +141,7 @@ services:
- pinpoint - pinpoint
pinot-server-0: pinot-server-0:
image: apachepinot/pinot:latest-arm64 image: apachepinot/pinot:latest
restart: unless-stopped restart: unless-stopped
command: StartServer -zkAddress pinot-zoo command: StartServer -zkAddress pinot-zoo
depends_on: depends_on:
@ -152,7 +152,7 @@ services:
- pinpoint - pinpoint
pinot-init: pinot-init:
image: apachepinot/pinot:latest-arm64 image: apachepinot/pinot:latest
restart: "no" restart: "no"
entrypoint: > entrypoint: >
sh -c " sh -c "
@ -166,8 +166,6 @@ services:
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-dataType-schema.json > dataTypeSchema.json && curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-dataType-schema.json > dataTypeSchema.json &&
sed -i 's/localhost:19092/pinpoint-kafka:9092/g' uriStatTable.json tagTable.json doubleTable.json dataTypeTable.json && sed -i 's/localhost:19092/pinpoint-kafka:9092/g' uriStatTable.json tagTable.json doubleTable.json dataTypeTable.json &&
sed -i 's/uri-stat/url-stat/g' uriStatTable.json &&
sed -i '3,$$s/Double/DOUBLE/' doubleSchema.json &&
sleep 30 && sleep 30 &&
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile uriStatSchema.json -realtimeTableConfigFile uriStatTable.json -controllerHost pinot-controller -controllerPort 9000 -exec && /opt/pinot/bin/pinot-admin.sh AddTable -schemaFile uriStatSchema.json -realtimeTableConfigFile uriStatTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
@ -175,7 +173,7 @@ services:
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile doubleSchema.json -realtimeTableConfigFile doubleTable.json -controllerHost pinot-controller -controllerPort 9000 -exec && /opt/pinot/bin/pinot-admin.sh AddTable -schemaFile doubleSchema.json -realtimeTableConfigFile doubleTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile dataTypeSchema.json -realtimeTableConfigFile dataTypeTable.json -controllerHost pinot-controller -controllerPort 9000 -exec" /opt/pinot/bin/pinot-admin.sh AddTable -schemaFile dataTypeSchema.json -realtimeTableConfigFile dataTypeTable.json -controllerHost pinot-controller -controllerPort 9000 -exec"
depends_on: depends_on:
- pinot-server - pinot-server-0
- pinpoint-kafka-init - pinpoint-kafka-init
networks: networks:
- pinpoint - pinpoint
@ -197,18 +195,6 @@ services:
- pinpoint-collector - pinpoint-collector
entrypoint: > entrypoint: >
sh -c " sh -c "
echo ' curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/telegraf/pinpoint-telegraf.conf > telegraf.conf &&
[[inputs.cpu]]\ sed -i 's/127.0.0.1/pinpoint-collector/g' telegraf.conf &&
percpu = true\
totalcpu = true\
collect_cpu_time = false\
report_active = false\
[[outputs.http]]\
url = \"http://pinpoint-collector:15200/telegraf\"\
data_format = \"json\"\
[outputs.http.headers]\
hostGroupName = \"pinpoint-docker\"\
Content-Type = \"application/json\"\' > telegraf.conf &&
cat telegraf.conf &&
telegraf -config telegraf.conf" telegraf -config telegraf.conf"

View File

@ -2,7 +2,7 @@ FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
#ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-${PINPOINT_VERSION}.jar #ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-${PINPOINT_VERSION}.jar
ARG INSTALL_URL=https://github.com/ga-ram/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-2.5.0.jar ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-${PINPOINT_VERSION}.jar
RUN mkdir -p /pinpoint/config \ RUN mkdir -p /pinpoint/config \
&& mkdir -p /pinpoint/scripts && mkdir -p /pinpoint/scripts

View File

@ -1,8 +1,7 @@
FROM openjdk:11.0.16-jre-slim-buster FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
#ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-starter-boot-${PINPOINT_VERSION}.jar ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-starter-boot-${PINPOINT_VERSION}.jar
ARG INSTALL_URL=https://github.com/ga-ram/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-starter-boot-2.5.0.jar
RUN mkdir -p /pinpoint/config \ RUN mkdir -p /pinpoint/config \
&& mkdir -p /pinpoint/scripts && mkdir -p /pinpoint/scripts