entombedvirus-munin_manager 0.0.2 → 0.0.3

data/Rakefile

@@ -1,5 +1,5 @@
 require 'echoe'
-Echoe.new('munin_manager', '0.0.2') do |s|
+Echoe.new('munin_manager', '0.0.3') do |s|
   s.description = "Tool to maintain and install munin plugins written in Ruby"
   s.author = "Rohith Ravi"
   s.email = "entombedvirus@gmail.com"

data/bin/munin_manager

@@ -11,10 +11,12 @@ options = OpenStruct.new
 options.plugin_dir = "/etc/munin/plugins"
 
 parser = OptionParser.new do |opts|
-  opts.banner = "Usage: munin_manager <command> [<plugin_name>[:<symlink_name>]] [options]"
+  opts.banner = "Usage: munin_manager <command>  [options]"
   opts.separator ""
   
   opts.separator "Commands:"
+  opts.separator "PLUGIN_NAME is of the form <plugin>[:<symlink>]"
+  opts.separator ""
   
   opts.on("-l", "--list", "List available plugins to install") do
     buffer = []
@@ -40,26 +42,17 @@ parser = OptionParser.new do |opts|
     end
   end
   
-  opts.on("-i", "--install PLUGIN_NAME [PLUGIN_NAME]", Array,
+  opts.on("-i", "--install PLUGIN_NAME[,PLUGIN_NAME]", Array,
     "Installs a plugin by creating a symlink in '%s'" % options.plugin_dir) do |names|
-    if options.plugins = MuninManager::Plugins[*names]
       options.action = :install
       options.plugin_names = names
-    else
-      puts "'%s' plugin not found" % names.join
-    end
   end
   
-  opts.on("-u", "--uninstall PLUGIN_NAME [PLUGIN_NAME]", Array,
+  opts.on("-u", "--uninstall PLUGIN_NAME[,PLUGIN_NAME]", Array,
     "Removes plugins from '%s'" % options.plugin_dir,
     "if it is a symlink") do |names|
-    
-    if options.plugins = MuninManager::Plugins[*names]
       options.action = :uninstall      
       options.plugin_names = names
-    else
-      puts "'#{names}' plugin not found"
-    end
   end
 
   opts.separator ""
@@ -85,7 +78,18 @@ parser.parse!(ARGV)
 options.freeze!
 
 case options.action
-when :uninstall, :install
-  plugins = Array(MuninManager::Plugins[*options.plugin_names])
-  plugins.each {|p| p.send(options.action, options)}
+when :install, :uninstall
+  options.plugin_names.each do |plugin_name|
+    plugin_klass = MuninManager::Plugins.search(plugin_name)
+    
+    unless plugin_klass
+      STDERR.puts "ERROR: Matching plugin not found for '%s'" % plugin_name
+      exit(1)
+    end
+
+    new_options = options.dup
+    new_options.install_name = plugin_name
+
+    plugin_klass.send(options.action, new_options)
+  end
 end

data/lib/munin_manager/acts_as_munin_plugin.rb

@@ -23,24 +23,29 @@ module MuninManager
           downcase
       end
 
-      def help_text
+      def help_text(options = {})
         # Any general info concerning the plugin. Should be overriden by included class
       end
 
       def install(options)
-        symlink = File.join(options.plugin_dir, plugin_name)
+        install_as = options.install_name.split(":").last
+        symlink = File.join(options.plugin_dir, install_as)
         runner = File.join(File.dirname(__FILE__), "..", "..", "bin", "runner")
         runner = File.expand_path(runner)
 
-        if File.exists?(symlink) && !options.force
-          STDERR.puts "'%s' already exists. Please specify --force option to overwrite" % symlink
-          return
+        if File.exists?(symlink)
+          if options.force
+            File.unlink(symlink)
+          else
+            STDERR.puts "'%s' already exists. Please specify --force option to overwrite" % symlink
+            return
+          end
         end
 
         STDOUT.puts "Installing '%s' at '%s'" % [plugin_name, symlink]
         FileUtils.ln_sf(runner, symlink)
 
-        STDOUT.puts help_text
+        STDOUT.puts help_text(:symlink => install_as)
 
       rescue Errno::EACCES
         STDERR.puts "ERROR: Permission denied while attempting to install to '%s'" % symlink
@@ -48,7 +53,8 @@ module MuninManager
 
       # Default uninstaller. Override in included classes if the default is not sufficient
       def uninstall(options)
-        symlink = File.join(options.plugin_dir, plugin_name)
+        install_as = options.install_name.split(":").last
+        symlink = File.join(options.plugin_dir, install_as)
 
         unless File.exists?(symlink)
           STDERR.puts "'%s' does not seem to exist. Aborting..." % symlink
@@ -62,6 +68,8 @@ module MuninManager
 
         STDOUT.puts "Removing '%s'..." % symlink
         File.unlink(symlink)
+      rescue Errno::EACCES
+        STDERR.puts "ERROR: Permission denied while attempting to uninstall '%s'" % symlink
       end
     end
 

data/lib/munin_manager/plugins/rails_response_time.rb

@@ -1,6 +1,13 @@
 module MuninManager
   class Plugins::RailsResponseTime < LogReader
     include ActsAsMuninPlugin
+    attr_accessor :search_pattern
+
+    def initialize(log_file, options = {})
+      super(log_file)
+      @search_pattern = options[:search_pattern] || /.*/
+      @search_pattern = Regexp.new(@search_pattern) if @search_pattern.is_a?(String)
+    end
 
     def data
       @data ||= Hash.new {|h, k| h[k] = Array.new}
@@ -13,10 +20,12 @@ module MuninManager
 
         if line.starts_with?("Processing ")
           cols = line.split(/\s+/)
-          current_action = cols[1]
+          current_action = cols[1] if self.search_pattern.match(cols[1])
+
         elsif line.starts_with?("Completed in ") && !current_action.nil?
           cols = line.split(/\s+/)
           data[current_action] << cols[2].to_f
+          current_action = nil
         end
 
       end
@@ -56,7 +65,7 @@ module MuninManager
       log_file = ENV['log_file'] || "/var/log/rails.log"
       allowed_commands = ['config']
 
-      rails = new(log_file)
+      rails = new(log_file, :search_pattern => ENV['search_pattern'])
 
       if cmd = ARGV[0] and allowed_commands.include? cmd then
         puts rails.send(cmd.to_sym)
@@ -66,7 +75,7 @@ module MuninManager
       end
     end
 
-    def self.help_text
+    def self.help_text(options = {})
       %Q{
 #{plugin_name.capitalize} Munin Plugin
 ===========================
@@ -74,8 +83,9 @@ module MuninManager
 Please remember to add something like the lines below to /etc/munin/plugin-conf.d/munin-node
 if the rails log file is not at /var/log/rails.log
 
-[#{plugin_name}]
+[#{options[:symlink] || plugin_name}]
 env.log_file /var/log/custom/rails.log
+env.search_pattern UsersController.*
 
 Also, make sure that the '/var/lib/munin/plugin-state' is writable by munin.
 

data/lib/munin_manager/plugins.rb

@@ -15,10 +15,15 @@ module MuninManager
     
     def [](*names)
       if names.length == 1
-        return detect {|plugin| plugin.plugin_name == names.first}
+        return detect {|plugin_klass| plugin_klass.plugin_name == names.first}
       end
       
       names.map {|name| self[name]}
     end
+
+    def search(name)
+      str = name.to_s.split(':', 2).first
+      detect {|plugin_klass| plugin_klass.plugin_name.starts_with?(str)}
+    end
   end
 end

data/munin_manager.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{munin_manager}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rohith Ravi"]
-  s.date = %q{2009-03-10}
+  s.date = %q{2009-04-09}
   s.description = %q{Tool to maintain and install munin plugins written in Ruby}
   s.email = %q{entombedvirus@gmail.com}
   s.executables = ["munin_manager", "runner"]
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{munin_manager}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Tool to maintain and install munin plugins written in Ruby}
-  s.test_files = ["test/haproxy_response_time_test.rb", "test/log_reader_test.rb", "test/test_helper.rb", "test/rails_response_time_test.rb"]
+  s.test_files = ["test/haproxy_response_time_test.rb", "test/log_reader_test.rb", "test/rails_response_time_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/rails_response_time_test.rb

@@ -13,8 +13,12 @@ class RailsResponseTimeTest < Test::Unit::TestCase
   rescue
     # Do nothing
   end
+
+  def test_has_default_search_pattern
+    assert_kind_of Regexp, @reader.search_pattern
+  end
   
-  def test_parsing
+  def test_parsing_with_default_search_pattern
     @reader.collect!
     assert @reader.data.keys.length > 0
 
@@ -23,6 +27,15 @@ class RailsResponseTimeTest < Test::Unit::TestCase
     end
   end
 
+  def test_parsing_with_non_default_search_string
+    @reader.search_pattern = /UsersController.*/
+    @reader.collect!
+
+    @reader.data.each_pair do |action_name, time|
+      assert_not_nil /UsersController.*/.match(action_name), "'%s' does not match search pattern" % action_name
+    end
+  end
+
   def test_config_parses_log
     assert @reader.config.split("\n").select {|line| not line.starts_with?("graph_")}.length > 0
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: entombedvirus-munin_manager
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Rohith Ravi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-10 00:00:00 -07:00
+date: 2009-04-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -84,5 +84,5 @@ summary: Tool to maintain and install munin plugins written in Ruby
 test_files: 
 - test/haproxy_response_time_test.rb
 - test/log_reader_test.rb
-- test/test_helper.rb
 - test/rails_response_time_test.rb
+- test/test_helper.rb