Support for all xpack features through generic install + improved tests

test/integration/helpers/serverspec/xpack_spec.rb

@@ -78,7 +78,7 @@ shared_examples 'xpack::init' do |es_version|
   end
 
 
-  #Check shield and license plugins are installed
+  #Check shield,watcher and license plugins are installed
   describe file('/usr/share/elasticsearch/plugins/license') do
     it { should be_directory }
     it { should be_owned_by 'elasticsearch' }
@@ -102,6 +102,33 @@ shared_examples 'xpack::init' do |es_version|
     it { should be_owned_by 'elasticsearch' }
   end
 
+  describe file('/usr/share/elasticsearch/plugins/watcher') do
+    it { should be_directory }
+    it { should be_owned_by 'elasticsearch' }
+  end
+
+  describe command('curl -s localhost:9200/_nodes/plugins?pretty=true -u es_admin:changeMe | grep watcher') do
+    its(:exit_status) { should eq 0 }
+  end
+  
+  #test we haven't installed graph or marvel-agent
+
+  describe file('/usr/share/elasticsearch/plugins/graph') do
+    it { should_not exist }
+  end
+
+  describe command('curl -s localhost:9200/_nodes/plugins?pretty=true -u es_admin:changeMe | grep graph') do
+    its(:exit_status) { should eq 1 }
+  end
+
+  describe file('/usr/share/elasticsearch/plugins/marvel-agent') do
+    it { should_not exist }
+  end
+
+  describe command('curl -s localhost:9200/_nodes/plugins?pretty=true -u es_admin:changeMe | grep marvel-agent') do
+    its(:exit_status) { should eq 1 }
+  end
+
 
   #Test users file, users_roles and roles.yml
   describe file('/etc/elasticsearch/shield_node/shield/users_roles') do

test/integration/multi-2x/serverspec/default_spec.rb

@@ -2,7 +2,7 @@ require 'multi_spec'
 
 
 describe 'Multi Tests v 2.x' do
-  include_examples 'multi::init', "2.3.4", ["kopf","license","marvel-agent"]
+  include_examples 'multi::init', "2.3.4", ["kopf"]
 end
 
 

test/integration/package-2x/serverspec/default_spec.rb

@@ -2,5 +2,5 @@ require 'package_spec'
 
 
 describe 'Package Tests v 2.x' do
-  include_examples 'package::init', "2.3.4", ["kopf","license","marvel-agent"]
+  include_examples 'package::init', "2.3.4", ["kopf"]
 end

test/integration/xpack.yml

@@ -10,6 +10,7 @@
     es_enable_xpack: true
     es_xpack_features:
       - shield
+      - watcher
     es_api_basic_auth_username: es_admin
     es_api_basic_auth_password: changeMe
     es_users: