munin_rake_processes 0.0.2 → 0.0.3

data/lib/munin/rake_processes/cpu.rb

@@ -4,19 +4,21 @@ module Munin
 
       def config
         puts <<-CONFIG
+graph_args --lower-limit 0 --upper-limit 100
 graph_category #{graph_category}
-graph_info The CPU usage of Rake processes currently running - (possibly from cron)
-graph_title CPU usage of Rake Processes
-graph_vlabel CPU usage of Rake Processes
+graph_info The % of CPU currently used by each running Rake processes - (possibly from cron)
+graph_scale no
+graph_title Current CPU utilization of Rake Processes
+graph_vlabel Percent
         CONFIG
-        rake_processes.each_key do |key|
-          puts "#{key}_CPU.label #{key}_CPU"
+        rake_processes.each do |key, values|
+          puts "#{key}.label #{values[:label]}"
         end
       end
 
       def run
-        rake_processes.each do |cmd, values|
-          puts "#{cmd}_CPU.value #{values[:cpu]}"
+        rake_processes.each do |key, values|
+          puts "#{key}.value #{values[:cpu]}"
         end
       end
     end

data/lib/munin/rake_processes/cpu_time.rb

@@ -5,18 +5,18 @@ module Munin
       def config
         puts <<-CONFIG
 graph_category #{graph_category}
-graph_info The CPU time consumed of Rake processes currently running - (possibly from cron)
-graph_title CPU Time of Rake Processes
-graph_vlabel CPU Time of Rake Processes
+graph_info The seconds of cumulative CPU time consumed by each Rake processes
+graph_title Cumulative CPU Time of Rake Processes
+graph_vlabel Seconds
         CONFIG
-        rake_processes.each_key do |key|
-          puts "#{key}_TIME.label #{key}_TIME"
+        rake_processes.each do |key, values|
+          puts "#{key}.label #{values[:label]}"
         end
       end
 
       def run
-        rake_processes.each do |cmd, values|
-          puts "#{cmd}_TIME.value #{values[:time]}"
+        rake_processes.each do |key, values|
+          puts "#{key}.value #{values[:time]}"
         end
       end
     end

data/lib/munin/rake_processes/memory.rb

@@ -4,19 +4,21 @@ module Munin
 
       def config
         puts <<-CONFIG
+graph_args --lower-limit 0 --upper-limit 100
 graph_category #{graph_category}
-graph_info The Memory usage of Rake processes currently running - (possibly from cron)
-graph_title Memory usage of Rake Processes
-graph_vlabel Memory usage of Rake Processes
+graph_info The % of Memory currently used by each running Rake processes - (possibly from cron)
+graph_scale no
+graph_title Current Memory utilization of Rake Processes
+graph_vlabel Percent
         CONFIG
-        rake_processes.each_key do |key|
-          puts "#{key}_Memory.label #{key}_Memory"
+        rake_processes.each do |key, values|
+          puts "#{key}.label #{values[:label]}"
         end
       end
 
       def run
-        rake_processes.each do |cmd, values|
-          puts "#{cmd}_Memory.value #{values[:memory]}"
+        rake_processes.each do |key, values|
+          puts "#{key}.value #{values[:memory]}"
         end
       end
     end

data/lib/munin/rake_processes/plugin.rb

@@ -28,10 +28,11 @@ module Munin
           rake_ps_lines.each do |ps_line|
             user, pid, cpu, memory, cpu_time, cmd = ps_line.split ' ', 6
             cmd =~ /rake([^-]+)/
-            rake_cmd = $1.split('-').first.strip.gsub(/[^\w]/, '_')
-            label = "#{user}_#{pid}_#{rake_cmd}"
+            rake_cmd = $1.split('-').first.strip
+            key = "#{user}_#{pid}_#{rake_cmd.gsub(/[^\w]/, '_')}"
+            label = "#{user} (#{pid}) #{rake_cmd}"
             time_in_seconds = ps_time_to_seconds(cpu_time)
