From f110aa5628fbb824ab8bf9da680a595d4c4c6362 Mon Sep 17 00:00:00 2001 From: spenes Date: Tue, 26 Sep 2023 15:14:53 +0300 Subject: [PATCH 1/4] Bump Collector to 3.0.0 --- .../configs/compositions/docker-compose-aws.yml | 2 +- .../configs/compositions/docker-compose-gcp.yml | 2 +- .../configs/snowplow-stream-collector.hocon | 16 ---------------- .../resources/ui/js/components/Overview.tsx | 4 ++-- .../roles/docker/files/docker-compose.yml | 2 +- 5 files changed, 5 insertions(+), 21 deletions(-) diff --git a/provisioning/resources/configs/compositions/docker-compose-aws.yml b/provisioning/resources/configs/compositions/docker-compose-aws.yml index 64a3c8c3..a6822c87 100644 --- a/provisioning/resources/configs/compositions/docker-compose-aws.yml +++ b/provisioning/resources/configs/compositions/docker-compose-aws.yml @@ -138,7 +138,7 @@ services: mem_limit: 64m scala-stream-collector: - image: snowplow/scala-stream-collector-nsq:2.9.0-distroless + image: snowplow/scala-stream-collector-nsq:3.0.0-rc9-distroless container_name: scala-stream-collector-nsq command: [ "--config", "/snowplow/config/snowplow-stream-collector.hocon" ] restart: always diff --git a/provisioning/resources/configs/compositions/docker-compose-gcp.yml b/provisioning/resources/configs/compositions/docker-compose-gcp.yml index 54010e84..2dd51432 100644 --- a/provisioning/resources/configs/compositions/docker-compose-gcp.yml +++ b/provisioning/resources/configs/compositions/docker-compose-gcp.yml @@ -117,7 +117,7 @@ services: mem_limit: 64m scala-stream-collector: - image: snowplow/scala-stream-collector-nsq:2.9.0-distroless + image: snowplow/scala-stream-collector-nsq:3.0.0-rc9-distroless container_name: scala-stream-collector-nsq command: [ "--config", "/snowplow/config/snowplow-stream-collector.hocon" ] restart: always diff --git a/provisioning/resources/configs/snowplow-stream-collector.hocon b/provisioning/resources/configs/snowplow-stream-collector.hocon index a353a1c6..383a5db3 100644 --- a/provisioning/resources/configs/snowplow-stream-collector.hocon +++ b/provisioning/resources/configs/snowplow-stream-collector.hocon @@ -51,8 +51,6 @@ collector { doNotTrackCookie { enabled = false - name = dnt - value = 1 } rootResponse { @@ -105,17 +103,3 @@ collector { } preTerminationPeriod = 0 seconds } - -akka { - loglevel = WARNING - loggers = ["akka.event.slf4j.Slf4jLogger"] - - http.server { - remote-address-header = on - raw-request-uri-header = on - parsing { - max-uri-length = 32768 - uri-parsing-mode = relaxed - } - } -} diff --git a/provisioning/resources/ui/js/components/Overview.tsx b/provisioning/resources/ui/js/components/Overview.tsx index 93855dad..0687fde3 100644 --- a/provisioning/resources/ui/js/components/Overview.tsx +++ b/provisioning/resources/ui/js/components/Overview.tsx @@ -52,8 +52,8 @@ export class Overview extends React.Component<{}, {}> {

The software stack installed: