flapjack 0.8.11 → 0.8.12

data/flapjack.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.version       = Flapjack::VERSION
 
   gem.add_dependency 'dante'
-  gem.add_dependency 'oj'
+  gem.add_dependency 'oj', '>= 2.9.0'
   gem.add_dependency 'eventmachine', '~> 1.0.0'
   gem.add_dependency 'hiredis'
   gem.add_dependency 'em-synchrony', '~> 1.0.2'
@@ -39,6 +39,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'tzinfo', '~> 1.0.1'
   gem.add_dependency 'tzinfo-data'
   gem.add_dependency 'rbtrace'
-
-  gem.add_development_dependency 'rake'
+  gem.add_dependency 'rake'
 end

data/lib/flapjack/configuration.rb

@@ -38,6 +38,7 @@ module Flapjack
 
       redis_path = (redis['path'] || nil)
       base_opts = {:db => (redis['db'] || 0)}
+      base_opts[:driver] = redis['driver'] if redis['driver']
       redis_config = base_opts.merge(
         (redis_path ? { :path => redis_path } :
                       { :host => (redis['host'] || '127.0.0.1'),

data/lib/flapjack/data/contact.rb

@@ -31,7 +31,7 @@ module Flapjack
           k =~ /^contact:(.*)$/
           id = $1
           contact = self.find_by_id(id, :redis => redis)
-          ret << contact if contact
+          ret << contact unless contact.nil?
           ret
         }.sort_by {|c| [c.last_name, c.first_name]}
       end

data/lib/flapjack/data/event.rb

@@ -121,30 +121,11 @@ module Flapjack
       def self.parse_and_validate(raw, opts = {})
         errors = []
         if parsed = ::Oj.load(raw)
-
           if parsed.is_a?(Hash)
-            missing_keys = REQUIRED_KEYS.select {|k|
-              !parsed.has_key?(k) || parsed[k].nil? || parsed[k].empty?
-            }
-            unless missing_keys.empty?
-              errors << "Event hash has missing keys '#{missing_keys.join('\', \'')}'"
-            end
-
-            unknown_keys =  parsed.keys - (REQUIRED_KEYS + OPTIONAL_KEYS)
-            unless unknown_keys.empty?
-              errors << "Event hash has unknown key(s) '#{unknown_keys.join('\', \'')}'"
-            end
+            errors = validation_errors_for_hash(parsed, opts)
           else
-            errors << "Event must be a JSON hash, see https://github.com/flpjck/flapjack/wiki/DATA_STRUCTURES#event-queue"
-          end
-
-          if errors.empty?
-            errors += VALIDATIONS.keys.inject([]) {|ret,vk|
-              ret << "Event #{VALIDATIONS[vk]}" unless vk.call(parsed)
-              ret
-            }
+            errors << "Event must be a JSON hash, see https://github.com/flapjack/flapjack/wiki/DATA_STRUCTURES#event-queue"
           end
-
           return parsed if errors.empty?
         end
 
@@ -160,6 +141,29 @@ module Flapjack
         nil
       end
 
+      def self.validation_errors_for_hash(hash, opts = {})
+        errors = []
+        missing_keys = REQUIRED_KEYS.select {|k|
+          !hash.has_key?(k) || hash[k].nil? || hash[k].empty?
+        }
+        unless missing_keys.empty?
+          errors << "Event hash has missing keys '#{missing_keys.join('\', \'')}'"
+        end
+
+        unknown_keys =  hash.keys - (REQUIRED_KEYS + OPTIONAL_KEYS)
+        unless unknown_keys.empty?
+          errors << "Event hash has unknown key(s) '#{unknown_keys.join('\', \'')}'"
+        end
+
+        if errors.empty?
+          errors += VALIDATIONS.keys.inject([]) {|ret,vk|
+            ret << "Event #{VALIDATIONS[vk]}" unless vk.call(hash)
+            ret
+          }
+        end
+        errors
+      end
+
       # creates, or modifies, an event object and adds it to the events list in redis
       #   'entity'    => entity,
       #   'check'     => check,

data/lib/flapjack/data/notification_rule.rb

@@ -16,17 +16,26 @@ module Flapjack
         :time_restrictions, :unknown_media, :warning_media, :critical_media,
         :unknown_blackhole, :warning_blackhole, :critical_blackhole
 
+      def self.all(options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+        redis.keys("contact_notification_rules:*").inject([]) do |memo, contact_key|
+          redis.smembers(contact_key).each do |rule_id|
+            ret = self.find_by_id(rule_id, :redis => redis)
+            memo << ret unless ret.nil?
+          end
+          memo
+        end
+      end
+
       def self.exists_with_id?(rule_id, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
         raise "No id value passed" unless not (rule_id.nil? || rule_id == '')
-        logger   = options[:logger]
         redis.exists("notification_rule:#{rule_id}")
       end
 
       def self.find_by_id(rule_id, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
         raise "No id value passed" unless not (rule_id.nil? || rule_id == '')
-        logger   = options[:logger]
 
         # sanity check
         return unless redis.exists("notification_rule:#{rule_id}")
@@ -34,6 +43,14 @@ module Flapjack
         self.new({:id => rule_id.to_s}, {:redis => redis})
       end
 
+      def self.find_by_ids(rule_ids, options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+
+        rule_ids.map do |id|
+          self.find_by_id(id, options)
+        end
+      end
+
       # replacing save! etc
       def self.add(rule_data, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
@@ -43,15 +60,18 @@ module Flapjack
           return errors
         end
         rule_id = rule_data[:id] || SecureRandom.uuid
-        errors = self.add_or_update(rule_data.merge(:id => rule_id), options)
+
+        errors = self.add_or_update(rule_data.merge(:id => rule_id), :redis => redis, :logger => options[:logger])
         return errors unless errors.nil? || errors.empty?
+
         self.find_by_id(rule_id, :redis => redis)
       end
 
-      def update(rule_data, opts = {})
-        errors = self.class.add_or_update({:contact_id => @contact_id}.merge(rule_data.merge(:id => @id)),
-          :redis => @redis, :logger => opts[:logger])
+      def update(update_data, opts = {})
+        rule_data = @redis.hgetall("notification_rule:#{@id}").merge(update_data.merge(:id => @id))
+        errors = self.class.add_or_update(rule_data, :redis => @redis, :logger => opts[:logger])
         return errors unless errors.nil? || errors.empty?
+
         refresh
         nil
       end
@@ -69,7 +89,6 @@ module Flapjack
         return unless !tr.nil? && tr.is_a?(Hash)
         return if timezone.nil? && !timezone.is_a?(ActiveSupport::TimeZone)
         return unless tr = prepare_time_restriction(tr, timezone)
-
         IceCube::Schedule.from_hash(tr)
       end
 
@@ -216,39 +235,34 @@ module Flapjack
         # this will hand back a 'deep' copy
         tr = symbolize(time_restriction)
 
-        return unless tr.has_key?(:start_time) && tr.has_key?(:end_time)
+        return unless (tr.has_key?(:start_time) || tr.has_key?(:start_date)) &&
+          (tr.has_key?(:end_time) || tr.has_key?(:end_date))
 
-        parsed_time = proc {|t|
-          if t.is_a?(Time)
-            t
+        parsed_time = proc {|tr, field|
+          if t = tr.delete(field)
+            t = t.dup
+            t = t[:time] if t.is_a?(Hash)
+
+            if t.is_a?(Time)
+              t
+            else
+              begin; (timezone || Time).parse(t); rescue ArgumentError; nil; end
+            end
           else
-            begin; (timezone || Time).parse(t); rescue ArgumentError; nil; end
+            nil
           end
         }
 
-        start_time = case tr[:start_time]
-        when String, Time
-          parsed_time.call(tr.delete(:start_time).dup)
-        when Hash
-          time_hash = tr.delete(:start_time).dup
-          parsed_time.call(time_hash[:time])
-        end
-
-        end_time = case tr[:end_time]
-        when String, Time
-          parsed_time.call(tr.delete(:end_time).dup)
-        when Hash
-          time_hash = tr.delete(:end_time).dup
-          parsed_time.call(time_hash[:time])
-        end
+        start_time = parsed_time.call(tr, :start_date) || parsed_time.call(tr, :start_time)
+        end_time   = parsed_time.call(tr, :end_date) || parsed_time.call(tr, :end_time)
 
         return unless start_time && end_time
 
-        tr[:start_date] = timezone ?
+        tr[:start_time] = timezone ?
                             {:time => start_time, :zone => timezone.name} :
                             start_time
 
-        tr[:end_date]   = timezone ?
+        tr[:end_time]   = timezone ?
                             {:time => end_time, :zone => timezone.name} :
                             end_time
 

data/lib/flapjack/gateways/api.rb

@@ -3,7 +3,7 @@
 # A HTTP-based API server, which provides queries to determine the status of
 # entities and the checks that are reported against them.
 #
-# There's a matching flapjack-diner gem at https://github.com/flpjck/flapjack-diner
+# There's a matching flapjack-diner gem at https://github.com/flapjack/flapjack-diner
 # which consumes data from this API.
 
 require 'time'

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

@@ -94,7 +94,7 @@ module Flapjack
           end
 
           # Returns all the contacts
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-get_contacts
           app.get '/contacts' do
             content_type :json
             "[" +
@@ -105,7 +105,7 @@ module Flapjack
           end
 
           # Returns the core information about the specified contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-get_contacts_id
           app.get '/contacts/:contact_id' do
             content_type :json
 
@@ -114,7 +114,7 @@ module Flapjack
           end
 
           # Lists this contact's notification rules
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id_notification_rules
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-get_contacts_id_notification_rules
           app.get '/contacts/:contact_id/notification_rules' do
             content_type :json
 
@@ -122,7 +122,7 @@ module Flapjack
           end
 
           # Get the specified notification rule for this user
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id_notification_rules_id
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-get_contacts_id_notification_rules_id
           app.get '/notification_rules/:id' do
             content_type :json
 
@@ -131,7 +131,7 @@ module Flapjack
           end
 
           # Creates a notification rule for a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-post_contacts_id_notification_rules
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-post_contacts_id_notification_rules
           app.post '/notification_rules' do
             content_type :json
 
@@ -157,7 +157,7 @@ module Flapjack
           end
 
           # Updates a notification rule
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-put_notification_rules_id
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-put_notification_rules_id
           app.put('/notification_rules/:id') do
             content_type :json
 
@@ -180,7 +180,7 @@ module Flapjack
           end
 
           # Deletes a notification rule
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-put_notification_rules_id
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-put_notification_rules_id
           app.delete('/notification_rules/:id') do
             logger.debug("delete /notification_rules/#{params[:id]}")
             rule = find_rule(params[:id])
@@ -191,7 +191,7 @@ module Flapjack
           end
 
           # Returns the media of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id_media
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-get_contacts_id_media
           app.get '/contacts/:contact_id/media' do
             content_type :json
 
@@ -209,7 +209,7 @@ module Flapjack
           end
 
           # Returns the specified media of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id_media_media
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-get_contacts_id_media_media
           app.get('/contacts/:contact_id/media/:id') do
             content_type :json
 
@@ -229,7 +229,7 @@ module Flapjack
           end
 
           # Creates or updates a media of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-put_contacts_id_media_media
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-put_contacts_id_media_media
           app.put('/contacts/:contact_id/media/:id') do
             content_type :json
 
@@ -275,7 +275,7 @@ module Flapjack
           end
 
           # Returns the timezone of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id_timezone
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-get_contacts_id_timezone
           app.get('/contacts/:contact_id/timezone') do
             content_type :json
 
@@ -284,7 +284,7 @@ module Flapjack
           end
 
           # Sets the timezone of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-put_contacts_id_timezone
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-put_contacts_id_timezone
           app.put('/contacts/:contact_id/timezone') do
             content_type :json
 
@@ -294,7 +294,7 @@ module Flapjack
           end
 
           # Removes the timezone of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-put_contacts_id_timezone
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-put_contacts_id_timezone
           app.delete('/contacts/:contact_id/timezone') do
             contact = find_contact(params[:contact_id])
             contact.timezone = nil

data/lib/flapjack/gateways/jabber.rb

@@ -379,7 +379,7 @@ module Flapjack
             number_found = entity_list.length
             case
             when number_found == 0
-              msg = "found no entities matching /#{pattern}/"
+              msg = "found no entities matching /#{entity_pattern}/"
             when number_found >= 1
               failing_list = Flapjack::Data::EntityCheck.find_all_failing_by_entity(:redis => @redis)
               entities = failing_list.select {|k,v| v.count >= 1 && entity_list.include?(k) }
@@ -414,7 +414,7 @@ module Flapjack
             number_found = entity_names.length
             case
             when number_found == 0
-              msg = "found no entities matching /#{pattern}/"
+              msg = "found no entities matching /#{entity_pattern}/"
             when number_found >= 1
               entities = entity_names.map {|name|
                 Flapjack::Data::Entity.find_by_name(name, :redis => @redis)

data/lib/flapjack/gateways/jsonapi.rb

@@ -3,7 +3,7 @@
 # A HTTP-based API server, which provides queries to determine the status of
 # entities and the checks that are reported against them.
 #
-# There's a matching flapjack-diner gem at https://github.com/flpjck/flapjack-diner
+# There's a matching flapjack-diner gem at https://github.com/flapjack/flapjack-diner
 # which consumes data from this API.
 
 require 'time'
@@ -20,6 +20,7 @@ require 'flapjack/gateways/jsonapi/check_methods'
 require 'flapjack/gateways/jsonapi/contact_methods'
 require 'flapjack/gateways/jsonapi/entity_methods'
 require 'flapjack/gateways/jsonapi/medium_methods'
+require 'flapjack/gateways/jsonapi/metrics_methods'
 require 'flapjack/gateways/jsonapi/notification_rule_methods'
 require 'flapjack/gateways/jsonapi/pagerduty_credential_methods'
 require 'flapjack/gateways/jsonapi/report_methods'
@@ -53,9 +54,16 @@ module Flapjack
       end
 
       class NotificationRuleNotFound < RuntimeError
-        attr_reader :rule_id
-        def initialize(rule_id)
-          @rule_id = rule_id
+        attr_reader :notification_rule_id
+        def initialize(notification_rule_id)
+          @notification_rule_id = notification_rule_id
+        end
+      end
+
+      class NotificationRulesNotFound < RuntimeError
+        attr_reader :notification_rule_ids
+        def initialize(notification_rule_ids)
+          @notification_rule_ids = notification_rule_ids
         end
       end
 
@@ -132,7 +140,9 @@ module Flapjack
         when Flapjack::Gateways::JSONAPI::ContactsNotFound
           rescue_error.call(404, e, request_info, "could not find contacts '" + e.contact_ids.join(', ') + "'")
         when Flapjack::Gateways::JSONAPI::NotificationRuleNotFound
-          rescue_error.call(404, e, request_info,"could not find notification rule '#{e.rule_id}'")
+          rescue_error.call(404, e, request_info,"could not find notification rule '#{e.notification_rule_id}'")
+        when Flapjack::Gateways::JSONAPI::NotificationRulesNotFound
+          rescue_error.call(404, e, request_info, "could not find notification rules '" + e.notification_rule_ids.join(', ') + "'")
         when Flapjack::Gateways::JSONAPI::EntityNotFound
           rescue_error.call(404, e, request_info, "could not find entity '#{e.entity}'")
         when Flapjack::Gateways::JSONAPI::EntityCheckNotFound
@@ -241,11 +251,6 @@ module Flapjack
           headers(cors_headers)
         end
 
-        def location(ids)
-          location = "#{base_url}#{request.path_info}#{ids.length == 1 ? '/' + ids.first : '?ids=' + ids.join(',')}"
-          headers({'Location' => location})
-        end
-
         def err(status, *msg)
           msg_str = msg.join(", ")
           logger.info "Error: #{msg_str}"
@@ -405,6 +410,7 @@ module Flapjack
       register Flapjack::Gateways::JSONAPI::ContactMethods
       register Flapjack::Gateways::JSONAPI::EntityMethods
       register Flapjack::Gateways::JSONAPI::MediumMethods
+      register Flapjack::Gateways::JSONAPI::MetricsMethods
       register Flapjack::Gateways::JSONAPI::NotificationRuleMethods
       register Flapjack::Gateways::JSONAPI::PagerdutyCredentialMethods
       register Flapjack::Gateways::JSONAPI::ReportMethods

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

@@ -89,15 +89,15 @@ module Flapjack
 
             semaphore.release
 
-            ids = contacts_data.map {|c| c['id']}
-            location(ids)
-            status 201
+            contact_ids = contacts_data.map {|c| c['id']}
 
-            contacts_data.map {|cd| cd['id']}.to_json
+            response.headers['Location'] = "#{base_url}/contacts/#{contact_ids.join(',')}"
+            status 201
+            contact_ids.to_json
           end
 
           # Returns all (/contacts) or some (/contacts/1,2,3) or one (/contacts/2) contact(s)
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts
+          # https://github.com/flapjack/flapjack/wiki/API#wiki-get_contacts
           app.get %r{^/contacts(?:/)?([^/]+)?$} do
             requested_contacts = if params[:captures] && params[:captures][0]
               params[:captures][0].split(',').uniq
@@ -108,7 +108,7 @@ module Flapjack
             contacts = if requested_contacts
               Flapjack::Data::Contact.find_by_ids(requested_contacts, :logger => logger, :redis => redis)
             else
-              Flapjack::Data::Contact.all(:redis => redis)
+              Flapjack::Data::Contact.all(:redis => redis).reject {|c| c.id.nil? || c.id.empty? }
             end
             contacts.compact!