munin_manager 1.2.2 → 1.2.3

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/bin/munin_manager

@@ -11,11 +11,10 @@ options = OpenStruct.new
 options.plugin_dir = "/etc/munin/plugins"
 
 parser = OptionParser.new do |opts|
-  opts.banner = "Usage: munin_manager <command>  [options]"
+  opts.banner = "Usage: munin_manager [options]"
   opts.separator ""
   
-  opts.separator "Commands:"
-  opts.separator "PLUGIN_NAME is of the form <plugin>[:<symlink>]"
+  opts.separator "PLUGIN_NAME is of the form <plugin>[.<symlink name>]"
   opts.separator ""
   
   opts.on("-l", "--list", "List available plugins to install") do

data/lib/munin_manager/acts_as_munin_plugin.rb

@@ -28,7 +28,7 @@ module MuninManager
       end
 
       def install(options)
-        install_as = options.install_name.split(":").last
+        install_as = options.install_name
         symlink = File.join(options.plugin_dir, install_as)
         runner = File.join(File.dirname(__FILE__), "..", "..", "bin", "runner")
         runner = File.expand_path(runner)
@@ -53,7 +53,7 @@ module MuninManager
 
       # Default uninstaller. Override in included classes if the default is not sufficient
       def uninstall(options)
-        install_as = options.install_name.split(":").last
+        install_as = options.install_name
         symlink = File.join(options.plugin_dir, install_as)
 
         unless File.exists?(symlink)

data/lib/munin_manager/plugins.rb

@@ -22,7 +22,7 @@ module MuninManager
     end
 
     def search(name)
-      str = name.to_s.split(':', 2).first
+      str = name.to_s.split('.', 2).first
       detect {|plugin_klass| plugin_klass.plugin_name.starts_with?(str)}
     end
   end

data/lib/munin_manager/plugins/haproxy_app_response_time.rb

@@ -2,6 +2,23 @@ module MuninManager
   class Plugins::HaproxyAppResponseTime < LogReader
     include ActsAsMuninPlugin
 
+    EXTRACTORS = {
+      :client_connect => lambda {|line| line.split(/\s+/)[9].split("/")[0].to_f},
+      :waiting_in_queue => lambda {|line| line.split(/\s+/)[9].split("/")[1].to_f},
+      :server_connect => lambda {|line| line.split(/\s+/)[9].split("/")[2].to_f},
+      :server_response => lambda {|line| line.split(/\s+/)[9].split("/")[3].to_f},
+      :rails_action => lambda {|line| (line.match(/\{([0-9.]+)\}/).captures[0].to_f * 1000) rescue 0},
+      :total => lambda {|line| line.split(/\s+/)[9].split("/")[4].to_f},
+    }
+    
+    def initialize(logfile, options)
+      @measure = options[:measure].to_sym
+      raise ArgumentError, 
+        "I do not know how to measure `%s`" % options[:measure] unless EXTRACTORS.key?(@measure)
+        
+      super(logfile)
+    end
+    
     def data
       @data ||= Hash.new {|h, k| h[k] = Hash.new{|d,v| d[v] = Array.new}}
     end
@@ -13,13 +30,8 @@ module MuninManager
         server, port = chunks[8].split(":") rescue []
         server_name = server.split("/")[1] rescue nil
         next if server_name.nil?
-        timers = chunks[9].split("/") rescue []
-        data[server_name][:client_connect] << timers[0].to_f
-        data[server_name][:waiting_in_queue] << timers[1].to_f
-        data[server_name][:server_connect] << timers[2].to_f
-        data[server_name][:server_response] << timers[3].to_f
-        data[server_name][:rails_action] << line.match(/\{([0-9.]+)\}/).captures[0].to_f rescue 0
-        data[server_name][:total] << timers[4].to_f
+        
+        data[server_name][@measure] << EXTRACTORS[@measure].call(line)
       end
     end
 
@@ -45,10 +57,11 @@ module MuninManager
         server_name = server.split("/")[1] rescue nil
         server_hash[server_name] = '' unless server_name.nil?
       end
-      default = [:client_connect,:waiting_in_queue, :server_connect, :server_response, :rails_action, :total]
+      
+      default = Array(@measure)
             
       config_text = <<-LABEL                     
-graph_title HAProxy Response Breakdown
+graph_title HAProxy App Server #{@measure}
 graph_vlabel time (secs)
 graph_category Haproxy
       LABEL
@@ -67,7 +80,12 @@ graph_category Haproxy
       log_file = ENV['log_file'] || "/var/log/haproxy.log"
       allowed_commands = ['config']
 
-      haproxy = new(log_file)
+      measure = ENV['measure']
+      # Try to figure out what we're trying to measure from the symlink name
+      measure ||= File.basename($0).split(".", 2).last
+      measure = nil unless EXTRACTORS.key?(measure.to_sym)
+      
+      haproxy = new(log_file, :measure => measure || 'total')
 
       if cmd = ARGV[0] and allowed_commands.include? cmd then
         puts haproxy.send(cmd.to_sym)
@@ -77,7 +95,7 @@ graph_category Haproxy
       end
     end
 
-    def self.help_text
+    def self.help_text(options = {})
       %Q{
 #{plugin_name.capitalize} Munin Plugin
 ===========================
@@ -85,7 +103,7 @@ graph_category Haproxy
 Please remember to add something like the lines below to /etc/munin/plugin-conf.d/munin-node
 if the haproxy log file is not at /var/log/haproxy.log
 
-[#{plugin_name}]
+[#{options[:symlink]}]
 env.log_file /var/log/custom/haproxy.log
 
 Also, make sure that the '/var/lib/munin/plugin-state' is writable by munin.

data/lib/munin_manager/plugins/haproxy_response_time.rb

@@ -60,7 +60,7 @@ total.label Total Response Time
       end
     end
 
-    def self.help_text
+    def self.help_text(options = {})
       %Q{
 #{plugin_name.capitalize} Munin Plugin
 ===========================
@@ -68,7 +68,7 @@ total.label Total Response Time
 Please remember to add something like the lines below to /etc/munin/plugin-conf.d/munin-node
 if the haproxy log file is not at /var/log/haproxy.log
 
-[#{plugin_name}]
+[#{options[:symlink]}]
 env.log_file /var/log/custom/haproxy.log
 
 Also, make sure that the '/var/lib/munin/plugin-state' is writable by munin.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: munin_manager
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Rohith Ravi