flapjack 0.7.27 → 0.7.28

data/features/steps/notifications_steps.rb

@@ -136,7 +136,7 @@ end
 
 # TODO may need to get more complex, depending which SMS provider is used
 When /^the SMS notification handler runs successfully$/ do
-  @request = stub_request(:get, /^#{Regexp.escape(Flapjack::Gateways::SmsMessagenet::MESSAGENET_URL)}/)
+  @request = stub_request(:get, /^#{Regexp.escape(Flapjack::Gateways::SmsMessagenet::MESSAGENET_DEFAULT_URL)}/)
 
   Flapjack::Gateways::SmsMessagenet.instance_variable_set('@config', {'username' => 'abcd', 'password' => 'efgh'})
   Flapjack::Gateways::SmsMessagenet.instance_variable_set('@redis', @redis)
@@ -147,7 +147,7 @@ When /^the SMS notification handler runs successfully$/ do
 end
 
 When /^the SMS notification handler fails to send an SMS$/ do
-  @request = stub_request(:get, /^#{Regexp.escape(Flapjack::Gateways::SmsMessagenet::MESSAGENET_URL)}/).to_return(:status => [500, "Internal Server Error"])
+  @request = stub_request(:get, /^#{Regexp.escape(Flapjack::Gateways::SmsMessagenet::MESSAGENET_DEFAULT_URL)}/).to_return(:status => [500, "Internal Server Error"])
   Flapjack::Gateways::SmsMessagenet.instance_variable_set('@config', {'username' => 'abcd', 'password' => 'efgh'})
   Flapjack::Gateways::SmsMessagenet.instance_variable_set('@redis', @redis)
   Flapjack::Gateways::SmsMessagenet.instance_variable_set('@logger', @logger)

data/features/steps/packaging-lintian_steps.rb

@@ -12,7 +12,7 @@ Then /^every file in the output should start with "([^\"]*)"$/ do |string|
   end
 end
 
-When /^I run "([^"]*)"$/ do |cmd|
+When /^I run `([^"]*)`$/ do |cmd|
   #bin_path = '/usr/bin'
   #command = "#{bin_path}/#{cmd}"
 
@@ -21,7 +21,7 @@ When /^I run "([^"]*)"$/ do |cmd|
   @exit_status = $?.exitstatus
 end
 
-Then /^the exit status should be (\d+)$/ do |number|
+Then /^the exit value should be (\d+)$/ do |number|
   @exit_status.should == number.to_i
 end
 

data/features/support/daemons.rb

@@ -0,0 +1,113 @@
+#!/usr/bin/env ruby
+
+def red(text);    "\e[0;31;49m#{text}\e[0m"; end
+def yellow(text); "\e[0;33;49m#{text}\e[0m"; end
+def green(text);  "\e[0;32;49m#{text}\e[0m"; end
+def blue(text);   "\e[0;34;49m#{text}\e[0m"; end
+
+After('@process') do
+  kill_lingering_processes
+end
+
+PROCESSES = []
+
+def current_dir
+  File.join(*dirs)
+end
+
+def dirs
+  @dirs ||= ['tmp', 'cucumber_cli']
+end
+
+def write_file(file_name, file_content)
+  _create_file(file_name, file_content, false)
+end
+
+def _create_file(file_name, file_content, check_presence)
+  in_current_dir do
+    raise "expected #{file_name} to be present" if check_presence && !File.file?(file_name)
+    _mkdir(File.dirname(file_name))
+    File.open(file_name, 'w') { |f| f << file_content }
+  end
+end
+
+def in_current_dir(&block)
+  _mkdir(current_dir)
+  Dir.chdir(current_dir, &block)
+end
+
+def _mkdir(dir_name)
+  FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
+end
+
+def kill_lingering_processes
+  PROCESSES && PROCESSES.each do |process_h|
+    process = process_h[:process]
+    pid     = process ? process.pid : process_h[:pid]
+    command = process_h[:command]
+
+    begin
+      puts yellow("Killing process #{pid}") if @debug
+      Process.kill("KILL", pid)
+    rescue Errno::ESRCH
+      puts green("Process #{pid} has already exited.") if @debug
+    end
+
+    if @debug
+      if process
+        puts blue("Output from #{pid} #{command}\n")
+        puts process.read + "\n"
+      else
+        # TODO capture STDOUT from daemonize?
+      end
+    end
+  end
+  puts yellow("Done killing processes") if @debug
+  PROCESSES.clear
+end
+
+def time_and_pid_from_file(pid_file, cutoff_time = nil)
+  return unless File.exists?(pid_file)
+  file_time = File.mtime(pid_file)
+  return unless cutoff_time.nil? || (file_time.to_i >= cutoff_time.to_i)
+  [file_time, File.read(pid_file).strip.to_i]
+end
+
+def spawn_process(command, opts={})
+  puts yellow("Running: #{command}") if @debug
+
+  process_h = nil
+
+  file = opts[:daemon_pidfile]
+
+  if file
+    time = Time.now
+    attempts = 0
+
+    `#{command}`
+
+    while attempts < 50
+      time_and_pid = time_and_pid_from_file(file, time)
+      if time_and_pid
+        process_h = {:pid => time_and_pid.last, :command => command}
+        break
+      end
+      attempts += 1
+      sleep 0.2
+    end
+  else
+    process = IO.popen(command)
+    pid = process.pid
+    process_h = {:process => process, :command => command}
+  end
+
+  raise "failed to spawn process #{command}" if process_h.nil?
+
+  PROCESSES << process_h
+
+  process_h
+end
+
+at_exit do
+  kill_lingering_processes
+end

