flapjack 0.7.29 → 0.7.30

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

@@ -30,7 +30,8 @@
               <th>Summary Threshold</th>
             </tr>
             <% @contact.media.each_pair do |mk, mv| %>
-              <% alerting[mk] = @contact.alerting_checks_for_media(mk) %>
+              <% alerting_checks = @contact.alerting_checks_for_media(mk) %>
+              <% alerting[mk] = alerting_checks unless (alerting_checks.nil? || alerting_checks.empty?) %>
               <tr>
                 <% if 'pagerduty'.eql?(mk) %>
                   <td>PagerDuty</td>
@@ -53,18 +54,20 @@
                     <% end %>
                   </td>
                   <td>
-                    <% if alerting[mk].length >= @contact.media_rollup_thresholds[mk].to_i %>
-                      Yes -
-                    <% else %>
+                    <% rollup_threshold = @contact.media_rollup_thresholds[mk] %>
+                    <% num_alerting = alerting[mk].nil? ? 0 : alerting[mk].length %>
+                    <% if rollup_threshold.nil? || (num_alerting < rollup_threshold.to_i) %>
                       No -
+                    <% else %>
+                      Yes -
                     <% end %>
-                    <%= alerting[mk].length %> alerting
+                    <%= num_alerting %> alerting
                   </td>
                   <td>
-                    <% if @contact.media_rollup_thresholds[mk] %>
-                      <%= h @contact.media_rollup_thresholds[mk] %>
-                    <% else %>
+                    <% if rollup_threshold.nil? %>
                       -
+                    <% else %>
+                      <%= h rollup_threshold %>
                     <% end %>
                   </td>
                 <% end %>
@@ -74,32 +77,34 @@
         <% end %>
 
         <h3>Alerting Checks</h3>
-        <p>These failing checks are currently alerting because they are not acknowledged, not in scheduled maintenance, and currently allowed by this contact's notification rules.</p>
+        <p>Alerting checks are any that are failing, not acknowledged, not in scheduled maintenance, and currently allowed by this contact's notification rules.</p>
 
-        <table class="table table-bordered table-hover table-condensed">
-          <tr>
-            <th>Media</th>
-            <th>Alerting Checks</th>
-          </tr>
-          <% alerting.each_pair do |media, checks| %>
-            <% if checks.length > 0 %>
-              <tr>
-                <td><%= h media.capitalize %></td>
-                <td>
-                  <% checks.each do |entity_check| %>
-                    <% entity, check = entity_check.split(':', 2) %>
-                    <% check_link = "<a href=\"/check?entity=#{u(entity)}&amp;check=#{u(check)}\" title=\"check status\">" +
-                       h(check) + "</a>"%>
-                    <a href="/entity/<%= u(entity) %>" title="entity status"><%= h entity %></a> ::
-                    <%= check_link %> <br />
-                  <% end %>
-                </td>
-              </tr>
-            <% else %>
-              <tr><td colspan="2">No alerting checks, yay!</td></tr>
+        <% if alerting.empty? %>
+          <p><em>There are no currently alerting checks.</em></p>
+        <% else %>
+          <table class="table table-bordered table-hover table-condensed">
+            <tr>
+              <th>Media</th>
+              <th>Alerting Checks</th>
+            </tr>
+            <% alerting.each_pair do |media, checks| %>
+              <% if checks.length > 0 %>
+                <tr>
+                  <td><%= h media.capitalize %></td>
+                  <td>
+                    <% checks.each do |entity_check| %>
+                      <% entity, check = entity_check.split(':', 2) %>
+                      <% check_link = "<a href=\"/check?entity=#{u(entity)}&amp;check=#{u(check)}\" title=\"check status\">" +
+                         h(check) + "</a>"%>
+                      <a href="/entity/<%= u(entity) %>" title="entity status"><%= h entity %></a> ::
+                      <%= check_link %> <br />
+                    <% end %>
+                  </td>
+                </tr>
+              <% end %>
             <% end %>
-          <% end %>
-        </table>
+          </table>
+        <% end %>
 
         <h3>All Entities and Checks</h3>
         <% if !@entities_and_checks || @entities_and_checks.empty? %>

data/lib/flapjack/gateways/web.rb

@@ -347,16 +347,16 @@ module Flapjack
           }.max_by {|n| n[1] || 0}
 
         lc = entity_check.last_change
