sensu 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5716bcce7e37813806670e77b25c94e06dfa9c02
-  data.tar.gz: ad76c66cad53d2c722af68f0513e2a346adf7afb
+  metadata.gz: 033a973109e8bcb6bb775163452c270b74907afe
+  data.tar.gz: 464a435d9c1191d9e8b941681c8b53af57977940
 SHA512:
-  metadata.gz: e9cd95bde516a9fa44b29f107d5f8cd68c61c26a0f49981232af6f4916540221d558c3bf3dcfb49ae0d4c6ed5311f496168ed74b804c6453e6383a2c85d35191
-  data.tar.gz: 763abe545f122b8f0c624ab29c523d1723af31012605a19171fd57916effc1552b5089746b39f2398eddaedc91e718fdbda62a4a159d2e44af2bf8ce0dd9966c
+  metadata.gz: be59c0a1d75341cfec86f91e29f978c8c5a5a629cad565918d253f687e72958c18a037f4919d04746802da3ddab4a7664388c6538f2eaf24a4fa01b9795f2d5d
+  data.tar.gz: 4775c24d752d40cc2ae90795a80ff81095796a4aabd0d5d9b719e58d45c80ac74b6f9234f6e3d321c41c7505941f7ec8424573e0845d5dd06618ab8ab54b9632

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.2.0 - 2017-12-05
+
+### Features
+
+Scheduled maintenance, Sensu now gives users the ability to silence a
+check and/or client subscriptions at a predetermined time (`begin`
+epoch timestamp), with an optional expiration (in seconds), enabling
+users to silence events in advance for scheduled maintenance windows.
+
+The Sensu API now logs the "X-Request-ID" header, making it much
+easier to trace a request/response. If the API client does not provide
+a request ID, the API generates one for the request (UUID).
+
+The Sensu API `/results/*` endpoints now include check history in the
+result data.
+
+Check token substitution is now supported in check "subdue".
+
 ## 1.1.3 - 2017-11-24
 
 ### Fixes

