From 57a9a3a3b990160d03cbaad55d6c0925e27fc9bd Mon Sep 17 00:00:00 2001 From: spenes Date: Tue, 26 Sep 2023 14:24:17 +0300 Subject: [PATCH 1/3] Use pip2 (close #389) --- vagrant/up.bash | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vagrant/up.bash b/vagrant/up.bash index ca3cd836..d40ac075 100755 --- a/vagrant/up.bash +++ b/vagrant/up.bash @@ -5,17 +5,17 @@ #echo "-------------------------------" export DEBIAN_FRONTEND=noninteractive apt-get update -apt-get install -y language-pack-en python-pip libffi-dev libssl-dev python-dev -sudo pip install --upgrade pip -sudo pip install markupsafe==1.1.1 -sudo pip install setuptools==40.8.0 -sudo pip install paramiko==1.16.0 +apt-get install -y language-pack-en python-pip libffi-dev libssl-dev python2-dev +sudo pip2 install --upgrade pip +sudo pip2 install markupsafe==1.1.1 +sudo pip2 install setuptools==40.8.0 +sudo pip2 install paramiko==1.16.0 sudo sh -c 'echo "ubuntu ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers' # see https://askubuntu.com/questions/192050/how-to-run-sudo-command-with-no-password #echo "==================" #echo "INSTALLING ANSIBLE" #echo "------------------" -sudo pip install ansible==2.8.1 +sudo pip2 install ansible==2.8.1 #echo "==========================================" #echo "RUNNING PLAYBOOKS WITH ANSIBLE*" From c1e3d0213583fd11a6df982f222cf721d397f987 Mon Sep 17 00:00:00 2001 From: spenes Date: Tue, 26 Sep 2023 15:59:35 +0300 Subject: [PATCH 2/3] Add -y flag to Go compiler installation command (close #390) --- provisioning/roles/sp_mini_3_build_go_projects/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/roles/sp_mini_3_build_go_projects/tasks/main.yml b/provisioning/roles/sp_mini_3_build_go_projects/tasks/main.yml index d9107fd3..32d862ea 100644 --- a/provisioning/roles/sp_mini_3_build_go_projects/tasks/main.yml +++ b/provisioning/roles/sp_mini_3_build_go_projects/tasks/main.yml @@ -11,7 +11,7 @@ - name: Install Go 1.15 become: yes - command: sudo apt install golang-1.15-go + command: sudo apt -y install golang-1.15-go - name: Init Go module become: yes From ca78e360b0b01bab225c4465e46f651d0f3dc048 Mon Sep 17 00:00:00 2001 From: spenes Date: Tue, 26 Sep 2023 15:14:53 +0300 Subject: [PATCH 3/3] 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 | 2 +- .../roles/docker/files/docker-compose.yml | 2 +- 5 files changed, 4 insertions(+), 20 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 7b9d826f..0687fde3 100644 --- a/provisioning/resources/ui/js/components/Overview.tsx +++ b/provisioning/resources/ui/js/components/Overview.tsx @@ -53,7 +53,7 @@ export class Overview extends React.Component<{}, {}> {

The software stack installed:

  • Snowplow Mini 0.17.0
    • -
  • Snowplow Stream Collector NSQ 2.9.0
    • +
  • Snowplow Stream Collector NSQ 3.0.0-rc9
  • Snowplow Stream Enrich NSQ 3.8.0
  • Snowplow Elasticsearch Loader 2.1.0
  • Snowplow Iglu Server 0.10.0
    • diff --git a/provisioning/roles/docker/files/docker-compose.yml b/provisioning/roles/docker/files/docker-compose.yml index 68589d71..9155d670 100644 --- a/provisioning/roles/docker/files/docker-compose.yml +++ b/provisioning/roles/docker/files/docker-compose.yml @@ -131,7 +131,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