flapjack 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c18eef4f4dd8297baab83f9f8c1ac1eb3972ace
-  data.tar.gz: b62c3482d22ddb71af95b7cb5c097fa9ea75bdf4
+  metadata.gz: 7fc94944c2fb13e947e99bdfe54b0fe6f69a80e3
+  data.tar.gz: 7f090f5ca4504a757a5e773937af868c7eed16ee
 SHA512:
-  metadata.gz: 0edb5492abaf9467c0960bcf9be3a5c941803354ce6f0e6bb5b2c03c6ac44a691544d173c00da9c37a4ab0e4973a6e5bc5c0bc02f44008701777597a7d5f8c24
-  data.tar.gz: 2befbc8f51f15d686e88a5dadc7b2eea9f73f32860a7b77f34fdd8af31e243b4a99262e3d1befcba50f3d2a28f70f5679e91f22178ffbacebba23405a19c50eb
+  metadata.gz: b63e5c995f7790525b8eb152a52621e5edb9a1eed65b5abef6e3c0068b8217df0ab34ef6f33c48f694bc19eefd6f247013b8e2eb3e8dd7c480e77c3e4745a5b0
+  data.tar.gz: 6d96a660e3bf02e1bbf820b7ba4d6f14322dc6db76ae621a89266d3d0da5aefa433aa5c4dadd69315a8f317631d649f654d308dddf1316220d331052ff06b2b3

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
-  - "2.1.0"
+  - "2.1.1"
 env:
   - ENTITIES=10 INTERVAL=120
 gemfile:

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## Flapjack Changelog
 
-# 0.8.5 - UNRELEASED
+# 0.8.6 - 2014-03-14
+- Bug: tie Thin to < 2.0.0pre gh-442 (@mattdelves)
+- Feature: Allow site-specific ERB templates for messages. gh-443 (@jswoods)
+- Feature: Add flapjack-nsca-receiver gh-444 (@giganteous)
+- Bug: Redis storage leak - unacknowledged_failures gh-446, gh-430 (@ali-graham)
+
+# 0.8.5 - 2014-02-10
 - Feature: jsonapi rework now supports PATCH, eg for media under contacts gh-253 (@ali-graham)
 - Feature: experimental backbone based /edit_contacts page in the web UI has improvements gh-253 (@ali-graham)
 

data/Gemfile

@@ -20,6 +20,6 @@ group :test do
   gem 'guard-cucumber'
   gem 'fuubar'
   gem 'simplecov', :require => false
-  gem 'debugger-ruby_core_source', '>= 1.3.1' # required for perftools
+  gem 'debugger-ruby_core_source', '>= 1.3.2' # required for perftools
   gem 'perftools.rb'
 end

data/bin/flapjack-nsca-receiver

@@ -0,0 +1,246 @@
+#!/usr/bin/env ruby
+#
+# Nagios.cfg should be enabled with a command_file:
+#
+# command_file=/var/lib/nagios3/rw/nagios.cmd
+#
+# The format this script expects looks like:
+#   [$TIMET] PROCESS_SERVICE_CHECK_RESULT;$HOSTNAME$;$SERVICEDESC$;$SERVICESTATE$;$SERVICEOUTPUT$;$SERVICEPERFDATA$
+#
+
+unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+  $: << File.dirname(__FILE__) + '/../lib'
+end
+
+require 'optparse'
+require 'ostruct'
+require 'redis'
+
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
+
+require 'dante'
+
+require 'flapjack/configuration'
+require 'flapjack/data/event'
+
+# Nsca example line for a storage-device check:
+#[1393410685] PROCESS_SERVICE_CHECK_RESULT;db1.dev;STORAGE;0;Raid Set # 000 (800.0GB) is Normal.
+
+def process_input(opts)
+  redis = opts[:redis]
+  fifo  = File.new(opts[:fifo])
+  begin
+    while line = fifo.gets
+      skip unless line
+      split_line = line.split(" ")
+
+      timestamp, passivecheck = split_line
+      split_passive = passivecheck.split(";")
+      timestamp = timestamp.delete('[]')
+
+      check_long_output = ''
+      object_type, entity, check, state, check_output = split_passive
+
+      case
+      when (split_line.length < 2 || split_passive.length < 5)
+        puts "ERROR - rejecting this line; illegal format: [#{line}]"
+        next
+      when (timestamp !~ /^\d+$/)
+        puts "ERROR - rejecting this line; timestamp look like a timestamp: [#{line}]"
+        next
+      when (object_type != 'PROCESS_SERVICE_CHECK_RESULT')
+        puts "ERROR - rejecting this line; identifier 'PROCESS_SERVICE_CHECK_RESULT' is missing: [#{line}]"
+        next
+      end
+
+      puts "#{object_type}, #{timestamp}, #{entity}, #{check}, #{state}, #{check_output}"
+
+      state = {'0' => 'ok', '1' => 'warning', '2' => 'critical'}[state.downcase] || 'unknown'
+      event = {
+        'entity'    => entity,
+        'check'     => check,
+        'type'      => 'service',
+        'state'     => state,
+        'summary'   => check_output,
+        'details'   => nil,
+        'time'      => timestamp,
+      }
+      Flapjack::Data::Event.add(event, :redis => redis)
+    end
+  rescue Redis::CannotConnectError
+    puts "Error, unable to to connect to the redis server (#{$!})"
+  end
+end
+
+def main(opts)
+  fifo = opts[:fifo]
+  redis = Redis.new(opts[:redis_options])
+  while true
+    process_input(:redis => redis, :fifo => fifo)
+    puts "Whoops with the fifo, restarting main loop in 10 seconds"
+    sleep 10
+  end
+end
+
+options = OpenStruct.new
+options.config    = Flapjack::Configuration::DEFAULT_CONFIG_PATH
+options.daemonize = nil
+
+exe = File.basename(__FILE__)
+
+optparse = OptionParser.new do |opts|
+  opts.banner = "Usage: #{exe} COMMAND [OPTIONS]"
+
+  opts.separator  ""
+  opts.separator  "Commands"
+  opts.separator  "     start #{" " * 25} start #{exe}"
+  opts.separator  "     stop #{" " * 26} stop #{exe}"
+  opts.separator  "     restart #{" " * 23} (re)start #{exe}"
+  opts.separator  "     status #{" " * 24} see if #{exe} is running"
+  opts.separator  ""
+  opts.separator  "Options"
+
+  opts.on("-c", "--config [PATH]", String, "PATH to the config file to use") do |c|
+    options.config = c
+  end
+
+  opts.on("-f", "--fifo FIFO", String, "Path to the nagios perfdata named pipe") do |f|
+    options.fifo = f
+  end
+
+  opts.on("-d", "--[no-]daemonize", "Daemonize?") do |d|
+    options.daemonize = d
+  end
+
+  opts.on("-p", "--pidfile [PATH]", String, "PATH to the pidfile to write to") do |pid|
+    options.pidfile = pid
+  end
+
+  opts.on("-l", "--logfile [PATH]", String, "PATH to the logfile to write to") do |l|
+    options.logfile = l
+  end
+
+  opts.on_tail("-h", "--help", "Show this usage message") do
+    puts opts
+    puts '
+Required Nagios Configuration Changes
+-------------------------------------
+
+flapjack-nsca-receiver reads events from the nagios "command file" read from by Nagios, written to by the Nsca-daemon.
+
+The named pipe is automatically created by _nagios_ if it is enabled
+in the configfile:
+
+  # modified lines:
+  command_file=/var/lib/nagios3/rw/nagios.cmd
+
+The Nsca daemon is optionally writing to a tempfile if the named pipe does
+not exist.
+
+Details on the wiki: https://github.com/flpjck/flapjack/wiki/USING#XXX
+'
+
+    exit
+  end
+
+end
+optparse.parse!(ARGV)
+
+FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'production'
+
+config = Flapjack::Configuration.new
+config.load(options.config)
+config_env = config.all
+redis_options = config.for_redis
+
+if config_env.nil? || config_env.empty?
+  puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"
+  puts optparse
+  exit 1
+end
+
+config_nr = config_env['nsca-receiver'] || {}
+
+pidfile = options.pidfile.nil? ?
+            (config_nr['pid_file'] || "/var/run/flapjack/#{exe}.pid") :
+            options.pidfile
+
+logfile = options.logfile.nil? ?
+            (config_nr['log_file'] || "/var/log/flapjack/#{exe}.log") :
+            options.logfile
+
+fifo = options.fifo.nil? ?
+         (config_nr['fifo'] || '/var/lib/nagios3/rw/nagios.cmd') :
+         options.fifo
+
+daemonize = options.daemonize.nil? ?
+              !!config_nr['daemonize'] :
+              options.daemonize
+
+
+runner = Dante::Runner.new(exe, :pid_path => pidfile, :log_path => logfile)
+case ARGV[0]
+when "start", "restart"
+  unless File.exist?(fifo)
+    raise "No fifo (named pipe) file found at #{fifo}"
+  end
+  unless File.pipe?(fifo)
+    raise "The file at #{fifo} is not a named pipe, try using mkfifo to make one"
+  end
+  unless File.readable?(fifo)
+    raise "The fifo (named pipe) at #{fifo} is unreadable"
+  end
+end
+
+case ARGV[0]
+when "start"
+  if runner.daemon_running?
+    puts "#{exe} is already running."
+    exit 1
+  else
+    print "#{exe} starting..."
+    runner.execute(:daemonize => daemonize) {
+      main(:redis_options => redis_options, :fifo => fifo)
+    }
+    puts " done."
+  end
+
+when "stop"
+  if runner.daemon_running?
+    print "#{exe} stopping..."
+    runner.execute(:kill => true)
+    puts " done."
+  else
+    puts "#{exe} is not running."
+    exit 1
+  end
+
+when "restart"
+  print "#{exe} restarting..."
+  runner.execute(:daemonize => true, :restart => true) {
+    main(:redis_options => redis_options, :fifo => fifo)
+  }
+  puts " done."
+
+when "status"
+  uptime = (runner.daemon_running?) ? Time.now - File.stat(pidfile).ctime : 0
+  if runner.daemon_running?
+    puts "#{exe} is running: #{uptime}"
+  else
+    puts "#{exe} is not running"
+    exit 3
+  end
+
+else
+  if ARGV.nil? || ARGV.empty?
+    puts "No command provided"
+  else
+    puts "Unknown command provided: '#{ARGV[0]}'"
+  end
+  puts "\n#{optparse}"
+  exit 1
+
+end
+
+

data/etc/flapjack_config.yaml.example

@@ -37,6 +37,10 @@ production:
     fifo: "/var/cache/nagios3/event_stream.fifo"
     pid_file: "/var/run/flapjack/flapjack-nagios-receiver.pid"
     log_file: "/var/log/flapjack/flapjack-nagios-receiver.log"
+  nsca-receiver:
+    fifo: "/var/lib/nagios3/rw/nagios.cmd"
+    pid_file: "/var/run/flapjack/flapjack-nsca-receiver.pid"
+    log_file: "/var/log/flapjack/flapjack-nsca-receiver.log"
   gateways:
     email:
       enabled: no
@@ -53,6 +57,14 @@ production:
         #  type:
         #  username:
         #  password:
+      # location of custom alert templates
+      #templates:
+      #  rollup_subject.text: '/etc/flapjack/templates/email/rollup_subject.text.erb'
+      #  alert_subject.text: '/etc/flapjack/templates/email/alert_subject.text.erb'
+      #  rollup.text: '/etc/flapjack/templates/email/rollup.text.erb'
+      #  alert.text: '/etc/flapjack/templates/email/alert.text.erb'
+      #  rollup.html: '/etc/flapjack/templates/email/rollup.html.erb'
+      #  alert.html: '/etc/flapjack/templates/email/alert.html.erb'
     sms:
       enabled: no
       queue: sms_notifications
@@ -62,6 +74,10 @@ production:
       logger:
         level: INFO
         syslog_errors: yes
