Merge pull request splunk#1536 from splunk/repo-sync

Pulling refs/heads/main into main
pjurczak-splunk · Sep 19, 2024 · 17f984c · 17f984c
2 parents c93dcd1 + ddbcc29
commit 17f984c
Show file tree

Hide file tree

Showing 9 changed files with 378 additions and 237 deletions.
diff --git a/_templates/404.html b/_templates/404.html
@@ -204,8 +204,8 @@ <h2 style="font-size:21px;font-family: 'Open Sans'; font-weight: bold;">Was this
       <a href="https://www.splunk.com/en_us/legal/privacy/privacy-policy.html" target="_blank">Privacy</a> | 
       <a href="https://www.splunk.com/en_us/legal/terms/terms-of-use.html" target="_blank">Terms</a> | 
       <a href="https://www.splunk.com/en_us/legal/export-controls.html" target="_blank">Export Control</a> | 
-      <span style="color:black">&copy; 2005 - 2023 Splunk Inc. All rights reserved.</span>
-      <div class="newfootertxt" style="color:black">Splunk, Splunk>, Turn Data Into Doing, and Data-to-Everything are trademarks or registered trademarks of Splunk Inc. in the United States and other countries. All other brand names, product names, or trademarks belong to their respective owners.</div>
+      <span style="color:black">&copy; 2005 - 2023 Splunk LLC All rights reserved.</span>
+      <div class="newfootertxt" style="color:black">Splunk, Splunk>, Turn Data Into Doing, and Data-to-Everything are trademarks or registered trademarks of Splunk LLC in the United States and other countries. All other brand names, product names, or trademarks belong to their respective owners.</div>
       </div>
       <div style="width: 28%;">
         <a href="#feedbackModal" class="feedbackbtn">Feedback</a>

diff --git a/_templates/layout.html b/_templates/layout.html
@@ -206,8 +206,8 @@ <h2 style="font-size:21px;font-family: 'Open Sans'; font-weight: bold;">Was this
       <a href="https://www.splunk.com/en_us/legal/privacy/privacy-policy.html" target="_blank">Privacy</a> | 
       <a href="https://www.splunk.com/en_us/legal/terms/terms-of-use.html" target="_blank">Terms</a> | 
       <a href="https://www.splunk.com/en_us/legal/export-controls.html" target="_blank">Export Control</a> | 
-      <span style="color:black">&copy; 2005 - 2023 Splunk Inc. All rights reserved.</span>
-      <div class="newfootertxt" style="color:black">Splunk, Splunk>, Turn Data Into Doing, and Data-to-Everything are trademarks or registered trademarks of Splunk Inc. in the United States and other countries. All other brand names, product names, or trademarks belong to their respective owners.</div>
+      <span style="color:black">&copy; 2005 - 2023 Splunk LLC All rights reserved.</span>
+      <div class="newfootertxt" style="color:black">Splunk, Splunk>, Turn Data Into Doing, and Data-to-Everything are trademarks or registered trademarks of Splunk LLC in the United States and other countries. All other brand names, product names, or trademarks belong to their respective owners.</div>
       </div>
       <div style="width: 28%;">
         <a href="#feedbackModal" class="feedbackbtn">Feedback</a>

diff --git a/_templates/search.html b/_templates/search.html
@@ -268,8 +268,8 @@ <h2 style="font-size:21px;font-family: 'Open Sans'; font-weight: bold;">Was this
         <a href="https://www.splunk.com/en_us/legal/privacy/privacy-policy.html" target="_blank">Privacy</a> |
         <a href="https://www.splunk.com/en_us/legal/terms/terms-of-use.html" target="_blank">Terms</a> |
         <a href="https://www.splunk.com/en_us/legal/export-controls.html" target="_blank">Export Control</a> |
-        <span style="color:black">&copy; 2005 - 2023 Splunk Inc. All rights reserved.</span>
-        <div class="newfootertxt" style="color:black">Splunk, Splunk>, Turn Data Into Doing, and Data-to-Everything are trademarks or registered trademarks of Splunk Inc. in the United States and other countries. All other brand names, product names, or trademarks belong to their respective owners.</div>
+        <span style="color:black">&copy; 2005 - 2023 Splunk LLC All rights reserved.</span>
+        <div class="newfootertxt" style="color:black">Splunk, Splunk>, Turn Data Into Doing, and Data-to-Everything are trademarks or registered trademarks of Splunk LLC in the United States and other countries. All other brand names, product names, or trademarks belong to their respective owners.</div>
     </div>
     <div style="width: 28%;">
         <a href="#feedbackModal" class="feedbackbtn">Feedback</a>

