Added docs

elastic · Jul 4, 2017 · 8ab7461 · 8ab7461
1 parent 65eec21
commit 8ab7461
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 21 deletions.
diff --git a/auditbeat/docs/index.asciidoc b/auditbeat/docs/index.asciidoc
@@ -6,6 +6,7 @@ include::../../libbeat/docs/version.asciidoc[]
 :version: {stack-version}
 :beatname_lc: auditbeat
 :beatname_uc: Auditbeat
+:beatname_pkg: {beatname_lc}
 :security: X-Pack Security
 :dockerimage: docker.elastic.co/beats/{beatname_lc}:{version}
 

diff --git a/filebeat/docs/index.asciidoc b/filebeat/docs/index.asciidoc
@@ -15,6 +15,7 @@ include::../../libbeat/docs/version.asciidoc[]
 :version: {stack-version}
 :beatname_lc: filebeat
 :beatname_uc: Filebeat
+:beatname_pkg: {beatname_lc}
 :security: X-Pack Security
 :dockerimage: docker.elastic.co/beats/{beatname_lc}:{version}
 

diff --git a/heartbeat/docs/getting-started.asciidoc b/heartbeat/docs/getting-started.asciidoc
@@ -241,14 +241,14 @@ start Heartbeat in the foreground.
 
 ["source","sh",subs="attributes"]
 ----------------------------------------------------------------------
-sudo /etc/init.d/heartbeat start
+sudo /etc/init.d/heartbeat-elastic start
 ----------------------------------------------------------------------
 
 *rpm:*
 
 ["source","sh",subs="attributes"]
 ----------------------------------------------------------------------
-sudo /etc/init.d/heartbeat start
+sudo /etc/init.d/heartbeat-elastic start
 ----------------------------------------------------------------------
 
 *mac:*

diff --git a/heartbeat/docs/index.asciidoc b/heartbeat/docs/index.asciidoc
@@ -15,6 +15,7 @@ include::../../libbeat/docs/version.asciidoc[]
 :version: {stack-version}
 :beatname_lc: heartbeat
 :beatname_uc: Heartbeat
+:beatname_pkg: heartbeat-elastic
 :security: X-Pack Security
 :dockerimage: docker.elastic.co/beats/{beatname_lc}:{version}
 

diff --git a/libbeat/docs/repositories.asciidoc b/libbeat/docs/repositories.asciidoc
@@ -70,34 +70,19 @@ the following:
 Simply delete the `deb-src` entry from the `/etc/apt/sources.list` file, and the installation should work as expected.
 ==================================================
 
-ifeval::["{beatname_uc}"=="Heartbeat"]
-
-. On Debian or Ubuntu, pin the repository before installing to ensure that the
-correct Elastic Heartbeat package is installed. To do this, edit 
-`/etc/apt/preferences` (or `/etc/apt/preferences.d/heartbeat`) as follows:
-+
-[source,shell]
---------------------------------------------------
-Package: heartbeat
-Pin: origin artifacts.elastic.co
-Pin-Priority: 700
---------------------------------------------------
-
-endif::[]
-
 . Run `apt-get update`, and the repository is ready for use. For example, you can
 install {beatname_uc} by running:
 +
 ["source","sh",subs="attributes"]
 --------------------------------------------------
-sudo apt-get update && sudo apt-get install {beatname_lc}
+sudo apt-get update && sudo apt-get install {beatname_pkg}
 --------------------------------------------------
 
 . To configure the Beat to start automatically during boot, run:
 +
 ["source","sh",subs="attributes"]
 --------------------------------------------------
-sudo update-rc.d {beatname_lc} defaults 95 10
+sudo update-rc.d {beatname_pkg} defaults 95 10
 --------------------------------------------------
 
 endif::[]
@@ -142,14 +127,14 @@ running:
 +
 ["source","sh",subs="attributes"]
 --------------------------------------------------
-sudo yum install {beatname_lc}
+sudo yum install {beatname_pkg}
 --------------------------------------------------
 
 . To configure the Beat to start automatically during boot, run:
 +
 ["source","sh",subs="attributes"]
 --------------------------------------------------
-sudo chkconfig --add {beatname_lc}
+sudo chkconfig --add {beatname_pkg}
 --------------------------------------------------
 
 endif::[]

diff --git a/metricbeat/docs/index.asciidoc b/metricbeat/docs/index.asciidoc
@@ -11,6 +11,7 @@ include::../../libbeat/docs/version.asciidoc[]
 :version: {stack-version}
 :beatname_lc: metricbeat
 :beatname_uc: Metricbeat
+:beatname_pkg: {beatname_lc}
 :security: X-Pack Security
 :monitoringdoc: https://www.elastic.co/guide/en/x-pack/current
 :dockerimage: docker.elastic.co/beats/{beatname_lc}:{version}

diff --git a/packetbeat/docs/index.asciidoc b/packetbeat/docs/index.asciidoc
@@ -16,6 +16,7 @@ include::../../libbeat/docs/version.asciidoc[]
 :version: {stack-version}
 :beatname_lc: packetbeat
 :beatname_uc: Packetbeat
+:beatname_pkg: {beatname_lc}
 :security: X-Pack Security
 :dockerimage: docker.elastic.co/beats/{beatname_lc}:{version}
 

diff --git a/winlogbeat/docs/index.asciidoc b/winlogbeat/docs/index.asciidoc
@@ -14,6 +14,7 @@ include::../../libbeat/docs/version.asciidoc[]
 :version: {stack-version}
 :beatname_lc: winlogbeat
 :beatname_uc: Winlogbeat
+:beatname_pkg: {beatname_lc}
 :security: X-Pack Security
 
 include::./overview.asciidoc[]