Merge pull request #347 from dmitchsplunk/main

Tech Summit workshop updates

Author: hagen-p

content/en/ninja-workshops/8-docker-k8s-otel/6-add-instrumentation-to-dockerfile.md

@@ -101,7 +101,6 @@ USER app
 WORKDIR /app
 EXPOSE 8080
 
-# CODE ALREADY IN YOUR DOCKERFILE:
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
@@ -125,14 +124,12 @@ FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
 RUN dotnet publish "./helloworld.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
-# CODE ALREADY IN YOUR DOCKERFILE
 FROM base AS final
 
 # NEW CODE: Copy instrumentation file tree
 WORKDIR "//home/app/.splunk-otel-dotnet"
 COPY --from=build /root/.splunk-otel-dotnet/ .
 
-# CODE ALREADY IN YOUR DOCKERFILE
 WORKDIR /app
 COPY --from=publish /app/publish .
 

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

@@ -195,7 +195,7 @@ splunk-otel-collector-k8s-cluster-receiver-d54857c89-tx7qr   1/1     Running   0
 
 ## Confirm your K8s Cluster is in O11y Cloud
 
-In Splunk Observability Cloud, navigate to **Infrastructure** -> **Kubernetes** -> **Kubernetes Nodes**, 
-and then Filter on your Cluster Name (which is `$INSTANCE-cluster`): 
+In Splunk Observability Cloud, navigate to **Infrastructure** -> **Kubernetes** -> **Kubernetes Clusters**, 
+and then search for your cluster name (which is `$INSTANCE-cluster`): 
 
 ![Kubernetes node](../images/k8snode.png)

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

@@ -107,7 +107,7 @@ spec:
 Then, create a second file in the same directory named `service.yaml`: 
 
 ``` bash
-vi service.yaml
+vi /home/splunk/service.yaml
 ```
 
 And paste in the following: 
@@ -190,7 +190,7 @@ environment variables to tell it where to send the data.
 
 Add the following to `deployment.yaml` file you created earlier: 
 
-> **IMPORTANT** replace `$INSTANCE` in your Dockerfile with your instance name,
+> **IMPORTANT** replace `$INSTANCE` in the YAML below with your instance name,
 > which can be determined by running `echo $INSTANCE`.
 
 ``` yaml
@@ -209,6 +209,44 @@ Add the following to `deployment.yaml` file you created earlier:
               value: "deployment.environment=otel-$INSTANCE" 
 ```
 
+The complete `deployment.yaml` file should be as follows (with **your** instance name rather than `$INSTANCE`): 
+
+``` yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: helloworld
+spec:
+  selector:
+    matchLabels:
+      app: helloworld
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: helloworld
+    spec:
+      containers:
+        - name: helloworld
+          image: docker.io/library/helloworld:1.2
+          imagePullPolicy: Never
+          ports:
+            - containerPort: 8080
+          env:
+            - name: PORT
+              value: "8080"
+            - name: NODE_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.hostIP
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: "http://$(NODE_IP):4318"
+            - name: OTEL_SERVICE_NAME
+              value: "helloworld"
+            - name: OTEL_RESOURCE_ATTRIBUTES 
+              value: "deployment.environment=otel-$INSTANCE" 
+```
+
 Apply the changes with: 
 
 {{< tabs >}}

content/en/ninja-workshops/8-docker-k8s-otel/images/k8snode.png

@@ -114,8 +114,8 @@ splunk-otel-collector-operator-6fd9f9d569-wd5mn                 2/2     Running
 
 ## Confirm your K8s Cluster is in O11y Cloud
 
-In Splunk Observability Cloud, navigate to **Infrastructure** -> **Kubernetes** -> **Kubernetes Nodes**,
-and then Filter on your Cluster Name (which is `$INSTANCE-k3s-cluster`):
+In Splunk Observability Cloud, navigate to **Infrastructure** -> **Kubernetes** -> **Kubernetes Clusters**,
+and then search for your Cluster Name (which is `$INSTANCE-k3s-cluster`):
 
 ![Kubernetes node](../images/k8snode.png)
 
@@ -204,7 +204,16 @@ Let's look at an example.
 
 Suppose we want to see the traces that are sent to the collector.  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 bottom of the `/home/splunk/workshop/tagging/otel/values.yaml` file as follows:
+You can use vi or nano to edit the `values.yaml` file. We will show an example using vi:
+
+``` bash
+vi /home/splunk/workshop/tagging/otel/values.yaml
+```
+
+Add the debug exporter to the bottom of the `values.yaml` file by copying and pasting the 
+section marked with `Add the section below` in the following example: 
+
+> Press 'i' to enter into insert mode in vi before adding the text below. 
 
 ``` yaml
 splunkObservability:
@@ -249,6 +258,9 @@ agent:
             - debug
 ```
 
+> To save your changes in vi, press the `esc` key to enter command mode, then type `:wq!` followed by pressing the
+>  `enter/return` key. 
+
 Once the file is saved, we can apply the changes with:
 
 {{< tabs >}}

content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/2-deploy-collector.md

@@ -56,7 +56,7 @@ This illustrates the power of **Tag Spotlight**! Finding this pattern would be t
 
 We've looked at errors, but what about latency? Let's click on the **Requests & errors distribution** dropdown and change it to **Latency distribution**.
 
-Click on the settings icon beside **Cards display** to add the P50 and P99 metrics. 
+> IMPORTANT: Click on the settings icon beside **Cards display** to add the P50 and P99 metrics. 
 
 Here, we can see that the requests with a `poor` credit score request are running slowly, with P50, P90, and P99 times of around 3 seconds, which is too long for our users to wait, and much slower than other requests.
 

content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/5-troubleshoot-using-tag-spotlight.md

@@ -26,8 +26,8 @@ spec:
                 fieldRef:
                   fieldPath: status.hostIP
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: "http://$(NODE_IP):4317"
+              value: "http://$(NODE_IP):4318"
             - name: OTEL_SERVICE_NAME
               value: "helloworld"
             - name: OTEL_RESOURCE_ATTRIBUTES
-              value: "deployment.environment=otel-yourname"   
+              value: "deployment.environment=otel-$INSTANCE"