Merge pull request #1571 from splunk/repo-sync

Pulling refs/heads/main into main
splunk · Oct 15, 2024 · f080544 · f080544
2 parents 93aaf69 + 21a01a7
commit f080544
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/_includes/collector-upgrade.rst b/_includes/collector-upgrade.rst
@@ -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. 
 

diff --git a/gdi/opentelemetry/automatic-discovery/windows/windows-backend.rst b/gdi/opentelemetry/automatic-discovery/windows/windows-backend.rst
@@ -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`.
 
@@ -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

diff --git a/gdi/opentelemetry/collector-windows/install-windows-msi.rst b/gdi/opentelemetry/collector-windows/install-windows-msi.rst
@@ -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
 
@@ -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``