auxesis-flapjack 0.4.9 → 0.4.10

data/Rakefile

@@ -4,6 +4,15 @@ require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'
 
+# integration tests for cli utils
+begin 
+  require 'cucumber/rake/task'
+
+  Cucumber::Rake::Task.new do |task|
+    task.cucumber_opts = "--require features/"
+  end
+rescue LoadError
+end
 
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ["--options", "spec/spec.opts"]

data/TODO.md

@@ -1,14 +1,10 @@
- * daemonise notifier - DONE
- * provide config file for notifier
-   * specify which notifier plugins to load - DONE
-   * specify configuration for plugins (from address/xmmp login) - DONE
- * write init scripts for notifier/worker-manager - DONE
  * hook notifier into web interface
    * update status of checks - DONE
    * relationships + cascading notifications - DONE
    * simple graphs
    * event/result history
  * build option to specify notifier(s) directory
+ * trigger populator from web interface
  * documentation!
    * user
    * developer
@@ -17,7 +13,6 @@
    * integrating with collectd guide
    * writing custom populators guide
  * write puppet manifests
- * write chef cookbooks
  * package with pallet
  * generate .deb/.rpms
    * build packages for gem dependencies

data/bin/flapjack-notifier-manager

@@ -27,10 +27,17 @@ unless File.writable?(pid_dir)
   exit 2
 end
 
-daemon_args = (args + ['--', '--beanstalk', options.host, 
-                       '--port', options.port.to_s,
-                       '--recipients', options.recipients])
+# construct arguments
+daemon_args = args
+if args.first != "stop"
+  # if we're not stopping the daemon, pass options to it
+  daemon_args += ['--', '--beanstalk', options.host, 
+                        '--port', options.port.to_s,
+                        '--recipients', options.recipients,
+                        '--config', File.expand_path(options.config_filename)]
+end
 
+# boot
 Daemons.run(worker_path, :ARGV => daemon_args,
                          :multiple => false, 
                          :dir_mode => :normal,

data/bin/flapjack-worker-manager

@@ -29,5 +29,7 @@ options.workers.times do |n|
                 :dir_mode => :normal,
                 :dir => pid_dir)
   end
+  # so we don't try and stop the daemon multiple times
+  break if ARGV[0] == "stop"
 end
 

data/flapjack.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'flapjack'
-  s.version = '0.4.9'
-  s.date = '2009-07-14'
+  s.version = '0.4.10'
+  s.date = '2009-07-16'
   
   s.summary = "a scalable and distributed monitoring system"
   s.description = "Flapjack is highly scalable and distributed monitoring system. It understands the Nagios plugin format, and can easily be scaled from 1 server to 1000."

data/lib/flapjack/cli/notifier_manager.rb

@@ -27,6 +27,9 @@ module Flapjack
         opts.on('-r', '--recipients FILE', 'recipients file') do |recipients|
           options.recipients = File.expand_path(recipients.to_s)
         end
+        opts.on('-c', '--config FILE', 'config file') do |config|
+          options.config_filename = config.to_s
+        end
       end
   
       begin
@@ -41,18 +44,35 @@ module Flapjack
       options.host ||= "localhost"
       options.port ||= 11300
 
+      @errors = []
+
       unless ARGV[0] == "stop"
-        unless options.recipients =~ /.+/ 
-          puts "You must specify a recipients file!\n\n"
-          puts opts
-          exit 2
+        if options.recipients
+          unless File.exists?(options.recipients)
+            @errors << "The specified recipients file doesn't exist!"
+          end
+        else
+          @errors << "You must specify a recipients file!"
         end
-    
-        unless File.exists?(options.recipients)
-          puts "The specified recipients file doesn't exist!"
-          exit 2
+
+        if options.config_filename 
+          unless File.exists?(options.config_filename)
+            @errors << "The specified config file dosen't exist!"
+          end
+        else 
+          @errors << "You must specify a config file!"
         end
       end
+
+      if @errors.size > 0
+        puts "Errors:" 
+        @errors.each do |error|
+          puts "  - #{error}"
+        end
+        puts
+        puts opts
+        exit 2
+      end
   
       unless %w(start stop restart).include?(args[0])
         puts opts

data/lib/flapjack/cli/worker_manager.rb

@@ -20,11 +20,14 @@ class WorkerManagerOptions
       opts.on('-w', '--workers N', 'number of workers to spin up') do |workers|
         options.workers = workers.to_i
       end
+      opts.on('-c', '--checks-directory DIR', 'sandboxed check directory') do |dir|
+        options.check_directory = dir
+      end
     end
 
     begin
       opts.parse!(args)
-    rescue
+    rescue => e
       puts e.message.capitalize + "\n\n"
       puts opts
       exit 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auxesis-flapjack
 version: !ruby/object:Gem::Version 
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-14 00:00:00 -07:00
+date: 2009-07-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency