flapjack 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de195d7c1f069b7e1817c654b51315c55df5ec37
-  data.tar.gz: b6f8b5059820e001df53e1a7f3ef6fdbd49c90cb
+  metadata.gz: 20501028ceb91b915d143e9d9343fae832db8e1c
+  data.tar.gz: b2d975287acd597e04f148f589c76ed067832665
 SHA512:
-  metadata.gz: e0131f314a1c13869035a9ec07cbca94bd8a79b56af800b7183291e50fade89bccd023223ccf2b7037d0c8bab9fc20ca25aec348e0e0ca8baf371071f530ad47
-  data.tar.gz: 9710ad57f6ced3f0b4f276690dce38e5accd4361613ef3944811893d7faa46c5871e92e07da2cd30428d7a85cfc2b3d7887067c9b1f068565fc577410c7538c6
+  metadata.gz: 051d4c2f9f58b9b57a45105a10c7cd64353c2a3c485b53a57a8bcc54f7546ed36058a50dfcb52a663413ffc2f8d5c955651a5cb554a48ea276b073eb93345409
+  data.tar.gz: ea18f80815f9172ca9a0f3f2021934b9f38d5da6cec030c0f27ad493dec8178ef40120f3004a898adfe50f6a1df22b0ac89c45a8a6492110694f02d2c5986e8f

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Flapjack Changelog
 
+# 0.8.11 - 2014-05-01
+- Feature: simulate-failed-check - give -t a default of 45 seconds (@jessereynolds)
+- Feature: allow email messages to have custom from address #468 (@mattdelves)
+- Feature: jabber - The reply message should only include the filtered list of entity checks #472 (@someword)
+- Feature: Add perfdata handling #471 (@mattdelves)
+- Feature: jsonapi featureset reaches critical mass #474 (@ali-graham)
+- Feature: Add rbtrace command line option for profiling #479 (@auxesis)
+- Bug: ack'ing via jabber fails #480 (@jessereynolds)
+
 # 0.8.10 - 2014-04-28
 - Feature: Add regex entities to notification rules #463 (@jswoods)
 - Bug: oobetet gateway exception sending pagerduty event #464 (@jessereynolds)

data/Gemfile

@@ -11,7 +11,7 @@ group :test do
   gem 'cucumber'
   gem 'delorean'
   gem 'rack-test'
-  gem 'async_rack_test'
+  gem 'async_rack_test', '>= 0.0.5'
   gem 'resque_spec'
   gem 'webmock'
   gem 'guard'

data/bin/flapjack

@@ -53,10 +53,18 @@ optparse = OptionParser.new do |opts|
     options.config = c
   end
 
+  opts.on("-n", "--environment [ENV]", String, "Environment to boot") do |e|
+    options.environment = e
+  end
+
   opts.on("-d", "--[no-]daemonize", "Daemonize?") do |d|
     options.daemonize = d
   end
 
+  opts.on('-r', '--rbtrace', 'Enable rbtrace profiling') do
+    require 'rbtrace'
+  end
+
   opts.on("-p", "--pidfile [PATH]", String, "PATH to the pidfile to write to") do |pid|
     options.pidfile = pid
   end
@@ -88,7 +96,7 @@ elsif !["start", "stop", "restart", "reload", "status"].include?(ARGV[0])
   exit 1
 end
 
-FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'production'
+FLAPJACK_ENV = options.environment || ENV['FLAPJACK_ENV'] || 'production'
 
 config = Flapjack::Configuration.new
 config.load(options.config)
@@ -158,6 +166,7 @@ when "start"
     puts "Flapjack is already running."
   else
     print "Flapjack starting..."
+    print "\n" unless daemonize
     return_value = nil
     runner.execute(:daemonize => daemonize) {
       return_value = flapjack_coord.call

data/bin/flapjack-nagios-receiver

@@ -59,6 +59,7 @@ def process_input(opts)
         'state'     => state,
         'summary'   => check_output,
         'details'   => details,
+        'perfdata'  => check_perfdata,
         'time'      => timestamp,
       }
       Flapjack::Data::Event.add(event, :redis => redis)
@@ -243,5 +244,3 @@ else
   exit 1
 
 end
-
-

data/bin/simulate-failed-check

@@ -26,7 +26,7 @@ end
 
 def fail(opts)
   redis = Redis.new(opts[:redis_options])
