Skip to content

Commit 2b4578d

Browse files
committed
Workshop housekeeping
1 parent 759cb98 commit 2b4578d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+15
-2276
lines changed

content/en/ninja-workshops/1-automatic-discovery/1-petclinic-monolith/1-otel-collector.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ weight: 1
66

77
The Splunk OpenTelemetry Collector is the core component of instrumenting infrastructure and applications. Its role is to collect and send:
88

9-
* Infrastructure metrics (disk, CPU, memory, etc)
9+
* Infrastructure metrics (disk, CPU, memory, etc.)
1010
* Application Performance Monitoring (APM) traces
1111
* Profiling data
1212
* Host and application logs
@@ -30,10 +30,10 @@ sudo sh /tmp/splunk-otel-collector.sh --uninstall
3030
To ensure your instance is configured correctly, we need to confirm that the required environment variables for this workshop are set correctly. In your terminal run the following command:
3131

3232
``` bash
33-
. ~/workshop/scripts/check_env.sh
33+
. ~/workshop/petclinic/scripts/check_env.sh
3434
```
3535

36-
In the output check that all of the following environment variables are present and have values set. If any are missing, please contact your instructor:
36+
In the output check that all the following environment variables are present and have values set. If any are missing, please contact your instructor:
3737

3838
```text
3939
ACCESS_TOKEN
@@ -44,7 +44,7 @@ HEC_URL
4444
INSTANCE
4545
```
4646

47-
We can then go ahead and install the Collector. Some additional parameters are passed to the install script, they are:
47+
We can then go ahead and install the Collector. Some additional parameters are passed to the installation script, they are:
4848

4949
* `--with-instrumentation` - This will install the agent from the Splunk distribution of OpenTelemetry Java, which is then loaded automatically when the PetClinic Java application starts up. No configuration is required!
5050
* `--deployment-environment` - Sets the resource attribute `deployment.environment` to the value passed. This is used to filter views in the UI.

content/en/ninja-workshops/1-automatic-discovery/2-petclinic-kubernetes/2-preparation/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ INSTANCE = <instance_name>
4949
{{% /tab %}}
5050
{{< /tabs >}}
5151

52-
Please make a note of the `INSTANCE` environment variable value as this will used later to filter data in **Splunk Observability Cloud**.
52+
Please make a note of the `INSTANCE` environment variable value as this will be used later to filter data in **Splunk Observability Cloud**.
5353

54-
For this workshop, **all** of the above are required. If any have values missing, please contact your Instructor.
54+
For this workshop, **all** the above are required. If any have values missing, please contact your Instructor.
5555

5656
> [!SPLUNK] Delete any existing OpenTelemetry Collectors
5757
>If you have previously completed a Splunk Observability workshop using this EC2 instance, you

content/en/ninja-workshops/3-opentelemetry-collector-workshops/2-advanced-collector/6-sensitive-data/6-2-test-delete-tag.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ In this exercise, we will **delete** the `user.account_password`, **update** the
2020
../otelcol --config=agent.yaml
2121
```
2222

23-
**Start the Loadgen**:
23+
**Start the Load Generator**:
2424

2525
1. In the **Spans terminal** window change into the `6-sensitive-data` directory.
2626
2. Start the `loadgen`:
27+
2728
```sh
2829
../loadgen
2930
```

content/en/scenarios/optimize_end_user_experiences/3-advanced-synthetics/_index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ The exported JSON from the Chrome DevTools Recorder will then be used to create
1818
- Access to Splunk Observability Cloud
1919

2020
## Supporting resources
21-
1. Lantern: [advanced Selectors for multi-step browser tests](https://lantern.splunk.com/Observability/UCE/Proactive_response/Optimize_End-User_Experiences/Running_Synthetics_browser_tests/Selectors_for_multi-step_browser_tests)
21+
22+
1. Lantern: [advanced Selectors for multistep browser tests](https://lantern.splunk.com/Observability/UCE/Proactive_response/Optimize_End-User_Experiences/Running_Synthetics_browser_tests/Selectors_for_multi-step_browser_tests)
2223
1. Chrome for Developers [DevTools Tips](https://developer.chrome.com/blog/devtools-tips-4)
23-
1. web.dev [Core Web Vitals](https://web.dev/explore/learn-core-web-vitals) reference
24+
1. web.dev [Core Web Vitals](https://web.dev/explore/learn-core-web-vitals) reference

legacy-content/en/99-imt-admin/_index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ hidden: true
99

1010
During this _**technical**_ Splunk Observability Cloud Infrastructure Monitoring Workshop, you will build out an environment based on a [lightweight](https://k3s.io/) Kubernetes[^1] cluster.
1111

12-
To simplify the workshop modules, a pre-configured AWS/EC2 instance is provided and the instructor will provide you with the login information for the instance that you will be using during the workshop.
12+
To simplify the workshop modules, a pre-configured AWS/EC2 instance is provided, and the instructor will provide you with the login information for the instance that you will be using during the workshop.
1313

14-
The instance is pre-configured with all the software required to deploy the Splunk OpenTelemetry Connector[^2] in Kubernetes, deploy an NGINX^3 ReplicaSet^4 and finally deploy a microservices-based application which has been instrumented using OpenTelemetry to send metrics, traces, spans and logs[^5].
14+
The instance is pre-configured with all the software required to deploy the Splunk OpenTelemetry Connector[^2] in Kubernetes, deploy an NGINX[^3] ReplicaSet[^4] and finally deploy a microservices-based application which has been instrumented using OpenTelemetry to send metrics, traces, spans and logs[^5].
1515

1616
The workshops also introduce you to dashboards, navigators editing and creating charts, creating detectors to fire alerts, Monitoring as Code and the Service Bureau[^6]
1717

@@ -60,9 +60,9 @@ INSTANCE = <instance_name>
6060
{{% /tab %}}
6161
{{< /tabs >}}
6262

63-
Please make a note of the `INSTANCE` environment variable value as this will used later to filter data in **Splunk Observability Cloud**.
63+
Please make a note of the `INSTANCE` environment variable value as this will be used later to filter data in **Splunk Observability Cloud**.
6464

65-
For this workshop, **all** of the above are required. If any have values missing, please contact your Instructor.
65+
For this workshop, **all** the above are required. If any have values missing, please contact your Instructor.
6666

6767
[^1]: [**Kubernetes**](https://kubernetes.io/docs/concepts/overview/what-is-kubernetes/) is a portable, extensible, open-source platform for managing containerized workloads and services, that facilitates both declarative configuration and automation.
6868
[^2]: [**OpenTelemetry Collector**](https://opentelemetry.io/) offers a vendor-agnostic implementation on how to receive, process and export telemetry data. In addition, it removes the need to run, operate and maintain multiple agents/collectors to support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) sending to multiple open-source or commercial back-ends.

workshop/ansible/inventory.ini

Lines changed: 0 additions & 8 deletions
This file was deleted.

workshop/ansible/petclinic.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

workshop/ninja/advanced-otel/1-agent/agent-basic.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

workshop/ninja/advanced-otel/1-agent/agent-debug.yaml

Lines changed: 0 additions & 56 deletions
This file was deleted.

workshop/ninja/advanced-otel/1-agent/agent-file.yaml

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)