Fixes to support Splunk Show instances

Author: rcastley

content/en/apm/online-boutique/validate-apm.md

@@ -9,15 +9,15 @@ weight: 2
 
 Go to **Dashboards → All Dashboards → APM Services → Service**. Here we can view the RED metrics (Rate, Error & Duration) for the Online Boutique application.
 
-For this we need to know the name of your application environment. In this workshop all the environments use: `<hostname>-workshop`.
+For this, we need to know the name of your application environment. In this workshop all the environments use: `<instance>-workshop`.
 
-To find the hostname, on the AWS/EC2 instance run the following command:
+To find the `instance`, on the AWS/EC2 instance run the following command:
 
 {{< tabs >}}
-{{% tab title="Echo Hostname" %}}
+{{% tab title="Echo Instance" %}}
 
 ``` bash
-echo $(hostname)-workshop
+echo $INSTANCE-workshop
 ```
 
 {{% /tab %}}
@@ -30,23 +30,23 @@ bdzx-workshop
 {{% /tab %}}
 {{< /tabs >}}
 
-Select your environment you found in the previous step then select the `frontend` service and set time to Past 15 minutes.
+Select the environment you found in the previous step then select the `frontend` service and set the time to Past 15 minutes.
 
 ![APM Dashboard](../../images/online-boutique-service-dashboard.png)
 
-With this automatically generated dashboard you can keep an eye out for the health of your service(s) using RED (Rate, Error & Duration) metrics. It provides various performance related charts as well as correlated information on the underlying host and Kubernetes pods (if applicable).
+With this automatically generated dashboard, you can keep an eye out for the health of your service(s) using RED (Rate, Error & Duration) metrics. It provides various performance-related charts as well as correlated information on the underlying host and Kubernetes pods (if applicable).
 
 Take some time to explore the various charts in this dashboard
 
 ---
 
 ## 2. APM Metrics
 
-In the left hand menu card click on **APM** this will bring you to the APM Overview dashboard:
+In the left-hand menu card click on **APM** this will bring you to the APM Overview dashboard:
 
 ![select APM](../../images/online-boutique-apm.png)
 
-Select the **Explore** on the right hand side and select your environment you found before and set the time to 15 minutes. This will show you the automatically generated Dependency/Service Map for the Online Boutique application.
+Select **Explore** on the right-hand side select the environment you found before and set the time to 15 minutes. This will show you the automatically generated Dependency/Service Map for the Online Boutique application.
 
 It should look similar to the screenshot below:
 
@@ -59,7 +59,7 @@ The legend at the bottom of the page explains the different visualizations in th
 * Service requests, error rate and root error rate.
 * Request rate, latency and error rate
 
-Also in this view you can see the overall Error and Latency rates over time charts.
+Also in this view, you can see the overall Error and Latency rates over time charts.
 
 ## 3. OpenTelemetry Dashboard
 

content/en/imt/gdi/_index.md

@@ -84,16 +84,34 @@ Install the OpenTelemetry Collector Helm chart with the following commands, do *
 helm install splunk-otel-collector \
 --set="splunkObservability.realm=$REALM" \
 --set="splunkObservability.accessToken=$ACCESS_TOKEN" \
---set="clusterName=$(hostname)-k3s-cluster" \
+--set="clusterName=$INSTANCE-k3s-cluster" \
+--set="splunkObservability.logsEnabled=false" \
+--set="logsEngine=otel" \
+--set="splunkObservability.profilingEnabled=true" \
+--set="splunkObservability.infrastructureMonitoringEventsEnabled=true" \
+--set="environment=$INSTANCE-workshop" \
+--set="splunkPlatform.endpoint=$HEC_URL" \
+--set="splunkPlatform.token=$HEC_TOKEN" \
+--set="splunkPlatform.index=splunk4rookies-workshop" \
+splunk-otel-collector-chart/splunk-otel-collector \
+-f ~/workshop/k3s/otel-collector.yaml
+
+```
+<!--
+```bash
+helm install splunk-otel-collector \
+--set="splunkObservability.realm=$REALM" \
+--set="splunkObservability.accessToken=$ACCESS_TOKEN" \
+--set="clusterName=$INSTANCE-k3s-cluster" \
 --set="splunkObservability.logsEnabled=true" \
 --set="logsEngine=otel" \
 --set="splunkObservability.profilingEnabled=true" \
 --set="splunkObservability.infrastructureMonitoringEventsEnabled=true" \
