sensu 0.22.2-java → 0.23.0.beta-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f441f12eaa29a2a1e6c78a85a59f9e493831348d
-  data.tar.gz: 20cf8ae1262ca4e44dbce41e918175b603421be3
+  metadata.gz: 405cb44986cc3e6267c5dc1829a92a98528d6cd3
+  data.tar.gz: cd4b7efb2a34f8d794713150284254237f7049a8
 SHA512:
-  metadata.gz: a9e8c6031a34a771eb4151feaff489de935fc5d369beaeb31578a1c91cb9f2fb700b32eeaddfc0bc7c8a4949f368d85119b632841b50f846a12d1a6169427893
-  data.tar.gz: ae14b0070639620f67dfedcfb4b2bc0a14d9650fa8270cc4f099848294671c1b0e40580eeaaf4918ff5ae705ff1da4517afe45162840f0bf76104b35331ee522
+  metadata.gz: ae4fd3a2bf582ec78266574d96ce8afbafe7813d6a0297c3ab3bfb92d36ae73f103c4f5f47dd599eedac9a27f15b12c329fcc56fa3958a47320ec5779e02fac8
+  data.tar.gz: c47ad23db2c4cbd2bda7f212e5211f0ef88a7ae0f8122299708797467b2cabfa964523f184755da4eadf850d1c4b66960ead7004f10cfeda3c24357b0696ea7b

data/CHANGELOG.md

@@ -1,3 +1,43 @@
+## 0.23.0 - 2016-03-29
+
+### Important
+
+Dropped support for Rubies < 2.0.0, as they have long been EOL and have
+proven to be a hindrance and security risk.
+
+The Sensu Transport API changed. Transports are now a deferrable, they
+must call `succeed()` once they have fully initialized. Sensu now waits
+for its transport to fully initialize before taking other actions.
+
+### Features
+
+Redis Sentinel support for HA Redis. Sensu services can now be configured
+to query one or more instances of Redis Sentinel for a Redis master. This
+feature eliminates the last need for HAProxy in highly available Sensu
+configurations. To configure Sensu services to use Redis Sentinel, hosts
+and ports of one or more Sentinel instances must be provided, e.g.
+`"sentinels": [{"host": "10.0.1.23", "port": 26479}]`.
+
+Added a CLI option/argument to cause the Sensu service to print (output to
+STDOUT) its compiled configuration settings and exit. The CLI option is
+`--print_config` or `-P`.
+
+Added token substitution to filter eval attributes, providing access to
+event data, e.g. `"occurrences": "eval: value == :::check.occurrences:::"`.
+
+The Sensu 0.23 packages use Ruby 2.3.
+
+### Other
+
+Performance improvements. Dropped MultiJson in favour of Sensu JSON, a
+lighter weight JSON parser abstraction that supports platform specific
+parsers for Sensu Core and Enterprise. The Oj JSON parser is once again
+used for Sensu Core. Used https://github.com/JuanitoFatas/fast-ruby and
+benchmarks as a guide to further changes.
+
+Using EventMachine 1.2.0, which brings several changes and improvements:
+https://github.com/eventmachine/eventmachine/blob/master/CHANGELOG.md#1201-march-15-2016
+
 ## 0.22.2 - 2016-03-16
 
 ### Fixes

data/MIT-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Sonian Inc.
+Copyright (c) 2016 Sonian Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/sensu/api/process.rb

@@ -22,17 +22,20 @@ module Sensu
           bootstrap(options)
           setup_process(options)
           EM::run do
-            start
-            setup_signal_traps
+            setup_connections do
+              start
+              setup_signal_traps
+            end
           end
         end
 
-        def on_reactor_run
-          EM::next_tick do
-            setup_redis
-            set :redis, @redis
-            setup_transport
-            set :transport, @transport
+        def setup_connections
+          setup_redis do |redis|
+            set :redis, redis
+            setup_transport do |transport|
+              set :transport, transport
+              yield if block_given?
+            end
           end
         end
 
@@ -49,8 +52,6 @@ module Sensu
             "Credentials" => "true",
             "Headers" => "Origin, X-Requested-With, Content-Type, Accept, Authorization"
           }
-          on_reactor_run
-          self
         end
 
         def start_server
