Fixed HPA workshop collector issue

Author: rcastley

content/en/other/4-hpa/1-deploy-otel.md

@@ -20,17 +20,7 @@ You will be able to connect to the workshop instance by using SSH from your Mac,
 Your workshop instance has been pre-configured with the correct **Access Token** and **Realm** for this workshop. There is no need for you to configure these.
 {{% /notice %}}
 
-## 3. Namespaces in Kubernetes
-
-Most of our customers will make use of some kind of private or public cloud service to run Kubernetes. They often choose to have only a few large Kubernetes clusters as it is easier to manage centrally.
-
-Namespaces are a way to organize these large Kubernetes clusters into virtual sub-clusters. This can be helpful when different teams or projects share a Kubernetes cluster as this will give them the easy ability to just see and work with their resources.
-
-Any number of namespaces are supported within a cluster, each logically separated from others but with the ability to communicate with each other. Components are only **visible** when selecting a namespace or when adding the `--all-namespaces` flag to `kubectl` instead of allowing you to view just the components relevant to your project by selecting your namespace.
-
-Most customers will want to install the Splunk OpenTelemetry Collector into a separate namespace.  This workshop will follow that best practice.
-
-## 4. Install Splunk OTel using Helm
+## 3. Install Splunk OTel using Helm
 
 Install the OpenTelemetry Collector using the Splunk Helm chart. First, add the Splunk Helm chart repository and update.
 
@@ -45,10 +35,10 @@ helm repo add splunk-otel-collector-chart https://signalfx.github.io/splunk-otel
 {{% tab title="helm repo add output" %}}
 
 ```text
-Using ACCESS_TOKEN={REDACTED}
+Using ACCESS_TOKEN=<REDACTED>
 Using REALM=eu0
 "splunk-otel-collector-chart" has been added to your repositories
-Using ACCESS_TOKEN={REDACTED}
+Using ACCESS_TOKEN=<REDACTED>
 Using REALM=eu0
 Hang tight while we grab the latest from your chart repositories...
 ...Successfully got an update from the "splunk-otel-collector-chart" chart repository
@@ -58,7 +48,7 @@ Update Complete. ⎈Happy Helming!⎈
 {{% /tab %}}
 {{< /tabs >}}
 
-Install the OpenTelemetry Collector Helm chart into a new **splunk** namespace with the following commands, do **NOT** edit this:
+Install the OpenTelemetry Collector Helm with the following commands, do **NOT** edit this:
 
 {{< tabs >}}
 {{% tab title="helm install" %}}
@@ -75,8 +65,6 @@ helm install splunk-otel-collector \
 --set="splunkPlatform.token=$HEC_TOKEN" \
 --set="splunkPlatform.index=splunk4rookies-workshop" \
 splunk-otel-collector-chart/splunk-otel-collector \
---namespace splunk \
---create-namespace \
 -f ~/workshop/k3s/otel-collector.yaml
 ```
 
@@ -85,15 +73,15 @@ splunk-otel-collector-chart/splunk-otel-collector \
 
 ## 5. Verify Deployment
 
-You can monitor the progress of the deployment by running `kubectl get pods` and adding `-n splunk` to the command to see the pods in the `splunk` namespace which should typically report that the new pods are up and running after about 30 seconds.
+You can monitor the progress of the deployment by running `kubectl get pods` which should typically report that the new pods are up and running after about 30 seconds.
 
 Ensure the status is reported as **Running** before continuing.
 
 {{< tabs >}}
 {{% tab title="kubectl get pods" %}}
 
 ``` bash
-kubectl get pods -n splunk
+kubectl get pods
 ```
 
 {{% /tab %}}
