Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add version variable to the packetbeat version #279

Merged
merged 3 commits into from
Sep 29, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.