flapjack 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fc94944c2fb13e947e99bdfe54b0fe6f69a80e3
-  data.tar.gz: 7f090f5ca4504a757a5e773937af868c7eed16ee
+  metadata.gz: 402e2bdf881bed38ea358f612379fb80d6447a28
+  data.tar.gz: 8cb9bc4bb2956c611ceec529456a8908955d515a
 SHA512:
-  metadata.gz: b63e5c995f7790525b8eb152a52621e5edb9a1eed65b5abef6e3c0068b8217df0ab34ef6f33c48f694bc19eefd6f247013b8e2eb3e8dd7c480e77c3e4745a5b0
-  data.tar.gz: 6d96a660e3bf02e1bbf820b7ba4d6f14322dc6db76ae621a89266d3d0da5aefa433aa5c4dadd69315a8f317631d649f654d308dddf1316220d331052ff06b2b3
+  metadata.gz: 6fa99305fd86b34e3d3fa7460012c9b7d5f611b21c80d7e6619f218a4688f595ef5c0eb9670aa78a1831658fe1bd3ebac43480a41cbffafd2a96ccd0e5195fe3
+  data.tar.gz: c348219851002bfcb5597a25a9d75888ae27e1f4129b62f7a1c2de6b19cbb1ba3056e1628410bd047be8302e9cbe979fcfe0b13ad3ee4beb92333ded6bf30740

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 0.8.7 - 2014-03-19
+- Added "tags" (array of strings) to event hash gh-453 (@portertech)
+- Allow contacts to be associated with a common entity "ALL" gh-454 (@portertech)
+
 # 0.8.6 - 2014-03-14
 - Bug: tie Thin to < 2.0.0pre gh-442 (@mattdelves)
 - Feature: Allow site-specific ERB templates for messages. gh-443 (@jswoods)

data/lib/flapjack/data/entity.rb

@@ -32,7 +32,7 @@ module Flapjack
         raise "Redis connection not set" unless redis = options[:redis]
         raise "Entity name not provided" unless entity['name'] && !entity['name'].empty?
 
-        #FIXME: should probably raise an exception if trying to create a new entity with the 
+        #FIXME: should probably raise an exception if trying to create a new entity with the
         # same name or id as an existing entity. (Go away and use update instead.)
         if entity['id']
           existing_name = redis.hget("entity:#{entity['id']}", 'name')
@@ -132,7 +132,8 @@ module Flapjack
       end
 
       def contacts
-        contact_ids = @redis.smembers("contacts_for:#{id}")
+        contact_ids = @redis.smembers("contacts_for:#{id}") +
+          @redis.smembers("contacts_for:ALL")
 
         if @logger
           @logger.debug("#{contact_ids.length} contact(s) for #{id} (#{name}): " +

data/lib/flapjack/data/event.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'oj'
+require 'flapjack/data/tag_set'
 
 module Flapjack
   module Data
@@ -11,7 +12,7 @@ module Flapjack
       attr_reader :check, :summary, :details, :acknowledgement_id
 
       REQUIRED_KEYS = ['type', 'state', 'entity', 'check', 'summary']
-      OPTIONAL_KEYS = ['time', 'details', 'acknowledgement_id', 'duration']
+      OPTIONAL_KEYS = ['time', 'details', 'acknowledgement_id', 'duration', 'tags']
 
       VALIDATIONS = {
         proc {|e| e['type'].is_a?(String) &&
@@ -50,6 +51,11 @@ module Flapjack
                   e['duration'].is_a?(Integer) ||
                  (e['duration'].is_a?(String) && !!(e['duration'] =~ /^\d+$/)) } =>
           "duration must be a positive integer, or a string castable to one",
+
+        proc {|e| e['tags'].nil? ||
+                  (e['tags'].is_a?(Array) &&
+                   e['tags'].all? {|tag| tag.is_a?(String)}) } =>
+          "tags must be an array of strings",
       }
 
       # Helper method for getting the next event.
@@ -203,6 +209,10 @@ module Flapjack
         end
         # details is optional. set it to nil if it only contains whitespace
         @details = (@details.is_a?(String) && ! @details.strip.empty?) ? @details.strip : nil
+        if attrs['tags']
+          @tags = Flapjack::Data::TagSet.new
+          attrs['tags'].each {|tag| @tags.add(tag)}
+        end
       end
 
       def state
@@ -261,4 +271,3 @@ module Flapjack
     end
   end
 end
-

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

data/spec/lib/flapjack/data/event_spec.rb

@@ -14,10 +14,11 @@ describe Flapjack::Data::Event do
                       'entity'  => entity_name,
                       'check'   => check,
                       'time'    => time.to_i,
-                      'summary' => "timeout",
+                      'summary' => 'timeout',
                       'details' => "couldn't access",
                       'acknowledgement_id' => '1234',
-                      'duration' => (60 * 60) }
+                      'duration' => (60 * 60),
+                      'tags' => ['dev'] }
   }
 
   context 'class' do
@@ -149,7 +150,7 @@ describe Flapjack::Data::Event do
       end
     end
 
-    ['time', 'details', 'acknowledgement_id', 'duration'].each do |optional_key|
+    ['time', 'details', 'acknowledgement_id', 'duration', 'tags'].each do |optional_key|
       it "rejects an event with invalid '#{optional_key}' key (archiving)" do
         bad_event_data = event_data.clone
         bad_event_data[optional_key] = {'hello' => 'there'}
@@ -300,6 +301,9 @@ describe Flapjack::Data::Event do
       expect(event.time).to eq(event_data['time'])
       expect(event.id).to eq('xyz-example.com:ping')
       expect(event.type).to eq('service')
+      expect(event.tags).to be_an_instance_of(Flapjack::Data::TagSet)
+      expect(event.tags).to include('dev')
+      expect(event.tags).to_not include('prod')
 
       expect(event).to be_a_service
       expect(event).to be_a_service

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante