Skip to content

Commit 8301838

Browse files
committed
Further fixes to instructions
1 parent 08bf678 commit 8301838

File tree

5 files changed

+26
-29
lines changed

5 files changed

+26
-29
lines changed

content/en/other/pet-clinic/1-otel-collector.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ weight: 1
66

77
## 1. Introduction
88

9-
The OpenTelemetry Collector is the core component of instrumenting infrastructure and applications. Its role is to collect and send:
9+
The Splunk OpenTelemetry Collector is the core component of instrumenting infrastructure and applications. Its role is to collect and send:
1010

11-
* Infrastructure metrics (disk, cpu, memory, etc)
11+
* Infrastructure metrics (disk, CPU, memory, etc)
1212
* Application Performance Monitoring (APM) traces
1313
* Profiling data
1414
* Host and application logs
@@ -63,8 +63,7 @@ sudo sh /tmp/splunk-otel-collector.sh --realm $REALM -- $ACCESS_TOKEN --mode age
6363

6464
When prompted to restart services, select 'OK' and press enter.
6565

66-
{{% notice style="info" title="AWS/EC2 instances" %}}
67-
If you are attempting this workshop on an AWS/EC2 instance you will have to patch the collector to expose the hostname of the instance:
66+
Next, we will patch the collector to expose the hostname of the instance and not the AWS instance ID. This will make it easier to filter data in the UI. Run the following command to patch the collector:
6867

6968
``` bash
7069
sudo sed -i 's/gcp, ecs, ec2, azure, system/system, gcp, ecs, ec2, azure/g' /etc/otel/collector/agent_config.yaml
@@ -76,7 +75,6 @@ Once the `agent_config.yaml` has been patched, you will need to restart the coll
7675
sudo systemctl restart splunk-otel-collector
7776
```
7877

79-
{{% /notice %}}
8078
Once the installation is completed, you can navigate to the **Hosts with agent installed** dashboard to see the data from your host, **Dashboards → Hosts with agent installed**.
8179

8280
Use the dashboard filter and select `host.name` and type or select the hostname of your workshop instance (you can get this from the command prompt in your terminal session). Once you see data flowing for your host, we are then ready to get started with the APM component.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Next, run the `maven` command to compile/build/package PetClinic:
3939
```
4040

4141
{{% notice style="info" %}}
42-
This will take a few minutes the first time you run, `maven` will download a lot of dependencies before it compiles the application. Future executions will be a lot quicker.
42+
This will take a few minutes the first time you run, `maven` will download a lot of dependencies before it compiles the application. Future builds will be a lot quicker.
4343
{{% /notice %}}
4444

4545
Once the build completes, you need to obtain the public IP address of the instance you are running on. You can do this by running the following command:
@@ -104,7 +104,7 @@ OpenJDK 64-Bit Server VM warning: Sharing is only supported for boot loader clas
104104

105105
## 3. Review Profiling Data Collection
106106

107-
You can now visit the Splunk APM UI and examine the application components, traces, profiling, DB Query performance and metrics. From the left-hand menu **APM****Explore**, click the environment dropdown and select your environment e.g. `<INSTANCE>-petclinic-service` (where`<INSTANCE>` is replaced with the value you noted down earlier).
107+
You can now visit the Splunk APM UI and examine the application components, traces, profiling, DB Query performance and metrics. From the left-hand menu **APM****Explore**, click the environment dropdown and select your environment e.g. `<INSTANCE>-petclinic` (where`<INSTANCE>` is replaced with the value you noted down earlier).
108108

109109
![APM Environment](../images/apm-environment.png)
110110

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,12 @@ Next, insert the snippet we generated above in the `<head>` section of the page.
5656
deploymentEnvironment: "petclinic-1be0-petclinic-env"
5757
});
5858
</script>
59+
...
5960
```
6061

61-
Now we need to rebuild the application and run it again:
62-
6362
## 2. Rebuild PetClinic
6463

65-
Run the `maven` command to compile/build/package PetClinic:
64+
With the code changes complete, we need to rebuild the application and run it again. Run the `maven` command to compile/build/package PetClinic:
6665

6766
```bash
6867
./mvnw package -Dmaven.test.skip=true
@@ -76,8 +75,8 @@ java \
7675
-jar target/spring-petclinic-*.jar --spring.profiles.active=mysql
7776
```
7877

79-
Then let's visit the application using a browser to generate real-user traffic `http://<IP_ADDRESS>:8083`, now we should see RUM traces being reported.
78+
Then let's visit the application using a browser to generate real-user traffic `http://<IP_ADDRESS>:8083`.
8079

81-
Let's visit RUM and see some of the traces and metrics **Hamburger Menu → RUM** and you will see some of the Spring PetClinic URLs showing up in the UI.
80+
In RUM, filter down into the environment as defined in the RUM snippet above and click through to the dashboard.
8281

8382
When you drill down into a RUM trace you will see a link to APM in the spans. Clicking on the trace ID will take you to the corresponding APM trace for the current RUM trace.

content/en/other/pet-clinic/4-log-observer-connect.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ weight: 4
55

66
## 1. Introduction
77

