Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

[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 74c5bbe16895dc53d5e28f6656edbc8f22242b57..4eae910dd7d8cbada42558b36fdc4adcdbe21004 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/api_calls_
+++ b/cookbooks/munin/files/default/plugins/api_calls_
@@ -10,11 +10,11 @@ def uris_from_status(server)
   doc = Hpricot.parse(file)
   tables = doc / "table"
   rows = (tables[1] / "tr")[1..-1]
-  data = rows.collect { |r| (r  / "td").collect(&:inner_html) }
+  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 only the URI part
-  matching_data.collect { |r| r[12] }
+  matching_data.collect { |r| r[13] }
 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]
@@ -62,7 +62,7 @@ else
     end
   end
 
-  CALL_TYPES.keys.each do |type|
+  CALL_TYPES.each_key do |type|
     count = counts[type] || 0
     puts "#{type}.value #{count}"
   end