@@ -10,7 +10,7 @@ class RailsRequests < Scout::Plugin def build_report patch_elif - + log_path = option(:log) unless log_path and not log_path.empty? @file_found = false @@ -18,6 +18,17 @@ class RailsRequests < Scout::Plugin end max_length = option(:max_request_length).to_f + # process the ignored_actions option -- this is a regex provided by users; matching URIs don't get counted as slow + ignored_actions=nil + if option(:ignored_actions) && option(:ignored_actions).strip != '' + begin + ignored_actions = Regexp.new(option(:ignored_actions)) + puts ignored_actions.inspect + rescue + error("Argument error","Could not understand the regular expression for excluding slow actions: #{option(:ignored_actions)}. #{$!.message}") + end + end + report_data = { :slow_request_rate => 0, :request_rate => 0, :average_request_length => nil } @@ -44,9 +55,12 @@ class RailsRequests < Scout::Plugin request_count += 1 total_request_time += last_completed.first.to_f if max_length > 0 and last_completed.first > max_length - slow_request_count += 1 - slow_requests += "#{last_completed.last}\n" - slow_requests += "#{last_completed[1]}\n\n" + # only test for ignored_actions if we actually have an ignored_actions regex + if ignored_actions.nil? || (ignored_actions.is_a?(Regexp) && !ignored_actions.match(last_completed.last)) + slow_request_count += 1 + slow_requests += "#{last_completed.last}\n" + slow_requests += "#{last_completed[1]}\n\n" + end end end # request should be analyzed end rails_requests/rails_requests.rb @@ -4,12 +4,16 @@ options: notes: "The full path to the Ruby on Rails log file you wish to analyze (ex: /var/www/apps/APP_NAME/current/log/production.log)." max_request_length: name: Max Request Length (sec) - notes: If any request length is larger than this amount, an alert is generated + notes: If any request length is larger than this amount, an alert is generated (see Advanced for more options) default: 3 rla_run_time: name: Request Log Analyzer Run Time (HH:MM) notes: It's best to schedule these summaries about fifteen minutes before any logrotate cron job you have set would kick in. default: '23:45' + ignored_actions: + name: Ignored Actions + notes: Takes a regex. Any URIs matching this regex will NOT count as slow requests, and you will NOT be notified if they exceed Max Request Length. Matching actions will still be included in daily summaries. + advanced: true metadata: request_rate: rails_requests/rails_requests.yml 656ca351a9931d5252f8aa8624084801ef14dcac Andre Lewis andre@highgroove.com http://github.com/highgroove/scout-plugins/commit/e475aa762c5897de65d8277b41f5fd8408c3bdd0 e475aa762c5897de65d8277b41f5fd8408c3bdd0 2009-10-27T10:52:19-07:00 2009-10-27T10:52:19-07:00 ignore actions matching a regex you provide in options 5b9ab1c285c1608346c855c9732c9f47ac46852b Andre Lewis andre@highgroove.com