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

Commit 624dd4a

Browse files
Merge pull request #1691 from splunk/repo-sync
Pulling refs/heads/main into main
2 parents c782a18 + 8080fc1 commit 624dd4a

File tree

6 files changed

+28
-15
lines changed

6 files changed

+28
-15
lines changed

gdi/get-data-in/application/otel-dotnet/instrumentation/azure-webapps.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
100100
101101
builder.Services.AddOpenTelemetry()
102102
.ConfigureResource(cfg => cfg
103-
.AddService(serviceName: serviceName, serviceVersion: "1.0.0")
104103
// See https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Azure
105104
// for other types of Azure detectors
106-
.AddAzureAppServiceDetector())
105+
.AddAzureAppServiceDetector()
106+
.AddService(serviceName: serviceName, serviceVersion: "1.0.0"))
107107
.WithTracing(t => t
108108
// Use Add[instrumentation-name]Instrumentation to instrument missing services
109109
// Use Nuget to find different instrumentation libraries

gdi/get-data-in/application/otel-dotnet/instrumentation/azure-webjobs.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
101101
102102
builder.Services.AddOpenTelemetry()
103103
.ConfigureResource(cfg => cfg
104-
.AddService(serviceName: serviceName, serviceVersion: "1.0.0")
105104
// See https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Azure
106105
// for other types of Azure detectors
107-
.AddAzureAppServiceDetector())
106+
.AddAzureAppServiceDetector()
107+
.AddService(serviceName: serviceName, serviceVersion: "1.0.0"))
108108
.WithTracing(t => t
109109
// Use Add[instrumentation-name]Instrumentation to instrument missing services
110110
// Use Nuget to find different instrumentation libraries

gdi/get-data-in/application/otel-dotnet/instrumentation/instrument-dotnet-application.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,11 @@ Database Query Performance settings
357357

358358
Starting from version 1.4.0, the .NET OTel instrumentation collects database queries for Database Query Performance. See :ref:`db-query-performance`.
359359

360-
SQL statements might contain sensitive information. To configure this behavior, see ``OTEL_DOTNET_AUTO_SQLCLIENT_SET_DBSTATEMENT_FOR_TEXT`` and ``OTEL_DOTNET_AUTO_ENTITYFRAMEWORKCORE_SET_DBSTATEMENT_FOR_TEXT`` in :ref:`dotnet-otel-instrumentation-settings`.
360+
SQL statements might contain sensitive information. To configure this behavior, use the following settings as described in :ref:`dotnet-otel-requirements`.
361+
362+
* ``OTEL_DOTNET_AUTO_SQLCLIENT_SET_DBSTATEMENT_FOR_TEXT``
363+
* ``OTEL_DOTNET_AUTO_ENTITYFRAMEWORKCORE_SET_DBSTATEMENT_FOR_TEXT``
364+
* ``OTEL_DOTNET_AUTO_ORACLEMDA_SET_DBSTATEMENT_FOR_TEXT``
361365

362366
.. _docker-install-otel-dotnet:
363367

gdi/opentelemetry/collector-addon/collector-addon-intro.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The Collector in the Splunk Add-on for OpenTelemetry is the same Collector offer
6262

6363
* - :ref:`Automatic discovery and configuration <discovery_mode>`
6464
- Supported
65-
- Not supported
65+
- Supported for Linux only
6666

6767
* - Distribution and deployment
6868
- Source code, binary, Operator, Helm Charts, Debian, Ansible, Puppet, Chef, Salt

sp-oncall/spoc-integrations/aws-cloudwatch-integration-guide.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ them through some other means, such as email. If you need more information on ho
2828
Turn on AWS Cloudwatch in Splunk On-Call
2929
=============================================
3030

31-
In Splunk On-Call, select :guilabel:`Integrations`, :guilabel:`AWS CloudWatch`.
31+
In Splunk On-Call, select :guilabel:`Integrations`, :guilabel:`AWS CloudWatch`.
3232

3333
If the integration has not yet been activated, select :guilabel:`Enable Integration` to generate your endpoint URL. Be sure to replace the ``$routing_key`` section of your new endpoint with the routing key you want to use. If no routing key is included as part of the endpoint URL, the subscription isn't confirmed. See :ref:`spoc-routing-keys` for more information.
3434

3535
You can point multiple SNS subscriptions to the same AWS CloudWatch endpoint in Splunk On-Call. The subscription isn't confirmed if it hits a different endpoint.
3636

37+
.. note:: After you set it up, AWS automatically confirms the subscription after a few minutes.
38+
3739
Linking Splunk On-Call in AWS Simple Notification Service (SNS)
3840
=======================================================================
3941

synthetics/browser-test/set-up-browser-test.rst

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -423,14 +423,16 @@ Authentication
423423

424424
Add credentials to authenticate with sites that require additional security protocols, for example from within a corporate network. To use Authentication, a username and password need to be provided. The username can be entered as plain text or be defined by a global variable, but the password must be defined using a global variable. It is recommended to use a concealed global variable for your password to create an additional layer of security for your credentials. For more, see :ref:`concealed-gv`.
425425

426-
When executing the browser test, the Chrome browser is configured with the credentials defined in the test configuration. Authentication is not integrated at the OS level, it is only configured in the browser. At this time, Chrome supports the following authentication protocols:
426+
When executing the browser test, the Chrome browser is configured with the credentials defined in the test configuration. Authentication is not integrated at the OS level, and no authentication processing happens in the runner itself. Credentials are passed directly to Chrome for handling.
427+
428+
At this time, Chrome supports the following authentication protocols:
427429

428430
* Basic Authentication
429431
* NTLM
430-
* Kerberos
432+
* Kerberos (with limitations)
431433
* Digest
432434

433-
More details on Chrome authentication are available :new-page:`here list <https://www.chromium.org/developers/design-documents/http-authentication/>`.
435+
Chrome supports Kerberos authentication only when it can infer the correct Kerberos service principal name (SPN) based on standard conventions. This support doesn't include :new-page:`Kerberos Credentials Delegation (Forwardable Tickets) <https://www.chromium.org/developers/design-documents/http-authentication/>`.
434436

435437

436438
.. _browser-headers:
@@ -458,9 +460,14 @@ To set a cookie, a key and value must be provided. A domain and path may optiona
458460

459461
Host overrides
460462
---------------------------------------
461-
Add host override rules to reroute requests from one host to another. For example, you can create a host override to test an existing production site against page resources loaded from a development site or a specific CDN edge node.
463+
Add host override rules to reroute requests from one host to another. For example, you can create a host override to test an existing production site against page resources loaded from a development site or from a specific CDN edge node.
464+
465+
You can also indicate whether to retain the original ``HOST`` header by activating :guilabel:`Keep host headers`. If activated, the original request's headers remain intact (recommended). If deactivated, a change in the ``HOST`` header to the new host might occur, potentially leading to an internal direct (307). :guilabel:`Keep host headers` is activated by default.
466+
467+
468+
.. note::
469+
Host overrides apply only to the exact hostname you specify. They don't automatically apply to subdomains. In other words, host overrides don't support wildcards. If you need to override any subdomains, you must create a separate host override for each subdomain's fully qualified domain name (FQDN). For example, if you create a host override for ``domainA.com`` to ``domainB.com``, requests to ``domainA.com`` are redirected to ``domainB.com``, but requests to ``mail.domainA.com`` are not automatically redirected to ``mail.domainB.com``. You must explicitly create a separate host override for ``mail.domainA.com``.
462470

463-
You can also indicate whether to retain the original HOST header by activating :strong:`Keep host headers`. If activated, the original request's headers remain intact (recommended). If deactivated, a change in the HOST header to the new host might occur, potentially leading to an internal direct (307). It is activated by default.
464471

465472
.. _browser-wait-times:
466473

@@ -473,10 +480,10 @@ Optimize your test coverage by adding custom wait times to capture longer page l
473480

474481
Follow these steps to configure custom wait times for your Browser tests:
475482

476-
#. In Splunk Synthetic Monitoring, select :strong:`Edit` on the Browser test to open the configuration panel.
477-
#. Select :strong:`New step > Wait`, from the step type drop down.
483+
#. In Splunk Synthetic Monitoring, select :guilabel:`Edit` on the Browser test to open the configuration panel.
484+
#. Select :guilabel:`New step > Wait`, from the step type drop down.
478485
#. Add a name and the wait time in ms.
479-
#. When you finish instrumenting your test, save the workflow: :strong:`Return to test > Save`.
486+
#. When you finish instrumenting your test, save the workflow: :guilabel:`Return to test > Save`.
480487

481488
The following image shows how to configure a test to go to a URL, wait for 10 seconds, then log in.
482489

0 commit comments

Comments
 (0)