sensu 0.18.0-java → 0.18.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b150f73c2e45b7029bca9d36d73c996538651606
-  data.tar.gz: 1254668b8bca3643d8303c75bb9ab4e363e1d56f
+  metadata.gz: b6d7a448d0424a899fd3c8d28524ba0069e484b9
+  data.tar.gz: c8d96c4c8a55343dcb0e0b3064fd64f7a3ef0ca9
 SHA512:
-  metadata.gz: 6b775fe6458441e6a0ca1fdd5168ae716f125dc7d87daf0f7b6d6833c78300cab22028940bb229cb44afd57a15fe263f7080ec272253c98ace43cc0fd37a256f
-  data.tar.gz: fa6908053402fc2bc1fb443d4174ff5044b334e01fadf9440f2fb39a8e2d32341ac7b90ff6f0b8a21a87588991ac8f2fcbff13e21ee0661479b1bd4deb4203b3
+  metadata.gz: af8ea8a7099f459e078968ac86beec8e2554552086fef9578c4b37ab17ee735595f0170d8c88474c6c734f730dd42adc88d39ea1a96a052fd446360fca805f6a
+  data.tar.gz: e3c0bb292415d73d7a06698e3557cec3b455e92b537e18ea5e1acca2ee7bdd2269fd67a2731c23b3e0efb79d7607fb8c1361b4f753191490b470f5acfc5d5360

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.18.1 - 2015-05-11
+
+### Other
+
+Check results written to the Sensu client socket(s) now have a default
+executed timestamp, equal to the current Unix/epoch time.
+
+Check source is now validated for check results written to the Sensu
+client socket(s), using the same regular expression as the configuration
+attribute validator.
+
+The latest versions of Ruby Sinatra and Async Sinatra are now used,
+which include many improvements and bug fixes.
+
+Added a caret to the beginning of API routes/endpoints that use regular
+expressions, fixing a bug that caused the wrong route/endpoint to be
+called, e.g. `/clients/client`.
+
 ## 0.18.0 - 2015-05-05
 
 ### Features

data/README.md