data/features/support/env.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 #
+
 require 'delorean'
 require 'chronic'
 require 'active_support/time'
@@ -12,6 +13,10 @@ if ENV['COVERAGE']
   SimpleCov.start do
     add_filter '/features/'
   end
+  SimpleCov.at_exit do
+    Oj.default_options = { :mode => :compat }
+    SimpleCov.result.format!
+  end
 end
 
 ENV["FLAPJACK_ENV"] = 'test'
@@ -24,6 +29,11 @@ require 'pathname'
 require 'webmock/cucumber'
 WebMock.disable_net_connect!
 
+require 'oj'
+Oj.mimic_JSON
+Oj.default_options = { :indent => 0, :mode => :strict }
+require 'active_support/json'
+
 require 'flapjack/notifier'
 require 'flapjack/processor'
 require 'flapjack/patches'
@@ -81,11 +91,11 @@ EXPIRE_AS_IF_AT
   end
 
   def self.time_travel_to(dest_time)
-    # puts "travelling to #{Time.now.in_time_zone}, real time is #{Time.now_without_delorean.in_time_zone}"
+    #puts "travelling to #{Time.now.in_time_zone}, real time is #{Time.now_without_delorean.in_time_zone}"
     old_maybe_fake_time = Time.now.in_time_zone
 
     Delorean.time_travel_to(dest_time)
-    # puts "travelled to #{Time.now.in_time_zone}, real time is #{Time.now_without_delorean.in_time_zone}"
+    #puts "travelled to #{Time.now.in_time_zone}, real time is #{Time.now_without_delorean.in_time_zone}"
     return if dest_time < old_maybe_fake_time
 
     # dumps the first offset -- we're not interested in time difference from
@@ -98,11 +108,11 @@ EXPIRE_AS_IF_AT
     delta = -offsets.inject(0){ |sum, val| sum + val }.floor
 
     real_time = Time.now_without_delorean.to_i
-    # puts "delta #{delta}, expire before real time #{Time.at(real_time + delta)}"
+    #puts "delta #{delta}, expire before real time #{Time.at(real_time + delta)}"
 
     result = @redis.evalsha(@expire_as_if_at_sha, ['*'],
                [real_time, real_time + delta])
-    # puts "Expired #{result} key#{(result == 1) ? '' : 's'}"
+    #puts "Expired #{result} key#{(result == 1) ? '' : 's'}"
   end
 
 end
@@ -170,3 +180,15 @@ After('@time') do
   Delorean.back_to_the_present
 end
 
+After('@process') do
+  ['tmp/cucumber_cli/flapjack_cfg.yml',
+   'tmp/cucumber_cli/flapjack_cfg.yml.bak',
+   'tmp/cucumber_cli/flapjack_cfg_d.yml',
+   'tmp/cucumber_cli/flapjack_d.log',
+   'tmp/cucumber_cli/flapjack_d.pid'].each do |file|
+    next unless File.exists?(file)
+    File.unlink(file)
+  end
+end
+
+

data/lib/flapjack/configuration.rb

@@ -7,6 +7,8 @@ module Flapjack
 
   class Configuration
 
+    DEFAULT_CONFIG_PATH = '/etc/flapjack/flapjack_config.yaml'
+
     attr_reader :filename
 
     def initialize(opts = {})

data/lib/flapjack/data/contact.rb

@@ -16,9 +16,10 @@ module Flapjack
 
     class Contact
 
-      attr_accessor :id, :first_name, :last_name, :email, :media, :media_intervals, :pagerduty_credentials
+      attr_accessor :id, :first_name, :last_name, :email, :media, :media_intervals, :media_rollup_thresholds, :pagerduty_credentials
 
       TAG_PREFIX = 'contact_tag'
