Merge branch 'splunk:main' into main

Author: jelkhouri-splunk

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.50
+current_version = 4.51
 commit = True
 Tag = True
 parse = v?(?P<major>\d+)\.(?P<minor>\d+)

README.md

@@ -21,5 +21,5 @@ To get started, please proceed to [The Splunk Observability Cloud Workshops Home
 If you are the host for the RUM workshop, please check this [README](https://github.com/splunk/observability-workshop/blob/main/workshop/apm/README.md)
 
 Latest versions of the workshop are:
+- [v4.51](https://splunk.github.io/observability-workshop/v4.51/)
 - [v4.50](https://splunk.github.io/observability-workshop/v4.50/)
-- [v4.49](https://splunk.github.io/observability-workshop/v4.49/)

VERSION

@@ -1 +1 @@
-4.50
+4.51

config.yaml

@@ -34,10 +34,10 @@ params:
   versions:
     - version: latest
       url: https://splunk.github.io/observability-workshop/latest/
-    - version: v4.49
-      url: https://splunk.github.io/observability-workshop/v4.49
     - version: v4.50
       url: https://splunk.github.io/observability-workshop/v4.50
+    - version: v4.51
+      url: https://splunk.github.io/observability-workshop/v4.51
   url_latest_version: https://splunk.github.io/observability-workshop/
   #github_repo: https://github.com/splunk/observability-workshop
   #github_project_repo: https://github.com/splunk/observability-workshop

content/en/pet-clinic/images/petclinic-exercise.png

@@ -108,18 +108,18 @@ curl localhost:5000/get_review
 
 To create a container image, you need to create a Dockerfile, run docker build to build the image referencing the Docker file and push it up to a remote repository so it can be pulled by other sources.
 
-- Create a Dockerfile
+- [Create a Dockerfile](https://docs.docker.com/get-started/02_our_app/)
 - Creating a Dockerfile typically requires you to consider the following:
   - Identify an appropriate container image
     - ubuntu vs. python vs. alpine/slim
     - ubuntu - overkill, large image size, wasted resources when running in K8
     - this is a python app, so pick an image that is optimized for it
-    - avoid alpine for python
+    - [avoid alpine for python](https://lih-verma.medium.com/alpine-makes-python-docker-builds-way-too-50-slower-and-images-double-2-larger-61d1d43cbc79)
   - Order matters
     - you're building layers.
     - re-use the layers as much as possible
     - have items that change often towards the end
-  - Other Best practices for writing Dockerfiles
+  - [Other Best practices for writing Dockerfiles](https://docs.docker.com/develop/develop-images/dockerfile_best-practices/)
 
 Dockerfile for review
 
@@ -172,7 +172,8 @@ curl -s http://localhost:8000/v2/_catalog
 ## 3. Run REVIEW in Kubernetes
 
 Create K8 deployment yaml file for the REVIEW app
-Reference: Creating a Deployment
+
+Reference: [Creating a Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#creating-a-deployment)
 
 review.deployment.yaml
 
@@ -217,7 +218,9 @@ Notes regarding review.deployment.yaml:
 - regcred provides this deployment with the ability to access your dockerhub credentials which is necessary to pull the container image.
 - The volume definition and volumemount make the yelp dataset visible to the container
 
-Create a K8 service yaml file for the review app. Reference: Creating a service:
+Create a K8 service yaml file for the review app. 
+
+Reference: [Creating a service:](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service)
 
 review.service.yaml
 

content/en/tko/session-2/docs/code_to_python.md

@@ -17,7 +17,7 @@ A prospect uses Kafka and MongoDB in their environment. Since there are integrat
 - Google “myservice helm chart”
 - `https://artifacthub.io/` (**Note:** Look for charts from trusted organizations, with high star count and frequent updates)
 
-### 2. Review Apache Kafka packaged by Bitnami
+### 2. Review [Apache Kafka packaged by Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/kafka/#installing-the-chart)
 
 We will deploy the helm chart with these options enabled:
 
@@ -26,7 +26,7 @@ We will deploy the helm chart with these options enabled:
 - `metrics.kafka.enabled=true`
 - `deleteTopicEnable=true`
 
-### 3. Review MongoDB(R) packaged by Bitnami
+### 3. Review [MongoDB(R) packaged by Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/mongodb/#installing-the-chart)
 
 We will deploy the helm chart with these options enabled:
 
@@ -72,9 +72,9 @@ Use information for each Helm chart and Splunk O11y Data Setup to generate value
 {{% /alert %}}
 
 - References:
-  - Apache Kafka packaged by Bitnami
-  - Configure application receivers for databases » Apache Kafka
-  - Kafkametricsreceiver
+  - [Apache Kafka packaged by Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/spark/#installing-the-chart)
+  - [Configure application receivers for databases » Apache Kafka](https://docs.splunk.com/Observability/gdi/kafka/kafka.html)
+  - [Kafkametricsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/kafkametricsreceiver)
 
 #### 4.1 Example kafka.values.yaml
 
@@ -188,9 +188,13 @@ splunk-otel-collector-1638910184-k8s-cluster-receiver-8587qmh9l   1/1     Runnin
 Verify that out of the box dashboards for Kafka, MongoDB and Zookeeper are populated in the Infrastructure Monitor landing page. Drill down into each component to view granular details for each service.
 
 - Infrastructure Monitoring Landing page:
+![IM-landing-page](../images/imlp.png)
 
 - K8 Navigator:
+![k8-navigator](../images/k8nav.png)
 
 - MongoDB Dashboard:
+![mongodb-dash](../images/mongodash.png)
 
 - Kafka Dashboard:
+![kafka-dash](../images/kafkadash.png)