@@ -5,7 +5,7 @@ A monitoring framework that aims to be simple, malleable, and scalable.
 [![Build Status](https://secure.travis-ci.org/sensu/sensu.png)](https://travis-ci.org/sensu/sensu)
 
 ## Documentation
-  Please refer to the [Sensu Docs](http://docs.sensuapp.org/).
+  Please refer to the [Sensu Docs](http://sensuapp.org/docs/latest/overview).
 
 ## License
   Sensu is released under the [MIT license](https://raw.github.com/sensu/sensu/master/MIT-LICENSE.txt).

data/lib/sensu/api/process.rb

@@ -1,7 +1,7 @@
 require "sensu/daemon"
 
-gem "sinatra", "1.3.5"
-gem "async_sinatra", "1.0.0"
+gem "sinatra", "1.4.6"
+gem "async_sinatra", "1.2.0"
 
 unless RUBY_PLATFORM =~ /java/
   gem "thin", "1.5.0"
@@ -345,7 +345,7 @@ module Sensu
         end
       end
 
-      aget %r{/clients?/([\w\.-]+)/?$} do |client_name|
+      aget %r{^/clients?/([\w\.-]+)/?$} do |client_name|
         settings.redis.get("client:#{client_name}") do |client_json|
           unless client_json.nil?
             body client_json
@@ -355,7 +355,7 @@ module Sensu
         end
       end
 
-      aget %r{/clients/([\w\.-]+)/history/?$} do |client_name|
+      aget %r{^/clients/([\w\.-]+)/history/?$} do |client_name|
         response = Array.new
         settings.redis.smembers("result:#{client_name}") do |checks|
           unless checks.empty?
@@ -391,7 +391,7 @@ module Sensu
         end
       end
 
-      adelete %r{/clients?/([\w\.-]+)/?$} do |client_name|
+      adelete %r{^/clients?/([\w\.-]+)/?$} do |client_name|
         settings.redis.get("client:#{client_name}") do |client_json|
           unless client_json.nil?
             settings.redis.hgetall("events:#{client_name}") do |events|
@@ -426,7 +426,7 @@ module Sensu
         body MultiJson.dump(settings.all_checks)
       end
 
-      aget %r{/checks?/([\w\.-]+)/?$} do |check_name|
+      aget %r{^/checks?/([\w\.-]+)/?$} do |check_name|
         if settings.checks[check_name]
           response = settings.checks[check_name].merge(:name => check_name)
           body MultiJson.dump(response)
@@ -491,7 +491,7 @@ module Sensu
         end
       end
 
-      aget %r{/events/([\w\.-]+)/?$} do |client_name|
+      aget %r{^/events/([\w\.-]+)/?$} do |client_name|
         response = Array.new
         settings.redis.hgetall("events:#{client_name}") do |events|
           events.each do |check_name, event_json|
@@ -501,7 +501,7 @@ module Sensu
         end
       end
 
-      aget %r{/events?/([\w\.-]+)/([\w\.-]+)/?$} do |client_name, check_name|
+      aget %r{^/events?/([\w\.-]+)/([\w\.-]+)/?$} do |client_name, check_name|
         settings.redis.hgetall("events:#{client_name}") do |events|
           event_json = events[check_name]
           unless event_json.nil?
@@ -512,7 +512,7 @@ module Sensu
         end
       end
 
-      adelete %r{/events?/([\w\.-]+)/([\w\.-]+)/?$} do |client_name, check_name|
+      adelete %r{^/events?/([\w\.-]+)/([\w\.-]+)/?$} do |client_name, check_name|
         settings.redis.hgetall("events:#{client_name}") do |events|
           if events.include?(check_name)
             resolve_event(events[check_name])
@@ -566,7 +566,7 @@ module Sensu
         end
       end
 
-      aget %r{/aggregates/([\w\.-]+)/?$} do |check_name|
+      aget %r{^/aggregates/([\w\.-]+)/?$} do |check_name|
         settings.redis.smembers("aggregates:#{check_name}") do |aggregates|
           unless aggregates.empty?
             aggregates.reverse!
@@ -587,7 +587,7 @@ module Sensu
         end
       end
 
-      adelete %r{/aggregates/([\w\.-]+)/?$} do |check_name|
+      adelete %r{^/aggregates/([\w\.-]+)/?$} do |check_name|
         settings.redis.smembers("aggregates:#{check_name}") do |aggregates|
           unless aggregates.empty?
             aggregates.each do |check_issued|
@@ -606,7 +606,7 @@ module Sensu
         end
       end
 
-      aget %r{/aggregates?/([\w\.-]+)/([\w\.-]+)/?$} do |check_name, check_issued|
+      aget %r{^/aggregates?/([\w\.-]+)/([\w\.-]+)/?$} do |check_name, check_issued|
         result_set = "#{check_name}:#{check_issued}"
         settings.redis.hgetall("aggregate:#{result_set}") do |aggregate|
           unless aggregate.empty?
@@ -640,7 +640,7 @@ module Sensu
         end
       end
 
-      apost %r{/stash(?:es)?/(.*)/?} do |path|
+      apost %r{^/stash(?:es)?/(.*)/?} do |path|
         read_data do |data|
           settings.redis.set("stash:#{path}", MultiJson.dump(data)) do
             settings.redis.sadd("stashes", path) do
@@ -650,7 +650,7 @@ module Sensu
         end
       end
 
-      aget %r{/stash(?:es)?/(.*)/?} do |path|
+      aget %r{^/stash(?:es)?/(.*)/?} do |path|
         settings.redis.get("stash:#{path}") do |stash_json|
           unless stash_json.nil?
             body stash_json
@@ -660,7 +660,7 @@ module Sensu
         end
       end
 
-      adelete %r{/stash(?:es)?/(.*)/?} do |path|
+      adelete %r{^/stash(?:es)?/(.*)/?} do |path|
         settings.redis.exists("stash:#{path}") do |stash_exists|
           if stash_exists
             settings.redis.srem("stashes", path) do

data/lib/sensu/client/socket.rb

@@ -119,12 +119,18 @@ module Sensu
         unless check[:name] =~ /^[\w\.-]+$/
           raise DataError, "check name must be a string and cannot contain spaces or special characters"
         end
+        unless check[:source].nil? || check[:source] =~ /^[\w\.-]+$/
+          raise DataError, "check source must be a string and cannot contain spaces or special characters"
+        end
         unless check[:output].is_a?(String)
           raise DataError, "check output must be a string"
         end
         unless check[:status].is_a?(Integer)
           raise DataError, "check status must be an integer"
         end
+        unless check[:executed].is_a?(Integer)
+          raise DataError, "check executed timestamp must be an integer"
+        end
       end
 
       # Publish a check result to the Sensu transport.
@@ -149,6 +155,7 @@ module Sensu
       # @raise [DataError] if +check+ is invalid.
       def process_check_result(check)
         check[:status] ||= 0
+        check[:executed] ||= Time.now.to_i
         validate_check_result(check)
         publish_check_result(check)
         respond("ok")

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.18.0"
+    VERSION = "0.18.1"
 
     # Sensu check severities.
     SEVERITIES = %w[ok warning critical unknown]

data/sensu.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform    = RUBY_PLATFORM =~ /java/ ? Gem::Platform::JAVA : Gem::Platform::RUBY
   s.authors     = ["Sean Porter", "Justin Kolberg"]
   s.email       = ["portertech@gmail.com", "amdprophet@gmail.com"]
-  s.homepage    = "https://github.com/sensu/sensu"
+  s.homepage    = "http://sensuapp.org"
   s.summary     = "A monitoring framework"
   s.description = "A monitoring framework that aims to be simple, malleable, and scalable."
   s.license     = "MIT"
@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.add_dependency "sensu-transport", "2.4.0"
   s.add_dependency "sensu-spawn", "1.1.0"
   s.add_dependency "em-redis-unified", "0.6.0"
-  s.add_dependency "sinatra", "1.3.5"
-  s.add_dependency "async_sinatra", "1.0.0"
+  s.add_dependency "sinatra", "1.4.6"
+  s.add_dependency "async_sinatra", "1.2.0"
   s.add_dependency "thin", "1.5.0" unless RUBY_PLATFORM =~ /java/
 
   s.add_development_dependency "rake", "~> 10.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: java
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -171,12 +171,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.4.6
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.4.6
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -185,12 +185,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -268,7 +268,7 @@ files:
 - README.md
 - CHANGELOG.md
 - MIT-LICENSE.txt
-homepage: https://github.com/sensu/sensu
+homepage: http://sensuapp.org
 licenses:
 - MIT
 metadata: {}