-  stop_after = opts[:minutes].to_i * 60
+  stop_after = (opts[:minutes] * 60).to_i
   recover = opts[:recover]
   state = opts[:state] || 'critical'
   event  = {
@@ -82,8 +82,12 @@ optparse = OptionParser.new do |opts|
     options.config = c
   end
 
-  opts.on("-t", "--time MINUTES", String, "MINUTES to generate failure events for") do |t|
-    options.minutes = t
+  opts.on("-n", "--environment [ENV]", String, "Environment to boot") do |e|
+    options.environment = e
+  end
+
+  opts.on("-t", "--time MINUTES", String, "MINUTES to generate failure events for (0.75)") do |t|
+    options.minutes = t.to_f
   end
 
   opts.on("-i", "--interval SECONDS", String, "SECONDS between events, can be decimal eg 0.1 (10)") do |i|
@@ -109,7 +113,11 @@ unless options.interval.to_f > 0
   options.interval = 10.0
 end
 
-FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'production'
+unless options.minutes
+  options.minutes = 0.75
+end
+
+FLAPJACK_ENV = options.environment || ENV['FLAPJACK_ENV'] || 'production'
 
 config = Flapjack::Configuration.new
 config.load(options.config)

data/etc/flapjack_config.yaml.example

@@ -49,8 +49,9 @@ production:
         level: INFO
         syslog_errors: yes
       smtp_config:
-        # port 1025 is the default port for http://mailcatcher.me
+        #from: "flapjack@noreply.example"
         host: 127.0.0.1
+        # 1025 is the default port for http://mailcatcher.me
         port: 1025
         starttls: false
         #auth:

data/flapjack.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'ice_cube'
   gem.add_dependency 'tzinfo', '~> 1.0.1'
   gem.add_dependency 'tzinfo-data'
+  gem.add_dependency 'rbtrace'
 
   gem.add_development_dependency 'rake'
 end

data/lib/flapjack/data/contact.rb

@@ -19,8 +19,7 @@ module Flapjack
     class Contact
 
       attr_accessor :id, :first_name, :last_name, :email, :media,
-        :media_intervals, :media_rollup_thresholds, :pagerduty_credentials,
-        :linked_entity_ids, :linked_media_ids
+        :media_intervals, :media_rollup_thresholds, :pagerduty_credentials
 
       TAG_PREFIX = 'contact_tag'
       ALL_MEDIA  = ['email', 'sms', 'jabber', 'pagerduty']
@@ -155,6 +154,11 @@ module Flapjack
                      *['subdomain', 'username', 'password'].collect {|f| [f, details[f]]})
       end
 
+      def delete_pagerduty_credentials
+        @redis.hdel("contact_media:#{self.id}", 'pagerduty')
+        @redis.del("contact_pagerduty:#{self.id}")
+      end
+
       # returns false if this contact was already in the set for the entity
       def add_entity(entity)
         key = "contacts_for:#{entity.id}"
@@ -201,11 +205,10 @@ module Flapjack
         }.values
       end
 
-      def self.entities_jsonapi(contact_ids, options = {})
+      def self.entity_ids_for(contact_ids, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
 
-        entity_data = []
-        linked_entity_ids = {}
+        entity_ids = {}
 
         temp_set = SecureRandom.uuid
         redis.sadd(temp_set, contact_ids)
@@ -216,28 +219,30 @@ module Flapjack
           next unless k =~ /^contacts_for:([a-zA-Z0-9][a-zA-Z0-9\.\-]*[a-zA-Z0-9])(?::(\w+))?$/
 
           entity_id = $1
-          check     = $2
-
-          entity_data << {:id => entity_id, :name => redis.hget("entity:#{entity_id}", 'name')}
+          # check     = $2
 
           contact_ids.each do |contact_id|
-            linked_entity_ids[contact_id] ||= []
-            linked_entity_ids[contact_id] << entity_id
+            entity_ids[contact_id] ||= []
+            entity_ids[contact_id] << entity_id
           end
         end
 
         redis.del(temp_set)
 
-        [entity_data, linked_entity_ids]
+        entity_ids
       end
 
       def name
         [(self.first_name || ''), (self.last_name || '')].join(" ").strip
       end
 
+      def notification_rule_ids
+        @redis.smembers("contact_notification_rules:#{self.id}")
+      end
+
       # return an array of the notification rules of this contact
       def notification_rules(opts = {})
-        rules = @redis.smembers("contact_notification_rules:#{self.id}").inject([]) do |ret, rule_id|
+        rules = self.notification_rule_ids.inject([]) do |ret, rule_id|
           unless (rule_id.nil? || rule_id == '')
             ret << Flapjack::Data::NotificationRule.find_by_id(rule_id, :redis => @redis)
           end
@@ -268,6 +273,14 @@ module Flapjack
           :redis => @redis, :logger => opts[:logger])
       end
 
