Update munin api plugins for changes in apache server status

diff --git a/cookbooks/munin/files/default/plugins/api_calls_ b/cookbooks/munin/files/default/plugins/api_calls_
index ea95ed137d4f5133684613538ea13e3d7fcae0a5..4eae910dd7d8cbada42558b36fdc4adcdbe21004 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/api_calls_
+++ b/cookbooks/munin/files/default/plugins/api_calls_
@@ -12,9 +12,9 @@ def uris_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.positive? && 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
   # return only the URI part

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

 end
 
 CALL_TYPES = {
 end
 
 CALL_TYPES = {

diff --git a/cookbooks/munin/files/default/plugins/api_waits_ b/cookbooks/munin/files/default/plugins/api_waits_
index f575dad1c6df39a3b0e36df4ebe4e35822b6a3c7..3d511ec8cb5bc0582f54281c6cb5c9a5859b6567 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/api_waits_
+++ b/cookbooks/munin/files/default/plugins/api_waits_
@@ -12,9 +12,9 @@ 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.positive? && 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
   # 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 = {
 end
 
 CALL_TYPES = {