diff --git a/gdi/get-data-in/application/otel-dotnet/get-started.rst b/gdi/get-data-in/application/otel-dotnet/get-started.rst
@@ -13,6 +13,7 @@ Instrument .NET applications for Splunk Observability Cloud (OpenTelemetry)
    Requirements <dotnet-requirements>
    Pre-checks <instrumentation/dotnet-pre-checks>
    Instrument your .NET application <instrumentation/instrument-dotnet-application>
+   Advanced configuration for IIS applications <instrumentation/advanced-config-iis-apps>
    Instrument Azure Web Apps <instrumentation/azure-webapps>
    Instrument Azure Web Jobs <instrumentation/azure-webjobs>
    Configure the .NET instrumentation <configuration/advanced-dotnet-configuration>

diff --git a/...et-data-in/application/otel-dotnet/instrumentation/advanced-config-iis-apps.rst b/...et-data-in/application/otel-dotnet/instrumentation/advanced-config-iis-apps.rst
@@ -0,0 +1,61 @@
+.. _advanced-config-iis-apps:
+
+*******************************************
+Advanced configuration for IIS applications
+*******************************************
+
+Follow these advanced configuration steps to make changes to specific application pools.
+
+Set environment variables
+=========================
+
+You can set environment variables for specific application pools in the ``environmentVariables`` block of the :new-page:`applicationHost.config file <https://learn.microsoft.com/en-us/iis/configuration/system.applicationhost/applicationpools/add/environmentvariables/#configuration-sample>`.
+
+For example:
+
+.. code-block:: xml
+
+    <environmentVariables>
+        <add name="OTEL_RESOURCE_ATTRIBUTES" value="deployment.environment=test,service.version=1.0.0" />
+    </environmentVariables>
+
+For all IIS applications, consider setting common environment variables for W3SVC and WAS Windows Services. For more information, see :new-page:`Instrument a Windows Service running a .NET application <https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docs/windows-service-instrumentation.md>` in the OpenTelemetry documentation.
+
+.. note::
+
+   If the same environment variables are set in the ``environmentVariable`` block and in the web.config ``appSettings`` block, the value in the ``environmentVariables`` block takes precedence.
+
+Activate or deactivate instrumentation
+======================================
+
+For .NET Framework applications, use the PowerShell module to activate or deactivate the instrumentation for specific application pools.
+
+#. Import the PowerShell module:
+
+   .. code-block:: powershell
+
+      Import-Module "OpenTelemetry.DotNet.Auto.psm1"
+
+   .. note::
+
+      The application pool name is case sensitive.
+
+#. Activate or deactivate the application pool.
+
+   * Activate instrumentation for the application pool:
+
+     .. code-block:: powershell
+
+        Enable-OpenTelemetryForIISAppPool -AppPoolName <app-pool>
+
+   * Deactivate instrumentation for the application pool:
+
+     .. code-block:: powershell
+
+        Disable-OpenTelemetryForIISAppPool -AppPoolName <app-pool>
+
+#. Restart the application pool:
+
+   .. code-block:: powershell
+
+      Restart-WebAppPool -Name <app-pool>
diff --git a/...ta-in/application/otel-dotnet/instrumentation/instrument-dotnet-application.rst b/...ta-in/application/otel-dotnet/instrumentation/instrument-dotnet-application.rst
@@ -238,16 +238,9 @@ Windows
 
             Start-Process "iisreset.exe" -NoNewWindow -Wait
 
-         You can also set the resource attributes for specific application pools in the ``environmentVariables`` block of the :new-page:`applicationHost.config file <https://learn.microsoft.com/en-us/iis/configuration/system.applicationhost/applicationpools/add/environmentvariables/#configuration-sample>`. For example:
-
-         .. code-block:: xml
-
-            <environmentVariables>
-               <add name="OTEL_RESOURCE_ATTRIBUTES" value="deployment.environment=test,service.version=1.0.0" />
-            </environmentVariables>
-
          .. note::
-            If the ``OTEL_SERVICE_NAME`` or ``OTEL_RESOURCE_ATTRIBUTES`` environment variables are set for a process, settings with the same names from ``appSettings`` block of web.config are ignored.
+
+            For advanced IIS application configuration options, see :ref:`advanced-config-iis-apps`.
 
       .. tab:: IIS (ASP.NET Core)
 
@@ -266,6 +259,10 @@ Windows
 
             Start-Process "iisreset.exe" -NoNewWindow -Wait
 
+         .. note::
+
+            For advanced IIS application configuration options, see :ref:`advanced-config-iis-apps`.
+
       .. tab:: Windows service
 
          For .NET Framework applications, you can configure resource attributes in the ``appSettings`` block of the app.config file.