-            _rake_processes[label] = {:cpu => cpu, :memory => memory, :time => time_in_seconds}
+            _rake_processes[key] = {:cpu => cpu, :memory => memory, :time => time_in_seconds, :label => label}
           end
           _rake_processes
         end

data/lib/munin/rake_processes/version.rb

@@ -1,5 +1,5 @@
 module Munin
   module RakeProcesses
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/munin_rake_processes.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.post_install_message = <<-POST_INSTALL_MESSAGE
   #{"*" * 80}
 
-    To install these munin plugins and start monitoring your rake processes run
+      To install these munin plugins and start monitoring your rake processes run
 
       munin_rake_processes_installer
 

data/spec/munin/rake_processes/cpu_spec.rb

@@ -15,13 +15,15 @@ describe Munin::RakeProcesses::Cpu do
 
     subject { captured_output }
     it { should == <<-OUTPUT
+graph_args --lower-limit 0 --upper-limit 100
 graph_category RakeProcesses
-graph_info The CPU usage of Rake processes currently running - (possibly from cron)
-graph_title CPU usage of Rake Processes
-graph_vlabel CPU usage of Rake Processes
-some_user_25963_load_users_CPU.label some_user_25963_load_users_CPU
-some_user_27461_load_users_CPU.label some_user_27461_load_users_CPU
-some_user_27499_cron_CPU.label some_user_27499_cron_CPU
+graph_info The % of CPU currently used by each running Rake processes - (possibly from cron)
+graph_scale no
+graph_title Current CPU utilization of Rake Processes
+graph_vlabel Percent
+some_user_25963_users_load.label some_user (25963) users:load
+some_user_27461_users_load.label some_user (27461) users:load
+some_user_27499_cron.label some_user (27499) cron
 OUTPUT
     }
   end
@@ -33,9 +35,9 @@ OUTPUT
 
     subject { captured_output }
     it { should == <<-OUTPUT
-some_user_25963_load_users_CPU.value 5.0
-some_user_27461_load_users_CPU.value 0.0
-some_user_27499_cron_CPU.value 90.0
+some_user_25963_users_load.value 5.0
+some_user_27461_users_load.value 0.0
+some_user_27499_cron.value 90.0
 OUTPUT
     }
   end

data/spec/munin/rake_processes/cpu_time_spec.rb

@@ -16,12 +16,12 @@ describe Munin::RakeProcesses::CpuTime do
     subject { captured_output }
     it { should == <<-OUTPUT
 graph_category RakeProcesses
-graph_info The CPU time consumed of Rake processes currently running - (possibly from cron)
-graph_title CPU Time of Rake Processes
-graph_vlabel CPU Time of Rake Processes
-some_user_25963_load_users_TIME.label some_user_25963_load_users_TIME
-some_user_27461_load_users_TIME.label some_user_27461_load_users_TIME
-some_user_27499_cron_TIME.label some_user_27499_cron_TIME
+graph_info The seconds of cumulative CPU time consumed by each Rake processes
+graph_title Cumulative CPU Time of Rake Processes
+graph_vlabel Seconds
+some_user_25963_users_load.label some_user (25963) users:load
+some_user_27461_users_load.label some_user (27461) users:load
+some_user_27499_cron.label some_user (27499) cron
 OUTPUT
     }
   end
@@ -33,9 +33,9 @@ OUTPUT
 
     subject { captured_output }
     it { should == <<-OUTPUT
-some_user_25963_load_users_TIME.value 8448.69
-some_user_27461_load_users_TIME.value 0.0
-some_user_27499_cron_TIME.value 2.3
+some_user_25963_users_load.value 8448.69
+some_user_27461_users_load.value 0.0
+some_user_27499_cron.value 2.3
 OUTPUT
     }
   end

data/spec/munin/rake_processes/memory_spec.rb