@@ -83,15 +84,18 @@ module Sensu
         def stop
           @logger.warn("stopping")
           stop_server do
-            @redis.close
-            @transport.close
+            settings.redis.close
+            settings.transport.close
             super
           end
         end
 
         def test(options={})
           bootstrap(options)
-          start
+          setup_connections do
+            start
+            yield
+          end
         end
       end
 
@@ -163,7 +167,7 @@ module Sensu
         end
 
         def issued!
-          accepted!(MultiJson.dump(:issued => Time.now.to_i))
+          accepted!(Sensu::JSON.dump(:issued => Time.now.to_i))
         end
 
         def no_content!
@@ -173,7 +177,7 @@ module Sensu
 
         def read_data(rules={})
           begin
-            data = MultiJson.load(env["rack.input"].read)
+            data = Sensu::JSON.load(env["rack.input"].read)
             valid = rules.all? do |key, rule|
               value = data[key]
               (value.is_a?(rule[:type]) || (rule[:nil_ok] && value.nil?)) &&
@@ -185,7 +189,7 @@ module Sensu
             else
               bad_request!
             end
-          rescue MultiJson::ParseError
+          rescue Sensu::JSON::ParseError
             bad_request!
           end
         end
@@ -198,10 +202,10 @@ module Sensu
           limit = integer_parameter(params[:limit])
           offset = integer_parameter(params[:offset]) || 0
           unless limit.nil?
-            headers["X-Pagination"] = MultiJson.dump(
+            headers["X-Pagination"] = Sensu::JSON.dump(
               :limit => limit,
               :offset => offset,
-              :total => items.size
+              :total => items.length
             )
             paginated = items.slice(offset, limit)
             Array(paginated)
@@ -244,7 +248,7 @@ module Sensu
             :check => check
           }
           settings.logger.info("publishing check result", :payload => payload)
-          settings.transport.publish(:direct, "results", MultiJson.dump(payload)) do |info|
+          settings.transport.publish(:direct, "results", Sensu::JSON.dump(payload)) do |info|
             if info[:error]
               settings.logger.error("failed to publish check result", {
                 :payload => payload,
@@ -255,7 +259,7 @@ module Sensu
         end
 
         def resolve_event(event_json)
-          event = MultiJson.load(event_json)
+          event = Sensu::JSON.load(event_json)
           check = event[:check].merge(
             :output => "Resolving on request of the API",
             :status => 0,
@@ -282,7 +286,7 @@ module Sensu
             :subscribers => check[:subscribers]
           })
           check[:subscribers].each do |subscription|
-            options = transport_publish_options(subscription.to_s, MultiJson.dump(payload))
+            options = transport_publish_options(subscription.to_s, Sensu::JSON.dump(payload))
             settings.transport.publish(*options) do |info|
               if info[:error]
                 settings.logger.error("failed to publish check request", {
@@ -320,7 +324,7 @@ module Sensu
               :connected => settings.redis.connected?
             }
           }
-          body MultiJson.dump(response)
+          body Sensu::JSON.dump(response)
         end
       end
 
@@ -355,9 +359,9 @@ module Sensu
           data[:keepalives] = false
           data[:version] = VERSION
           data[:timestamp] = Time.now.to_i
-          settings.redis.set("client:#{data[:name]}", MultiJson.dump(data)) do
+          settings.redis.set("client:#{data[:name]}", Sensu::JSON.dump(data)) do
             settings.redis.sadd("clients", data[:name]) do
-              created!(MultiJson.dump(:name => data[:name]))
+              created!(Sensu::JSON.dump(:name => data[:name]))
             end
           end
         end
@@ -371,18 +375,18 @@ module Sensu
             clients.each_with_index do |client_name, index|
               settings.redis.get("client:#{client_name}") do |client_json|
                 unless client_json.nil?
-                  response << MultiJson.load(client_json)
+                  response << Sensu::JSON.load(client_json)
                 else
                   settings.logger.error("client data missing from registry", :client_name => client_name)
                   settings.redis.srem("clients", client_name)
                 end
-                if index == clients.size - 1
-                  body MultiJson.dump(response)
+                if index == clients.length - 1
+                  body Sensu::JSON.dump(response)
                 end
               end
             end
           else
-            body MultiJson.dump(response)
+            body Sensu::JSON.dump(response)
           end
         end
       end
@@ -410,7 +414,7 @@ module Sensu
                 end
                 settings.redis.get("result:#{result_key}") do |result_json|
                   unless result_json.nil?
-                    result = MultiJson.load(result_json)
+                    result = Sensu::JSON.load(result_json)
                     last_execution = result[:executed]
                     unless history.empty? || last_execution.nil?
                       item = {
@@ -423,14 +427,14 @@ module Sensu
                       response << item
                     end
                   end
-                  if index == checks.size - 1
-                    body MultiJson.dump(response)
+                  if index == checks.length - 1
+                    body Sensu::JSON.dump(response)
                   end
                 end
               end
             end
           else
-            body MultiJson.dump(response)
+            body Sensu::JSON.dump(response)
           end
         end
       end
@@ -477,13 +481,13 @@ module Sensu
       end
 
       aget "/checks/?" do
-        body MultiJson.dump(settings.all_checks)
+        body Sensu::JSON.dump(settings.all_checks)
       end
 
       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)
+          body Sensu::JSON.dump(response)
         else
           not_found!
         end
@@ -515,15 +519,15 @@ module Sensu
             clients.each_with_index do |client_name, index|
               settings.redis.hgetall("events:#{client_name}") do |events|
                 events.each do |check_name, event_json|
-                  response << MultiJson.load(event_json)
+                  response << Sensu::JSON.load(event_json)
                 end
-                if index == clients.size - 1
-                  body MultiJson.dump(response)
+                if index == clients.length - 1
+                  body Sensu::JSON.dump(response)
                 end
               end
             end
           else
-            body MultiJson.dump(response)
+            body Sensu::JSON.dump(response)
           end
         end
       end
@@ -532,9 +536,9 @@ module Sensu
         response = Array.new
         settings.redis.hgetall("events:#{client_name}") do |events|
           events.each do |check_name, event_json|
-            response << MultiJson.load(event_json)
+            response << Sensu::JSON.load(event_json)
           end
-          body MultiJson.dump(response)
+          body Sensu::JSON.dump(response)
         end
       end
 
@@ -592,13 +596,13 @@ module Sensu
                   :issued => aggregates
                 }
                 response << item
