flapjack 0.7.31 → 0.7.32

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 0.7.32 - 2013-11-12
+- Feature: Improve flapjack-nagios-receiver --help to output example Nagios config gh-317 (@jessereynolds)
+- Bug: Crash with jabber query 'tell me about ENTITY' gh-367 (@ali-graham)
+
 # 0.7.31 - 2013-11-06
 - Bug: TypeError at /checks_all gh-363 (@jessereynolds)
 

data/bin/flapjack-nagios-receiver

@@ -116,6 +116,35 @@ optparse = OptionParser.new do |opts|
     options.logfile = l
   end
 
+  opts.on_tail("-h", "--help", "Show this usage message") do
+    puts opts
+    puts '
+Required Nagios Configuration Changes
+-------------------------------------
+
+flapjack-nagios-receiver reads events from a named pipe written to by Nagios. The named pipe needs creating, and Nagios needs to be told to write performance data output to it.
+
+To create the named pipe:
+
+  mkfifo -m 0666 /var/cache/nagios3/event_stream.fifo
+
+nagios.cfg changes:
+
+  # modified lines:
+  enable_notifications=0
+  host_perfdata_file=/var/cache/nagios3/event_stream.fifo
+  service_perfdata_file=/var/cache/nagios3/event_stream.fifo
+  host_perfdata_file_template=[HOSTPERFDATA]\t$TIMET$\t$HOSTNAME$\tHOST\t$HOSTSTATE$\t$HOSTEXECUTIONTIME$\t$HOSTLATENCY$\t$HOSTOUTPUT$\t$HOSTPERFDATA$
+  service_perfdata_file_template=[SERVICEPERFDATA]\t$TIMET$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$
+  host_perfdata_file_mode=p
+  service_perfdata_file_mode=p
+
+Details on the wiki: https://github.com/flpjck/flapjack/wiki/USING#configuring-nagios
+'
+
+    exit
+  end
+
 end
 optparse.parse!(ARGV)
 
@@ -128,7 +157,8 @@ redis_options = config.for_redis
 
 if config_env.nil? || config_env.empty?
   puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"
-  exit(false)
+  puts optparse
+  exit 1
 end
 
 config_nr = config_env['nagios-receiver'] || {}

data/features/cli_flapjack-nagios-receiver.feature

@@ -30,6 +30,7 @@ test:
     Then the exit status should be 0
     And  the output should contain "Usage: flapjack-nagios-receiver"
     And  the output should contain "-f, --fifo FIFO"
+    And  the output should contain "Required Nagios Configuration Changes"
 
   Scenario: Starting flapjack-nagios-receiver
     When I start flapjack-nagios-receiver with `flapjack-nagios-receiver start --no-daemonize --config tmp/cucumber_cli/flapjack-nagios-receiver.yaml`

data/lib/flapjack/gateways/jabber.rb

@@ -128,7 +128,7 @@ module Flapjack
         end
       end
 
-      def get_check_details(entity_check)
+      def get_check_details(entity_check, current_time)
         sched   = entity_check.current_maintenance(:scheduled => true)
         unsched = entity_check.current_maintenance(:unscheduled => true)
         out = ''
@@ -273,7 +273,7 @@ module Flapjack
                 entity_check = Flapjack::Data::EntityCheck.for_entity(entity, check, :redis => @redis)
                 next if entity_check.nil?
                 msg += "---\n#{entity_name}:#{check}\n" if check_name.nil?
-                msg += get_check_details(entity_check)
+                msg += get_check_details(entity_check, current_time)
               end
             end
           else
@@ -375,9 +375,14 @@ module Flapjack
           command = $1
         end
 
-        results = interpreter(command)
-        msg     = results[:msg]
-        action  = results[:action]
+        begin
+          results = interpreter(command)
+          msg     = results[:msg]
+          action  = results[:action]
+        rescue => e
+          @logger.error("Exception when interpreting command '#{command}' - #{e.class}, #{e.message}")
+          msg = "Oops, something went wrong processing that command (#{e.class}, #{e.message})"
+        end
 
         if msg || action
           EventMachine::Synchrony.next_tick do
@@ -398,9 +403,14 @@ module Flapjack
           command = stanza.body
         end
 
-        results = interpreter(command)
-        msg     = results[:msg]
-        action  = results[:action]
+        begin
+          results = interpreter(command)
+          msg     = results[:msg]
+          action  = results[:action]
+        rescue => e
+          @logger.error("Exception when interpreting command '#{command}' - #{e.class}, #{e.message}")
+          msg = "Oops, something went wrong processing that command (#{e.class}, #{e.message})"
+        end
 
         if msg || action
           EventMachine::Synchrony.next_tick do

data/lib/flapjack/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.31
+  version: 0.7.32
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -558,7 +558,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3016684688125604852
+      hash: 834691896094237630
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -567,7 +567,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3016684688125604852
+      hash: 834691896094237630
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23