Bump Iglu Server to 0.3.0 (closes #152)

snowplow · May 21, 2018 · 0998646 · 0998646
1 parent 0fb5d47
commit 0998646
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 deletions.
diff --git a/integration/integration_test.sh b/integration/integration_test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 sudo service elasticsearch start
-sudo service iglu_server_0.2.0 start
+sudo service iglu_server_0.3.0 start
 sudo service snowplow_stream_collector start
 sudo service snowplow_stream_enrich start
 sudo service snowplow_elasticsearch_loader_good start

diff --git a/provisioning/resources/configs/control-plane-api.toml b/provisioning/resources/configs/control-plane-api.toml
@@ -18,7 +18,7 @@ stream_collector = "snowplow_stream_collector"
 stream_enrich = "snowplow_stream_enrich"
 es_loader_good = "snowplow_elasticsearch_loader_good"
 es_loader_bad = "snowplow_elasticsearch_loader_bad"
-iglu = "iglu_server_0.2.0"
+iglu = "iglu_server_0.3.0"
 caddy = "caddy_init"
 
 [PSQL]

diff --git a/provisioning/resources/configs/iglu-server.conf b/provisioning/resources/configs/iglu-server.conf
@@ -1,4 +1,4 @@
-# Copyright (c) 2014 Snowplow Analytics Ltd. All rights reserved.
+# Copyright (c) 2014-2018 Snowplow Analytics Ltd. All rights reserved.
 #
 # This program is licensed to you under the Apache License Version 2.0, and
 # you may not use this file except in compliance with the Apache License
@@ -15,8 +15,12 @@
 # the Iglu repository server.
 
 # 'repo-server' contains configuration options for the repo-server.
+# interface on which the server will be running
+# baseURL is address of deployment, "<ip>:<port>/<deployment_path>" address used for baseURL of Swagger UI
+# port on which the server will be running
 repo-server {
   interface = "0.0.0.0"
+  baseURL = "0.0.0.0"
   port = 8081
 }
 
@@ -32,14 +36,16 @@ postgres {
 }
 
 akka {
+  loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = INFO
   log-dead-letters = off
+  stdout-loglevel = "DEBUG"
+  logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
 }
 
-# spray-can is the HTTP server the Iglu repository server is built on.
-spray.can {
+akka.http {
   server {
-    request-timeout = 10s
+    request-timeout = 10 seconds
     remote-address-header = on
     parsing.uri-parsing-mode = relaxed
   }

diff --git a/...isioning/resources/init/iglu_server_0.2.0 → ...isioning/resources/init/iglu_server_0.3.0 b/...isioning/resources/init/iglu_server_0.2.0 → ...isioning/resources/init/iglu_server_0.3.0
@@ -10,10 +10,10 @@
 ### END INIT INFO
 
 dir="/home/ubuntu/snowplow/bin/"
-cmd="java -Dconfig.file=/home/ubuntu/snowplow/configs/iglu-server.conf -jar $dir/iglu-server-0.2.0.jar com.snowplowanalytics.iglu.server.Boot"
+cmd="java -jar $dir/iglu-server-0.3.0.jar --config /home/ubuntu/snowplow/configs/iglu-server.conf"
 user="ubuntu"
 
-name="iglu_server_0.2.0"
+name="iglu_server_0.3.0"
 pid_file="/var/run/$name.pid"
 stdout_log="/var/log/$name.log"
 stderr_log="/var/log/$name.err"

diff --git a/provisioning/resources/ui/js/components/Overview.tsx b/provisioning/resources/ui/js/components/Overview.tsx
@@ -52,7 +52,7 @@ export class Overview extends React.Component<{}, {}> {
           <li>Snowplow Stream Collector 0.11.0</li>
           <li>Snowplow Stream Enrich 0.12.0</li>
           <li>Snowplow Elasticsearch Sink 0.10.1</li>
-          <li>Snowplow Iglu Server 0.2.0</li>
+          <li>Snowplow Iglu Server 0.3.0</li>
           <li>NSQ 1.0.0</li>
           <li>Elasticsearch 1.7.5</li>
           <li>Kibana 4.0.1</li>

diff --git a/provisioning/roles/sp_mini_4_setup_apps/tasks/main.yml b/provisioning/roles/sp_mini_4_setup_apps/tasks/main.yml
@@ -6,7 +6,7 @@
     stream_collector_package: 'snowplow_scala_stream_collector_0.11.0.zip'
     stream_enrich_package: 'snowplow_stream_enrich_0.12.0.zip'
     es_loader_package: 'snowplow_elasticsearch_loader_http_0.10.1.zip'
-    iglu_server_package: 'iglu_server_0.2.0.zip'
+    iglu_server_package: 'iglu_server_0.3.0.zip'
     kibana_v: '4.0.1'
     nsq_package: 'nsq-1.0.0-compat.linux-amd64.go1.8.tar.gz'
     nsq_bin_dir: 'nsq-1.0.0-compat.linux-amd64.go1.8/bin'

diff --git a/provisioning/roles/sp_mini_7_setup_init/tasks/main.yml b/provisioning/roles/sp_mini_7_setup_init/tasks/main.yml
@@ -15,7 +15,7 @@
     - snowplow_stream_enrich
     - snowplow_elasticsearch_loader_good
     - snowplow_elasticsearch_loader_bad
-    - iglu_server_0.2.0
+    - iglu_server_0.3.0
     - caddy_init
     - nsqd_init
     - nsqlookupd_init
@@ -30,7 +30,7 @@
     - snowplow_stream_enrich
     - snowplow_elasticsearch_loader_good
     - snowplow_elasticsearch_loader_bad
-    - iglu_server_0.2.0
+    - iglu_server_0.3.0
     - elasticsearch
     - caddy_init
     - nsqd_init