[Docs] Fix aws-credentials-config link (#13335)

* Fix aws-credentials-config link * Add indentation for aws-credentials-examples.asciidoc
elastic · Aug 28, 2019 · 0a065f5 · 0a065f5
1 parent 2a6c58f
commit 0a065f5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/filebeat/docs/aws-credentials-examples.asciidoc b/filebeat/docs/aws-credentials-examples.asciidoc
@@ -1,4 +1,5 @@
-* Use AWS credentials in filebeat configuration
+* Use AWS credentials in Filebeat configuration
++
 [source,yaml]
 ----
 filebeat.inputs:
@@ -8,9 +9,9 @@ filebeat.inputs:
   secret_access_key: '<secret_access_key>'
   session_token: '<session_token>'
 ----
-
++
 or
-
++
 [source,yaml]
 ----
 filebeat.inputs:
@@ -22,6 +23,7 @@ filebeat.inputs:
 ----
 
 * Use shared AWS credentials file
++
 [source,yaml]
 ----
 filebeat.inputs:

diff --git a/metricbeat/docs/aws-credentials-examples.asciidoc b/metricbeat/docs/aws-credentials-examples.asciidoc
@@ -1,3 +1,5 @@
+* Use AWS credentials in Metricbeat configuration
++
 [source,yaml]
 ----
 metricbeat.modules:
@@ -9,9 +11,9 @@ metricbeat.modules:
   secret_access_key: '<secret_access_key>'
   session_token: '<session_token>'
 ----
-
++
 or
-
++
 [source,yaml]
 ----
 metricbeat.modules:
@@ -25,7 +27,7 @@ metricbeat.modules:
 ----
 
 * Use shared AWS credentials file
-
++
 [source,yaml]
 ----
 metricbeat.modules:

diff --git a/metricbeat/docs/modules/aws.asciidoc b/metricbeat/docs/modules/aws.asciidoc
@@ -6,6 +6,8 @@ This file is generated! See scripts/mage/docs_collector.go
 [role="xpack"]
 == aws module
 
+:libbeat-xpack-dir: ../../../x-pack/libbeat
+
 This module periodically fetches monitoring metrics from AWS Cloudwatch using
 https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricData.html[GetMetricData API] for AWS services.
 Note: extra AWS charges on GetMetricData API requests will be generated by this module.
@@ -18,7 +20,7 @@ The default metricsets are `ec2`, `sqs`, `s3_request`, `s3_daily_storage`, `clou
 The `aws` module requires AWS credentials configuration in order to make AWS API calls.
 Users can either use `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and/or
 `AWS_SESSION_TOKEN`, or use shared AWS credentials file.
-Please see <<aws-credentials-config>> for more details.
+Please see <<aws-credentials-config,AWS credentials options>> for more details.
 
 This module also accepts optional configuration `regions` to specify which
 AWS regions to query metrics from. If the `regions` parameter is not set in the
@@ -89,7 +91,7 @@ for a list of AWS services that publish metrics to CloudWatch.
 dimensions to Amazon CloudWatch every minute.
 
 [id="aws-credentials-config"]
-include::../../../../../libbeat/docs/aws-credentials-config.asciidoc
+include::{libbeat-xpack-dir}/docs/aws-credentials-config.asciidoc[]
 
 
 [float]

diff --git a/x-pack/metricbeat/module/aws/_meta/docs.asciidoc b/x-pack/metricbeat/module/aws/_meta/docs.asciidoc
@@ -1,3 +1,5 @@
+:libbeat-xpack-dir: ../../../x-pack/libbeat
+
 This module periodically fetches monitoring metrics from AWS Cloudwatch using
 https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricData.html[GetMetricData API] for AWS services.
 Note: extra AWS charges on GetMetricData API requests will be generated by this module.
@@ -10,7 +12,7 @@ The default metricsets are `ec2`, `sqs`, `s3_request`, `s3_daily_storage`, `clou
 The `aws` module requires AWS credentials configuration in order to make AWS API calls.
 Users can either use `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and/or
 `AWS_SESSION_TOKEN`, or use shared AWS credentials file.
-Please see <<aws-credentials-config>> for more details.
+Please see <<aws-credentials-config,AWS credentials options>> for more details.
 
 This module also accepts optional configuration `regions` to specify which
 AWS regions to query metrics from. If the `regions` parameter is not set in the
@@ -81,4 +83,4 @@ for a list of AWS services that publish metrics to CloudWatch.
 dimensions to Amazon CloudWatch every minute.
 
 [id="aws-credentials-config"]
-include::../../../../../libbeat/docs/aws-credentials-config.asciidoc
+include::{libbeat-xpack-dir}/docs/aws-credentials-config.asciidoc[]
diff --git a/x-pack/metricbeat/module/aws/cloudwatch/_meta/docs.asciidoc b/x-pack/metricbeat/module/aws/cloudwatch/_meta/docs.asciidoc
@@ -29,7 +29,7 @@ By default, statistic includes Average, Sum, Count, Maximum and Minimum.
 === Configuration example
 To be more focused on `cloudwatch` metricset use cases, the examples below do
 not include configurations on AWS credentials.
-Please see <<aws-credentials-config>> for more details on setting AWS credentials
+Please see <<aws-credentials-config,AWS credentials options>> for more details on setting AWS credentials
 in configurations in order for this metricset to make proper AWS API calls.
 
 [source,yaml]