From ef83a259df31a34cd048e092c7127ca9af0b7623 Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Thu, 1 Nov 2018 15:09:16 -0700 Subject: [PATCH] Add conditions for each platform (#8811) * Add conditions for each platform * Add conditions to directory layout topic * Combine conditions for deb and rpm --- docs/configuring-howto.asciidoc | 4 ---- docs/getting-started.asciidoc | 11 +---------- docs/index.asciidoc | 2 ++ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/docs/configuring-howto.asciidoc b/docs/configuring-howto.asciidoc index 95d56d427f2..be66d268251 100644 --- a/docs/configuring-howto.asciidoc +++ b/docs/configuring-howto.asciidoc @@ -47,9 +47,7 @@ include::./config-options.asciidoc[] include::./general-options.asciidoc[] -:allplatforms: include::../../libbeat/docs/queueconfig.asciidoc[] -:allplatforms!: include::../../libbeat/docs/outputconfig.asciidoc[] @@ -75,10 +73,8 @@ include::../../libbeat/docs/shared-env-vars.asciidoc[] //include::../../libbeat/docs/shared-autodiscover.asciidoc[] :standalone: -:allplatforms: include::../../libbeat/docs/yaml.asciidoc[] :standalone!: -:allplatforms!: include::../../libbeat/docs/regexp.asciidoc[] diff --git a/docs/getting-started.asciidoc b/docs/getting-started.asciidoc index 6fffeff4b5e..2be942e9701 100644 --- a/docs/getting-started.asciidoc +++ b/docs/getting-started.asciidoc @@ -182,7 +182,6 @@ include::../../libbeat/docs/step-look-at-config.asciidoc[] IMPORTANT: This documentation is placeholder content. It has not yet been reviewed. -:allplatforms: include::../../libbeat/docs/shared-template-load.asciidoc[] [[load-kibana-dashboards]] @@ -190,7 +189,6 @@ include::../../libbeat/docs/shared-template-load.asciidoc[] IMPORTANT: This documentation is placeholder content. It has not yet been reviewed. -:allplatforms: include::../../libbeat/docs/dashboards.asciidoc[] [id="{beatname_lc}-starting"] @@ -206,14 +204,7 @@ NOTE: If you use an init.d script to start {beatname_uc} on deb or rpm, you can' specify command line flags (see <>). To specify flags, start {beatname_uc} in the foreground. -*deb:* - -["source","sh",subs="attributes"] ----------------------------------------------------------------------- -sudo service {beatname_lc} start ----------------------------------------------------------------------- - -*rpm:* +*deb and rpm:* ["source","sh",subs="attributes"] ---------------------------------------------------------------------- diff --git a/docs/index.asciidoc b/docs/index.asciidoc index be27ac9a406..6bb3fdecbcc 100644 --- a/docs/index.asciidoc +++ b/docs/index.asciidoc @@ -13,6 +13,8 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[] :beat_default_index_prefix: {beatname_lc} :has_ml_jobs: no :libbeat-docs: Beats Platform Reference +:deb_os: +:rpm_os: include::../../libbeat/docs/shared-beats-attributes.asciidoc[]