Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pulling refs/heads/main into main #1536

Merged
merged 17 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _templates/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions _templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions _templates/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions gdi/get-data-in/application/otel-dotnet/get-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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.
Expand Down
Loading
Loading