Updated the all labs

Author: mcouliba

abtesting.adoc

@@ -1,24 +1,24 @@
 == A/B Testing with Service Mesh
 
-*10 MINUTES PRACTICE*
+_10 MINUTE EXERCISE_
 
-https://en.wikipedia.org/wiki/A/B_testing[A/B testing^] allows running multiple versions of a functionality in parallel; and using analytics of the user behavior it is possible to determine which version is the best. 
-It is also possible to launch the new features only for a small set of users, to prepare the general avalability of a new feature. 
-
-In this lab you will see how you can use Site Mesh to do some A/B testing using and route traffic between 2 versions of the Catalog service.
-
-=== Deploying the new Catalog service
+In this lab you will see how you can use *OpenShift Service Mesh* to do some A/B testing using and route traffic between 2 versions of the Catalog service.
 
-A new *_Catalog Service v2_* has been created, this service is developed in https://golang.org/[Golang^] and available in the following repository:
+[sidebar]
+.A/B Testing
+--
+https://en.wikipedia.org/wiki/A/B_testing[A/B testing^] allows running multiple versions of a functionality in parallel and using analytics of the user behavior it is possible to determine which version is the best. 
+It is also possible to launch the new features only for a small set of users, to prepare the general avalability of a new feature. 
+--
 
-<{{CATALOG_GO_GIT_REPO}}>
+=== Deploying the new Catalog Service
 
-This service use the same business logic except that all product descriptions are returned in uppercase.
+A new *_Catalog Service v2_* has been implemented in https://golang.org/[Golang^] which uses the same business logic than *_Catalog Service v1_* 
+except that all product descriptions are returned in **UPPERCASE**.
 
 Let's deploy the service directly from the git repository using the `*oc new-app*` command.
 
 In the terminal window type the following command:
-
 ----
 $ oc new-app {{LABS_GIT_REPO}} \
     --strategy=docker \
@@ -29,7 +29,7 @@ $ oc new-app {{LABS_GIT_REPO}} \
 
 TIP: To simplify the lab, we use the same labels for *_catalog_* and *_catalog-v2_* since they are used for the service routing.
 
-Service Mesh will be used to route the traffic between the catalog service v1 and v2, so you have to add the Istio sidecar to the *_Catalog Service v2_* using the following command:
+**OpenShift Service Mesh** will be used to route the traffic between the catalog service v1 and v2, so you have to add the Istio sidecar to the *_Catalog Service v2_* using the following command:
 
 ----
 $ oc patch dc/catalog-v2 --patch \
@@ -50,11 +50,10 @@ Wait few seconds that the application restarts.
 
 === Enabling A/B Testing
 
-https://en.wikipedia.org/wiki/[A/B_testing^] allows to run in parallel two versions of an application with one single variant (usually visual) and to collect metrics in order to determine the variant with the best effect of the user behavior.
-
-The implementation of such procedure is one are the advantages coming with OpenShift Service Mesh.
+The implementation of such procedure like **A/B Testing** is one are the advantages coming with OpenShift Service Mesh.
+For this lab, you want to answer the following question: 
 
-For this lab, you want to answer the following question: **Do the product descriptions written in uppercase increase sales rate?**
+**Do the product descriptions written in uppercase increase sales rate?**
 
 Let's now create the *_Destination Rule_* resource.
 
@@ -131,10 +130,10 @@ TIP: You can also go to the Web interface and refresh the page to see that produ
 
 Go to Kiali to see the traffic distribution between Catalog v1 and v2.
 
-From the {{ KIALI_URL }}[Kiali Console^], `*click on the 'Graph' link*` in the left navigation and enter the following configuration:
+From the {{ KIALI_URL }}[Kiali Console^], `*click on the 'Graph' link*` in the left navigation and enter the following configuration in the drop down menus:
 
  * Namespace: **{{COOLSTORE_PROJECT}}**
- * Display: **check 'Traffic Animation'**
+ * Display: **'Traffic Animation'** check
  * Edge Label: **Requests percent of total**
  * Fetching: **Last 5 min**
 

catalog-deployment.adoc

@@ -1,6 +1,6 @@
 == Deploying the Catalog Service
 
-_10 MINUTES PRACTICE_
+_10 MINUTE EXERCISE_
 
 In this lab you will learn about building and deploying a microservice based on Java/Maven on OpenShift. 
 The **Catalog Service** is part of the Cool Store architecture to provide a list of products for the CoolStore online shop.

catalog-spring-boot-codeready.adoc

@@ -1,6 +1,6 @@
 == Microservices with Spring Boot
 
-_45 MINUTES PRACTICE_
+_45 MINUTE EXERCISE_
 
 In this lab you will learn about Spring Boot and how you can build microservices 
 using Spring Boot and JBoss technologies. During this lab, you will create a REST API for 
