Merge remote-tracking branch 'upstream/main'

Author: dmitchsplunk

content/en/ninja-workshops/8-docker-k8s-otel/2-deploy-collector.md

@@ -105,6 +105,8 @@ for further details on how to install the collector.
 
 Let's confirm that the collector is running successfully on our instance. 
 
+> Press Ctrl + C to exit out of the status command.
+
 {{< tabs >}}
 {{% tab title="Script" %}}
 
@@ -137,6 +139,8 @@ sudo systemctl status splunk-otel-collector
 
 We can view the collector logs using `journalctl`: 
 
+> Press Ctrl + C to exit out of tailing the log.
+
 {{< tabs >}}
 {{% tab title="Script" %}}
 

content/en/ninja-workshops/8-docker-k8s-otel/3-deploy-dotnet-app.md

@@ -144,7 +144,7 @@ info: Microsoft.Hosting.Lifetime[0]
 {{% /tab %}}
 {{< /tabs >}}
 
-Once it's running, open a second SSH terminal and access the application using curl: 
+Once it's running, open a second SSH terminal to your Ubuntu instance and access the application using curl: 
 
 {{< tabs >}}
 {{% tab title="Script" %}}
@@ -182,6 +182,8 @@ Hello, Tom!
 {{% /tab %}}
 {{< /tabs >}}
 
+> Press Ctrl + C to quit your Helloworld app before moving to the next step.
+
 ## Next Steps
 
 What are the two methods that we can use to instrument our application with OpenTelemetry?  

content/en/ninja-workshops/8-docker-k8s-otel/4-instrument-app-with-otel.md

@@ -183,4 +183,6 @@ Next, click on **Traces** on the right-hand side to see the traces captured for
 
 An individual trace should look like the following: 
 
-![Traces](../images/trace.png)
+![Traces](../images/trace.png)
+
+> Press Ctrl + C to quit your Helloworld app before moving to the next step.

content/en/ninja-workshops/8-docker-k8s-otel/5-dockerize-app.md

@@ -45,9 +45,20 @@ instructions to the image builder on the commands to run, files to copy, startup
 
 ## Create a Dockerfile 
 
-Let's create a file named `Dockerfile` in the `/home/splunk/workshop/docker-k8s-otel/helloworld` directory.  
+Let's create a file named `Dockerfile` in the `/home/splunk/workshop/docker-k8s-otel/helloworld` directory. 
 
-It should include the following content: 
+``` bash
+cd /home/splunk/workshop/docker-k8s-otel/helloworld
+```
+
+You can use vi or nano to create the file. We will show an example using vi:
+
+``` bash
+vi Dockerfile
+```
+Copy and paste the following content into the newly opened file:
+
+> Press 'i' to enter into insert mode in vi before pasting the text below.
 
 ``` dockerfile
 FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
@@ -75,6 +86,15 @@ COPY --from=publish /app/publish .
 ENTRYPOINT ["dotnet", "helloworld.dll"]
 ```
 
+To save your changes in vi, hit the ESC key then type
+
+``` bash
+:wq!
+
+```
+followed by the ENTER/RETURN key.
+
+
 What does all this mean?  Let's break it down. 
 
 ## Walking through the Dockerfile