Changed the Marvel module name to Marvel Agent

- this results in a `marvel-agent-2.0.0.zip` artifact, to better differentiate it from the kibana marvel plugin
- post 2.0 when we move the marvel kibana codebase to x-plugins we'll need to differentiate between these two modules anyway.

Closes elastic/elasticsearch#846

Original commit: elastic/x-pack-elasticsearch@6b6a76f7dd

marvel/docs/getting-started.asciidoc

@@ -12,14 +12,14 @@ To install Marvel:
 +
 [source,shell]
 ----------------------------------------------------------
-bin/plugin install elasticsearch/license/latest
+bin/plugin install license
 ----------------------------------------------------------
 
 .. Run `bin/plugin install` to install the Marvel plugin.
 +
 [source,shell]
 ----------------------------------------------------------
-bin/plugin install elasticsearch/marvel/latest
+bin/plugin install marvel-agent
 ----------------------------------------------------------
 +
 NOTE: If you are using a <<package-installation, DEB/RPM distribution>> of Elasticsearch, run the installation with superuser permissions. To perform an offline installation,  <<offline-installation, download the Marvel binaries>>. 

marvel/docs/installing-marvel.asciidoc

@@ -42,8 +42,8 @@ specify the location of the configuration files by setting `-Des.path.conf`. For
 [source,shell]
 ----------------------------------------------------------
 cd /usr/share/elasticsearch
-sudo bin/plugin -i elasticsearch/license/latest -Des.path.conf=/etc/elasticsearch
-sudo bin/plugin -i elasticsearch/marvel/latest -Des.path.conf=/etc/elasticsearch
+sudo bin/plugin install license
+sudo bin/plugin install marvel-agent
 ----------------------------------------------------------
 
 [float]
@@ -60,8 +60,8 @@ To install Marvel on a machine that doesn't have Internet access:
 +
 ** https://download.elastic.co/elasticsearch/license/license-latest.zip[
 https://download.elastic.co/elasticsearch/license/license-latest.zip]
-** https://download.elastic.co/elasticsearch/marvel/marvel-latest.zip[
-https://download.elastic.co/elasticsearch/marvel/marvel-latest.zip]
+** https://download.elastic.co/elasticsearch/marvel/marvel-agent-latest.zip[
+https://download.elastic.co/elasticsearch/marvel/marvel-agent-latest.zip]
 
 . Transfer the zip files to the offline machine.
 
@@ -69,8 +69,8 @@ https://download.elastic.co/elasticsearch/marvel/marvel-latest.zip]
 +
 [source,shell]
 ----------------------------------------------------------
-bin/plugin -i license -u file:///path/to/file/license-latest.zip <1>
-bin/plugin -i marvel -u file:///path/to/file/marvel-latest.zip
+bin/plugin install file:///path/to/file/license-latest.zip <1>
+bin/plugin install file:///path/to/file/marvel-agent-latest.zip
 ----------------------------------------------------------
 <1> Note that you must specify an absolute path to the zip file after the `file://` protocol.
 
@@ -95,8 +95,8 @@ marvel.agent.enabled: false
 +
 [source,sh]
 ----------------
-bin/plugin -i elasticsearch/license/latest
-bin/plugin -i elasticsearch/marvel/latest
+bin/plugin install license
+bin/plugin install marvel-agent
 ----------------
 
 . Start Elasticsearch on the nodes in your monitoring cluster:
@@ -119,8 +119,8 @@ marvel.agent.exporter.es.hosts: ["es-mon-1:9200","es-mon-2:9200"]
 +
 [source,sh]
 ----------------
-bin/plugin -i elasticsearch/license/latest
-bin/plugin -i elasticsearch/marvel/latest
+bin/plugin install license
+bin/plugin install marvel-agent
 ----------------
 
 

marvel/pom.xml

@@ -5,9 +5,9 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>marvel</artifactId>
-    <name>X-Plugins: Marvel</name>
-    <description>Elasticsearch Marvel</description>
+    <artifactId>marvel-agent</artifactId>
+    <name>X-Plugins: Marvel Agent</name>
+    <description>Elasticsearch Marvel Agent</description>
 
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>

marvel/src/main/assemblies/plugin.xml

@@ -28,7 +28,7 @@
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveDependencies>false</useTransitiveDependencies>
             <includes>
-                <include>org.elasticsearch.plugin:marvel</include>
+                <include>org.elasticsearch.plugin:marvel-agent</include>
             </includes>
         </dependencySet>
     </dependencySets>

marvel/src/test/resources/rest-api-spec/test/marvel/10_basic.yaml

@@ -12,5 +12,5 @@
 
     - match:  { nodes.$master.plugins.0.name: license  }
     - match:  { nodes.$master.plugins.0.jvm: true  }
-    - match:  { nodes.$master.plugins.1.name: marvel  }
+    - match:  { nodes.$master.plugins.1.name: marvel-agent  }
     - match:  { nodes.$master.plugins.1.jvm: true  }

qa/smoke-test-plugins-ssl/pom.xml

@@ -25,7 +25,7 @@
     <elasticsearch.integ.antfile>${project.basedir}/integration-tests.xml</elasticsearch.integ.antfile>
     <tests.rest.suite>smoke_test_plugins_ssl</tests.rest.suite>
     <tests.rest.load_packaged>false</tests.rest.load_packaged>
-    <xplugins.list>license,marvel,shield,watcher</xplugins.list>
+    <xplugins.list>license,marvel-agent,shield,watcher</xplugins.list>
     <ssl.antfile>${project.basedir}/ssl-setup.xml</ssl.antfile>
     <keystore.path>${project.build.outputDirectory}/test-node.jks</keystore.path>
   </properties>
@@ -94,7 +94,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>marvel</artifactId>
+                   <artifactId>marvel-agent</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>

qa/smoke-test-plugins-ssl/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml

@@ -11,6 +11,6 @@
         nodes.info: {}
 
     - match:  { nodes.$master.plugins.13.name: license }
-    - match:  { nodes.$master.plugins.16.name: marvel }
+    - match:  { nodes.$master.plugins.16.name: marvel-agent }
     - match:  { nodes.$master.plugins.18.name: shield }
     - match:  { nodes.$master.plugins.20.name: watcher }

qa/smoke-test-plugins/pom.xml

@@ -25,7 +25,7 @@
     <elasticsearch.integ.antfile>${project.basedir}/integration-tests.xml</elasticsearch.integ.antfile>
     <tests.rest.suite>smoke_test_plugins</tests.rest.suite>
     <tests.rest.load_packaged>false</tests.rest.load_packaged>
-    <xplugins.list>license,marvel,shield,watcher</xplugins.list>
+    <xplugins.list>license,marvel-agent,shield,watcher</xplugins.list>
   </properties>
 
   <dependencies>
@@ -92,7 +92,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>marvel</artifactId>
+                   <artifactId>marvel-agent</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>

qa/smoke-test-plugins/rest-api-spec/test/smoke_test_plugins/10_basic.yaml

@@ -11,6 +11,6 @@
         nodes.info: {}
 
     - match:  { nodes.$master.plugins.13.name: license }
-    - match:  { nodes.$master.plugins.16.name: marvel }
+    - match:  { nodes.$master.plugins.16.name: marvel-agent }
     - match:  { nodes.$master.plugins.18.name: shield }
     - match:  { nodes.$master.plugins.20.name: watcher }