---set="environment=$(hostname)-workshop" \
+--set="environment=$INSTANCE-workshop" \
 splunk-otel-collector-chart/splunk-otel-collector \
 -f ~/workshop/k3s/otel-collector.yaml
 ```
-
+-->
 {{% /tab %}}
 {{% tab title="Helm Install Output" %}}
 
@@ -179,12 +197,12 @@ In the Splunk UI, click the **>>** bottom left and click on **Infrastructure**.
 
 Under **Containers** click on **Kubernetes** to open the Kubernetes Navigator Cluster Map to ensure metrics are being sent in.
 
-Validate that your cluster is discovered and reporting by finding your cluster (in the workshop you will see many other clusters). To find your cluster name run the following command and copy the output to your clipboard:
+Validate that your cluster is discovered and reported by finding your cluster (in the workshop you will see many other clusters). To find your cluster name run the following command and copy the output to your clipboard:
 
 {{% tab title="Echo Cluster Name" %}}
 
 ```bash
-echo $(hostname)-k3s-cluster
+echo $INSTANCE-k3s-cluster
 ```
 
 {{% /tab %}}

content/en/imt/gdi/nginx.md

@@ -139,7 +139,7 @@ This will start a gentle continuous load on the application.
 
 As you can see from the above screenshot, most of the calls will report a fail, this is expected, as we have not yet deployed the application behind it, however, NGINX is reporting on your attempts and you should be able to see those metrics.  
 
-Validate you are seeing those metrics in the UI by selecting **Dashboards → Built-in Dashboard Groups  → NGINX → NGINX Servers**. Using the **Overrides** filter on `k8s.cluster.name:`, find the name of your cluster as returned by `echo $(hostname)-k3s-cluster` in the terminal.
+Validate you are seeing those metrics in the UI by selecting **Dashboards → Built-in Dashboard Groups  → NGINX → NGINX Servers**. Using the **Overrides** filter on `k8s.cluster.name:`, find the name of your cluster as returned by `echo $INSTANCE-k3s-cluster` in the terminal.
 
 ![NGINX Dashboard](../../images/nginx-dashboard.png)
 

content/en/imt/monitoring-as-code/_index.md

@@ -124,7 +124,7 @@ The plan command alone will not actually carry out the proposed changes, and so
 {{% tab title="Execution Plan" %}}
 
 ```bash
-terraform plan -var="api_token=$API_TOKEN" -var="realm=$REALM" -var="o11y_prefix=[$(hostname)]"
+terraform plan -var="api_token=$API_TOKEN" -var="realm=$REALM" -var="o11y_prefix=[$INSTANCE]"
 ```
 
 {{% /tab %}}
@@ -153,7 +153,7 @@ Due to this being a workshop it is required that the prefix is to be unique so y
 {{% tab title="Apply Plan" %}}
 
 ``` bash
-terraform apply -var="api_token=$API_TOKEN" -var="realm=$REALM" -var="o11y_prefix=[$(hostname)]"
+terraform apply -var="api_token=$API_TOKEN" -var="realm=$REALM" -var="o11y_prefix=[$INSTANCE]"
 ```
 
 {{% /tab %}}
@@ -166,10 +166,10 @@ Apply complete! Resources: 146 added, 0 changed, 0 destroyed.
 {{% /tab %}}
 {{< /tabs >}}
 
-Once the apply has completed, validate that the detectors were created, under the **Alerts & Detectors** and click on the **Detectors** tab. They will be prefixed by the hostname of your instance. To check the prefix value run:
+Once the apply has been completed, validate that the detectors were created, under the **Alerts & Detectors** and click on the **Detectors** tab. They will be prefixed by the instance name. To check the prefix value run:
 
 ``` bash
-echo $(hostname)
+echo $INSTANCE
 ```
 
  You will see a list of the new detectors and you can search for the prefix that was output from above.

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

@@ -69,7 +69,7 @@ Install the OpenTelemetry Collector Helm chart into a new **splunk** namespace w
 helm install splunk-otel-collector \
 --set="splunkObservability.realm=$REALM" \
 --set="splunkObservability.accessToken=$ACCESS_TOKEN" \
---set="clusterName=$(hostname)-k3s-cluster" \
+--set="clusterName=$INSTANCE-k3s-cluster" \
 --set="splunkObservability.logsEnabled=true" \
 --set="splunkObservability.infrastructureMonitoringEventsEnabled=true" \
 splunk-otel-collector-chart/splunk-otel-collector \

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

@@ -72,7 +72,7 @@ To use the Apache configuration, you can upgrade the existing Splunk OpenTelemet
 helm upgrade splunk-otel-collector \
 --set="splunkObservability.realm=$REALM" \
 --set="splunkObservability.accessToken=$ACCESS_TOKEN" \
---set="clusterName=$(hostname)-k3s-cluster" \
+--set="clusterName=$INSTANCE-k3s-cluster" \
 --set="splunkObservability.logsEnabled=true" \
 --set="splunkObservability.infrastructureMonitoringEventsEnabled=true" \
 splunk-otel-collector-chart/splunk-otel-collector \

content/en/other/lambda-kinesis/1-setup.md

@@ -45,15 +45,15 @@ git clone https://github.com/kdroukman/o11y-lambda-lab.git
 
 In your Splunk Observability Cloud Organisation (Org) obtain your Access Token and Realm Values.
 
-Please reset your environment variables from the earlier lab. Take care that for this lab we may be using different names - make sure to match the Environment Variable names bellow.
+Please reset your environment variables from the earlier lab. Take care that for this lab we may be using different names - make sure to match the Environment Variable names below.
 
 {{< tabs >}}
 {{% tab title="Export Environment Variables" %}}
 
 ``` ini
 export ACCESS_TOKEN=CHANGE_ME \
 export REALM=CHANGE_ME \
