sensu 0.6.8 → 0.6.9

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 \#*
 dump.rdb
 .DS_Store
+*.png

data/README.org

@@ -1,61 +1,28 @@
 * Welcome to Sensu
-  Sensu is a monitoring system framework, handling the remote execution of checks.
+  Sensu is a monitoring system framework.
 
-  Checks can utilize user created plugins, returning an exit status code and outputting to STDOUT.
-
-  Check results are handled by user created handlers.
+  [[https://github.com/sonian/sensu/raw/master/sensu-logo.png]]
 
-  Documentation can be found [[https://github.com/sonian/sensu/wiki][here]].
+  Checks can utilize user created plugins, returning an exit status code and outputting to STDOUT.
 
+  Check results are handled by user created handlers, receiving JSON formatted event data from STDIN.
+* Documentation
+  Documentation can be found [[https://github.com/sonian/sensu/wiki][HERE]].
 * License
   Sensu is released under the [[https://github.com/sonian/sensu/blob/master/MIT-LICENSE.txt][MIT license]].
-
 * Contributing
   - [[http://help.github.com/fork-a-repo/][Fork]] [[https://github.com/sonian/sensu][Sensu]]
   - Use a [[https://github.com/dchelimsky/rspec/wiki/Topic-Branches][topic branch]]
   - Create a [[http://help.github.com/send-pull-requests/][pull request]]
 
   Keep it simple.
-
-** Readme Driven Development
-*** A Client Will
-  - Have a set of attributes to describe it, including its responsibilities
-  - Send keep-alives to a server
-  - Subscribe to a queue bound to a set of fanout exchanges, determined by its responsibilities
-  - Substitute tokens in check commands with their matching client attribute
-  - Report when it does not have a client attribute for token substitution
-  - Receive checks from subscriptions, execute them, and publish the results to a queue with its client name
-  - Not allow overlapping check executions of the same name
-  - Report when it is unaware of a check it received from a subscription
-
-*** A Server Will
-  - Subscribe to a queue for check results, another for keep-alives
-  - Pull keep-alives, storing client details
-  - Publish checks on defined intervals to their associated fanout exchanges
-  - Pull check results, storing the latest events for clients, a good result will flush a previous event for that client
-  - Create an event when it stops receiving keep-alives from a client, a new keep-alive for the client will clear the event
-  - Trigger a event handler, either the default handler or one specified for the check, providing it with a JSON event file
-
-*** An API Will
-  - List all current events
-  - List all clients and their attributes
-  - Show a client and its attributes
-  - Remove a client and resolve associated events
-
-*** A Plugin Will
-  - Output to STDOUT
-  - Return a valid exit status code
-
-*** A Handler Will
-  - Accept a command line argument "-f", for an event file path
-  - Parse the JSON event file
-  - Handle the event as it wishes
-
 ** Testing
 *** Requirements
-  - RabbitMQ (default configuration)
-  - Redis (default configuration)
-
-*** MiniTest
-
+  - RabbitMQ
+  - Redis
+*** Running
+  : bundle install
   : rake test
+* Contributors
+  - Sean Porter ([[https://twitter.com/#!/portertech][@portertech]])
+  - Justin Kolberg ([[https://twitter.com/#!/amdprophet][@amdprophet]])

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

data/lib/sensu/client.rb

@@ -8,7 +8,7 @@ module Sensu
         client.setup_amqp
         client.setup_keepalives
         client.setup_subscriptions
-        client.monitor_queues
+        client.setup_queue_monitor
 
         Signal.trap('INT') do
           EM.stop
@@ -90,7 +90,7 @@ module Sensu
       end
     end
 
-    def monitor_queues
+    def setup_queue_monitor
       EM.add_periodic_timer(5) do
         unless @check_queue.subscribed?
           @check_queue.delete

data/lib/sensu/server.rb

@@ -19,7 +19,7 @@ module Sensu
           server.setup_publisher
           server.setup_keepalive_monitor
         end
-        server.monitor_queues
+        server.setup_queue_monitor
 
         Signal.trap('INT') do
           EM.stop
@@ -83,29 +83,68 @@ module Sensu
         unless client_json.nil?
           client = JSON.parse(client_json)
           check = result['check']
-          check.merge!(@settings['checks'][check['name']]) if @settings['checks'].has_key?(check['name'])
+          if @settings['checks'][check['name']]
+            check.merge!(@settings['checks'][check['name']])
+          end
           check['handler'] ||= 'default'
           event = {'client' => client, 'check' => check, 'occurrences' => 1}
           if check['type'] == 'metric'
             handle_event(event)
           else
-            @redis.hget('events:' + client['name'], check['name']).callback do |event_json|
-              previous_event = event_json ? JSON.parse(event_json) : nil
-              if previous_event && check['status'] == 0
-                @redis.hdel('events:' + client['name'], check['name'])
-                event['action'] = 'resolve'
-                handle_event(event)
-              elsif check['status'] > 0
-                if previous_event && check['status'] == previous_event['status']
-                  event['occurrences'] = previous_event['occurrences'] += 1
+            history_key = 'history:' + client['name'] + ':' + check['name']
+            @redis.rpush(history_key, check['status']).callback do
+              @redis.lrange(history_key, -21, -1).callback do |history|
+                total_state_change = 0
+                unless history.count < 21
+                  state_changes = 0
+                  change_weight = 0.8
+                  history.each do |status|
+                    previous_status ||= status
+                    unless status == previous_status
+                      state_changes += change_weight
+                    end
+                    change_weight += 0.02
+                    previous_status = status
+                  end
+                  total_state_change = (state_changes.fdiv(20) * 100).to_i
+                  @redis.lpop(history_key)
                 end
-                @redis.hset('events:' + client['name'], check['name'], {
-                  'status' => check['status'],
-                  'output' => check['output'],
-                  'occurrences' => event['occurrences']
-                }.to_json).callback do
-                  event['action'] = 'create'
-                  handle_event(event)
+                high_flap_threshold = check['high_flap_threshold'] || 50
+                low_flap_threshold = check['low_flap_threshold'] || 40
+                @redis.hget('events:' + client['name'], check['name']).callback do |event_json|
+                  previous_event = event_json ? JSON.parse(event_json) : false
+                  flapping = previous_event ? previous_event['flapping'] : false
+                  check['flapping'] = case
+                  when total_state_change >= high_flap_threshold
+                    true
+                  when flapping && total_state_change <= low_flap_threshold
+                    false
+                  else
+                    flapping
+                  end
+                  if previous_event && check['status'] == 0
+                    unless check['flapping']
+                      @redis.hdel('events:' + client['name'], check['name']).callback do
+                        event['action'] = 'resolve'
+                        handle_event(event)
+                      end
+                    else
+                      @redis.hset('events:' + client['name'], check['name'], previous_event.merge({'flapping' => true}).to_json)
+                    end
+                  elsif check['status'] != 0
+                    if previous_event && check['status'] == previous_event['status']
+                      event['occurrences'] = previous_event['occurrences'] += 1
+                    end
+                    @redis.hset('events:' + client['name'], check['name'], {
+                      'status' => check['status'],
+                      'output' => check['output'],
+                      'flapping' => check['flapping'],
+                      'occurrences' => event['occurrences']
+                    }.to_json).callback do
+                      event['action'] = 'create'
+                      handle_event(event)
+                    end
+                  end
                 end
               end
             end
@@ -153,17 +192,17 @@ module Sensu
               when time_since_last_check >= 180
                 result['check']['status'] = 2
                 result['check']['output'] = 'No keep-alive sent from host in over 180 seconds'
-                @result_queue.publish(result.to_json)
+                process_result(result)
               when time_since_last_check >= 120
                 result['check']['status'] = 1
                 result['check']['output'] = 'No keep-alive sent from host in over 120 seconds'
-                @result_queue.publish(result.to_json)
+                process_result(result)
               else
                 @redis.hexists('events:' + client_id, 'keepalive').callback do |exists|
                   if exists == 1
                     result['check']['status'] = 0
                     result['check']['output'] = 'Keep-alive sent from host'
-                    @result_queue.publish(result.to_json)
+                    process_result(result)
                   end
                 end
               end
@@ -173,7 +212,7 @@ module Sensu
       end
     end
 
-    def monitor_queues
+    def setup_queue_monitor
       EM.add_periodic_timer(5) do
         unless @keepalive_queue.subscribed?
           setup_keepalives

metadata

@@ -1,193 +1,149 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sensu
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 8
-  version: 0.6.8
+version: !ruby/object:Gem::Version
+  version: 0.6.9
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Sean Porter
 - Justin Kolberg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-07 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-13 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: amqp
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70143497848320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 7
-        - 4
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.7.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70143497848320
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70143497846580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70143497846580
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &70143497845280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: em-syslog
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70143497845280
+- !ruby/object:Gem::Dependency
+  name: em-syslog
+  requirement: &70143497844500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: em-hiredis
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70143497844500
+- !ruby/object:Gem::Dependency
+  name: em-hiredis
+  requirement: &70143497843400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: async_sinatra
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70143497843400
+- !ruby/object:Gem::Dependency
+  name: async_sinatra
+  requirement: &70143497842460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70143497842460
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70143497841880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70143497841880
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70143497841300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70143497841300
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70143497840860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: em-ventually
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70143497840860
+- !ruby/object:Gem::Dependency
+  name: em-ventually
+  requirement: &70143497840360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70143497840360
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70143497839760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: *70143497839760
 description: A server monitoring framework using the publish-subscribe model
-email: 
+email:
 - sean.porter@sonian.net
 - justin.kolberg@sonian.net
-executables: 
+executables:
 - sensu-api
 - sensu-client
 - sensu-server
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -203,41 +159,32 @@ files:
 - lib/sensu/config.rb
 - lib/sensu/helpers.rb
 - lib/sensu/server.rb
+- sensu-logo.png
 - sensu.gemspec
 - sensu.windows
-has_rdoc: true
 homepage: https://github.com/sonian/sensu
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A server monitoring framework
 test_files: []
-