Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge with main #295

Merged
merged 4 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 5.51
current_version = 5.53
commit = True
Tag = True
parse = v?(?P<major>\d+)\.(?P<minor>\d+)
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runs:
- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
hugo-version: '0.119.0'
hugo-version: '0.125.5'
extended: true

- name: Setup yq
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.51](https://splunk.github.io/observability-workshop/v5.51/)
- [v5.50](https://splunk.github.io/observability-workshop/v5.50/)
- [v5.53](https://splunk.github.io/observability-workshop/v5.53/)
- [v5.52](https://splunk.github.io/observability-workshop/v5.52/)
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.51
5.53
2 changes: 1 addition & 1 deletion deprecated/multipass/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ variable "splunk_diab" {
variable "wsversion" {
description = "Workshop version"
type = string
default = "5.51"
default = "5.53"
}

variable "instance_password" {
Expand Down
2 changes: 1 addition & 1 deletion deprecated/multipass/terraform.tfvars.template
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ otel_demo = false
pub_key = ""

# Advanced
wsversion = "5.51"
wsversion = "5.53"
user_data_tpl = "userdata.yaml"

8 changes: 4 additions & 4 deletions hugo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ params:
versions:
- version: latest
url: https://splunk.github.io/observability-workshop/latest/
- version: v5.50
url: https://splunk.github.io/observability-workshop/v5.50
- version: v5.51
url: https://splunk.github.io/observability-workshop/v5.51
- version: v5.52
url: https://splunk.github.io/observability-workshop/v5.52
- version: v5.53
url: https://splunk.github.io/observability-workshop/v5.53
url_latest_version: https://splunk.github.io/observability-workshop/
imageEffects:
border: false
Expand Down
2 changes: 1 addition & 1 deletion workshop/aws/ec2/terraform.tfvars.template
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ tagging_workshop = false
pub_key = ""

# Advanced
wsversion = "5.51"
wsversion = "5.53"
user_data_tpl = "userdata.yaml"
2 changes: 1 addition & 1 deletion workshop/aws/ec2/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ variable "tagging_workshop" {
variable "wsversion" {
description = "Workshop version"
type = string
default = "5.51"
default = "5.53"
}

data "aws_ami" "latest-ubuntu" {
Expand Down
2 changes: 1 addition & 1 deletion workshop/cloud-init/victorops.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ write_files:

runcmd:
# Download Workshop
- export WSVERSION=5.51
- export WSVERSION=5.53
- '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/
Expand Down
Loading