-                if index == checks.size - 1
-                  body MultiJson.dump(response)
+                if index == checks.length - 1
+                  body Sensu::JSON.dump(response)
                 end
               end
             end
           else
-            body MultiJson.dump(response)
+            body Sensu::JSON.dump(response)
           end
         end
       end
@@ -617,7 +621,7 @@ module Sensu
                 issued > timestamp
               end
             end
-            body MultiJson.dump(pagination(aggregates))
+            body Sensu::JSON.dump(pagination(aggregates))
           else
             not_found!
           end
@@ -653,7 +657,7 @@ module Sensu
             end
             settings.redis.hgetall("aggregation:#{result_set}") do |results|
               parsed_results = results.inject(Array.new) do |parsed, (client_name, check_json)|
-                check = MultiJson.load(check_json)
+                check = Sensu::JSON.load(check_json)
                 parsed << check.merge(:client => client_name)
               end
               if params[:summarize]
@@ -669,7 +673,7 @@ module Sensu
               if params[:results]
                 response[:results] = parsed_results
               end
-              body MultiJson.dump(response)
+              body Sensu::JSON.dump(response)
             end
           else
             not_found!
@@ -679,9 +683,9 @@ module Sensu
 
       apost %r{^/stash(?:es)?/(.*)/?} do |path|
         read_data do |data|
-          settings.redis.set("stash:#{path}", MultiJson.dump(data)) do
+          settings.redis.set("stash:#{path}", Sensu::JSON.dump(data)) do
             settings.redis.sadd("stashes", path) do
-              created!(MultiJson.dump(:path => path))
+              created!(Sensu::JSON.dump(:path => path))
             end
           end
         end
@@ -721,21 +725,21 @@ module Sensu
                   unless stash_json.nil?
                     item = {
                       :path => path,
-                      :content => MultiJson.load(stash_json),
+                      :content => Sensu::JSON.load(stash_json),
                       :expire => ttl
                     }
                     response << item
                   else
                     settings.redis.srem("stashes", path)
                   end
