Section 1 fixes

Author: rcastley

content/en/conf/1-advanced-collector/1-agent-gateway/1-1-gateway.md

@@ -15,8 +15,9 @@ This makes your observability pipeline easier to manage, scale, and analyze—es
 Open or create your second terminal window and name it **Gateway**. Navigate to the first exercise directory `[WORKSHOP]/1-agent-gateway`
 then check the contents of the `gateway.yaml` file.
 
-This file outlines the core structure of the OpenTelemetry Collector as deployed in **Gateway** mode:
+This file outlines the core structure of the OpenTelemetry Collector as deployed in **Gateway** mode.
 
+<!--
 ```bash
  cat ./gateway.yaml
 ```
@@ -105,7 +106,7 @@ service:                          # Service configuration
       - debug                     # Debug exporter
       - file/logs
 ```
-
+-->
 {{% /notice %}}
 
 ### Understanding the Gateway Configuration
@@ -132,19 +133,20 @@ Let’s explore the `gateway.yaml` file that defines how the OpenTelemetry Colle
   The **Gateway** uses three file exporters to output telemetry data to local files. These exporters are defined as:
 
   ```yaml
-  exporters:
-    file/traces:
-      path: ./gateway-traces.out
-    file/metrics:
-      path: ./gateway-metrics.out
-    file/logs:
-      path: ./gateway-logs.out
+  exporters:                        # List of exporters
+    debug:                          # Debug exporter
+      verbosity: detailed           # Enable detailed debug output
+    file/traces:                    # Exporter Type/Name
+      path: "./gateway-traces.out"  # Path for OTLP JSON output for traces
+      append: false                 # Overwrite the file each time
+    file/metrics:                   # Exporter Type/Name
+      path: "./gateway-metrics.out" # Path for OTLP JSON output for metrics
+      append: false                 # Overwrite the file each time
+    file/logs:                      # Exporter Type/Name
+      path: "./gateway-logs.out"    # Path for OTLP JSON output for logs
+      append: false                 # Overwrite the file each time
   ```
 
-  Each exporter writes a specific signal type to its corresponding file:
-
-  * `gateway-traces.out`: stores span (trace) data
-  * `gateway-metrics.out`: stores metric data
-  * `gateway-logs.out`: stores log data
+  Each exporter writes a specific signal type to its corresponding file.
 
   These files are created once the gateway is started and will be populated with real telemetry as the agent sends data. You can monitor these files in real time to observe the flow of telemetry through your pipeline.

content/en/conf/1-advanced-collector/1-agent-gateway/1-2-send-metrics.md

@@ -1,26 +1,22 @@
 ---
-title: 1.2 Send Test Metrics
-linkTitle: 1.2 Send Metrics
+title: 1.2 Validate & Test Configuration
+linkTitle: 1.2 Validate & Test Configuration
 weight: 3
 ---
 
-Now, we can start the **Gateway** and the **Agent**, which is configured to automaticly send  **Host Metrics** at startup. We do this to  verify that data is properly routed from the **Agent** to the **Gateway**.
+Now, we can start the **Gateway** and the **Agent**, which is configured to automatically send **Host Metrics** at startup. We do this to verify that data is properly routed from the **Agent** to the **Gateway**.
 
 {{% notice title="Exercise" style="green" icon="running" %}}
 
-**Start the Gateway**: In the **Gateway terminal** window, run the following command to start the **Gateway**:
+**Gateway**: In the **Gateway terminal** window, run the following command to start the **Gateway**:
 
 ```bash {title="Start the Gateway"}
 ../otelcol --config=gateway.yaml
 ```
 
-If everything is configured correctly, the first and last lines of the output should look like:
+If everything is configured correctly, the collector will start and state `Everything is ready. Begin running and processing data.` in the output, similar to the following:
 
 ```text
-2025/06/09 09:22:11 settings.go:478: Set config to [gateway.yaml]
-...
-<snip to the end>
-...
 2025-06-09T09:22:11.944+0100    info    [email protected]/service.go:289 Everything is ready. Begin running and processing data. {"resource": {}}
 ```
 
@@ -43,22 +39,23 @@ Once the **Gateway** is running, it will listen for incoming data on port `5318`
 
 ```text
 <snip>
-NumberDataPoints #37
+NumberDataPoints #31
 Data point attributes:
-    -> cpu: Str(cpu0)
-    -> state: Str(system)
-StartTimestamp: 2024-12-09 14:18:28 +0000 UTC
-Timestamp: 2025-01-15 15:27:51.319526 +0000 UTC
-Value: 9637.660000
+     -> cpu: Str(cpu3)
+     -> state: Str(wait)
+StartTimestamp: 2025-07-07 16:49:42 +0000 UTC
+Timestamp: 2025-07-09 09:36:21.190226459 +0000 UTC
+Value: 77.380000
+        {"resource": {}, "otelcol.component.id": "debug", "otelcol.component.kind": "exporter", "otelcol.signal": "metrics"}
 ```
 
-At this stage, the **Agent** continues to collect **CPU** metrics once per hour or upon each restart and sends them to the gateway. The **Gateway** processes these metrics and exports them to a file named `./gateway-metrics.out`. This file stores the exported metrics as part of the pipeline service.  
+At this stage, the **Agent** continues to collect **CPU** metrics once per hour or upon each restart and sends them to the gateway. The **Gateway** processes these metrics and exports them to a file named `gateway-metrics.out`. This file stores the exported metrics as part of the pipeline service.  
 
 **Verify Data arrived at Gateway**: To confirm that CPU metrics, specifically for `cpu0`, have successfully reached the gateway, we’ll inspect the `gateway-metrics.out` file using the `jq` command.
 
 The following command filters and extracts the `system.cpu.time` metric, focusing on `cpu0`. It displays the metric’s state (e.g., `user`, `system`, `idle`, `interrupt`) along with the corresponding values.
 
-Run the command below in the **Tests terminal** to check the `system.cpu.time` metric:
+Open or create your third terminal window and name it **Tests**. Run the command below in the **Tests terminal** to check the `system.cpu.time` metric:
 
 {{% tabs %}}
 {{% tab title="Check CPU Metrics" %}}

content/en/conf/1-advanced-collector/1-agent-gateway/_index.md

@@ -32,7 +32,7 @@ We will refer to these terminals as: **Agent**, **Gateway**, **Loadgen**, and **
     ├── agent.yaml
     └── gateway.yaml
     ```
-
+<!--
 3. Check the contents of the **agent.yaml** file. This file outlines the core structure of the OpenTelemetry Collector as deployed in **Agent** mode:
 
     ```bash
@@ -130,7 +130,7 @@ We will refer to these terminals as: **Agent**, **Gateway**, **Loadgen**, and **
           - file
           - otlphttp
     ```
-
+-->
 {{% /notice %}}
 
 ### Understanding the Agent configuration
@@ -179,18 +179,20 @@ The `receivers` section defines how the **Agent** ingests telemetry data. In thi
 
 #### Exporters
 
-* The `exporters` section controls where the collected telemetry data is sent:
+* **Debug Exporter**
 
   ```yaml
-  exporters:                             # Array of Exporters
     debug:                               # Exporter Type
       verbosity: detailed                # Enabled detailed debug output
+  ```
+
+* **OTLPHTTP Exporter**
+
+  ```yaml
     otlphttp:                            # Exporter Type
       endpoint: "http://localhost:5318"  # Gateway OTLP endpoint  
   ```
 
   The `debug` exporter sends data to the console for visibility and debugging during the workshop while the `otlphttp` exporter forwards all telemetry to the local **Gateway** instance.
 
-{{% notice title="Info" style="info" %}}
-This dual-export strategy ensures you can see the raw data locally while also sending it downstream for further processing and export.
-{{% /notice %}}
+  **This dual-export strategy ensures you can see the raw data locally while also sending it downstream for further processing and export.**

content/en/conf/1-advanced-collector/_index.md

@@ -1,5 +1,5 @@
 ---
-title: Advanced OpenTelemetry Collector Workshop
+title: Advanced OpenTelemetry Collector
 description: Practice setting up the OpenTelemetry Collector configuration from scratch and go though several advanced configuration scenarios's.
 weight: 2
 archetype: chapter

content/en/conf/1-advanced-collector/prerequisites.md

@@ -14,7 +14,14 @@ time: 5 minutes
 
 {{% notice title="Exercise" style="green" icon="running" %}}
 
-**Create a workshop directory**: In your environment create a new directory (e.g. `advanced-otel-workshop`). We will refer to this directory as `[WORKSHOP]` for the remainder of the workshop.
+**Create a directory**: In your environment create a new directory and change into it:
+
+``` bash
+mkdir advanced-otel-workshop && \
+cd advanced-otel-workshop
+```
+
+We will refer to this directory as `[WORKSHOP]` for the remainder of the workshop.
 
 **Download workshop binaries**: Change into your `[WORKSHOP]` directory and download the OpenTelemetry Collector, Load Generator binaries and setup script:
 
@@ -71,7 +78,7 @@ Run the `setup-workshop.sh` script which will configure the correct permissions
 {{% tab title="Setup Workshop" %}}
 
 ```bash
-sh setup-workshop.sh
+./setup-workshop.sh
 ```
 
 {{% /tab %}}
@@ -149,14 +156,15 @@ Configuration files created in the following directories:
 
 ```text { title="Initial Directory Structure" }
 [WORKSHOP]
-├── otelcol                # OpenTelemetry Collector binary
-├── loadgen                # Load Generator binary
-├── 1-agent-gateway        # Directories for exercises
+├── 1-agent-gateway
 ├── 2-building-resilience
 ├── 3-dropping-spans
 ├── 4-sensitive-data
 ├── 5-transform-data
-└── 6-routing-data
+├── 6-routing-data
+├── loadgen
+├── otelcol
+└── setup-workshop.sh
 ```
 
 <!--

workshop/ninja/advanced-otel/setup-workshop.sh

@@ -190,13 +190,13 @@ exporters:                        # List of exporters
   debug:                          # Debug exporter
     verbosity: detailed           # Enable detailed debug output
   file/traces:                    # Exporter Type/Name
-    path: "./gateway-traces.out"  # Path for OTLP JSON output
+    path: "./gateway-traces.out"  # Path for OTLP JSON output for traces
     append: false                 # Overwrite the file each time
   file/metrics:                   # Exporter Type/Name
-    path: "./gateway-metrics.out" # Path for OTLP JSON output
+    path: "./gateway-metrics.out" # Path for OTLP JSON output for metrics
     append: false                 # Overwrite the file each time
   file/logs:                      # Exporter Type/Name
-    path: "./gateway-logs.out"    # Path for OTLP JSON output
+    path: "./gateway-logs.out"    # Path for OTLP JSON output for logs
     append: false                 # Overwrite the file each time
 
 processors:                       # List of processors