Fixing paths

Author: rcastley

workshop/aws/ec2/templates/userdata.yaml

@@ -76,7 +76,16 @@ write_files:
       if [ ! -f ~/.helmok ]; then
         helm repo add splunk-otel-collector-chart https://signalfx.github.io/splunk-otel-collector-chart
         helm repo update
-        helm install splunk-otel-collector --set="splunkObservability.realm=$REALM" --set="splunkObservability.accessToken=$ACCESS_TOKEN" --set="clusterName=$INSTANCE-k3s-cluster" --set="splunkObservability.logsEnabled=true" --set="splunkObservability.profilingEnabled=true" --set="splunkObservability.infrastructureMonitoringEventsEnabled=true" --set="environment=$INSTANCE-apm-env" splunk-otel-collector-chart/splunk-otel-collector -f ~/workshop/k3s/otel-collector.yaml
+        helm install splunk-otel-collector \
+        --set="splunkObservability.realm=$REALM" \
+        --set="splunkObservability.accessToken=$ACCESS_TOKEN" \
+        --set="clusterName=$INSTANCE-k3s-cluster" \
+        --set="splunkObservability.logsEnabled=true" \
+        --set="splunkObservability.profilingEnabled=true" \
+        --set="splunkObservability.infrastructureMonitoringEventsEnabled=true" \
+        --set="environment=$INSTANCE-apm-env" \
+        splunk-otel-collector-chart/splunk-otel-collector \
+        -f ~/workshop/k3s/otel-collector.yaml
         cd ~/workshop/apm/
         bash apm-config.sh -r
         sudo kubectl apply -f deployment.yaml
@@ -87,15 +96,30 @@ write_files:
 
 %{ if otel_demo == true ~}
       export RUM_TOKEN=${rum_token}
-      mkdir otel-demo && cd otel-demo
-      curl -s -OL https://raw.githubusercontent.com/splunk/observability-workshop/main/oteldemo/otel-demo-collector.yaml
-      curl -s -OL https://raw.githubusercontent.com/splunk/observability-workshop/main/oteldemo/otel-demo.yaml
       if [ ! -f ~/.helmok ]; then
         helm repo add splunk-otel-collector-chart https://signalfx.github.io/splunk-otel-collector-chart
         helm repo update
-        helm install splunk-otel-collector --set="splunkObservability.realm=$REALM" --set="splunkObservability.accessToken=$ACCESS_TOKEN" --set="clusterName=$(hostname)-k3s-cluster" --set="splunkObservability.logsEnabled=true" --set="logsEngine=otel" --set="splunkObservability.profilingEnabled=true" --set="splunkObservability.infrastructureMonitoringEventsEnabled=true" --set="networkExplorer.enabled=true" --set="networkExplorer.podSecurityPolicy.enabled=false" --set="agent.enabled=true" --set="gateway.replicaCount=1" --set="gateway.resources.limits.cpu=500m" --set="gateway.resources.limits.memory=1Gi" --set="clusterReceiver.enabled=true" --set="environment=$(hostname)-apm-env" splunk-otel-collector-chart/splunk-otel-collector -f otel-demo-collector.yaml
+        helm install splunk-otel-collector \
+        --set="splunkObservability.realm=$REALM" \
+        --set="splunkObservability.accessToken=$ACCESS_TOKEN" \
+        --set="clusterName=$INSTANCE-k3s-cluster" \
+        --set="splunkObservability.logsEnabled=true" \
+        --set="logsEngine=otel" \
+        --set="splunkObservability.profilingEnabled=true" \
+        --set="splunkObservability.infrastructureMonitoringEventsEnabled=true" \
+        --set="networkExplorer.enabled=true" \
+        --set="networkExplorer.podSecurityPolicy.enabled=false" \
+        --set="agent.enabled=true" \
+        --set="gateway.replicaCount=1" \
+        --set="gateway.resources.limits.cpu=500m" \
+        --set="gateway.resources.limits.memory=1Gi" \
+        --set="clusterReceiver.enabled=true" \
+        --set="environment=$INSTANCE-apm-env" \
+        splunk-otel-collector-chart/splunk-otel-collector \
+        -f ~/workshop/oteldemo/otel-demo-collector.yaml
         helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
-        helm install my-otel-demo open-telemetry/opentelemetry-demo --values otel-demo.yaml
+        helm install my-otel-demo open-telemetry/opentelemetry-demo --values ~/workshop/oteldemo/otel-demo.yaml
+        echo $INSTANCE > ~/.helmok
         cd /home/ubuntu
       fi
 %{ endif ~}