Update DMon version

Default attributes now point to latest master of DMon. This new
version is also installed in new directory as upstream changes in
install scripts indicate.

Change-Id: I8a3adf20112deaea75b20730169a59c2bd535736

cookbooks/dmon/attributes/default.rb

@@ -23,10 +23,10 @@
 
 default['dmon']['tarball'] =
   'http://github.com/dice-project/DICE-Monitoring/archive/'\
-  'e5f1bbe0762d38620aaec4cc8a02d59770cd8cb4.tar.gz'
+  '3487474c775b8ce5d04a5b3826597c4dd1d65721.tar.gz'
 default['dmon']['checksum'] =
-  '15c390faf5de54e0b0ab4955eb9ada07c615f80dbafec9251d7eddc29fed6033'
-default['dmon']['install_dir'] = '/opt/IeAT-DICE-Repository'
+  'a1b1a56a26eafde0601fe19ebdf70d3d199060102519874c3dfa78b86b068dd3'
+default['dmon']['install_dir'] = '/opt/DICE-Monitoring'
 
 default['dmon']['port'] = '5001'
 

cookbooks/dmon/test/integration/elk/serverspec/elk_spec.rb

@@ -12,22 +12,22 @@
   it { should have_login_shell '/bin/bash' }
 end
 
-describe file('/opt/IeAT-DICE-Repository') do
+describe file('/opt/DICE-Monitoring') do
   it { should be_directory }
   it { should be_owned_by 'ubuntu' }
 end
 
-describe file('/opt/IeAT-DICE-Repository/src/logs/dmon-controller.log') do
+describe file('/opt/DICE-Monitoring/src/logs/dmon-controller.log') do
   it { should be_file }
   it { should be_owned_by 'ubuntu' }
 end
 
-describe file('/opt/IeAT-DICE-Repository/dmonEnv') do
+describe file('/opt/DICE-Monitoring/dmonEnv') do
   it { should be_directory }
   it { should be_owned_by 'ubuntu' }
 end
 
-describe command('. /opt/IeAT-DICE-Repository/dmonEnv/bin/activate') do
+describe command('. /opt/DICE-Monitoring/dmonEnv/bin/activate') do
   its(:exit_status) { should eq 0 }
 end
 
@@ -53,7 +53,7 @@
   it { should contain('diceMonit').from(/cluster.name:/).to(/#/) }
   it { should contain('esCoreMaster').from(/node.name:/).to(/#/) }
   it do
-    should contain('/opt/IeAT-DICE-Repository/src/logs')
+    should contain('/opt/DICE-Monitoring/src/logs')
       .from(/path.logs:/).to(/#/)
   end
 end
@@ -69,11 +69,11 @@
   it { should contain('127.0.0.1').from(/elasticsearch.url:/).to(/#/) }
   it { should contain('9200').from(/elasticsearch.url:/).to(/#/) }
   it do
-    should contain('/opt/IeAT-DICE-Repository/src/pid/kibana.pid')
+    should contain('/opt/DICE-Monitoring/src/pid/kibana.pid')
       .from(/pid.file:/).to(/#/)
   end
   it do
-    should contain('/opt/IeAT-DICE-Repository/src/logs/kibana.log')
+    should contain('/opt/DICE-Monitoring/src/logs/kibana.log')
       .from(/logging.dest:/).to(/#/)
   end
 end
@@ -83,13 +83,13 @@
   it { should be_owned_by 'ubuntu' }
 end
 
-describe file('/opt/IeAT-DICE-Repository/src/logs/logstash.log') do
+describe file('/opt/DICE-Monitoring/src/logs/logstash.log') do
   it { should be_file }
   it { should be_owned_by 'ubuntu' }
 end
 
-private_key = '/opt/IeAT-DICE-Repository/src/keys/logstash-forwarder.key'
-certificate = '/opt/IeAT-DICE-Repository/src/keys/logstash-forwarder.crt'
+private_key = '/opt/DICE-Monitoring/src/keys/logstash-forwarder.key'
+certificate = '/opt/DICE-Monitoring/src/keys/logstash-forwarder.crt'
 
 describe x509_certificate(certificate) do
   it { should be_certificate }