@@ -37,7 +37,7 @@ This is a minimal Spring Boot project with support for RESTful services and Spri
 to a database. This project currently contains no code other than the main class, ***CatalogApplication***
 which is there to bootstrap the Spring Boot application.
 
-Examine ***com/redhat/cloudnative/catalog/CatalogApplication.java*** in the **src/main** directory:
+`*Examine 'com.redhat.cloudnative.catalog.CatalogApplication' class*` in the **/projects/labs/catalog-spring-boot/src/main** directory:
 
 [source,java]
 .CatalogApplication.java
@@ -57,7 +57,7 @@ public class CatalogApplication {
 ----
 
 The database is configured using the Spring application configuration file which is located at 
-**src/main/resources/application.properties**. Examine this file to see the database connection details 
+**/projects/labs/catalog-spring-boot/src/main/resources/application.properties**. Examine this file to see the database connection details 
 and note that an in-memory H2 database is used in this lab for local development and will be replaced
 with a PostgreSQL database in the following labs. Be patient! More on that later.
 
@@ -74,9 +74,9 @@ image:{% image_path codeready-commands-build.png %}[Maven Build,600]
 Once successfully built, the resulting ***jar*** is located in the **target/** directory:
 
 ----
-$ ls labs/catalog-spring-boot/target/*.jar
+$ ls /projects/labs/catalog-spring-boot/target/*.jar
 
-labs/catalog-spring-boot/target/catalog-1.0-SNAPSHOT.jar
+/projects/labs/catalog-spring-boot/target/catalog-1.0-SNAPSHOT.jar
 ----
 
 This is an uber-jar with all the dependencies required packaged in the ***jar*** to enable running the 
@@ -255,9 +255,9 @@ $ curl http://localhost:9000/api/catalog
 [{"itemId":"329299","name":"Red Fedora","desc":"Official Red Hat Fedora","price":34.99},...]
 ----
 
-You can also use the preview url that CodeReady Workspaces has generated for you to be able to test service 
-directly in the browser. Append the path **/api/catalog** at the end of the preview url and try 
-it in your browser in a new tab.
+You can also use the preview url that CodeReady Workspaces has generated for you to be able to test the service 
+that is now running in the workspace directly in the browser. 
+Append the path **/api/catalog** at the end of the preview url and try it in your browser in a new tab.
 
 image:{% image_path springboot-che-preview-browser.png %}[Preview URL,900]
 
@@ -278,10 +278,9 @@ S2I uses the https://access.redhat.com/documentation/en-us/red_hat_jboss_middlew
 of the **Catalog Service** by uploading the Spring Boot uber-jar from the **target/** 
 folder to the OpenShift platform. 
 
-Maven projects can use the https://maven.fabric8.io[Fabric8 Maven Plugin^] in order to use OpenShift S2I for building 
-the container image of the application from within the project. This maven plugin is a Kubernetes/OpenShift client 
-able to communicate with the OpenShift platform using the REST endpoints in order to issue the commands 
-allowing to build a project, deploy it and finally launch a docker process as a pod.
+Maven projects can use the https://maven.fabric8.io[Fabric8 Maven Plugin^] to access the OpenShift S2I for building the application container image. 
+This maven plugin is a Kubernetes/OpenShift client and uses the REST API to communicate with OpenShift and issue commands to build, 
+deploy and launch the application as a pod.
 
 To build and deploy the **Catalog Service** on OpenShift using the *fabric8* maven plugin, 
 which is already configured in CodeReady Workspaces, `*right click on catalog-spring-boot*` project in the project explorer then, `*click on Commands > Deploy > fabric8:deploy*`

continuous-delivery.adoc

@@ -1,11 +1,13 @@
 ==  Automating Deployments Using Pipelines
 
-*20 MINUTES PRACTICE*
+_20 MINUTE EXERCISE_
 
 In this lab you will learn about deployment pipelines and you will create a pipeline to 
 automate build and deployment of the Inventory service.
 
-==== Continuous Delivery
+[sidebar]
+.Continuous Delivery
+--
 So far you have been building and deploying each service manually to OpenShift. Although 
 it's convenient for local development, it's an error-prone way of delivering software if 
 extended to test and production environments.
@@ -18,13 +20,12 @@ to go through in order to reach upper environments and eventually to production.
 OpenShift simplifies building CI/CD Pipelines by integrating
 the popular https://jenkins.io/doc/book/pipeline/overview/[Jenkins Pipelines^] into
 the platform and enables defining truly complex workflows directly from within OpenShift.
-
-The first step for any deployment pipeline is to store all code and configurations in 
-a source code repository.
+--
 
 ==== Create a Git Repository for Inventory
 
-You can use any Git server (e.g. GitHub, BitBucket, etc) for this lab but we have prepared a 
+The first step for any deployment pipeline is to store all code and configurations in 
+a source code repository. You can use any Git server (e.g. GitHub, BitBucket, etc) for this lab but we have prepared a 
 Gogs git server which you can access here: 
 
 {{ GIT_URL }}[{{ GIT_URL }}^]

debug-codeready.adoc

@@ -1,6 +1,6 @@
 ## Debugging Applications
 
-*20 MINUTES PRACTICE*
+*20 MINUTE EXERCISE*
 
 In this lab you will debug the CoolStore application using Java remote debugging and 
 look into line-by-line code execution as the code runs inside a container on OpenShift.

env-info.adoc

@@ -1,26 +1,25 @@
-## Appendix: Environment Info
+== Appendix: Environment Info
 
 You find all urls, hostnames, usernames and passwords that are needed during the 
 labs in this page. Note that the urls are also embedded inside each lab instructions.
 
-**OPENSHIFT**
-
+OPENSHIFT::
 {{ OPENSHIFT_CONSOLE_URL }}
 
-**GIT SERVER**
-
+GIT SERVER::
 {{ GIT_URL }}
 
-**NEXUS MAVEN REPOSITORY**
-
+NEXUS MAVEN REPOSITORY::
 {{ NEXUS_URL }}
 
-**ECLIPSE CHE IDE**
-
-Register an account on Eclipse Che using an email address.
+CODEREADY WORKSPACES::
+{{ CODEREADY_WORKSPACES_URL }}
 
-{{ ECLIPSE_CHE_URL }}
+KIALI::
+{{ KIALI_URL }}
 
-**OPENSHIFT DOCS**
+JAEGER::
+{{ JAEGER_URL }}
 
+OPENSHIFT DOCS::
 {{ OPENSHIFT_DOCS_BASE }}

fault-tolerance-codeready.adoc

@@ -1,6 +1,6 @@
 ## Service Resilience and Fault Tolerance
 
-*30 MINUTES PRACTICE*
+_30 MINUTE EXERCISE_
 
 In this lab you will learn about how you can build service resilience and fault tolerance into 
 the applications both at the infrastructure level using OpenShift capabilities as well as 
@@ -266,6 +266,9 @@ user load and recovers from failures. However failures also happen in the downst
 is dependent on. It's not uncommon that the whole application fails or slows down because one of the downstream 
 services consumed by the application is not responsive or responds slowly.
 
+[sidebar]
+.Circuit Breaker
+--
 https://martinfowler.com/bliki/CircuitBreaker.html[Circuit Breaker^] is a pattern to address this issue and while 
 it became popular with microservice architecture, it's a useful pattern for all applications that depend on other 
 services.
@@ -282,6 +285,7 @@ image:{% image_path fault-circuit-breaker.png %}[Circuit Breaker,300]
 Spring Boot and Thorntail provide convenient integration with https://github.com/Netflix/Hystrix[Hystrix^] 
 which is a framework that provides circuit breaker functionality. Eclipse Vert.x, in addition to integration 
 with Hystrix, provides built-in support for circuit breakers.
+--
 
 Let's take the Inventory service down and see what happens to the CoolStore online shop.
 
@@ -303,7 +307,7 @@ The CoolStore online shop cannot function without the products list, however the
 crucial bit in the shopping experience. Let's add a circuit breaker for calls to the Inventory service and 
 provide a default inventory status when the Inventory service is not responsive.
 
-In the `*gateway-vertx*` project, open `*src/main/java/com/redhat/cloudnative/gateway/GatewayVerticle.java*` and 
+In the `*gateway-vertx*` project, `*open /projects/labs/gateway-vertx/src/main/java/com/redhat/cloudnative/gateway/GatewayVerticle.java*` and 
 replace its code it with the following code:
 
 [source,java]
@@ -458,8 +462,8 @@ image:{% image_path eclipse-che-commands-build.png %}[Maven Build,340]
 Although you can use the **DEPLOY > fabric8:deploy** from the commands palette, you 
 can also trigger a new container image build on OpenShift using 
 the `*oc start-build*` command which allows you to build container images directly from the application 
-archives (`jar`, `*war`, etc) without the need to have access to the source code for example by downloading 
-the `*jar*` file form the Maven repository (e.g. Nexus or Artifactory).
+archives (`jar`, `war`, etc) without the need to have access to the source code for example by downloading 
+the `jar` file form the Maven repository (e.g. Nexus or Artifactory).
 
 ----
 $ oc start-build gateway-s2i --from-file=labs/gateway-vertx/target/gateway-1.0-SNAPSHOT.jar

gateway-deployment.adoc

@@ -1,6 +1,6 @@
 == Deploying the API Gateway
 
-_10 MINUTES PRACTICE_
+_10 MINUTE EXERCISE_
 
 As explained in the introduction at the core of the Cool Store Portal architecture there is a Gateway component.
 

gateway-vertx-codeready.adoc

@@ -1,6 +1,6 @@
 == Reactive Microservices with Eclipse Vert.x
 
-_45 MINUTES PRACTICE_
+_45 MINUTE EXERCISE_
 
 In this lab you will learn about Eclipse Vert.x and how you can 
 build microservices using reactive principles. During this lab you will 
@@ -48,7 +48,7 @@ image:{% image_path vertx-event-loop.png %}[Vert.x Event Loop,600]
 
 Although you can have multiple, there is currently only one Verticle created in the *_gateway-vertx_* project. 
 
-`*Examine 'GatewayVerticle' class*` in the *_com.redhat.cloudnative.gateway_* package in the **src** directory.
+`*Examine 'GatewayVerticle' class*` in the **com.redhat.cloudnative.gateway** package in the **/projects/labs/gateway-vertx/src** directory.
 
 [source,java]
 .GatewayVerticle.java
@@ -89,9 +89,9 @@ image:{% image_path codeready-commands-build.png %}[Maven Build,600]
 Once successfully built, the resulting *_jar_* is located in the **target/** directory:
 
 ----
-$ ls labs/gateway-vertx/target/*.jar
+$ ls /projects/labs/gateway-vertx/target/*.jar
 
-labs/gateway-vertx/target/gateway-1.0-SNAPSHOT.jar
+/projects/labs/gateway-vertx/target/gateway-1.0-SNAPSHOT.jar
 ----
 
 This is an uber-jar with all the dependencies required packaged in the *jar* to enable running the 
@@ -107,7 +107,7 @@ architecture.
 
 image:{% image_path coolstore-arch.png %}[API Gateway Pattern,400]
 
-Replace the content of *_src/main/java/com/redhat/cloudnative/gateway/GatewayVerticle.java_* class with the following:
+`*Replace the content of '/projects/labs/gateway-vertx/src/main/java/com.redhat.cloudnative.gateway/GatewayVerticle.java'*` class with the following:
 
 [source,java]
 .GatewayVerticle.java
@@ -260,10 +260,9 @@ S2I uses the https://access.redhat.com/documentation/en-us/red_hat_jboss_middlew
 image of the API Gateway service by uploading the Vert.x uber-jar from 
 the **target** folder to the OpenShift platform. 
 
-Maven projects can use the https://maven.fabric8.io[Fabric8 Maven Plugin^] in order to use OpenShift S2I for building 
-the container image of the application from within the project. This maven plugin is a Kubernetes/OpenShift client 
-able to communicate with the OpenShift platform using the REST endpoints in order to issue the commands 
-allowing to build a project, deploy it and finally launch a docker process as a pod.
+Maven projects can use the https://maven.fabric8.io[Fabric8 Maven Plugin^] to access the OpenShift S2I for building the application container image. 
+This maven plugin is a Kubernetes/OpenShift client and uses the REST API to communicate with OpenShift and issue commands to build, 
+deploy and launch the application as a pod.
 
 To build and deploy the **Gateway Service** on OpenShift using the *fabric8* maven plugin, 
 which is already configured in CodeReady Workspaces, `*right click on 'gateway-vertx'*` project in the project explorer then, `*click on 'Commands > Deploy > fabric8:deploy'*`

getting-started-codeready.adoc

@@ -1,6 +1,6 @@
 == Getting Started with OpenShift
 
-_5 MINUTES PRACTICE_
+_5 MINUTE EXERCISE_
 
 In this lab you will learn about providing your Developer Workspace with a Kubernetes-native development platform 
 and getting familiar with the OpenShift CLI and OpenShift Web Console.
@@ -38,10 +38,14 @@ Finally, `*enter your account information*` and `*click on 'Submit'*`
 image:{% image_path codeready-account-information.png %}[CodeReady Workspaces - Log in,300]
 
 === Creating a Workspace
-Once logged into CodeReady Workspaces, you can now create your workspace based on a stack.
+Once logged into CodeReady Workspaces, you can now create your workspace based on the **Cloud-Native Stack**.
+
+[TIP]
+====
 A **Stack** is a template for workspace configuration.
 It includes the programming language and tools needed in your workspace to create applications.
 Stacks make it possible to deploy identical workspaces for all users on demand.
+====
 
 `*Select the stack called 'Cloud-Native'*` and then `*click on 'CREATE & OPEN'*`.