awslabs · ajpaws · Oct 27, 2020 · Oct 27, 2020
diff --git a/content/ecs-spot-capacity-providers/WorkshopSetup/cli_setup.md b/content/ecs-spot-capacity-providers/WorkshopSetup/cli_setup.md
@@ -38,10 +38,6 @@ In order to execute the steps in the workshop, you'll need to clone the workshop
 
 In the Cloud9 IDE terminal, run the following command:
 
-(Remove before prod)
-```
-git clone https://github.com/jalawala/ec2-spot-workshops.git 
-```
 ```
 git clone https://github.com/awslabs/ec2-spot-workshops.git
 ```

diff --git a/content/ecs-spot-capacity-providers/WorkshopSetup/launch_cloudformation.md b/content/ecs-spot-capacity-providers/WorkshopSetup/launch_cloudformation.md
@@ -8,7 +8,7 @@ Launch the CloudFormation stack
 
 To save time on the initial setup, a CloudFormation template will be used to create the required resources needed for the workshop.
 
-1. You can view and download the CloudFormation template from GitHub [here, Change location before making it live] (https://github.com/ec2-spot-workshops/workshops/ecs-spot-capacity-providers/ecs-spot-workshop-cfn-for-aws-console.yaml).
+1. You can view and download the CloudFormation template from GitHub [here, Change location before making it live] (https://github.com/ec2-spot-workshops/workshops/ecs-spot-capacity-providers/ecs-spot-workshop-cfn.yaml).
 2. Take a moment to review the CloudFormation template so you understand the resources it will be creating.
 3. Browse to the [AWS CloudFormation console] (https://console.aws.amazon.com/cloudformation). Make sure you are in AWS region designated by the facilitators of the workshop
 4. Click **Create stack**.

diff --git a/content/ecs-spot-capacity-providers/module-1/asg_with_od.md b/content/ecs-spot-capacity-providers/module-1/asg_with_od.md
@@ -23,7 +23,7 @@ export OD_PERCENTAGE=100 # Note that ASG will have 100% On-Demand, 0% Spot
 Run the following command to substitute the template with actual values from the global variables
 
 ```bash
-sed -i -e "s#%ASG_NAME%#$ASG_NAME#g"  -e "s#%OD_PERCENTAGE%#$OD_PERCENTAGE#g" -e "s#%PUBLIC_SUBNET_LIST%#$VPCPublicSubnets#g" -e "s#%LT_ID%#$LaunchTemplateId#g"  asg.json
+sed -i -e "s#%ASG_NAME%#$ASG_NAME#g"  -e "s#%OD_PERCENTAGE%#$OD_PERCENTAGE#g" -e "s#%PUBLIC_SUBNET_LIST%#$VPCPublicSubnets#g"  asg.json
 ```
 
 Create the ASG for the On-Demand Instances

diff --git a/content/ecs-spot-capacity-providers/module-1/asg_with_spot.md b/content/ecs-spot-capacity-providers/module-1/asg_with_spot.md
@@ -5,23 +5,8 @@ weight: 15
 
 In this section, you create an Auto Scaling group for EC2 Spot Instances using the Launch Template created in previous section. This procedure is exactly same as the previous section except for a few changes specific to the configuration for Spot Instances.
 
-One of the best practices for adoption of Spot Instances is to diversify the EC2 instances across different instance types and availability zones, in order to tap into multiple spare capacity pools. 
 
-One key criteria for choosing the instance size can be based on the ECS Task vCPU and Memory limit configuration. For example, look at the ECS task resource limits in the file **ec2-task.json**:
-
-```plaintext
-"cpu": "256", "memory": "1024"
-```
-
-This means the ratio for vCPU:Memory in our ECS task that would run in the cluster is **1:4**. Ideally, we should select instance types with similar vCPU:Memory ratio, in order to have good utilization of the resources in the EC2 instances. The smallest instance type which would satisfy this critera from the latest generation of x86_64 EC2 instance types is m5.large. To learn more about EC2 instance types click [here](https://aws.amazon.com/ec2/instance-types/)
-
-In order to adhere to EC2 Spot best practices and diversify our use of instance types (in order to tap into multiple spare capacity pools), we can use the EC2 Instance Types console to find instance types which have similar hardware characteristics to the m5.large. The t2 & t3 instance types are burstable instance types, which also fit our objective in this workshop. To learn more about EC2 burstable instance types, click [here](https://aws.amazon.com/ec2/instance-types/t3/)
-
-![OD ASG](/images/ecs-spot-capacity-providers/ec1.png)
-![OD ASG](/images/ecs-spot-capacity-providers/ec2.png)
-![OD ASG](/images/ecs-spot-capacity-providers/ec3.png)
-
-We selected 10 different instance types as can seen asg.json, but you can configure up to 20 different instance types in an ASG. We chose instance types with similar hardware characteristics in order to have a consistent auto scaling experience.
+We have configured the instance diversification in asg.json. We chose instance types with similar hardware characteristics in order to have a consistent auto scaling experience.
 
 Copy the file **templates/asg.json** for the Auto Scaling group configuration.
 
@@ -41,7 +26,7 @@ export OD_PERCENTAGE=0 # Note that ASG will have 0% On-Demand, 100% Spot
 Run the following command to substitute the template with actual values from the global variables
 
 ```bash
-sed -i -e "s#%ASG_NAME%#$ASG_NAME#g"  -e "s#%OD_PERCENTAGE%#$OD_PERCENTAGE#g" -e "s#%PUBLIC_SUBNET_LIST%#$VPCPublicSubnets#g" -e "s#%LT_ID%#$LaunchTemplateId#g"  asg.json
+sed -i -e "s#%ASG_NAME%#$ASG_NAME#g"  -e "s#%OD_PERCENTAGE%#$OD_PERCENTAGE#g" -e "s#%PUBLIC_SUBNET_LIST%#$VPCPublicSubnets#g" asg.json
 ```
 
 Create the Auto scaling group that will run Spot Instances in our cluster

diff --git a/content/ecs-spot-capacity-providers/module-1/selecting_spot_instance_types.md b/content/ecs-spot-capacity-providers/module-1/selecting_spot_instance_types.md
@@ -0,0 +1,108 @@
+---
+title: "Selecting Instance Types"
+date: 2018-08-07T11:05:19-07:00
+weight: 13
+draft: false
+---
+
+[Amazon EC2 Spot Instances](https://aws.amazon.com/ec2/spot/) offer spare compute capacity available in the AWS Cloud at steep discounts compared to On-Demand prices. EC2 can interrupt Spot Instances with two minutes of notification when EC2 needs the capacity back. You can use Spot Instances for various fault-tolerant and flexible applications. Some examples are analytics, containerized workloads, high-performance computing (HPC), stateless web servers, rendering, CI/CD, and other test and development workloads.
+
+One of the best practices to successfully adopt Spot instances is to implement **Spot instance diversification** as part of your configuration. Spot instance diversification helps to procure
+capacity from multiple Spot Instance pools, both for scaling up and for replacing spot instances that may receive a spot instance termination notification. A Spot instance pool is a set of unused EC2 instances with the same instance type (for example, m5.large), operating system, Availability Zone.
+
+We can diversify Spot instance pools using below strategy:
+
+ - By Implementing instance diversification within the nodegroups, by selecting a mix of instances types and families from different Spot instance pools that meet the same vCPU's and memory criteria.
+
+One key criteria for choosing the instance size can be based on the ECS Task vCPU and Memory limit configuration. For example, look at the ECS task resource limits in the file **ec2-task.json**:
+
+```plaintext
+"cpu": "256", "memory": "1024"
+```
+
+This means the ratio for vCPU:Memory in our ECS task that would run in the cluster is **1:4**. Ideally, we should select instance types with similar vCPU:Memory ratio, in order to have good utilization of the resources in the EC2 instances. The smallest instance type which would satisfy this critera from the latest generation of x86_64 EC2 instance types is m5.large. To learn more about EC2 instance types click [here](https://aws.amazon.com/ec2/instance-types/)
+
+We will use **[amazon-ec2-instance-selector](https://github.com/aws/amazon-ec2-instance-selector)** to help us select the relevant instance
+types and familes with sufficient number of vCPUs and RAM. 
+
+There are over 270 different instance types available on EC2 which can make the process of selecting appropriate instance types difficult. **[amazon-ec2-instance-selector](https://github.com/aws/amazon-ec2-instance-selector)** helps you select compatible instance types for your application to run on. The command line interface can be passed resource criteria like vcpus, memory, network performance, and much more and then return the available, matching instance types.
+
+Let's first install **amazon-ec2-instance-selector** :
+
+```
+curl -Lo ec2-instance-selector https://github.com/aws/amazon-ec2-instance-selector/releases/download/v1.3.0/ec2-instance-selector-`uname | tr '[:upper:]' '[:lower:]'`-amd64 && chmod +x ec2-instance-selector
+sudo mv ec2-instance-selector /usr/local/bin/
+ec2-instance-selector --version
+```
+
+Now that you have ec2-instance-selector installed, you can run
+`ec2-instance-selector --help` to understand how you could use it for selecting
+instances that match your workload requirements. For the purpose of this workshop
+we need to first get a group of instances that meet the 4vCPUs and 16GB of RAM.
+Run the following command to get the list of instances.
+
+```bash
+ec2-instance-selector --vcpus 2 --memory 8192 --gpus 0 --current-generation -a x86_64 --deny-list '.*n.*'      
+```
+
+This should display a list like the one that follows (note results might differ depending on the region). We will use this instances as part of one of our node groups.
+
+```
+m4.large
+m5.large
+m5a.large
+m5ad.large
+m5d.large
+t2.large
+t3.large
+t3a.large           
+```
+
+Internally ec2-instance-selector is making calls to the [DescribeInstanceTypes](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstanceTypes.html) for the specific region and filtering
+the intstances based on the criteria selected in the command line, in our case 
+we did filter for instances that meet the following criteria:
+
+ * Instances with no GPUs
+ * of x86_64 Architecture (no ARM instances like A1 or m6g instances for example)
+ * Instances that have 4 vCPUs and 16GB of Ram
+ * Instances of current generation (4th gen onwards)
+ * Instances that don't meet the regular expresion `.*n.*`, so effectively m5n, m5dn. 
+
+{{% notice warning %}}
+Your workload may have other constraints that you should consider when selecting instances types. For example. **t2** and **t3** instance types are [burstable instances](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html) and might not be appropriate for CPU bound workloads that require CPU execution determinism. Instances such as m5**a** are [AMD Instances](https://aws.amazon.com/ec2/amd/), if your workload is sensitive to numerical differences (i.e: financial risk calculations, industrial simulations) mixing these instance types might not be appropriate.
+{{% /notice %}}
+
+{{% notice note %}}
+You are encouraged to test what are the options that `ec2-instance-selector` provides and run a few commands with it to familiarize yourself with the tool.
+For example, try running the same commands as you did before with the extra parameter **`--output table-wide`**.
+{{% /notice %}}
+
+### Challenge 
+
+Find out another group that adheres to a 1vCPU:4GB ratio, this time using instances with 8vCPU's and 32GB of RAM.
+
+{{%expand "Expand this for an example on the list of instances" %}}
+
+That should be easy. You can run the command:  
+
+```bash
+ec2-instance-selector --vcpus 8 --memory 32768 --gpus 0 --current-generation -a x86_64 --deny-list '.*n.*|.*h.*'   
+```
+
+which should yield a list as follows 
+
+```
+m4.2xlarge
+m5.2xlarge
+m5a.2xlarge
+m5d.2xlarge
+t2.2xlarge
+t3.2xlarge
+t3a.2xlarge
+```
+
+{{% /expand %}}
+
+
+
+
diff --git a/content/ecs-spot-capacity-providers/module-2/_index.md b/content/ecs-spot-capacity-providers/module-2/_index.md
@@ -1,5 +1,5 @@
 ---
-title: "Module-2 (Optional): Optimizing costs using ECS Fargate Spot Capacity Providers"
+title: "Module-2 : Optimizing costs using ECS Fargate Spot Capacity Providers"
 weight: 40
 ---