Merge branch 'main' into conf24

splunk · Jun 4, 2024 · 1429ef3 · 1429ef3
2 parents 456845d + d52fce7
commit 1429ef3
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 30 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.53
+current_version = 5.59
 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.53](https://splunk.github.io/observability-workshop/v5.53/)
-- [v5.52](https://splunk.github.io/observability-workshop/v5.52/)
+- [v5.59](https://splunk.github.io/observability-workshop/v5.59/)
+- [v5.58](https://splunk.github.io/observability-workshop/v5.58/)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.53
+5.59
diff --git a/content/en/conf24/1-zero-config-k8s/2-preparation/1-otel.md b/content/en/conf24/1-zero-config-k8s/2-preparation/1-otel.md
@@ -1,4 +1,5 @@
 ---
+
 title: Deploy the Splunk OpenTelemetry Collector
 linkTitle: 1. Deploy OpenTelemetry Collector
 weight: 2

diff --git a/content/en/other/11-synthetics-scripting/1-real-browser-test/1-recording-a-test.md b/content/en/other/11-synthetics-scripting/1-real-browser-test/1-recording-a-test.md
@@ -13,12 +13,12 @@ The starting URL for the workshop is different for **EMEA** and **AMER/APAC**. P
 {{% tabs %}}
 {{% tab title="EMEA Workshop URL" %}}
 
-[https://online-boutique-eu.o11ystore.com/](https://online-boutique-eu.o11ystore.com/)
+[https://online-boutique-eu.splunko11y.com/](https://online-boutique-eu.splunko11y.com/)
 
 {{% /tab %}}
 {{% tab title="AMER/APAC Workshop URL" %}}
 
-[https://online-boutique-us.o11ystore.com/](https://online-boutique-us.o11ystore.com/)
+[https://online-boutique-us.splunko11y.com/](https://online-boutique-us.splunko11y.com/)
 
 {{% /tab %}}
 {{% /tabs %}}
@@ -86,11 +86,11 @@ Select **JSON** as the format, then click on **Save**
         },
         {
             "type": "navigate",
-            "url": "https://online-boutique-eu.o11ystore.com/",
+            "url": "https://online-boutique-eu.splunko11y.com/",
             "assertedEvents": [
                 {
                     "type": "navigation",
-                    "url": "https://online-boutique-eu.o11ystore.com/",
+                    "url": "https://online-boutique-eu.splunko11y.com/",
                     "title": "Online Boutique"
                 }
             ]
@@ -114,7 +114,7 @@ Select **JSON** as the format, then click on **Save**
             "assertedEvents": [
                 {
                     "type": "navigation",
-                    "url": "https://online-boutique-eu.o11ystore.com/product/66VCHSJNUP",
+                    "url": "https://online-boutique-eu.splunko11y.com/product/66VCHSJNUP",
                     "title": ""
                 }
             ]
@@ -144,7 +144,7 @@ Select **JSON** as the format, then click on **Save**
             "assertedEvents": [
                 {
                     "type": "navigation",
-                    "url": "https://online-boutique-eu.o11ystore.com/cart",
+                    "url": "https://online-boutique-eu.splunko11y.com/cart",
                     "title": ""
                 }
             ]
@@ -174,7 +174,7 @@ Select **JSON** as the format, then click on **Save**
             "assertedEvents": [
                 {
                     "type": "navigation",
-                    "url": "https://online-boutique-eu.o11ystore.com/cart/checkout",
+                    "url": "https://online-boutique-eu.splunko11y.com/cart/checkout",
                     "title": ""
                 }
             ]

diff --git a/content/en/scenarios/optimize_end_user_experiences/2-rum/2-setup.md b/content/en/scenarios/optimize_end_user_experiences/2-rum/2-setup.md
@@ -24,7 +24,7 @@ This code enables RUM Tracing, [Session Replay](https://docs.splunk.com/observab
 * The first part is to indicate where to download the Splunk Open Telemetry Javascript file from: `https://cdn.signalfx.com/o11y-gdi-rum/latest/splunk-otel-web.js` (this can also be hosted locally if so required).
 * The next section defines the location where to send the traces to in the beacon url: `{beaconUrl: "https://rum-ingest.eu0.signalfx.com/v1/rum"`
 * The RUM Access Token:  `rumAuth: "<redacted>"`.
-* Identification tags `app` and `environment` to indentify in the SPLUNK RUM UI e.g.  `app: "frontend-demo-us-store", environment: "frontend-demo-us"}` (these values will be different in your workshop)
+* Identification tags `app` and `environment` to indentify in the SPLUNK RUM UI e.g.  `app: "online-boutique-us-store", environment: "online-boutique-us"}` (these values will be different in your workshop)
 
 The above lines 21 and 23-30 are all that is required to enable RUM on your website!
 

diff --git a/...arios/optimize_end_user_experiences/3-advanced-synthetics/1-recording-a-test.md b/...arios/optimize_end_user_experiences/3-advanced-synthetics/1-recording-a-test.md
@@ -74,11 +74,11 @@ Select **JSON** as the format, then click on **Save**
         },
         {
             "type": "navigate",
-            "url": "https://online-boutique-eu.o11ystore.com/",
+            "url": "https://online-boutique-eu.splunko11y.com/",
             "assertedEvents": [
                 {
                     "type": "navigation",
-                    "url": "https://online-boutique-eu.o11ystore.com/",
+                    "url": "https://online-boutique-eu.splunko11y.com/",
                     "title": "Online Boutique"
                 }
             ]
@@ -102,7 +102,7 @@ Select **JSON** as the format, then click on **Save**
             "assertedEvents": [
                 {
                     "type": "navigation",
-                    "url": "https://online-boutique-eu.o11ystore.com/product/66VCHSJNUP",
+                    "url": "https://online-boutique-eu.splunko11y.com/product/66VCHSJNUP",
                     "title": ""
                 }
             ]
@@ -132,7 +132,7 @@ Select **JSON** as the format, then click on **Save**
             "assertedEvents": [
                 {
                     "type": "navigation",
-                    "url": "https://online-boutique-eu.o11ystore.com/cart",
+                    "url": "https://online-boutique-eu.splunko11y.com/cart",
                     "title": ""
                 }
             ]
@@ -162,7 +162,7 @@ Select **JSON** as the format, then click on **Save**
             "assertedEvents": [
                 {
                     "type": "navigation",
-                    "url": "https://online-boutique-eu.o11ystore.com/cart/checkout",
+                    "url": "https://online-boutique-eu.splunko11y.com/cart/checkout",
                     "title": ""
                 }
             ]

diff --git a/content/ja/synthetics/_index.md b/content/ja/synthetics/_index.md
@@ -4,6 +4,7 @@ linkTitle: Splunk Synthetics
 description: ユーザーフロー、ビジネストランザクション、APIにおけるパフォーマンスの問題を積極的に発見、修正し、より良いデジタル体験を提供します。
 weight: 4
 isCJKLanguage: true
+hidden: true
 ---
 
 **Splunk Synthetic Monitoring** は、完全なオブザーバビリティスイートである Splunk Observability Cloud の一部として、アップタイムと Webパフォーマンスの最適化のための最も包括的で詳細な機能を提供します。

diff --git a/deprecated/multipass/main.tf b/deprecated/multipass/main.tf
@@ -72,7 +72,7 @@ variable "splunk_diab" {
 variable "wsversion" {
   description = "Workshop version"
   type        = string
-  default     = "5.53"
+  default     = "5.59"
 }
 
 variable "instance_password" {

diff --git a/deprecated/multipass/terraform.tfvars.template b/deprecated/multipass/terraform.tfvars.template
@@ -17,6 +17,6 @@ otel_demo = false
 pub_key = ""
 
 # Advanced
-wsversion = "5.53"
+wsversion = "5.59"
 user_data_tpl = "userdata.yaml"
 
diff --git a/hugo.yaml b/hugo.yaml
@@ -1,6 +1,6 @@
 baseURL: https://splunk.github.io/
-canonifyURLs: true
-relativeURLs: true
+relativeURLs: false
+#canonifyURLs: true
 noChmod: true
 contentDir: content/en
 title: Splunk Observability Cloud Workshops
@@ -56,10 +56,10 @@ params:
   versions:
     - version: latest
       url: https://splunk.github.io/observability-workshop/latest/
-    - version: v5.52
-      url: https://splunk.github.io/observability-workshop/v5.52
-    - version: v5.53
-      url: https://splunk.github.io/observability-workshop/v5.53
+    - version: v5.58
+      url: https://splunk.github.io/observability-workshop/v5.58
+    - version: v5.59
+      url: https://splunk.github.io/observability-workshop/v5.59
   url_latest_version: https://splunk.github.io/observability-workshop/
   imageEffects:
     border: false

diff --git a/workshop/ansible/orbstack.yml b/workshop/ansible/orbstack.yml
@@ -54,13 +54,14 @@
             type: Opaque
             stringData:
               app: {{ instance }}-store
-              deployment: "deployment.environment={{ instance }}"
-              env: {{ instance }}
+              deployment: "deployment.environment={{ instance }}-workshop"
+              env: {{ instance }}-workshop
               realm: {{ realm }}
               access_token: {{ ingest_token }}
               rum_token: {{ rum_token }}
               hec_token: {{ hec_token }}
               hec_url: {{ hec_url }}
+              url: frontend
         become: true
         when: not wh_result.stat.exists
 

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.53"
+wsversion = "5.59"
 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.53"
+  default     = "5.59"
 }
 
 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.53
+  - export WSVERSION=5.59
   - '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/

diff --git a/workshop/k3s/demo-in-a-box.zip b/workshop/k3s/demo-in-a-box.zip