From ab187206eda6ab1f39a79ca6f56cd3b4030a7883 Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Tue, 6 Sep 2016 23:51:51 -0700 Subject: [PATCH] Change security doc URL to variable (#2475) --- filebeat/docs/index.asciidoc | 3 ++- libbeat/docs/index.asciidoc | 1 + libbeat/docs/shared-ssl-logstash-config.asciidoc | 2 +- metricbeat/docs/index.asciidoc | 3 ++- packetbeat/docs/index.asciidoc | 3 ++- winlogbeat/docs/index.asciidoc | 3 ++- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/filebeat/docs/index.asciidoc b/filebeat/docs/index.asciidoc index 60f192de317..c9a6685e919 100644 --- a/filebeat/docs/index.asciidoc +++ b/filebeat/docs/index.asciidoc @@ -7,7 +7,8 @@ include::./version.asciidoc[] :metricbeat: http://www.elastic.co/guide/en/beats/metricbeat/{doc-branch} :filebeat: http://www.elastic.co/guide/en/beats/filebeat/{doc-branch} :winlogbeat: http://www.elastic.co/guide/en/beats/winlogbeat/{doc-branch} -:elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/{doc-branch}/ +:elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/{doc-branch} +:securitydoc: https://www.elastic.co/guide/en/shield/current :version: {stack-version} :beatname_lc: filebeat :beatname_uc: Filebeat diff --git a/libbeat/docs/index.asciidoc b/libbeat/docs/index.asciidoc index 5f0cc2e3dc4..27fd2c4195e 100644 --- a/libbeat/docs/index.asciidoc +++ b/libbeat/docs/index.asciidoc @@ -7,6 +7,7 @@ include::./version.asciidoc[] :metricbeat: http://www.elastic.co/guide/en/beats/metricbeat/{doc-branch} :filebeat: http://www.elastic.co/guide/en/beats/filebeat/{doc-branch} :winlogbeat: http://www.elastic.co/guide/en/beats/winlogbeat/{doc-branch} +:securitydoc: https://www.elastic.co/guide/en/shield/current :security: X-Pack Security :ES-version: {stack-version} :LS-version: {stack-version} diff --git a/libbeat/docs/shared-ssl-logstash-config.asciidoc b/libbeat/docs/shared-ssl-logstash-config.asciidoc index 3efcb4ffd5c..1b940aefb88 100644 --- a/libbeat/docs/shared-ssl-logstash-config.asciidoc +++ b/libbeat/docs/shared-ssl-logstash-config.asciidoc @@ -17,7 +17,7 @@ To use SSL mutual authentication: . Create a certificate authority (CA) and use it to sign the certificates that you plan to use for {beatname_uc} and Logstash. Creating a correct SSL/TLS infrastructure is outside the scope of this -document. There are many online resources available that describe how to create certificates including https://www.elastic.co/guide/en/shield/2.3/certificate-authority.html[this section of the documentation for Shield]. +document. There are many online resources available that describe how to create certificates, including the section in the {security} documentation about {securitydoc}/certificate-authority.html[setting up a certificate authority]. + NOTE: Certificates must be signed by your root CA. Intermediate CAs are currently not supported. diff --git a/metricbeat/docs/index.asciidoc b/metricbeat/docs/index.asciidoc index af2835441a1..d0e52904d2a 100644 --- a/metricbeat/docs/index.asciidoc +++ b/metricbeat/docs/index.asciidoc @@ -4,7 +4,8 @@ include::./version.asciidoc[] :libbeat: http://www.elastic.co/guide/en/beats/libbeat/{doc-branch} :filebeat: http://www.elastic.co/guide/en/beats/filebeat/{doc-branch} -:elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/{doc-branch}/ +:elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/{doc-branch} +:securitydoc: https://www.elastic.co/guide/en/shield/current :version: {stack-version} :beatname_lc: metricbeat :beatname_uc: Metricbeat diff --git a/packetbeat/docs/index.asciidoc b/packetbeat/docs/index.asciidoc index 2de95e628e7..8c57197a06b 100644 --- a/packetbeat/docs/index.asciidoc +++ b/packetbeat/docs/index.asciidoc @@ -7,7 +7,8 @@ include::./version.asciidoc[] :metricbeat: http://www.elastic.co/guide/en/beats/metricbeat/{doc-branch} :filebeat: http://www.elastic.co/guide/en/beats/filebeat/{doc-branch} :winlogbeat: http://www.elastic.co/guide/en/beats/winlogbeat/{doc-branch} -:elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/{doc-branch}/ +:elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/{doc-branch} +:securitydoc: https://www.elastic.co/guide/en/shield/current :version: {stack-version} :beatname_lc: packetbeat :beatname_uc: Packetbeat diff --git a/winlogbeat/docs/index.asciidoc b/winlogbeat/docs/index.asciidoc index 5c29f1527e2..62cb1a73739 100644 --- a/winlogbeat/docs/index.asciidoc +++ b/winlogbeat/docs/index.asciidoc @@ -7,7 +7,8 @@ include::./version.asciidoc[] :metricbeat: http://www.elastic.co/guide/en/beats/metricbeat/{doc-branch} :filebeat: http://www.elastic.co/guide/en/beats/filebeat/{doc-branch} :winlogbeat: http://www.elastic.co/guide/en/beats/winlogbeat/{doc-branch} -:elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/{doc-branch}/ +:elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/{doc-branch} +:securitydoc: https://www.elastic.co/guide/en/shield/current :version: {stack-version} :beatname_lc: winlogbeat :beatname_uc: Winlogbeat