Merge remote-tracking branch 'upstream/main'

Author: dmitchsplunk

.bumpversion.cfg

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

README.md

@@ -22,5 +22,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:
+- [v6.7](https://splunk.github.io/observability-workshop/v6.7/)
 - [v6.6](https://splunk.github.io/observability-workshop/v6.6/)
-- [v6.5](https://splunk.github.io/observability-workshop/v6.5/)

VERSION

@@ -1 +1 @@
-6.6
+6.7

local-hosting/multipass/main.tf

@@ -52,7 +52,7 @@ variable "tagging_workshop" {
 variable "wsversion" {
   description = "Workshop version"
   type        = string
-  default     = "6.6"
+  default     = "6.7"
 }
 
 variable "user_data_tpl" {

local-hosting/multipass/terraform.tfvars.template

@@ -10,6 +10,6 @@ tagging_workshop = false
 pub_key = ""
 
 # Advanced
-wsversion = "6.6"
+wsversion = "6.7"
 user_data_tpl = "userdata.yaml"
 architecture = "arm64" # amd64 or arm64

local-hosting/proxmox/ubuntu-cloud-k3d.sh

@@ -193,7 +193,7 @@ runcmd:
   - curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash
 
   # Create 3 node k3d cluster
-  - k3d cluster create ${HOSTNAME}-cluster --agents 2 --agents-memory 6G --k3s-arg "--kubelet-arg=eviction-hard=memory.available<1Gi@server:0" --k3s-arg "--kubelet-arg=eviction-hard=memory.available<1Gi@agent:*" --image rancher/k3s:v1.33.4-k3s1 --port "81:80@loadbalancer" --port "82:82@loadbalancer" -v /var/log/syslog:/var/log/syslog -v /var/log/auth.log:/var/log/auth.log
+  - k3d cluster create ${HOSTNAME}-cluster --agents 2 --agents-memory 6G --k3s-arg "--kubelet-arg=eviction-hard=memory.available<1Gi@server:0" --k3s-arg "--kubelet-arg=eviction-hard=memory.available<1Gi@agent:*" --image rancher/k3s:v1.33.4-k3s1 --port "80:80@loadbalancer" --port "81:80@loadbalancer" --port "82:82@loadbalancer" -v /var/log/syslog:/var/log/syslog -v /var/log/auth.log:/var/log/auth.log
 
   # Add user splunk to docker group
   - usermod -aG docker splunk

workshop/aws/ec2/terraform.tfvars.template

@@ -21,5 +21,5 @@ tagging_workshop = false
 pub_key = ""
 
 # Advanced
-wsversion = "6.6"
+wsversion = "6.7"
 user_data_tpl = "userdata.yaml"

workshop/aws/ec2/variables.tf

@@ -99,7 +99,7 @@ variable "tagging_workshop" {
 variable "wsversion" {
   description = "Workshop version"
   type        = string
-  default     = "6.6"
+  default     = "6.7"
 }
 
 data "aws_ami" "latest-ubuntu" {

workshop/cloud-init/victorops.yaml

@@ -52,7 +52,7 @@ write_files:
 
 runcmd:
   # Download Workshop
-  - export WSVERSION=6.6
+  - export WSVERSION=6.7
   - '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/