diff --git a/docs/reference/docs/reindex.asciidoc b/docs/reference/docs/reindex.asciidoc index 5779d88c1f9b..61b7b5b6e59c 100644 --- a/docs/reference/docs/reindex.asciidoc +++ b/docs/reference/docs/reindex.asciidoc @@ -933,11 +933,10 @@ using basic auth or the password will be sent in plain text. There are a range of <> available to configure the behaviour of the `https` connection. -Remote hosts have to be explicitly whitelisted in elasticsearch.yml using the +Remote hosts have to be explicitly allowed in elasticsearch.yml using the `reindex.remote.whitelist` property. It can be set to a comma delimited list -of allowed remote `host` and `port` combinations (e.g. -`otherhost:9200, another:9200, 127.0.10.*:9200, localhost:*`). Scheme is -ignored by the whitelist -- only host and port are used, for example: +of allowed remote `host` and `port` combinations. Scheme is +ignored, only the host and port are used. For example: [source,yaml] @@ -945,7 +944,7 @@ ignored by the whitelist -- only host and port are used, for example: reindex.remote.whitelist: "otherhost:9200, another:9200, 127.0.10.*:9200, localhost:*" -------------------------------------------------- -The whitelist must be configured on any nodes that will coordinate the reindex. +The list of allowed hosts must be configured on any nodes that will coordinate the reindex. This feature should work with remote clusters of any version of Elasticsearch you are likely to find. This should allow you to upgrade from any version of diff --git a/docs/reference/scripting/painless.asciidoc b/docs/reference/scripting/painless.asciidoc index 1d615c1426e9..82d886589d25 100644 --- a/docs/reference/scripting/painless.asciidoc +++ b/docs/reference/scripting/painless.asciidoc @@ -15,7 +15,7 @@ provides: * Fast performance: Painless scripts https://benchmarks.elastic.co/index.html#search_qps_scripts[ run several times faster] than the alternatives. -* Safety: Fine-grained whitelist with method call/field granularity. See the +* Safety: Fine-grained allowlists with method call/field granularity. See the {painless}/painless-api-reference.html[Painless API Reference] for a complete list of available classes and methods. diff --git a/docs/reference/settings/monitoring-settings.asciidoc b/docs/reference/settings/monitoring-settings.asciidoc index 2e86e4df6298..0c2661f6bcbf 100644 --- a/docs/reference/settings/monitoring-settings.asciidoc +++ b/docs/reference/settings/monitoring-settings.asciidoc @@ -261,10 +261,10 @@ cluster alerts are not displayed. `cluster_alerts.management.blacklist`:: Prevents the creation of specific cluster alerts. It also removes any applicable -watches that already exist in the current cluster. + +watches that already exist in the current cluster. + -- -You can add any of the following watch identifiers to the blacklist: +You can add any of the following watch identifiers to the list of blocked alerts: * `elasticsearch_cluster_status` * `elasticsearch_version_mismatch` diff --git a/docs/reference/settings/notification-settings.asciidoc b/docs/reference/settings/notification-settings.asciidoc index b713258b3947..1bf4362a4e85 100644 --- a/docs/reference/settings/notification-settings.asciidoc +++ b/docs/reference/settings/notification-settings.asciidoc @@ -69,7 +69,7 @@ client is used in the HTTP input, the webhook, the slack, pagerduty, and jira actions. This setting can be updated dynamically. It defaults to `*` allowing everything. Note: If you configure this setting and you are using one of the slack/pagerduty actions, you have to ensure that the -corresponding endpoints are whitelisted as well. +corresponding endpoints are explicitly allowed as well. [[ssl-notification-settings]] :ssl-prefix: xpack.http diff --git a/docs/reference/snapshot-restore/apis/put-repo-api.asciidoc b/docs/reference/snapshot-restore/apis/put-repo-api.asciidoc index 773679aca9c8..d9169a7cf69f 100644 --- a/docs/reference/snapshot-restore/apis/put-repo-api.asciidoc +++ b/docs/reference/snapshot-restore/apis/put-repo-api.asciidoc @@ -236,7 +236,7 @@ URLs using the `file` protocol must point to the location of a shared filesystem accessible to all master and data nodes in the cluster. This location must be registered in the `path.repo` setting. -URLs using the `http`, `https`, or `ftp` protocols must be whitelisted in the +URLs using the `http`, `https`, or `ftp` protocols must be explicitly allowed with the `repositories.url.allowed_urls` setting. This setting supports wildcards in the place of a host, path, query, or fragment in the URL. ==== diff --git a/docs/reference/snapshot-restore/register-repository.asciidoc b/docs/reference/snapshot-restore/register-repository.asciidoc index dfb2ad6e8a37..e5df7ae1fd92 100644 --- a/docs/reference/snapshot-restore/register-repository.asciidoc +++ b/docs/reference/snapshot-restore/register-repository.asciidoc @@ -201,7 +201,7 @@ accessible to all master and data nodes in the cluster. This location must be registered in the `path.repo` setting, similar to a <>. -URLs using the `ftp`, `http`, or `https` protocols must be whitelisted in the +URLs using the `ftp`, `http`, or `https` protocols must be explicitly allowed with the `repositories.url.allowed_urls` setting. This setting supports wildcards (`*`) in place of a host, path, query, or fragment in the URL. For example: