flapjack 1.3.0rc2 → 1.3.0rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a93d8f0d691ce0742f2957abd0d171652bd525c
-  data.tar.gz: ef1e19c328fad3675b27bf0e20dff95f12070025
+  metadata.gz: 3a99054ee2b384d5e9c228122908ccf56025729a
+  data.tar.gz: 9f460d85068057cf8063ebce88c199470efe8c91
 SHA512:
-  metadata.gz: 41ca70ac49c6eaf26b4adebc0b4eb0ef2190c1ae2620ff23d7442e282112817d85ba7fbba2554f6e6a3808f995ff85e35bcfe06bc8c8e6a08cb270276dcecbda
-  data.tar.gz: c0a0c02ab9c3336f3265b4c4a18c985e074e9c1d43174dea06cac81ae6700315b693835b4d982828ce02b6a5b41ea321b66166b671306ccff9c834c8e3af78e2
+  metadata.gz: 80ecfea159a7b1267f1288f32a2c672da1d73519fa9befc25299915eb786e24f577928737c05f04f339ac4eb00fbdc7312dcb64596c66c127a39fc0099125d18
+  data.tar.gz: d84a6a4b1cc227717f1b2b3ed91699d2908f4de32e44eab6f576b64cd5224e4fba189bed5341764d518a0dad2b1326b4b5eef568b718328ec6c13437b6f5608e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 1.3.0rc3 - 2015-02-17
+- Bug: cleanup gateway shutdown logic, fix #789 #790 (@ali-graham)
+- Chore: move init scripts to omnibus-flapjack repo (@Hobbsee)
+
 # 1.3.0rc2 - 2015-02-13
 - Bug: Error uninstalling - Error generating or dispatching SMS Nexmo message #789 (@Hobbsee)
 

data/lib/flapjack/data/alert.rb

@@ -130,6 +130,7 @@ module Flapjack
           end
           return nil
         end
+        return if 'shutdown'.eql?(parsed['notification_type'])
         self.new( parsed, :logger => opts[:logger] )
       end
 

data/lib/flapjack/data/event.rb

@@ -138,6 +138,7 @@ module Flapjack
       def self.parse_and_validate(raw, opts = {})
         errors = []
         if parsed = ::Flapjack.load_json(raw)
+          return if 'noop'.eql?(parsed['type'])
           if parsed.is_a?(Hash)
             errors = validation_errors_for_hash(parsed, opts)
           else

data/lib/flapjack/data/migration.rb

@@ -205,7 +205,7 @@ module Flapjack
 
         return if redis.exists('validated_scheduled_maintenance_periods')
 
-        Flapjack::Data::EntityCheck.all(:redis => redis).select {|ec|
+        Flapjack::Data::EntityCheck.all(:redis => redis).compact.select {|ec|
           ec.in_scheduled_maintenance?
         }.each do |check|
           check.update_current_scheduled_maintenance(:revalidate => true)

data/lib/flapjack/data/notification.rb

@@ -85,8 +85,9 @@ module Flapjack
           if options[:logger]
             options[:logger].warn("Error deserialising notification json: #{e}, raw json: #{raw.inspect}")
           end
-          return nil
+          return
         end
+        return if 'shutdown'.eql?(parsed['type'])
         self.new( parsed )
       end
 

data/lib/flapjack/gateways/aws_sns.rb

@@ -45,7 +45,8 @@ module Flapjack
         until @should_quit
           begin
             @logger.debug("aws_sns gateway is going into blpop mode on #{queue}")
-            deliver( Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger) )
+            alert = Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger)
+            deliver(alert) unless alert.nil?
           rescue => e
             @logger.error "Error generating or dispatching AWS SNS message: #{e.class}: #{e.message}\n" +
               e.backtrace.join("\n")

data/lib/flapjack/gateways/email.rb

@@ -51,7 +51,8 @@ module Flapjack
         until @should_quit
           begin
             @logger.debug("email gateway is going into blpop mode on #{queue}")
-            deliver( Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger) )
+            alert = Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger)
+            deliver(alert) unless alert.nil?
           rescue => e
             @logger.error "Error generating or dispatching email message: #{e.class}: #{e.message}\n" +
               e.backtrace.join("\n")

data/lib/flapjack/gateways/sms_messagenet.rb

@@ -45,7 +45,8 @@ module Flapjack
         until @should_quit
           begin
             @logger.debug("sms_messagenet gateway is going into blpop mode on #{queue}")
-            deliver( Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger) )
+            alert = Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger)
+            deliver(alert) unless alert.nil?
           rescue => e
             @logger.error "Error generating or dispatching SMS Messagenet message: #{e.class}: #{e.message}\n" +
               e.backtrace.join("\n")

data/lib/flapjack/gateways/sms_nexmo.rb

@@ -45,7 +45,8 @@ module Flapjack
         until @should_quit
           begin
             @logger.debug("sms_nexmo gateway is going into blpop mode on #{queue}")
-            deliver( Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger) )
+            alert = Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger)
+            deliver(alert) unless alert.nil?
           rescue => e
             @logger.error "Error generating or dispatching SMS Nexmo message: #{e.class}: #{e.message}\n" +
               e.backtrace.join("\n")

data/lib/flapjack/gateways/sms_twilio.rb

@@ -49,7 +49,8 @@ module Flapjack
         until @should_quit
           begin
             @logger.debug("sms_twilio gateway is going into blpop mode on #{queue}")
-            deliver( Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger) )
+            alert = Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger)
+            deliver(alert) unless alert.nil?
           rescue => e
             @logger.error "Error generating or dispatching SMS Twilio message: #{e.class}: #{e.message}\n" +
               e.backtrace.join("\n")

data/lib/flapjack/notifier.rb

@@ -66,7 +66,7 @@ module Flapjack
         notification = Flapjack::Data::Notification.next(@notifications_queue,
                                                          :redis => @redis,
                                                          :logger => @logger)
-        process_notification(notification) unless notification.nil? || (notification.type == 'shutdown')
+        process_notification(notification) unless notification.nil?
       end
 
       @logger.info("Exiting main loop.")

data/lib/flapjack/version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "1.3.0rc2"
+  VERSION = "1.3.0rc3"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 1.3.0rc2
+  version: 1.3.0rc3
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -387,9 +387,6 @@ files:
 - Rakefile
 - bin/flapjack
 - build.sh
-- dist/etc/init.d/flapjack
-- dist/etc/init.d/flapjack-nagios-receiver
-- dist/etc/init.d/flapper
 - etc/flapjack_config.yaml.example
 - features/ack_after_sched_maint.feature
 - features/cli.feature

data/dist/etc/init.d/flapjack

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides:       flapjack
-# Required-Start: $syslog $remote_fs redis-flapjack
-# Required-Stop:  $syslog $remote_fs redis-flapjack
-# Should-Start:   $local_fs
-# Should-Stop:    $local_fs
-# Default-Start:  2 3 4 5
-# Default-Stop:   0 1 6
-# Short-Description:  flapjack - scalable monitoring notification system
-# Description:    flapjack - scalable monitoring notification system
-### END INIT INFO
-
-# Copyright (c) 2009-2013 Lindsay Holmwood <lindsay@holmwood.id.au>
-#
-# Boots flapjack (coordinator, processor, notifier, gateways...)
-
-PATH=/opt/flapjack/bin:$PATH
-
-if [ ! $(which flapjack) ]; then
-  echo "Error: flapjack isn't in PATH."
-  echo "Refusing to do anything!"
-  exit 1
-fi
-
-# Evaluate command
-flapjack server $@
-
-RETVAL=$?
-exit $RETVAL
-

data/dist/etc/init.d/flapjack-nagios-receiver

@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2009-2013 Lindsay Holmwood <lindsay@holmwood.id.au>
-#
-# flapjack-nagios-receiver
-# reads from a nagios perfdata named-pipe and submits each event to the events queue in redis
-#
-
-PATH=/opt/flapjack/bin:$PATH
-
-if [ ! $(which flapjack) ]; then
-  echo "Error: flapjack isn't in PATH."
-  echo "Refusing to do anything!"
-  exit 1
-fi
-
-# Evaluate command
-flapjack receiver nagios $1 --daemonize
-
-RETVAL=$?
-exit $RETVAL

data/dist/etc/init.d/flapper

@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# flapper
-#
-
-PATH=/opt/flapjack/bin:$PATH
-
-if [ ! $(which flapjack) ]; then
-  echo "Error: flapjack isn't in PATH."
-  echo "Refusing to do anything!"
-  exit 1
-fi
-
-# Evaluate command
-flapjack flapper $1
-
-RETVAL=$?
-exit $RETVAL