@@ -1 +1,3 @@ +.loadpath +.project .DS_Store .gitignore @@ -1,52 +1,53 @@ class MemoryUsage < ScoutAgent::Plugin TEST_USAGE = "#{File.basename($0)} max_swap_used MAX_SWAP_USED max_swap_ration MAX_SWAP_RATIO" - UNITS = { "b" => 1, + UNITS = { "b" => 1, "k" => 1024, "m" => 1024 * 1024, "g" => 1024 * 1024 * 1024 } def build_report top_output = `top -#{RUBY_PLATFORM.include?('darwin') ? 'l' : 'n'} 1` - mem = top_output[/^(?:Phys)?Mem:.+/i] or raise "Missing mem" - swap = top_output[/^Swap:.+/i] - - report_memory(mem, "mem") + mem = top_output[/^(?:Phys)?Mem:.+/i] or raise "Missing mem" + swap = top_output[/^Swap:.+/i] + @reports = {} + report_memory(mem, "mem") report_percent("mem") - if swap + if swap report_memory(swap, "swap") report_percent("swap") - if swap_used = reports.last[:swap_used] - ratio = ( swap_used.to_f / reports.last[:mem_used] ).round - - report(:swap_ratio => ratio) - + if swap_used = @reports[:swap_used] + @reports[:swap_ratio] = ratio = ( swap_used.to_f / + @reports[:mem_used] ).round max = @options["max_swap_used"].to_i*UNITS["m"] if max > 0 and swap_used > max - alert "Maximum Swap Exceeded (#{swap_used})", '' + alert "Maximum Swap Exceeded (#{swap_used})",'' end max = @options["max_swap_ratio"].to_i if max > 0 and ratio > max - alert "Maximum Swap Ratio Exceeded (#{ratio})", '' + alert "Maximum Swap Ratio Exceeded (#{ratio})",'' end end end - @report + report(@reports) rescue => e - error "Couldn't use `top` as expected.", "#{e.message}\n#{e.backtrace}" #$!.message + error "Couldn't use `top` as expected.", "#{e.message} ----- #{e.backtrace}" #$!.message end private def report_memory(data, type) data.scan(/(\d+|\d+\.\d+)([bkmg])\s+(\w+)/i) do |amount, unit, label| - report( "#{type}_#{label.downcase}".to_sym => (amount.to_f * UNITS[unit.downcase]).round ) + @reports["#{type}_#{label.downcase}".to_sym] = + (amount.to_f * UNITS[unit.downcase]).round end end def report_percent(type) - used = (reports.last["#{type}_used".to_sym]) or return - free = (reports.last["#{type}_free".to_sym]) or return - report( "#{type}_used_percent".to_sym => (used.to_f / (used + free) * 100).round ) + used = @reports["#{type}_used".to_sym] or return + free = @reports["#{type}_free".to_sym] or return + @reports["#{type}_used_percent".to_sym] = + (used.to_f / (used + free) * 100).round end end + \ No newline at end of file memory_usage/memory_usage.rb d3742ec4cd16267825514ff79a77ab88fb41d74f Andre Lewis andre@highgroove.com http://github.com/highgroove/scout-plugins/commit/f8a0099eb938261163f524319c5c5a8767aecfca f8a0099eb938261163f524319c5c5a8767aecfca 2009-03-04T15:13:04-08:00 2009-03-04T15:13:04-08:00 memory usage change ... but still not working with new agent cb75a5816f2b9f53dde991bbc75ed124f557ec4f Andre Lewis andre@highgroove.com