-                  if index == stashes.size - 1
-                    body MultiJson.dump(pagination(response))
+                  if index == stashes.length - 1
+                    body Sensu::JSON.dump(pagination(response))
                   end
                 end
               end
             end
           else
-            body MultiJson.dump(response)
+            body Sensu::JSON.dump(response)
           end
         end
       end
@@ -748,9 +752,9 @@ module Sensu
         }
         read_data(rules) do |data|
           stash_key = "stash:#{data[:path]}"
-          settings.redis.set(stash_key, MultiJson.dump(data[:content])) do
+          settings.redis.set(stash_key, Sensu::JSON.dump(data[:content])) do
             settings.redis.sadd("stashes", data[:path]) do
-              response = MultiJson.dump(:path => data[:path])
+              response = Sensu::JSON.dump(:path => data[:path])
               if data[:expire]
                 settings.redis.expire(stash_key, data[:expire]) do
                   created!(response)
@@ -787,21 +791,21 @@ module Sensu
                     result_key = "result:#{client_name}:#{check_name}"
                     settings.redis.get(result_key) do |result_json|
                       unless result_json.nil?
-                        check = MultiJson.load(result_json)
+                        check = Sensu::JSON.load(result_json)
                         response << {:client => client_name, :check => check}
                       end
-                      if client_index == clients.size - 1 && check_index == checks.size - 1
-                        body MultiJson.dump(response)
+                      if client_index == clients.length - 1 && check_index == checks.length - 1
+                        body Sensu::JSON.dump(response)
                       end
                     end
                   end
-                elsif client_index == clients.size - 1
-                  body MultiJson.dump(response)
+                elsif client_index == clients.length - 1
+                  body Sensu::JSON.dump(response)
                 end
               end
             end
           else
-            body MultiJson.dump(response)
+            body Sensu::JSON.dump(response)
           end
         end
       end
@@ -814,11 +818,11 @@ module Sensu
               result_key = "result:#{client_name}:#{check_name}"
               settings.redis.get(result_key) do |result_json|
                 unless result_json.nil?
-                  check = MultiJson.load(result_json)
+                  check = Sensu::JSON.load(result_json)
                   response << {:client => client_name, :check => check}
                 end
-                if check_index == checks.size - 1
-                  body MultiJson.dump(response)
+                if check_index == checks.length - 1
+                  body Sensu::JSON.dump(response)
                 end
               end
             end
@@ -832,9 +836,9 @@ module Sensu
         result_key = "result:#{client_name}:#{check_name}"
         settings.redis.get(result_key) do |result_json|
           unless result_json.nil?
-            check = MultiJson.load(result_json)
+            check = Sensu::JSON.load(result_json)
             response = {:client => client_name, :check => check}
-            body MultiJson.dump(response)
+            body Sensu::JSON.dump(response)
           else
             not_found!
           end

data/lib/sensu/cli.rb

@@ -26,6 +26,9 @@ module Sensu
         opts.on("-d", "--config_dir DIR[,DIR]", "DIR or comma-delimited DIR list for Sensu JSON config files") do |dir|
           options[:config_dirs] = dir.split(",")
         end
+        opts.on("-P", "--print_config", "Print the compiled configuration and exit") do
+          options[:print_config] = true
+        end
         opts.on("-e", "--extension_dir DIR", "DIR for Sensu extensions") do |dir|
           options[:extension_dir] = dir
         end

data/lib/sensu/client/process.rb

@@ -51,7 +51,7 @@ module Sensu
       def publish_keepalive
         payload = keepalive_payload
         @logger.debug("publishing keepalive", :payload => payload)
-        @transport.publish(:direct, "keepalives", MultiJson.dump(payload)) do |info|
+        @transport.publish(:direct, "keepalives", Sensu::JSON.dump(payload)) do |info|
           if info[:error]
             @logger.error("failed to publish keepalive", {
               :payload => payload,
@@ -89,7 +89,7 @@ module Sensu
         }
         payload[:signature] = @settings[:client][:signature] if @settings[:client][:signature]
         @logger.info("publishing check result", :payload => payload)
-        @transport.publish(:direct, "results", MultiJson.dump(payload)) do |info|
+        @transport.publish(:direct, "results", Sensu::JSON.dump(payload)) do |info|
           if info[:error]
             @logger.error("failed to publish check result", {
               :payload => payload,
@@ -99,42 +99,6 @@ module Sensu
         end
       end
 
-      # Traverse the Sensu client definition (hash) for an attribute
-      # value, with a fallback default value if nil.
-      #
-      # @param tree [Hash] to traverse.
-      # @param path [Array] of attribute keys.
-      # @param default [Object] value if attribute value is nil.
-      # @return [Object] attribute or fallback default value.
-      def find_client_attribute(tree, path, default)
-        attribute = tree[path.shift]
-        if attribute.is_a?(Hash)
-          find_client_attribute(attribute, path, default)
-        else
-          attribute.nil? ? default : attribute
-        end
-      end
-
-      # Substitue check command tokens (eg. :::db.name|production:::)
-      # with the associated client definition attribute value. Command
-      # tokens can provide a fallback default value, following a pipe.
-      #
-      # @param check [Hash]
-      # @return [Array] containing the check command string with
-      #   tokens substituted and an array of unmatched command tokens.
-      def substitute_check_command_tokens(check)
-        unmatched_tokens = []
-        substituted = check[:command].gsub(/:::([^:].*?):::/) do
-          token, default = $1.to_s.split("|", -1)
-          matched = find_client_attribute(@settings[:client], token.split("."), default)
-          if matched.nil?
-            unmatched_tokens << token
-          end
-          matched
-        end
-        [substituted, unmatched_tokens]
-      end
-
       # Execute a check command, capturing its output (STDOUT/ERR),
       # exit status code, execution duration, timestamp, and publish
       # the result. This method guards against multiple executions for
@@ -149,7 +113,7 @@ module Sensu
         @logger.debug("attempting to execute check command", :check => check)
         unless @checks_in_progress.include?(check[:name])
           @checks_in_progress << check[:name]
-          command, unmatched_tokens = substitute_check_command_tokens(check)
+          command, unmatched_tokens = substitute_tokens(check[:command], @settings[:client])
           if unmatched_tokens.empty?
             check[:executed] = Time.now.to_i
             started = Time.now.to_f
@@ -273,10 +237,10 @@ module Sensu
           options = transport_subscribe_options(subscription)
           @transport.subscribe(*options) do |message_info, message|
             begin
-              check = MultiJson.load(message)
+              check = Sensu::JSON.load(message)
               @logger.info("received check request", :check => check)
               process_check_request(check)
-            rescue MultiJson::ParseError => error
+            rescue Sensu::JSON::ParseError => error
               @logger.error("failed to parse the check request payload", {
                 :message => message,
                 :error => error.to_s
@@ -412,9 +376,10 @@ module Sensu
       # transport connection, the sockets, and calling the
       # `bootstrap()` method.
       def start
-        setup_transport
-        setup_sockets
-        bootstrap
+        setup_transport do
+          setup_sockets
+          bootstrap
+        end
       end
 
       # Pause the Sensu client process, unless it is being paused or

data/lib/sensu/client/socket.rb

@@ -1,4 +1,4 @@
-require "multi_json"
+require "sensu/json"
 
 module Sensu
   module Client
@@ -145,7 +145,7 @@ module Sensu
           :check => check.merge(:issued => Time.now.to_i)
         }
         @logger.info("publishing check result", :payload => payload)
-        @transport.publish(:direct, "results", MultiJson.dump(payload))
+        @transport.publish(:direct, "results", Sensu::JSON.dump(payload))
       end
 
       # Process a check result. Set check result attribute defaults,
@@ -169,10 +169,10 @@ module Sensu
       # @param [String] data to parse for a check result.
       def parse_check_result(data)
         begin
-          check = MultiJson.load(data)
+          check = Sensu::JSON.load(data)
           cancel_watchdog
           process_check_result(check)
-        rescue MultiJson::ParseError, ArgumentError => error
+        rescue Sensu::JSON::ParseError, ArgumentError => error
           if @protocol == :tcp
             @parse_error = error.to_s
           else

data/lib/sensu/constants.rb

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