From 99389f43a278d9bb134d7a61692ab6744d45e50a Mon Sep 17 00:00:00 2001 From: Paul Williams Date: Wed, 9 Oct 2024 17:04:22 -0700 Subject: [PATCH 1/4] Add that auto instrumentation is enabled for only IIS applications by default --- .../automatic-discovery/windows/windows-backend.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gdi/opentelemetry/automatic-discovery/windows/windows-backend.rst b/gdi/opentelemetry/automatic-discovery/windows/windows-backend.rst index 298a24cbd..a72cd86c6 100644 --- 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 enabled for IIS applications. To enable 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 ```` with a valid Splunk Observability Cloud access token. To obtain an access token, see :ref:`admin-api-access-tokens`. - Replace ```` 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 From d8e5eb349c1c2e53be2b038a0c6fc7d1f490b585 Mon Sep 17 00:00:00 2001 From: Paul Williams Date: Wed, 9 Oct 2024 17:17:32 -0700 Subject: [PATCH 2/4] Use different words for enable --- .../automatic-discovery/windows/windows-backend.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdi/opentelemetry/automatic-discovery/windows/windows-backend.rst b/gdi/opentelemetry/automatic-discovery/windows/windows-backend.rst index a72cd86c6..c17f0ac8b 100644 --- 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. By default, automatic instrumentation is only enabled for IIS applications. To enable 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. +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`. From 45acb9787cf9ae07b6409ad602888b404cb5264f Mon Sep 17 00:00:00 2001 From: Paul Williams Date: Thu, 10 Oct 2024 16:18:12 -0700 Subject: [PATCH 3/4] Remove package manager examples --- _includes/collector-upgrade.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/collector-upgrade.rst b/_includes/collector-upgrade.rst index 022c9714d..33315da49 100644 --- 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. From edabc6c0a4e3226cdbd87ee4a9ab669c26360a07 Mon Sep 17 00:00:00 2001 From: Paul Williams Date: Fri, 11 Oct 2024 16:04:10 -0700 Subject: [PATCH 4/4] Add clarifications to the MSI install topic --- gdi/opentelemetry/collector-windows/install-windows-msi.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdi/opentelemetry/collector-windows/install-windows-msi.rst b/gdi/opentelemetry/collector-windows/install-windows-msi.rst index d832672e7..6d9cecf4f 100644 --- 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``