+      # move an existing notification rule from another contact to this one
+      def grab_notification_rule(rule)
+        @redis.srem("contact_notification_rules:#{rule.contact.id}", rule.id)
+        rule.contact_id = self.id
+        rule.update({})
+        @redis.sadd("contact_notification_rules:#{self.id}", rule.id)
+      end
+
       def delete_notification_rule(rule)
         @redis.srem("contact_notification_rules:#{self.id}", rule.id)
         @redis.del("notification_rule:#{rule.id}")
@@ -436,7 +449,11 @@ module Flapjack
       # return a list of media enabled for this contact
       # eg [ 'email', 'sms' ]
       def media_list
-        @redis.hkeys("contact_media:#{self.id}")
+        @redis.hkeys("contact_media:#{self.id}") - ['pagerduty']
+      end
+
+      def media_ids
+        self.media_list.collect {|medium| "#{self.id}_#{medium}" }
       end
 
       # return the timezone of the contact, or the system default if none is set
@@ -484,16 +501,17 @@ module Flapjack
         }.to_json
       end
 
-      def to_jsonapi(*args)
-        { "id"                      => self.id,
-          "first_name"              => self.first_name,
-          "last_name"               => self.last_name,
-          "email"                   => self.email,
-          "timezone"                => self.timezone.name,
-          "tags"                    => self.tags.to_a,
-          "links"                   => {
-            :entities => @linked_entity_ids || [],
-            :media    => @linked_media_ids  || []
+      def to_jsonapi(opts = {})
+        { "id"                    => self.id,
+          "first_name"            => self.first_name,
+          "last_name"             => self.last_name,
+          "email"                 => self.email,
+          "timezone"              => self.timezone.name,
+          "tags"                  => self.tags.to_a,
+          "links"                 => {
+            :entities               => opts[:entity_ids]          || [],
+            :media                  => self.media_ids             || [],
+            :notification_rules     => self.notification_rule_ids || [],
           }
         }.to_json
       end
@@ -512,9 +530,11 @@ module Flapjack
       def self.add_or_update(contact_id, contact_data, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
 
-        # TODO check that the rest of this is safe for the update case
-        redis.hmset("contact:#{contact_id}",
-                    *['first_name', 'last_name', 'email'].collect {|f| [f, contact_data[f]]})
+        attrs = (['first_name', 'last_name', 'email'] & contact_data.keys).collect do |key|
+          [key, contact_data[key]]
+        end.flatten(1)
+
+        redis.hmset("contact:#{contact_id}", *attrs) unless attrs.empty?
 
         if ( ! contact_data['tags'].nil? && contact_data['tags'].is_a?(Enumerable))
           contact_data['tags'].each do |t|

data/lib/flapjack/data/entity.rb

@@ -78,6 +78,15 @@ module Flapjack
         self.new(:name => entity_name, :id => entity_id, :redis => redis)
       end
 
+      def self.find_by_ids(entity_ids, options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+        logger = options[:logger]
+
+        entity_ids.map do |id|
+          self.find_by_id(id, options)
+        end
+      end
+
       # NB: if we're worried about user input, https://github.com/mudge/re2
       # has bindings for a non-backtracking RE engine that runs in linear
       # time
@@ -145,6 +154,15 @@ module Flapjack
         }.compact
       end
 
+      def self.contact_ids_for(entity_ids, options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+
+        entity_ids.inject({}) do |memo, entity_id|
+          memo[entity_id] = redis.smembers("contacts_for:#{entity_id}")
+          memo
+        end
+      end
+
       def check_list
         @redis.zrange("current_checks:#{@name}", 0, -1)
       end
@@ -186,6 +204,16 @@ module Flapjack
         }
       end
 
+      def to_jsonapi(opts = {})
+        {
+          "id"        => self.id,
+          "name"      => self.name,
+          "links"     => {
+            :contacts   => opts[:contact_ids] || [],
+          }
+        }.to_json
+      end
+
     private
 
       # NB: initializer should not be used directly -- instead one of the finder methods

data/lib/flapjack/data/entity_check.rb

@@ -27,31 +27,38 @@ module Flapjack
 
       attr_accessor :entity, :check
 
-      # TODO probably shouldn't always be creating on query -- work out when this should be happening
       def self.for_event_id(event_id, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
+        entity_name, check_name = event_id.split(':', 2)
+        create_entity = options[:create_entity]
         logger = options[:logger]
-        entity_name, check = event_id.split(':', 2)
-        self.new(Flapjack::Data::Entity.find_by_name(entity_name, :redis => redis, :create => true, :logger => true), check,
-          :redis => redis, :logger => logger)
+        entity = Flapjack::Data::Entity.find_by_name(entity_name,
+          :create => create_entity, :logger => logger, :redis => redis)
+        self.new(entity, check_name, :logger => logger, :redis => redis)
       end
 
-      # TODO probably shouldn't always be creating on query -- work out when this should be happening
-      def self.for_entity_name(entity_name, check, options = {})
+      def self.for_entity_name(entity_name, check_name, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
-        self.new(Flapjack::Data::Entity.find_by_name(entity_name, :redis => redis, :create => true), check,
-          :redis => redis)
+        create_entity = options[:create_entity]
+        logger = options[:logger]
+        entity = Flapjack::Data::Entity.find_by_name(entity_name,
+          :create => create_entity, :logger => logger, :redis => redis)
+        self.new(entity, check_name, :logger => logger, :redis => redis)
       end
 
       def self.for_entity_id(entity_id, check, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
-        self.new(Flapjack::Data::Entity.find_by_id(entity_id, :redis => redis), check,
-          :redis => redis)
+        create_entity = options[:create_entity]
+        logger = options[:logger]
+        entity = Flapjack::Data::Entity.find_by_id(entity_id,
+          :create => create_entity, :logger => logger, :redis => redis)
+        self.new(entity, check, :redis => redis)
       end
 
       def self.for_entity(entity, check, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
-        self.new(entity, check, :redis => redis)
+        logger = options[:logger]
+        self.new(entity, check, :logger => logger, :redis => redis)
       end
 
       def self.find_all_for_entity_name(entity_name, options = {})
@@ -360,6 +367,7 @@ module Flapjack
         timestamp = options[:timestamp] || Time.now.to_i
         summary = options[:summary]
         details = options[:details]
+        perfdata = options[:perfdata]
         count = options[:count]
 
         old_state = self.state
@@ -400,6 +408,10 @@ module Flapjack
         # hash summary and details (as they may have changed)
         @redis.hset("check:#{@key}", 'summary', (summary || ''))
         @redis.hset("check:#{@key}", 'details', (details || ''))
+        if perfdata
+          @redis.hset("check:#{@key}", 'perfdata', format_perfdata(perfdata).to_json)
+#          @redis.set("#{@key}:#{timestamp}:perfdata", perfdata)
+        end
 
         @redis.exec
       end
@@ -503,6 +515,18 @@ module Flapjack
         @redis.hget("check:#{@key}", 'details')
       end
 
+      def perfdata
+        data = @redis.hget("check:#{@key}", 'perfdata')
+        begin
+          data = JSON.parse(data) if data
+        rescue
+          data = "Unable to parse string: #{data}"
+        end
+
+        data = [data] if data.is_a?(Hash)
+        data
+      end
+
       # Returns a list of states for this entity check, sorted by timestamp.
       #
       # start_time and end_time should be passed as integer timestamps; these timestamps
@@ -647,6 +671,23 @@ module Flapjack
         @logger = options[:logger]
       end
 
+      def format_perfdata(perfdata)
+        # example perfdata: time=0.486630s;;;0.000000 size=909B;;;0
+        items = perfdata.split(' ')
+        # Do some fancy regex
+        data = []
+        items.each do |item|
+          components = item.split '='
+          key = components[0].to_s
+          value = ""
+          if components[1]
+            value = components[1].split(';')[0].to_s
+          end
+          data << {"key" => key, "value" => value}
+        end
+        data
+      end
+
     end
 
   end