@@ -2,10 +2,13 @@ * Log entries in task view can now be filtered by date. By default only entries from the last 24 hours are shown. +* Added ability to reload and edit existing tasks [dvdplm] * Added experimental 'dont_wait' parameter to the Taskr4Rails action that forces the remote code to be forked so that it does not hold up the entire server. Currently this will only work if the remote Rails server is running - on Mongrel. + on Mongrel. +* Taskr can be configured to send SNMP traps whenever task events are logged. + See the config.example.yml file's "LOGGING" section for more info. === 0.3.0 :: 2008-06-19 History.txt @@ -139,6 +139,19 @@ task_log: # ERROR, WARN, INFO, or DEBUG level: DEBUG +### SNMP Traps +# Taskr can be configured to send out SNMP traps whenever task events occur. +# That is, in addition to logging task events to the Task Log (see above), +# Taskr can send out SNMP traps notifying an SNMP listener of the event. +# This functionality relies on the Net-SNMP package's `snmptrap` command-line +# utility, so make sure you have the PERL Net-SNMP installed on your system +# before enabling the following configuration options. + +#snmp: +# send_traps: true +# to_host: snmp.example.net +# community: public +# enterprise_oid: 1.3.6.1.4.1.55555.7007 ##### MISC ##################################################################### config.example.yml @@ -39,10 +39,11 @@ unless Object.method_defined? :gem alias gem require_gem end +gem 'picnic', '>=0.6.5' require 'picnic' require 'camping/db' require 'reststop' -gem 'rufus-scheduler', '~> 1.0.7' +gem 'rufus-scheduler', '>=1.0.7' require 'rufus/scheduler' lib/taskr/environment.rb @@ -200,7 +200,7 @@ module Taskr::Models end def to_s - "#{self.class.name.demodulize}(#{task_action})" + "#{self.class.name.demodulize}(#{action_class})" end end @@ -261,6 +261,51 @@ module Taskr::Models :data => data ) end + + # Send SNMP traps through net-snmp if Taskr is configured to send them. + if Taskr::Conf[:snmp] && Taskr::Conf[:snmp][:send_traps] + snmp_community = Taskr::Conf[:snmp][:community] + enterprise_oid = Taskr::Conf[:snmp][:enterprise_oid] || '1.3.6.1.4.1.55555.7007' + to_host = Taskr::Conf[:snmp][:to_host] + snmp_persistent_dir = Taskr::Conf[:snmp][:snmp_persistent_dir] || '/tmp' + my_host = ENV['HOSTNAME'] || `hostname`.strip || 'taskr' + + # see http://www.oid-info.com/get/1.3.6.1.4.1.9.5.1.14.4.1.2 + level_oid = '1.3.6.1.4.1.9.5.1.14.4.1.2' + level_typ = 'i' + case level + when 'DEBUG' then level_val = 8 + when 'INFO' then level_val = 7 + when 'WARN' then level_val = 5 + when 'ERROR' then level_val = 4 + end + + # see http://www.oid-info.com/get/1.3.6.1.4.1.9.9.41.1.2.3.1.4 + sevr_oid = '1.3.6.1.4.1.9.9.41.1.2.3.1.4' + sevr_typ = 's' + sevr_val = level + + # TODO: make msg format configurable + msg = ("Taskr #{level} on task #{task}[#{action}]: #{data}").gsub(/"/, '\"') + + # see http://www.oid-info.com/get/1.3.6.1.4.1.9.9.41.1.2.3.1.5 + msg_oid = '1.3.6.1.4.1.9.9.41.1.2.3.1.5' + msg_typ = 's' + msg_val = msg + + cmd = %{snmptrap -v 1 -c #{snmp_community} #{to_host} #{enterprise_oid} #{my_host} 6 #{level_val} '' \ +#{level_oid} #{level_typ} "#{level_val}" \ +#{sevr_oid} #{sevr_typ} "#{sevr_val}" \ +#{msg_oid} #{msg_typ} "#{msg_val}"} + + # Band-aid fix for bug in Net-SNMP. + # See http://sourceforge.net/tracker/index.php?func=detail&aid=1588455&group_id=12694&atid=112694 + ENV['SNMP_PERSISTENT_DIR'] ||= snmp_persistent_dir + + $LOG.debug "SENDING SNMP TRAP: #{cmd}" + + `#{cmd}` + end end # Produces a Logger-like class that will create log entries for the given lib/taskr/models.rb 0b742f6a1cc9849fa9e387d10f5a72a4c53d7f31 zuk matt@zukowski.ca http://github.com/zuk/taskr/commit/39561e2c0e605b674ca15a50c0cc00579a861f97 39561e2c0e605b674ca15a50c0cc00579a861f97 2008-10-14T12:06:41-07:00 2008-10-14T12:06:41-07:00 * Taskr can be configured to send SNMP traps whenever task events are logged. See the config.example.yml file's "LOGGING" section for more info. git-svn-id: http://ruby-taskr.googlecode.com/svn/trunk@219 dda205c7-5e3f-0410-a417-dfc30505af65 7e1e88305a08d02b05bd51c92cd407ada218d517 zuk matt@zukowski.ca