Merge remote-tracking branch 'upstream/main'

splunk · Sep 6, 2024 · a1285c0 · a1285c0
2 parents 2a163e8 + 8913e5d
commit a1285c0
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 10 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.64
+current_version = 5.65
 commit = True
 Tag = True
 parse = v?(?P<major>\d+)\.(?P<minor>\d+)

diff --git a/README.md b/README.md
@@ -23,5 +23,5 @@ Unless required by applicable law or agreed to in writing, software distributed
 To get started, please proceed to [The Splunk Observability Cloud Workshops Homepage](https://splunk.github.io/observability-workshop/latest/).
 
 Latest versions of the workshop are:
+- [v5.65](https://splunk.github.io/observability-workshop/v5.65/)
 - [v5.64](https://splunk.github.io/observability-workshop/v5.64/)
-- [v5.63](https://splunk.github.io/observability-workshop/v5.63/)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.64
+5.65
diff --git a/...ent/en/other/3-automatic-discovery/1-petclinic-monolith/images/log-observer.png b/...ent/en/other/3-automatic-discovery/1-petclinic-monolith/images/log-observer.png
diff --git a/.../en/other/3-automatic-discovery/1-petclinic-monolith/images/petclinic-error.png b/.../en/other/3-automatic-discovery/1-petclinic-monolith/images/petclinic-error.png
diff --git a/...c-discovery/2-petclinic-kubernetes/images/auto-instrumentation-java-diagram.png b/...c-discovery/2-petclinic-kubernetes/images/auto-instrumentation-java-diagram.png
diff --git a/content/en/other/99-imt-admin/gdi/images/clustermap-nav.png b/content/en/other/99-imt-admin/gdi/images/clustermap-nav.png
diff --git a/content/en/other/99-imt-admin/gdi/images/filtered-k3s-cluster.png b/content/en/other/99-imt-admin/gdi/images/filtered-k3s-cluster.png
diff --git a/content/en/other/99-imt-admin/gdi/images/find_k3s_cluster.png b/content/en/other/99-imt-admin/gdi/images/find_k3s_cluster.png
diff --git a/content/en/other/99-imt-admin/gdi/images/k3s-cluster-to-node.png b/content/en/other/99-imt-admin/gdi/images/k3s-cluster-to-node.png
diff --git a/content/en/other/99-imt-admin/gdi/images/k3s-node-view.png b/content/en/other/99-imt-admin/gdi/images/k3s-node-view.png
diff --git a/content/en/other/99-imt-admin/gdi/images/k3s-otel-agent.png b/content/en/other/99-imt-admin/gdi/images/k3s-otel-agent.png
diff --git a/content/en/other/99-imt-admin/gdi/images/k3s-otel-cluster-reciever.png b/content/en/other/99-imt-admin/gdi/images/k3s-otel-cluster-reciever.png
diff --git a/content/en/other/99-imt-admin/gdi/images/selecting-k3s-cluster.png b/content/en/other/99-imt-admin/gdi/images/selecting-k3s-cluster.png
diff --git a/hugo.yaml b/hugo.yaml
@@ -56,10 +56,10 @@ params:
   versions:
     - version: latest
       url: https://splunk.github.io/observability-workshop/latest/
-    - version: v5.63
-      url: https://splunk.github.io/observability-workshop/v5.63
     - version: v5.64
       url: https://splunk.github.io/observability-workshop/v5.64
+    - version: v5.65
+      url: https://splunk.github.io/observability-workshop/v5.65
   url_latest_version: https://splunk.github.io/observability-workshop/
   imageEffects:
     border: false

diff --git a/local-hosting/multipass/main.tf b/local-hosting/multipass/main.tf
@@ -72,7 +72,7 @@ variable "tagging_workshop" {
 variable "wsversion" {
   description = "Workshop version"
   type        = string
-  default     = "5.64"
+  default     = "5.65"
 }
 
 variable "user_data_tpl" {

diff --git a/local-hosting/multipass/terraform.tfvars.template b/local-hosting/multipass/terraform.tfvars.template
@@ -18,6 +18,6 @@ tagging_workshop = false
 pub_key = ""
 
 # Advanced
-wsversion = "5.64"
+wsversion = "5.65"
 user_data_tpl = "userdata.yaml"
 
diff --git a/workshop/aws/ec2/terraform.tfvars.template b/workshop/aws/ec2/terraform.tfvars.template
@@ -21,5 +21,5 @@ tagging_workshop = false
 pub_key = ""
 
 # Advanced
-wsversion = "5.64"
+wsversion = "5.65"
 user_data_tpl = "userdata.yaml"
diff --git a/workshop/aws/ec2/variables.tf b/workshop/aws/ec2/variables.tf
@@ -99,7 +99,7 @@ variable "tagging_workshop" {
 variable "wsversion" {
   description = "Workshop version"
   type        = string
-  default     = "5.64"
+  default     = "5.65"
 }
 
 data "aws_ami" "latest-ubuntu" {

diff --git a/workshop/cloud-init/victorops.yaml b/workshop/cloud-init/victorops.yaml
@@ -52,7 +52,7 @@ write_files:
 
 runcmd:
   # Download Workshop
-  - export WSVERSION=5.64
+  - export WSVERSION=5.65
   - 'export WSARCHIVE=$([ "$WSVERSION" = "main" ] && echo "main" || echo "v$WSVERSION")'
   - curl -s -OL https://github.com/splunk/observability-workshop/archive/$WSARCHIVE.zip
   - unzip -qq $WSARCHIVE.zip -d /home/splunk/