Fix munin replication plugin to work with osmium based state

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

diff --git a/cookbooks/munin/files/default/plugins/api_waits_ b/cookbooks/munin/files/default/plugins/api_waits_
index d072b89d58f8f6be2ca306162df62849e5044d3e..f575dad1c6df39a3b0e36df4ebe4e35822b6a3c7 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/api_waits_
+++ b/cookbooks/munin/files/default/plugins/api_waits_
@@ -12,7 +12,7 @@ def uri_and_times_from_status(server)
   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
   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

-  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.positive? && r[3].match(/W/) && r[11].match(server) }

   # return URI and number of seconds processing for each request
   matching_data.collect { |r| [r[12], r[5].to_i] }
 end
   # return URI and number of seconds processing for each request
   matching_data.collect { |r| [r[12], r[5].to_i] }
 end


@@ -26,7 +26,7 @@ CALL_TYPES = {
   :trkpts => "GPX trackpoints calls",
   :web => "Web site traffic",
   :other => "Other API calls"
   :trkpts => "GPX trackpoints calls",
   :web => "Web site traffic",
   :other => "Other API calls"

-}
+}.freeze

 
 def categorise_uri(line)
   uri = line.split(" ")[1]
 
 def categorise_uri(line)
   uri = line.split(" ")[1]


@@ -63,9 +63,9 @@ else
     end
   end
 
     end
   end
 

-  CALL_TYPES.keys.each do |type|
+  CALL_TYPES.each_key do |type|

     count = counts[type] || [0]
     count = counts[type] || [0]

-    avg = count.inject(0) { |a, e| a + e } / (1.0 * count.length)
+    avg = count.inject(0) { |acc, elem| acc + elem } / (1.0 * count.length)

     puts "#{type}.value #{avg}"
   end
 end
     puts "#{type}.value #{avg}"
   end
 end