From f92e4798ce39d49a1d9f486a693218357db5a465 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Wed, 25 May 2022 18:06:14 +0530 Subject: [PATCH] =?UTF-8?q?refactor:=20=E2=9A=B0=EF=B8=8F=20Remove=20depre?= =?UTF-8?q?cated=20flattner=20and=20Druid=20leftover=20files=20(#1194)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: ⚰️ Remove flattner from Makefile Signed-off-by: Prashant Shahi * refactor: ⚰️ Remove deprecated Druid leftover files Signed-off-by: Prashant Shahi Co-authored-by: Pranay Prateek --- Makefile | 25 +- .../docker-compose-tiny.yaml | 273 ------------------ .../druid-kafka-setup/docker-compose.yaml | 269 ----------------- .../druid-jobs/retention-spec.json | 1 - .../druid-jobs/supervisor-spec.json | 69 ----- .../environment_small/broker | 53 ---- .../environment_small/coordinator | 52 ---- .../environment_small/historical | 53 ---- .../environment_small/middlemanager | 53 ---- .../environment_small/router | 52 ---- .../druid-kafka-setup/environment_tiny/broker | 52 ---- .../druid-kafka-setup/environment_tiny/common | 26 -- .../environment_tiny/coordinator | 49 ---- .../environment_tiny/historical | 49 ---- .../environment_tiny/middlemanager | 50 ---- .../druid-kafka-setup/environment_tiny/router | 49 ---- .../otel-collector-config.yaml | 51 ---- deploy/install.sh | 3 - pkg/query-service/app/interface.go | 1 - pkg/query-service/app/server.go | 6 +- pkg/query-service/main.go | 4 - 21 files changed, 2 insertions(+), 1238 deletions(-) delete mode 100644 deploy/docker/druid-kafka-setup/docker-compose-tiny.yaml delete mode 100644 deploy/docker/druid-kafka-setup/docker-compose.yaml delete mode 100644 deploy/docker/druid-kafka-setup/druid-jobs/retention-spec.json delete mode 100644 deploy/docker/druid-kafka-setup/druid-jobs/supervisor-spec.json delete mode 100644 deploy/docker/druid-kafka-setup/environment_small/broker delete mode 100644 deploy/docker/druid-kafka-setup/environment_small/coordinator delete mode 100644 deploy/docker/druid-kafka-setup/environment_small/historical delete mode 100644 deploy/docker/druid-kafka-setup/environment_small/middlemanager delete mode 100644 deploy/docker/druid-kafka-setup/environment_small/router delete mode 100644 deploy/docker/druid-kafka-setup/environment_tiny/broker delete mode 100644 deploy/docker/druid-kafka-setup/environment_tiny/common delete mode 100644 deploy/docker/druid-kafka-setup/environment_tiny/coordinator delete mode 100644 deploy/docker/druid-kafka-setup/environment_tiny/historical delete mode 100644 deploy/docker/druid-kafka-setup/environment_tiny/middlemanager delete mode 100644 deploy/docker/druid-kafka-setup/environment_tiny/router delete mode 100644 deploy/docker/druid-kafka-setup/otel-collector-config.yaml diff --git a/Makefile b/Makefile index 8dc880a971..ac93167fa7 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,6 @@ BUILD_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) # Internal variables or constants. FRONTEND_DIRECTORY ?= frontend -FLATTENER_DIRECTORY ?= pkg/processors/flattener QUERY_SERVICE_DIRECTORY ?= pkg/query-service STANDALONE_DIRECTORY ?= deploy/docker/clickhouse-setup SWARM_DIRECTORY ?= deploy/docker-swarm/clickhouse-setup @@ -20,7 +19,6 @@ DOCKER_TAG ?= latest FRONTEND_DOCKER_IMAGE ?= frontend QUERY_SERVICE_DOCKER_IMAGE ?= query-service -FLATTERNER_DOCKER_IMAGE ?= flattener-processor # Build-time Go variables PACKAGE?=go.signoz.io/query-service @@ -31,7 +29,7 @@ gitBranch=${PACKAGE}/version.gitBranch LD_FLAGS="-X ${buildHash}=${BUILD_HASH} -X ${buildTime}=${BUILD_TIME} -X ${buildVersion}=${BUILD_VERSION} -X ${gitBranch}=${BUILD_BRANCH}" -all: build-push-frontend build-push-query-service build-push-flattener +all: build-push-frontend build-push-query-service # Steps to build and push docker image of frontend .PHONY: build-frontend-amd64 build-push-frontend # Step to build docker image of frontend in amd64 (used in build pipeline) @@ -73,27 +71,6 @@ build-push-query-service: --push --platform linux/arm64,linux/amd64 --build-arg LD_FLAGS=$(LD_FLAGS) \ --tag $(REPONAME)/$(QUERY_SERVICE_DOCKER_IMAGE):$(DOCKER_TAG) . -# Steps to build and push docker image of flattener -.PHONY: build-flattener-amd64 build-push-flattener -# Step to build docker image of flattener in amd64 (used in build pipeline) -build-flattener-amd64: - @echo "------------------" - @echo "--> Building flattener docker image for amd64" - @echo "------------------" - @cd $(FLATTENER_DIRECTORY) && \ - docker build -f Dockerfile --no-cache -t $(REPONAME)/$(FLATTERNER_DOCKER_IMAGE):$(DOCKER_TAG) \ - --build-arg TARGETPLATFORM="linux/amd64" . - -# Step to build and push docker image of flattener in amd64 (used in push pipeline) -build-push-flattener: - @echo "------------------" - @echo "--> Building and pushing flattener docker image" - @echo "------------------" - @cd $(FLATTENER_DIRECTORY) && \ - docker buildx build --file Dockerfile --progress plane \ - --no-cache --push --platform linux/arm64,linux/amd64 \ - --tag $(REPONAME)/$(FLATTERNER_DOCKER_IMAGE):$(DOCKER_TAG) . - dev-setup: mkdir -p /var/lib/signoz sqlite3 /var/lib/signoz/signoz.db "VACUUM"; diff --git a/deploy/docker/druid-kafka-setup/docker-compose-tiny.yaml b/deploy/docker/druid-kafka-setup/docker-compose-tiny.yaml deleted file mode 100644 index 20ce14e822..0000000000 --- a/deploy/docker/druid-kafka-setup/docker-compose-tiny.yaml +++ /dev/null @@ -1,273 +0,0 @@ -version: "2.4" - -volumes: - metadata_data: {} - middle_var: {} - historical_var: {} - broker_var: {} - coordinator_var: {} - router_var: {} - -# If able to connect to kafka but not able to write to topic otlp_spans look into below link -# https://github.com/wurstmeister/kafka-docker/issues/409#issuecomment-428346707 - -services: - - zookeeper: - image: bitnami/zookeeper:3.6.2-debian-10-r100 - ports: - - "2181:2181" - environment: - - ALLOW_ANONYMOUS_LOGIN=yes - - - kafka: - # image: wurstmeister/kafka - image: bitnami/kafka:2.7.0-debian-10-r1 - ports: - - "9092:9092" - hostname: kafka - environment: - KAFKA_ADVERTISED_HOST_NAME: kafka - KAFKA_ADVERTISED_PORT: 9092 - KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 - ALLOW_PLAINTEXT_LISTENER: 'yes' - KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: 'true' - KAFKA_TOPICS: 'otlp_spans:1:1,flattened_spans:1:1' - - healthcheck: - # test: ["CMD", "kafka-topics.sh", "--create", "--topic", "otlp_spans", "--zookeeper", "zookeeper:2181"] - test: ["CMD", "kafka-topics.sh", "--list", "--zookeeper", "zookeeper:2181"] - interval: 30s - timeout: 10s - retries: 10 - depends_on: - - zookeeper - - postgres: - container_name: postgres - image: postgres:latest - volumes: - - metadata_data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=FoolishPassword - - POSTGRES_USER=druid - - POSTGRES_DB=druid - - coordinator: - image: apache/druid:0.20.0 - container_name: coordinator - volumes: - - ./storage:/opt/data - - coordinator_var:/opt/druid/var - depends_on: - - zookeeper - - postgres - ports: - - "8081:8081" - command: - - coordinator - env_file: - - environment_tiny/coordinator - - environment_tiny/common - - broker: - image: apache/druid:0.20.0 - container_name: broker - volumes: - - broker_var:/opt/druid/var - depends_on: - - zookeeper - - postgres - - coordinator - ports: - - "8082:8082" - command: - - broker - env_file: - - environment_tiny/broker - - environment_tiny/common - - historical: - image: apache/druid:0.20.0 - container_name: historical - volumes: - - ./storage:/opt/data - - historical_var:/opt/druid/var - depends_on: - - zookeeper - - postgres - - coordinator - ports: - - "8083:8083" - command: - - historical - env_file: - - environment_tiny/historical - - environment_tiny/common - - middlemanager: - image: apache/druid:0.20.0 - container_name: middlemanager - volumes: - - ./storage:/opt/data - - middle_var:/opt/druid/var - depends_on: - - zookeeper - - postgres - - coordinator - ports: - - "8091:8091" - command: - - middleManager - env_file: - - environment_tiny/middlemanager - - environment_tiny/common - - router: - image: apache/druid:0.20.0 - container_name: router - volumes: - - router_var:/opt/druid/var - depends_on: - - zookeeper - - postgres - - coordinator - ports: - - "8888:8888" - command: - - router - env_file: - - environment_tiny/router - - environment_tiny/common - healthcheck: - test: ["CMD", "wget", "--spider", "-q", "http://router:8888/druid/coordinator/v1/datasources/flattened_spans"] - interval: 30s - timeout: 5s - retries: 5 - - flatten-processor: - image: signoz/flattener-processor:0.4.0 - container_name: flattener-processor - - depends_on: - - kafka - - otel-collector - ports: - - "8000:8000" - - environment: - - KAFKA_BROKER=kafka:9092 - - KAFKA_INPUT_TOPIC=otlp_spans - - KAFKA_OUTPUT_TOPIC=flattened_spans - - - query-service: - image: signoz.docker.scarf.sh/signoz/query-service:0.4.1 - container_name: query-service - - depends_on: - router: - condition: service_healthy - ports: - - "8080:8080" - volumes: - - ../dashboards:/root/config/dashboards - - ./data/signoz/:/var/lib/signoz/ - environment: - - DruidClientUrl=http://router:8888 - - DruidDatasource=flattened_spans - - STORAGE=druid - - POSTHOG_API_KEY=H-htDCae7CR3RV57gUzmol6IAKtm5IMCvbcm_fwnL-w - - GODEBUG=netdns=go - - frontend: - image: signoz/frontend:0.4.1 - container_name: frontend - - depends_on: - - query-service - links: - - "query-service" - ports: - - "3301:3301" - volumes: - - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf - - create-supervisor: - image: theithollow/hollowapp-blog:curl - container_name: create-supervisor - command: - - /bin/sh - - -c - - "curl -X POST -H 'Content-Type: application/json' -d @/app/supervisor-spec.json http://router:8888/druid/indexer/v1/supervisor" - - depends_on: - - router - restart: on-failure:6 - - volumes: - - ./druid-jobs/supervisor-spec.json:/app/supervisor-spec.json - - - set-retention: - image: theithollow/hollowapp-blog:curl - container_name: set-retention - command: - - /bin/sh - - -c - - "curl -X POST -H 'Content-Type: application/json' -d @/app/retention-spec.json http://router:8888/druid/coordinator/v1/rules/flattened_spans" - - depends_on: - - router - restart: on-failure:6 - volumes: - - ./druid-jobs/retention-spec.json:/app/retention-spec.json - - otel-collector: - image: otel/opentelemetry-collector:0.18.0 - command: ["--config=/etc/otel-collector-config.yaml", "--mem-ballast-size-mib=683"] - volumes: - - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml - ports: - - "1777:1777" # pprof extension - - "8887:8888" # Prometheus metrics exposed by the agent - - "14268:14268" # Jaeger receiver - - "55678" # OpenCensus receiver - - "55680:55680" # OTLP HTTP/2.0 legacy port - - "55681:55681" # OTLP HTTP/1.0 receiver - - "4317:4317" # OTLP GRPC receiver - - "55679:55679" # zpages extension - - "13133" # health_check - depends_on: - kafka: - condition: service_healthy - - - hotrod: - image: jaegertracing/example-hotrod:latest - container_name: hotrod - ports: - - "9000:8080" - command: ["all"] - environment: - - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces - - - load-hotrod: - image: "grubykarol/locust:1.2.3-python3.9-alpine3.12" - container_name: load-hotrod - hostname: load-hotrod - ports: - - "8089:8089" - environment: - ATTACKED_HOST: http://hotrod:8080 - LOCUST_MODE: standalone - NO_PROXY: standalone - TASK_DELAY_FROM: 5 - TASK_DELAY_TO: 30 - QUIET_MODE: "${QUIET_MODE:-false}" - LOCUST_OPTS: "--headless -u 10 -r 1" - volumes: - - ../common/locust-scripts:/locust - diff --git a/deploy/docker/druid-kafka-setup/docker-compose.yaml b/deploy/docker/druid-kafka-setup/docker-compose.yaml deleted file mode 100644 index c47823492f..0000000000 --- a/deploy/docker/druid-kafka-setup/docker-compose.yaml +++ /dev/null @@ -1,269 +0,0 @@ -version: "2.4" - -volumes: - metadata_data: {} - middle_var: {} - historical_var: {} - broker_var: {} - coordinator_var: {} - router_var: {} - -# If able to connect to kafka but not able to write to topic otlp_spans look into below link -# https://github.com/wurstmeister/kafka-docker/issues/409#issuecomment-428346707 - -services: - - zookeeper: - image: bitnami/zookeeper:3.6.2-debian-10-r100 - ports: - - "2181:2181" - environment: - - ALLOW_ANONYMOUS_LOGIN=yes - - - kafka: - # image: wurstmeister/kafka - image: bitnami/kafka:2.7.0-debian-10-r1 - ports: - - "9092:9092" - hostname: kafka - environment: - KAFKA_ADVERTISED_HOST_NAME: kafka - KAFKA_ADVERTISED_PORT: 9092 - KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 - ALLOW_PLAINTEXT_LISTENER: 'yes' - KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: 'true' - KAFKA_TOPICS: 'otlp_spans:1:1,flattened_spans:1:1' - - healthcheck: - # test: ["CMD", "kafka-topics.sh", "--create", "--topic", "otlp_spans", "--zookeeper", "zookeeper:2181"] - test: ["CMD", "kafka-topics.sh", "--list", "--zookeeper", "zookeeper:2181"] - interval: 30s - timeout: 10s - retries: 10 - depends_on: - - zookeeper - - postgres: - container_name: postgres - image: postgres:latest - volumes: - - metadata_data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=FoolishPassword - - POSTGRES_USER=druid - - POSTGRES_DB=druid - - coordinator: - image: apache/druid:0.20.0 - container_name: coordinator - volumes: - - ./storage:/opt/druid/deepStorage - - coordinator_var:/opt/druid/data - depends_on: - - zookeeper - - postgres - ports: - - "8081:8081" - command: - - coordinator - env_file: - - environment_small/coordinator - - broker: - image: apache/druid:0.20.0 - container_name: broker - volumes: - - broker_var:/opt/druid/data - depends_on: - - zookeeper - - postgres - - coordinator - ports: - - "8082:8082" - command: - - broker - env_file: - - environment_small/broker - - historical: - image: apache/druid:0.20.0 - container_name: historical - volumes: - - ./storage:/opt/druid/deepStorage - - historical_var:/opt/druid/data - depends_on: - - zookeeper - - postgres - - coordinator - ports: - - "8083:8083" - command: - - historical - env_file: - - environment_small/historical - - middlemanager: - image: apache/druid:0.20.0 - container_name: middlemanager - volumes: - - ./storage:/opt/druid/deepStorage - - middle_var:/opt/druid/data - depends_on: - - zookeeper - - postgres - - coordinator - ports: - - "8091:8091" - command: - - middleManager - env_file: - - environment_small/middlemanager - - router: - image: apache/druid:0.20.0 - container_name: router - volumes: - - router_var:/opt/druid/data - depends_on: - - zookeeper - - postgres - - coordinator - ports: - - "8888:8888" - command: - - router - env_file: - - environment_small/router - healthcheck: - test: ["CMD", "wget", "--spider", "-q", "http://router:8888/druid/coordinator/v1/datasources/flattened_spans"] - interval: 30s - timeout: 5s - retries: 5 - - flatten-processor: - image: signoz/flattener-processor:0.4.0 - container_name: flattener-processor - - depends_on: - - kafka - - otel-collector - ports: - - "8000:8000" - - environment: - - KAFKA_BROKER=kafka:9092 - - KAFKA_INPUT_TOPIC=otlp_spans - - KAFKA_OUTPUT_TOPIC=flattened_spans - - - query-service: - image: signoz.docker.scarf.sh/signoz/query-service:0.4.1 - container_name: query-service - - depends_on: - router: - condition: service_healthy - ports: - - "8080:8080" - - volumes: - - ../dashboards:/root/config/dashboards - - ./data/signoz/:/var/lib/signoz/ - environment: - - DruidClientUrl=http://router:8888 - - DruidDatasource=flattened_spans - - STORAGE=druid - - POSTHOG_API_KEY=H-htDCae7CR3RV57gUzmol6IAKtm5IMCvbcm_fwnL-w - - GODEBUG=netdns=go - - frontend: - image: signoz/frontend:0.4.1 - container_name: frontend - - depends_on: - - query-service - links: - - "query-service" - ports: - - "3301:3301" - volumes: - - ./nginx-config.conf:/etc/nginx/conf.d/default.conf - - create-supervisor: - image: theithollow/hollowapp-blog:curl - container_name: create-supervisor - command: - - /bin/sh - - -c - - "curl -X POST -H 'Content-Type: application/json' -d @/app/supervisor-spec.json http://router:8888/druid/indexer/v1/supervisor" - - depends_on: - - router - restart: on-failure:6 - - volumes: - - ./druid-jobs/supervisor-spec.json:/app/supervisor-spec.json - - - set-retention: - image: theithollow/hollowapp-blog:curl - container_name: set-retention - command: - - /bin/sh - - -c - - "curl -X POST -H 'Content-Type: application/json' -d @/app/retention-spec.json http://router:8888/druid/coordinator/v1/rules/flattened_spans" - - depends_on: - - router - restart: on-failure:6 - volumes: - - ./druid-jobs/retention-spec.json:/app/retention-spec.json - - otel-collector: - image: otel/opentelemetry-collector:0.18.0 - command: ["--config=/etc/otel-collector-config.yaml", "--mem-ballast-size-mib=683"] - volumes: - - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml - ports: - - "1777:1777" # pprof extension - - "8887:8888" # Prometheus metrics exposed by the agent - - "14268:14268" # Jaeger receiver - - "55678" # OpenCensus receiver - - "55680:55680" # OTLP HTTP/2.0 leagcy grpc receiver - - "55681:55681" # OTLP HTTP/1.0 receiver - - "4317:4317" # OTLP GRPC receiver - - "55679:55679" # zpages extension - - "13133" # health_check - depends_on: - kafka: - condition: service_healthy - - - hotrod: - image: jaegertracing/example-hotrod:latest - container_name: hotrod - ports: - - "9000:8080" - command: ["all"] - environment: - - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces - - - load-hotrod: - image: "grubykarol/locust:1.2.3-python3.9-alpine3.12" - container_name: load-hotrod - hostname: load-hotrod - ports: - - "8089:8089" - environment: - ATTACKED_HOST: http://hotrod:8080 - LOCUST_MODE: standalone - NO_PROXY: standalone - TASK_DELAY_FROM: 5 - TASK_DELAY_TO: 30 - QUIET_MODE: "${QUIET_MODE:-false}" - LOCUST_OPTS: "--headless -u 10 -r 1" - volumes: - - ./locust-scripts:/locust - diff --git a/deploy/docker/druid-kafka-setup/druid-jobs/retention-spec.json b/deploy/docker/druid-kafka-setup/druid-jobs/retention-spec.json deleted file mode 100644 index b4b0ebb426..0000000000 --- a/deploy/docker/druid-kafka-setup/druid-jobs/retention-spec.json +++ /dev/null @@ -1 +0,0 @@ -[{"period":"P3D","includeFuture":true,"tieredReplicants":{"_default_tier":1},"type":"loadByPeriod"},{"type":"dropForever"}] \ No newline at end of file diff --git a/deploy/docker/druid-kafka-setup/druid-jobs/supervisor-spec.json b/deploy/docker/druid-kafka-setup/druid-jobs/supervisor-spec.json deleted file mode 100644 index 3528826159..0000000000 --- a/deploy/docker/druid-kafka-setup/druid-jobs/supervisor-spec.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "type": "kafka", - "dataSchema": { - "dataSource": "flattened_spans", - "parser": { - "type": "string", - "parseSpec": { - "format": "json", - "timestampSpec": { - "column": "StartTimeUnixNano", - "format": "nano" - }, - "dimensionsSpec": { - "dimensions": [ - "TraceId", - "SpanId", - "ParentSpanId", - "Name", - "ServiceName", - "References", - "Tags", - "ExternalHttpMethod", - "ExternalHttpUrl", - "Component", - "DBSystem", - "DBName", - "DBOperation", - "PeerService", - { - "type": "string", - "name": "TagsKeys", - "multiValueHandling": "ARRAY" - }, - { - "type": "string", - "name": "TagsValues", - "multiValueHandling": "ARRAY" - }, - { "name": "DurationNano", "type": "Long" }, - { "name": "Kind", "type": "int" }, - { "name": "StatusCode", "type": "int" } - ] - } - } - }, - "metricsSpec" : [ - { "type": "quantilesDoublesSketch", "name": "QuantileDuration", "fieldName": "DurationNano" } - ], - "granularitySpec": { - "type": "uniform", - "segmentGranularity": "DAY", - "queryGranularity": "NONE", - "rollup": false - } - }, - "tuningConfig": { - "type": "kafka", - "reportParseExceptions": true - }, - "ioConfig": { - "topic": "flattened_spans", - "replicas": 1, - "taskDuration": "PT20M", - "completionTimeout": "PT30M", - "consumerProperties": { - "bootstrap.servers": "kafka:9092" - } - } - } diff --git a/deploy/docker/druid-kafka-setup/environment_small/broker b/deploy/docker/druid-kafka-setup/environment_small/broker deleted file mode 100644 index 37d3ef37b4..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_small/broker +++ /dev/null @@ -1,53 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Java tuning -DRUID_XMX=512m -DRUID_XMS=512m -DRUID_MAXNEWSIZE=256m -DRUID_NEWSIZE=256m -DRUID_MAXDIRECTMEMORYSIZE=768m - -druid_emitter_logging_logLevel=debug - -druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - -druid_zk_service_host=zookeeper - -druid_metadata_storage_host= -druid_metadata_storage_type=postgresql -druid_metadata_storage_connector_connectURI=jdbc:postgresql://postgres:5432/druid -druid_metadata_storage_connector_user=druid -druid_metadata_storage_connector_password=FoolishPassword - -druid_coordinator_balancer_strategy=cachingCost - -druid_indexer_runner_javaOptsArray=["-server", "-Xms512m", "-Xmx512m", "-XX:MaxDirectMemorySize=768m", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] -druid_indexer_fork_property_druid_processing_buffer_sizeBytes=25000000 -druid_processing_buffer_sizeBytes=100MiB - -druid_storage_type=local -druid_storage_storageDirectory=/opt/druid/deepStorage -druid_indexer_logs_type=file -druid_indexer_logs_directory=/opt/druid/data/indexing-logs - -druid_processing_numThreads=1 -druid_processing_numMergeBuffers=2 - -DRUID_LOG4J= \ No newline at end of file diff --git a/deploy/docker/druid-kafka-setup/environment_small/coordinator b/deploy/docker/druid-kafka-setup/environment_small/coordinator deleted file mode 100644 index 476e6dcdef..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_small/coordinator +++ /dev/null @@ -1,52 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Java tuning -DRUID_XMX=64m -DRUID_XMS=64m -DRUID_MAXNEWSIZE=256m -DRUID_NEWSIZE=256m -DRUID_MAXDIRECTMEMORYSIZE=400m - -druid_emitter_logging_logLevel=debug - -druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - -druid_zk_service_host=zookeeper - -druid_metadata_storage_host= -druid_metadata_storage_type=postgresql -druid_metadata_storage_connector_connectURI=jdbc:postgresql://postgres:5432/druid -druid_metadata_storage_connector_user=druid -druid_metadata_storage_connector_password=FoolishPassword - -druid_coordinator_balancer_strategy=cachingCost - -druid_indexer_runner_javaOptsArray=["-server", "-Xms64m", "-Xmx64m", "-XX:MaxDirectMemorySize=400m", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] -druid_indexer_fork_property_druid_processing_buffer_sizeBytes=25000000 - -druid_storage_type=local -druid_storage_storageDirectory=/opt/druid/deepStorage -druid_indexer_logs_type=file -druid_indexer_logs_directory=/opt/druid/data/indexing-logs - -druid_processing_numThreads=1 -druid_processing_numMergeBuffers=2 - -DRUID_LOG4J= \ No newline at end of file diff --git a/deploy/docker/druid-kafka-setup/environment_small/historical b/deploy/docker/druid-kafka-setup/environment_small/historical deleted file mode 100644 index c614644bca..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_small/historical +++ /dev/null @@ -1,53 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Java tuning -DRUID_XMX=512m -DRUID_XMS=512m -DRUID_MAXNEWSIZE=256m -DRUID_NEWSIZE=256m -DRUID_MAXDIRECTMEMORYSIZE=1280m - -druid_emitter_logging_logLevel=debug - -druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - -druid_zk_service_host=zookeeper - -druid_metadata_storage_host= -druid_metadata_storage_type=postgresql -druid_metadata_storage_connector_connectURI=jdbc:postgresql://postgres:5432/druid -druid_metadata_storage_connector_user=druid -druid_metadata_storage_connector_password=FoolishPassword - -druid_coordinator_balancer_strategy=cachingCost - -druid_indexer_runner_javaOptsArray=["-server", "-Xms512m", "-Xmx512m", "-XX:MaxDirectMemorySize=1280m", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] -druid_indexer_fork_property_druid_processing_buffer_sizeBytes=25000000 -druid_processing_buffer_sizeBytes=200MiB - -druid_storage_type=local -druid_storage_storageDirectory=/opt/druid/deepStorage -druid_indexer_logs_type=file -druid_indexer_logs_directory=/opt/druid/data/indexing-logs - -druid_processing_numThreads=2 -druid_processing_numMergeBuffers=2 - -DRUID_LOG4J= \ No newline at end of file diff --git a/deploy/docker/druid-kafka-setup/environment_small/middlemanager b/deploy/docker/druid-kafka-setup/environment_small/middlemanager deleted file mode 100644 index a5ae2dbee8..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_small/middlemanager +++ /dev/null @@ -1,53 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Java tuning -DRUID_XMX=1g -DRUID_XMS=1g -DRUID_MAXNEWSIZE=256m -DRUID_NEWSIZE=256m -DRUID_MAXDIRECTMEMORYSIZE=2g - -druid_emitter_logging_logLevel=debug - -druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - -druid_zk_service_host=zookeeper - -druid_metadata_storage_host= -druid_metadata_storage_type=postgresql -druid_metadata_storage_connector_connectURI=jdbc:postgresql://postgres:5432/druid -druid_metadata_storage_connector_user=druid -druid_metadata_storage_connector_password=FoolishPassword - -druid_coordinator_balancer_strategy=cachingCost - -druid_indexer_runner_javaOptsArray=["-server", "-Xms1g", "-Xmx1g", "-XX:MaxDirectMemorySize=2g", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] -druid_indexer_fork_property_druid_processing_buffer_sizeBytes=25000000 -druid_processing_buffer_sizeBytes=200MiB - -druid_storage_type=local -druid_storage_storageDirectory=/opt/druid/deepStorage -druid_indexer_logs_type=file -druid_indexer_logs_directory=/opt/druid/data/indexing-logs - -druid_processing_numThreads=2 -druid_processing_numMergeBuffers=2 - -DRUID_LOG4J= \ No newline at end of file diff --git a/deploy/docker/druid-kafka-setup/environment_small/router b/deploy/docker/druid-kafka-setup/environment_small/router deleted file mode 100644 index 3e349616fe..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_small/router +++ /dev/null @@ -1,52 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Java tuning -DRUID_XMX=128m -DRUID_XMS=128m -DRUID_MAXNEWSIZE=256m -DRUID_NEWSIZE=256m -DRUID_MAXDIRECTMEMORYSIZE=128m - -druid_emitter_logging_logLevel=debug - -druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - -druid_zk_service_host=zookeeper - -druid_metadata_storage_host= -druid_metadata_storage_type=postgresql -druid_metadata_storage_connector_connectURI=jdbc:postgresql://postgres:5432/druid -druid_metadata_storage_connector_user=druid -druid_metadata_storage_connector_password=FoolishPassword - -druid_coordinator_balancer_strategy=cachingCost - -druid_indexer_runner_javaOptsArray=["-server", "-Xms128m", "-Xmx128m", "-XX:MaxDirectMemorySize=128m", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] -druid_indexer_fork_property_druid_processing_buffer_sizeBytes=25000000 - -druid_storage_type=local -druid_storage_storageDirectory=/opt/druid/deepStorage -druid_indexer_logs_type=file -druid_indexer_logs_directory=/opt/druid/data/indexing-logs - -druid_processing_numThreads=1 -druid_processing_numMergeBuffers=2 - -DRUID_LOG4J= \ No newline at end of file diff --git a/deploy/docker/druid-kafka-setup/environment_tiny/broker b/deploy/docker/druid-kafka-setup/environment_tiny/broker deleted file mode 100644 index c232d64b4b..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_tiny/broker +++ /dev/null @@ -1,52 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Java tuning -DRUID_XMX=512m -DRUID_XMS=512m -DRUID_MAXNEWSIZE=256m -DRUID_NEWSIZE=256m -DRUID_MAXDIRECTMEMORYSIZE=400m - -druid_emitter_logging_logLevel=debug - -# druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - - - - -druid_zk_service_host=zookeeper - -druid_metadata_storage_host= -druid_metadata_storage_type=postgresql -druid_metadata_storage_connector_connectURI=jdbc:postgresql://postgres:5432/druid -druid_metadata_storage_connector_user=druid -druid_metadata_storage_connector_password=FoolishPassword - -druid_coordinator_balancer_strategy=cachingCost - -druid_indexer_runner_javaOptsArray=["-server", "-Xms512m", "-Xmx512m", "-XX:MaxDirectMemorySize=400m", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] -druid_indexer_fork_property_druid_processing_buffer_sizeBytes=25000000 -druid_processing_buffer_sizeBytes=50MiB - - -druid_processing_numThreads=1 -druid_processing_numMergeBuffers=2 - -DRUID_LOG4J= diff --git a/deploy/docker/druid-kafka-setup/environment_tiny/common b/deploy/docker/druid-kafka-setup/environment_tiny/common deleted file mode 100644 index 005290157e..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_tiny/common +++ /dev/null @@ -1,26 +0,0 @@ -# For S3 storage - -# druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service", "druid-s3-extensions"] - - -# druid_storage_type=s3 -# druid_storage_bucket= -# druid_storage_baseKey=druid/segments - -# AWS_ACCESS_KEY_ID= -# AWS_SECRET_ACCESS_KEY= -# AWS_REGION= - -# druid_indexer_logs_type=s3 -# druid_indexer_logs_s3Bucket= -# druid_indexer_logs_s3Prefix=druid/indexing-logs - -# ----------------------------------------------------------- -# For local storage -druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - -druid_storage_type=local -druid_storage_storageDirectory=/opt/data/segments -druid_indexer_logs_type=file -druid_indexer_logs_directory=/opt/data/indexing-logs - diff --git a/deploy/docker/druid-kafka-setup/environment_tiny/coordinator b/deploy/docker/druid-kafka-setup/environment_tiny/coordinator deleted file mode 100644 index d5b9a4367f..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_tiny/coordinator +++ /dev/null @@ -1,49 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Java tuning -DRUID_XMX=64m -DRUID_XMS=64m -DRUID_MAXNEWSIZE=256m -DRUID_NEWSIZE=256m -DRUID_MAXDIRECTMEMORYSIZE=400m - -druid_emitter_logging_logLevel=debug - -# druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - - -druid_zk_service_host=zookeeper - -druid_metadata_storage_host= -druid_metadata_storage_type=postgresql -druid_metadata_storage_connector_connectURI=jdbc:postgresql://postgres:5432/druid -druid_metadata_storage_connector_user=druid -druid_metadata_storage_connector_password=FoolishPassword - -druid_coordinator_balancer_strategy=cachingCost - -druid_indexer_runner_javaOptsArray=["-server", "-Xms64m", "-Xmx64m", "-XX:MaxDirectMemorySize=400m", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] -druid_indexer_fork_property_druid_processing_buffer_sizeBytes=25000000 - - -druid_processing_numThreads=1 -druid_processing_numMergeBuffers=2 - -DRUID_LOG4J= diff --git a/deploy/docker/druid-kafka-setup/environment_tiny/historical b/deploy/docker/druid-kafka-setup/environment_tiny/historical deleted file mode 100644 index cef8b92414..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_tiny/historical +++ /dev/null @@ -1,49 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Java tuning -DRUID_XMX=512m -DRUID_XMS=512m -DRUID_MAXNEWSIZE=256m -DRUID_NEWSIZE=256m -DRUID_MAXDIRECTMEMORYSIZE=400m - -druid_emitter_logging_logLevel=debug - -# druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - - -druid_zk_service_host=zookeeper - -druid_metadata_storage_host= -druid_metadata_storage_type=postgresql -druid_metadata_storage_connector_connectURI=jdbc:postgresql://postgres:5432/druid -druid_metadata_storage_connector_user=druid -druid_metadata_storage_connector_password=FoolishPassword - -druid_coordinator_balancer_strategy=cachingCost - -druid_indexer_runner_javaOptsArray=["-server", "-Xms512m", "-Xmx512m", "-XX:MaxDirectMemorySize=400m", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] -druid_indexer_fork_property_druid_processing_buffer_sizeBytes=25000000 -druid_processing_buffer_sizeBytes=50MiB - -druid_processing_numThreads=1 -druid_processing_numMergeBuffers=2 - -DRUID_LOG4J= diff --git a/deploy/docker/druid-kafka-setup/environment_tiny/middlemanager b/deploy/docker/druid-kafka-setup/environment_tiny/middlemanager deleted file mode 100644 index 21abd6fe37..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_tiny/middlemanager +++ /dev/null @@ -1,50 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Java tuning -DRUID_XMX=64m -DRUID_XMS=64m -DRUID_MAXNEWSIZE=256m -DRUID_NEWSIZE=256m -DRUID_MAXDIRECTMEMORYSIZE=400m - -druid_emitter_logging_logLevel=debug - -# druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - - - -druid_zk_service_host=zookeeper - -druid_metadata_storage_host= -druid_metadata_storage_type=postgresql -druid_metadata_storage_connector_connectURI=jdbc:postgresql://postgres:5432/druid -druid_metadata_storage_connector_user=druid -druid_metadata_storage_connector_password=FoolishPassword - -druid_coordinator_balancer_strategy=cachingCost - -druid_indexer_runner_javaOptsArray=["-server", "-Xms256m", "-Xmx256m", "-XX:MaxDirectMemorySize=400m", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] -druid_indexer_fork_property_druid_processing_buffer_sizeBytes=25000000 - - -druid_processing_numThreads=1 -druid_processing_numMergeBuffers=2 - -DRUID_LOG4J= diff --git a/deploy/docker/druid-kafka-setup/environment_tiny/router b/deploy/docker/druid-kafka-setup/environment_tiny/router deleted file mode 100644 index 5bfab90f4b..0000000000 --- a/deploy/docker/druid-kafka-setup/environment_tiny/router +++ /dev/null @@ -1,49 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Java tuning -DRUID_XMX=64m -DRUID_XMS=64m -DRUID_MAXNEWSIZE=256m -DRUID_NEWSIZE=256m -DRUID_MAXDIRECTMEMORYSIZE=128m - -druid_emitter_logging_logLevel=debug - -# druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"] - - -druid_zk_service_host=zookeeper - -druid_metadata_storage_host= -druid_metadata_storage_type=postgresql -druid_metadata_storage_connector_connectURI=jdbc:postgresql://postgres:5432/druid -druid_metadata_storage_connector_user=druid -druid_metadata_storage_connector_password=FoolishPassword - -druid_coordinator_balancer_strategy=cachingCost - -druid_indexer_runner_javaOptsArray=["-server", "-Xms64m", "-Xmx64m", "-XX:MaxDirectMemorySize=128m", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] -druid_indexer_fork_property_druid_processing_buffer_sizeBytes=25000000 - - -druid_processing_numThreads=1 -druid_processing_numMergeBuffers=2 - -DRUID_LOG4J= diff --git a/deploy/docker/druid-kafka-setup/otel-collector-config.yaml b/deploy/docker/druid-kafka-setup/otel-collector-config.yaml deleted file mode 100644 index ff4b8f496d..0000000000 --- a/deploy/docker/druid-kafka-setup/otel-collector-config.yaml +++ /dev/null @@ -1,51 +0,0 @@ -receivers: - otlp: - protocols: - grpc: - http: - jaeger: - protocols: - grpc: - thrift_http: -processors: - batch: - send_batch_size: 1000 - timeout: 10s - memory_limiter: - # Same as --mem-ballast-size-mib CLI argument - ballast_size_mib: 683 - # 80% of maximum memory up to 2G - limit_mib: 1500 - # 25% of limit up to 2G - spike_limit_mib: 512 - check_interval: 5s - queued_retry: - num_workers: 4 - queue_size: 100 - retry_on_failure: true -extensions: - health_check: {} - zpages: {} -exporters: - kafka/traces: - brokers: - - kafka:9092 - topic: 'otlp_spans' - protocol_version: 2.0.0 - - kafka/metrics: - brokers: - - kafka:9092 - topic: 'otlp_metrics' - protocol_version: 2.0.0 -service: - extensions: [health_check, zpages] - pipelines: - traces: - receivers: [jaeger, otlp] - processors: [memory_limiter, batch, queued_retry] - exporters: [kafka/traces] - metrics: - receivers: [otlp] - processors: [batch] - exporters: [kafka/metrics] \ No newline at end of file diff --git a/deploy/install.sh b/deploy/install.sh index abca7f0878..12814c8980 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -333,7 +333,6 @@ fi # echo -e "👉 ${RED}Two ways to go forward\n" # echo -e "${RED}1) ClickHouse as database (default)\n" -# echo -e "${RED}2) Kafka + Druid as datastore \n" # read -p "⚙️ Enter your preference (1/2):" choice_setup # while [[ $choice_setup != "1" && $choice_setup != "2" && $choice_setup != "" ]] @@ -346,8 +345,6 @@ fi # if [[ $choice_setup == "1" || $choice_setup == "" ]];then # setup_type='clickhouse' -# else -# setup_type='druid' # fi setup_type='clickhouse' diff --git a/pkg/query-service/app/interface.go b/pkg/query-service/app/interface.go index 422f57ba41..cbbb78249b 100644 --- a/pkg/query-service/app/interface.go +++ b/pkg/query-service/app/interface.go @@ -26,7 +26,6 @@ type Reader interface { GetQueryRangeResult(ctx context.Context, query *model.QueryRangeParams) (*promql.Result, *stats.QueryStats, *model.ApiError) GetServiceOverview(ctx context.Context, query *model.GetServiceOverviewParams) (*[]model.ServiceOverviewItem, *model.ApiError) GetServices(ctx context.Context, query *model.GetServicesParams) (*[]model.ServiceItem, *model.ApiError) - // GetApplicationPercentiles(ctx context.Context, query *model.ApplicationPercentileParams) ([]godruid.Timeseries, error) GetTopEndpoints(ctx context.Context, query *model.GetTopEndpointsParams) (*[]model.TopEndpointsItem, *model.ApiError) GetUsage(ctx context.Context, query *model.GetUsageParams) (*[]model.UsageItem, error) GetServicesList(ctx context.Context) (*[]string, error) diff --git a/pkg/query-service/app/server.go b/pkg/query-service/app/server.go index 8399e543d3..e157153dcc 100644 --- a/pkg/query-service/app/server.go +++ b/pkg/query-service/app/server.go @@ -26,7 +26,6 @@ import ( type ServerOptions struct { HTTPHostPort string - // DruidClientUrl string } // Server runs HTTP, Mux and a grpc server @@ -106,10 +105,7 @@ func (s *Server) createHTTPServer() (*http.Server, error) { var reader Reader storage := os.Getenv("STORAGE") - if storage == "druid" { - zap.S().Info("Using Apache Druid as datastore ...") - // reader = druidReader.NewReader(localDB) - } else if storage == "clickhouse" { + if storage == "clickhouse" { zap.S().Info("Using ClickHouse as datastore ...") clickhouseReader := clickhouseReader.NewReader(localDB) go clickhouseReader.Start() diff --git a/pkg/query-service/main.go b/pkg/query-service/main.go index 9cede29cd7..8eb1c48ccd 100644 --- a/pkg/query-service/main.go +++ b/pkg/query-service/main.go @@ -34,11 +34,7 @@ func main() { version.PrintVersion() serverOptions := &app.ServerOptions{ - // HTTPHostPort: v.GetString(app.HTTPHostPort), - // DruidClientUrl: v.GetString(app.DruidClientUrl), - HTTPHostPort: constants.HTTPHostPort, - // DruidClientUrl: constants.DruidClientUrl, } // Read the jwt secret key