+      ALL_MEDIA  = ['email', 'sms', 'jabber', 'pagerduty']
 
       def self.all(options = {})
         raise "Redis connection not set" unless redis = options[:redis]
@@ -40,7 +41,7 @@ module Flapjack
         # sanity check
         return unless redis.hexists("contact:#{contact_id}", 'first_name')
 
-        contact = self.new(:id => contact_id, :redis => redis)
+        contact = self.new(:id => contact_id, :redis => redis, :logger => logger)
         contact.refresh
         contact
       end
@@ -77,6 +78,7 @@ module Flapjack
           @redis.hmget("contact:#{@id}", 'first_name', 'last_name', 'email')
         self.media = @redis.hgetall("contact_media:#{@id}")
         self.media_intervals = @redis.hgetall("contact_media_intervals:#{self.id}")
+        self.media_rollup_thresholds = @redis.hgetall("contact_media_rollup_thresholds:#{self.id}")
 
         # similar to code in instance method pagerduty_credentials
         if service_key = @redis.hget("contact_media:#{@id}", 'pagerduty')
@@ -117,6 +119,7 @@ module Flapjack
 
         @redis.del("contact:#{self.id}", "contact_media:#{self.id}",
                    "contact_media_intervals:#{self.id}",
+                   "contact_media_rollup_thresholds:#{self.id}",
                    "contact_tz:#{self.id}", "contact_pagerduty:#{self.id}")
       end
 
@@ -177,8 +180,8 @@ module Flapjack
               :entities           => [],
               :tags               => Flapjack::Data::TagSet.new([]),
               :time_restrictions  => [],
-              :warning_media      => ['email', 'sms', 'jabber', 'pagerduty'],
-              :critical_media     => ['email', 'sms', 'jabber', 'pagerduty'],
+              :warning_media      => ALL_MEDIA,
+              :critical_media     => ALL_MEDIA,
               :warning_blackhole  => false,
               :critical_blackhole => false,
             }, :logger => opts[:logger])
@@ -216,6 +219,20 @@ module Flapjack
         self.media_intervals = @redis.hgetall("contact_media_intervals:#{self.id}")
       end
 
+      def rollup_threshold_for_media(media)
+        threshold = @redis.hget("contact_media_rollup_thresholds:#{self.id}", media)
+        (threshold.nil? || (threshold.to_i <= 0 )) ? nil : threshold.to_i
+      end
+
+      def set_rollup_threshold_for_media(media, threshold)
+        if threshold.nil?
+          @redis.hdel("contact_media_rollup_thresholds:#{self.id}", media)
+          return
+        end
+        @redis.hset("contact_media_rollup_thresholds:#{self.id}", media, threshold)
+        self.media_rollup_thresholds = @redis.hgetall("contact_media_rollup_thresholds:#{self.id}")
+      end
+
       def set_address_for_media(media, address)
         @redis.hset("contact_media:#{self.id}", media, address)
         if media == 'pagerduty'
@@ -229,6 +246,7 @@ module Flapjack
       def remove_media(media)
         @redis.hdel("contact_media:#{self.id}", media)
         @redis.hdel("contact_media_intervals:#{self.id}", media)
+        @redis.hdel("contact_media_rollup_thresholds:#{self.id}", media)
         if media == 'pagerduty'
           @redis.del("contact_pagerduty:#{self.id}")
         end
@@ -260,7 +278,57 @@ module Flapjack
         else
           @redis.set(key, 'd')
           @redis.expire(key, self.interval_for_media(media))
+          # TODO: #182 - update the alert history keys
+        end
+      end
+
+      def drop_rollup_notifications_for_media?(media)
+        @redis.exists("drop_rollup_alerts_for_contact:#{self.id}:#{media}")
+      end
+
+      def update_sent_rollup_alert_keys_for_media(media, opts = {})
+        delete = !! opts[:delete]
+        key = "drop_rollup_alerts_for_contact:#{self.id}:#{media}"
+        if delete
+          @redis.del(key)
+        else
+          @redis.set(key, 'd')
+          @redis.expire(key, self.interval_for_media(media))
+        end
+      end
+
+      def add_alerting_check_for_media(media, check)
+        @redis.zadd("contact_alerting_checks:#{self.id}:media:#{media}", Time.now.to_i, check)
+      end
+
+      def remove_alerting_check_for_media(media, check)
+        @redis.zrem("contact_alerting_checks:#{self.id}:media:#{media}", check)
+      end
+
+      # removes any checks that are in ok, scheduled or unscheduled maintenance
+      # from the alerting checks set for the given media
+      # returns the number of checks removed
+      def clean_alerting_checks_for_media(media)
+        key = "contact_alerting_checks:#{self.id}:media:#{media}"
+        cleaned = 0
+        alerting_checks_for_media(media).each do |check|
+          next unless Flapjack::Data::EntityCheck.state_for_event_id?(check, :redis => @redis) == 'ok' ||
+            Flapjack::Data::EntityCheck.in_unscheduled_maintenance_for_event_id?(check, :redis => @redis) ||
+            Flapjack::Data::EntityCheck.in_scheduled_maintenance_for_event_id?(check, :redis => @redis)
+
+          @logger.debug("removing from alerting checks for #{self.id}/#{media}: #{check}") if @logger
+          remove_alerting_check_for_media(media, check)
+          cleaned += 1
         end
