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 #1571

Merged
merged 6 commits into from
Oct 15, 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
2 changes: 1 addition & 1 deletion _includes/collector-upgrade.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The installer script uses one of the supported package managers to install the Collector, for example apt or yum.
The installer script uses one of the supported package managers to install the Collector.

When you update the Collector using the official packages, configuration files are never overridden. If you need to update the configuration after an update, edit them manually before backward compatibility is dropped.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Automatic discovery for back-end applications in Windows

Automatic discovery can detect the following types of applications in your Windows environment:

Automatic discovery and configuration for OpenTelemetry .NET activates automatic instrumentation for .NET applications running on Windows. After installing the package, you must start or restart any .NET applications that you want to instrument.
Automatic discovery and configuration for OpenTelemetry .NET activates automatic instrumentation for .NET applications running on Windows. By default, automatic instrumentation is only turned on for IIS applications. To activate other application and service types, see :ref:`otel-dotnet-manual-install`. After installing the package, you must start or restart any .NET applications that you want to instrument.

.. note:: The SignalFx instrumentation for .NET is deprecated and will reach end of support on February 21, 2025. To learn how to migrate from SignalFx .NET to OpenTelemetry .NET, see :ref:`migrate-signalfx-dotnet-to-dotnet-otel`.

Expand Down Expand Up @@ -45,6 +45,8 @@ Do the following to customize the command:
- Replace ``<access_token>`` with a valid Splunk Observability Cloud access token. To obtain an access token, see :ref:`admin-api-access-tokens`.
- Replace ``<realm>`` is the Splunk Observability Cloud realm, for example, ``us0``. To find the realm name of your account, open the navigation menu in Splunk Observability Cloud, select :menuselection:`Settings`, and then select your username. The realm name appears in the :guilabel:`Organizations` section.



.. _configure-the-package-dotnet:

Configure the .NET instrumentation
Expand Down
4 changes: 2 additions & 2 deletions gdi/opentelemetry/collector-windows/install-windows-msi.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Follow these steps:
Start-Process -Wait msiexec "/i PATH_TO_MSI /qn"
3. Update all variables in the configuration file as appropriate.
3. Configure the Collector using the environment variables listed in the table below.

.. code-block:: PowerShell
Expand Down Expand Up @@ -140,7 +140,7 @@ You can use the following Splunk-specific environment variables with the MSI:
- ``us0``

* - ``SPLUNK_SETUP_COLLECTOR_MODE``
- Install property that sets the Collector's deployment mode. Learn more at :ref:`otel-deployment-mode`.
- Install property that sets the Collector's deployment mode to either ``agent`` or ``gateway``. Learn more at :ref:`otel-deployment-mode`.
- ``agent``

* - ``SPLUNK_TRACE_URL``
Expand Down
Loading