Skip to content

Commit

Permalink
[DOCS] Updates links to Stack Overview (#14121)
Browse files Browse the repository at this point in the history
  • Loading branch information
lcawl committed Oct 29, 2019
1 parent 859661c commit b2f316f
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 23 deletions.
2 changes: 1 addition & 1 deletion libbeat/docs/https.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<securing-beats>>).
{ref}/secure-cluster.html[Secure a cluster] and <<securing-beats>>).
If you aren't using {security}, you can use a web proxy instead.

Here is a sample configuration:
Expand Down
3 changes: 1 addition & 2 deletions libbeat/docs/security/basic-auth.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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].
11 changes: 5 additions & 6 deletions libbeat/docs/security/securing-beats.asciidoc
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
[role="xpack"]
[[securing-beats]]
== Configure {beatname_uc} to use {security}
== Configure {beatname_uc} to use {security-features}

[subs="attributes"]
++++
<titleabbrev>Use {security}</titleabbrev>
<titleabbrev>Use {security-features}</titleabbrev>
++++

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:

. <<feature-roles>>.
+
Expand All @@ -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[]

Expand Down
2 changes: 1 addition & 1 deletion libbeat/docs/security/users.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions libbeat/docs/shared-central-management.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/docs/modules/elasticsearch.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions metricbeat/docs/modules/kibana.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion metricbeat/module/beat/docs.asciidoc
Original file line number Diff line number Diff line change
@@ -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`.

Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/elasticsearch/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions metricbeat/module/kibana/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b2f316f

Please sign in to comment.