+        cleaned
+      end
+
+      def alerting_checks_for_media(media)
+        @redis.zrange("contact_alerting_checks:#{self.id}:media:#{media}", 0, -1)
+      end
+
+      def count_alerting_checks_for_media(media)
+        @redis.zcard("contact_alerting_checks:#{self.id}:media:#{media}")
       end
 
       # FIXME
@@ -344,7 +412,8 @@ module Flapjack
 
       def initialize(options = {})
         raise "Redis connection not set" unless @redis = options[:redis]
-        @id = options[:id]
+        @id     = options[:id]
+        @logger = options[:logger]
       end
 
       # NB: should probably be called in the context of a Redis multi block; not doing so
@@ -360,6 +429,7 @@ module Flapjack
         unless contact_data['media'].nil?
           redis.del("contact_media:#{contact_id}")
           redis.del("contact_media_intervals:#{contact_id}")
+          redis.del("contact_media_rollup_thresholds:#{contact_id}")
           redis.del("contact_pagerduty:#{contact_id}")
 
           contact_data['media'].each_pair {|medium, details|
@@ -371,6 +441,7 @@ module Flapjack
             else
               redis.hset("contact_media:#{contact_id}", medium, details['address'])
               redis.hset("contact_media_intervals:#{contact_id}", medium, details['interval']) if details['interval']
+              redis.hset("contact_media_rollup_thresholds:#{contact_id}", medium, details['rollup_threshold']) if details['rollup_threshold']
             end
           }
         end

data/lib/flapjack/data/entity_check.rb

@@ -114,6 +114,21 @@ module Flapjack
         result
       end
 
+      def self.in_unscheduled_maintenance_for_event_id?(event_id, options)
+        raise "Redis connection not set" unless redis = options[:redis]
+        redis.exists("#{event_id}:unscheduled_maintenance")
+      end
+
+      def self.in_scheduled_maintenance_for_event_id?(event_id, options)
+        raise "Redis connection not set" unless redis = options[:redis]
+        redis.exists("#{event_id}:scheduled_maintenance")
+      end
+
+      def self.state_for_event_id?(event_id, options)
+        raise "Redis connection not set" unless redis = options[:redis]
+        redis.hget("check:#{event_id}", 'state')
+      end
+
       def entity_name
         entity.name
       end
@@ -536,6 +551,7 @@ module Flapjack
         raise "Invalid entity" unless @entity = entity
         raise "Invalid check" unless @check = check
         @key = "#{entity.name}:#{check}"
+        @logger = options[:logger]
       end
 
     end

data/lib/flapjack/data/message.rb

@@ -10,13 +10,14 @@ module Flapjack
   module Data
     class Message
 
-      attr_reader :medium, :address, :duration, :contact
+      attr_reader :medium, :address, :duration, :contact, :rollup
 
       def self.for_contact(contact, opts = {})
-        self.new(:contact => contact,
-                 :medium => opts[:medium],
-                 :address => opts[:address],
-                 :duration => opts[:duration])
+        self.new(:contact  => contact,
+                 :medium   => opts[:medium],
+                 :address  => opts[:address],
+                 :duration => opts[:duration],
+                 :rollup   => opts[:rollup])
       end
 
       def id
@@ -31,6 +32,7 @@ module Flapjack
         c = {'media'              => medium,
              'address'            => address,
              'id'                 => id,
+             'rollup'             => rollup,
              'contact_id'         => contact.id,
              'contact_first_name' => contact.first_name,
              'contact_last_name'  => contact.last_name}
@@ -41,10 +43,11 @@ module Flapjack
     private
 
       def initialize(opts = {})
-        @contact = opts[:contact]
-        @medium = opts[:medium]
-        @address = opts[:address]
+        @contact  = opts[:contact]
+        @medium   = opts[:medium]
+        @address  = opts[:address]
         @duration = opts[:duration]
+        @rollup   = opts[:rollup]
       end
 
     end