From 6f784d54e277e4e178f39f99fe1a769c0dde6151 Mon Sep 17 00:00:00 2001 From: ga-ram Date: Fri, 3 Mar 2023 17:26:09 +0900 Subject: [PATCH] Remove workaround settings --- docker-compose-metric-arm.yml | 65 ++++++++++++++++++++++++++++ docker-compose-metric.yml | 28 +++--------- pinpoint-collector/Dockerfile-metric | 2 +- pinpoint-web/Dockerfile-metric | 3 +- 4 files changed, 74 insertions(+), 24 deletions(-) create mode 100644 docker-compose-metric-arm.yml diff --git a/docker-compose-metric-arm.yml b/docker-compose-metric-arm.yml new file mode 100644 index 0000000..ebe761c --- /dev/null +++ b/docker-compose-metric-arm.yml @@ -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 \ No newline at end of file diff --git a/docker-compose-metric.yml b/docker-compose-metric.yml index eae3399..a9e7d7e 100644 --- a/docker-compose-metric.yml +++ b/docker-compose-metric.yml @@ -117,7 +117,7 @@ services: - pinpoint pinot-controller: - image: apachepinot/pinot:latest-arm64 + image: apachepinot/pinot:latest restart: unless-stopped command: StartController -zkAddress pinot-zoo depends_on: @@ -130,7 +130,7 @@ services: - pinpoint pinot-broker-0: - image: apachepinot/pinot:latest-arm64 + image: apachepinot/pinot:latest restart: unless-stopped command: StartBroker -zkAddress pinot-zoo depends_on: @@ -141,7 +141,7 @@ services: - pinpoint pinot-server-0: - image: apachepinot/pinot:latest-arm64 + image: apachepinot/pinot:latest restart: unless-stopped command: StartServer -zkAddress pinot-zoo depends_on: @@ -152,7 +152,7 @@ services: - pinpoint pinot-init: - image: apachepinot/pinot:latest-arm64 + image: apachepinot/pinot:latest restart: "no" entrypoint: > 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 && 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 && /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 dataTypeSchema.json -realtimeTableConfigFile dataTypeTable.json -controllerHost pinot-controller -controllerPort 9000 -exec" depends_on: - - pinot-server + - pinot-server-0 - pinpoint-kafka-init networks: - pinpoint @@ -197,18 +195,6 @@ services: - pinpoint-collector entrypoint: > sh -c " - echo ' - [[inputs.cpu]]\ - 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 && + curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/telegraf/pinpoint-telegraf.conf > telegraf.conf && + sed -i 's/127.0.0.1/pinpoint-collector/g' telegraf.conf && telegraf -config telegraf.conf" \ No newline at end of file diff --git a/pinpoint-collector/Dockerfile-metric b/pinpoint-collector/Dockerfile-metric index 3030d50..47bb34e 100644 --- a/pinpoint-collector/Dockerfile-metric +++ b/pinpoint-collector/Dockerfile-metric @@ -2,7 +2,7 @@ FROM openjdk:11.0.16-jre-slim-buster 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/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 \ && mkdir -p /pinpoint/scripts diff --git a/pinpoint-web/Dockerfile-metric b/pinpoint-web/Dockerfile-metric index 8a0f491..f5ad99c 100644 --- a/pinpoint-web/Dockerfile-metric +++ b/pinpoint-web/Dockerfile-metric @@ -1,8 +1,7 @@ FROM openjdk:11.0.16-jre-slim-buster 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/ga-ram/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-starter-boot-2.5.0.jar +ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-starter-boot-${PINPOINT_VERSION}.jar RUN mkdir -p /pinpoint/config \ && mkdir -p /pinpoint/scripts