Updated screenshots and minor edits

Author: rcastley

content/en/ninja-workshops/1-automatic-discovery/2-petclinic-kubernetes/2-preparation/1-otel.md

@@ -7,7 +7,7 @@ weight: 1
 
 To get Observability signals (**metrics, traces** and **logs**) into **Splunk Observability Cloud** we need to deploy the Splunk OpenTelemetry Collector into the Kubernetes cluster.
 
-For this workshop, we will be using the Splunk OpenTelemetry Collector Helm Chart. First, we need to add the Helm chart repository to Helm and run helm repo update to ensure the latest version:
+For this workshop, we will be using the Splunk OpenTelemetry Collector Helm Chart. First, we need to add the Helm chart repository to Helm and run `helm repo update` to ensure the latest version:
 
 {{< tabs >}}
 {{% tab title="Install Helm Chart" %}}

content/en/ninja-workshops/1-automatic-discovery/2-petclinic-kubernetes/2-preparation/2-petclinic.md

@@ -10,7 +10,7 @@ The first deployment of our application will be using prebuilt containers to giv
 {{% tab title="kubectl apply" %}}
 
 ``` bash
-kubectl apply -f ~/workshop/petclinic/petclinic-deploy.yaml
+kubectl apply -f ~/workshop/petclinic/deployment.yaml
 ```
 
 {{% /tab %}}
@@ -42,7 +42,7 @@ configmap/scriptfile created
 {{% /tab %}}
 {{< /tabs >}}
 
-At this point, we can verify the deployment by checking that the Pods are running. The containers need to be downloaded and started so this may take a couple of minutes.
+At this point, we can verify the deployment by checking that the Pods are running. The containers need to be downloaded and started, so this may take a couple of minutes.
 
 {{< tabs >}}
 {{% tab title="kubectl get pods" %}}
@@ -82,13 +82,13 @@ curl http://ifconfig.me
 
 ```
 
-You can validate if the application is running by visiting **http://<IP_ADDRESS>:81** (replace **<IP_ADDRESS>** with the IP address you obtained above). You should see the PetClinic application running. The application is also running on ports **80** & **443** if you prefer to use those or port **81** is unreachable.
+Validate if the application is running by visiting **http://<IP_ADDRESS>:81** (replace **<IP_ADDRESS>** with the IP address you obtained above). You should see the PetClinic application running. The application is also running on ports **80** & **443** if you prefer to use those or port **81** is unreachable.
 
 ![Pet shop](../../images/petclinic.png)
 
 Make sure the application is working correctly by visiting the **All Owners** **(1)** and **Veterinarians** **(2)** tabs, confirming that you see a list of names on each page.
 
-![owners](../../images/petclinic-owners.png)
+![Owners](../../images/petclinic-owners.png)
 
 <!--
 Once they are all running, the application will take a few minutes to fully start up, create the database and synchronize all the services, so let's use the time to check the local private repository is active.

content/en/ninja-workshops/1-automatic-discovery/2-petclinic-kubernetes/2-preparation/_index.md

@@ -11,7 +11,7 @@ The instructor will provide you with the login information for the instance that
 When you first log into your instance, you will be greeted by the Splunk Logo as shown below. If you have any issues connecting to your workshop instance, please reach out to your Instructor.
 
 ``` text
-$ ssh -p 2222 splunk@<ip-address>
+$ ssh -p 2222 splunk@<IP-ADDRESS>
 
 ███████╗██████╗ ██╗     ██╗   ██╗███╗   ██╗██╗  ██╗    ██╗  
 ██╔════╝██╔══██╗██║     ██║   ██║████╗  ██║██║ ██╔╝    ╚██╗ 
@@ -20,9 +20,7 @@ $ ssh -p 2222 splunk@<ip-address>
 ███████║██║     ███████╗╚██████╔╝██║ ╚████║██║  ██╗    ██╔╝ 
 ╚══════╝╚═╝     ╚══════╝ ╚═════╝ ╚═╝  ╚═══╝╚═╝  ╚═╝    ╚═╝  
 Last login: Mon Feb  5 11:04:54 2024 from [Redacted]