data/README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://img.shields.io/travis/sensu/sensu.svg)](https://travis-ci.org/sensu/sensu)
 [![Gem Version](https://img.shields.io/gem/v/sensu.svg)](https://github.com/sensu/sensu/blob/master/CHANGELOG.md)
 [![MIT Licensed](https://img.shields.io/github/license/sensu/sensu.svg)](https://raw.githubusercontent.com/sensu/sensu/master/MIT-LICENSE.txt)
+[![Join the chat at https://slack.sensu.io/](https://slack.sensu.io/badge.svg)](https://slack.sensu.io/)
 
 # Sensu
 

data/lib/sensu/api/http_handler.rb

@@ -1,3 +1,4 @@
+require "sensu/utilities"
 require "sensu/api/routes"
 require "sensu/api/utilities/filter_response_content"
 
@@ -21,9 +22,11 @@ module Sensu
       # @result [Hash]
       def request_details
         return @request_details if @request_details
+        @request_id = @http.fetch(:x_request_id, random_uuid)
         @request_start_time = Time.now.to_f
         _, remote_address = Socket.unpack_sockaddr_in(get_peername)
         @request_details = {
+          :request_id => @request_id,
           :remote_address => remote_address,
           :user_agent => @http[:user_agent],
           :method => @http_request_method,
@@ -44,7 +47,9 @@ module Sensu
       end
 
       # Log the HTTP response. This method calculates the
-      # request/response time.
+      # request/response time. The debug log level is used for the
+      # response body log event, as it is generally very verbose and
+      # unnecessary in most cases.
       def log_response
         @logger.info("api response", {
           :request => request_details,
@@ -148,6 +153,13 @@ module Sensu
         end
       end
 
+      # Set the HTTP response headers, including the request ID and
+      # cors headers (via `set_cores_headers()`).
+      def set_headers
+        @response.headers["X-Request-ID"] = @request_id
+        set_cors_headers
+      end
+
       # Paginate the provided items. This method uses two HTTP query
       # parameters to determine how to paginate the items, `limit` and
       # `offset`. The parameter `limit` specifies how many items are
@@ -392,7 +404,7 @@ module Sensu
         log_request
         parse_parameters
         create_response
-        set_cors_headers
+        set_headers
         if authorized?
           if connected?
             route_request

data/lib/sensu/api/routes/results.rb

@@ -36,12 +36,19 @@ module Sensu
                     checks.each_with_index do |check_name, check_index|
                       result_key = "result:#{client_name}:#{check_name}"
                       @redis.get(result_key) do |result_json|
-                        unless result_json.nil?
-                          check = Sensu::JSON.load(result_json)
-                          @response_content << {:client => client_name, :check => check}
-                        end
-                        if client_index == clients.length - 1 && check_index == checks.length - 1
-                          respond
+                        history_key = "history:#{client_name}:#{check_name}"
+                        @redis.lrange(history_key, -21, -1) do |history|
+                          history.map! do |status|
+                            status.to_i
+                          end
+                          unless result_json.nil?
+                            check = Sensu::JSON.load(result_json)
+                            check[:history] = history
+                            @response_content << {:client => client_name, :check => check}
+                          end
+                          if client_index == clients.length - 1 && check_index == checks.length - 1
+                            respond
+                          end
                         end
                       end
                     end
@@ -67,12 +74,19 @@ module Sensu
               checks.each_with_index do |check_name, check_index|
                 result_key = "result:#{client_name}:#{check_name}"
                 @redis.get(result_key) do |result_json|
-                  unless result_json.nil?
-                    check = Sensu::JSON.load(result_json)
-                    @response_content << {:client => client_name, :check => check}
-                  end
-                  if check_index == checks.length - 1
-                    respond
+                  history_key = "history:#{client_name}:#{check_name}"
+                  @redis.lrange(history_key, -21, -1) do |history|
+                    history.map! do |status|
+                      status.to_i
+                    end
+                    unless result_json.nil?
+                      check = Sensu::JSON.load(result_json)
+                      check[:history] = history
+                      @response_content << {:client => client_name, :check => check}
+                    end
+                    if check_index == checks.length - 1
+                      respond
+                    end
                   end
                 end
               end
@@ -88,9 +102,16 @@ module Sensu
           result_key = "result:#{client_name}:#{check_name}"
           @redis.get(result_key) do |result_json|
             unless result_json.nil?
-              check = Sensu::JSON.load(result_json)
-              @response_content = {:client => client_name, :check => check}
-              respond
+              history_key = "history:#{client_name}:#{check_name}"
+              @redis.lrange(history_key, -21, -1) do |history|
+                history.map! do |status|
+                  status.to_i
+                end
+                check = Sensu::JSON.load(result_json)
+                check[:history] = history
+                @response_content = {:client => client_name, :check => check}
+                respond
+              end
             else
               not_found!
             end

data/lib/sensu/api/routes/silenced.rb

@@ -48,6 +48,7 @@ module Sensu
           rules = {
             :subscription => {:type => String, :nil_ok => true, :regex => /\A[\w\.\-\:]+\z/},
             :check => {:type => String, :nil_ok => true, :regex => /\A[\w\.-]+\z/},
+            :begin => {:type => Integer, :nil_ok => true},
             :expire => {:type => Integer, :nil_ok => true},
             :reason => {:type => String, :nil_ok => true},
             :creator => {:type => String, :nil_ok => true},
@@ -58,20 +59,27 @@ module Sensu
               subscription = data.fetch(:subscription, "*")
               check = data.fetch(:check, "*")
               silenced_id = "#{subscription}:#{check}"
+              timestamp = Time.now.to_i
               silenced_info = {
                 :id => silenced_id,
                 :subscription => data[:subscription],
                 :check => data[:check],
                 :reason => data[:reason],
                 :creator => data[:creator],
+                :begin => data[:begin],
                 :expire_on_resolve => data.fetch(:expire_on_resolve, false),
-                :timestamp => Time.now.to_i
+                :timestamp => timestamp
               }
               silenced_key = "silence:#{silenced_id}"
               @redis.set(silenced_key, Sensu::JSON.dump(silenced_info)) do
                 @redis.sadd("silenced", silenced_key) do
                   if data[:expire]
-                    @redis.expire(silenced_key, data[:expire]) do
+                    expire = data[:expire]
+                    if data[:begin]
+                      diff = data[:begin] - timestamp
+                      expire += diff if diff > 0
+                    end
+                    @redis.expire(silenced_key, expire) do
                       created!
                     end
                   else

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "1.1.3".freeze
+    VERSION = "1.2.0".freeze
 
     # Sensu release information.
     RELEASE_INFO = {

data/lib/sensu/daemon.rb

@@ -4,7 +4,7 @@ gem "eventmachine", "1.2.5"
 
 gem "sensu-json", "2.1.0"
 gem "sensu-logger", "1.2.1"
-gem "sensu-settings", "10.9.0"
+gem "sensu-settings", "10.12.0"
 gem "sensu-extension", "1.5.1"
 gem "sensu-extensions", "1.9.0"
 gem "sensu-transport", "7.0.2"

data/lib/sensu/server/process.rb

@@ -485,7 +485,7 @@ module Sensu
                 silenced_key = "silence:#{silenced_info[:id]}"
                 @redis.srem("silenced", silenced_key)
                 @redis.del(silenced_key)
-              else
+              elsif silenced_info[:begin].nil? || silenced_info[:begin] <= Time.now.to_i
                 event[:silenced_by] << silenced_info[:id]
               end
             end
@@ -1065,6 +1065,9 @@ module Sensu
         if @settings.handler_exists?(:keepalive)
           check[:handler] = "keepalive"
         end
+        if @settings[:sensu][:keepalives]
+          check = deep_merge(check, @settings[:sensu][:keepalives])
+        end
         if client.has_key?(:keepalive)
           check = deep_merge(check, client[:keepalive])
         end

data/sensu.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency "eventmachine", "1.2.5"
   s.add_dependency "sensu-json", "2.1.0"
   s.add_dependency "sensu-logger", "1.2.1"
-  s.add_dependency "sensu-settings", "10.9.0"
+  s.add_dependency "sensu-settings", "10.12.0"
   s.add_dependency "sensu-extension", "1.5.1"
   s.add_dependency "sensu-extensions", "1.9.0"
   s.add_dependency "sensu-transport", "7.0.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-25 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.9.0
+        version: 10.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.9.0
+        version: 10.12.0
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement