diff --git a/content/ecs-spot-capacity-providers/Introduction/_index.md b/content/ecs-spot-capacity-providers/Introduction/_index.md index edd5290e..d1b70e1a 100644 --- a/content/ecs-spot-capacity-providers/Introduction/_index.md +++ b/content/ecs-spot-capacity-providers/Introduction/_index.md @@ -4,6 +4,7 @@ weight = 5 +++ -If you're already familiar with the below concepts or already have experience with operating ECS clusters, you can skip the introduction and move to the [**Modules**](/ecs-spot-capacity-providers/modules.html) section to start the workshop. +If you're already familiar with the below concepts or already have experience with operating ECS clusters, you can skip the introduction and proceed to [**Setup the workshop environment on AWS**](/ecs-spot-capacity-providers/workshopsetup.html) section to start the workshop. + {{% children %}} \ No newline at end of file diff --git a/content/ecs-spot-capacity-providers/WorkshopSetup/cli_setup.md b/content/ecs-spot-capacity-providers/WorkshopSetup/cli_setup.md index 5f69d41e..472193ca 100644 --- a/content/ecs-spot-capacity-providers/WorkshopSetup/cli_setup.md +++ b/content/ecs-spot-capacity-providers/WorkshopSetup/cli_setup.md @@ -92,5 +92,5 @@ do done ``` +***Congratulations***, your Cloud9 workspace setup is complete, and you can proceed to next steps of this workshop. -***Congratulations***, your Cloud9 workspace setup is complete, and you can proceed to Module-1 of this workshop. \ No newline at end of file diff --git a/content/ecs-spot-capacity-providers/before/_index.md b/content/ecs-spot-capacity-providers/before/_index.md index 5d5eadac..036855ea 100644 --- a/content/ecs-spot-capacity-providers/before/_index.md +++ b/content/ecs-spot-capacity-providers/before/_index.md @@ -8,6 +8,3 @@ To start the workshop, follow one of the following pages, depending on whether y {{% children %}} -Once you are done with either setup, continue to the [**Setup with CloudFormation**](/ecs-spot-capacity-providers/WorkshopSetup/launch_cloudformation.html). If you need an introduction to containers, Amazon ECS and AWS Fargate, continue to the [**Introduction section.**](/ecs-spot-capacity-providers/introduction.html) - - diff --git a/content/ecs-spot-capacity-providers/before/aws_event/_index.md b/content/ecs-spot-capacity-providers/before/aws_event/_index.md index 681af7f0..9ac5488e 100644 --- a/content/ecs-spot-capacity-providers/before/aws_event/_index.md +++ b/content/ecs-spot-capacity-providers/before/aws_event/_index.md @@ -1,6 +1,6 @@ +++ title = "...At an AWS event" -weight = 5 +weight = 1 +++ {{% notice warning %}} @@ -19,4 +19,8 @@ If you are at an AWS event, an AWS acccount was created for you to use throughou You are now logged in to the AWS console in an account that was created for you, and will be available only throughout the workshop run time. -Once you are done with either setup, continue to the [**Setup with CloudFormation**](/ecs-spot-capacity-providers/WorkshopSetup/launch_cloudformation.html). If you need an introduction to containers, Amazon ECS and AWS Fargate, continue to the [**Introduction.**](/ecs-spot-capacity-providers/introduction.html) +You can now proceed to the the workshop steps [**Setup the workshop environment on AWS**](/ecs-spot-capacity-providers/workshopsetup.html) + +Optional: +If you want to read through basic concepts on Amazon ECS before doing workshop steps, you may go to [**Introduction**](/ecs-spot-capacity-providers/introduction.html) + diff --git a/content/ecs-spot-capacity-providers/before/self_paced/_index.md b/content/ecs-spot-capacity-providers/before/self_paced/_index.md index 27cc8de0..7c270eec 100644 --- a/content/ecs-spot-capacity-providers/before/self_paced/_index.md +++ b/content/ecs-spot-capacity-providers/before/self_paced/_index.md @@ -1,6 +1,6 @@ +++ title = "...On your own (self-paced)" -weight = 5 +weight = 10 +++ ### Running the workshop self-paced, in your own AWS account @@ -8,6 +8,8 @@ weight = 5 To complete this workshop, have access to an AWS account with administrative permissions. An IAM user with administrator access (**arn:aws:iam::aws:policy/AdministratorAccess**) will do nicely. -Once you are done with either setup, continue to the [**Setup with CloudFormation**](/ecs-spot-capacity-providers/WorkshopSetup/launch_cloudformation.html). If you need an introduction to containers, Amazon ECS and AWS Fargate, continue to the [**Introduction section.**](/ecs-spot-capacity-providers/introduction.html) +If you need an introduction to containers, Amazon ECS and AWS Fargate, continue to the [**Introduction section.**](/ecs-spot-capacity-providers/introduction.html) OR + +You can directly go to [**Setup the workshop environment on AWS**](/ecs-spot-capacity-providers/workshopsetup.html) section. To avoid unwanted costs in your account, don't forget to go through the [**Cleanup step**](/ecs-spot-capacity-providers/cleanup.html) when you finish the workshop, or if you deploy the CloudFormation template but don't complete the workshop. diff --git a/content/ecs-spot-capacity-providers/cleanup.md b/content/ecs-spot-capacity-providers/cleanup.md index 9594b054..6704f6ee 100644 --- a/content/ecs-spot-capacity-providers/cleanup.md +++ b/content/ecs-spot-capacity-providers/cleanup.md @@ -16,7 +16,7 @@ Before you clean up the resources and complete the workshop, you may want to rev We need to scale down the number of tasks in the ECS service before deleting it. -Run below commands to delete the ECS Service *fargate-service-split* if you have completed the optional Module-2 +Run below commands to delete the ECS Service *fargate-service-split* if you have completed the optional Fargate section ```bash aws ecs update-service --cluster EcsSpotWorkshop \ diff --git a/content/ecs-spot-capacity-providers/module-1/_index.md b/content/ecs-spot-capacity-providers/module-1/_index.md index 95ded65c..6d968882 100644 --- a/content/ecs-spot-capacity-providers/module-1/_index.md +++ b/content/ecs-spot-capacity-providers/module-1/_index.md @@ -1,5 +1,5 @@ --- -title: "Module-1: Cost optimizing using ECS Auto Scaling groups Capacity Providers and EC2 Spot" +title: "Cost optimizing ECS using Spot Instances with Auto Scaling groups Capacity Providers" weight: 20 --- diff --git a/content/ecs-spot-capacity-providers/module-1/cluster_visualizer.md b/content/ecs-spot-capacity-providers/module-1/cluster_visualizer.md index 08f73dcc..6262118d 100644 --- a/content/ecs-spot-capacity-providers/module-1/cluster_visualizer.md +++ b/content/ecs-spot-capacity-providers/module-1/cluster_visualizer.md @@ -93,8 +93,6 @@ The cloud watch alarm cause the target tracking policy to trigger the scale in ![Visualizer](/images/ecs-spot-capacity-providers/cp40.png) -***Congratulations !!!*** you have successfully completed this module and learnt how capacity providers instance termination protection feature avoids any disruption to your applications. You can skip rest of the section and go to the next page. - {{% /expand%}} Now, let us look at the Cloudwatch dashboard for the changes in the CapacityProviderReservation metric values, @@ -119,4 +117,4 @@ Let’s look at the C3VIS dashboard again As you see, the instance which does not run any tasks is terminated respecting the instance termination protection. -***Congratulations !!!*** you have successfully completed this module and learnt how capacity providers instance termination protection feature avoids any disruption to your applications. + diff --git a/content/ecs-spot-capacity-providers/module-1/spot_inturruption_handling.md b/content/ecs-spot-capacity-providers/module-1/spot_inturruption_handling.md index 88a76b22..c953b9d9 100644 --- a/content/ecs-spot-capacity-providers/module-1/spot_inturruption_handling.md +++ b/content/ecs-spot-capacity-providers/module-1/spot_inturruption_handling.md @@ -17,7 +17,7 @@ echo "ECS_ENABLE_SPOT_INSTANCE_DRAINING=true" >> /etc/ecs/ecs.config ``` When Amazon ECS Spot Instance draining is enabled on the instance, ECS container agent receives the Spot Instance interruption notice and places the instance in DRAINING status. When a container instance set to DRAINING, Amazon ECS prevents new tasks from being scheduled for placement on the container instance [Click here](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/container-instance-spot.html) to learn more. -The web application (**app.py**) docker container image we built in Module-1 shows two ways to handle the EC2 Spot interruption within a docker container. This allows you to perform actions such as preventing the processing of any new jobs, checkpointing the progress of a current job, or gracefully exiting the application to complete tasks. +The web application (app.py) we used to buld docker image shows two ways to handle the EC2 Spot interruption within a docker container. This allows you to perform actions such as preventing the processing of new work, checkpointing the progress of a batch job, or gracefully exiting the application to complete tasks such as ensuring database connections are properly closed In the first method, it polls the instance metadata service for spot interruption and display a message to web page notifying the users (this is, of course, just for demonstration and not for real world scenarios). @@ -54,3 +54,5 @@ def exit_gracefully(self, signum, frame): print("SIGTERM Signal Received due to EC2 Spot Interruption. Let's wrap up the work within 2 mins..") ``` +***Congratulations !!!*** you have successfully completed this workshop. You may continue to **optional** section on how to save costs using ***Fargate Spot*** Capacity Providers. + diff --git a/content/ecs-spot-capacity-providers/module-2/_index.md b/content/ecs-spot-capacity-providers/module-2/_index.md index 57c21272..32f8323a 100644 --- a/content/ecs-spot-capacity-providers/module-2/_index.md +++ b/content/ecs-spot-capacity-providers/module-2/_index.md @@ -1,5 +1,6 @@ --- -title: "Module-2 : Optimizing costs using ECS Fargate Spot Capacity Providers" +title: "Saving costs using AWS Fargate Spot Capacity Providers (Optional)" + weight: 40 --- diff --git a/content/ecs-spot-capacity-providers/modules.md b/content/ecs-spot-capacity-providers/modules.md deleted file mode 100644 index 74828964..00000000 --- a/content/ecs-spot-capacity-providers/modules.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: "Workshop Modules" -weight: 13 ---- - -This workshop has been broken down into modules. - -These modules are designed to be completed in sequence. If you are reading this at a live AWS event, the workshop attendants will give you a high level run down of the workshop. Then it’s up to you to follow the instructions below to completion. - - -| Modules | Description | -| --- | --- | -| **Module-1** | Cost optimizing ECS using Spot Instances with Auto Scaling groups Capacity Providers | -| **Module-2 (Optional)** | Cost optimizing ECS using AWS Fargate Spot | diff --git a/themes/learn b/themes/learn index 023fe7ef..ed760baf 160000 --- a/themes/learn +++ b/themes/learn @@ -1 +1 @@ -Subproject commit 023fe7ef2b4c45fe66ac932d9e25d09f30b74a4e +Subproject commit ed760baf3f083bc774f49eed688973a97de28904