Fixed exercises and flow

Author: rcastley

content/en/s4r/6-apm/4-apm-service-breakdown.md

@@ -7,7 +7,7 @@ weight: 4
 
 * In the right-hand pane click on the {{% button style="grey"  %}}Breakdown{{% /button %}}.
 * Select `tenant.level` in the list.
-* Click on **gold** to select it.
+* Back in the Service MapClick on **gold** to select it.
 * Click on {{% button style="grey"  %}}Breakdown{{% /button %}} and select `version`.
 * Repeat this for **silver** and **bronze**.
 {{< tabs >}}

content/en/s4r/6-apm/6-apm-waterfall.md

@@ -18,7 +18,7 @@ Each span in Splunk APM captures a single operation. Splunk APM considers a span
 **What is the error message and version being reported in the span metadata?**
 {{% /tab %}}
 {{% tab title="Answer" %}}
-**Invalid request and `v350.10`**
+**Invalid request and `v350.10`**.
 {{% /tab %}}
 {{< /tabs >}}
 
@@ -38,6 +38,6 @@ Related Content relies on specific metadata that allow APM, Infrastructure Monit
 {{% notice title="Exercise" style="green" icon="running" %}}
 
 * At the very bottom of the **Trace Waterfall** click on the word **Logs (1)**. This highlights that there are **Related Logs** for this trace.
-* Click on the **Logs for trace** entry in the pop-up, the will open the **Log Observer** view in a new tab.
+* Click on the **Logs for trace XXX** entry in the pop-up, this will open the logs for the complete trace in **Log Observer**.
 
 {{% /notice %}}

content/en/s4r/7-log-observer/1-log-filtering.md

@@ -20,7 +20,7 @@ We need to focus on just the Error messages in the logs:
 * Click on the **Group By** drop-down box and use the filter to find **Severity**.
 * Once selected click the {{% button style="blue" %}}Apply{{% /button %}} button (notice that the chart legend changes to show debug, error and info).
   ![legend](../images/severity-logs.png)
-* Selecting just the error logs can be done by either clicking on the word error (**1**) in the legend, followed by selecting **Add to filter** or by adding `severity=error` directly in the filter box.
+* Selecting just the error logs can be done by either clicking on the word error (**1**) in the legend, followed by selecting **Add to filter**.
 * You could also add the service name, `sf_service=paymentservice`, to the filter if there are error lines for multiple services, but in our case, this is not necessary.
   ![Error Logs](../images/log-observer-errors.png)
 

content/en/s4r/7-log-observer/2-log-entry.md

