Added RUM and Collectors.

fryckbos · Jan 30, 2017 · 9848a7c · 9848a7c
1 parent 81f1242
commit 9848a7c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/conf.sh b/conf.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export VERSION="3.1.0"
+export VERSION="3.5.5"
 
 export REGISTRY=docker.coscale.com:5000
 export REGISTRY_USERNAME=
@@ -13,6 +13,8 @@ export API_URL=
 export API_SUPER_USER=
 export API_SUPER_PASSWD=
 export APP_URL=
+#RUM_URL has no protocol
+export RUM_URL=
 
 export [email protected]
 export [email protected]
@@ -24,4 +26,3 @@ export MAIL_SSL=false
 export MAIL_AUTH=false
 export MAIL_USERNAME=
 export MAIL_PASSWORD=
-
diff --git a/links/collector b/links/collector
@@ -0,0 +1 @@
+--link coscale_rabbitmq:rabbitmq
diff --git a/links/haproxy b/links/haproxy
@@ -1 +1 @@
---link coscale_api:api --link coscale_app:app
+--link coscale_api:api --link coscale_app:app --link coscale_rum:rum --link coscale_rumdatareceiver:rumdatareceiver
diff --git a/links/rumaggregator b/links/rumaggregator
@@ -0,0 +1 @@
+--link coscale_rabbitmq:rabbitmq
diff --git a/links/rumdatareceiver b/links/rumdatareceiver
@@ -0,0 +1 @@
+--link coscale_rabbitmq:rabbitmq
diff --git a/run.sh b/run.sh
@@ -44,7 +44,7 @@ function run {
     echo "Starting $SERVICE:$IMAGE_VERSION"
     docker run -d \
         $LINKS $EXPOSED $VOLUMES $DNS_SWITCHES \
-        -e "API_URL=$API_URL" -e "API_SUPER_USER=$API_SUPER_USER" -e "API_SUPER_PASSWD=$API_SUPER_PASSWD" -e "APP_URL=$APP_URL" -e "MAIL_SERVER=$MAIL_SERVER" -e "FROM_EMAIL=$FROM_EMAIL" -e "SUPPORT_EMAIL=$SUPPORT_EMAIL" -e "ANOMALY_EMAIL=$ANOMALY_EMAIL" \
+        -e "API_URL=$API_URL" -e "API_SUPER_USER=$API_SUPER_USER" -e "API_SUPER_PASSWD=$API_SUPER_PASSWD" -e "APP_URL=$APP_URL" -e "MAIL_SERVER=$MAIL_SERVER" -e "FROM_EMAIL=$FROM_EMAIL" -e "SUPPORT_EMAIL=$SUPPORT_EMAIL" -e "RUM_URL=$RUM_URL" -e "ANOMALY_EMAIL=$ANOMALY_EMAIL" \
         --name coscale_$SERVICE coscale/$SERVICE:$IMAGE_VERSION
 }
 

diff --git a/services.sh b/services.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 export DATA_SERVICES="rabbitmq cassandra memcached postgresql elasticsearch"
 export LB_SERVICE="haproxy"
-export COSCALE_SERVICES="anomalydetectorservice alerter analysismanager analysisworker api app cron datastore mailer pageminer reporter roller anomalymatcher triggermatcher"
+export COSCALE_SERVICES="anomalydetectorservice alerter analysismanager analysisworker api app cron datastore mailer pageminer reporter roller anomalymatcher triggermatcher rum rumdatareceiver collector rumaggregator"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		--link coscale_api:api --link coscale_app:app
		--link coscale_api:api --link coscale_app:app --link coscale_rum:rum --link coscale_rumdatareceiver:rumdatareceiver