Skip to content
This repository was archived by the owner on Dec 5, 2023. It is now read-only.

Commit 55edb8f

Browse files
authored
Merge pull request #51 from microservices-demo/update-healthcheck
Update healthcheck cart -> carts
2 parents 05373fd + 28da1eb commit 55edb8f

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

deployment/docker-compose-weave.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ This will send some traffic to the application, which will form the connection g
6363

6464
<!-- deploy-doc-hidden run-tests
6565
66-
docker create -t -\-name healthcheck weaveworksdemos/healthcheck:snapshot -s user,catalogue,queue-master,cart,shipping,payment,orders -d 120 -r 5
66+
docker create -t -\-name healthcheck weaveworksdemos/healthcheck:snapshot -s user,catalogue,queue-master,carts,shipping,payment,orders -d 120 -r 5
6767
docker network connect dockercomposeweave_secure healthcheck
6868
docker network connect dockercomposeweave_internal healthcheck
6969
docker network connect dockercomposeweave_external healthcheck

deployment/docker-compose.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ This will send some traffic to the application, which will form the connection g
7171

7272
<!-- deploy-doc-hidden run-tests
7373
74-
docker run -\-rm -t -\-net=dockercompose_default weaveworksdemos/healthcheck:snapshot -s user,catalogue,queue-master,cart,shipping,payment,orders -d 90 -r 5
74+
docker run -\-rm -t -\-net=dockercompose_default weaveworksdemos/healthcheck:snapshot -s user,catalogue,queue-master,carts,shipping,payment,orders -d 90 -r 5
7575
if [ $? -ne 0 ]; then
7676
exit 1;
7777
fi

deployment/docker-swarm.md

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

deployment/ecs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ To ensure that the application is running properly, you could perform some load
6969
<!-- deploy-doc-hidden run-tests
7070
7171
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")
72-
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"
72+
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"
7373
7474
if [ $? -ne 0 ]; then
7575
exit 1;

deployment/kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ This will send some traffic to the application, which will form the connection g
191191
docker run --rm weaveworksdemos/load-test -d 300 -h $elb_url -c 2 -r 100
192192
193193
master_ip=$(terraform output -json | jq -r '.master_address.value')
194-
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"
194+
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"
195195
196196
set +e
197197

deployment/mesos-cni.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ This will send some traffic to the application, which will form the connection g
134134
135135
eval $(terraform output -state=/tmp/mesos-terraform/terraform.tfstate -json | jq -r '.[].value')
136136
137-
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
137+
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
138138
139139
ssh -i $KEY ubuntu@$MASTER ". ~/.profile; mesos tail -n 100 -i healthcheck stdout"
140140

deployment/mesos-marathon.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ This will send some traffic to the application, which will form the connection g
113113
<!-- deploy-doc-hidden run-tests
114114
115115
eval $(terraform output -state=/tmp/mesos-terraform/terraform.tfstate -json | jq -r '.[].value')
116-
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"
116+
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"
117117
118118
if [ $? -ne 0 ]; then
119119
exit 1;

deployment/minimesos-marathon.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ This will send some traffic to the application, which will form the connection g
7777

7878
<!-- deploy-doc-hidden run-tests
7979
80-
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
80+
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
8181
8282
if [ $? -ne 0 ]; then
8383
exit 1;

deployment/nomad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ docker run --rm weaveworksdemos/load-test -d 300 -h 192.168.59.102 -c 2 -r 100
199199
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)
200200
docker run -\-rm weaveworksdemos/load-test -d 300 -h $public_dns -c 2 -r 20
201201
202-
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"
202+
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"
203203
vagrant ssh ci-sockshop-nomad-node1 -c "docker network connect backoffice healthcheck; \
204204
docker network connect internal healthcheck; \
205205
docker network connect external healthcheck; \

0 commit comments

Comments
 (0)