flapjack 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac75cd5f3cf88878ef41b54de2a1d4ca3007387e
-  data.tar.gz: 941ba78adea49cfa2025c5b848d7debf070d37b5
+  metadata.gz: de195d7c1f069b7e1817c654b51315c55df5ec37
+  data.tar.gz: b6f8b5059820e001df53e1a7f3ef6fdbd49c90cb
 SHA512:
-  metadata.gz: d55e5a48109d8eb7733dd45e854ac590b2f069fd6011aeb2017bbe0fbad66feacd41a460c5945bf42953f4afd3486f0be82c5155a3fce2f3ecb3d661c05919b8
-  data.tar.gz: 20666c66b76ef55c0105c1929a86073979280e11b91b31ac9498720bbb751dac3bd72fac3dba1bba747673275bb9bde1cb0f2b417f00f8a4eeed5348ac202505
+  metadata.gz: e0131f314a1c13869035a9ec07cbca94bd8a79b56af800b7183291e50fade89bccd023223ccf2b7037d0c8bab9fc20ca25aec348e0e0ca8baf371071f530ad47
+  data.tar.gz: 9710ad57f6ced3f0b4f276690dce38e5accd4361613ef3944811893d7faa46c5871e92e07da2cd30428d7a85cfc2b3d7887067c9b1f068565fc577410c7538c6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Flapjack Changelog
 
+# 0.8.10 - 2014-04-28
+- Feature: Add regex entities to notification rules #463 (@jswoods)
+- Bug: oobetet gateway exception sending pagerduty event #464 (@jessereynolds)
+- Bug: Event counters don't add up #465 (@jessereynolds)
+
 # 0.8.9 - 2014-04-21
 - Feature: Support arbitrary gateways in notifier, queue names from config gh-456 (@auxesis)
 - Feature: Add chat bot features (ack by regex, query status by regex) gh-459 (@someword)

data/lib/flapjack/data/contact.rb

