diff --git a/libbeat/docs/https.asciidoc b/libbeat/docs/https.asciidoc index 04082d45322..a9344601846 100644 --- a/libbeat/docs/https.asciidoc +++ b/libbeat/docs/https.asciidoc @@ -13,7 +13,7 @@ To secure the communication between {beatname_uc} and Elasticsearch, you can use HTTPS and basic authentication. Basic authentication for Elasticsearch is available when you enable {security} (see -{ref}/elasticsearch-security.html[Securing the {stack}] and <>). +{ref}/secure-cluster.html[Secure a cluster] and <>). If you aren't using {security}, you can use a web proxy instead. Here is a sample configuration: diff --git a/libbeat/docs/security/basic-auth.asciidoc b/libbeat/docs/security/basic-auth.asciidoc index 9ae8a8f96af..70622330ebe 100644 --- a/libbeat/docs/security/basic-auth.asciidoc +++ b/libbeat/docs/security/basic-auth.asciidoc @@ -58,5 +58,4 @@ output.elasticsearch: -------------------------------------------------- To learn more about {stack} security features and other types of -authentication, see {ref}/elasticsearch-security.html[Securing the -{stack}]. +authentication, see {ref}/secure-cluster.html[Secure a cluster]. diff --git a/libbeat/docs/security/securing-beats.asciidoc b/libbeat/docs/security/securing-beats.asciidoc index 32f5e210a85..c8f9305f1d2 100644 --- a/libbeat/docs/security/securing-beats.asciidoc +++ b/libbeat/docs/security/securing-beats.asciidoc @@ -1,15 +1,14 @@ [role="xpack"] [[securing-beats]] -== Configure {beatname_uc} to use {security} +== Configure {beatname_uc} to use {security-features} [subs="attributes"] ++++ -Use {security} +Use {security-features} ++++ If you want {beatname_uc} to connect to a cluster that has -{ref}/elasticsearch-security.html[{security}] enabled, there are extra -configuration steps: +{security-features} enabled, there are extra configuration steps: . <>. + @@ -26,8 +25,8 @@ authentication credentials or present a client certificate. If encryption is enabled on the cluster, you need to enable HTTPS in the {beatname_uc} configuration. -For more information about {security}, see -{xpack-ref}/elasticsearch-security.html[Securing the {stack}]. +For more information about {security-features}, see +{ref}/secure-cluster.html[Secure a cluster]. include::users.asciidoc[] diff --git a/libbeat/docs/security/users.asciidoc b/libbeat/docs/security/users.asciidoc index 77634fdfe68..5ef2417ca58 100644 --- a/libbeat/docs/security/users.asciidoc +++ b/libbeat/docs/security/users.asciidoc @@ -340,7 +340,7 @@ endif::apm-server[] ==== Learn more about users and roles Want to learn more about creating users and roles? See -{ref}/elasticsearch-security.html[Securing the {stack}]. Also see: +{ref}/secure-cluster.html[Secure a cluster]. Also see: * {ref}/security-privileges.html[Security privileges] for a description of available privileges diff --git a/libbeat/docs/shared-central-management.asciidoc b/libbeat/docs/shared-central-management.asciidoc index de597ea2345..e44274dfc3b 100644 --- a/libbeat/docs/shared-central-management.asciidoc +++ b/libbeat/docs/shared-central-management.asciidoc @@ -11,8 +11,8 @@ beta[] ======================================= When you use central management, configurations are stored centrally in {es}. To prevent an attacker from leveraging the configurations to attack your -infrastructure, you must {es}/elasticsearch-security.html[secure {es} and -{kib}] before using central management. +infrastructure, you must secure {es} and {kib} before using central management. +See {ref}/secure-cluster.html[Secure a cluster]. ======================================= {beats} central management provides a way to define and manage configurations in diff --git a/metricbeat/docs/modules/elasticsearch.asciidoc b/metricbeat/docs/modules/elasticsearch.asciidoc index 4c54d694034..484519f7426 100644 --- a/metricbeat/docs/modules/elasticsearch.asciidoc +++ b/metricbeat/docs/modules/elasticsearch.asciidoc @@ -11,9 +11,9 @@ There are two modules that collect metrics about {es}: monitoring of Elasticsearch across multiple versions. The default metricsets in this module are `node` and `node_stats`. * The Elasticsearch X-Pack module enables you to monitor more Elasticsearch -metrics with our {ref}/monitor-elasticsearch-cluster.html[monitoring] feature. The -default metricsets in this module are `ccr`, `cluster_stats`, `index`, -`index_recovery`, `index_summary`, `ml_job`, `node_stats`, and `shard`. +metrics with our {stack} {monitor-features}. The default metricsets in this +module are `ccr`, `cluster_stats`, `index`, `index_recovery`, `index_summary`, +`ml_job`, `node_stats`, and `shard`. [float] === Compatibility diff --git a/metricbeat/docs/modules/kibana.asciidoc b/metricbeat/docs/modules/kibana.asciidoc index 74415466a40..a878e843071 100644 --- a/metricbeat/docs/modules/kibana.asciidoc +++ b/metricbeat/docs/modules/kibana.asciidoc @@ -10,8 +10,7 @@ There are two modules that collect metrics about {kib}: * The Kibana module tracks only the high-level metrics. The default metricset in this module is `status`. * The Kibana X-Pack module enables you to monitor more Kibana metrics with our -{ref}/monitor-elasticsearch-cluster.html[monitoring] feature. The default metricset in -this module is `stats`. +{stack} {monitor-features}. The default metricset in this module is `stats`. [float] === Compatibility diff --git a/metricbeat/module/beat/docs.asciidoc b/metricbeat/module/beat/docs.asciidoc index 597a17053e9..8e0967abf40 100644 --- a/metricbeat/module/beat/docs.asciidoc +++ b/metricbeat/module/beat/docs.asciidoc @@ -1,5 +1,6 @@ The Beat module contains a minimal set of metrics to enable monitoring of any Beat or other software based on libbeat across -multiple versions. To monitor more Beat metrics, use our {ref}/monitor-elasticsearch-cluster.html[monitoring] feature. +multiple versions. To monitor more Beat metrics, use our {stack} +{monitor-features}. The default metricset is `stats`. diff --git a/metricbeat/module/elasticsearch/_meta/docs.asciidoc b/metricbeat/module/elasticsearch/_meta/docs.asciidoc index 0478dfcbaff..50d78e6d612 100644 --- a/metricbeat/module/elasticsearch/_meta/docs.asciidoc +++ b/metricbeat/module/elasticsearch/_meta/docs.asciidoc @@ -4,9 +4,9 @@ There are two modules that collect metrics about {es}: monitoring of Elasticsearch across multiple versions. The default metricsets in this module are `node` and `node_stats`. * The Elasticsearch X-Pack module enables you to monitor more Elasticsearch -metrics with our {ref}/monitor-elasticsearch-cluster.html[monitoring] feature. The -default metricsets in this module are `ccr`, `cluster_stats`, `index`, -`index_recovery`, `index_summary`, `ml_job`, `node_stats`, and `shard`. +metrics with our {stack} {monitor-features}. The default metricsets in this +module are `ccr`, `cluster_stats`, `index`, `index_recovery`, `index_summary`, +`ml_job`, `node_stats`, and `shard`. [float] === Compatibility diff --git a/metricbeat/module/kibana/_meta/docs.asciidoc b/metricbeat/module/kibana/_meta/docs.asciidoc index 51b9470b0d3..527480b4328 100644 --- a/metricbeat/module/kibana/_meta/docs.asciidoc +++ b/metricbeat/module/kibana/_meta/docs.asciidoc @@ -3,8 +3,7 @@ There are two modules that collect metrics about {kib}: * The Kibana module tracks only the high-level metrics. The default metricset in this module is `status`. * The Kibana X-Pack module enables you to monitor more Kibana metrics with our -{ref}/monitor-elasticsearch-cluster.html[monitoring] feature. The default metricset in -this module is `stats`. +{stack} {monitor-features}. The default metricset in this module is `stats`. [float] === Compatibility