Fix api munin plugins

[chef.git] / cookbooks / munin / files / default / plugins / api_calls_

diff --git a/cookbooks/munin/files/default/plugins/api_calls_ b/cookbooks/munin/files/default/plugins/api_calls_
index 8cf836d79b1fbaacba95e4883d4b09039af7fa5e..74c5bbe16895dc53d5e28f6656edbc8f22242b57 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/api_calls_
+++ b/cookbooks/munin/files/default/plugins/api_calls_
@@ -1,20 +1,20 @@
 #!/usr/bin/ruby
 
 #!/usr/bin/ruby
 

-require 'rubygems'
-require 'date'
-require 'hpricot'
-require 'open-uri'
+require "rubygems"
+require "date"
+require "hpricot"
+require "open-uri"

 
 def uris_from_status(server)
   file = open("http://#{server}/server-status").read
   doc = Hpricot.parse(file)
 
 def uris_from_status(server)
   file = open("http://#{server}/server-status").read
   doc = Hpricot.parse(file)

-  tables = doc / 'table'
-  rows = (tables[0] / 'tr')[1..-1]
-  data = rows.collect {|r| (r  / 'td').collect {|x| x.inner_html} }
+  tables = doc / "table"
+  rows = (tables[1] / "tr")[1..-1]
+  data = rows.collect { |r| (r  / "td").collect(&:inner_html) }

   # filter where the PID is numeric, status is 'W' and host matches the server
   # filter where the PID is numeric, status is 'W' and host matches the server

-  matching_data = data.select {|r| (r[1].to_i > 0) && r[3].match(/W/) && r[11].match(server)}
+  matching_data = data.select { |r| r[1].to_i > 0 && r[3].match(/W/) && r[11].match(server) }

   # return only the URI part
   # return only the URI part

-  matching_data.collect {|r| r[12]}
+  matching_data.collect { |r| r[12] }

 end
 
 CALL_TYPES = {
 end
 
 CALL_TYPES = {


@@ -32,35 +32,34 @@ def categorise_uri(line)
   uri = line.split(" ")[1]
 
   case uri
   uri = line.split(" ")[1]
 
   case uri

-  when /api\/0\.6\/map/ then :map
-  when /api\/0\.6\/changeset\/[0-9]*\/upload/ then :upload
-  when /api\/0\.6\/amf/ then :amf
-  when /api\/0\.6\/(node|way|relation)\/[0-9]*\/history/ then :history
-  when /api\/0\.6\/(node|way|relation)\/[0-9]*\/full/ then :full
-  when /api\/0\.6\/trackpoints/ then :trkpts
-  when /api\/0\.6\// then :other
+  when %r{api/0\.6/map} then :map
+  when %r{api/0\.6/changeset/[0-9]*/upload} then :upload
+  when %r{api/0\.6/amf} then :amf
+  when %r{api/0\.6/(node|way|relation)/[0-9]*/history} then :history
+  when %r{api/0\.6/(node|way|relation)/[0-9]*/full} then :full
+  when %r{api/0\.6/trackpoints} then :trkpts
+  when %r{api/0\.6/} then :other

   else :web
   end
 end
 
   else :web
   end
 end
 

-server = $0.match("api_calls_(.*)")[1]
+server = $PROGRAM_NAME.match("api_calls_(.*)")[1]

 
 

-if ARGV[0] == 'config'
+if ARGV[0] == "config"

   puts "graph_title Active requests"
   puts "graph_vlabel Number of requests"
   puts "graph_category api"
   CALL_TYPES.each { |k, v| puts "#{k}.label #{v}" }
 
 else
   puts "graph_title Active requests"
   puts "graph_vlabel Number of requests"
   puts "graph_category api"
   CALL_TYPES.each { |k, v| puts "#{k}.label #{v}" }
 
 else

-  counts = uris_from_status(server).
-      collect {|x| categorise_uri(x)}.
-      inject(Hash.new) do |h, e|
-    if h.has_key? e
+  counts = uris_from_status(server)
+           .collect { |x| categorise_uri(x) }
+           .each_with_object({}) do |e, h|
+    if h.key? e

       h[e] += 1
     else
       h[e] = 1
     end
       h[e] += 1
     else
       h[e] = 1
     end

-    h

   end
 
   CALL_TYPES.keys.each do |type|
   end
 
   CALL_TYPES.keys.each do |type|