+      # location of custom alert templates
+      #templates:
+      #  rollup.text: '/etc/flapjack/templates/sms/rollup.text.erb'
+      #  alert.text: '/etc/flapjack/templates/sms/alert.text.erb'
     jabber:
       enabled: no
       queue: jabber_notifications
@@ -76,12 +92,19 @@ production:
       logger:
         level: INFO
         syslog_errors: yes
+      # location of custom alert templates
+      #templates:
+      #  rollup.text: '/etc/flapjack/templates/jabber/rollup.text.erb' 
+      #  alert.text: '/etc/flapjack/templates/jabber/alert.text.erb' 
     pagerduty:
       enabled: no
       queue: pagerduty_notifications
       logger:
         level: INFO
         syslog_errors: yes
+      # location of custom alert templates
+      #templates:
+      #  alert.text: '/etc/flapjack/templates/pagerduty/alert.text.erb' 
     web:
       enabled: yes
       port: 3080
@@ -180,6 +203,14 @@ development:
         #  type:
         #  username:
         #  password:
+      # location of custom alert templates
+      #templates:
+      #  rollup_subject.text: '/etc/flapjack/templates/email/rollup_subject.text.erb'
+      #  alert_subject.text: '/etc/flapjack/templates/email/alert_subject.text.erb'
+      #  rollup.text: '/etc/flapjack/templates/email/rollup.text.erb'
+      #  alert.text: '/etc/flapjack/templates/email/alert.text.erb'
+      #  rollup.html: '/etc/flapjack/templates/email/rollup.html.erb'
+      #  alert.html: '/etc/flapjack/templates/email/alert.html.erb'
     sms:
       enabled: yes
       queue: sms_notifications
@@ -191,6 +222,10 @@ development:
       logger:
         level: INFO
         syslog_errors: yes
+      # location of custom alert templates
+      #templates:
+      #  rollup.text: '/etc/flapjack/templates/sms/rollup.text.erb'
+      #  alert.text: '/etc/flapjack/templates/sms/alert.text.erb'
     jabber:
       enabled: no
       queue: jabber_notifications
@@ -205,12 +240,19 @@ development:
       logger:
         level: INFO
         syslog_errors: yes
+      # location of custom alert templates
+      #templates:
+      #  rollup.text: '/etc/flapjack/templates/jabber/rollup.text.erb' 
+      #  alert.text: '/etc/flapjack/templates/jabber/alert.text.erb' 
     pagerduty:
       enabled: no
       queue: pagerduty_notifications
       logger:
         level: INFO
         syslog_errors: yes
+      # location of custom alert templates
+      #templates:
+      #  alert.text: '/etc/flapjack/templates/pagerduty/alert.text.erb' 
     web:
       enabled: yes
       port: 4080

data/flapjack.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'resque', '~> 1.23.0'
   gem.add_dependency 'sinatra'
   gem.add_dependency 'rack-fiber_pool'
-  gem.add_dependency 'thin'
+  gem.add_dependency 'thin', '~> 1.6.1'
   gem.add_dependency 'mail'
   gem.add_dependency 'blather', '~> 0.8.3'
   gem.add_dependency 'chronic'

data/lib/flapjack/data/alert.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'digest'
+
 require 'active_support/inflector'
 require 'flapjack/utility'
 
@@ -44,7 +46,8 @@ module Flapjack
       # from self
       attr_reader :entity,
                   :check,
-                  :notification_id
+                  :notification_id,
+                  :event_hash
 
       include Flapjack::Utility
 
@@ -52,6 +55,8 @@ module Flapjack
         raise "no logger supplied" unless @logger = opts[:logger]
 
         @event_id                   = contents['event_id']
+        @event_hash                 = contents['event_hash'] ||
+                                        Digest.hexencode(Digest::SHA1.new.digest(@event_id))[0..7].downcase
         @state                      = contents['state']
         @summary                    = contents['summary']
         @acknowledgement_duration   = contents['duration'] # SMELLY

data/lib/flapjack/data/entity_check.rb

@@ -105,6 +105,16 @@ module Flapjack
         end
       end
 