@@ -19,14 +19,15 @@ Before we look at a specific log line, let's quickly recap what we have done so
 * Click on an error entry in the log table (make sure it says `hostname: "paymentservice-xxxx"` in case there is a rare error from a different service in the list too.
 {{< tabs >}}
 {{% tab title="Question" %}}
-**Based on the message, what would you tell the development teams to do to resolve the issue?**
+**Based on the message, what would you tell the development team to do to resolve the issue?**
 {{% /tab %}}
 {{% tab title="Answer" %}}
-**Either fix the issue in `v350.10` or rollback to `v350.9`.**
+**The development team needs to rebuild and deploy the container with a valid API Token or rollback to `v350.9`**.
 {{% /tab %}}
 {{< /tabs >}}
 
-![Log Message](../images/log-observer-log-message.png)
+  ![Log Message](../images/log-observer-log-message.png)
+* Click on the **X** in the log message pane to close it.
 
 {{% /notice %}}
 

content/en/s4r/7-log-observer/3-log-timeline-chart.md

@@ -9,24 +9,26 @@ Let's look at creating a **Log Timeline** chart. The Log Timeline chart is used
 
 {{% notice title="Info" style="green" title="Exercise" icon="running" %}}
 
-First, we will reduce the amount of information to just the columns we are interested in:
+First, we will reduce the amount of information to only the columns we are interested in:
 
-* Click on the {{% icon icon="cog" %}} icon to open the **Table Settings**, untick `_raw` and ensure the following fields are selected:
+* Click on the Configure Table {{% icon icon="cog" %}} icon above the **Logs table** to open the **Table Settings**, untick `_raw` and ensure the following fields are selected:
   * `k8s.pod_name`
   * `message`
   * `version`
   ![Log Table Settings](../images/log-observer-table.png)
-* Remove the fixed time from the time picker, and set it to the **Last** 15 minutes**.
-* To make this work for all traces, remove the `trace_id` from the filter and add `sf_service=paymentservice` and `sf_environment=[WORKSHOPNAME]`.
+* Remove the fixed time from the time picker, and set it to the **Last 15 minutes**.
+* To make this work for all traces, remove the `trace_id` from the filter and add the fields `sf_service=paymentservice` and `sf_environment=[WORKSHOPNAME]`.
 * Click **Save** and select **Save to Dashboard**.
   ![save it](../images/save-query.png)
 * In the chart creation dialog box that appears, enter the **Chart name**, this will be the name of the chart on the dashboard. Use the following format: `Initials - Log Timeline Chart`
 * Ensure that **Log Timeline** is selected as the **Chart Type**.
   ![log timeline](../images/log-timeline.png?classes=left&width=25vw)
-* Click {{% button style="blue" %}}Select Dashboard{{% /button %}} and then click {{% button style="blue" %}}New Dashboard{{% /button %}} in the Dashboard Selection dialog box.
+* Click {{% button style="blue" %}}Select Dashboard{{% /button %}} and then click {{% button style="blue" %}}New dashboard{{% /button %}} in the Dashboard Selection dialog box.
 * In the **New dashboard** dialog box, enter a name for the new dashboard (no need to enter a description). Use the following format: `Initials - Service Health Dashboard` and click {{% button style="blue" %}}Save{{% /button %}}
 * Ensure the new dashboard is highlighted in the list (**1**) and click {{% button style="blue" %}}OK{{% /button %}} (**2**).
   ![Save dashboard](../images/dashboard-save.png)
 * Click the {{% button %}}Save{{% /button %}} button.
 
 {{% /notice %}}
+
+Next, we will create a **Log View** chart.

content/en/s4r/7-log-observer/4-log-view-chart.md

@@ -24,10 +24,10 @@ As with the previous Log Timeline chart, we will add a version of this chart to
 * The result should be similar to the dashboard below:
   ![Custom Dashboard](../images/log-observer-custom-dashboard.png)
 * As the last step in this exercise, let us add your dashboard to your workshop team page, this will make it easy to find later in the workshop.
-* At the top of the page, click on the ***...*** behind the name of your dashboard (**1**).
-* Select **Link to teams** from the drop-down (**2**).
-* In the following **Link to teams** dialog box, find the Workshop team that your instructor will have provided for you.
+* At the top of the page, click on the ***...*** to the left of your dashboard name(**1**).
   ![linking](../images/linking.png)
+* Select **Link to teams** from the drop-down (**2**).
+* In the following **Link to teams** dialog box, find the Workshop team that your instructor will have provided for you and click {{% button style="blue" %}}Done{{% /button %}}.
 
 {{% /notice %}}
 

content/en/s4r/9-custom-dashboard/2-add-chart.md

@@ -12,21 +12,19 @@ In this section, we are going to use the **Copy and Paste** functionality to ext
 * Select the **2+** at the top of the page and select **Paste charts**, this will create the charts in your custom dashboard.
 <!--* Add `sf_environment:[WORKSHOPNAME]` and `sf_service:payment_service` to the override filter box. ( This will make sure the charts only show data for your workshop **paymentservice**).
 -->
-* The chart currently show data for all *Environments* & *Services*, so lets add a filter to our environment and the paymentservice.
-* Click on the the 3 dots **...** at the  top right side of the **Request Rate** chart. This wil open the edit mode.
-* In the new screen, click on the {{% button style="blue" %}}sf_environment{{% /button %}} button (1) in the middle of the screen, and pick the [WORKSHOPNAME] from the drop down. The button should change to **sf_environment:[WORKSHOPNAME]**
+* The chart currently shows data for all **Environments** and **Services**, so let's add a filter to our environment and the paymentservice.
+* Click on the 3 dots **...** at the top right side of the **Request Rate** chart. This will open the chart in edit mode.
+* In the new screen, click on the {{% button style="blue" %}}sf_environment{{% /button %}} button (1) in the middle of the screen, and pick the [WORKSHOPNAME] from the drop-down. The button should change to **sf_environment:[WORKSHOPNAME]**
 * Do the same with the {{% button style="blue" %}}sf_service.{{% /button %}} button (2), only this time change it to `paymentservice`.
-![edit chart](../images/edit-chart.png)
-* Click the {{% button style="blue" %}}Save and close {{% /button %}} button (3). 
+  ![edit chart](../images/edit-chart.png)
+* Click the {{% button style="blue" %}}Save and close {{% /button %}} button (**3**).
 * Click {{% button style="blue" %}}Save{{% /button %}}.
 * As the new pasted charts appeared at the bottom of our dashboard, we need to re-organize our dashboard gain.
 * First drag the *Log view* chart to the second row, between the *Instructions* chart and the *Log Lines* chart, and expand it to fill the row.
-* Then first resize the two new charts to be 1/3 of a row chart we just pasted, before moving them to the top row, so you have the *Instruction, Request Rate & Error Rate* chart taking up the top row.
-
-![new dashboard look](../images/copyandpastedcharts.png)
-
+* Resize the two new charts to be 1/3 of a row chart we just pasted, before moving them to the top row, so you have the *Instruction, Request Rate & Error Rate* chart taking up the top row.
+  ![New dashboard look](../images/copyandpastedcharts.png)
 * Click the {{% button style="blue" %}}Save{{% /button %}} button again to keep th lates changes.
 
-Now we are going to create a custom chart based on our Synthetic test that is running.
-
 {{% /notice %}}
+
+Next, we are going to create a custom chart based on our Synthetic test that is running.

content/en/s4r/9-custom-dashboard/3-custom-chart.md

@@ -4,15 +4,15 @@ linkTitle: 3. Add Custom Chart
 weight: 3
 ---
 
-In this part of the workshop we are going to create a chart that we will add to our dashboard, we will also link it to the detector we previously build. This will allow us to see the behaviour of our test and get alerted if one or more of our test runs breaches its SLA.
+In this part of the workshop we are going to create a chart that we will add to our dashboard, we will also link it to the detector we previously built. This will allow us to see the behavior of our test and get alerted if one or more of our test runs breach its SLA.
 
 {{% notice title="Exercise" style="green" icon="running" %}}
 
 * At the top of the dashboard click on the **+** and select *chart*. This will bring us to the new chart screen.
 
 ![new chart screen](../images/new-chart.png)
 
-* First, use the {{% button style="grey" %}}Untitled chart{{% /button %}} input field and name the chart **Overall Test Duration**. Next, you can set the Description to **Showing the Synthetic Test for the complete application**.
+* First, use the {{% button style="grey" %}}Untitled chart{{% /button %}} input field and name the chart **Overall Test Duration**. Next, you can set the Description to **Show the Synthetic Test for the complete application**.
 * For this exercise we want a bar or column chart, so click on the 3d icon ![column chart](../images/barchart-icon.png?classes=inline&height=25px)in the chart option box.
 * We need to provide a signal or metric that we are going to display. In this case, we want *synthetics.run.duration.time.ms* (This is runtime in duration for our test)
 * Click the {{% button style="blue" %}}Add filter{{% /button %}} button.