@@ -15,13 +15,15 @@ describe Munin::RakeProcesses::Memory do
 
     subject { captured_output }
     it { should == <<-OUTPUT
+graph_args --lower-limit 0 --upper-limit 100
 graph_category RakeProcesses
-graph_info The Memory usage of Rake processes currently running - (possibly from cron)
-graph_title Memory usage of Rake Processes
-graph_vlabel Memory usage of Rake Processes
-some_user_25963_load_users_Memory.label some_user_25963_load_users_Memory
-some_user_27461_load_users_Memory.label some_user_27461_load_users_Memory
-some_user_27499_cron_Memory.label some_user_27499_cron_Memory
+graph_info The % of Memory currently used by each running Rake processes - (possibly from cron)
+graph_scale no
+graph_title Current Memory utilization of Rake Processes
+graph_vlabel Percent
+some_user_25963_users_load.label some_user (25963) users:load
+some_user_27461_users_load.label some_user (27461) users:load
+some_user_27499_cron.label some_user (27499) cron
 OUTPUT
     }
   end
@@ -33,9 +35,9 @@ OUTPUT
 
     subject { captured_output }
     it { should == <<-OUTPUT
-some_user_25963_load_users_Memory.value 0.2
-some_user_27461_load_users_Memory.value 0.1
-some_user_27499_cron_Memory.value 0.3
+some_user_25963_users_load.value 0.2
+some_user_27461_users_load.value 0.1
+some_user_27499_cron.value 0.3
 OUTPUT
     }
   end

data/spec/munin/rake_processes/plugin_spec.rb

@@ -10,14 +10,14 @@ describe Munin::RakeProcesses::Plugin do
     its(:size) { should == 3 }
 
     describe 'old load_users' do
-      subject { rake_processes['some_user_25963_load_users'] }
+      subject { rake_processes['some_user_25963_users_load'] }
       its([:cpu   ]) { should == '5.0'   }
       its([:memory]) { should == '0.2'   }
       its([:time  ]) { should == 8448.69 }
     end
 
     describe 'hung old load_users' do
-      subject { rake_processes['some_user_27461_load_users'] }
+      subject { rake_processes['some_user_27461_users_load'] }
       its([:cpu   ]) { should == '0.0' }
       its([:memory]) { should == '0.1' }
       its([:time  ]) { should == 0.0   }

data/spec/spec_helper.rb

@@ -8,8 +8,8 @@ end
 
 def stub_ps
   Munin::RakeProcesses::Plugin.stub(:'`').and_return <<-PS_STRING
-some_user      25963   5.0  0.2  140:48.69 ruby /Users/alex/.rvm/gems/ruby-1.8.7-p334/bin/rake load_users
-some_user      27461   0.0  0.1   00:00:00 ruby /Users/alex/.rvm/gems/ruby-1.8.7-p334/bin/rake load_users
+some_user      25963   5.0  0.2  140:48.69 ruby /Users/alex/.rvm/gems/ruby-1.8.7-p334/bin/rake users:load
+some_user      27461   0.0  0.1   00:00:00 ruby /Users/alex/.rvm/gems/ruby-1.8.7-p334/bin/rake users:load
 some_user      27499  90.0  0.3    0:02.30 ruby /Users/alex/.rvm/gems/ruby-1.8.7-p334/bin/rake cron
 PS_STRING
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: munin_rake_processes
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70140733836500 !ruby/object:Gem::Requirement
+  requirement: &70155678730500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70140733836500
+  version_requirements: *70155678730500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70140733834760 !ruby/object:Gem::Requirement
+  requirement: &70155678729820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70140733834760
+  version_requirements: *70155678729820
 description: Munin tasks for monitoring rake processes
 email:
 - alex@alexrothenberg.com
@@ -74,7 +74,7 @@ files:
 homepage: ''
 licenses: []
 post_install_message: ! "  ********************************************************************************\n\n
-  \   To install these munin plugins and start monitoring your rake processes run\n\n
+  \     To install these munin plugins and start monitoring your rake processes run\n\n
   \     munin_rake_processes_installer\n\n    Enjoy!\n\n  ********************************************************************************\n"
 rdoc_options: []
 require_paths: