Skip to content

Commit

Permalink
Remove shared content that is not relevant (#9030) (#9077)
Browse files Browse the repository at this point in the history
  • Loading branch information
dedemorton authored Nov 14, 2018
1 parent 2f7c62c commit 27ca249
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 12 deletions.
2 changes: 2 additions & 0 deletions libbeat/docs/shared-directory-layout.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
<<configuration-path,path options>> in the configuration file.
endif::serverless[]

==== Default paths

Expand Down
2 changes: 2 additions & 0 deletions libbeat/docs/shared-download-and-install.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ system.

ifeval::["{release-state}"!="unreleased"]

ifndef::no_repos[]
[NOTE]
==================================================
If you use Apt or Yum, you can <<setup-repositories,install {beatname_uc} from our
Expand All @@ -15,5 +16,6 @@ repositories>> 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::[]
8 changes: 8 additions & 0 deletions libbeat/docs/shared-faq.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ paths in single quotation marks (see <<wrap-paths-in-quotes>>).

Also see the general advice under <<yaml-tips>>.

ifndef::only-elasticsearch[]
[float]
[[connection-problem]]
=== Logstash connection doesn't work?
Expand All @@ -54,7 +55,9 @@ telnet <hostname or IP> 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?
Expand All @@ -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?
Expand All @@ -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?
Expand Down Expand Up @@ -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]]
Expand Down
8 changes: 8 additions & 0 deletions libbeat/docs/shared-securing-beat.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ process and securing communication between {beatname_uc} and other products in
the Elastic stack:

* <<securing-communication-elasticsearch>>
ifndef::only-elasticsearch[]
* <<configuring-ssl-logstash>>
endif::only-elasticsearch[]
* <<securing-beats>>
ifndef::only-elasticsearch[]
* <<linux-seccomp>>
endif::only-elasticsearch[]

ifdef::beat-specific-security[]
include::{beat-specific-security}[]
Expand All @@ -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[]
6 changes: 0 additions & 6 deletions x-pack/functionbeat/docs/configuring-howto.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ The following topics describe how to configure {beatname_uc}:
* <<configuration-ssl>>
* <<filtering-and-enhancing-data>>
* <<configuring-ingest-node>>
* <<configuration-path>>
* <<setup-kibana-endpoint>>
* <<configuration-template>>
* <<configuration-logging>>
* <<using-environ-vars>>
* <<yaml-tips>>
* <<regexp-support>>
* <<http-endpoint>>
* <<{beatname_lc}-reference-yml>>

--
Expand All @@ -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[]
Expand All @@ -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[]
3 changes: 0 additions & 3 deletions x-pack/functionbeat/docs/faq.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
1 change: 0 additions & 1 deletion x-pack/functionbeat/docs/getting-started.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ include::{libbeat-dir}/docs/shared-getting-started-intro.asciidoc[]
* <<{beatname_lc}-template>>
* <<{beatname_lc}-deploying>>
* <<view-kibana-dashboards>>
* <<setup-repositories>>

[id="{beatname_lc}-installation"]
=== Step 1: Download the {beatname_uc} package
Expand Down
3 changes: 1 addition & 2 deletions x-pack/functionbeat/docs/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand All @@ -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[]
Expand Down

0 comments on commit 27ca249

Please sign in to comment.