lib/tasks/nagioscheck.rake @@ -34,13 +34,7 @@ class ApplicationController < ActionController::Base end def build_conditions_from_blacklist - conditions = Array.new - bl_terms = Blacklistterm.find :all - bl_terms.each do |term| - conditions << [ "Message NOT LIKE ?", "%#{term.message}%" ] unless term.message.blank? - end - - return Logentry.merge_conditions *conditions + return Blacklist.build_conditions end def build_conditions_for_blacklist blacklist_id app/controllers/application_controller.rb @@ -1,50 +1,21 @@ class DashboardController < ApplicationController def index - @dashboard_settings = get_dashboard_settings - @new_messages = get_new_messages @dashboard_settings["timespan"] - @alert = alert? @dashboard_settings["number_of_allowed_messages"], @new_messages + @dashboard_settings = Setting.get_dashboard_settings + @new_messages = Logentry.get_new_messages @dashboard_settings["timespan"], build_conditions_from_blacklist + @alert = Logentry.alert? @dashboard_settings["number_of_allowed_messages"], @new_messages end def nagioscheck - @dashboard_settings = get_dashboard_settings - @new_messages = get_new_messages @dashboard_settings["timespan"] + @dashboard_settings = Setting.get_dashboard_settings + @new_messages = Logentry.get_new_messages @dashboard_settings["timespan"], build_conditions_from_blacklist - if !alert? @dashboard_settings["number_of_allowed_messages"], @new_messages + if !Logentry.alert? @dashboard_settings["number_of_allowed_messages"], @new_messages render :text => "okay" return end render :text => "alert" end - - private - def get_new_messages timespan - blacklist_conditions = build_conditions_from_blacklist - timespan_condition = [ "ReceivedAt > ?", timespan.minutes.ago] - conditions = Logentry.merge_conditions blacklist_conditions, timespan_condition - return Logentry.count :conditions => conditions - end - - def get_dashboard_settings - if Setting.last.blank? - timespan = 10 - number_of_allowed_messages = 100 - fontsize = 50 - else - Setting.last.dashboard_timespan.blank? ? timespan = 10 : timespan = Setting.last.dashboard_timespan.to_i - Setting.last.dashboard_messages.blank? ? number_of_allowed_messages = 100 : number_of_allowed_messages = Setting.last.dashboard_messages.to_i - Setting.last.dashboard_font_size.blank? ? fontsize = 50 : fontsize = Setting.last.dashboard_font_size.to_i - end - - return { "number_of_allowed_messages" => number_of_allowed_messages, - "timespan" => timespan, - "fontsize" => fontsize } - end - - def alert? number_of_allowed_messages, new_messages - return true if new_messages > number_of_allowed_messages - return false - end end app/controllers/dashboard_controller.rb @@ -1,3 +1,13 @@ class Blacklist < ActiveRecord::Base has_many :blacklistterms + + def self.build_conditions + conditions = Array.new + bl_terms = Blacklistterm.find :all + bl_terms.each do |term| + conditions << [ "Message NOT LIKE ?", "%#{term.message}%" ] unless term.message.blank? + end + + return Logentry.merge_conditions *conditions + end end app/models/blacklist.rb @@ -2,6 +2,17 @@ class Logentry < ActiveRecord::Base include AuthenticatedSystem + def self.get_new_messages timespan, blacklist_conditions + timespan_condition = [ "ReceivedAt > ?", timespan.minutes.ago] + conditions = self.merge_conditions blacklist_conditions, timespan_condition + return self.count :conditions => conditions + end + + def self.alert? number_of_allowed_messages, new_messages + return true if new_messages > number_of_allowed_messages + return false + end + def human_readable_severity case self.Priority when 0: "Emergency" app/models/logentry.rb @@ -1,2 +1,19 @@ class Setting < ActiveRecord::Base + + def self.get_dashboard_settings + if self.last.blank? + timespan = 10 + number_of_allowed_messages = 100 + fontsize = 50 + else + self.last.dashboard_timespan.blank? ? timespan = 10 : timespan = self.last.dashboard_timespan.to_i + self.last.dashboard_messages.blank? ? number_of_allowed_messages = 100 : number_of_allowed_messages = self.last.dashboard_messages.to_i + self.last.dashboard_font_size.blank? ? fontsize = 50 : fontsize = self.last.dashboard_font_size.to_i + end + + return { "number_of_allowed_messages" => number_of_allowed_messages, + "timespan" => timespan, + "fontsize" => fontsize } + end + end app/models/setting.rb a92520ad3ad38e006bd84b407172be0ffc0c5fe0 Lennart Koopmann lennart@linux.jimdo.office http://github.com/lennartkoopmann/Graylog/commit/98bab556351dd6771a8e5aa311deac982363a16f 98bab556351dd6771a8e5aa311deac982363a16f 2009-10-06T08:32:11-07:00 2009-10-06T08:32:11-07:00 More refactoring. Also added rake task for Nagios NRPE check a4993525546a74fca9fa1c3597c24fe60284565b Lennart Koopmann lennart@linux.jimdo.office