Skip to content

Commit fce8d71

Browse files
authored
Merge pull request #338 from dmitchsplunk/main
Further updates to hands-on and solving problems workshops
2 parents f7174c0 + 5d67a52 commit fce8d71

File tree

3 files changed

+33
-1
lines changed

3 files changed

+33
-1
lines changed

content/en/ninja-workshops/8-docker-k8s-otel/5-dockerize-app.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,10 @@ The next stage of the Dockerfile is the build stage. For this stage, the
135135
`mcr.microsoft.com/dotnet/sdk:8.0` image is used, which is also based off of
136136
Debian 12 but includes the full [.NET SDK](https://github.com/dotnet/dotnet-docker/blob/main/README.sdk.md) rather than just the runtime.
137137

138-
This stage copies the application code to the build image and then
138+
This stage copies the `.csproj` file to the build image, and then uses `dotnet restore` to
139+
download any dependencies used by the application.
140+
141+
It then copies the application code to the build image and
139142
uses `dotnet build` to build the project and its dependencies into a
140143
set of `.dll` binaries:
141144

content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/1-connect-to-instance.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,27 @@ using one of the methods below:
1919
* Earlier versions of Windows
2020
* Use Putty
2121

22+
## Editing Files
23+
24+
We'll use `vi` to edit files during the workshop. Here's a quick primer.
25+
26+
To open a file for editing:
27+
28+
```bash
29+
vi <filename>
30+
```
31+
32+
* To edit the file, click `i` to switch to **Insert mode** and begin entering text as normal. Use `Esc` to return to **Command mode**.
33+
* To save your changes without exiting the editor, enter `Esc` to return to command mode then enter `:w`.
34+
* To exit the editor without saving changes, enter `Esc` to return to command mode then enter `:q!`.
35+
* To save your changes and exist the editor, enter `Esc` to return to command mode then enter `:wq`.
36+
37+
See [An introduction to the vi editor](https://www.redhat.com/en/blog/introduction-vi-editor) for a comprehensive introduction to `vi`.
38+
39+
If you'd prefer using another editor, you can use `nano` instead:
40+
41+
```bash
42+
nano <filename>
43+
```
44+
45+

content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/3-deploy-sample-app.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ deployment.apps/loadgenerator created
7878

7979
## Explore the Application
8080

81+
We'll provide an overview of the application in this section. If you'd like to see the complete source
82+
code for the application, refer to the [Observability Workshop repository in GitHub](https://github.com/splunk/observability-workshop/tree/main/workshop/tagging)
83+
8184
### OpenTelemetry Instrumentation
8285

8386
If we look at the Dockerfile's used to build the credit check and credit processor services, we
@@ -226,6 +229,8 @@ let's review what the debug exporter has captured by tailing the agent collector
226229
kubectl logs -l component=otel-collector-agent -f
227230
```
228231

232+
Hint: use `CTRL+C` to stop tailing the logs.
233+
229234
You should see traces written to the agent collector logs such as the following:
230235

231236
````

0 commit comments

Comments
 (0)