flapjack 1.1.0 → 1.2.0rc1

data/lib/flapjack/gateways/web.rb

@@ -167,7 +167,7 @@ module Flapjack
         check_stats
         @adjective = ''
 
-        checks_by_entity = Flapjack::Data::EntityCheck.find_current_by_entity(:redis => redis)
+        checks_by_entity = Flapjack::Data::EntityCheck.find_current_names_by_entity(:redis => redis)
         @states = checks_by_entity.keys.inject({}) {|result, entity_name|
           Flapjack::Data::Entity.find_by_name(entity_name, :redis => redis, :create => true)
           result[entity_name] = checks_by_entity[entity_name].sort.map {|check|
@@ -184,7 +184,7 @@ module Flapjack
         check_stats
         @adjective = 'failing'
 
-        checks_by_entity = Flapjack::Data::EntityCheck.find_current_failing_by_entity(:redis => redis)
+        checks_by_entity = Flapjack::Data::EntityCheck.find_current_names_failing_by_entity(:redis => redis)
         @states = checks_by_entity.keys.inject({}) {|result, entity|
           result[entity] = checks_by_entity[entity].sort.map {|check|
             [check] + entity_check_state(entity, check)
@@ -211,7 +211,7 @@ module Flapjack
         self_stats
         entity_stats
         check_stats
-        {
+        json_data = {
           'events_queued'       => @events_queued,
           'all_entities'        => @count_current_entities,
           'failing_entities'    => @count_failing_entities,
@@ -231,7 +231,8 @@ module Flapjack
           'boottime'            => @boot_time,
           'current_time'        => Time.now,
           'executive_instances' => @executive_instances,
-        }.to_json
+        }
+        Flapjack.dump_json(json_data)
       end
 
       get '/entities_all' do
@@ -258,7 +259,7 @@ module Flapjack
       get '/entities_failing' do
         entity_stats
         @adjective = 'failing'
-        @entities = Flapjack::Data::Entity.find_all_with_failing_checks(:redis => redis)
+        @entities = Flapjack::Data::Entity.find_all_names_with_failing_checks(:redis => redis)
 
         erb 'entities.html'.to_sym
       end
@@ -266,7 +267,7 @@ module Flapjack
       get '/entity/:entity' do
         @entity = params[:entity]
         entity_stats
-        @states = Flapjack::Data::EntityCheck.find_current_for_entity_name(@entity, :redis => redis).sort.map { |check|
+        @states = Flapjack::Data::EntityCheck.find_current_names_for_entity_name(@entity, :redis => redis).sort.map { |check|
           [check] + entity_check_state(@entity, check)
         }.sort_by {|parts| parts }
 
@@ -488,7 +489,7 @@ module Flapjack
 
       def entity_stats(entities = nil)
         @count_current_entities  = (entities || Flapjack::Data::Entity.all(:enabled => true, :redis => redis)).length
-        @count_failing_entities  = Flapjack::Data::Entity.find_all_with_failing_checks(:redis => redis).length
+        @count_failing_entities  = Flapjack::Data::Entity.find_all_names_with_failing_checks(:redis => redis).length
       end
 
       def check_stats

data/lib/flapjack/notifier.rb

@@ -4,8 +4,6 @@ require 'active_support/time'
 
 require 'em-hiredis'
 
-require 'oj'
-
 require 'flapjack/data/contact'
 require 'flapjack/data/entity_check'
 require 'flapjack/data/notification'
@@ -79,7 +77,7 @@ module Flapjack
       redis_uri = @redis_config[:path] ||
         "redis://#{@redis_config[:host] || '127.0.0.1'}:#{@redis_config[:port] || '6379'}/#{@redis_config[:db] || '0'}"
       shutdown_redis = EM::Hiredis.connect(redis_uri)
-      shutdown_redis.rpush(@notifications_queue, Oj.dump('type' => 'shutdown'))
+      shutdown_redis.rpush(@notifications_queue, Flapjack.dump_json('type' => 'shutdown'))
     end
 
   private
@@ -171,7 +169,7 @@ module Flapjack
         when :sns
           Resque.enqueue_to(@queues['sns'], Flapjack::Gateways::AwsSns, contents)
         else
-          @redis.rpush(@queues[media_type.to_s], Oj.dump(contents))
+          @redis.rpush(@queues[media_type.to_s], Flapjack.dump_json(contents))
         end
       end
     end

data/lib/flapjack/processor.rb

@@ -129,7 +129,7 @@ module Flapjack
         redis_uri = @redis_config[:path] ||
           "redis://#{@redis_config[:host] || '127.0.0.1'}:#{@redis_config[:port] || '6379'}/#{@redis_config[:db] || '0'}"
         shutdown_redis = EM::Hiredis.connect(redis_uri)
-        shutdown_redis.rpush('events', Oj.dump('type' => 'noop'))
+        shutdown_redis.rpush('events', Flapjack.dump_json('type' => 'noop'))
       end
     end
 
@@ -151,7 +151,7 @@ module Flapjack
       entity_check = Flapjack::Data::EntityCheck.for_event_id(event.id, :create_entity => true, :redis => @redis)
       timestamp = Time.now.to_i
 
-      event.tags = (event.tags || Flapjack::Data::TagSet.new) + entity_check.tags
+      event.tags = (event.tags || Set.new) + entity_check.tags
 
       should_notify, previous_state = update_keys(event, entity_check, timestamp)
 

data/lib/flapjack/version.rb

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

data/lib/flapjack.rb

@@ -1,6 +1,16 @@
 #!/usr/bin/env ruby
 
+require 'oj'
+
 module Flapjack
 
+  def self.load_json(data)
+    Oj.load(data, :mode => :strict, :symbol_keys => false)
+  end
+
+  def self.dump_json(data)
+    Oj.dump(data, :mode => :compat, :time_format => :ruby, :indent => 0)
+  end
+
 end
 

data/spec/lib/flapjack/coordinator_spec.rb

@@ -9,6 +9,8 @@ describe Flapjack::Coordinator do
 
   let(:logger) { double(Flapjack::Logger) }
 
+  let(:redis)  { double(::Redis) }
+
   let!(:time)  { Time.now }
 
   it "starts and stops a pikelet" do
@@ -19,6 +21,10 @@ describe Flapjack::Coordinator do
     expect(config).to receive(:for_redis).and_return({})
     expect(config).to receive(:all).twice.and_return(cfg)
 
+    expect(redis).to receive(:keys).with('entity_tag:*').and_return([])
+    expect(redis).to receive(:keys).with('check_tag:*').and_return([])
+    expect(Flapjack::RedisPool).to receive(:new).and_return(redis)
+
     processor = double('processor')
     expect(processor).to receive(:start)
     expect(processor).to receive(:stop)
@@ -52,6 +58,10 @@ describe Flapjack::Coordinator do
     expect(config).to receive(:for_redis).and_return({})
     expect(config).to receive(:all).twice.and_return(cfg)
 
+    expect(redis).to receive(:keys).with('entity_tag:*').and_return([])
+    expect(redis).to receive(:keys).with('check_tag:*').and_return([])
+    expect(Flapjack::RedisPool).to receive(:new).and_return(redis)
+
     processor = double('processor')
     expect(processor).to receive(:start).and_raise(RuntimeError)
     expect(processor).to receive(:stop)
@@ -79,6 +89,10 @@ describe Flapjack::Coordinator do
     expect(config).to receive(:for_redis).and_return({})
     expect(config).to receive(:all).twice.and_return(cfg)
 
+    expect(redis).to receive(:keys).with('entity_tag:*').and_return([])
+    expect(redis).to receive(:keys).with('check_tag:*').and_return([])
+    expect(Flapjack::RedisPool).to receive(:new).and_return(redis)
+
     processor = double('processor')
     expect(processor).to receive(:start)
     expect(processor).to receive(:stop)
@@ -121,6 +135,10 @@ describe Flapjack::Coordinator do
     expect(config).to receive(:for_redis).and_return({})
     expect(config).to receive(:all).twice.and_return(cfg)
 
+    expect(redis).to receive(:keys).with('entity_tag:*').and_return([])
+    expect(redis).to receive(:keys).with('check_tag:*').and_return([])
+    expect(Flapjack::RedisPool).to receive(:new).and_return(redis)
+
     processor = double('processor')
     expect(processor).to receive(:start)
     expect(processor).to receive(:stop)

data/spec/lib/flapjack/data/contact_spec.rb

@@ -1,11 +1,6 @@
 require 'spec_helper'
 
-require 'active_support/time_with_zone'
-require 'ice_cube'
 require 'flapjack/data/contact'
-require 'flapjack/data/entity_check'
-require 'flapjack/data/notification_rule'
-require 'flapjack/data/tag_set'
 
 describe Flapjack::Data::Contact, :redis => true do
 
@@ -24,7 +19,7 @@ describe Flapjack::Data::Contact, :redis => true do
 
   let(:general_notification_rule_data) {
     {:entities           => [],
-     :tags               => Flapjack::Data::TagSet.new([]),
+     :tags               => Set.new([]),
      :time_restrictions  => [],
      :unknown_media      => [],
      :warning_media      => ['email', 'sms', 'sms_twilio', 'jabber', 'pagerduty', 'sns'],
@@ -193,9 +188,8 @@ describe Flapjack::Data::Contact, :redis => true do
     expect(rules.select {|r| r.is_specific? }.size).to eq(1)
   end
 
-  it "deletes a contact by id, including linked entities, checks, tags and notification rules" do
+  it "deletes a contact by id, including linked entities, checks and notification rules" do
     contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
-    contact.add_tags('admin')
 
     entity_name = 'abc-123'
 
@@ -206,10 +200,8 @@ describe Flapjack::Data::Contact, :redis => true do
 
     expect {
       expect {
-        expect {
-          contact.delete!
-        }.to change { Flapjack::Data::Contact.all(:redis => @redis).size }.by(-1)
-      }.to change { @redis.smembers('contact_tag:admin').size }.by(-1)
+        contact.delete!
+      }.to change { Flapjack::Data::Contact.all(:redis => @redis).size }.by(-1)
     }.to change { entity.contacts.size }.by(-1)
   end
 

data/spec/lib/flapjack/data/entity_check_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-require 'flapjack/data/entity'
 require 'flapjack/data/entity_check'
-require 'flapjack/data/tag_set'
 
 describe Flapjack::Data::EntityCheck, :redis => true do
 
@@ -88,6 +86,61 @@ describe Flapjack::Data::EntityCheck, :redis => true do
     }.to raise_error
   end
 
+  it 'registers with current_checks and current_entities if explicitly added' do
+    expect(@redis.zrange("current_checks:#{name}", 0, -1)).to eq([])
+    expect(@redis.zrange("current_entities", 0, -1)).to eq([])
+
+    check_data = {'entity_id' => '5000',
+                  'name'      => 'ssh'}
+
+    Flapjack::Data::EntityCheck.add(check_data, :redis => @redis)
+
+    expect(@redis.zrange("current_checks:#{name}", 0, -1)).to eq(["ssh"])
+    expect(@redis.zrange("current_entities", 0, -1)).to eq([name])
+  end
+
+  it 'creates tags if passed when explicitly added' do
+    check_data = {'entity_id' => '5000',
+                  'name'      => 'ssh',
+                  'tags'      => ['virtual', 'staging']}
+
+    Flapjack::Data::EntityCheck.add(check_data, :redis => @redis)
+
+    entity_check = Flapjack::Data::EntityCheck.for_event_id("#{name}:ssh", :redis => @redis)
+    expect(entity_check).not_to be_nil
+    expect(entity_check.tags).to eq(Set.new(['abc-123', 'ssh', 'virtual', 'staging']))
+  end
+
+  it "adds tags to checks" do
+    entity_check = Flapjack::Data::EntityCheck.for_entity_name(name, 'ping', :redis => @redis)
+
+    entity_check.add_tags('source:foobar', 'foo')
+
+    expect(entity_check.tags).to include("source:foobar")
+    expect(entity_check.tags).to include("foo")
+
+    # and test the tags as read back from redis
+    entity_check = Flapjack::Data::EntityCheck.for_event_id("#{name}:ping", :redis => @redis)
+    expect(entity_check.tags).to include("source:foobar")
+    expect(entity_check.tags).to include("foo")
+  end
+
+  it "deletes tags from checks" do
+    entity_check = Flapjack::Data::EntityCheck.for_entity_name(name, 'ping', :redis => @redis)
+
+    entity_check.add_tags('source:foobar', 'foo')
+
+    expect(entity_check.tags).to include("source:foobar")
+    expect(entity_check.tags).to include("foo")
+
+    entity_check.delete_tags('source:foobar')
+
+    # and test the tags as read back from redis
+    entity_check = Flapjack::Data::EntityCheck.for_event_id("#{name}:ping", :redis => @redis)
+    expect(entity_check.tags).not_to include("source:foobar")
+    expect(entity_check.tags).to include("foo")
+  end
+
   context "maintenance" do
 
     it "returns that it is in unscheduled maintenance" do
@@ -1349,7 +1402,7 @@ describe Flapjack::Data::EntityCheck, :redis => true do
     ec = Flapjack::Data::EntityCheck.for_entity_name('foo-app-01.example.com', 'Disk / Utilisation', :create_entity => true, :redis => @redis)
     tags = ec.tags
     expect(tags).not_to be_nil
-    expect(tags).to be_a(Flapjack::Data::TagSet)
+    expect(tags).to be_a(Set)
     expect(['foo-app-01', 'example.com', 'disk', '/', 'utilisation'].to_set.subset?(tags)).to be true
   end
 

data/spec/lib/flapjack/data/entity_spec.rb

@@ -14,6 +14,17 @@ describe Flapjack::Data::Entity, :redis => true do
     expect(@redis.get("entity_id:#{name}")).to match(/^\S+$/)
   end
 
+  it 'creates tags if passed when added' do
+    Flapjack::Data::Entity.add({'id'   => '5000',
+                                'name' => name,
+                                'tags' => ['database', 'virtual']},
+                                :redis => @redis)
+
+    entity = Flapjack::Data::Entity.find_by_id('5000', :redis => @redis)
+    expect(entity).not_to be_nil
+    expect(entity.tags).to eq(Set.new(['database', 'virtual']))
+  end
+
   it "adds a registered contact with an entity" do
     Flapjack::Data::Contact.add({'id'         => '362',
                                  'first_name' => 'John',
@@ -182,73 +193,74 @@ describe Flapjack::Data::Entity, :redis => true do
 
   end
 
-  it "finds entities by tag" do
-    entity0 = Flapjack::Data::Entity.add({'id'       => '5000',
-                                          'name'     => 'abc-123',
-                                          'contacts' => []},
-                                         :redis => @redis)
-
-    entity1 = Flapjack::Data::Entity.add({'id'       => '5001',
-                                          'name'     => 'def-456',
-                                          'contacts' => []},
-                                         :redis => @redis)
-
-    entity0.add_tags('source:foobar', 'abc')
-    entity1.add_tags('source:foobar', 'def')
-
-    expect(entity0).not_to be_nil
-    expect(entity0).to be_an(Flapjack::Data::Entity)
-    expect(entity0.tags).to include("source:foobar")
-    expect(entity0.tags).to include("abc")
-    expect(entity0.tags).not_to include("def")
-    expect(entity1).not_to be_nil
-    expect(entity1).to be_an(Flapjack::Data::Entity)
-    expect(entity1.tags).to include("source:foobar")
-    expect(entity1.tags).to include("def")
-    expect(entity1.tags).not_to include("abc")
-
-    entities = Flapjack::Data::Entity.find_all_with_tags(['abc'], :redis => @redis)
-    expect(entities).to be_an(Array)
-    expect(entities.size).to eq(1)
-    expect(entities.first).to eq('abc-123')
-
-    entities = Flapjack::Data::Entity.find_all_with_tags(['donkey'], :redis => @redis)
-    expect(entities).to be_an(Array)
-    expect(entities).to be_empty
-  end
-
-  it "finds entities with several tags" do
-    entity0 = Flapjack::Data::Entity.add({'id'       => '5000',
-                                         'name'     => 'abc-123',
-                                         'contacts' => []},
-                                        :redis => @redis)
-
-    entity1 = Flapjack::Data::Entity.add({'id'       => '5001',
-                                         'name'     => 'def-456',
-                                         'contacts' => []},
-                                        :redis => @redis)
-
-    entity0.add_tags('source:foobar', 'abc')
-    entity1.add_tags('source:foobar', 'def')
-
-    expect(entity0).not_to be_nil
-    expect(entity0).to be_an(Flapjack::Data::Entity)
-    expect(entity0.tags).to include("source:foobar")
-    expect(entity0.tags).to include("abc")
-    expect(entity1).not_to be_nil
-    expect(entity1).to be_an(Flapjack::Data::Entity)
-    expect(entity1.tags).to include("source:foobar")
-    expect(entity1.tags).to include("def")
-
-    entities = Flapjack::Data::Entity.find_all_with_tags(['source:foobar'], :redis => @redis)
-    expect(entities).to be_an(Array)
-    expect(entities.size).to eq(2)
-
-    entities = Flapjack::Data::Entity.find_all_with_tags(['source:foobar', 'def'], :redis => @redis)
-    expect(entities).to be_an(Array)
-    expect(entities.size).to eq(1)
-    expect(entities.first).to eq('def-456')
-  end
+  # # Not used anywhere
+  # it "finds entities by tag" do
+  #   entity0 = Flapjack::Data::Entity.add({'id'       => '5000',
+  #                                         'name'     => 'abc-123',
+  #                                         'contacts' => []},
+  #                                        :redis => @redis)
+
+  #   entity1 = Flapjack::Data::Entity.add({'id'       => '5001',
+  #                                         'name'     => 'def-456',
+  #                                         'contacts' => []},
+  #                                        :redis => @redis)
+
+  #   entity0.add_tags('source:foobar', 'abc')
+  #   entity1.add_tags('source:foobar', 'def')
+
+  #   expect(entity0).not_to be_nil
+  #   expect(entity0).to be_an(Flapjack::Data::Entity)
+  #   expect(entity0.tags).to include("source:foobar")
+  #   expect(entity0.tags).to include("abc")
+  #   expect(entity0.tags).not_to include("def")
+  #   expect(entity1).not_to be_nil
+  #   expect(entity1).to be_an(Flapjack::Data::Entity)
+  #   expect(entity1.tags).to include("source:foobar")
+  #   expect(entity1.tags).to include("def")
+  #   expect(entity1.tags).not_to include("abc")
+
+  #   entities = Flapjack::Data::Entity.find_all_with_tags(['abc'], :redis => @redis)
+  #   expect(entities).to be_an(Array)
+  #   expect(entities.size).to eq(1)
+  #   expect(entities.first).to eq('abc-123')
+
+  #   entities = Flapjack::Data::Entity.find_all_with_tags(['donkey'], :redis => @redis)
+  #   expect(entities).to be_an(Array)
+  #   expect(entities).to be_empty
+  # end
+
+  # it "finds entities with several tags" do
+  #   entity0 = Flapjack::Data::Entity.add({'id'       => '5000',
+  #                                        'name'     => 'abc-123',
+  #                                        'contacts' => []},
+  #                                       :redis => @redis)
+
+  #   entity1 = Flapjack::Data::Entity.add({'id'       => '5001',
+  #                                        'name'     => 'def-456',
+  #                                        'contacts' => []},
+  #                                       :redis => @redis)
+
+  #   entity0.add_tags('source:foobar', 'abc')
+  #   entity1.add_tags('source:foobar', 'def')
+
+  #   expect(entity0).not_to be_nil
+  #   expect(entity0).to be_an(Flapjack::Data::Entity)
+  #   expect(entity0.tags).to include("source:foobar")
+  #   expect(entity0.tags).to include("abc")
+  #   expect(entity1).not_to be_nil
+  #   expect(entity1).to be_an(Flapjack::Data::Entity)
+  #   expect(entity1.tags).to include("source:foobar")
+  #   expect(entity1.tags).to include("def")
+
+  #   entities = Flapjack::Data::Entity.find_all_with_tags(['source:foobar'], :redis => @redis)
+  #   expect(entities).to be_an(Array)
+  #   expect(entities.size).to eq(2)
+
+  #   entities = Flapjack::Data::Entity.find_all_with_tags(['source:foobar', 'def'], :redis => @redis)
+  #   expect(entities).to be_an(Array)
+  #   expect(entities.size).to eq(1)
+  #   expect(entities.first).to eq('def-456')
+  # end
 
   context 'renaming and merging' do