Skip to content

Commit

Permalink
Merge pull request #279 from monicasarbu/variable_packetbeat
Browse files Browse the repository at this point in the history
Add version variable to the packetbeat version
  • Loading branch information
tsg committed Sep 29, 2015
2 parents 453f59c + 7f33ab5 commit de91d4d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 253 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ env/bin/activate: requirements.txt

.PHONY: gen
gen: env
./scripts/generate_gettingstarted.sh docs/gettingstarted.in.asciidoc docs/gettingstarted.asciidoc
. env/bin/activate && python scripts/generate_template.py etc/fields.yml etc/packetbeat.template.json
. env/bin/activate && python scripts/generate_field_docs.py etc/fields.yml docs/fields.asciidoc

Expand Down
29 changes: 10 additions & 19 deletions docs/gettingstarted.asciidoc
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
////

This file is generated! Edit gettingstarted.in.asciidoc instead and then
re-generate this file with:

../scripts/generate_gettingstarted.sh gettingstarted.in.asciidoc gettingstarted.asciidoc

////
[[packetbeat-getting-started]]
== Getting started

Expand All @@ -31,29 +22,29 @@ servers:

deb:

[source,shell]
["source","sh",subs="attributes,callouts"]
----------------------------------------------------------------------
sudo apt-get install libpcap0.8
curl -L -O https://download.elasticsearch.org/beats/packetbeat/packetbeat_1.0.0-beta3_amd64.deb
sudo dpkg -i packetbeat_1.0.0-beta3_amd64.deb
curl -L -O https://download.elasticsearch.org/beats/packetbeat/packetbeat_{version}_amd64.deb
sudo dpkg -i packetbeat_{version}_amd64.deb
----------------------------------------------------------------------

rpm:

[source,shell]
["source","sh",subs="attributes,callouts"]
----------------------------------------------------------------------
sudo yum install libpcap
curl -L -O https://download.elasticsearch.org/beats/packetbeat/packetbeat-1.0.0-beta3-x86_64.rpm
sudo rpm -vi packetbeat-1.0.0-beta3-x86_64.rpm
curl -L -O https://download.elasticsearch.org/beats/packetbeat/packetbeat-{version}-x86_64.rpm
sudo rpm -vi packetbeat-{version}-x86_64.rpm
----------------------------------------------------------------------


mac:

[source,shell]
["source","sh",subs="attributes,callouts"]
----------------------------------------------------------------------
curl -L -O https://download.elasticsearch.org/beats/packetbeat/packetbeat-1.0.0-beta3-darwin.tgz
tar xzvf packetbeat-1.0.0-beta3-darwin.tgz
curl -L -O https://download.elasticsearch.org/beats/packetbeat/packetbeat-{version}-darwin.tgz
tar xzvf packetbeat-{version}-darwin.tgz
----------------------------------------------------------------------

NOTE: We also provide 32bits images. You can get them from our
Expand Down Expand Up @@ -148,7 +139,7 @@ mac:

[source,shell]
----------------------------------------------------------------------
cd beats-1.0.0-beta3-darwin
cd beats-{version}-darwin
curl -XPUT 'http://localhost:9200/_template/packetbeat' [email protected]
----------------------------------------------------------------------

Expand Down
190 changes: 0 additions & 190 deletions docs/gettingstarted.in.asciidoc

This file was deleted.

1 change: 1 addition & 0 deletions docs/index.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
= Packetbeat reference
:libbeat: http://www.elastic.co/guide/en/beats/libbeat/master
:version: 1.0.0-beta3

include::./overview.asciidoc[]

Expand Down
43 changes: 0 additions & 43 deletions scripts/generate_gettingstarted.sh

This file was deleted.

0 comments on commit de91d4d

Please sign in to comment.