-export PREFIX=$(hostname)
+export PREFIX=$INSTANCE
 ```
 
 {{% /tab %}}

content/en/other/lambda-kinesis/3-lambdas-in-splunk.md

@@ -10,7 +10,7 @@ Now it's time to check how your Lambda traffic has been captured in Splunk APM.
 
 ## Navigate to your Splunk Observability Cloud
 
-Select APM from the Main Menu and then select your APM Environment. Your APM environment should be in the format `$(hostname)-apm-lambda` where the hostname value is a four letter name of your lab host. (Check it by looking at your command prompt, or by running `echo $(hostname)`).
+Select APM from the Main Menu and then select your APM Environment. Your APM environment should be in the format `$INSTANCE-apm-lambda` where the hostname value is a four letter name of your lab host. (Check it by looking at your command prompt, or by running `echo $INSTANCE`).
 
 {{% notice style="note" %}} It may take a few minutes for you traces to appear in Splunk APM. Try hitting refresh on your browser until you find your environement name in the list of Envrionments {{% /notice %}}
 

content/en/other/pet-clinic/2-zero-configuration.md

@@ -47,7 +47,7 @@ Once the compilation is complete, you can run the application with the following
 ```bash
 java \
 -Dserver.port=8083 \
--Dotel.service.name=$(hostname)-petclinic-service \
+-Dotel.service.name=$INSTANCE-petclinic-service \
 -jar target/spring-petclinic-*.jar --spring.profiles.active=mysql
 ```
 
@@ -103,7 +103,7 @@ Let's launch the PetClinic again using a new resource attribute. Note, that addi
 ```bash
 java \
 -Dserver.port=8083 \
--Dotel.service.name=$(hostname)-petclinic-service \
+-Dotel.service.name=$INSTANCE-petclinic-service \
 -Dotel.resource.attributes=version=0.314 \
 -jar target/spring-petclinic-*.jar --spring.profiles.active=mysql
 ```

content/en/other/pet-clinic/3-rum.md

@@ -9,24 +9,24 @@ For the Real User Monitoring (RUM) instrumentation, we will add the Open Telemet
 
 Select the preconfigured **RUM ACCESS TOKEN** from the dropdown, and click **Next**. Enter **App name** and **Environment** using the following syntax:
 
-- `[hostname]-petclinic-service` - replacing `[hostname]` with your actual hostname.
-- `[hostname]-petclinic-env` - replacing `[hostname]` with your actual hostname.
+- `[instance]-petclinic-service` - replacing `[instance]` with your actual hostname.
+- `[instance]-petclinic-env` - replacing `[instance]` with your actual hostname.
 
 Then you'll need to select the workshop RUM token and define the application and environment names. The wizard will then show a snippet of HTML code that needs to be placed at the top of the pages in the `<head>` section. In this example, we are using:
 
-- Application Name: `<hostname>-petclinic-service`
-- Environment: `<hostname>-petclinic-env`
+- Application Name: `<instance>-petclinic-service`
+- Environment: `<instance>-petclinic-env`
 
-Copy the generated code snippet in the wizard or copy and edit the snippet below accordingly. You need to replace `<REALM>`, `<RUM_ACCESS_TOKEN>` and `<hostname>` with the actual values.
+Copy the generated code snippet in the wizard or copy and edit the snippet below accordingly. You need to replace `<REALM>`, `<RUM_ACCESS_TOKEN>` and `<instance>` with the actual values.
 
 ``` html
 <script src="https://cdn.signalfx.com/o11y-gdi-rum/latest/splunk-otel-web.js" crossorigin="anonymous"></script>
 <script>
 SplunkRum.init({
     beaconUrl: "https://rum-ingest.<REALM>.signalfx.com/v1/rum",
     rumAuth: "<RUM_ACCESS_TOKEN>",
-    app: "<hostname>-petclinic-service",
-    environment: "<hostname>-petclinic-env"
+    app: "<instance>-petclinic-service",
+    environment: "<instance>-petclinic-env"
     });
 </script>
 ```
@@ -52,7 +52,7 @@ Run the `maven` command to compile/build/package PetClinic:
 ```bash
 java \
 -Dserver.port=8083 \
--Dotel.service.name=$(hostname)-petclinic-service \
+-Dotel.service.name=$INSTANCE-petclinic-service \
 -Dotel.resource.attributes=version=0.314 \
 -jar target/spring-petclinic-*.jar --spring.profiles.active=mysql
 ```