From a2e51cf75549fe7a469acd317e0c7736fe74096f Mon Sep 17 00:00:00 2001 From: Jennifer Elkhouri <89526208+jelkhouri-splunk@users.noreply.github.com> Date: Fri, 17 Jan 2025 13:16:12 -0500 Subject: [PATCH 1/2] updated to include kubernetes in hands-on section --- .../8-docker-k8s-otel/_index.md | 2 +- observability-workshop.sln | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 observability-workshop.sln diff --git a/content/en/ninja-workshops/8-docker-k8s-otel/_index.md b/content/en/ninja-workshops/8-docker-k8s-otel/_index.md index 43c5427f92..76cf5ac5f0 100644 --- a/content/en/ninja-workshops/8-docker-k8s-otel/_index.md +++ b/content/en/ninja-workshops/8-docker-k8s-otel/_index.md @@ -12,7 +12,7 @@ hidden: true In this workshop, you'll get hands-on experience with the following: -* Practice deploying the collector and instrumenting a .NET application with the Splunk distribution of OpenTelemetry .NET in a Linux environment. +* Practice deploying the collector and instrumenting a .NET application with the Splunk distribution of OpenTelemetry .NET in Linux and Kubernetes environments. * Practice “dockerizing” a .NET application, running it in Docker, and then adding Splunk OpenTelemetry instrumentation. * Practice deploying the Splunk distro of the collector in a K8s environment using Helm. Then customize the collector config and troubleshoot an issue. diff --git a/observability-workshop.sln b/observability-workshop.sln new file mode 100644 index 0000000000..65958289c7 --- /dev/null +++ b/observability-workshop.sln @@ -0,0 +1,32 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.2.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workshop", "workshop", "{2FB3DC77-AF68-536B-2541-271BB767B72D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker-k8s-otel", "docker-k8s-otel", "{5195D479-F9BA-E4D6-7FE1-6CA23478E4A0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "helloworld", "workshop\docker-k8s-otel\helloworld\helloworld.csproj", "{F40D10CA-765F-346C-FC91-D3C98CAAB2E4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F40D10CA-765F-346C-FC91-D3C98CAAB2E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F40D10CA-765F-346C-FC91-D3C98CAAB2E4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F40D10CA-765F-346C-FC91-D3C98CAAB2E4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F40D10CA-765F-346C-FC91-D3C98CAAB2E4}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {5195D479-F9BA-E4D6-7FE1-6CA23478E4A0} = {2FB3DC77-AF68-536B-2541-271BB767B72D} + {F40D10CA-765F-346C-FC91-D3C98CAAB2E4} = {5195D479-F9BA-E4D6-7FE1-6CA23478E4A0} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {401B9BA6-3FA4-46FB-B4D5-3C8ECACE1D20} + EndGlobalSection +EndGlobal From 6ea9b92f849e35a409ce068315ae8060ec0d2e72 Mon Sep 17 00:00:00 2001 From: Robert Castley Date: Fri, 17 Jan 2025 19:22:51 +0000 Subject: [PATCH 2/2] Delete observability-workshop.sln --- observability-workshop.sln | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 observability-workshop.sln diff --git a/observability-workshop.sln b/observability-workshop.sln deleted file mode 100644 index 65958289c7..0000000000 --- a/observability-workshop.sln +++ /dev/null @@ -1,32 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.2.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workshop", "workshop", "{2FB3DC77-AF68-536B-2541-271BB767B72D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker-k8s-otel", "docker-k8s-otel", "{5195D479-F9BA-E4D6-7FE1-6CA23478E4A0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "helloworld", "workshop\docker-k8s-otel\helloworld\helloworld.csproj", "{F40D10CA-765F-346C-FC91-D3C98CAAB2E4}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F40D10CA-765F-346C-FC91-D3C98CAAB2E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F40D10CA-765F-346C-FC91-D3C98CAAB2E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F40D10CA-765F-346C-FC91-D3C98CAAB2E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F40D10CA-765F-346C-FC91-D3C98CAAB2E4}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {5195D479-F9BA-E4D6-7FE1-6CA23478E4A0} = {2FB3DC77-AF68-536B-2541-271BB767B72D} - {F40D10CA-765F-346C-FC91-D3C98CAAB2E4} = {5195D479-F9BA-E4D6-7FE1-6CA23478E4A0} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {401B9BA6-3FA4-46FB-B4D5-3C8ECACE1D20} - EndGlobalSection -EndGlobal