Merge pull request #51 from microservices-demo/update-healthcheck

Update healthcheck cart -> carts

Author: vlal

deployment/docker-compose-weave.md

@@ -63,7 +63,7 @@ This will send some traffic to the application, which will form the connection g
 
 <!-- deploy-doc-hidden run-tests
 
-    docker create -t -\-name healthcheck weaveworksdemos/healthcheck:snapshot -s user,catalogue,queue-master,cart,shipping,payment,orders -d 120 -r 5
+    docker create -t -\-name healthcheck weaveworksdemos/healthcheck:snapshot -s user,catalogue,queue-master,carts,shipping,payment,orders -d 120 -r 5
     docker network connect dockercomposeweave_secure healthcheck
     docker network connect dockercomposeweave_internal healthcheck
     docker network connect dockercomposeweave_external healthcheck

deployment/docker-compose.md

@@ -71,7 +71,7 @@ This will send some traffic to the application, which will form the connection g
 
 <!-- deploy-doc-hidden run-tests
 
-    docker run -\-rm -t -\-net=dockercompose_default weaveworksdemos/healthcheck:snapshot -s user,catalogue,queue-master,cart,shipping,payment,orders -d 90 -r 5
+    docker run -\-rm -t -\-net=dockercompose_default weaveworksdemos/healthcheck:snapshot -s user,catalogue,queue-master,carts,shipping,payment,orders -d 90 -r 5
     if [ $? -ne 0 ]; then
         exit 1;
     fi

deployment/docker-swarm.md

@@ -138,7 +138,7 @@ Using any IP from the command: `terraform output`
 
     cat > /root/boot.sh <<-EOF
 #!/usr/bin/env bash
-docker service create -\-constraint='node.role == manager' -\-network=dockerswarm_default -\-name healthcheck weaveworksdemos/healthcheck:snapshot -s user,catalogue,cart,shipping,payment,orders -r 5
+docker service create -\-constraint='node.role == manager' -\-network=dockerswarm_default -\-name healthcheck weaveworksdemos/healthcheck:snapshot -s user,catalogue,carts,shipping,payment,orders -r 5
 sleep 60
 ID=\$(docker ps -a | grep healthcheck | awk '{print \$1}' | head -n1)
 docker logs -f \$ID

deployment/ecs.md

@@ -69,7 +69,7 @@ To ensure that the application is running properly, you could perform some load
 <!-- deploy-doc-hidden run-tests
 
     instance=$(aws ec2 describe-instances -\-filter "Name=key-name,Values=microservices-demo-key" "Name=instance-state-name,Values=running" | jq -r ".Reservations[0].Instances[0].PublicIpAddress")
-    ssh -i ~/.ssh/microservices-demo-key.pem -o StrictHostKeyChecking=no ec2-user@$instance "eval \$(weave env); docker run -\-rm -t weaveworksdemos/healthcheck:snapshot -s user,catalogue,cart,shipping,payment,orders,queue-master -d 180 -r 5"
+    ssh -i ~/.ssh/microservices-demo-key.pem -o StrictHostKeyChecking=no ec2-user@$instance "eval \$(weave env); docker run -\-rm -t weaveworksdemos/healthcheck:snapshot -s user,catalogue,carts,shipping,payment,orders,queue-master -d 180 -r 5"
 
     if [ $? -ne 0 ]; then
         exit 1;

deployment/kubernetes.md

@@ -191,7 +191,7 @@ This will send some traffic to the application, which will form the connection g
     docker run --rm weaveworksdemos/load-test -d 300 -h $elb_url -c 2 -r 100
 
     master_ip=$(terraform output -json | jq -r '.master_address.value')
-    ssh -i ~/.ssh/deploy-docs-k8s.pem ubuntu@$master_ip "kubectl run -i -t -\-namespace=sock-shop healthcheck -\-restart=Never -\-image=weaveworksdemos/healthcheck:snapshot -- -s orders,cart,payment,user,catalogue,shipping,queue-master -d 60 -r 5"
+    ssh -i ~/.ssh/deploy-docs-k8s.pem ubuntu@$master_ip "kubectl run -i -t -\-namespace=sock-shop healthcheck -\-restart=Never -\-image=weaveworksdemos/healthcheck:snapshot -- -s orders,carts,payment,user,catalogue,shipping,queue-master -d 60 -r 5"
 
     set +e
 

deployment/mesos-cni.md

@@ -134,7 +134,7 @@ This will send some traffic to the application, which will form the connection g
 
     eval $(terraform output -state=/tmp/mesos-terraform/terraform.tfstate -json | jq -r '.[].value')
 
