Skip to content
This repository was archived by the owner on Sep 2, 2025. It is now read-only.

Commit f080544

Browse files
Merge pull request #1571 from splunk/repo-sync
Pulling refs/heads/main into main
2 parents 93aaf69 + 21a01a7 commit f080544

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

_includes/collector-upgrade.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
The installer script uses one of the supported package managers to install the Collector, for example apt or yum.
1+
The installer script uses one of the supported package managers to install the Collector.
22

33
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.
44

gdi/opentelemetry/automatic-discovery/windows/windows-backend.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Automatic discovery for back-end applications in Windows
99

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

12-
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.
12+
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.
1313

1414
.. 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`.
1515

@@ -45,6 +45,8 @@ Do the following to customize the command:
4545
- Replace ``<access_token>`` with a valid Splunk Observability Cloud access token. To obtain an access token, see :ref:`admin-api-access-tokens`.
4646
- 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.
4747

48+
49+
4850
.. _configure-the-package-dotnet:
4951

5052
Configure the .NET instrumentation

gdi/opentelemetry/collector-windows/install-windows-msi.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Follow these steps:
7070
7171
Start-Process -Wait msiexec "/i PATH_TO_MSI /qn"
7272
73-
3. Update all variables in the configuration file as appropriate.
73+
3. Configure the Collector using the environment variables listed in the table below.
7474

7575
.. code-block:: PowerShell
7676
@@ -140,7 +140,7 @@ You can use the following Splunk-specific environment variables with the MSI:
140140
- ``us0``
141141

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

146146
* - ``SPLUNK_TRACE_URL``

0 commit comments

Comments
 (0)