[7.4][DOCS] Backport: Add Logstash output to functionbeat and refactor Logstash output docs…

auditbeat/docs/index.asciidoc

@@ -1,6 +1,6 @@
 = Auditbeat Reference
 
-:libbeat-dir: ../../libbeat
+:libbeat-dir: {docdir}/../../libbeat
 
 include::{libbeat-dir}/docs/version.asciidoc[]
 

docs/devguide/index.asciidoc

@@ -1,7 +1,7 @@
 [[beats-reference]]
 = Beats Developer Guide
 
-:libbeat-dir: ../../libbeat
+:libbeat-dir: {docdir}/../../libbeat
 
 include::{libbeat-dir}/docs/version.asciidoc[]
 

filebeat/docs/index.asciidoc

@@ -1,6 +1,6 @@
 = Filebeat Reference
 
-:libbeat-dir: ../../libbeat
+:libbeat-dir: {docdir}/../../libbeat
 
 include::{libbeat-dir}/docs/version.asciidoc[]
 

heartbeat/docs/index.asciidoc

@@ -1,6 +1,6 @@
 = Heartbeat Reference
 
-:libbeat-dir: ../../libbeat
+:libbeat-dir: {docdir}/../../libbeat
 
 include::{libbeat-dir}/docs/version.asciidoc[]
 

journalbeat/docs/index.asciidoc

@@ -1,6 +1,6 @@
 = Journalbeat Reference
 
-:libbeat-dir: ../../libbeat
+:libbeat-dir: {docdir}/../../libbeat
 
 include::{libbeat-dir}/docs/version.asciidoc[]
 

libbeat/docs/command-reference.asciidoc

@@ -529,9 +529,9 @@ network. This option is useful only for testing {beatname_uc}.
 endif::[]
 
 *`-N, --N`*:: Disables publishing for testing purposes.
-ifndef::only-elasticsearch[]
+ifndef::no_file_output[]
 This option disables all outputs except the <<file-output,File output>>.
-endif::only-elasticsearch[]
+endif::[]
 
 ifeval::["{beatname_lc}"=="packetbeat"]
 *`-O, --O`*::

libbeat/docs/dashboards.asciidoc

@@ -36,10 +36,10 @@ for your system. The command shown here loads the dashboards from the {beatname_
 package. For more options, such as loading customized dashboards, see
 {beatsdevguide}/import-dashboards.html[Importing Existing Beat Dashboards] in
 the _Beats Developer Guide_.
-ifndef::only-elasticsearch[]
+ifndef::no-output-logstash[]
 If you've configured the Logstash output, see
 <<load-dashboards-logstash>>.
-endif::only-elasticsearch[]
+endif::[]
 
 ifdef::requires-sudo[]
 include::../../libbeat/docs/shared-note-sudo.asciidoc[]
@@ -105,7 +105,7 @@ PS > .{backslash}{beatname_lc}.exe setup --dashboards
 ----------------------------------------------------------------------
 endif::win_os[]
 
-ifndef::only-elasticsearch[]
+ifndef::no-output-logstash[]
 [[load-dashboards-logstash]]
 ==== Set up dashboards for Logstash output
 
@@ -208,5 +208,5 @@ PS > .{backslash}{beatname_lc}.exe setup -e `
 ----
 endif::win_os[]
 
-endif::only-elasticsearch[]
+endif::no-output-logstash[]
 

libbeat/docs/index.asciidoc

@@ -1,5 +1,7 @@
 = Beats Platform Reference
 
+:libbeat-dir: {docdir}/../../libbeat
+
 include::./version.asciidoc[]
 
 include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
@@ -12,7 +14,7 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
 :beat_default_index_prefix: {beatname_lc}
 :has_ml_jobs:
 
-include::../../libbeat/docs/shared-beats-attributes.asciidoc[]
+include::{libbeat-dir}/docs/shared-beats-attributes.asciidoc[]
 
 include::./overview.asciidoc[]
 
@@ -30,4 +32,4 @@ include::./breaking.asciidoc[]
 
 include::./release.asciidoc[]
 
-include::../../libbeat/docs/contributing-to-beats.asciidoc[]
+include::{libbeat-dir}/docs/contributing-to-beats.asciidoc[]

libbeat/docs/monitoring/monitoring-internal-collection.asciidoc

@@ -49,9 +49,9 @@ monitoring:
 --------------------
 +
 If you
-ifndef::only-elasticsearch[]
+ifndef::no-output-logstash[]
 configured a different output, such as {ls} or you
-endif::only-elasticsearch[]
+endif::[]
 want to send {beatname_uc} monitoring events to a separate {es} cluster
 (referred to as the _monitoring cluster_), you must specify additional
 configuration options. For example: