further updates to the hands-on workshop

Author: dmitchsplunk

content/en/ninja-workshops/8-docker-k8s-otel/11-summary.md

@@ -16,3 +16,5 @@ This workshop provided hands-on experience with the following concepts:
 To see how other languages and environments are instrumented with OpenTelemetry,
 explore the [Splunk OpenTelemetry Examples GitHub repository](https://github.com/signalfx/splunk-opentelemetry-examples). 
 
+To run this workshop on your own in the future, refer back to these instructions and use the **Splunk4Rookies - Observability** 
+workshop template in Splunk Show to provision an EC2 instance. 

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

@@ -12,6 +12,37 @@ But how do we do that?
 The first step is to create a Docker image for our application.  This is known as 
 "dockerizing" and application, and the process begins with the creation of a `Dockerfile`. 
 
+But first, let's define some key terms. 
+
+## Key Terms 
+
+### What is Docker?  
+
+_"Docker provides the ability to package and run an application in a loosely isolated environment
+called a container. The isolation and security lets you run many containers simultaneously on
+a given host. Containers are lightweight and contain everything needed to run the application,
+so you don't need to rely on what's installed on the host."_
+
+Source:  https://docs.docker.com/get-started/docker-overview/
+
+### What is a container? 
+
+_"Containers are isolated processes for each of your app's components. Each component
+...runs in its own isolated environment, 
+completely isolated from everything else on your machine."_
+
+Source:  https://docs.docker.com/get-started/docker-concepts/the-basics/what-is-a-container/
+
+### What is a container image?
+
+_"A container image is a standardized package that includes all of the files, binaries,
+libraries, and configurations to run a container."_
+
+### Dockerfile 
+
+_"A Dockerfile is a text-based document that's used to create a container image. It provides
+instructions to the image builder on the commands to run, files to copy, startup command, and more."_
+
 ## Create a Dockerfile 
 
 Let's create a file named `Dockerfile` in the `/home/splunk/workshop/docker-k8s-otel/helloworld` directory.  

content/en/ninja-workshops/8-docker-k8s-otel/7-install-collector-k8s.md

@@ -5,45 +5,70 @@ weight: 7
 time: 15 minutes
 ---
 
+## Recap of Part 1 of the Workshop
+
 At this point in the workshop, we've successfully: 
 
 * Deployed the Splunk distribution of the OpenTelemetry Collector on our Linux Host
 * Configured it to send traces and metrics to Splunk Observability Cloud
 * Deployed a .NET application and instrumented it with OpenTelemetry 
 * Dockerized the .NET application and ensured traces are flowing to o11y cloud
 
-In the next part of the workshop, we want to run the application in Kubernetes instead. 
+If you **haven't** completed the steps listed above, please execute the following commands before proceeding with
+the remainder of the workshop: 
 
-To do this, we first want to deploy the Splunk distribution of the OpenTelemetry Collector 
-to our Kubernetes cluster. 
+``` bash
+cp /home/splunk/workshop/docker-k8s-otel/docker/Dockerfile /home/splunk/workshop/docker-k8s-otel/helloworld/
+cp /home/splunk/workshop/docker-k8s-otel/docker/entrypoint.sh /home/splunk/workshop/docker-k8s-otel/helloworld/
+````
 
-## Uninstall the Host Collector 
+## Introduction to Part 2 of the Workshop
 
-Before moving forward, let’s remove the collector we installed earlier on the Linux host: 
+In the next part of the workshop, we want to run the application in Kubernetes, 
+so we'll need to deploy the Splunk distribution of the OpenTelemetry Collector 
+in our Kubernetes cluster. 
 
-``` bash
-curl -sSL https://dl.signalfx.com/splunk-otel-collector.sh > /tmp/splunk-otel-collector.sh;
-sudo sh /tmp/splunk-otel-collector.sh --uninstall
-```
+Let's define some key terms first. 
+
+### Key Terms
+
+#### What is Kubernetes?
+
+_"Kubernetes is a portable, extensible, open source platform for managing containerized
+workloads and services, that facilitates both declarative configuration and automation."_
 
-## What is Helm? 
+Source:  https://kubernetes.io/docs/concepts/overview/
 
-We'll use Helm to deploy the OpenTelemetry collector in our K8s cluster.  But what is Helm? 
+We'll deploy the Docker image we built earlier for our application into our Kubernetes cluster, after making
+a small modification to the Dockerfile. 
+
+#### What is Helm?
 
 Helm is a package manager for Kubernetes.
 
-“It helps you define, install, and upgrade even the most complex Kubernetes application.”
+_“It helps you define, install, and upgrade even the most complex Kubernetes application.”_
+
+Source:  https://helm.sh/
 
-Source:  https://helm.sh/ 
+We'll use Helm to deploy the OpenTelemetry collector in our K8s cluster.
 
-## Benefits of Helm
+#### Benefits of Helm
 
 * Manage Complexity
   * deal with a single values.yaml file rather than dozens of manifest files
 * Easy Updates
   * in-place upgrades
 * Rollback support
-  * Just use helm rollback to roll back to an older version of a release 
+  * Just use helm rollback to roll back to an older version of a release
+
+## Uninstall the Host Collector 
+
+Before moving forward, let’s remove the collector we installed earlier on the Linux host: 
+
+``` bash
+curl -sSL https://dl.signalfx.com/splunk-otel-collector.sh > /tmp/splunk-otel-collector.sh;
+sudo sh /tmp/splunk-otel-collector.sh --uninstall
+```
 
 ## Install the Collector using Helm
 

content/en/ninja-workshops/8-docker-k8s-otel/9-customize-collector-config.md

@@ -190,7 +190,7 @@ Suppose we want to see the traces and logs that are sent to the collector, so we
 inspect them before sending them to Splunk.  We can use the debug exporter for this purpose, which 
 can be helpful for troubleshooting OpenTelemetry-related issues. 
 
-Let's add the debug exporter to the values.yaml file as follows: 
+Let's add the debug exporter to the bottom of the values.yaml file as follows: 
 
 ``` yaml
 logsEngine: otel

content/en/ninja-workshops/8-docker-k8s-otel/_index.md

@@ -7,6 +7,7 @@ time: 2 minutes
 authors: ["Derek Mitchell"]
 description: By the end of this workshop you'll have gotten hands-on experience instrumenting a .NET application with OpenTelemetry, then Dockerizing the application and deploying it to Kubernetes.  You’ll also gain experience deploying the OpenTelemetry collector using Helm, customizing the collector configuration, and troubleshooting collector configuration issues.
 draft: false
+hidden: true
 ---
 
 In this workshop, you'll get hands-on experience with the following: 

content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/_index.md

@@ -7,6 +7,7 @@ time: 2 minutes
 authors: ["Derek Mitchell"]
 description: By the end of this workshop you'll have gotten hands-on experience deploying the OpenTelemetry Collector, instrumenting an application with OpenTelemetry, capturing tags from the application, and using Troubleshooting MetricSets and Tag Spotlight to determine the root cause of an issue. 
 draft: false
+hidden: true
 ---
 
 In this workshop, you'll get hands-on experience with the following:

workshop/docker-k8s-otel/k8s/Dockerfile

@@ -0,0 +1,42 @@
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+USER app
+WORKDIR /app
+EXPOSE 8080
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["helloworld.csproj", "helloworld/"]
+RUN dotnet restore "./helloworld/./helloworld.csproj"
+WORKDIR "/src/helloworld"
+COPY . .
+RUN dotnet build "./helloworld.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+# Add dependencies for splunk-otel-dotnet-install.sh
+RUN apt-get update && \
+	apt-get install -y unzip
+
+# Download Splunk OTel .NET installer
+RUN curl -sSfL https://github.com/signalfx/splunk-otel-dotnet/releases/latest/download/splunk-otel-dotnet-install.sh -O
+
+# Install the distribution
+RUN sh ./splunk-otel-dotnet-install.sh
+
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./helloworld.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+
+# Copy instrumentation file tree
+WORKDIR "//home/app/.splunk-otel-dotnet"
+COPY --from=build /root/.splunk-otel-dotnet/ .
+
+WORKDIR /app
+COPY --from=publish /app/publish .
+COPY entrypoint.sh .
+
+ENTRYPOINT ["sh", "entrypoint.sh"]
+CMD ["dotnet", "helloworld.dll"]