flapjack 0.6.53 → 0.6.54

data/lib/flapjack/gateways/oobetet.rb

@@ -8,15 +8,12 @@ require 'em-synchrony/fiber_iterator'
 require 'yajl/json_gem'
 
 require 'flapjack/utility'
-require 'flapjack/gateways/base'
 
 module Flapjack
 
   module Gateways
 
     class Oobetet < Blather::Client
-
-      include Flapjack::Gateways::Generic
       include Flapjack::Utility
 
       log = Logger.new(STDOUT)
@@ -24,13 +21,23 @@ module Flapjack
       log.level = Logger::INFO
       Blather.logger = log
 
+      def initialize(opts = {})
+        @config = opts[:config]
+        @logger = opts[:logger]
+        super()
+      end
+
+      def stop
+        @should_quit = true
+      end
+
       def setup
         @hostname = Socket.gethostname
         @flapjacktest_jid = Blather::JID.new((@config['jabberid'] || 'flapjacktest') + "/#{@hostname}:#{Process.pid}")
 
         super(@flapjacktest_jid, @config['password'], @config['server'], @config['port'].to_i)
 
-        logger.debug("Building jabber connection with jabberid: " +
+        @logger.debug("Building jabber connection with jabberid: " +
           @flapjacktest_jid.to_s + ", port: " + @config['port'].to_s +
           ", server: " + @config['server'].to_s + ", password: " +
           @config['password'].to_s)
@@ -80,12 +87,12 @@ module Flapjack
 
       # Join the MUC Chat room after connecting.
       def on_ready(stanza)
-        return if should_quit?
+        return if @should_quit
         @connected_at = Time.now.to_i
-        logger.info("Jabber Connected")
+        @logger.info("Jabber Connected")
         if @config['rooms'] && @config['rooms'].length > 0
           @config['rooms'].each do |room|
-            logger.info("Joining room #{room}")
+            @logger.info("Joining room #{room}")
             presence = Blather::Stanza::Presence.new
             presence.from = @flapjacktest_jid
             presence.to = Blather::JID.new("#{room}/#{@config['alias']}")
@@ -98,8 +105,8 @@ module Flapjack
 
       # returning true to prevent the reactor loop from stopping
       def on_disconnect(stanza)
-        return true if should_quit?
-        logger.warn("jabbers disconnected! reconnecting in 1 second ...")
+        return true if @should_quit
+        @logger.warn("jabbers disconnected! reconnecting in 1 second ...")
         EventMachine::Timer.new(1) do
           connect # Blather::Client.connect
         end
@@ -107,12 +114,12 @@ module Flapjack
       end
 
       def on_groupchat(stanza)
-        return if should_quit?
+        return if @should_quit
 
         stanza_body = stanza.body
 
-        logger.debug("groupchat stanza body: #{stanza_body}")
-        logger.debug("groupchat message received: #{stanza.inspect}")
+        @logger.debug("groupchat stanza body: #{stanza_body}")
+        @logger.debug("groupchat message received: #{stanza.inspect}")
 
         if (stanza_body =~ /^(?:problem|recovery|acknowledgement)/i) &&
            (stanza_body =~ /^(\w+).*#{Regexp.escape(@check_matcher)}/)
@@ -120,21 +127,21 @@ module Flapjack
           # got something interesting
           status = $1.downcase
           t = Time.now.to_i
-          logger.debug("groupchat found the following state for #{@check_matcher}: #{status}")
+          @logger.debug("groupchat found the following state for #{@check_matcher}: #{status}")
 
           case status
           when 'problem'
-            logger.debug("updating @times last_problem")
+            @logger.debug("updating @times last_problem")
             @times[:last_problem] = t
           when 'recovery'
-            logger.debug("updating @times last_recovery")
+            @logger.debug("updating @times last_recovery")
             @times[:last_recovery] = t
           when 'acknowledgement'
-            logger.debug("updating @times last_ack")
+            @logger.debug("updating @times last_ack")
             @times[:last_ack] = t
           end
         end
-        logger.debug("@times: #{@times.inspect}")
+        @logger.debug("@times: #{@times.inspect}")
       end
 
       def check_timers
@@ -209,15 +216,15 @@ module Flapjack
         http = EM::HttpRequest.new(@pagerduty_events_api_url).post(options)
         response = Yajl::Parser.parse(http.response)
         status   = http.response_header.status
-        logger.debug "send_pagerduty_event got a return code of #{status.to_s} - #{response.inspect}"
+        @logger.debug "send_pagerduty_event got a return code of #{status.to_s} - #{response.inspect}"
         [status, response]
       end
 
-      def main
-        logger.debug("New oobetet pikelet with the following options: #{@config.inspect}")
+      def start
+        @logger.debug("New oobetet pikelet with the following options: #{@config.inspect}")
 
         keepalive_timer = EM::Synchrony.add_periodic_timer(60) do
-          logger.debug("calling keepalive on the jabber connection")
+          @logger.debug("calling keepalive on the jabber connection")
           write(' ') if connected?
         end
 
@@ -225,7 +232,7 @@ module Flapjack
         register_handlers
         connect # Blather::Client.connect
 
-        until should_quit?
+        until @should_quit
           EM::Synchrony.sleep(10)
           check_timers
         end
@@ -236,6 +243,3 @@ module Flapjack
     end
   end
 end
-
-
-

data/lib/flapjack/gateways/pagerduty.rb

@@ -9,47 +9,36 @@ require 'flapjack/data/entity_check'
 require 'flapjack/data/global'
 require 'flapjack/redis_pool'
 
-require 'flapjack/gateways/base'
-
 module Flapjack
 
   module Gateways
 
     class Pagerduty
-      include Flapjack::Gateways::Generic
-
       PAGERDUTY_EVENTS_API_URL   = 'https://events.pagerduty.com/generic/2010-04-15/create_event.json'
       SEM_PAGERDUTY_ACKS_RUNNING = 'sem_pagerduty_acks_running'
 
-      alias_method :generic_bootstrap, :bootstrap
-      alias_method :generic_cleanup,   :cleanup
-
-      def bootstrap(opts = {})
-        generic_bootstrap(opts)
-
+      def initialize(opts = {})
+        @config = opts[:config]
+        @logger = opts[:logger]
         @redis_config = opts[:redis_config]
-        @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 1)
+        @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 2) # first will block
 
-        logger.debug("New Pagerduty pikelet with the following options: #{@config.inspect}")
+        @logger.debug("New Pagerduty pikelet with the following options: #{@config.inspect}")
 
         @pagerduty_acks_started = nil
+        super()
       end
 
-      def cleanup
-        @redis.empty! if @redis
-        @redis_timer.empty! if @redis_timer
-        generic_cleanup
+      def stop
+        @logger.info("stopping")
+        @should_quit = true
+        @redis.rpush(@config['queue'], JSON.generate('notification_type' => 'shutdown'))
       end
 
-      def add_shutdown_event(opts = {})
-        return unless redis = opts[:redis]
-        redis.rpush(@config['queue'], JSON.generate('notification_type' => 'shutdown'))
-      end
-
-      def main
-        logger.debug("pagerduty gateway - commencing main method")
+      def start
+        @logger.info("starting")
         while not test_pagerduty_connection do
-          logger.error("Can't connect to the pagerduty API, retrying after 10 seconds")
+          @logger.error("Can't connect to the pagerduty API, retrying after 10 seconds")
           EM::Synchrony.sleep(10)
         end
 
@@ -58,19 +47,18 @@ module Flapjack
         @redis.del(SEM_PAGERDUTY_ACKS_RUNNING)
 
         acknowledgement_timer = EM::Synchrony.add_periodic_timer(10) do
-          @redis_timer ||= Flapjack::RedisPool.new(:config => @redis_config, :size => 1)
           find_pagerduty_acknowledgements_if_safe
         end
 
         queue = @config['queue']
         events = {}
 
-        until should_quit?
-          logger.debug("pagerduty gateway is going into blpop mode on #{queue}")
+        until @should_quit
+          @logger.debug("pagerduty gateway is going into blpop mode on #{queue}")
           events[queue] = @redis.blpop(queue, 0)
           event         = Yajl::Parser.parse(events[queue][1])
           type          = event['notification_type']
-          logger.debug("pagerduty notification event popped off the queue: " + event.inspect)
+          @logger.debug("pagerduty notification event popped off the queue: " + event.inspect)
           unless 'shutdown'.eql?(type)
             event_id      = event['event_id']
             entity, check = event_id.split(':')
@@ -117,18 +105,18 @@ module Flapjack
         # timeout of five minutes to guard against stale locks caused by crashing code) either in this
         # process or in other processes
         if (@pagerduty_acks_started and @pagerduty_acks_started > (Time.now.to_i - 300)) or
-            @redis_timer.get(SEM_PAGERDUTY_ACKS_RUNNING) == 'true'
-          logger.debug("skipping looking for acks in pagerduty as this is already happening")
+            @redis.get(SEM_PAGERDUTY_ACKS_RUNNING) == 'true'
+          @logger.debug("skipping looking for acks in pagerduty as this is already happening")
           return
         end
 
         @pagerduty_acks_started = Time.now.to_i
-        @redis_timer.set(SEM_PAGERDUTY_ACKS_RUNNING, 'true')
-        @redis_timer.expire(SEM_PAGERDUTY_ACKS_RUNNING, 300)
+        @redis.set(SEM_PAGERDUTY_ACKS_RUNNING, 'true')
+        @redis.expire(SEM_PAGERDUTY_ACKS_RUNNING, 300)
 
         find_pagerduty_acknowledgements
 
-        @redis_timer.del(SEM_PAGERDUTY_ACKS_RUNNING)
+        @redis.del(SEM_PAGERDUTY_ACKS_RUNNING)
         @pagerduty_acks_started = nil
       end
 
@@ -141,7 +129,7 @@ module Flapjack
                  "description"  => "I love APIs with noops." }
         code, results = send_pagerduty_event(noop)
         return true if code == 200 && results['status'] =~ /success/i
-        logger.error "Error: test_pagerduty_connection: API returned #{code.to_s} #{results.inspect}"
+        @logger.error "Error: test_pagerduty_connection: API returned #{code.to_s} #{results.inspect}"
         false
       end
 
@@ -150,15 +138,14 @@ module Flapjack
         http = EM::HttpRequest.new(PAGERDUTY_EVENTS_API_URL).post(options)
         response = Yajl::Parser.parse(http.response)
         status   = http.response_header.status
-        logger.debug "send_pagerduty_event got a return code of #{status.to_s} - #{response.inspect}"
+        @logger.debug "send_pagerduty_event got a return code of #{status.to_s} - #{response.inspect}"
         [status, response]
       end
 
       def find_pagerduty_acknowledgements
+        @logger.debug("looking for acks in pagerduty for unack'd problems")
 
-        logger.debug("looking for acks in pagerduty for unack'd problems")
-
-        unacknowledged_failing_checks = Flapjack::Data::Global.unacknowledged_failing_checks(:redis => @redis_timer)
+        unacknowledged_failing_checks = Flapjack::Data::Global.unacknowledged_failing_checks(:redis => @redis)
 
         @logger.debug "found unacknowledged failing checks as follows: " + unacknowledged_failing_checks.join(', ')
 
@@ -190,7 +177,7 @@ module Flapjack
           end
 
           pg_acknowledged_by = acknowledged[:pg_acknowledged_by]
-          @logger.debug "#{entity_check.entity_name}:#{check} is acknowledged in pagerduty, creating flapjack acknowledgement... "
+          @logger.info "#{entity_check.entity_name}:#{check} is acknowledged in pagerduty, creating flapjack acknowledgement... "
           who_text = ""
           if !pg_acknowledged_by.nil? && !pg_acknowledged_by['name'].nil?
             who_text = " by #{pg_acknowledged_by['name']}"
@@ -223,12 +210,6 @@ module Flapjack
         @logger.debug("pagerduty_acknowledged?: auth: #{options[:head].inspect}")
 
         http = EM::HttpRequest.new(url).get(options)
-        # DEBUG flapjack-pagerduty: pagerduty_acknowledged?: decoded response as:
-        # {"incidents"=>[{"incident_number"=>40, "status"=>"acknowledged",
-        # "last_status_change_by"=>{"id"=>"PO1NWPS", "name"=>"Jesse Reynolds",
-        # "email"=>"jesse@bulletproof.net",
-        # "html_url"=>"http://bltprf.pagerduty.com/users/PO1NWPS"}}], "limit"=>100, "offset"=>0,
-        # "total"=>1}
         begin
           response = Yajl::Parser.parse(http.response)
         rescue Yajl::ParseError

data/lib/flapjack/gateways/sms_messagenet.rb

@@ -3,27 +3,20 @@
 require 'em-synchrony'
 require 'em-synchrony/em-http'
 
-require 'flapjack/gateways/base'
-
 module Flapjack
   module Gateways
     class SmsMessagenet
-      extend Flapjack::Gateways::Resque
 
       MESSAGENET_URL = 'https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage'
 
       class << self
 
-        alias_method :orig_bootstrap, :bootstrap
-
-        def bootstrap(opts = {})
-          return if @bootstrapped
+        def start
           @sent = 0
-          orig_bootstrap(opts)
         end
 
         def perform(notification)
-          logger.debug "Woo, got a notification to send out: #{notification.inspect}"
+          @logger.debug "Woo, got a notification to send out: #{notification.inspect}"
 
           notification_type  = notification['notification_type']
           contact_first_name = notification['contact_first_name']
@@ -50,15 +43,15 @@ module Flapjack
           notification['message'] = message
 
           # TODO log error and skip instead of raising errors
-          if config.nil? || (config.respond_to?(:empty?) && config.empty?)
-            logger.error "Messagenet config is missing"
+          if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
+            @logger.error "Messagenet config is missing"
             return
           end
 
           errors = []
 
-          username = config["username"]
-          password = config["password"]
+          username = @config["username"]
+          password = @config["password"]
           address  = notification['address']
           message  = notification['message']
           notification_id = notification['id']
@@ -74,7 +67,7 @@ module Flapjack
           end
 
           unless errors.empty?
-            errors.each {|err| logger.error err }
+            errors.each {|err| @logger.error err }
             return
           end
 
@@ -85,15 +78,15 @@ module Flapjack
 
           http = EM::HttpRequest.new(MESSAGENET_URL).get(:query => query)
 
-          logger.debug "server response: #{http.response}"
+          @logger.debug "server response: #{http.response}"
 
           status = (http.nil? || http.response_header.nil?) ? nil : http.response_header.status
           if (status >= 200) && (status <= 206)
             @sent += 1
-            logger.info "Sent SMS via Messagenet, response status is #{status}, " +
+            @logger.info "Sent SMS via Messagenet, response status is #{status}, " +
               "notification_id: #{notification_id}"
           else
-            logger.error "Failed to send SMS via Messagenet, response status is #{status}, " +
+            @logger.error "Failed to send SMS via Messagenet, response status is #{status}, " +
               "notification_id: #{notification_id}"
           end
 

data/lib/flapjack/gateways/web.rb

@@ -13,8 +13,6 @@ require 'flapjack/data/entity_check'
 require 'flapjack/redis_pool'
 require 'flapjack/utility'
 
-require 'flapjack/gateways/base'
-
 module Flapjack
 
   module Gateways
@@ -34,8 +32,8 @@ module Flapjack
             s, h, b = printer.call(env)
             [s, h, b]
           else
-            logger.error e.message
-            logger.error e.backtrace.join("\n")
+            @logger.error e.message
+            @logger.error e.backtrace.join("\n")
             [503, {}, ""]
           end
         end
@@ -46,29 +44,17 @@ module Flapjack
       use Rack::MethodOverride
 
       class << self
-        include Flapjack::Gateways::Thin
-
-        attr_accessor :redis
-
-        alias_method :thin_bootstrap, :bootstrap
-        alias_method :thin_cleanup,   :cleanup
+        def start
+          @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 1)
 
-        def bootstrap(opts = {})
-          thin_bootstrap(opts)
-          @redis = Flapjack::RedisPool.new(:config => opts[:redis_config], :size => 1)
+          @logger.info "starting web - class"
 
-          if config && config['access_log']
-            access_logger = Flapjack::AsyncLogger.new(config['access_log'])
+          if @config && @config['access_log']
+            access_logger = Flapjack::AsyncLogger.new(@config['access_log'])
             use Flapjack::CommonLogger, access_logger
           end
 
         end
-
-        def cleanup
-          @redis.empty! if @redis
-          thin_cleanup
-        end
-
       end
 
       include Flapjack::Utility

data/lib/flapjack/gateways/web/views/_css.haml

@@ -24,6 +24,9 @@
   table td.critical {
     background-color: #fb9a99;
   }
+  table td.unknown {
+    background-color: #fb9a99;
+  }
   table td.down {
     background-color: #fb9a99;
   }

data/lib/flapjack/gateways/web/views/check.haml

@@ -13,7 +13,7 @@
       %form{:action => "/acknowledgements/#{check_path_escaped}", :method => "post"}
         %h2
           State: #{@check_state ? @check_state.upcase : ''}
-        - if (['warning', 'critical'].include?(@check_state) and !(@current_unscheduled_maintenance || @current_scheduled_maintenance))
+        - if (['warning', 'critical', 'unknown'].include?(@check_state) and !(@current_unscheduled_maintenance || @current_scheduled_maintenance))
           %input{:type => 'hidden', :name => 'acknowledgement_id', :value => "#{@acknowledgement_id}"}
           %input{:type => 'submit', :value => 'Acknowledge', :class => 'button'}
           with