Skip to content

Commit

Permalink
Merge branch '1.0.0-rc1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Tudor Golubenco committed Nov 10, 2015
2 parents cdbdc6c + c3e4d84 commit a63f98a
Show file tree
Hide file tree
Showing 3 changed files with 112 additions and 2 deletions.
19 changes: 17 additions & 2 deletions docs/gettingstarted.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ see the documentation for your Beat.

In this setup, the Beat sends events to Logstash. Logstash receives
these events by using the
https://www.elastic.co/guide/en/logstash/current/plugins-inputs-beats.html[Beats
input plugin] and then sends the transaction to Elasticsearch by using the
https://www.elastic.co/guide/en/logstash/current/plugins-inputs-beats.html[Logstash Input Beats
plugin] and then sends the transaction to Elasticsearch by using the
http://www.elastic.co/guide/en/logstash/current/plugins-outputs-elasticsearch.html[Elasticsearch
output plugin]. The Elasticsearch plugin of Logstash uses the bulk API, making
indexing very efficient.
Expand Down Expand Up @@ -210,6 +210,21 @@ Logstash uses this configuration to index events in Elasticsearch in the same
way that the Beat would, but you get additional buffering and other capabilities
provided by Logstash.

[[logstash-input-update]]
==== Updating Logstash Input Beats Plugin

The latest version of Logstash might not come with the latest version of the
https://www.elastic.co/guide/en/logstash/current/plugins-inputs-beats.html[Logstash Input Beats Plugin].
You can easily update to the latest version of the input plugin from your logstash installation:

["source","sh",subs="attributes,callouts"]
----------------------------------------------------------------------
./bin/plugin update logstash-input-beats
----------------------------------------------------------------------

More details about working with input plugins in Logstash are available https://www.elastic.co/guide/en/logstash/current/working-with-plugins.html[here].


==== Running Logstash

Now you can start Logstash. Use the command that works with your system:
Expand Down
1 change: 1 addition & 0 deletions docs/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ include::./https.asciidoc[]

include::./newbeat.asciidoc[]

include::./repositories.asciidoc[]
94 changes: 94 additions & 0 deletions docs/repositories.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
[[setup-repositories]]
== Repositories

We have repositories available for APT and YUM based distributions. Note that we
provide binary packages, but no source packages.

We use the PGP key https://pgp.mit.edu/pks/lookup?op=vindex&search=0xD27D666CD88E42B4[D88E42B4],
Elasticsearch Signing Key, with fingerprint

4609 5ACC 8548 582C 1A26 99A9 D27D 666C D88E 42B4

to sign all our packages. It is available from https://pgp.mit.edu.

[float]
=== APT

Download and install the Public Signing Key:

[source,sh]
--------------------------------------------------
curl https://packages.elasticsearch.org/GPG-KEY-elasticsearch | sudo apt-key add -
--------------------------------------------------

Save the repository definition to +/etc/apt/sources.list.d/beats.list+:

["source","sh",subs="attributes,callouts"]
--------------------------------------------------
echo "deb https://packages.elastic.co/beats/apt stable main" | sudo tee -a /etc/apt/sources.list.d/beats.list

--------------------------------------------------

[WARNING]
==================================================
Use the `echo` method described above to add the Beats repository. Do not use `add-apt-repository`
as it will add a `deb-src` entry as well, but we do not provide a source package.
If you have added the `deb-src` entry, you will see an error like
the following:

Unable to find expected entry 'main/source/Sources' in Release file (Wrong sources.list entry or malformed file)

Just delete the `deb-src` entry from the `/etc/apt/sources.list` file and the installation should work as expected.
==================================================

Run apt-get update and the repository is ready for use. For example, you can
install Filebeat with:

[source,sh]
--------------------------------------------------
sudo apt-get update && sudo apt-get install filebeat
--------------------------------------------------

To configure the beat to automatically start during boot, run:

[source,sh]
--------------------------------------------------
sudo update-rc.d filebeat defaults 95 10
--------------------------------------------------

[float]
=== YUM

Download and install the public signing key:

[source,sh]
--------------------------------------------------
sudo rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch
--------------------------------------------------

Add the following in your `/etc/yum.repos.d/` directory
in a file with a `.repo` suffix, for example `beats.repo`

["source","sh",subs="attributes,callouts"]
--------------------------------------------------
[beats]
name=Elastic Beats Repository
baseurl=https://packages.elastic.co/beats/yum/el/$basearch
enabled=1
gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch
gpgcheck=1
--------------------------------------------------

And your repository is ready for use. For example, you can install Filebeat with:

[source,sh]
--------------------------------------------------
sudo yum install filebeat
--------------------------------------------------

To configure the beat to automatically start during boot, run:

[source,sh]
--------------------------------------------------
sudo chkconfig --add filebeat
--------------------------------------------------

0 comments on commit a63f98a

Please sign in to comment.