@@ -125,7 +113,7 @@ Use the label set by the `helm` install to tail logs (You will need to press `ct
 {{% tab title="kubectl logs" %}}
 
 ``` bash
-kubectl logs -l app=splunk-otel-collector -f --container otel-collector -n splunk
+kubectl logs -l app=splunk-otel-collector -f --container otel-collector
 ```
 
 {{% /tab %}}
@@ -139,7 +127,7 @@ Or use the installed `k9s` terminal UI.
 If you make an error installing the Splunk OpenTelemetry Collector you can start over by deleting the installation using:
 
 ``` sh
-helm delete splunk-otel-collector -n splunk
+helm delete splunk-otel-collector
 ```
 
 {{% /notice %}}

content/en/other/4-hpa/2-check-new-navigator-short.md

@@ -42,7 +42,7 @@ Now, let's find your cluster by filtering on the field `k8s.cluster.name` in the
 {{% notice title="Note" style="info" %}}
 You can enter a partial name into the search box, such as `emea-ws-7*`, to quickly find your Cluster.
 
-Also, it's a very good idea to switch the default time from the default **-3h** back to the last 15 minutes (**-15m**).
+Also, it's a very good idea to switch the default time from the default **-4h** back to the last 15 minutes (**-15m**).
 {{% /notice %}}
 
 ![Workloads](../images/k8s-workload-filter.png)
@@ -98,19 +98,19 @@ To filter to a specific workload, you can click on three dots **...** next to th
 
 ![workload-add-filter](../images/workload-add-filter.png)
 
-This will add the selected workload to your filters. Try this for the **splunk-otel-collector-k8s-cluster-receiver** workload. It will then list a single workload in the **splunk** namespace.
+This will add the selected workload to your filters. It would then list a single workload in the **default** namespace.
 
-The Heat map above will also filter down to a single-colored square. Click on the square to see more information about the workload.
+![workload-add-filter](../images/heatmap-filter-down.png)
+
+From the Heatmap above find the **splunk-otel-collector-k8s-cluster-receiver** in the **default** namespace and click on the square to see more information about the workload.
 
 ![workload-add-filter](../images/k8s-workload-detail.png)
 
 {{% notice title="Workshop Question" style="tip" icon="question" %}}
 What are the CPU request  & CPU limit units for the otel-collector?
 {{% /notice %}}
 
-At this point, you can drill into the information of the pods, but that is outside the scope of this workshop, for now reset your view by removing the filter for the **splunk-otel-collector-k8s-cluster-receiver** workload and setting the **Color by** option to **Pods Running**.
-
-![workload-add-filter](../images/k8s-workload-remove-filter.png)
+At this point, you can drill into the information of the pods, but that is outside the scope of this workshop.
 
 ## 3. Navigator Sidebar
 

content/en/other/4-hpa/3-deploy-apache.md

@@ -4,7 +4,17 @@ linkTitle: 3. Deploying PHP/Apache
 weight: 3
 ---
 
-## 1.  DNS and Services in Kubernetes
+## 1. Namespaces in Kubernetes
+
+Most of our customers will make use of some kind of private or public cloud service to run Kubernetes. They often choose to have only a few large Kubernetes clusters as it is easier to manage centrally.
+
+Namespaces are a way to organize these large Kubernetes clusters into virtual sub-clusters. This can be helpful when different teams or projects share a Kubernetes cluster as this will give them the easy ability to just see and work with their resources.
+
+Any number of namespaces are supported within a cluster, each logically separated from others but with the ability to communicate with each other. Components are only **visible** when selecting a namespace or when adding the `--all-namespaces` flag to `kubectl` instead of allowing you to view just the components relevant to your project by selecting your namespace.
+
+Most customers will want to install the applications into a separate namespace.  This workshop will follow that best practice.
+
+## 2.  DNS and Services in Kubernetes
 
 The Domain Name System (DNS) is a mechanism for linking various sorts of information with easy-to-remember names, such as IP addresses. Using a DNS system to translate request names into IP addresses makes it easy for end-users to reach their target domain name effortlessly.
 
@@ -30,7 +40,7 @@ my_pod.service-name.my-namespace.svc.cluster-domain.example
 
 More information can be found here: [**DNS for Service and Pods**](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/)
 
-## 2. Review OTel receiver for PHP/Apache
+## 3. Review OTel receiver for PHP/Apache
 
 Inspect the YAML file `~/workshop/k3s/otel-apache.yaml` and validate the contents using the following command:
 
@@ -55,7 +65,7 @@ agent:
                 service.name: php-apache
 ```
 
-## 3.  Observation Rules in the OpenTelemetry config
+## 4.  Observation Rules in the OpenTelemetry config
 
 The above file contains an observation rule for Apache using the OTel `receiver_creator`. This receiver can instantiate other receivers at runtime based on whether observed endpoints match a configured rule.
 
@@ -80,7 +90,6 @@ helm upgrade splunk-otel-collector \
 --set="splunkPlatform.token=$HEC_TOKEN" \
 --set="splunkPlatform.index=splunk4rookies-workshop" \
 splunk-otel-collector-chart/splunk-otel-collector \
---namespace splunk \
 -f ~/workshop/k3s/otel-collector.yaml \
 -f ~/workshop/k3s/otel-apache.yaml
 ```
@@ -94,16 +103,16 @@ The **REVISION** number of the deployment has changed, which is a helpful way to
 ``` text
 Release "splunk-otel-collector" has been upgraded. Happy Helming!
 NAME: splunk-otel-collector
-LAST DEPLOYED: Tue Jan 31 16:57:22 2023
-NAMESPACE: splunk
+LAST DEPLOYED: Tue Feb  6 11:17:15 2024
+NAMESPACE: default
 STATUS: deployed
 REVISION: 2
 TEST SUITE: None
 ```
 
 {{% /notice %}}
 
-## 4. Kubernetes ConfigMaps
+## 5. Kubernetes ConfigMaps
 
 A ConfigMap is an object in Kubernetes consisting of key-value pairs that can be injected into your application. With a ConfigMap, you can separate configuration from your Pods.
 
@@ -112,7 +121,7 @@ Using ConfigMap, you can prevent hardcoding configuration data. ConfigMaps are u
 The OpenTelemetry collector/agent uses ConfigMaps to store the configuration of the agent and the K8s Cluster receiver. You can/will always verify the current configuration of an agent after a change by running the following commands:
 
 ``` bash
-kubectl get cm -n splunk
+kubectl get cm
 ```
 
 {{% notice title="Workshop Question" style="tip" icon="question" %}}
@@ -122,7 +131,7 @@ How many ConfigMaps are used by the collector?
 When you have a list of ConfigMaps from the namespace, select the one for the `otel-agent` and view it with the following command:
 
 ``` bash
-kubectl get cm splunk-otel-collector-otel-agent -n splunk -o yaml
+kubectl get cm splunk-otel-collector-otel-agent -o yaml
 ```
 
 {{% notice title="NOTE" style="info" %}}
@@ -133,7 +142,7 @@ The option `-o yaml` will output the content of the ConfigMap in a readable YAML
 Is the configuration from `otel-apache.yaml` visible in the ConfigMap for the collector agent?
 {{% /notice %}}
 
-## 5. Review PHP/Apache deployment YAML
+## 6. Review PHP/Apache deployment YAML
 
 Inspect the YAML file `~/workshop/k3s/php-apache.yaml` and validate the contents using the following command:
 
@@ -171,7 +180,7 @@ spec:
         resources:
           limits:
             cpu: "8"
-            memory: "9Mi"
+            memory: "8Mi"
           requests:
             cpu: "6"
             memory: "4Mi"
@@ -190,7 +199,7 @@ spec:
     run: php-apache
 ```
 
-## 6. Deploy PHP/Apache
+## 7. Deploy PHP/Apache
 
 Create an `apache` namespace then deploy the PHP/Apache application to the cluster.
 
@@ -221,5 +230,5 @@ What metrics for your Apache instance are being reported in the Apache Navigator
 {{% notice title="Workshop Question" style="tip" icon="question" %}}
 Using Log Observer what is the issue with the PHP/Apache deployment?
 
-**Tip:** Adjust your **Table settings** by clicking on the cog to use only `object.involvedObject.name`, `object.message` and `k8s.cluster.name`. Make sure you unselect `_raw`!
+**Tip:** Adjust your filters to use: `object = php-apache-svc` and `k8s.cluster.name = <your_cluster>`.
 {{% /notice %}}

content/en/other/4-hpa/4-fix-apache.md

@@ -15,7 +15,7 @@ You do this by placing a Resource section in the deployment of your application/
 resources:
   limits:         # Maximum amount of CPU & memory for peek use
     cpu: "8"      # Maximum of 8 cores of CPU allowed at for peek use
-    memory: "9Mi" # Maximum allowed 9Mb of memory
+    memory: "8Mi" # Maximum allowed 8Mb of memory
   requests:       # Request are the expected amount of CPU & memory for normal use
     cpu: "6"      # Requesting 4 cores of a CPU
     memory: "4Mi" # Requesting 4Mb of memory
@@ -49,7 +49,7 @@ Find the resources section and reduce the CPU limits to **1** and the CPU reques
 resources:
   limits:
     cpu: "1"
-    memory: "9Mi"
+    memory: "8Mi"
   requests:
     cpu: "0.5"
     memory: "4Mi"