flapjack 1.2.0rc2 → 1.2.0

data/spec/lib/flapjack/data/migration_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+require 'flapjack/data/migration'
+require 'flapjack/data/notification_rule'
+
+describe Flapjack::Data::Migration, :redis => true do
+
+  it "fixes a notification rule wih no contact association" do
+    contact = Flapjack::Data::Contact.add( {
+        'id'         => 'c362',
+        'first_name' => 'John',
+        'last_name'  => 'Johnson',
+        'email'      => 'johnj@example.com',
+        'media'      => {
+          'pagerduty' => {
+            'service_key' => '123456789012345678901234',
+            'subdomain'   => 'flpjck',
+            'username'    => 'flapjack',
+            'password'    => 'very_secure'
+          },
+        },
+      },
+      :redis => @redis)
+
+    rule = contact.add_notification_rule(
+     :tags               => ["database","physical"],
+     :entities           => ["foo-app-01.example.com"],
+     :time_restrictions  => [],
+     :unknown_media      => [],
+     :warning_media      => ["email"],
+     :critical_media     => ["sms", "email"],
+     :unknown_blackhole  => false,
+     :warning_blackhole  => false,
+     :critical_blackhole => false
+    )
+
+    rule_id = rule.id
+
+    # degrade as the bug had previously
+    @redis.hset("notification_rule:#{rule.id}", 'contact_id', '')
+
+    rule = Flapjack::Data::NotificationRule.find_by_id(rule_id, :redis => @redis)
+    expect(rule).not_to be_nil
+    expect(rule.contact_id).to be_empty
+
+    Flapjack::Data::Migration.correct_notification_rule_contact_linkages(:redis => @redis)
+
+    rule = Flapjack::Data::NotificationRule.find_by_id(rule_id, :redis => @redis)
+    expect(rule).not_to be_nil
+    expect(rule.contact_id).to eq(contact.id)
+  end
+
+end

data/spec/lib/flapjack/gateways/jsonapi/check_methods_spec.rb

@@ -83,6 +83,16 @@ describe 'Flapjack::Gateways::JSONAPI::CheckMethods', :sinatra => true, :logger
     expect(last_response).to be_ok
     expect(last_response.body).to eq({:checks => [check_data, check_data_2]}.to_json)
   end
+
+  it "does not find a check" do
+    expect(Flapjack::Data::EntityCheck).to receive(:for_event_id).
+      with('www.example.com:SSH', :logger => @logger, :redis => redis).
+      and_return(nil)
+
+    aget '/checks/www.example.com:SSH'
+    expect(last_response).to be_not_found
+  end
+
   it "creates checks from a submitted list" do
     checks = {'checks' =>
       [

data/spec/lib/flapjack/gateways/jsonapi/report_methods_spec.rb

@@ -168,12 +168,9 @@ describe 'Flapjack::Gateways::JSONAPI::ReportMethods', :sinatra => true, :logger
     expect(last_response).to be_not_found
   end
 
-  it "should not show the status for a check that's not found on an entity" do
-    expect(Flapjack::Data::EntityCheck).to receive(:for_entity_name).
-      with(entity_name, 'SSH', :redis => redis).and_return(nil)
-
-    aget "/status_report/checks/#{entity_name}:SSH"
-    expect(last_response).to be_not_found
+  it "should not show the status for a check with a malformed name" do
+    aget "/status_report/checks/SSH"
+    expect(last_response.status).to eq(500)
   end
 
   it "returns a list of scheduled maintenance periods for an entity" do

data/spec/lib/flapjack/redis_pool_spec.rb

@@ -12,6 +12,7 @@ describe Flapjack::RedisPool do
         redis
       }
       expect(::Redis).to receive(:new).exactly(redis_count).times.and_return(*redis_conns)
+      expect(Flapjack::Data::Migration).to receive(:correct_notification_rule_contact_linkages).exactly(redis_count).times
       expect(Flapjack::Data::Migration).to receive(:migrate_entity_check_data_if_required).exactly(redis_count).times
       expect(Flapjack::Data::Migration).to receive(:refresh_archive_index).exactly(redis_count).times
 

data/tasks/benchmarks.rake

@@ -97,7 +97,7 @@ namespace :benchmarks do
   # - time to failure varies evenly between 1 hour and 1 month
   # - time to recovery varies evenly between 10 seconds and 1 week
   task :benchmark do
-    unless RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '8'
+    unless RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '9'
       # Flapjack doesn't support 1.8 or below, so just checking for 1.9 is OK
       raise "perftools.rb doesn't work on Ruby 2.0 or greater"
     end

data/tasks/entities.rake

@@ -129,10 +129,10 @@ namespace :entities do
 
         if id.nil? || entity.nil?
           id ||= SecureRandom.uuid
-          redis.multi
-          redis.hset('all_entity_ids_by_name', name, id)
-          redis.hset('all_entity_names_by_id', id, name)
-          redis.exec
+          redis.multi do
+            multi.hset('all_entity_ids_by_name', name, id)
+            multi.hset('all_entity_names_by_id', id, name)
+          end
           puts "Set id '#{id}' for entity #{name}'"
         elsif entity.name.eql?(name)
           puts "'#{name}' entity already exists with the provided id"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 1.2.0rc2
+  version: 1.2.0
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -55,6 +55,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
@@ -97,20 +111,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: em-resque
   requirement: !ruby/object:Gem::Requirement
@@ -552,6 +552,7 @@ files:
 - spec/lib/flapjack/data/entity_spec.rb
 - spec/lib/flapjack/data/event_spec.rb
 - spec/lib/flapjack/data/message_spec.rb
+- spec/lib/flapjack/data/migration_spec.rb
 - spec/lib/flapjack/data/notification_rule_spec.rb
 - spec/lib/flapjack/data/notification_spec.rb
 - spec/lib/flapjack/data/semaphore_spec.rb
@@ -635,9 +636,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -674,6 +675,7 @@ test_files:
 - spec/lib/flapjack/data/entity_spec.rb
 - spec/lib/flapjack/data/event_spec.rb
 - spec/lib/flapjack/data/message_spec.rb
+- spec/lib/flapjack/data/migration_spec.rb
 - spec/lib/flapjack/data/notification_rule_spec.rb
 - spec/lib/flapjack/data/notification_spec.rb
 - spec/lib/flapjack/data/semaphore_spec.rb