sensu 0.9.5.beta.2 → 0.9.5.beta.3

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.9.5.beta.2"
+  # A monitoring framework that aims to be simple, malleable, & scalable.
 end

data/lib/sensu/api.rb

@@ -148,13 +148,15 @@ module Sensu
 
     aget '/checks' do
       $logger.debug('[checks] -- ' + request.ip + ' -- GET -- request for check list')
-      body $settings.checks.to_json
+      response = $settings.checks.map { |check, details| details.merge(:name => check) }
+      body response.to_json
     end
 
     aget '/check/:name' do |check|
       $logger.debug('[check] -- ' + request.ip + ' -- GET -- request for check -- ' + check)
       if $settings.checks.key?(check)
-        body $settings.checks[check].to_json
+        response = $settings.checks[check].merge(:name => check)
+        body response.to_json
       else
         status 404
         body ''

data/lib/sensu/config.rb

@@ -12,7 +12,7 @@ require 'amqp'
 require 'cabin'
 require 'cabin/outputs/em/stdlib-logger'
 
-require File.join(File.dirname(__FILE__), '..', 'sensu')
+require File.join(File.dirname(__FILE__), 'version')
 require File.join(File.dirname(__FILE__), 'patches', 'ruby')
 require File.join(File.dirname(__FILE__), 'patches', 'amqp')
 
@@ -36,7 +36,9 @@ module Sensu
     end
 
     def invalid_config(message)
-      raise 'configuration invalid, ' + message
+      puts 'CONFIGURATION INVALID: ' + message
+      puts 'SENSU NOT RUNNING'
+      exit 2
     end
 
     def setup_logging
@@ -75,6 +77,11 @@ module Sensu
           unless details.subscribers.is_a?(Array) && details.subscribers.count > 0
             invalid_config('missing subscribers for check ' + name)
           end
+          details.subscribers.each do |subscriber|
+            unless subscriber.is_a?(String) && !subscriber.empty?
+              invalid_config('a check subscriber must be a string (not empty) for check ' + name)
+            end
+          end
         end
         if details.key?('handler')
           unless details.handler.is_a?(String)
@@ -95,7 +102,7 @@ module Sensu
       end
       @settings.handlers.each do |name, details|
         unless details.is_a?(Hash)
-          invalid_config('hander details must be a hash ' + name)
+          invalid_config('handler details must be a hash for handler ' + name)
         end
         unless details['type'].is_a?(String)
           invalid_config('missing type for handler ' + name)
@@ -128,12 +135,13 @@ module Sensu
     end
 
     def validate_api_settings
-      if @settings.api.key?('user')
+      unless @settings.api.port.is_a?(Integer)
+        invalid_config('api port must be an integer')
+      end
+      if @settings.api.key?('user') || @settings.api.key?('password')
         unless @settings.api.user.is_a?(String)
           invalid_config('api user must be a string')
         end
-      end
-      if @settings.api.key?('password')
         unless @settings.api.password.is_a?(String)
           invalid_config('api password must be a string')
         end
@@ -150,6 +158,11 @@ module Sensu
       unless @settings.client.subscriptions.is_a?(Array) && @settings.client.subscriptions.count > 0
         invalid_config('client must have subscriptions')
       end
+      @settings.client.subscriptions.each do |subscription|
+        unless subscription.is_a?(String) && !subscription.empty?
+          invalid_config('a client subscription must be a string (not empty)')
+        end
+      end
     end
 
     def has_keys(keys)
@@ -162,11 +175,11 @@ module Sensu
 
     def validate_settings
       @logger.debug('[validate] -- validating configuration')
-      has_keys(%w[rabbitmq checks])
+      has_keys(%w[checks])
       validate_common_settings
       case File.basename($0)
       when 'rake'
-        has_keys(%w[redis api handlers client])
+        has_keys(%w[api handlers client])
         validate_server_settings
         validate_api_settings
         validate_client_settings
@@ -187,6 +200,9 @@ module Sensu
       if File.readable?(@options[:config_file])
         begin
           config_hash = JSON.parse(File.open(@options[:config_file], 'r').read)
+          %w[rabbitmq redis].each do |key|
+            config_hash[key] ||= Hash.new
+          end
         rescue JSON::ParserError => error
           invalid_config('configuration file (' + @options[:config_file] + ') must be valid JSON: ' + error.to_s)
         end
@@ -220,6 +236,10 @@ module Sensu
           puts opts
           exit
         end
+        opts.on('-V', '--version', 'Display version') do
+          puts Sensu::VERSION
+          exit
+        end
         opts.on('-c', '--config FILE', 'Sensu JSON config FILE. Default is /etc/sensu/config.json') do |file|
           options[:config_file] = file
         end

data/lib/sensu/patches/redis.rb

@@ -1,9 +1,23 @@
 module Redis
   class Client
+    attr_accessor :redis_host, :redis_port, :redis_password
+
     def connection_completed
       @connected = true
       @reconnecting = false
-      @port, @host = Socket.unpack_sockaddr_in(get_peername)
+      if @redis_password
+        auth(@redis_password).callback do |reply|
+          unless reply == "OK"
+            raise 'could not authenticate'
+          end
+        end
+      end
+      info.callback do |reply|
+        redis_version = reply.split(/\n/).first.split(/:/).last
+        unless redis_version.to_i >= 2
+          raise 'redis version must be >= 2.0'
+        end
+      end
     end
 
     def close
@@ -15,14 +29,14 @@ module Redis
       unless !@connected || @closing_connection
         EM::Timer.new(1) do
           @reconnecting = true
-          reconnect(@host, @port)
+          reconnect(@redis_host, @redis_port)
         end
       else
         until @queue.empty?
-          @queue.shift.fail RuntimeError.new 'connection closed'
+          @queue.shift.fail RuntimeError.new('connection closed')
         end
         unless @connected
-          raise "could not connect to redis"
+          raise 'could not connect to redis'
         end
       end
     end
@@ -35,13 +49,10 @@ module Redis
   def self.connect(options={})
     host = options[:host] || 'localhost'
     port = options[:port] || 6379
-    redis = EM::connect(host, port, Redis::Client)
-    redis.info do |info|
-      redis_version = info.split(/\n/).first.split(/:/).last
-      unless redis_version.to_i >= 2
-        raise "redis version must be >= 2.0"
-      end
+    EM::connect(host, port, Redis::Client) do |client|
+      client.redis_host = host
+      client.redis_port = port
+      client.redis_password = options[:password]
     end
-    redis
   end
 end

data/lib/sensu/version.rb

@@ -0,0 +1,3 @@
+module Sensu
+  VERSION = "0.9.5.beta.3"
+end

data/sensu.gemspec

@@ -1,4 +1,4 @@
-require File.expand_path("../lib/sensu", __FILE__)
+require File.expand_path("../lib/sensu/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "sensu"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196255
+  hash: 62196253
   prerelease: true
   segments: 
   - 0
   - 9
   - 5
   - beta
-  - 2
-  version: 0.9.5.beta.2
+  - 3
+  version: 0.9.5.beta.3
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-06 00:00:00 -08:00
+date: 2012-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -222,6 +222,7 @@ files:
 - lib/sensu/patches/redis.rb
 - lib/sensu/patches/ruby.rb
 - lib/sensu/server.rb
+- lib/sensu/version.rb
 - lib/sensu.rb
 - sensu.gemspec
 - README.org