Update DMon agent package

Older DMon agent was not able to cope with Apache Storm 1.0.x logs. Newly released 0.2.6x version fixed this issue. New version of DMon agent needs to be explicitly informed about the version of Apache Storm that is running on the node, since if the STORM_VERSION environment variable is not set, agent will resort to fetching logs for Apache Storm 0.9.x. Change-Id: If8141381b05fc5ab8f63eae46a56e3932126c59d
dice-project · Oct 4, 2017 · 8b1509d · 8b1509d
1 parent 3ac9948
commit 8b1509d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/cookbooks/dmon_agent/attributes/default.rb b/cookbooks/dmon_agent/attributes/default.rb
@@ -1,9 +1,10 @@
 # General attributes
 default['dmon_agent']['install_dir'] = '/opt/dmon-agent'
 default['dmon_agent']['tarball'] =
-  'https://github.com/dice-project/DICE-Monitoring/archive/v0.2.3.tar.gz'
+  'https://github.com/xlab-si/DICE-Monitoring/releases/download/v0.2.6x/'\
+  'dice-monitoring-0.2.6x.tar.gz'
 default['dmon_agent']['checksum'] =
-  '1d7b6ced81dd19259a69d1620f0eb0c17992102623d8ea7c731391912cfeb43e'
+  '84a5cedb689f778d146ff044295d00522cf7ed88196814058b4d309a906e8396'
 
 # Apache Spark related attributes
 default['dmon_agent']['spark']['graphite']['period'] = 5

diff --git a/cookbooks/dmon_agent/recipes/storm.rb b/cookbooks/dmon_agent/recipes/storm.rb
@@ -5,6 +5,7 @@
 template '/etc/default/dmon-agent.d/storm' do
   source 'service-vars.erb'
   variables env_vars: {
+    'STORM_VERSION' => '1.0',
     'STORM_LOG' => node['storm']['log_dir']
   }
 end

diff --git a/cookbooks/dmon_agent/test/integration/storm/serverspec/storm_spec.rb b/cookbooks/dmon_agent/test/integration/storm/serverspec/storm_spec.rb
@@ -68,5 +68,6 @@
 describe file('/etc/default/dmon-agent.d/storm') do
   it { should exist }
   it { should be_file }
+  it { should contain('STORM_VERSION=1.0') }
   it { should contain('STORM_LOG=/usr/share/storm/logs') }
 end