Skip to content

Commit 600ef92

Browse files
committed
Removed reference to configuring environment variables
1 parent e76beaa commit 600ef92

File tree

3 files changed

+9
-64
lines changed

3 files changed

+9
-64
lines changed

content/en/apm/online-boutique/_index.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ description: Verify the Online Boutique application is deployed into Kubernetes
1919

2020
This workshop module assumes you are completing this after you have run the IM workshop, and still have access to your EC2 instance.
2121

22-
If this is the case, continue with [Deploy Online Boutique](#2-deploy-online-boutique), otherwise if you have received a fresh instance, please run the first two (2) sections of [Deploy the OTel Collector](../../imt/gdi/) to get the system ready for the APM workshop, then continue with the next section.
22+
If this is the case, continue with [**Deploy Online Boutique**](#2-deploy-online-boutique), otherwise, if you have received a fresh instance, please run the first two (2) sections of [**Deploy the OTel Collector**](../../imt/gdi/) to get the system ready for the APM workshop, then continue with the next section.
2323

2424
## 2. Deploy Online Boutique
2525

@@ -125,20 +125,21 @@ Use the **Cluster** dropdown to select the cluster name, you will see the new po
125125

126126
![Back to cluster](../images/online-boutique-k8s.png)
127127

128-
If you select the **WORKLOADS** tab again you should now see that there are a number of Deployments and ReplicaSets:
128+
If you select the **WORKLOADS** tab again you should now see that there are some Deployments and ReplicaSets:
129129

130130
![Online Boutique loaded](../images/online-boutique-workload.png)
131131

132132
## Visit the Online Boutique
133133

134134
{{% expand title="{{% badge style=primary icon=user-ninja %}}**Ninja** - Visit the Online Boutique you just deployed{{% /badge %}}" %}}
135135
{{% notice style="blue" %}}
136+
136137
The Online Boutique is viewable on port 81 of the EC2 instance's IP address. The IP address is the one you used to SSH into the instance at the beginning of the workshop.
137138

138139
Open your web browser and go to `http://<ec2-ip-address>:81/` where you will then be able to see the Online Boutique running.
139140
{{% /notice %}}
140141
{{% /expand %}}
141142

142-
Your Workshop instructor will provide you with URL to access the Online Boutique. Enter this URL into your browser and you will see the Online Boutique homepage.
143+
Your Workshop instructor will provide you with a URL to access the Online Boutique. Enter this URL into your browser and you will see the Online Boutique homepage.
143144

144145
![Online Boutique](../images/online-boutique.png)

content/en/imt/gdi/_index.md

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,47 +13,9 @@ weight: 2
1313

1414
---
1515

16-
## 1. Obtain Access Token
16+
## 1. Installation using Helm
1717

18-
You will need to obtain your Access Token[^1] from the Splunk UI. You can find the workshop Access Token by clicking **>>** bottom left and then selecting **Settings → Access Tokens**.
19-
20-
Expand the workshop token that your host has instructed you to use e.g. **O11y-Workshop-ACCESS**, then click on **Show Token** to expose your token. Click the {{% button style="grey" %}}Copy{{% /button %}} button to copy to clipboard. Please do not use the **Default** token!
21-
22-
![Access Token](../images/access-token.png)
23-
24-
{{% notice title="Please do not attempt to create your own token" style="warning" %}}
25-
We have created a Token specifically for this workshop with the appropriate settings for the exercises you will be performing so have allocated it both Ingest and API Permissions. Best practice in production is to only allocate a single permission to a Token such as Ingest OR API OR RUM and use multiple Tokens where required.
26-
{{% /notice %}}
27-
28-
You will also need to obtain the name of the Realm[^2] for your Splunk account. At the top of the side menu, click on your name. This will direct you to the **Account Settings** Page. Click the **Organizations**-tab. The Realm can be found at the top of the displayed information in the tab. In this example it is `eu0`.
29-
30-
![Account Settings](../images/account-settings.png)
31-
32-
## 2. Installation using Helm
33-
34-
Create the `ACCESS_TOKEN` and `REALM` environment variables to use in the proceeding Helm install command. For instance, if your realm is `us1`, you would type `export REALM=us1` and for `eu0` type `export REALM=eu0`.
35-
36-
{{< tabs >}}
37-
{{% tab title="Export ACCESS TOKEN" %}}
38-
39-
```bash
40-
export ACCESS_TOKEN="<replace_with_O11y-Workshop-ACCESS_TOKEN>"
41-
```
42-
43-
{{% /tab %}}
44-
{{< /tabs >}}
45-
46-
{{< tabs >}}
47-
{{% tab title="Export REALM" %}}
48-
49-
```bash
50-
export REALM="<replace_with_REALM>"
51-
```
52-
53-
{{% /tab %}}
54-
{{< /tabs >}}
55-
56-
Install the OpenTelemetry Collector using the Splunk Helm chart. First, add the Splunk Helm chart repository to Helm and update.
18+
Install the OpenTelemetry Collector using the Splunk Helm chart. First, add the Splunk Helm chart repository to Helm and update:
5719

5820
{{< tabs >}}
5921
{{% tab title="Helm Repo Add" %}}

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

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ weight: 5
1818

1919
Monitoring as code adopts the same approach as infrastructure as code. You can manage monitoring the same way you do applications, servers, or other infrastructure components.
2020

21-
You can use monitoring as code to build out your visualisations, what to monitor, and when to alert, among other things. This means your monitoring setup, processes, and rules can be versioned, shared, and reused.
21+
You can use monitoring as code to build out your visualizations, what to monitor, and when to alert, among other things. This means your monitoring setup, processes, and rules can be versioned, shared, and reused.
2222

23-
Full documentation for the Splunk Terraform Provider is available [here](https://registry.terraform.io/providers/splunk-terraform/signalfx/latest/docs).
23+
Full documentation for the Splunk Terraform Provider is available [**here**](https://registry.terraform.io/providers/splunk-terraform/signalfx/latest/docs).
2424

2525
Remaining in your AWS/EC2 instance, change into the `o11y-cloud-jumpstart` directory
2626

@@ -32,25 +32,7 @@ cd ~/observability-content-contrib/integration-examples/terraform-jumpstart
3232

3333
{{% /tab %}}
3434

35-
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
36-
37-
{{% tab title="Export API TOKEN" %}}
38-
39-
``` bash
40-
export API_TOKEN="<replace_with_O11y-Workshop-API_TOKEN>"
41-
```
42-
43-
{{% /tab %}}
44-
45-
{{% tab title="Export REALM" %}}
46-
47-
``` bash
48-
export REALM="<replace_with_REALM>"
49-
```
50-
51-
{{% /tab %}}
52-
53-
Initialize Terraform and upgrade to the latest version of the Splunk Terraform Provider
35+
Initialize Terraform and upgrade to the latest version of the Splunk Terraform Provider.
5436

5537
{{% notice title="Note: Upgrading the SignalFx Terraform Provider" style="info" %}}
5638
You will need to run the command below each time a new version of the Splunk Terraform Provider is released. You can track the releases on [GitHub.](https://github.com/splunk-terraform/terraform-provider-signalfx/releases)

0 commit comments

Comments
 (0)