wiki/amazon-ec2.md
... ...
@@ -26,15 +26,16 @@ In addition to having a password and MFA set for one user one can activate "Acce
26 26
27 27
## EC2 Server Architecture for Sailing Analytics
28 28
29
-The architecture is divided into 3 logical tiers. These are represented by firewall configurations (Security Groups) that can be associated to Instances. The following image depicts the parts of the architecture.
29
+The architecture is divided into logical tiers. These are represented by firewall configurations (Security Groups) that can be associated to Instances. Each tier can contain one or more instances. The following image depicts the parts of the architecture.
30 30
31 31
<img src="/wiki/images/amazon/EC2Architecture.JPG" width="100%" height="100%"/>
32 32
33 33
### Tiers
34 34
35 35
* **Webserver**: Holds one or more webserver instances that represent the public facing part of the architecture. Only instances running in this tier should have an Elastic IP assigned.
36
+* **Balancer**: Features an Elastic Load Balancer. Such balancers can be configured to distribute traffic among many other running instances. Internally an ELB consists of multiple balancing instances on which load is distributed by a DNS round robin.
36 37
* **Database**: Instances handling all operations related to persistence. Must be reachable by the "Instance" and "Balancer+Group" tier.
37
-* **Instances**: Space where all instances, that are not grouped, live.
38
+* **Instances**: Space where all instances, that are not logically grouped, live.
38 39
* **Balancer+Group**: Analytics instances grouped and managed by an Elastic Load Balancer. A group is just a term describing multiple instances replicating from one master instance. The word "group" does in this context not refer to the so called "Placement Groups".
39 40
40 41
### Instances
... ...
@@ -78,9 +79,26 @@ The architecture is divided into 3 logical tiers. These are represented by firew
78 79
79 80
### Create a new Analytics application instance
80 81
81
-1. First create a new Analytics instance [[wiki/amazon-ec2-create-new-app-instance]].
82
-2. Log into the instance using the "Sailing User (Apps)" key
83
-3. Make sure to bring the code to the branch you want
82
+* Create a new Analytics instance as described in detail here [[wiki/amazon-ec2-create-new-app-instance]]. You should use a configuration like the following. If you want to bring the code to a defined level then make sure to specify the BUILD-FROM and BUILD-COMPLETE_NOTIFY variables. If you leave them empty the instance will start using a very old build.
83
+
84
+<pre>
85
+BUILD-FROM=master
86
+BUILD-COMPLETE-NOTIFY=simon.marcel.pamies@sap.com
87
+SERVER_NAME=LIVE1
88
+MEMORY=1024m
89
+REPLICATION_HOST=172.31.25.253
90
+REPLICATION_CHANNEL=sapsailinganalytics-live
91
+TELNET_PORT=14888
92
+SERVER_PORT=8888
93
+MONGODB_HOST=172.31.25.253
94
+MONGODB_PORT=10202
95
+EXPEDITION_PORT=2010
96
+REPLICATE_ON_START=False
97
+REPLICATE_MASTER_SERVLET_HOST=
98
+REPLICATE_MASTER_SERVLET_PORT=
99
+REPLICATE_MASTER_QUEUE_HOST=
100
+REPLICATE_MASTER_QUEUE_PORT=
101
+</pre>
84 102
85 103
### Setup replicated instances with ELB
86 104