sensu 0.9.12.beta.4 → 0.9.12.beta.5

data/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ### Features
 
+Client check history API endpoint with last execution timestamp.
+
 API can bind to a specific address.
 
 Extension stop hook for clean up before the event loop is stopped.

data/README.md

@@ -2,7 +2,7 @@
 
 A monitoring framework that aims to be simple, malleable, and scalable.
 
-![travis](https://secure.travis-ci.org/sensu/sensu.png)
+[![Build Status](https://secure.travis-ci.org/sensu/sensu.png)](https://travis-ci.org/sensu/sensu)
 
 ## Documentation
   Please refer to the [Sensu Wiki](https://github.com/sensu/sensu/wiki).

data/lib/sensu/api.rb

@@ -253,6 +253,39 @@ module Sensu
       end
     end
 
+    aget %r{/clients/([\w\.-]+)/history$} do |client_name|
+      response = Array.new
+      $redis.smembers('history:' + client_name) do |checks|
+        unless checks.empty?
+          checks.each_with_index do |check_name, index|
+            history_key = 'history:' + client_name + ':' + check_name
+            $redis.lrange(history_key, -21, -1) do |history|
+              history.map! do |status|
+                status.to_i
+              end
+              execution_key = 'execution:' + client_name + ':' + check_name
+              $redis.get(execution_key) do |last_execution|
+                unless history.empty? || last_execution.nil?
+                  item = {
+                    :check => check_name,
+                    :history => history,
+                    :last_execution => last_execution.to_i,
+                    :last_status => history.last
+                  }
+                  response << item
+                end
+                if index == checks.size - 1
+                  body Oj.dump(response)
+                end
+              end
+            end
+          end
+        else
+          body Oj.dump(response)
+        end
+      end
+    end
+
     adelete %r{/clients?/([\w\.-]+)$} do |client_name|
       $redis.get('client:' + client_name) do |client_json|
         unless client_json.nil?
@@ -271,6 +304,7 @@ module Sensu
               $redis.smembers('history:' + client_name) do |checks|
                 checks.each do |check_name|
                   $redis.del('history:' + client_name + ':' + check_name)
+                  $redis.del('execution:' + client_name + ':' + check_name)
                 end
                 $redis.del('history:' + client_name)
               end
@@ -411,11 +445,11 @@ module Sensu
         unless checks.empty?
           checks.each_with_index do |check_name, index|
             $redis.smembers('aggregates:' + check_name) do |aggregates|
-              collection = {
+              item = {
                 :check => check_name,
                 :issued => aggregates.sort.reverse
               }
-              response << collection
+              response << item
               if index == checks.size - 1
                 body Oj.dump(response)
               end

data/lib/sensu/client.rb

@@ -97,6 +97,7 @@ module Sensu
       unless @checks_in_progress.include?(check[:name])
         @checks_in_progress << check[:name]
         command, unmatched_tokens = substitute_command_tokens(check)
+        check[:executed] = Time.now.to_i
         if unmatched_tokens.empty?
           execute = Proc.new do
             @logger.debug('executing check command', {
@@ -135,6 +136,7 @@ module Sensu
       @logger.debug('attempting to run check extension', {
         :check => check
       })
+      check[:executed] = Time.now.to_i
       extension = @extensions[:checks][check[:name]]
       extension.run do |output, status|
         check[:output] = output
@@ -155,6 +157,7 @@ module Sensu
           check[:output] = 'Check is not locally defined (safe mode)'
           check[:status] = 3
           check[:handle] = false
+          check[:executed] = Time.now.to_i
           publish_result(check)
         else
           execute_check_command(check)

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.12.beta.4'
+    VERSION = '0.9.12.beta.5'
 
     LOG_LEVELS = [:debug, :info, :warn, :error, :fatal]
 

data/lib/sensu/server.rb

@@ -427,6 +427,8 @@ module Sensu
           @redis.sadd('history:' + client[:name], check[:name])
           history_key = 'history:' + client[:name] + ':' + check[:name]
           @redis.rpush(history_key, check[:status]) do
+            execution_key = 'execution:' + client[:name] + ':' + check[:name]
+            @redis.set(execution_key, check[:executed])
             @redis.lrange(history_key, -21, -1) do |history|
               check[:history] = history
               total_state_change = 0
@@ -584,7 +586,8 @@ module Sensu
             client = Oj.load(client_json)
             check = {
               :name => 'keepalive',
-              :issued => Time.now.to_i
+              :issued => Time.now.to_i,
+              :executed => Time.now.to_i
             }
             time_since_last_keepalive = Time.now.to_i - client[:timestamp]
             case

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 3135244901
+  hash: -1667026956
   prerelease: true
   segments: 
   - 0
   - 9
   - 12
   - beta
-  - 4
-  version: 0.9.12.beta.4
+  - 5
+  version: 0.9.12.beta.5
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-08 00:00:00 -08:00
+date: 2013-03-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency