From 464e93a6a6549d8c72d5f9eefc3c12fd9e98307a Mon Sep 17 00:00:00 2001 From: dmitchsplunk Date: Mon, 13 Jan 2025 15:02:39 -0800 Subject: [PATCH 1/2] clarified dotnet restore purpose in dockerfile --- .../en/ninja-workshops/8-docker-k8s-otel/5-dockerize-app.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/content/en/ninja-workshops/8-docker-k8s-otel/5-dockerize-app.md b/content/en/ninja-workshops/8-docker-k8s-otel/5-dockerize-app.md index 8868fb6b22..ccd9add162 100644 --- a/content/en/ninja-workshops/8-docker-k8s-otel/5-dockerize-app.md +++ b/content/en/ninja-workshops/8-docker-k8s-otel/5-dockerize-app.md @@ -115,7 +115,10 @@ The next stage of the Dockerfile is the build stage. For this stage, the `mcr.microsoft.com/dotnet/sdk:8.0` image is used, which is also based off of Debian 12 but includes the full [.NET SDK](https://github.com/dotnet/dotnet-docker/blob/main/README.sdk.md) rather than just the runtime. -This stage copies the application code to the build image and then +This stage copies the `.csproj` file to the build image, and then uses `dotnet restore` to +download any dependencies used by the application. + +It then copies the application code to the build image and uses `dotnet build` to build the project and its dependencies into a set of `.dll` binaries: From 61bf16b19aba57983d19b81e2e2daa8228f1eb1a Mon Sep 17 00:00:00 2001 From: dmitchsplunk Date: Thu, 16 Jan 2025 10:00:02 -0800 Subject: [PATCH 2/2] updated the solving problems workshop with feedback --- .../1-connect-to-instance.md | 24 +++++++++++++++++++ .../3-deploy-sample-app.md | 5 ++++ 2 files changed, 29 insertions(+) diff --git a/content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/1-connect-to-instance.md b/content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/1-connect-to-instance.md index 14cfff98c4..2ee7b11622 100644 --- a/content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/1-connect-to-instance.md +++ b/content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/1-connect-to-instance.md @@ -19,3 +19,27 @@ using one of the methods below: * Earlier versions of Windows * Use Putty +## Editing Files + +We'll use `vi` to edit files during the workshop. Here's a quick primer. + +To open a file for editing: + +```bash +vi +``` + +* To edit the file, click `i` to switch to **Insert mode** and begin entering text as normal. Use `Esc` to return to **Command mode**. +* To save your changes without exiting the editor, enter `Esc` to return to command mode then enter `:w`. +* To exit the editor without saving changes, enter `Esc` to return to command mode then enter `:q!`. +* To save your changes and exist the editor, enter `Esc` to return to command mode then enter `:wq`. + +See [An introduction to the vi editor](https://www.redhat.com/en/blog/introduction-vi-editor) for a comprehensive introduction to `vi`. + +If you'd prefer using another editor, you can use `nano` instead: + +```bash +nano +``` + + diff --git a/content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/3-deploy-sample-app.md b/content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/3-deploy-sample-app.md index 99ac087ecb..cb52d41c20 100644 --- a/content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/3-deploy-sample-app.md +++ b/content/en/ninja-workshops/9-solving-problems-with-o11y-cloud/3-deploy-sample-app.md @@ -78,6 +78,9 @@ deployment.apps/loadgenerator created ## Explore the Application +We'll provide an overview of the application in this section. If you'd like to see the complete source +code for the application, refer to the [Observability Workshop repository in GitHub](https://github.com/splunk/observability-workshop/tree/main/workshop/tagging) + ### OpenTelemetry Instrumentation 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 kubectl logs -l component=otel-collector-agent -f ``` +Hint: use `CTRL+C` to stop tailing the logs. + You should see traces written to the agent collector logs such as the following: ````