-    ssh -i $KEY ubuntu@$MASTER 'sudo mesos-execute -\-networks=weave -\-shell -\-resources=cpus:0.2\;mem:1024 -\-name=healthcheck -\-command="cd /; ./healthcheck.rb -s orders.mesos-executeinstance.weave.local,user.mesos-executeinstance.weave.local,payment.mesos-executeinstance.weave.local,cart.mesos-executeinstance.weave.local,catalogue.mesos-executeinstance.weave.local,shipping.mesos-executeinstance.weave.local -d 60 -r 5" -\-docker_image=weaveworksdemos/healthcheck:snapshot -\-master=localhost:5050' > /tmp/healthcheck.log
+    ssh -i $KEY ubuntu@$MASTER 'sudo mesos-execute -\-networks=weave -\-shell -\-resources=cpus:0.2\;mem:1024 -\-name=healthcheck -\-command="cd /; ./healthcheck.rb -s orders.mesos-executeinstance.weave.local,user.mesos-executeinstance.weave.local,payment.mesos-executeinstance.weave.local,carts.mesos-executeinstance.weave.local,catalogue.mesos-executeinstance.weave.local,shipping.mesos-executeinstance.weave.local -d 60 -r 5" -\-docker_image=weaveworksdemos/healthcheck:snapshot -\-master=localhost:5050' > /tmp/healthcheck.log
 
     ssh -i $KEY ubuntu@$MASTER ". ~/.profile; mesos tail -n 100 -i healthcheck stdout"
 

deployment/mesos-marathon.md

@@ -113,7 +113,7 @@ This will send some traffic to the application, which will form the connection g
 <!-- deploy-doc-hidden run-tests
 
     eval $(terraform output -state=/tmp/mesos-terraform/terraform.tfstate -json | jq -r '.[].value')
-    ssh -i $KEY ubuntu@$SLAVE0 "eval \$(weave env); docker run -\-rm weaveworksdemos/healthcheck:snapshot -s orders,cart,payment,user,catalogue,shipping,queue-master -d 60 -r 5"
+    ssh -i $KEY ubuntu@$SLAVE0 "eval \$(weave env); docker run -\-rm weaveworksdemos/healthcheck:snapshot -s orders,carts,payment,user,catalogue,shipping,queue-master -d 60 -r 5"
 
     if [ $? -ne 0 ]; then
         exit 1;

deployment/minimesos-marathon.md

@@ -77,7 +77,7 @@ This will send some traffic to the application, which will form the connection g
 
 <!-- deploy-doc-hidden run-tests
 
-    docker run -\-rm -v=/var/run/weave/weave.sock:/var/run/weave/weave.sock docker docker -H=unix:///var/run/weave/weave.sock run -\-rm -\-name=healthcheck weaveworksdemos/healthcheck:snapshot -s catalogue,user,cart,orders,shipping,queue-master,payment -d 60 -r 5
+    docker run -\-rm -v=/var/run/weave/weave.sock:/var/run/weave/weave.sock docker docker -H=unix:///var/run/weave/weave.sock run -\-rm -\-name=healthcheck weaveworksdemos/healthcheck:snapshot -s catalogue,user,carts,orders,shipping,queue-master,payment -d 60 -r 5
 
     if [ $? -ne 0 ]; then
         exit 1;

deployment/nomad.md

@@ -199,7 +199,7 @@ docker run --rm weaveworksdemos/load-test -d 300 -h 192.168.59.102 -c 2 -r 100
     public_dns=$(aws ec2 describe-instances -\-filter "Name=private-dns-name,Values=${node_hostname}.eu-central-1.compute.internal" "Name=instance-state-name,Values=running" | jq -r ".Reservations[].Instances[0].PublicIpAddress" | head -n1)
     docker run -\-rm weaveworksdemos/load-test -d 300 -h $public_dns -c 2 -r 20
 
-    vagrant ssh ci-sockshop-nomad-node1 -c "eval \$(weave env); nomad run weavedemo.nomad; docker create -\-name healthcheck weaveworksdemos/healthcheck:snapshot -s orders,cart,payment,user,catalogue,shipping,queue-master -d 60 -r 5"
+    vagrant ssh ci-sockshop-nomad-node1 -c "eval \$(weave env); nomad run weavedemo.nomad; docker create -\-name healthcheck weaveworksdemos/healthcheck:snapshot -s orders,carts,payment,user,catalogue,shipping,queue-master -d 60 -r 5"
     vagrant ssh ci-sockshop-nomad-node1 -c "docker network connect backoffice healthcheck; \
         docker network connect internal healthcheck; \
         docker network connect external healthcheck; \