-        last_change   = lc ? ChronicDuration.output(Time.now.to_i - lc.to_i,
-                               :format => :short, :keep_zero => true, :units => 2) : 'never'
+        last_change   = lc ? (ChronicDuration.output(Time.now.to_i - lc.to_i,
+                               :format => :short, :keep_zero => true, :units => 2) || '0s') : 'never'
 
         lu = entity_check.last_update
-        last_update   = lu ? ChronicDuration.output(Time.now.to_i - lu.to_i,
-                               :format => :short, :keep_zero => true, :units => 2) : 'never'
+        last_update   = lu ? (ChronicDuration.output(Time.now.to_i - lu.to_i,
+                               :format => :short, :keep_zero => true, :units => 2) || '0s') : 'never'
 
         ln = latest_notif[1]
-        last_notified = ln ? ChronicDuration.output(Time.now.to_i - ln.to_i,
-                               :format => :short, :keep_zero => true, :units => 2) + ", #{latest_notif[0]}" : 'never'
+        last_notified = ln ? (ChronicDuration.output(Time.now.to_i - ln.to_i,
+                               :format => :short, :keep_zero => true, :units => 2) || '0s') + ", #{latest_notif[0]}" : 'never'
 
         [(entity_check.state       || '-'),
          (summary                  || '-'),
@@ -377,7 +377,7 @@ module Flapjack
           instance_id    = i.match(/executive_instance:(.*)/)[1]
           boot_time      = redis.hget(i, 'boot_time').to_i
           uptime         = Time.now.to_i - boot_time
-          uptime_string  = ChronicDuration.output(uptime, :format => :short, :keep_zero => true, :units => 2)
+          uptime_string  = (ChronicDuration.output(uptime, :format => :short, :keep_zero => true, :units => 2) || '0s')
           event_counters = redis.hgetall("event_counters:#{instance_id}")
           event_rates    = event_counters.inject({}) do |er, ec|
             er[ec[0]] = uptime && uptime > 0 ? (ec[1].to_f / uptime).round : nil

data/lib/flapjack/logger.rb

@@ -2,12 +2,7 @@
 
 require 'logger'
 require 'syslog'
-
-begin
-  # Ruby 2.0+
-  require 'syslog/logger'
-rescue LoadError
-end
+require 'monitor'
 
 module Flapjack
 
@@ -34,21 +29,9 @@ module Flapjack
         "#{t} [#{severity}] :: #{name} :: #{msg}\n"
       end
 
-      @syslog_formatter = proc do |severity, datetime, progname, msg|
-        t = datetime.iso8601
-        l = SEVERITY_LABELS[severity]
-        "#{t} [#{l}] :: #{name} :: #{msg}\n"
-      end
-
       @logger = ::Logger.new(STDOUT)
       @logger.formatter = @formatter
 
-      if Syslog.const_defined?('Logger', false)
-        # Ruby 2.0+
-        @sys_logger = Syslog.const_get('Logger', false).new('flapjack')
-        @sys_logger.formatter = @syslog_formatter
-      end
-
       configure(config)
     end
 
@@ -75,53 +58,50 @@ module Flapjack
       @logger.error(err) if err
 
       @logger.level = @level
-      if @sys_logger
-        @sys_logger.level = @level
-      end
+      @use_syslog = config.has_key?('syslog_errors') && config['syslog_errors']
     end
 
     def close
       raise "Already closed" if @logger.nil?
       @logger.close
       @logger = nil
-      if @sys_logger
-        @sys_logger.close
-        @sys_logger = nil
-      end
     end
 
-    def add(severity, message = nil, progname = nil, &block)
-      raise "Cannot log with a closed logger" if @logger.nil?
-      @logger.add(severity, message, progname, &block)
-      return if severity < @level
-
-      progname ||= 'flapjack'
-      if message.nil?
-        if block_given?
-          message = yield
-        else
-          message = progname
-          progname = 'flapjack'
-        end
-      end
-
-      if @sys_logger
-        @sys_logger.add(severity, message, progname, &block)
-      else
+    def self.syslog_add(severity, message, name)
+      @lock ||= Monitor.new
+      @lock.synchronize do
         level = SYSLOG_LEVELS[severity]
         t = Time.now.iso8601
         l = SEVERITY_LABELS[severity]
         begin
           Syslog.open('flapjack', (Syslog::Constants::LOG_PID | Syslog::Constants::LOG_CONS),
                                    Syslog::Constants::LOG_USER)
-          Syslog.mask = Syslog::LOG_UPTO(level)
-          Syslog.log(level, "#{t} [#{l}] :: #{@name} :: %s", message)
+          Syslog.mask = Syslog::LOG_UPTO(::Syslog::Constants::LOG_ERR)
+          Syslog.log(level, "#{t} [#{l}] :: #{name} :: %s", message)
         ensure
           Syslog.close
         end
       end
     end
 
+    def add(severity, message = nil, progname = nil, &block)
+      raise "Cannot log with a closed logger" if @logger.nil?
+      @logger.add(severity, message, progname, &block)
+      if severity >= @level
+        progname ||= 'flapjack'
+        if message.nil?
+          if block_given?
+            message = yield
+          else
+            message = progname
+            progname = 'flapjack'
+          end
+        end
+      end
+
+      Flapjack::Logger.syslog_add(severity, message, @name) if @use_syslog
+    end
+
     LEVELS.each do |level|
       define_method(level) {|progname, &block|
         add(::Logger.const_get(level.upcase), nil, progname, &block)

data/lib/flapjack/version.rb

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

data/spec/lib/flapjack/coordinator_spec.rb

@@ -17,7 +17,7 @@ describe Flapjack::Coordinator do
     cfg = {'processor' => {'enabled' => true}}
     EM.should_receive(:synchrony).and_yield
     config.should_receive(:for_redis).and_return({})
-    config.should_receive(:all).and_return(cfg)
+    config.should_receive(:all).twice.and_return(cfg)
 
     processor = double('processor')
     processor.should_receive(:start)
@@ -51,7 +51,7 @@ describe Flapjack::Coordinator do
     cfg = {'processor' => {'enabled' => true}}
     EM.should_receive(:synchrony).and_yield
     config.should_receive(:for_redis).and_return({})
-    config.should_receive(:all).and_return(cfg)
+    config.should_receive(:all).twice.and_return(cfg)
 
     processor = double('processor')
     processor.should_receive(:start).and_raise(RuntimeError)
@@ -82,7 +82,7 @@ describe Flapjack::Coordinator do
     cfg = {'executive' => {'enabled' => true}}
     EM.should_receive(:synchrony).and_yield
     config.should_receive(:for_redis).and_return({})
-    config.should_receive(:all).and_return(cfg)
+    config.should_receive(:all).twice.and_return(cfg)
 
     processor = double('processor')
     processor.should_receive(:start)
@@ -125,7 +125,7 @@ describe Flapjack::Coordinator do
           }
     EM.should_receive(:synchrony).and_yield
     config.should_receive(:for_redis).and_return({})
-    config.should_receive(:all).and_return(cfg)
+    config.should_receive(:all).twice.and_return(cfg)
 
     processor = double('processor')
     processor.should_receive(:start)
@@ -163,6 +163,7 @@ describe Flapjack::Coordinator do
     Kernel.should_receive(:trap).with('QUIT').and_yield
     Kernel.should_receive(:trap).with('HUP').and_yield
 
+    config.should_receive(:all).and_return({})
     config.should_receive(:for_redis).and_return({})
     fc = Flapjack::Coordinator.new(config)
     fc.should_receive(:stop).exactly(3).times
@@ -181,6 +182,7 @@ describe Flapjack::Coordinator do
     Kernel.should_not_receive(:trap).with('QUIT')
     Kernel.should_not_receive(:trap).with('HUP')
 
+    config.should_receive(:all).and_return({})
     config.should_receive(:for_redis).and_return({})
     fc = Flapjack::Coordinator.new(config)
     fc.should_receive(:stop).twice
@@ -197,7 +199,7 @@ describe Flapjack::Coordinator do
     new_config = double('new_config')
     filename = double('filename')
 
-    config.should_receive(:all).and_return(old_cfg)
+    config.should_receive(:all).twice.and_return(old_cfg)
     config.should_receive(:filename).and_return(filename)
 
     Flapjack::Configuration.should_receive(:new).and_return(new_config)
@@ -240,7 +242,7 @@ describe Flapjack::Coordinator do
     new_config = double('new_config')
     filename = double('filename')
 
-    config.should_receive(:all).and_return(old_cfg)
+    config.should_receive(:all).twice.and_return(old_cfg)
     config.should_receive(:filename).and_return(filename)
 
     Flapjack::Configuration.should_receive(:new).and_return(new_config)
@@ -270,7 +272,7 @@ describe Flapjack::Coordinator do
     new_config = double('new_config')
     filename = double('filename')
 
-    config.should_receive(:all).and_return(old_cfg)
+    config.should_receive(:all).twice.and_return(old_cfg)
     config.should_receive(:filename).and_return(filename)
 
     Flapjack::Configuration.should_receive(:new).and_return(new_config)

data/spec/lib/flapjack/logger_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'flapjack/logger'
 
 describe Flapjack::Logger do
 
@@ -13,19 +14,24 @@ describe Flapjack::Logger do
     logger.should_receive(:add).with(2, nil, "Yowza!")
     ::Logger.should_receive(:new).with(STDOUT).and_return(logger)
 
-    if Syslog.const_defined?('Logger', false)
-      sys_logger.should_receive(:formatter=).with(an_instance_of(Proc))
-      sys_logger.should_receive(:level=).with(Logger::DEBUG)
-      sys_logger.should_receive(:add).with(Logger::WARN, 'Yowza!', 'flapjack')
-      Syslog.const_get('Logger', false).should_receive(:new).with('flapjack').and_return(sys_logger)
-    else
-      Syslog.should_receive(:open).with('flapjack',
-        (Syslog::Constants::LOG_PID | Syslog::Constants::LOG_CONS),
-         Syslog::Constants::LOG_USER).and_return(syslog)
-      Syslog.should_receive(:mask=).with(Syslog::LOG_UPTO(Syslog::Constants::LOG_WARNING))
-      Syslog.should_receive(:log).with(Syslog::Constants::LOG_WARNING, /\[WARN\] :: spec :: %s/, "Yowza!")
-      Syslog.should_receive(:close)
-    end
+    Syslog.should_receive(:open).with('flapjack',
+      (Syslog::Constants::LOG_PID | Syslog::Constants::LOG_CONS),
+       Syslog::Constants::LOG_USER).and_return(syslog)
+    Syslog.should_receive(:mask=).with(Syslog::LOG_UPTO(Syslog::Constants::LOG_ERR))
+    Syslog.should_receive(:log).with(Syslog::Constants::LOG_WARNING, /\[WARN\] :: spec :: %s/, "Yowza!")
+    Syslog.should_receive(:close)
+
+    flogger = Flapjack::Logger.new('spec', 'level' => 'debug', 'syslog_errors' => 'true')
+    flogger.warn "Yowza!"
+  end
+
+  it 'defaults to not logging via syslog' do
+    logger.should_receive(:formatter=).with(an_instance_of(Proc))
+    logger.should_receive(:level=).and_return(Logger::DEBUG)
+    logger.should_receive(:add).with(2, nil, "Yowza!")
+    ::Logger.should_receive(:new).with(STDOUT).and_return(logger)
+
+    Syslog.should_not_receive(:open)
 
     flogger = Flapjack::Logger.new('spec', 'level' => 'debug')
     flogger.warn "Yowza!"

data/tasks/benchmarks.rake

@@ -14,7 +14,7 @@ namespace :benchmarks do
   require 'flapjack/data/entity_check'
   require 'flapjack/version'
 
-  FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'test'
+  FLAPJACK_ENV = 'test'
   config_file = File.join('tasks', 'support', 'flapjack_config_benchmark.yaml')
 
   config = Flapjack::Configuration.new

data/tasks/support/flapjack_config_benchmark.yaml

@@ -27,32 +27,4 @@ test:
     default_contact_timezone: Australia/Broken_Hill
     logger:
       level: WARN
-development:
-  pid_file: tmp/pids/flapjack_development.pid
-  log_file: log/flapjack_development.log
-  daemonize: no
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    db: 13
-  processor:
-    enabled: yes
-    queue: events
-    notifier_queue: notifications
-    archive_events: true
-    events_archive_maxage: 10800
-    new_check_scheduled_maintenance_duration: 1 month
-    exit_on_queue_empty: true
-    logger:
-      level: INFO
-  notifier:
-    enabled: yes
-    queue: notifications
-    email_queue: email_notifications
-    sms_queue: sms_notifications
-    jabber_queue: jabber_notifications
-    pagerduty_queue: pagerduty_notifications
-    notification_log_file: log/notification_test.log
-    default_contact_timezone: Australia/Broken_Hill
-    logger:
-      level: INFO
+