-Waiting for cloud-init status...
-Your instance is ready!
-splunk@show-no-config-i-0d1b29d967cb2e6ff:~$ 
+splunk@show-no-config-i-0d1b29d967cb2e6ff ~ $
 ```
 
 To ensure your instance is configured correctly, we need to confirm that the required environment variables for this workshop are set correctly. In your terminal, run the following script and check that the environment variables are present and set with actual valid values:

content/en/ninja-workshops/1-automatic-discovery/2-petclinic-kubernetes/3-verify-setup/_index.md

@@ -9,19 +9,14 @@ Once the installation has completed, you can log in to **Splunk Observability Cl
 
 From the left-hand menu, click on **Infrastructure** and select **Kubernetes**, then select the **Kubernetes nodes** pane. Once you are in the **Kubernetes nodes** view, change the **Time** filter from **-4h** to the last 15 minutes **(-15m)** to focus on the latest data.
 
-Next, from the list of clusters, select the cluster name of your workshop instance. Note: You can get the unique part from your cluster name by using the `INSTANCE` from the output from the shell script you ran earlier. **(1)**
+Next, from the list of nodes, select the Node name of your workshop instance. Note: You can get the unique part from your cluster name by using the `INSTANCE` from the output from the shell script you ran earlier. **(1)**
 
-![NavigatorI](../images/navigatorlist.png)
+![NavigatorList](../images/navigatorlist.png)
 
-You can now select your node by clicking on its name **(1)** in the node list.
+Open the **Hierarchy Map** by clicking on the *Hierarchy Map* link in the gray pane to show the graphical representation of your node.
 
-![NavigatorII](../images/nodelist.png)
+![HeirarchyMap](../images/hierarchymap.png)
 
-Open the **Hierarchy Map** by clicking on the *Hierarchy Map*  **(1)** link in the gray pane to show the graphical representation of your node.
+You will now only have your cluster visible. Scroll down the page to see the metrics coming in from your cluster. Locate the **Node log events rate** **(1)** chart and click on a vertical bar to see the log entries coming in from your cluster.
 
-![NavigatorII](../images/hierarchymap.png)
-
-You will now only have your cluster visible.
-Scroll down the page to see the metrics coming in from your cluster. Locate the **Node log events rate** chart and click on a vertical bar to see the log entries coming in from your cluster.
-
-![logs](../images/k8s-peek-at-logs.png)
+![Logs](../images/k8s-peek-at-logs.png)

content/en/ninja-workshops/1-automatic-discovery/2-petclinic-kubernetes/4-apm/1-patching-deployment.md

@@ -23,7 +23,7 @@ Image:         quay.io/phagen/spring-petclinic-api-gateway:0.0.2
 {{% /tab %}}
 {{< /tabs >}}
 
-Next, enable the Java automatic discovery and configuration for all of the services by adding the annotation to the deployments. The following command will patch the all deployments. This will trigger the OpenTelemetry Operator to inject the `splunk-otel-java` image into the Pods:
+Next, enable the Java automatic discovery and configuration for all the services by adding the annotation to the deployments. The following command will patch the all deployments. This will trigger the OpenTelemetry Operator to inject the `splunk-otel-java` image into the Pods:
 
 {{< tabs >}}
 {{% tab title="Patch all PetClinic services" %}}
@@ -77,5 +77,3 @@ Navigate back to the Kubernetes Navigator in **Splunk Observability Cloud**. Aft
 ![restart](../../images/k8s-navigator-restarted-pods.png)
 
 Wait for the Pods to turn green in the Kubernetes Navigator, then go tho the next section.
-
-

content/en/ninja-workshops/1-automatic-discovery/2-petclinic-kubernetes/4-apm/2-apm-data.md

@@ -4,10 +4,8 @@ linkTitle: 2. Viewing APM Data
 weight: 2
 ---
 
-Return to Splunk Observability Cloud, and from the left-hand menu click on  ![APM](../../images/apm-icon.png?classes=inline&height=25px) **APM** to see the data generated by the traces from the newly instrumented services. Change the **Environment** filter **(1)** to the name of your workshop instance in the dropdown box. (Note: this will be **`<INSTANCE>-workshop`** where **`INSTANCE`** is the value from the shell script you ran earlier. Ensure it is the only one selected.)
+In the left-hand menu click on **APM** to see the data generated by the traces from the newly instrumented services. Change the **Environment** filter **(1)** to the name of your workshop instance in the dropdown box. (Note: this will be **`<INSTANCE>-workshop`** where **`INSTANCE`** is the value from the shell script you ran earlier. Ensure it is the only one selected.)
 
 ![apm](../../images/zero-config-first-services-overview.png)
 
-You will see the name **(2)** of the **api-gateway** service and metrics in the Latency and Request & Errors charts. (If you see a Critical Alert, you can ignore it as it is caused by the sudden request increase generated by the load generator). You will also see the rest of the services appear.
-
-Once you see the Customer service, Vets service and Visits services as shown in the screenshot above, click on the **Service Map** **(3)**  pane to get ready for the next section.
+If you see a Critical Alert, you can ignore it as it is caused by the sudden request increase generated by the load generator **(2)**. Click on the **Service Map** **(3)** pane to get ready for the next section.

content/en/ninja-workshops/1-automatic-discovery/2-petclinic-kubernetes/5-traces/1-service-map.md

@@ -6,14 +6,14 @@ weight: 1
 
 ![apm map](../../images/zero-config-first-services-map.png)
 
-The above map shows all the interactions between all of the services. The map may still be in an interim state as it will take the Petclinic Microservice application a few minutes to start up and fully synchronize. Reducing the time filter to a custom time of **2 minutes** by entering -2m will help. You can click on the **Refresh** button **(1)** in the top right-hand corner of the screen. The initial startup-related errors indicated by red circles will eventually disappear.
+The above map shows all the interactions between all the services. The map may still be in an interim state as it will take the PetClinic Microservice application a few minutes to start up and fully synchronize. Reducing the time filter to a custom time of **2 minutes** by entering **-2m** will help. You can click on the **Refresh** button **(1)** in the top right-hand corner of the screen. The initial startup-related errors indicated by red circles will eventually disappear.
 
 Next, let's examine the metrics that are available for each service that is instrumented by visiting the request, error, and duration (RED) metrics Dashboard.
 
 For this exercise, we are going to use a common scenario you would use if your service operation was showing high latency or errors.
 
-Click on **customers-service** in the Dependency map **(1)**, then make sure the `customers-service` is selected in the **Services** dropdown box **(2)**. Next, select `GET /Owners` from the Operations dropdown **(3**)** adjacent to the Service name.
+Click on **customers-service** in the Dependency map, then make sure the `customers-service` is selected in the **Services** dropdown box **(1)**. Next, select `GET /owners` from the Operations dropdown **(2)** adjacent to the Service name.
 
-This should give you the workflow with a filter on `GET /owners` **(1)** as shown below.
+This should give you the workflow with a filter on `GET /owners` as shown below:
 
 ![select a trace](../../images/select-workflow.png)

content/en/ninja-workshops/1-automatic-discovery/2-petclinic-kubernetes/5-traces/4-red-metrics.md

@@ -4,12 +4,10 @@ linkTitle: 4. Service Centric View
 weight: 4
 ---
 
-Splunk APM provide **Service Centric Views** that provide engineers a deep understanding of service performance in one centralized view. Now, across every service, engineers can quickly identify errors or bottlenecks from a service’s underlying infrastructure, pinpoint performance degradations from new deployments, and visualize the health of every third party dependency.
+Splunk APM provide **Service Centric Views** that provide engineers a deep understanding of service performance in one centralized view. Now, across every service, engineers can quickly identify errors or bottlenecks from a service’s underlying infrastructure, pinpoint performance degradation from new deployments, and visualize the health of every third party dependency.
 
-To see this dashboard for the `api-gateway`, click on **APM** from the right hand menu and go to the **Dependency Map**. Make sure you have the `api-gateway` service selected in the Service Map, then click on the ***View Service** button in the top, right-hand pane. This will bring you to the Service Centric View dashboard:
+To see this dashboard for the `api-gateway`, click on **APM** from the left-hand menu and then click on the `api-gateway` service in the list. This will bring you to the Service Centric View dashboard:
 
 ![service_maps](../../images/service-view.png)
 
-This view, which is available for each of your instrumented services, offers an overview of **Service metrics**, **Runtime metrics** and **Infrastructure metrics**.
-
-You can select the **Back** function of you browser to go back to the previous view.
+This view, which is available for each of your instrumented services, offers an overview of **Service metrics**, **Error breakdown**, **Runtime metrics (Java)** and **Infrastructure metrics**.