+      def self.unacknowledged_failing(options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+
+        redis.zrange('failed_checks', '0', '-1').reject {|entity_check|
+          redis.exists(entity_check + ':unscheduled_maintenance')
+        }.collect {|entity_check|
+          Flapjack::Data::EntityCheck.for_event_id(entity_check, :redis => redis)
+        }
+      end
+
       def self.conflate_to_keys(entity_checks_hash)
         result = []
         entity_checks_hash.each {|entity, checks|
@@ -617,6 +627,16 @@ module Flapjack
         ta += check.split(' ').map {|x| x.downcase}
       end
 
+      def ack_hash
+        @ack_hash ||= @redis.hget('check_hashes_by_id', @key)
+        if @ack_hash.nil?
+          sha1 = Digest::SHA1.new
+          @ack_hash = Digest.hexencode(sha1.digest(@key))[0..7].downcase
+          @redis.hset("checks_by_hash", @ack_hash, @key)
+        end
+        @ack_hash
+      end
+
     private
 
       def initialize(entity, check, options = {})

data/lib/flapjack/data/event.rb

@@ -6,7 +6,7 @@ module Flapjack
   module Data
     class Event
 
-      attr_accessor :counter, :tags
+      attr_accessor :counter, :id_hash, :tags
 
       attr_reader :check, :summary, :details, :acknowledgement_id
 

data/lib/flapjack/data/notification.rb

@@ -52,6 +52,7 @@ module Flapjack
 
         tag_data = event.tags.is_a?(Set) ? event.tags.to_a : nil
         notif = {'event_id'       => event.id,
+                 'event_hash'     => event.id_hash,
                  'state'          => event.state,
                  'summary'        => event.summary,
                  'details'        => event.details,
@@ -105,6 +106,7 @@ module Flapjack
 
       def contents
         @contents ||= {'event_id'          => @event_id,
+                       'event_hash'        => @event_hash,
                        'state'             => @state,
                        'summary'           => @summary,
                        'duration'          => @duration,

data/lib/flapjack/gateways/email.rb

@@ -107,19 +107,27 @@ module Flapjack
           message_id = opts[:message_id]
           alert      = opts[:alert]
 
-          message_type = case
-          when alert.rollup
-            'rollup'
-          else
-            'alert'
-          end
+          message_type = alert.rollup ? 'rollup' : 'alert'
 
           mydir = File.dirname(__FILE__)
-
-          subject_template_path = mydir + "/email/#{message_type}_subject.text.erb"
-          text_template_path    = mydir + "/email/#{message_type}.text.erb"
-          html_template_path    = mydir + "/email/#{message_type}.html.erb"
-
+          subject_template_path = case
+          when @config.has_key?('templates') && @config['templates']["#{message_type}_subject.text"]
+            @config['templates']["#{message_type}_subject.text"]
+          else
+            mydir + "/email/#{message_type}_subject.text.erb"
+          end
+          text_template_path = case
+          when @config.has_key?('templates') && @config['templates']["#{message_type}.text"]
+            @config['templates']["#{message_type}.text"]
+          else
+            mydir + "/email/#{message_type}.text.erb"
+          end
+          html_template_path = case
+          when @config.has_key?('templates') && @config['templates']["#{message_type}.html"]
+            @config['templates']["#{message_type}.html"]
+          else
+            mydir + "/email/#{message_type}.html.erb"
+          end
           subject_template = ERB.new(File.read(subject_template_path), nil, '-')
           text_template    = ERB.new(File.read(text_template_path), nil, '-')
           html_template    = ERB.new(File.read(html_template_path), nil, '-')

data/lib/flapjack/gateways/jabber.rb

@@ -171,7 +171,7 @@ module Flapjack
         command = th.chunks.join(' ')
 
         case command
-        when /^ACKID\s+(\d+)(?:\s*(.*?)(?:\s*duration:.*?(\w+.*))?)$/im
+        when /^ACKID\s+([0-9A-F]+)(?:\s*(.*?)(?:\s*duration:.*?(\w+.*))?)$/im
           ackid        = $1
           comment      = $2
           duration_str = $3
@@ -189,7 +189,7 @@ module Flapjack
           four_hours = 4 * 60 * 60
           duration = (dur.nil? || (dur <= 0)) ? four_hours : dur
 
-          event_id = @redis.hget('unacknowledged_failures', ackid)
+          event_id = @redis.hget('check_hashes', ackid)
 
           if event_id.nil?
             error = "not found"
@@ -523,17 +523,21 @@ module Flapjack
             @logger.debug("processing jabber notification address: #{alert.address}, entity: #{alert.entity}, " +
                           "check: '#{alert.check}', state: #{alert.state}, summary: #{alert.summary}")
 
-            @ack_str =
-              alert.event_count &&
-              !alert.state.eql?('ok') &&
-              !'acknowledgement'.eql?(alert.type) &&
-              !'test'.eql?(alert.type) ?
-              "#{@config['alias']}: ACKID #{event['event_count']}" : nil
+            @ack_str = if alert.state.eql?('ok') || ['test', 'acknowledgement'].include?(alert.type)
+              nil
+            else
+              "#{@config['alias']}: ACKID #{alert.event_hash}"
+            end
 
             message_type = alert.rollup ? 'rollup' : 'alert'
 
             mydir = File.dirname(__FILE__)
-            message_template_path = mydir + "/jabber/#{message_type}.text.erb"
+            message_template_path = case
+            when @config.has_key?('templates') && @config['templates']["#{message_type}.text"]
+              @config['templates']["#{message_type}.text"]
+            else
+              mydir + "/jabber/#{message_type}.text.erb"
+            end
             message_template = ERB.new(File.read(message_template_path), nil, '-')
 
             @alert = alert

data/lib/flapjack/gateways/jsonapi.rb

@@ -195,8 +195,14 @@ module Flapjack
         query_string = (request.query_string.respond_to?(:length) &&
                         request.query_string.length > 0) ? "?#{request.query_string}" : ""
         if logger.debug?
+          body_debug = case
+          when response.body.respond_to?(:each)
+            response.body.each_with_index {|r, i| "body[#{i}]: #{r}"}.join(', ')
+          else
+            response.body.to_s
+          end
           logger.debug("Returning #{response.status} for #{request.request_method} " +
-            "#{request.path_info}#{query_string}, body: #{response.body}")
+            "#{request.path_info}#{query_string}, body: #{body_debug}")
         elsif logger.info?
           logger.info("Returning #{response.status} for #{request.request_method} " +
             "#{request.path_info}#{query_string}")

data/lib/flapjack/gateways/jsonapi/contact_methods.rb

@@ -130,7 +130,6 @@ module Flapjack
             contacts_data.map {|cd| cd['id']}.to_json
           end
 
-
           # Returns all (/contacts) or some (/contacts/1,2,3) or one (/contact/2) contact(s)
           # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts
           app.get %r{/contacts(?:/)?([^/]+)?$} do

data/lib/flapjack/gateways/pagerduty.rb

@@ -7,7 +7,6 @@ require 'em-synchrony/em-http'
 require 'oj'
 
 require 'flapjack/data/entity_check'
-require 'flapjack/data/global'
 require 'flapjack/data/alert'
 require 'flapjack/redis_pool'
 require 'flapjack/utility'
@@ -81,7 +80,12 @@ module Flapjack
                           "check: '#{alert.check}', state: #{alert.state}, summary: #{alert.summary}")
 
             mydir = File.dirname(__FILE__)
-            message_template_path = mydir + "/pagerduty/alert.text.erb"
+            message_template_path = case
+            when @config.has_key?('templates') && @config['templates']['alert.text']
+              @config['templates']['alert.text']
+            else
+              mydir + "/pagerduty/alert.text.erb"
+            end
             message_template = ERB.new(File.read(message_template_path), nil, '-')
 
             @alert = alert
@@ -174,7 +178,7 @@ module Flapjack
       def find_pagerduty_acknowledgements
         @logger.debug("looking for acks in pagerduty for unack'd problems")
 
-        unacknowledged_failing_checks = Flapjack::Data::Global.unacknowledged_failing_checks(:redis => @redis)
+        unacknowledged_failing_checks = Flapjack::Data::EntityCheck.unacknowledged_failing(:redis => @redis)
 
         @logger.debug "found unacknowledged failing checks as follows: " + unacknowledged_failing_checks.join(', ')
 

data/lib/flapjack/gateways/sms_messagenet.rb

@@ -34,7 +34,12 @@ module Flapjack
           message_type    = alert.rollup ? 'rollup' : 'alert'
 
           my_dir = File.dirname(__FILE__)
-          sms_template_path = my_dir + "/sms_messagenet/#{message_type}.text.erb"
+          sms_template_path = case
+          when @config.has_key?('templates') && @config['templates']["#{message_type}.text"]
+            @config['templates']["#{message_type}.text"]
+          else
+            my_dir + "/sms_messagenet/#{message_type}.text.erb"
+          end
           sms_template = ERB.new(File.read(sms_template_path), nil, '-')
 
           @alert  = alert

data/lib/flapjack/gateways/web.rb

@@ -218,8 +218,7 @@ module Flapjack
         @last_notifications         = last_notification_data(entity_check)
 
         @scheduled_maintenances     = entity_check.maintenances(nil, nil, :scheduled => true)
-        @acknowledgement_id         = entity_check.failed? ?
-          entity_check.event_count_at(entity_check.last_change) : nil
+        @acknowledgement_id         = entity_check.failed? ? entity_check.ack_hash : nil
 
         @current_scheduled_maintenance   = entity_check.current_maintenance(:scheduled => true)
         @current_unscheduled_maintenance = entity_check.current_maintenance(:scheduled => false)

data/lib/flapjack/processor.rb

@@ -175,6 +175,12 @@ module Flapjack
       case event.type
       # Service events represent current state of checks on monitored systems
       when 'service'
+        if event.failure?
+          # ensure that the check's hash is stored for later lookup
+          # can't happen inside the multi as it must get a value
+          event.id_hash = entity_check.ack_hash
+        end
+
         @redis.multi
         if event.ok?
           @redis.hincrby('event_counters', 'ok', 1)
@@ -182,7 +188,6 @@ module Flapjack
         elsif event.failure?
           @redis.hincrby('event_counters', 'failure', 1)
           @redis.hincrby("event_counters:#{@instance_id}", 'failure', 1)
-          @redis.hset('unacknowledged_failures', event.counter, event.id)
         end
         @redis.exec
 
@@ -217,10 +222,6 @@ module Flapjack
         @redis.hset(event.id + ':actions', timestamp, event.state)
         @redis.hincrby('event_counters', 'action', 1)
         @redis.hincrby("event_counters:#{@instance_id}", 'action', 1)
-
-        if event.acknowledgement? && event.acknowledgement_id
-          @redis.hdel('unacknowledged_failures', event.acknowledgement_id)
-        end
         @redis.exec
       end
 

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/spec/lib/flapjack/data/entity_check_spec.rb

@@ -597,4 +597,6 @@ describe Flapjack::Data::EntityCheck, :redis => true do
     expect(['foo-app-01', 'example.com', 'disk', '/', 'utilisation'].to_set.subset?(tags)).to be true
   end
 
+  it "returns unacknowledged failing checks"
+
 end

data/spec/lib/flapjack/gateways/jabber_spec.rb

@@ -52,13 +52,13 @@ describe Flapjack::Gateways::Jabber, :logger => true do
   end
 
   it "receives an acknowledgement message" do
-    expect(stanza).to receive(:body).and_return('flapjack: ACKID 876 fixing now duration: 90m')
+    expect(stanza).to receive(:body).and_return('flapjack: ACKID 1f8ac10f fixing now duration: 90m')
     from = double('from')
     expect(from).to receive(:stripped).and_return('sender')
     expect(stanza).to receive(:from).and_return(from)
 
     redis = double('redis')
-    expect(redis).to receive(:hget).with('unacknowledged_failures', '876').
+    expect(redis).to receive(:hget).with('check_hashes', '1f8ac10f').
       and_return('main-example.com:ping')
 
     entity_check = double(Flapjack::Data::EntityCheck)
@@ -66,7 +66,7 @@ describe Flapjack::Gateways::Jabber, :logger => true do
 
     expect(Flapjack::Data::Event).to receive(:create_acknowledgement).
       with('main-example.com', 'ping', :summary => 'fixing now',
-           :acknowledgement_id => '876',
+           :acknowledgement_id => '1f8ac10f',
            :duration => (90 * 60), :redis => redis)
 
     expect(Flapjack::Data::EntityCheck).to receive(:for_event_id).

data/spec/lib/flapjack/gateways/pagerduty_spec.rb

@@ -109,7 +109,7 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
     expect(Flapjack::Data::Event).to receive(:create_acknowledgement).with('foo-app-01.bar.net', 'PING',
       :summary => 'Acknowledged on PagerDuty', :duration => 14400, :redis => redis)
 
-    expect(Flapjack::Data::Global).to receive(:unacknowledged_failing_checks).and_return([entity_check])
+    expect(Flapjack::Data::EntityCheck).to receive(:unacknowledged_failing).and_return([entity_check])
 
     expect(fp).to receive(:pagerduty_acknowledged?).and_return({})
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -10,300 +10,300 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: em-resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: blather
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Flapjack is a distributed monitoring notification system that provides
@@ -313,6 +313,7 @@ email: lindsay@holmwood.id.au
 executables:
 - flapjack
 - flapjack-nagios-receiver
+- flapjack-nsca-receiver
 - flapjack-populator
 - flapper
 - receive-events
@@ -320,10 +321,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -332,6 +333,7 @@ files:
 - Rakefile
 - bin/flapjack
 - bin/flapjack-nagios-receiver
+- bin/flapjack-nsca-receiver
 - bin/flapjack-populator
 - bin/flapper
 - bin/receive-events
@@ -370,7 +372,6 @@ files:
 - lib/flapjack/data/entity.rb
 - lib/flapjack/data/entity_check.rb
 - lib/flapjack/data/event.rb
-- lib/flapjack/data/global.rb
 - lib/flapjack/data/message.rb
 - lib/flapjack/data/notification.rb
 - lib/flapjack/data/notification_rule.rb
@@ -486,7 +487,6 @@ files:
 - spec/lib/flapjack/data/entity_check_spec.rb
 - spec/lib/flapjack/data/entity_spec.rb
 - spec/lib/flapjack/data/event_spec.rb
-- spec/lib/flapjack/data/global_spec.rb
 - spec/lib/flapjack/data/message_spec.rb
 - spec/lib/flapjack/data/notification_rule_spec.rb
 - spec/lib/flapjack/data/notification_spec.rb
@@ -557,17 +557,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Intelligent, scalable, distributed monitoring notification system.
@@ -598,7 +598,6 @@ test_files:
 - spec/lib/flapjack/data/entity_check_spec.rb
 - spec/lib/flapjack/data/entity_spec.rb
 - spec/lib/flapjack/data/event_spec.rb
-- spec/lib/flapjack/data/global_spec.rb
 - spec/lib/flapjack/data/message_spec.rb
 - spec/lib/flapjack/data/notification_rule_spec.rb
 - spec/lib/flapjack/data/notification_spec.rb

data/lib/flapjack/data/global.rb

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'flapjack/data/entity_check'
-
-module Flapjack
-
-  module Data
-
-    class Global
-
-      # TODO maybe this should be an EntityCheck class method?
-      def self.unacknowledged_failing_checks(options = {})
-        raise "Redis connection not set" unless redis = options[:redis]
-
-        redis.zrange('failed_checks', '0', '-1').reject {|entity_check|
-          redis.exists(entity_check + ':unscheduled_maintenance')
-        }.collect {|entity_check|
-          Flapjack::Data::EntityCheck.for_event_id(entity_check, :redis => redis)
-        }
-      end
-
-    end
-
-  end
-
-end

data/spec/lib/flapjack/data/global_spec.rb

@@ -1,8 +0,0 @@
-require 'spec_helper'
-require 'flapjack/data/global'
-
-describe Flapjack::Data::Global do
-
-  it "returns unacknowledged failing checks"
-
-end