@@ -246,6 +246,7 @@ module Flapjack
         if rules.all? {|r| r.is_specific? } # also true if empty
           rule = self.add_notification_rule({
               :entities           => [],
+              :regex_entities     => [],
               :tags               => Flapjack::Data::TagSet.new([]),
               :regex_tags         => Flapjack::Data::TagSet.new([]),
               :time_restrictions  => [],

data/lib/flapjack/data/event.rb

@@ -261,7 +261,7 @@ module Flapjack
       end
 
       def failure?
-        ['critical', 'warning', 'unknown'].include?(state)
+        ['critical', 'warning', 'unknown', 'down', 'unreachable'].include?(state)
       end
 
       # # Not used anywhere

data/lib/flapjack/data/notification.rb

@@ -143,16 +143,19 @@ module Flapjack
             # matchers are rules of the contact that have matched the current event
             # for time, entity and tags
             matchers = rules.select do |rule|
-              logger.debug("considering rule with entities: #{rule.entities}, tags: #{rule.tags.to_json} and regex tags: #{rule.regex_tags.to_json}")
-              rule_has_tags       = rule.tags       ? (rule.tags.length > 0)       : false
-              rule_has_regex_tags = rule.regex_tags ? (rule.regex_tags.length > 0) : false
-              rule_has_entities   = rule.entities   ? (rule.entities.length > 0)   : false
-
-              matches_tags       = rule_has_tags       ? rule.match_tags?(@tags)       : true
-              matches_regex_tags = rule_has_regex_tags ? rule.match_regex_tags?(@tags) : true
-              matches_entity     = rule_has_entities   ? rule.match_entity?(@event_id) : true
-
-              ((matches_entity && matches_tags && matches_regex_tags) || ! rule.is_specific?) &&
+              logger.debug("considering rule with entities: #{rule.entities}, entities regex: #{rule.regex_entities},
+                           tags: #{rule.tags.to_json} and regex tags: #{rule.regex_tags.to_json}")
+              rule_has_tags           = rule.tags           ? (rule.tags.length > 0)           : false
+              rule_has_regex_tags     = rule.regex_tags     ? (rule.regex_tags.length > 0)     : false
+              rule_has_entities       = rule.entities       ? (rule.entities.length > 0)       : false
+              rule_has_regex_entities = rule.regex_entities ? (rule.regex_entities.length > 0) : false
+
+              matches_tags           = rule_has_tags           ? rule.match_tags?(@tags)               : true
+              matches_regex_tags     = rule_has_regex_tags     ? rule.match_regex_tags?(@tags)         : true
+              matches_entity         = rule_has_entities       ? rule.match_entity?(@event_id)         : true
+              matches_regex_entities = rule_has_regex_entities ? rule.match_regex_entities?(@event_id) : true
+
+              ((matches_entity && matches_regex_entities && matches_tags && matches_regex_tags) || ! rule.is_specific?) &&
                 rule_occurring_now?(rule, :contact => contact, :default_timezone => default_timezone)
             end
 

data/lib/flapjack/data/notification_rule.rb

@@ -12,7 +12,7 @@ module Flapjack
 
       extend Flapjack::Utility
 
-      attr_accessor :id, :contact_id, :entities, :tags, :regex_tags,
+      attr_accessor :id, :contact_id, :entities, :regex_entities, :tags, :regex_tags,
         :time_restrictions, :unknown_media, :warning_media, :critical_media,
         :unknown_blackhole, :warning_blackhole, :critical_blackhole
 
@@ -74,7 +74,7 @@ module Flapjack
       end
 
       def to_json(*args)
-        self.class.hashify(:id, :contact_id, :tags, :regex_tags, :entities,
+        self.class.hashify(:id, :contact_id, :tags, :regex_tags, :entities, :regex_entities,
             :time_restrictions, :unknown_media, :warning_media, :critical_media,
             :unknown_blackhole, :warning_blackhole, :critical_blackhole) {|k|
           [k, self.send(k)]
@@ -87,6 +87,17 @@ module Flapjack
         @entities.include?(event_id.split(':').first)
       end
 
+      # entity names match regex?
+      def match_regex_entities?(event_id)
+        return false unless @regex_entities && @regex_entities.length > 0
+        entity = event_id.split(':').first
+        matches = 0
+        @regex_entities.each do |regex_entity|
+          matches += 1 if /#{regex_entity}/ === entity
+        end
+        matches >= @regex_entities.length
+      end
+
       # tags match?
       def match_tags?(event_tags)
         return false unless @tags && @tags.length > 0
@@ -124,6 +135,7 @@ module Flapjack
 
       def is_specific?
         (!@entities.nil? && !@entities.empty?) ||
+          (!@regex_entities.nil? && !@regex_entities.empty?) ||
           (!@tags.nil? && !@tags.empty?) ||
           (!@regex_tags.nil? && !@regex_tags.empty?)
       end
@@ -172,6 +184,7 @@ module Flapjack
           :id                 => rule_data[:id].to_s,
           :contact_id         => rule_data[:contact_id].to_s,
           :entities           => Oj.dump(rule_data[:entities]),
+          :regex_entities     => Oj.dump(rule_data[:regex_entities]),
           :tags               => Oj.dump(tag_data),
           :regex_tags         => Oj.dump(regex_tag_data),
           :time_restrictions  => Oj.dump(rule_data[:time_restrictions], :mode => :compat),
@@ -262,6 +275,12 @@ module Flapjack
                  d[:entities].all? {|e| e.is_a?(String)} ) } =>
         "entities must be a list of strings",
 
+        proc {|d| !d.has_key?(:regex_entities) ||
+               ( d[:regex_entities].nil? ||
+                 d[:regex_entities].is_a?(Array) &&
+                 d[:regex_entities].all? {|e| e.is_a?(String)} ) } =>
+        "regex_entities must be a list of strings",
+
         proc {|d| !d.has_key?(:tags) ||
                ( d[:tags].nil? ||
                  d[:tags].is_a?(Flapjack::Data::TagSet) &&
@@ -345,6 +364,7 @@ module Flapjack
         regex_tags          = Oj.load(rule_data['regex_tags'] || '')
         @regex_tags         = regex_tags ? Flapjack::Data::TagSet.new(regex_tags) : nil
         @entities           = Oj.load(rule_data['entities'] || '')
+        @regex_entities     = Oj.load(rule_data['regex_entities'] || '')
         @time_restrictions  = Oj.load(rule_data['time_restrictions'] || '')
         @unknown_media      = Oj.load(rule_data['unknown_media'] || '')
         @warning_media      = Oj.load(rule_data['warning_media'] || '')

data/lib/flapjack/gateways/api/contact_methods.rb

@@ -144,7 +144,7 @@ module Flapjack
 
             contact = find_contact(params[:contact_id])
 
-            rule_data = hashify(:entities, :tags, :regex_tags,
+            rule_data = hashify(:entities, :regex_entities, :tags, :regex_tags,
               :unknown_media, :warning_media, :critical_media, :time_restrictions,
               :unknown_blackhole, :warning_blackhole, :critical_blackhole) {|k| [k, params[k]]}
 
@@ -167,7 +167,7 @@ module Flapjack
             rule = find_rule(params[:id])
             contact = find_contact(rule.contact_id)
 
-            rule_data = hashify(:entities, :tags, :regex_tags,
+            rule_data = hashify(:entities, :regex_entities, :tags, :regex_tags,
               :unknown_media, :warning_media, :critical_media, :time_restrictions,
               :unknown_blackhole, :warning_blackhole, :critical_blackhole) {|k| [k, params[k]]}
 

data/lib/flapjack/gateways/oobetet.rb

@@ -190,10 +190,10 @@ module Flapjack
 
       def emit_pagerduty(summary, event_type = 'trigger')
         if @config['pagerduty_contact']
-          pagerduty_event = { :service_key  => @config['pagerduty_contact'],
-                              :incident_key => "Flapjack Self Monitoring from #{@hostname}",
-                              :event_type   => event_type,
-                              :description  => summary }
+          pagerduty_event = { 'service_key'  => @config['pagerduty_contact'],
+                              'incident_key' => "Flapjack Self Monitoring from #{@hostname}",
+                              'event_type'   => event_type,
+                              'description'  => summary }
           status, response = send_pagerduty_event(pagerduty_event)
           if status == 200
             @logger.debug("successfully sent pagerduty event")
@@ -211,7 +211,7 @@ module Flapjack
 
       def send_pagerduty_event(event)
         options  = { :body => Oj.dump(event) }
-        http = EM::HttpRequest.new(@pagerduty_events_api_url).post(options)
+        http     = EM::HttpRequest.new(@pagerduty_events_api_url).post(options)
         response = Oj.load(http.response)
         status   = http.response_header.status
         @logger.debug "send_pagerduty_event got a return code of #{status.to_s} - #{response.inspect}"

data/lib/flapjack/gateways/web/views/contact.html.erb

@@ -102,8 +102,9 @@
     <tr>
       <th>ID</th>
       <th>Entities</th>
+      <th>Entities Regex</th>
       <th>Tags</th>
-      <th>Regex Tags</th>
+      <th>Tags Regex</th>
       <th>Warning Media</th>
       <th>Critical Media</th>
       <th>Time Restrictions</th>
@@ -113,6 +114,7 @@
       <tr>
         <td><%= h rule.id %></td>
         <td><%= h( (rule.entities && !rule.entities.empty?) ? rule.entities.join(', ') : '-') %></td>
+        <td><%= h( (rule.regex_entities && !rule.regex_entities.empty?) ? rule.regex_entities.join(', ') : '-') %></td>
         <td><%= h( (rule.tags && !rule.tags.empty?) ? rule.tags.to_a.join(', ') : '-') %></td>
         <td><%= h( (rule.regex_tags && !rule.regex_tags.empty?) ? rule.regex_tags.to_a.join(', ') : '-') %></td>
         <td><%= h( (rule.warning_media && !rule.warning_media.empty?) ? rule.warning_media.join(', ') : '-')%></td>

data/lib/flapjack/gateways/web/views/self_stats.html.erb

@@ -36,6 +36,7 @@
             <li>ok: <%= h @event_counters['ok'] %> events</li>
             <li>failure: <%= h @event_counters['failure'] %> events</li>
             <li>action: <%= h @event_counters['action'] %> events</li>
+            <li>invalid: <%= h @event_counters['invalid'] %> events</li>
           </ul>
         </td>
       </tr>
@@ -86,6 +87,7 @@
               <li>ok: <%= h event_counters['ok'] %> (<%= h event_rates['ok'] %> events/s)</li>
               <li>failure: <%= h event_counters['failure'] %> (<%= h event_rates['failure'] %> events/s)</li>
               <li>action: <%= h event_counters['action'] %> (<%= h event_rates['action'] %> events/s)</li>
+              <li>invalid: <%= h event_counters['invalid'] %> (<%= h event_rates['invalid'] %> events/s)</li>
             </ul>
           </td>
         </tr>
@@ -95,7 +97,7 @@
 </div>
 
 <p>
-  <a class="btn btn-success" href="/self_stats.json">View as JSON</a>.
+  <a class="btn btn-success" href="/self_stats.json">View as JSON</a>
   Learn how to
   <a href="https://github.com/flpjck/flapjack/wiki/Gathering-internal-statistics-with-collectd">
     use these metrics</a>.

data/lib/flapjack/processor.rb

@@ -58,18 +58,19 @@ module Flapjack
       # point on...
 
       # FIXME: add an administrative function to reset all event counters
-      if @redis.hget('event_counters', 'all').nil?
-        @redis.hset('event_counters', 'all', 0)
-        @redis.hset('event_counters', 'ok', 0)
-        @redis.hset('event_counters', 'failure', 0)
-        @redis.hset('event_counters', 'action', 0)
-      end
-
+      
+      @redis.hset('event_counters', 'all', 0)     if @redis.hget('event_counters', 'all').nil?
+      @redis.hset('event_counters', 'ok', 0)      if @redis.hget('event_counters', 'ok').nil?
+      @redis.hset('event_counters', 'failure', 0) if @redis.hget('event_counters', 'failure').nil?
+      @redis.hset('event_counters', 'action', 0)  if @redis.hget('event_counters', 'action').nil?
+      @redis.hset('event_counters', 'invalid', 0) if @redis.hget('event_counters', 'invalid').nil?
+      
       @redis.hset("executive_instance:#{@instance_id}", 'boot_time', boot_time.to_i)
       @redis.hset("event_counters:#{@instance_id}", 'all', 0)
       @redis.hset("event_counters:#{@instance_id}", 'ok', 0)
       @redis.hset("event_counters:#{@instance_id}", 'failure', 0)
       @redis.hset("event_counters:#{@instance_id}", 'action', 0)
+      @redis.hset("event_counters:#{@instance_id}", 'invalid', 0)
       touch_keys
     end
 
@@ -105,7 +106,14 @@ module Flapjack
           break
         end
 
-        process_event(event) unless event.nil?
+        if event.nil?
+          @redis.hincrby('event_counters', 'all', 1)
+          @redis.hincrby("event_counters:#{@instance_id}", 'all', 1)
+          @redis.hincrby('event_counters', 'invalid', 1)
+          @redis.hincrby("event_counters:#{@instance_id}", 'invalid', 1)
+        else
+          process_event(event)
+        end
       end
 
       @logger.info("Exiting main loop.")
@@ -166,7 +174,7 @@ module Flapjack
 
       event.counter = @redis.hincrby('event_counters', 'all', 1)
       @redis.hincrby("event_counters:#{@instance_id}", 'all', 1)
-
+        
       # FIXME skip if entity_check.nil?
 
       # FIXME: validate that the event is sane before we ever get here
@@ -188,6 +196,10 @@ module Flapjack
         elsif event.failure?
           @redis.hincrby('event_counters', 'failure', 1)
           @redis.hincrby("event_counters:#{@instance_id}", 'failure', 1)
+        else
+          @redis.hincrby('event_counters', 'invalid', 1)
+          @redis.hincrby("event_counters:#{@instance_id}", 'invalid', 1)
+          @logger.error("Invalid event received: #{event.inspect}")
         end
         @redis.exec
 
@@ -223,6 +235,10 @@ module Flapjack
         @redis.hincrby('event_counters', 'action', 1)
         @redis.hincrby("event_counters:#{@instance_id}", 'action', 1)
         @redis.exec
+      else
+        @redis.hincrby('event_counters', 'invalid', 1)
+        @redis.hincrby("event_counters:#{@instance_id}", 'invalid', 1)
+        @logger.error("Invalid event received: #{event.inspect}")
       end
 
       [result, previous_state]

data/lib/flapjack/version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end
 

data/spec/lib/flapjack/data/notification_rule_spec.rb

@@ -17,6 +17,7 @@ describe Flapjack::Data::NotificationRule, :redis => true do
      :tags               => ["database","physical"],
      :regex_tags         => [],
      :entities           => ["foo-app-01.example.com"],
+     :regex_entities     => [],
      :time_restrictions  => [ weekdays_8_18 ],
      :unknown_media      => [],
      :warning_media      => ["email"],
@@ -31,7 +32,8 @@ describe Flapjack::Data::NotificationRule, :redis => true do
     {:contact_id         => '23',
      :tags               => [],
      :regex_tags         => ["^data.*$","^(physical|bare_metal)$"],
-     :entities           => ["foo-app-01.example.com"],
+     :entities           => [],
+     :regex_entities     => ["^foo-\S{3}-\d{2}.example.com$"],
      :time_restrictions  => [ weekdays_8_18 ],
      :unknown_media      => [],
      :warning_media      => ["email"],

data/spec/lib/flapjack/gateways/api/contact_methods_spec.rb

@@ -44,6 +44,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
      "tags"               => ["database","physical"],
      "regex_tags"         => ["^data.*$","^(physical|bare_metal)$"],
      "entities"           => ["foo-app-01.example.com"],
+     "regex_entities"     => ["^foo-\S{3}-\d{2}.example.com$"],
      "time_restrictions"  => nil,
      "unknown_media"      => ["jabber"],
      "warning_media"      => ["email"],

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

@@ -45,7 +45,7 @@ describe 'Flapjack::Gateways::JSONAPI::ContactMethods', :sinatra => true, :logge
     {"contact_id"         => "21",
      "tags"               => ["database","physical"],
      "regex_tags"         => ["^data.*$","^(physical|bare_metal)$"],
-     "entities"           => ["foo-app-01.example.com"],
+     "regex_entities"     => ["^foo-\S{3}-\d{2}.example.com$"],
      "time_restrictions"  => nil,
      "unknown_media"      => ["jabber"],
      "warning_media"      => ["email"],

data/spec/lib/flapjack/processor_spec.rb

@@ -24,14 +24,20 @@ describe Flapjack::Processor, :logger => true do
     expect(redis).to receive(:hset).with(/^executive_instance:/, "boot_time", anything)
     expect(redis).to receive(:hget).with('event_counters', 'all').and_return(nil)
     expect(redis).to receive(:hset).with('event_counters', 'all', 0)
+    expect(redis).to receive(:hget).with('event_counters', 'ok').and_return(nil)
     expect(redis).to receive(:hset).with('event_counters', 'ok', 0)
+    expect(redis).to receive(:hget).with('event_counters', 'failure').and_return(nil)
     expect(redis).to receive(:hset).with('event_counters', 'failure', 0)
+    expect(redis).to receive(:hget).with('event_counters', 'action').and_return(nil)
     expect(redis).to receive(:hset).with('event_counters', 'action', 0)
+    expect(redis).to receive(:hget).with('event_counters', 'invalid').and_return(nil)
+    expect(redis).to receive(:hset).with('event_counters', 'invalid', 0)
 
     expect(redis).to receive(:hset).with(/^event_counters:/, 'all', 0)
     expect(redis).to receive(:hset).with(/^event_counters:/, 'ok', 0)
     expect(redis).to receive(:hset).with(/^event_counters:/, 'failure', 0)
     expect(redis).to receive(:hset).with(/^event_counters:/, 'action', 0)
+    expect(redis).to receive(:hset).with(/^event_counters:/, 'invalid', 0)
 
     expect(redis).to receive(:expire).with(/^executive_instance:/, anything)
     expect(redis).to receive(:expire).with(/^event_counters:/, anything).exactly(4).times

data/tmp/create_events_ok_failure.rb

@@ -3,27 +3,29 @@
 require 'redis'
 
 require 'oj'
-Oj.default_options = { :indent => 0, :mode => :strict }
+Oj.default_options = { :indent => 0, :mode => :compat }
 
 id = "%.2d" % (1..10).to_a[rand(9)]
 
 events = []
 
-events << {
+events << Oj.dump({
   'entity' => "app-#{id}",
   'check' => 'http',
   'type' => 'service',
   'state' => 'ok',
-}.to_json
+  'summary' => 'well i don\'t know',
+})
 
-events << {
+events << Oj.dump({
   'entity' => "app-#{id}",
   'check' => 'http',
-  'type' => 'service',
+  'type' => 'host',
   'state' => 'critical',
-}.to_json
+  'summary' => 'well i don\'t know',
+})
 
-redis = Redis.new
+redis = Redis.new(:db => 13)
 
 2000.times do
   events.each {|event|

metadata

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