From 3aa3376ca63bed91f5c0cf6656760e25a45d5f5c Mon Sep 17 00:00:00 2001 From: debadair Date: Wed, 18 Nov 2015 17:19:50 -0800 Subject: [PATCH] Docs: Bumped version number to 2.1.0 and added 2.1.0 release notes. Original commit: elastic/x-pack-elasticsearch@e39cf3e654582eed19a64694775ee3aa646c62c2 --- CONTRIBUTING.md | 2 +- README.md | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 09e40e646dd..ebc2dfa31f1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ git clone https://github.com/elastic/elasticsearch-marvel.git && cd elasticsearc npm install ``` - Start it up - - Start Elasticsearch, with esvm `esvm --branch 2.0` or with traditionally `bin/elasticsearch`. + - Start Elasticsearch, with esvm `esvm --branch 2.1` or with traditionally `bin/elasticsearch`. - Start up the mock Marvel agent with `gulp index` - Start up the filesystem watching of Marvel code and syncing to Kibana's plugin directory with `gulp dev` - Finally startup Kibana from that directory run `bin/kibana` diff --git a/README.md b/README.md index 1dde0b485de..4ff5302a1b7 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,29 @@ # WARNING THIS IS ALL IN FLUX +<<<<<<< HEAD # Testing/Installing Marvel 2.0.0 +======= +<<<<<<< HEAD +>>>>>>> 46ac02d... Docs: Bumped version number to 2.1.0 and added 2.1.0 release notes. The easiest way to get to know the new Marvel is probably by [reading the docs](https://github.com/elastic/elasticsearch-marvel/blob/master/docs/index.asciidoc), the second easiest way, however, is probably to install the 2.0.0 release version of it. +<<<<<<< HEAD - Install the marvel plugin on kibana ` ./bin/kibana plugin -i elasticsearch/marvel/2.0.0 ` - Install the License plugin on your cluster `./bin/plugin install license` - Install the Marvel agent on your cluster ` ./bin/plugin install marvel-agent ` +======= +The easiest way to play/get to know Marvel is to install the latest release version of it. To do so, just run the following command on every node on your cluster (restart node for it to have effect): +======= +# Testing/Installing Marvel 2.1.0 + +The easiest way to get to know the new Marvel is probably by [reading the docs](https://github.com/elastic/elasticsearch-marvel/blob/master/docs/index.asciidoc), the second easiest way, however, is probably to install the 2.1.0 release version of it. + +- Install the marvel plugin on kibana `./bin/kibana plugin -i elasticsearch/marvel/2.1.0` +- Install the License plugin on your cluster `./bin/plugin install license` +- Install the Marvel agent on your cluster `./bin/plugin install marvel-agent` +>>>>>>> 44fbb83... Docs: Bumped version number to 2.1.0 and added 2.1.0 release notes. +>>>>>>> 46ac02d... Docs: Bumped version number to 2.1.0 and added 2.1.0 release notes. Once done, open up the following url (assuming standard kibana config): [http://localhost:5601/app/marvel.](http://localhost:5601/app/marvel)