X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6f0a393ef9191a70d9c5040ed35f6ee4ca33db8b..3720032b9487e8cdd89eed9461ddeeac2c3cd764:/cookbooks/munin/files/default/plugins/api_waits_?ds=sidebyside

diff --git a/cookbooks/munin/files/default/plugins/api_waits_ b/cookbooks/munin/files/default/plugins/api_waits_
index e4a991a4c..3d511ec8c 100755
--- a/cookbooks/munin/files/default/plugins/api_waits_
+++ b/cookbooks/munin/files/default/plugins/api_waits_
@@ -9,12 +9,12 @@ def uri_and_times_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(&:inner_html) }
+  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[12].match(server) }
   # return URI and number of seconds processing for each request
-  matching_data.collect { |r| [r[12], r[5].to_i] }
+  matching_data.collect { |r| [r[13], r[5].to_i] }
 end
 
 CALL_TYPES = {
@@ -26,7 +26,7 @@ CALL_TYPES = {
   :trkpts => "GPX trackpoints calls",
   :web => "Web site traffic",
   :other => "Other API calls"
-}
+}.freeze
 
 def categorise_uri(line)
   uri = line.split(" ")[1]
@@ -54,7 +54,7 @@ if ARGV[0] == "config"
 else
   counts = uri_and_times_from_status(server)
            .collect { |x, y| [categorise_uri(x), y] }
-           .each_with_object({}) do |h, e|
+           .each_with_object({}) do |e, h|
     category, time = e
     if h.key? category
       h[category] += [time]
@@ -63,9 +63,9 @@ else
     end
   end
 
-  CALL_TYPES.keys.each do |type|
+  CALL_TYPES.each_key do |type|
     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