Move to API Token for terraform module

Author: rcastley

content/en/imt/monitoring-as-code/_index.md

@@ -34,10 +34,10 @@ cd ~/observability-content-contrib/integration-examples/terraform-jumpstart
 
 The environment variables needed should already be set from [Installation using Helm](../gdi/#2-installation-using-helm). If not, create the following environment variables to use in the Terraform steps below
 
-{{% tab title="Export ACCESS TOKEN" %}}
+{{% tab title="Export API TOKEN" %}}
 
 ``` bash
-export ACCESS_TOKEN="<replace_with_O11y-Workshop-ACCESS_TOKEN>"
+export API_TOKEN="<replace_with_O11y-Workshop-API_TOKEN>"
 ```
 
 {{% /tab %}}
@@ -124,7 +124,7 @@ The plan command alone will not actually carry out the proposed changes, and so
 {{% tab title="Execution Plan" %}}
 
 ```bash
-terraform plan -var="access_token=$ACCESS_TOKEN" -var="realm=$REALM" -var="o11y_prefix=[$(hostname)]"
+terraform plan -var="api_token=$API_TOKEN" -var="realm=$REALM" -var="o11y_prefix=[$(hostname)]"
 ```
 
 {{% /tab %}}
@@ -145,15 +145,15 @@ If the plan executes successfully, we can go ahead and apply:
 
 The `terraform apply` command executes the actions proposed in the Terraform plan above.
 
-The most straightforward way to use `terraform apply` is to run it without any arguments at all, in which case it will automatically create a new execution plan (as if you had run terraform plan) and then prompt you to provide the Access Token, Realm (the prefix defaults to `Splunk`) and approve the plan, before taking the indicated actions.
+The most straightforward way to use `terraform apply` is to run it without any arguments at all, in which case it will automatically create a new execution plan (as if you had run terraform plan) and then prompt you to provide the API Token, Realm (the prefix defaults to `Splunk`) and approve the plan, before taking the indicated actions.
 
 Due to this being a workshop it is required that the prefix is to be unique so you need to run the `terraform apply` below.
 
 {{< tabs >}}
 {{% tab title="Apply Plan" %}}
 
 ``` bash
-terraform apply -var="access_token=$ACCESS_TOKEN" -var="realm=$REALM" -var="o11y_prefix=[$(hostname)]"
+terraform apply -var="api_token=$API_TOKEN" -var="realm=$REALM" -var="o11y_prefix=[$(hostname)]"
 ```
 
 {{% /tab %}}
@@ -188,7 +188,7 @@ Now go and destroy all the Detectors and Dashboards that were previously applied
 {{% tab title="Destroy" %}}
 
 ``` bash
-terraform destroy -var="access_token=$ACCESS_TOKEN" -var="realm=$REALM"
+terraform destroy -var="api_token=$API_TOKEN" -var="realm=$REALM"
 ```
 
 {{% /tab %}}

multipass/README.md

@@ -63,6 +63,7 @@ Initializing provider plugins...
 ### Required variables
 
 - `splunk_access_token`: Observability Access Token
+- `splunk_api_token`: Observability API Token
 - `splunk_rum_token`: Observability RUM Token
 - `splunk_realm`: Observability Realm e.g. `eu0`
 - `splunk_hec_url`: Splunk HEC URL

multipass/main.tf

@@ -15,6 +15,12 @@ variable "splunk_access_token" {
   nullable    = false
 }
 
+variable "splunk_api_token" {
+  description = "Splunk Observability Cloud API Token"
+  type        = string
+  nullable    = false
+}
+
 variable "splunk_rum_token" {
   description = "Splunk Observability Cloud RUM Token"
   type        = string

multipass/terraform.tfvars.template

@@ -1,5 +1,6 @@
 # Required
 splunk_access_token = ""
+splunk_api_token = ""
 splunk_realm = ""
 
 # Required if splunk_presetup is true, optional otherwise. See variables.tf and README.md

workshop/aws/ec2/README.md

@@ -57,6 +57,7 @@ The following variables are available. Edit `terraform.tfvars` to reflect what y
 - `aws_instance_count`: How many instances?
 - `slug`: Short name/tag, e.g. acme. Used to derive project and hostnames, AWS tags and terraform workspace e.g. `emea-ws`)
 - `splunk_access_token`: Observability Access Token
+- `splunk_api_token`: Observability API Token
 - `splunk_realm`: Observability Realm
 - `splunk_rum_token`: Observability RUM Token
 - `splunk_hec_url`: Splunk HEC URL

workshop/aws/ec2/main.tf

@@ -197,6 +197,7 @@ resource "aws_key_pair" "kp" {
 locals {
   template_vars = {
     access_token      = var.splunk_access_token
+    api_token         = var.splunk_api_token
     rum_token         = var.splunk_rum_token
     realm             = var.splunk_realm
     hec_token         = var.splunk_hec_token

workshop/aws/ec2/templates/userdata.yaml

@@ -47,6 +47,7 @@ write_files:
     content: |
 
       export ACCESS_TOKEN=${access_token}
+      export API_TOKEN=${api_token}
       export REALM=${realm}
       export RUM_TOKEN=${rum_token}
       export HEC_TOKEN=${hec_token}
@@ -62,7 +63,7 @@ write_files:
 
       terraform() {
 
-        echo >&2 "Using ACCESS_TOKEN=${access_token}"
+        echo >&2 "Using API_TOKEN=${api_token}"
         echo >&2 "Using REALM=${realm}"
 
         command terraform "$@"
@@ -129,6 +130,7 @@ write_files:
       export RUM_TOKEN=${rum_token}
       export REALM=${realm}
       export ACCESS_TOKEN=${access_token}
+      export API_TOKEN=${api_token}
       export HEC_TOKEN=${hec_token}
       export HEC_URL=${hec_url}
       export INSTANCE="${instance_name}"
@@ -164,6 +166,7 @@ write_files:
       export RUM_TOKEN=${rum_token}
       export REALM=${realm}
       export ACCESS_TOKEN=${access_token}
+      export API_TOKEN=${api_token}
       export HEC_TOKEN=${hec_token}
       export HEC_URL=${hec_url}
       export INSTANCE="${instance_name}"

workshop/aws/ec2/terraform.tfvars.template

@@ -3,6 +3,7 @@ aws_region = ""
 aws_instance_count = ""
 slug = ""
 splunk_access_token = ""
+splunk_api_token = ""
 splunk_realm = ""
 
 # Required if splunk_presetup is true, optional otherwise. See variables.tf and README.md

workshop/aws/ec2/variables.tf

@@ -66,6 +66,12 @@ variable "splunk_access_token" {
   nullable    = false
 }
 
+variable "splunk_api_token" {
+  description = "Splunk Oberservability Cloud API Token"
+  type        = string
+  nullable    = false
+}
+
 variable "splunk_rum_token" {
   description = "Splunk Oberservability Cloud RUM Token"
   type        = string