flapjack 1.2.1rc1 → 1.2.1rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1038ee80ed4a85514dbe214c5a50768c3517db8e
-  data.tar.gz: 6373cd02ed2d57411ed732bb1b00eb3e449b6683
+  metadata.gz: c092ff47434ae5b8779b77e422ca2fbc3cec32df
+  data.tar.gz: 9c921600dc415ebb024ba5207571db063326e7fc
 SHA512:
-  metadata.gz: 4ebdf21010802ae6ff6cd737e0ca6be03428fbafd6cc7dd31a65da6fc8fe821c3bd35a375e5a2b0a05ea92a438fdd0e2909b5f6f65ff69a99d1eb5daabc78c7c
-  data.tar.gz: 91d761e805b496c781596559c1d32465c875208db46365c31f60e04b19c89ef34faf3d3e0adac3425149d02421433699b8f1b1adcd3fd0b19437f063bbcbe3ba
+  metadata.gz: 85c23c132e45faea927de004b369a416fc7f88bc17e4ff6f682bede8a3493749731074fd6112f8bcac3142dfe283787f72526055d40929d618c62836fb99607f
+  data.tar.gz: 202737eae76714ffaee089982854ba0efe743a0f84fba9d30a3dc0bcf8bd370ee6c265d382051c7c9b49ff89dac9c17753da2cac09f03a05a8c63ae4a0107ada

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Flapjack Changelog
 
+# 1.2.1rc2 - 2014-12-04
+- Bug: Correct scheduled maintenance periods with expiry that don't match their timestamps #734 (@ali-graham)
+
 # 1.2.1rc1 - 2014-12-04
 - Bug: Exception in pagerduty gateway when looking for acknowledgements #721 (@jessereynolds)
 - Bug: Retrieving scheduled maintenance via api fails when old entities without ids are present #711 (@jessereynolds)

data/Gemfile-ruby1.9.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flapjack (1.2.1rc1)
+    flapjack (1.2.1rc2)
       activesupport (~> 3.2.14)
       blather (~> 0.8.3)
       chronic

data/lib/flapjack/cli/maintenance.rb

@@ -68,6 +68,7 @@ module Flapjack
         return @redis unless @redis.nil?
         @redis = Redis.new(@redis_options.merge(:driver => :hiredis))
         Flapjack::Data::Migration.migrate_entity_check_data_if_required(:redis => @redis)
+        Flapjack::Data::Migration.validate_scheduled_maintenance_periods(:redis => @redis)
         @redis
       end
 

data/lib/flapjack/data/migration.rb

@@ -32,11 +32,10 @@ module Flapjack
 
       def self.create_entity_ids_if_required(options = {})
         raise "Redis connection not set" unless redis = options[:redis]
+
         logger = options[:logger]
 
-        if redis.exists('created_ids_for_old_entities_without_ids')
-          return
-        end
+        return if redis.exists('created_ids_for_old_entities_without_ids')
 
         semaphore = obtain_semaphore(ENTITY_DATA_MIGRATION, :redis => redis)
         if semaphore.nil?
@@ -71,9 +70,7 @@ module Flapjack
 
         logger = options[:logger]
 
-        if redis.exists('all_checks')
-          return
-        end
+        return if redis.exists('all_checks')
 
         semaphore = obtain_semaphore(ENTITY_DATA_MIGRATION, :redis => redis)
         if semaphore.nil?
@@ -160,9 +157,7 @@ module Flapjack
 
         logger = options[:logger]
 
-        if redis.exists('corrected_notification_rule_contact_linkages')
-          return
-        end
+        return if redis.exists('corrected_notification_rule_contact_linkages')
 
         invalid_notification_rule_keys = redis.keys("notification_rule:*").select {|k|
           contact_id = redis.hget(k, 'contact_id')
@@ -181,6 +176,23 @@ module Flapjack
         redis.set('corrected_notification_rule_contact_linkages', 'true')
       end
 
+      def self.validate_scheduled_maintenance_periods(options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+
+        logger = options[:logger]
+
+        return if redis.exists('validated_scheduled_maintenance_periods')
+
+        Flapjack::Data::EntityCheck.all(:redis => redis).select {|ec|
+          ec.in_scheduled_maintenance?
+        }.each do |check|
+          check.update_current_scheduled_maintenance(:revalidate => true)
+        end
+
+        logger.warn "Validated scheduled maintenance period expiry" unless logger.nil?
+        redis.set('validated_scheduled_maintenance_periods', 'true')
+      end
+
     end
   end
 end

data/lib/flapjack/redis_pool.rb

@@ -28,6 +28,8 @@ module Flapjack
         Flapjack::Data::Migration.create_entity_ids_if_required(:redis => redis,
           :logger => logger)
         Flapjack::Data::Migration.refresh_archive_index(:redis => redis)
+        Flapjack::Data::Migration.validate_scheduled_maintenance_periods(:redis => redis,
+          :logger => logger)
         redis
       }
     end

data/lib/flapjack/version.rb

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

data/spec/lib/flapjack/redis_pool_spec.rb

@@ -16,6 +16,7 @@ describe Flapjack::RedisPool do
       expect(Flapjack::Data::Migration).to receive(:migrate_entity_check_data_if_required).exactly(redis_count).times
       expect(Flapjack::Data::Migration).to receive(:create_entity_ids_if_required).exactly(redis_count).times
       expect(Flapjack::Data::Migration).to receive(:refresh_archive_index).exactly(redis_count).times
+      expect(Flapjack::Data::Migration).to receive(:validate_scheduled_maintenance_periods).exactly(redis_count).times
 
       frp = Flapjack::RedisPool.new(:size => redis_count)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 1.2.1rc1
+  version: 1.2.1rc2
 platform: ruby
 authors:
 - Lindsay Holmwood