@@ -8,10 +8,10 @@ metadata: triggers: - type: peak - data_series_name: last_minute + dname: last_minute max_value: 3 - type: trend - data_series_name: last_minute + dname: last_minute direction: UP percentage_change: 60 duration: 60 load_averages/load_averages.yml @@ -21,11 +21,11 @@ metadata: triggers: - type: peak - data_series_name: % Swap Used + dname: % Swap Used max_value: 50 # swap usage increases by 30% compared to last week - type: trend - data_series_name: % Swap Used + dname: % Swap Used direction: UP percentage_change: 30 duration: 60 memory_profiler/memory_profiler.yml @@ -33,7 +33,7 @@ metadata: triggers: - type: trend - data_series_name: total + dname: total direction: UP percentage_change: 30 duration: 60 mysql_monitoring/mysql_monitoring.yml @@ -2,24 +2,29 @@ class ProcessUsage < Scout::Plugin MEM_CONVERSION = 1024 def build_report - if @options["command_name"].nil? or @options["command_name"] == '' - return error(:subject => "Please specify the name of the process you want to monitor.") + if @options["command_name"].nil? or @options["command_name"] == "" + return error("Please specify the name of the process you want to monitor.") + end + ps_command = @options["ps_command"] || "ps axucww" + ps_regex = (@options["ps_regex"] || "(?i:COMMAND\\s+$)").to_s. + gsub("COMMAND", Regexp.escape(@options["command_name"])) + begin + ps_output = `#{ps_command}` + rescue + error("Couldn't use `ps` as expected.", $!.message) end - ps_command = @options['ps_command'] || "ps axucww" - ps_output = `#{ps_command}` fields = ps_output.to_a.first.downcase.split - memory_index = fields.index("rss") + memory_index = fields.index("rss") or + return error( "RSS field not found.", + "The output from `#{ps_command}` did not include the needed RSS field." ) highest = - ps_output.grep(/#{Regexp.escape(@options["command_name"])}\s+$/i). + ps_output.grep(Regexp.new(ps_regex)). map { |com| Float(com.split[memory_index]).abs }.max if highest - report(:memory => (highest/MEM_CONVERSION).to_i) + report(:memory => (highest/MEM_CONVERSION).to_i) else - error(:subject => "Command not found.", - :body => "No processes found matching #{@options['command_name']}.") + error( "Command not found.", + "No processes found matching #{@options['command_name']}." ) end - rescue - error(:subject => "Couldn't use `ps` as expected.", - :body => $!.message) end end process_memory/process_usage.rb @@ -7,6 +7,10 @@ options: name: The Process Status (ps) Command notes: The command with options. The default works on most systems. default: ps axucww + ps_regex: + name: The regex used to match a command name. + notes: "By default, this matches a command with options at the end of a line. The word COMMAND get's replaced with the command you gave (regex escaped). You may wish to try the following pattern if you have trouble matching dynamic options: (?i:\\bCOMMAND\\b)" + default: "(?i:COMMAND\\s+$)" metadata: memory: @@ -16,10 +20,10 @@ metadata: triggers: - type: peak - data_series_name: memory + dname: memory max_value: 10 - type: trend - data_series_name: memory + dname: memory direction: UP percentage_change: 20 duration: 60 process_memory/process_usage.yml @@ -188,9 +188,9 @@ class RailsAnalyzer duration=query.duration.to_i if query.explain_issues? # slow & explain issues. we can give more details. importance = 0 - importance += 1 if duration > 100 - importance += 1 if duration > 200 - importance += 1 if duration > 300 + importance += 1 if duration > 600 + importance += 1 if duration > 900 + importance += 1 if duration > 1200 importance = 3 if importance > 3 # importance maxes out at 3 add_hint( :title => "A #{duration}ms query in the #{query.table} table may be able to be optimized.", @@ -205,9 +205,9 @@ class RailsAnalyzer else # just slow # calculate importance importance = 0 - importance += 1 if duration > 100 - importance += 1 if duration > 200 - importance += 1 if duration > 300 + importance += 1 if duration > 600 + importance += 1 if duration > 900 + importance += 1 if duration > 1200 add_hint( :title => "A slow query occurred (#{duration} ms).", :description => "This query exceeds the maximum specified duration of #{MAX_QUERY_TIME}ms.", rails_instrumentation/rails_instrumentation.rb @@ -71,14 +71,14 @@ metadata: # #triggers: # - type: peak -# data_series_name: throughput # a shallow data series +# dname: throughput # a shallow data series # max_value: 200 # - type: plateau -# data_series_name: actions.runtime_max # a deep data series +# dname: actions.runtime_max # a deep data series # max_value: 1000 # duration: 10 # in minutes # - type: trend -# data_series_name: actions.runtime_avg +# dname: actions.runtime_avg # direction: UP # UP, DOWN, EITHER # percentage_change: 10 # greater than 0 # duration: 120 # a number (in minutes) or: DAY_SO_FAR @@ -86,10 +86,10 @@ metadata: triggers: - type: peak - data_series_name: actions.runtime_max + dname: actions.runtime_max max_value: 4000 - type: trend - data_series_name: actions.runtime_avg + dname: actions.runtime_avg direction: UP percentage_change: 30 duration: 120 rails_instrumentation/rails_instrumentation.yml @@ -8,6 +8,7 @@ class UrlMonitor < ScoutAgent::Plugin TIMEOUT_LENGTH = 50 # seconds def build_report + @options["url"] ="http://hotspotr.com/app/ping_" if @options["url"].strip.length == 0 return error(:subject => "A url wasn't provided.") end url_monitor/url_monitor.rb 5bb58ea082496cbbef5f8d1bb0d84a2a82b0297a 91d81476b47e3cd629d42a2e536f889c7c8407d6 James Edward Gray II james@graysoftinc.com http://github.com/highgroove/scout-plugins/commit/e78990370c927c87c72a2bb6c4fe3b9a0e637997 e78990370c927c87c72a2bb6c4fe3b9a0e637997 2009-05-08T15:57:14-07:00 2009-05-08T15:57:14-07:00 Merge branch 'agent_compatible' c5afeee5342959eac0b40925e07b2e2bf83aa439 James Edward Gray II james@graysoftinc.com