Fixed issues in Pet Clinic workshop

Author: rcastley

content/en/conf/opentelemetry-collector/_index.md

@@ -6,6 +6,35 @@ weight: 2
 alwaysopen: false
 ---
 
+{{< mermaid >}}
+%%{
+  init:{
+    "theme":"base",
+    "themeVariables": {
+      "primaryColor": "#ffffff",
+      "clusterBkg": "#eff2fb",
+      "defaultLinkColor": "#333333"
+    }
+  }
+}%%
+
+flowchart LR;
+    subgraph Collector
+    A[OTLP] --> M(Receivers)
+    B[JAEGER] --> M(Receivers)
+    C[Prometheus] --> M(Receivers)
+    end
+    subgraph Processors
+    M(Receivers) --> H(Filters, Attributes, etc)
+    E(Extensions)
+    end
+    subgraph Exporters
+    H(Filters, Attributes, etc) --> S(OTLP)
+    H(Filters, Attributes, etc) --> T(JAEGER)
+    H(Filters, Attributes, etc) --> U(Prometheus)
+    end
+{{< /mermaid >}}
+
 ## Overview
 
 [https://docs.splunk.com/Observability/gdi/other-ingestion-methods/upstream-collector.html#nav-Send-telemetry-using-OpenTelemetry-Collector-Contrib](https://docs.splunk.com/Observability/gdi/other-ingestion-methods/upstream-collector.html#nav-Send-telemetry-using-OpenTelemetry-Collector-Contrib)

content/en/other/pet-clinic/docs/apm.md renamed to content/en/other/pet-clinic/apm.md

@@ -76,7 +76,7 @@ Let's launch the PetClinic again using a new resource attribute. Note, that addi
 
 ```bash
 java \
--Dotel.service.name=$(hostname).service \
+-Dotel.service.name=$(hostname)-petclinic.service \
 -Dsplunk.profiler.enabled=true \
 -Dsplunk.metrics.enabled=true \
 -Dotel.resource.attributes=deployment.environment=$(hostname)-petclinic,version=0.314 \

content/en/other/pet-clinic/docs/imt.md renamed to content/en/other/pet-clinic/imt.md

@@ -15,7 +15,7 @@ The Splunk OpenTelemetry Collector uses FluentD to consume/report logs and to co
 
 Here's the sample FluentD configuration file (`petclinic.conf`, reading the file `/tmp/spring-petclinic.log`)
 
-```text
+```ini
 <source>
   @type tail
   @label @SPLUNK
@@ -69,7 +69,7 @@ The Spring PetClinic application can be configure to use a number of different j
     </rollingPolicy>
     <encoder>
       <pattern>
-      %d{yyyy-MM-dd HH:mm:ss} - %logger{36} - %msg trace_id=%X{trace_id} span_id=%X{span_id} trace_flags=%X{trace_flags} service.name=%property{otel.resource.service.name}, deployment.environment=%property{otel.resource.deployment.environment} %n
+        %d{yyyy-MM-dd HH:mm:ss} - %logger{36} - %msg trace_id=%X{trace_id} span_id=%X{span_id} trace_flags=%X{trace_flags} %n service: %property{otel.resource.service.name}, env: %property{otel.resource.deployment.environment}: %m%n
       </pattern>
     </encoder>
   </appender>
@@ -96,6 +96,7 @@ java \
 -Dotel.service.name=$(hostname)-petclinic.service \
 -Dsplunk.profiler.enabled=true \
 -Dsplunk.metrics.enabled=true \
+-Dotel.resource.attributes=deployment.environment=$(hostname)-petclinic,version=0.314 \
 -jar target/spring-petclinic-*.jar --spring.profiles.active=mysql
 ```
 
@@ -106,8 +107,7 @@ Hamburger Menu > Log Observer
 
 And you can add a filter to select only log messages from your host and the Spring PetClinic Application:
 
-1. Add Filter → Fields → `host.name` → `<your host name>`
-2. Add Filter → Fields → `service.name` → `<your host name>-petclinic.service`
+- Add Filter → Fields → `service.name` → `<your host name>-petclinic.service`
 
 ## 4. Summary
 

content/en/other/pet-clinic/docs/logobserver.md renamed to content/en/other/pet-clinic/logobserver.md

@@ -17,7 +17,7 @@ Then you'll need to select the workshop RUM token and define the application and
 - Application Name: `<hostname>-petclinic-service`
 - Environment: `<hostname>-petclinic-env`
 
-Copy the generated code snippet in the wizard or copy and edit the snippet below accordingly:
+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.
 
 ``` html
 <script src="https://cdn.signalfx.com/o11y-gdi-rum/latest/splunk-otel-web.js" crossorigin="anonymous"></script>
@@ -54,6 +54,7 @@ java \
 -Dotel.service.name=$(hostname)-petclinic.service \
 -Dsplunk.profiler.enabled=true \
 -Dsplunk.metrics.enabled=true \
+-Dotel.resource.attributes=deployment.environment=$(hostname)-petclinic,version=0.314 \
 -jar target/spring-petclinic-*.jar --spring.profiles.active=mysql
 ```