diff --git a/libbeat/docs/shared-directory-layout.asciidoc b/libbeat/docs/shared-directory-layout.asciidoc index 4c9c30ad144..e9375833213 100644 --- a/libbeat/docs/shared-directory-layout.asciidoc +++ b/libbeat/docs/shared-directory-layout.asciidoc @@ -24,8 +24,10 @@ The directory layout of an installation is as follows: | logs | The location for the logs created by {beatname_uc}. | {path.home}/logs | path.logs |======================================================================= +ifndef::serverless[] You can change these settings by using CLI flags or setting <> in the configuration file. +endif::serverless[] ==== Default paths diff --git a/libbeat/docs/shared-download-and-install.asciidoc b/libbeat/docs/shared-download-and-install.asciidoc index 0d434ba1650..8f2fdd12e3c 100644 --- a/libbeat/docs/shared-download-and-install.asciidoc +++ b/libbeat/docs/shared-download-and-install.asciidoc @@ -7,6 +7,7 @@ system. ifeval::["{release-state}"!="unreleased"] +ifndef::no_repos[] [NOTE] ================================================== If you use Apt or Yum, you can <> to update to the newest version more easily. See our https://www.elastic.co/downloads/beats/{beatname_lc}[download page] for other installation options, such as 32-bit images. ================================================== +endif::no_repos[] endif::[] diff --git a/libbeat/docs/shared-faq.asciidoc b/libbeat/docs/shared-faq.asciidoc index 21cdc2fd31b..534d96b16d2 100644 --- a/libbeat/docs/shared-faq.asciidoc +++ b/libbeat/docs/shared-faq.asciidoc @@ -34,6 +34,7 @@ paths in single quotation marks (see <>). Also see the general advice under <>. +ifndef::only-elasticsearch[] [float] [[connection-problem]] === Logstash connection doesn't work? @@ -54,7 +55,9 @@ telnet 5044 input plugin for Logstash] is installed and configured. Note that Beats will not connect to the Lumberjack input plugin. To learn how to install and update plugins, see {logstash-ref}/working-with-plugins.html[Working with plugins]. +endif::only-elasticsearch[] +ifndef::only-elasticsearch[] [float] [[metadata-missing]] === @metadata is missing in Logstash? @@ -64,7 +67,9 @@ queue (for example, Redis or Kafka), the `@metadata` field will not be available TIP: To preserve `@metadata` fields, use the Logstash mutate filter with the rename setting to rename the fields to non-internal fields. +endif::only-elasticsearch[] +ifndef::only-elasticsearch[] [float] [[diff-logstash-beats]] === Difference between Logstash and Beats? @@ -77,7 +82,9 @@ and transforming data from a variety of sources. For more information, see the https://www.elastic.co/guide/en/logstash/current/introduction.html[Logstash Introduction] and the https://www.elastic.co/guide/en/beats/libbeat/current/beats-reference.html[Beats Overview]. +endif::only-elasticsearch[] +ifndef::only-elasticsearch[] [float] [[ssl-client-fails]] === SSL client fails to connect to Logstash? @@ -142,6 +149,7 @@ This is not a SSL problem. Make sure that Logstash is running and that there is A firewall is refusing the connection. Check if a firewall is blocking the traffic on the client, the network, or the destination host. +endif::only-elasticsearch[] [float] [[monitoring-shows-fewer-than-expected-beats]] diff --git a/libbeat/docs/shared-securing-beat.asciidoc b/libbeat/docs/shared-securing-beat.asciidoc index 379a050bef6..7677da1a876 100644 --- a/libbeat/docs/shared-securing-beat.asciidoc +++ b/libbeat/docs/shared-securing-beat.asciidoc @@ -9,9 +9,13 @@ process and securing communication between {beatname_uc} and other products in the Elastic stack: * <> +ifndef::only-elasticsearch[] * <> +endif::only-elasticsearch[] * <> +ifndef::only-elasticsearch[] * <> +endif::only-elasticsearch[] ifdef::beat-specific-security[] include::{beat-specific-security}[] @@ -28,11 +32,15 @@ include::./https.asciidoc[] //sets block macro for shared-ssl-logstash-config.asciidoc included in next section +ifndef::only-elasticsearch[] [[configuring-ssl-logstash]] == Secure communication with Logstash by using SSL include::./shared-ssl-logstash-config.asciidoc[] +endif::only-elasticsearch[] include::./security/securing-beats.asciidoc[] +ifndef::only-elasticsearch[] include::./security/linux-seccomp.asciidoc[] +endif::only-elasticsearch[] diff --git a/x-pack/functionbeat/docs/configuring-howto.asciidoc b/x-pack/functionbeat/docs/configuring-howto.asciidoc index 499fd2a976e..a7743c937a5 100644 --- a/x-pack/functionbeat/docs/configuring-howto.asciidoc +++ b/x-pack/functionbeat/docs/configuring-howto.asciidoc @@ -18,14 +18,12 @@ The following topics describe how to configure {beatname_uc}: * <> * <> * <> -* <> * <> * <> * <> * <> * <> * <> -* <> * <<{beatname_lc}-reference-yml>> -- @@ -46,8 +44,6 @@ include::./filtering.asciidoc[] include::{libbeat-dir}/docs/shared-config-ingest.asciidoc[] -include::{libbeat-dir}/docs/shared-path-config.asciidoc[] - include::{libbeat-dir}/docs/shared-kibana-config.asciidoc[] include::{libbeat-dir}/docs/setup-config.asciidoc[] @@ -66,6 +62,4 @@ include::{libbeat-dir}/docs/yaml.asciidoc[] include::{libbeat-dir}/docs/regexp.asciidoc[] -include::{libbeat-dir}/docs/http-endpoint.asciidoc[] - include::{libbeat-dir}/docs/reference-yml.asciidoc[] diff --git a/x-pack/functionbeat/docs/faq.asciidoc b/x-pack/functionbeat/docs/faq.asciidoc index 2ca1763168e..40b6559c92a 100644 --- a/x-pack/functionbeat/docs/faq.asciidoc +++ b/x-pack/functionbeat/docs/faq.asciidoc @@ -5,7 +5,4 @@ This section contains frequently asked questions about {beatname_uc}. Also check out the https://discuss.elastic.co/c/beats/{beatname_lc}[{beatname_uc} discussion forum]. - -include::{libbeat-dir}/docs/faq-limit-bandwidth.asciidoc[] - include::{libbeat-dir}/docs/shared-faq.asciidoc[] diff --git a/x-pack/functionbeat/docs/getting-started.asciidoc b/x-pack/functionbeat/docs/getting-started.asciidoc index d611baf4bda..f2239f4c064 100644 --- a/x-pack/functionbeat/docs/getting-started.asciidoc +++ b/x-pack/functionbeat/docs/getting-started.asciidoc @@ -8,7 +8,6 @@ include::{libbeat-dir}/docs/shared-getting-started-intro.asciidoc[] * <<{beatname_lc}-template>> * <<{beatname_lc}-deploying>> * <> -* <> [id="{beatname_lc}-installation"] === Step 1: Download the {beatname_uc} package diff --git a/x-pack/functionbeat/docs/index.asciidoc b/x-pack/functionbeat/docs/index.asciidoc index 5c091f4fc74..9945872a66f 100644 --- a/x-pack/functionbeat/docs/index.asciidoc +++ b/x-pack/functionbeat/docs/index.asciidoc @@ -22,6 +22,7 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[] :win_os: :linux_os: :no_dashboards: +:no_repos: include::{libbeat-dir}/docs/shared-beats-attributes.asciidoc[] @@ -31,8 +32,6 @@ include::./overview.asciidoc[] include::./getting-started.asciidoc[] -include::{libbeat-dir}/docs/repositories.asciidoc[] - include::./setting-up-running.asciidoc[] include::./configuring-howto.asciidoc[]