honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 18:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflict in intro.

Browse Source 
Original commit: elastic/x-pack-elasticsearch@eee009f4c1
This commit is contained in:
debadair 2015-11-23 13:48:01 -08:00
parent 3aa3376ca6
commit bfbf8a252d
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

@ -1,30 +1,14 @@
# 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.
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 is to just install 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)