Skip to content

Commit 82f59e2

Browse files
Merge branch 'main' into tasks/rcs-rm-isCrossClusterSearchEnabled
2 parents 780639b + 36d9cbc commit 82f59e2

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

docs/reference/elasticsearch/configuration-reference/watcher-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ $$$pagerduty-account-attributes$$$
558558
: ([Dynamic](docs-content://deploy-manage/stack-settings.md#dynamic-cluster-setting)) Whether or not to provide the watch payload as context for the event by default. Valid values: `true`, `false`.
559559

560560
`xpack.notification.webhook.additional_token_enabled` ![logo cloud](https://doc-icons.s3.us-east-2.amazonaws.com/logo_cloud.svg "Supported on Elastic Cloud Hosted")
561-
: When set to `true`, {{es}} automatically sets a token which enables the bypassing of traffic filters for calls initiated by Watcher towards {{es}} or {{kib}}. The default is `false` and the feature is available starting with {{es}} version 8.7.1 and later.
561+
: When set to `true`, {{es}} automatically sets a token which enables the bypassing of [network security](docs-content://deploy-manage/security/network-security.md) for calls initiated by Watcher towards {{es}} or {{kib}}. The default is `false` and the feature is available starting with {{es}} version 8.7.1 and later.
562562

563563
::::{important}
564564
This setting only applies to the Watcher `webhook` action, not the `http` input action.

muted-tests.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,15 @@ tests:
521521
- class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS1EnrichUnavailableRemotesIT
522522
method: testEsqlEnrichWithSkipUnavailable
523523
issue: https://github.com/elastic/elasticsearch/issues/132078
524+
- class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
525+
method: test {yaml=update/100_synthetic_source/stored text}
526+
issue: https://github.com/elastic/elasticsearch/issues/132108
527+
- class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
528+
method: test {yaml=update/100_synthetic_source/keyword}
529+
issue: https://github.com/elastic/elasticsearch/issues/132110
530+
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
531+
method: test {p0=transform/transforms_crud/Test transform where source query is invalid}
532+
issue: https://github.com/elastic/elasticsearch/issues/132111
524533

525534
# Examples:
526535
#

0 commit comments

Comments
 (0)