diff --git a/shield/dev-tools/esvm/readme.txt b/shield/dev-tools/esvm/readme.txt index 46e7cfe61d9..ceae227e29c 100644 --- a/shield/dev-tools/esvm/readme.txt +++ b/shield/dev-tools/esvm/readme.txt @@ -19,7 +19,7 @@ Troubleshooting: - elasticsearch is installed under ~/.esvm/ - turn on debug in ~/.esvm/1.4.1/config/logging.yml - esvm --fresh will reinstall ES -- plugins will not re-install, you can remove them manually by ~/.esvm/1.4.1/bin/plugin --remove shield +- plugins will not re-install, you can remove them manually by ~/.esvm/1.4.1/bin/plugin remove shield - errors during startup will not show up. If esvm fails startup look in ~/.esvm/1.4.1/logs/* diff --git a/shield/docs/public/getting-started.asciidoc b/shield/docs/public/getting-started.asciidoc index a1d2efd907a..1b0f4b2899b 100644 --- a/shield/docs/public/getting-started.asciidoc +++ b/shield/docs/public/getting-started.asciidoc @@ -9,18 +9,18 @@ node must be restarted after installation. Plan for a complete cluster restart b To install and run Shield: -. Run `bin/plugin` -i from `ES_HOME` to install the license plugin. +. Run `bin/plugin install` from `ES_HOME` to install the license plugin. + [source,shell] ---------------------------------------------------------- -bin/plugin -i elasticsearch/license/latest +bin/plugin install elasticsearch/license/latest ---------------------------------------------------------- -. Run `bin/plugin -i` to install the Shield plugin. +. Run `bin/plugin install` to install the Shield plugin. + [source,shell] ---------------------------------------------------------- -bin/plugin -i elasticsearch/shield/latest +bin/plugin install elasticsearch/shield/latest ---------------------------------------------------------- + NOTE: If you are using a <> of Elasticsearch, you need to specify the configuration directory and run the installation with superuser permissions. To perform an offline installation, <>. diff --git a/shield/docs/public/installing-shield.asciidoc b/shield/docs/public/installing-shield.asciidoc index 0e3071b43fa..8f544b614c9 100644 --- a/shield/docs/public/installing-shield.asciidoc +++ b/shield/docs/public/installing-shield.asciidoc @@ -65,7 +65,7 @@ Transfer the compressed file to your server, then install the plugin with the `b [source,shell] ---------------------------------------------------- -bin/plugin -i shield -u file://PATH_TO_ZIP_FILE <1> +bin/plugin install shield -u file://PATH_TO_ZIP_FILE <1> ---------------------------------------------------- <1> Absolute path to Shield plugin zip distribution file (e.g. `file:///path/to/file/shield-1.3.0.zip`, note the three slashes at the beginning) diff --git a/shield/docs/public/release-notes.asciidoc b/shield/docs/public/release-notes.asciidoc index a4a05d8c83c..87d1ad8e628 100644 --- a/shield/docs/public/release-notes.asciidoc +++ b/shield/docs/public/release-notes.asciidoc @@ -18,8 +18,8 @@ will be preserved and you do this with a rolling upgrade of Elasticsearch. On ea [source,shell] --------------------------------------------------- -bin/plugin -r shield -bin/plugin -i elasticsearch/shield/latest <1> +bin/plugin remove shield +bin/plugin install elasticsearch/shield/latest <1> --------------------------------------------------- <1> `latest` will install the latest version of Shield compatible with your version of Elasticsearch. A specific version, such as `1.1.0` can also be specified. diff --git a/watcher/docs/getting-started.asciidoc b/watcher/docs/getting-started.asciidoc index 69eef723a25..3ec5382e957 100644 --- a/watcher/docs/getting-started.asciidoc +++ b/watcher/docs/getting-started.asciidoc @@ -7,20 +7,20 @@ on nodes running Elasticsearch 1.5 or later. To install and run Watcher: -. Run `bin/plugin -i` from `ES_HOME` to install the License plugin: +. Run `bin/plugin install` from `ES_HOME` to install the License plugin: + [source,shell] ---------------------------------------------------------- -bin/plugin -i elasticsearch/license/latest +bin/plugin install elasticsearch/license/latest ---------------------------------------------------------- + NOTE: You need to install the License and Watcher plugins on each node in your cluster. -. Run `bin/plugin -i` to install the Watcher plugin. +. Run `bin/plugin install` to install the Watcher plugin. + [source,shell] ---------------------------------------------------------- -bin/plugin -i elasticsearch/watcher/latest +bin/plugin install elasticsearch/watcher/latest ---------------------------------------------------------- + NOTE: If you are using a <> of Elasticsearch, diff --git a/watcher/docs/installing-watcher.asciidoc b/watcher/docs/installing-watcher.asciidoc index 5dfb3b6b1bd..58b8b4b9ed3 100644 --- a/watcher/docs/installing-watcher.asciidoc +++ b/watcher/docs/installing-watcher.asciidoc @@ -69,8 +69,8 @@ is slightly different. You need to install the License and Watcher plugins from [source,shell] ---------------------------------------------------------- cd /usr/share/elasticsearch -sudo bin/plugin -i elasticsearch/license/latest -sudo bin/plugin -i elasticsearch/watcher/latest +sudo bin/plugin install elasticsearch/license/latest +sudo bin/plugin install elasticsearch/watcher/latest ---------------------------------------------------------- [float] @@ -89,7 +89,7 @@ https://download.elastic.co/elasticsearch/watcher/watcher-1.0.0.zip]. [source,shell] ---------------------------------------------------------- -bin/plugin -i watcher -u file:// +bin/plugin install watcher -u file:// ---------------------------------------------------------- diff --git a/watcher/docs/release-notes.asciidoc b/watcher/docs/release-notes.asciidoc index 7334403029e..50d78602783 100644 --- a/watcher/docs/release-notes.asciidoc +++ b/watcher/docs/release-notes.asciidoc @@ -27,7 +27,7 @@ upgrade: + [source,yaml] -------------------------------------------------- -bin/plugin -r watcher +bin/plugin remove watcher -------------------------------------------------- 4. Restart Elasticsearch on each node.