8-
For the Splunk Log Observer component, we will configure the Spring PetClinic application to write logs to a file in the filesystem and configure the Splunk OpenTelemetry Collect to read (tail) that log file and report the information to the Splunk Observability Platform.
8+
For the Splunk Log Observer component, we will configure the Spring PetClinic application to write logs to a file and configure the Splunk OpenTelemetry Collector to read (tail) that log file and send the logs to Splunk Cloud.
99

1010
## 2. OpenTelemetry Filelog Configuration
1111

12-
We need to configure the Splunk OpenTelemetry Collector to tail the Spring PetClinic log file and report the data to the Splunk Cloud HEC URL.
12+
We need to configure the Splunk OpenTelemetry Collector to tail the Spring PetClinic log file and send the log data to Splunk Cloud.
1313

14-
The Splunk OpenTelemetry Collector uses the [**Filelog Receiver**](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/filelogreceiver/README.md) to consume logs. We will need to edit the collectors' configuration file:
14+
The Splunk OpenTelemetry Collector uses **Fluentd** by default but we will change the configuration to use the OpenTelemetry [**Filelog Receiver**](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/filelogreceiver/README.md) to consume the logs. We will need to edit the collectors' configuration file:
1515

1616
``` bash
1717
sudo vi /etc/otel/collector/agent_config.yaml
@@ -99,12 +99,14 @@ java \
9999

100100
## 4. View Logs
101101

102-
From the left-hand menu click on **Log Observer** and ensure **Index** set to **splunk4rookies-workshop**.
102+
From the left-hand menu click on **Log Observer** and ensure **Index** is set to **splunk4rookies-workshop**.
103103

104-
Next, click **Add Filter** search for the field `service_name` select the value `<your host name>-petclinic-service` and click `=` (include). You should now see only the log messages from your PetClinic application.
104+
Next, click **Add Filter** search for the field `service_name` select the value `<INSTANCE>-petclinic-service` and click `=` (include). You should now see only the log messages from your PetClinic application.
105105

106106
![Log Observer](../images/log-observer.png)
107107

108108
## 4. Summary
109109

110-
This is the end of the exercise and we have certainly covered a lot of ground. At this point, you should have metrics, traces (APM & RUM), logs, database query performance and code profiling being reported into Splunk Observability Cloud. **Congratulations**!
110+
This is the end of the workshop and we have certainly covered a lot of ground. At this point, you should have metrics, traces (APM & RUM), logs, database query performance and code profiling being reported into Splunk Observability Cloud.
111+
112+
**Congratulations!**

content/en/other/pet-clinic/_index.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,30 @@ weight: 1
44
description: A workshop using Zero Configuration Auto-Instrumentation for Java.
55
---
66

7-
The goal is to walk through the basic steps to configure the following components of the Splunk Observability platform:
7+
The goal is to walk through the basic steps to configure the following components of the **Splunk Observability Cloud** platform:
88

99
* Splunk Infrastructure Monitoring (IM)
1010
* Splunk Zero Configuration Auto Instrumentation for Java (APM)
1111
* Database Query Performance
1212
* AlwaysOn Profiling
1313
* Splunk Real User Monitoring (RUM)
1414
* RUM to APM Correlation
15-
* Splunk Log Observer
15+
* Splunk Log Observer (LO)
1616

1717
We will also show the steps about how to clone (download) a sample Java application (Spring PetClinic), as well as how to compile, package and run the application.
1818

19-
Once the application is up and running, we will instantly start seeing metrics and traces via the Zero Configuration Auto Instrumentation for Java that will be used by the Splunk APM product.
19+
Once the application is up and running, we will instantly start seeing metrics and traces via the **Zero Configuration Auto Instrumentation** for Java that will be used by the **Splunk APM** product.
2020

21-
After that, we will instrument PetClinic's end user interface (HTML pages rendered by the application) with the Splunk OpenTelemetry Javascript Libraries (RUM) that will generate RUM traces around all the individual clicks and page loads executed by an end user.
21+
After that, we will instrument PetClinic's end user interface (HTML pages rendered by the application) with the **Splunk OpenTelemetry Javascript Libraries (RUM)** that will generate RUM traces around all the individual clicks and page loads executed by an end user.
2222

23-
Lastly, we will configure the Spring PetClinic application to write application logs to the filesystem and also configure the Splunk OpenTelemetry Collector to read (tail) the logs and send them to Splunk Cloud.
23+
Lastly, we will configure the Spring PetClinic application to write application logs to the filesystem and also configure the Splunk OpenTelemetry Collector to read (tail) the logs and send them to **Splunk Cloud**.
2424

25-
{{% notice title="Prerequisites" style="info" %}}
26-
A Splunk-run workshop where a host/instance is provided **OR** a self-led workshop on your own host / [multipass instance](https://github.com/splunk/observability-workshop/tree/main/multipass)
25+
{{% notice title="Prerequisites" style="primary" icon="info" %}}
2726

28-
For your own system, you will need the following installed and enabled:
27+
* Outbound SSH access to port `2222`.
28+
* Outbound HTTP access to port `8083`.
29+
* Familiarity with the `bash` shell and `vi/vim` editor.
2930

30-
1. JDK 17 installed
31-
2. Maven
32-
3. Port `8083` open inbound/outbound
3331
{{% /notice %}}
3432

3533
![PetClinic Exercise](images/petclinic-exercise.png)

0 commit comments

Comments
 (0)