riemann-tools 1.11.0 → 2.0.0

data/lib/riemann/tools/mdstat_parser.tab.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "mdstat_parser.y".
 #
 
@@ -15,7 +15,7 @@ module Riemann
   module Tools
     class MdstatParser < Racc::Parser
 
-module_eval(<<'...end mdstat_parser.y/module_eval...', 'mdstat_parser.y', 58)
+module_eval(<<'...end mdstat_parser.y/module_eval...', 'mdstat_parser.y', 62)
 
   def parse(text)
     s = Utils::StringTokenizer.new(text)
@@ -23,7 +23,7 @@ module_eval(<<'...end mdstat_parser.y/module_eval...', 'mdstat_parser.y', 58)
     until s.eos? do
       case
       when s.scan(/\n/)               then s.push_token(nil)
-      when s.scan(/\s+/)              then s.push_token(nil)
+      when s.scan(/[[:blank:]]+/)     then s.push_token(nil)
 
       when s.scan(/\([WJFSR]\)/)      then s.push_token(:DISK_STATUS)
       when s.scan(/<none>/)           then s.push_token(:NONE)
@@ -40,6 +40,7 @@ module_eval(<<'...end mdstat_parser.y/module_eval...', 'mdstat_parser.y', 58)
       when s.scan(/\[/)               then s.push_token('[')
       when s.scan(/]/)                then s.push_token(']')
 
+      when s.scan(/auto-read-only\b/) then s.push_token(:AUTO_READ_ONLY)
       when s.scan(/DELAYED\b/)        then s.push_token(:DELAYED)
       when s.scan(/KB\b/)             then s.push_token(:BYTE_UNIT)
       when s.scan(/K\/sec\b/)         then s.push_token(:SPEED_UNIT)
@@ -89,154 +90,157 @@ module_eval(<<'...end mdstat_parser.y/module_eval...', 'mdstat_parser.y', 58)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    60,    17,    10,    53,    54,    15,    73,    55,    56,    14,
-     3,    13,    10,    28,     4,     7,    12,    61,    72,    62,
-    63,    11,    71,    18,    19,    20,    21,    22,    23,    24,
-    10,    27,    30,    32,    34,    35,    36,    37,    38,    39,
-    40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-    50,    51,    58,    64,    65,    66,    67,    68,    69,    70,
-    74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-    84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-    94,    95,    96,    97,    98,    99,   100 ]
+    64,    17,    10,    57,    58,    15,    77,    59,    60,    14,
+     3,    13,    10,    32,     4,     7,    12,    65,    76,    66,
+    67,    11,    75,    18,    19,    20,    21,    22,    24,    25,
+    26,    27,    28,    10,    31,    34,    36,    38,    39,    40,
+    41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+    51,    52,    53,    54,    55,    62,    68,    69,    70,    71,
+    72,    73,    74,    78,    79,    80,    81,    82,    83,    84,
+    85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+    95,    96,    97,    98,    99,   100,   101,   102,   103,   104 ]
 
 racc_action_check = [
-    53,    11,     5,    50,    50,    11,    66,    50,    50,    10,
-     0,    10,    25,    25,     1,     4,     6,    53,    66,    53,
-    53,     5,    66,    12,    13,    14,    16,    18,    19,    20,
-    23,    24,    28,    30,    31,    32,    33,    34,    36,    37,
-    38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-    48,    49,    52,    54,    55,    56,    58,    59,    64,    65,
-    67,    68,    74,    75,    76,    77,    78,    79,    80,    81,
-    82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-    92,    93,    94,    95,    97,    98,    99 ]
+    57,    11,     5,    54,    54,    11,    70,    54,    54,    10,
+     0,    10,    29,    29,     1,     4,     6,    57,    70,    57,
+    57,     5,    70,    12,    13,    14,    16,    18,    19,    20,
+    23,    24,    25,    26,    27,    32,    34,    35,    36,    37,
+    38,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+    49,    50,    51,    52,    53,    56,    58,    59,    60,    62,
+    63,    68,    69,    71,    72,    78,    79,    80,    81,    82,
+    83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+    93,    94,    95,    96,    97,    98,    99,   101,   102,   103 ]
 
 racc_action_pointer = [
-    -8,    14,   nil,   nil,    15,   -10,   -16,   nil,   nil,   nil,
-   -23,   -11,     4,    12,    12,   nil,    14,   nil,    -6,     9,
-    -4,   nil,   nil,    18,    22,     0,   nil,   nil,    28,   nil,
-     4,    20,    24,     4,    24,   nil,    25,     3,     5,    28,
-    29,    13,    11,    38,    14,    11,    36,    47,    17,    38,
-   -18,   nil,    49,    -6,    16,    17,    18,   nil,    22,    20,
-   nil,   nil,   nil,   nil,    34,    35,    -2,    47,    50,   nil,
-   nil,   nil,   nil,   nil,    27,    25,    51,    26,    49,    54,
-    36,    34,    57,    58,    67,    33,    41,    65,    40,    40,
-    65,    68,    75,    66,    75,    56,   nil,    47,    72,    58,
-   nil ]
+    -9,    14,   nil,   nil,    15,   -11,   -17,   nil,   nil,   nil,
+   -24,   -12,     3,    11,    11,   nil,    13,   nil,    -7,    -9,
+    -5,   nil,   nil,    10,    28,    22,    20,    -4,   nil,    -1,
+   nil,   nil,    30,   nil,     6,    22,    26,     6,    26,   nil,
+    27,     3,     7,    30,    31,    15,    13,    40,    16,    11,
+    38,    50,    19,    40,   -19,   nil,    51,    -7,    16,    17,
+    18,   nil,    24,    20,   nil,   nil,   nil,   nil,    36,    37,
+    -3,    49,    52,   nil,   nil,   nil,   nil,   nil,    29,    25,
+    53,    31,    51,    56,    38,    36,    59,    60,    69,    38,
+    43,    67,    40,    40,    67,    70,    77,    68,    77,    58,
+   nil,    47,    74,    60,   nil ]
 
 racc_action_default = [
-   -33,   -33,    -6,    -4,   -33,   -33,    -2,   101,    -1,    -5,
-   -33,   -33,   -33,   -33,   -33,   -29,   -30,   -32,   -33,   -33,
-   -33,   -31,    -3,   -33,   -11,   -33,    -9,   -10,   -33,    -8,
-   -13,   -15,   -33,   -33,   -33,   -12,   -33,   -33,   -33,   -33,
-   -33,   -33,   -33,   -33,   -33,   -33,   -33,   -33,   -33,   -33,
-   -24,   -14,   -17,   -33,   -33,   -33,   -33,    -7,   -33,   -33,
-   -25,   -26,   -27,   -28,   -33,   -33,   -33,   -33,   -33,   -19,
-   -20,   -21,   -22,   -23,   -33,   -33,   -33,   -33,   -33,   -33,
-   -33,   -33,   -33,   -33,   -33,   -33,   -33,   -33,   -33,   -33,
-   -33,   -33,   -33,   -33,   -33,   -33,   -16,   -33,   -33,   -33,
-   -18 ]
+   -35,   -35,    -6,    -4,   -35,   -35,    -2,   105,    -1,    -5,
+   -35,   -35,   -35,   -35,   -35,   -31,   -32,   -34,   -35,    -9,
+   -35,   -33,    -3,   -35,   -35,   -13,   -35,   -35,   -12,   -35,
+   -11,    -8,   -35,   -10,   -15,   -17,   -35,   -35,   -35,   -14,
+   -35,   -35,   -35,   -35,   -35,   -35,   -35,   -35,   -35,   -35,
+   -35,   -35,   -35,   -35,   -26,   -16,   -19,   -35,   -35,   -35,
+   -35,    -7,   -35,   -35,   -27,   -28,   -29,   -30,   -35,   -35,
+   -35,   -35,   -35,   -21,   -22,   -23,   -24,   -25,   -35,   -35,
+   -35,   -35,   -35,   -35,   -35,   -35,   -35,   -35,   -35,   -35,
+   -35,   -35,   -35,   -35,   -35,   -35,   -35,   -35,   -35,   -35,
+   -18,   -35,   -35,   -35,   -20 ]
 
 racc_goto_table = [
-     9,     1,     2,     5,     8,     6,    25,    31,    33,    52,
-    57,    59,    16,   nil,   nil,   nil,   nil,   nil,    26,   nil,
-    29 ]
+     9,     1,     2,     5,     8,     6,    23,    29,    35,    37,
+    56,    61,    63,    16,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    30,   nil,   nil,    33 ]
 
 racc_goto_check = [
      6,     1,     2,     3,     4,     5,     7,     8,     9,    10,
-    11,    12,    13,   nil,   nil,   nil,   nil,   nil,     6,   nil,
-     6 ]
+    11,    12,    13,    14,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,     6,   nil,   nil,     6 ]
 
 racc_goto_pointer = [
-   nil,     1,     2,     1,    -1,     2,    -5,   -17,   -23,   -23,
-   -41,   -42,   -42,     1 ]
+   nil,     1,     2,     1,    -1,     2,    -5,   -13,   -19,   -26,
+   -26,   -44,   -45,   -45,     2 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil ]
+   nil,   nil,   nil,   nil,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 42, :_reduce_1,
-  2, 43, :_reduce_none,
-  4, 46, :_reduce_none,
-  0, 46, :_reduce_none,
-  2, 44, :_reduce_5,
-  0, 44, :_reduce_6,
-  19, 47, :_reduce_7,
-  2, 48, :_reduce_none,
-  1, 48, :_reduce_none,
-  5, 47, :_reduce_none,
+  3, 43, :_reduce_1,
+  2, 44, :_reduce_none,
   4, 47, :_reduce_none,
-  2, 49, :_reduce_none,
+  0, 47, :_reduce_none,
+  2, 45, :_reduce_5,
+  0, 45, :_reduce_6,
+  20, 48, :_reduce_7,
+  3, 49, :_reduce_none,
   0, 49, :_reduce_none,
-  9, 50, :_reduce_none,
-  0, 50, :_reduce_none,
-  14, 52, :_reduce_none,
-  0, 52, :_reduce_none,
-  18, 51, :_reduce_none,
-  3, 51, :_reduce_none,
-  3, 51, :_reduce_none,
-  3, 51, :_reduce_none,
-  3, 51, :_reduce_none,
-  3, 51, :_reduce_none,
+  2, 50, :_reduce_none,
+  1, 50, :_reduce_none,
+  5, 48, :_reduce_none,
+  4, 48, :_reduce_none,
+  2, 51, :_reduce_none,
   0, 51, :_reduce_none,
-  1, 53, :_reduce_none,
-  1, 53, :_reduce_none,
-  1, 53, :_reduce_none,
-  1, 53, :_reduce_none,
-  2, 45, :_reduce_none,
-  2, 45, :_reduce_none,
-  2, 54, :_reduce_none,
-  1, 54, :_reduce_none ]
-
-racc_reduce_n = 33
-
-racc_shift_n = 101
+  9, 52, :_reduce_none,
+  0, 52, :_reduce_none,
+  14, 54, :_reduce_none,
+  0, 54, :_reduce_none,
+  18, 53, :_reduce_none,
+  3, 53, :_reduce_none,
+  3, 53, :_reduce_none,
+  3, 53, :_reduce_none,
+  3, 53, :_reduce_none,
+  3, 53, :_reduce_none,
+  0, 53, :_reduce_none,
+  1, 55, :_reduce_none,
+  1, 55, :_reduce_none,
+  1, 55, :_reduce_none,
+  1, 55, :_reduce_none,
+  2, 46, :_reduce_none,
+  2, 46, :_reduce_none,
+  2, 56, :_reduce_none,
+  1, 56, :_reduce_none ]
+
+racc_reduce_n = 35
+
+racc_shift_n = 105
 
 racc_token_table = {
   false => 0,
   :error => 1,
   :ALGORITHM => 2,
-  :BITMAP => 3,
-  :BLOCKS => 4,
-  :BYTE_UNIT => 5,
-  :CHECK => 6,
-  :CHUNK => 7,
-  :DELAYED => 8,
-  :DISK_STATUS => 9,
-  :FINISH => 10,
-  :FLOAT => 11,
-  :IDENTIFIER => 12,
-  :INTEGER => 13,
-  :LEVEL => 14,
-  :MIN => 15,
-  :NONE => 16,
-  :PAGES => 17,
-  :PERSONALITIES => 18,
-  :PERSONALITY => 19,
-  :PENDING => 20,
-  :PROGRESS => 21,
-  :RECOVER => 22,
-  :RECOVERY => 23,
-  :REMOTE => 24,
-  :RESHAPE => 25,
-  :RESYNC => 26,
-  :SPEED => 27,
-  :SPEED_UNIT => 28,
-  :SUPER => 29,
-  :UNIT => 30,
-  :UNUSED_DEVICES => 31,
-  "[" => 32,
-  "]" => 33,
-  ":" => 34,
-  "/" => 35,
-  "," => 36,
-  "=" => 37,
-  "%" => 38,
-  "(" => 39,
-  ")" => 40 }
-
-racc_nt_base = 41
+  :AUTO_READ_ONLY => 3,
+  :BITMAP => 4,
+  :BLOCKS => 5,
+  :BYTE_UNIT => 6,
+  :CHECK => 7,
+  :CHUNK => 8,
+  :DELAYED => 9,
+  :DISK_STATUS => 10,
+  :FINISH => 11,
+  :FLOAT => 12,
+  :IDENTIFIER => 13,
+  :INTEGER => 14,
+  :LEVEL => 15,
+  :MIN => 16,
+  :NONE => 17,
+  :PAGES => 18,
+  :PERSONALITIES => 19,
+  :PERSONALITY => 20,
+  :PENDING => 21,
+  :PROGRESS => 22,
+  :RECOVER => 23,
+  :RECOVERY => 24,
+  :REMOTE => 25,
+  :RESHAPE => 26,
+  :RESYNC => 27,
+  :SPEED => 28,
+  :SPEED_UNIT => 29,
+  :SUPER => 30,
+  :UNIT => 31,
+  :UNUSED_DEVICES => 32,
+  "[" => 33,
+  "]" => 34,
+  ":" => 35,
+  "/" => 36,
+  "(" => 37,
+  ")" => 38,
+  "," => 39,
+  "=" => 40,
+  "%" => 41 }
+
+racc_nt_base = 42
 
 racc_use_result_var = true
 
@@ -261,6 +265,7 @@ Racc_token_to_s_table = [
   "$end",
   "error",
   "ALGORITHM",
+  "AUTO_READ_ONLY",
   "BITMAP",
   "BLOCKS",
   "BYTE_UNIT",
@@ -294,11 +299,11 @@ Racc_token_to_s_table = [
   "\"]\"",
   "\":\"",
   "\"/\"",
+  "\"(\"",
+  "\")\"",
   "\",\"",
   "\"=\"",
   "\"%\"",
-  "\"(\"",
-  "\")\"",
   "$start",
   "target",
   "personalities",
@@ -306,6 +311,7 @@ Racc_token_to_s_table = [
   "unused_devices",
   "list_of_personalities",
   "device",
+  "auto_read_only",
   "list_of_devices",
   "super",
   "level",
@@ -350,7 +356,7 @@ module_eval(<<'.,.,', 'mdstat_parser.y', 11)
 
 module_eval(<<'.,.,', 'mdstat_parser.y', 13)
   def _reduce_7(val, _values, result)
-     result = { val[0][:value] => val[15][:value] }
+     result = { val[0][:value] => val[16][:value] }
     result
   end
 .,.,
@@ -405,6 +411,10 @@ module_eval(<<'.,.,', 'mdstat_parser.y', 13)
 
 # reduce 32 omitted
 
+# reduce 33 omitted
+
+# reduce 34 omitted
+
 def _reduce_none(val, _values, result)
   val[0]
 end

data/lib/riemann/tools/memcached.rb

@@ -7,6 +7,7 @@ module Riemann
   module Tools
     class Memcached
       include Riemann::Tools
+
       require 'socket'
 
       opt :memcached_host, 'Memcached hostname', default: 'localhost'

data/lib/riemann/tools/nginx_status.rb

@@ -9,6 +9,7 @@ module Riemann
   module Tools
     class NginxStatus
       include Riemann::Tools
+
       require 'net/http'
       require 'uri'
 

data/lib/riemann/tools/portcheck.rb

@@ -8,6 +8,7 @@ module Riemann
   module Tools
     class Portcheck
       include Riemann::Tools
+
       require 'socket'
 
       opt :hostname, 'Host, defaults to localhost', default: `hostname`.chomp

data/lib/riemann/tools/riemann_client_wrapper.rb

@@ -7,18 +7,49 @@ require 'riemann/client'
 module Riemann
   module Tools
     class RiemannClientWrapper
-      attr_reader :options
+      include Singleton
 
       BACKOFF_TMIN = 0.5  # Minimum delay between reconnection attempts
       BACKOFF_TMAX = 30.0 # Maximum delay
       BACKOFF_FACTOR = 2
 
-      def initialize(options)
-        @options = options
+      # The wrapper manage a single connection to riemann, transport options
+      # cannot be adjusted when riemann-wrapper is running, and enqueing events
+      # should not happen when the system is tearing down.  This is achieved
+      # with this simple state machine
+      #
+      # [idle] --client--> [running] --drain--> [draining]
+      #    ^                                         |
+      #    +-------[#reset (development only)]-------+
+      attr_reader :state
+
+      STATE_IDLE = 1
+      STATE_RUNNING = 2
+      STATE_DRAINING = 3
+
+      # These options are transport-related, and SHALL be the same for each
+      # tool running in riemann-wrapper.  Other options are ignored as far as
+      # the wrapper is concerned.
+      ALLOWED_OPTIONS = %i[host port timeout tls tls_key tls_cert tls_ca_cert tls_verify tcp tls].freeze
+
+      attr_reader :options
+
+      def options=(options)
+        if state == STATE_IDLE
+          @options = options
+          @client = nil
+        else
+          return if options.slice(*ALLOWED_OPTIONS) == @options.slice(*ALLOWED_OPTIONS)
 
+          raise 'Cannot change options while running'
+        end
+      end
+
+      def initialize
+        @options = nil
         @queue = Queue.new
         @max_bulk_size = 1000
-        @draining = false
+        @state = STATE_IDLE
 
         @worker = Thread.new do
           Thread.current.abort_on_exception = true
@@ -49,6 +80,8 @@ module Riemann
 
       def client
         @client ||= begin
+          @state = STATE_RUNNING
+
           r = Riemann::Client.new(
             host: options[:host],
             port: options[:port],
@@ -69,15 +102,25 @@ module Riemann
       end
 
       def <<(event)
-        raise('Cannot queue events when draining') if @draining
+        raise('Cannot queue events while draining') if state == STATE_DRAINING
 
         @queue << event
       end
 
       def drain
-        @draining = true
+        @state = STATE_DRAINING
         sleep(1) until @queue.empty? || @worker.stop?
       end
+
+      private
+
+      # For development purpose only: we do not want the singleton to leak
+      # state from one test to another.
+      def reset
+        @options = nil
+        @queue.clear
+        @state = STATE_IDLE
+      end
     end
   end
 end

data/lib/riemann/tools/tls_check.rb

@@ -24,7 +24,7 @@ module URI
   end
 end
 
-module Riemann
+module Riemann # rubocop:disable Style/OneClassPerFile
   module Tools
     class TLSCheck
       include Riemann::Tools
@@ -202,6 +202,8 @@ module Riemann
             description.start_with? 'OCSP'
           end
 
+          return '' unless ocsp
+
           ocsp_uri = URI(ocsp[/URI:(.*)/, 1])
 
           http_response = ::Net::HTTP.start(ocsp_uri.hostname, ocsp_uri.port) do |http|
@@ -478,7 +480,7 @@ module Riemann
         capabilities = initial_handshake_packet[5] | (initial_handshake_packet[8] << 16)
 
         ssl_flag = 1 << 11
-        raise 'No TLS support' if (capabilities & ssl_flag).zero?
+        raise 'No TLS support' if capabilities.nobits?(ssl_flag)
 
         socket.write(['2000000185ae7f0000000001210000000000000000000000000000000000000000000000'].pack('H*'))
         tls_handshake(socket, uri.host)

data/lib/riemann/tools/uptime_parser.tab.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 

data/lib/riemann/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Riemann
   module Tools # :nodoc:
-    VERSION = '1.11.0'
+    VERSION = '2.0.0'
   end
 end

data/lib/riemann/tools/zookeeper.rb

@@ -7,6 +7,7 @@ module Riemann
   module Tools
     class Zookeeper
       include Riemann::Tools
+
       require 'socket'
 
       opt :zookeeper_host, 'Zookeeper hostname', default: 'localhost'

data/lib/riemann/tools.rb

@@ -82,7 +82,10 @@ module Riemann
     end
 
     def riemann
-      @riemann ||= RiemannClientWrapper.new(options)
+      @riemann ||= begin
+        RiemannClientWrapper.instance.options = options
+        RiemannClientWrapper.instance
+      end
     end
     alias r riemann
 

data/riemann-tools.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Collection of utilities which submit events to Riemann,'
   spec.homepage      = 'https://github.com/aphyr/riemann-tools'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
   spec.metadata['allowed_push_host']     = 'https://rubygems.org/'
   spec.metadata['rubygems_mfa_required'] = 'true'
@@ -38,7 +38,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'json', '>= 1.8'
-  spec.add_runtime_dependency 'optimist', '~> 3.0', '>= 3.0.0'
-  spec.add_runtime_dependency 'riemann-client', '~> 1.1'
+  spec.add_dependency 'csv', '~> 3.0'
+  spec.add_dependency 'json', '>= 1.8'
+  spec.add_dependency 'optimist', '~> 3.0', '>= 3.0.0'
+  spec.add_dependency 'riemann-client', '~> 1.1'
 end

data/tools/riemann-aws/lib/riemann/tools/aws/billing.rb

@@ -7,6 +7,7 @@ module Riemann
     module Aws
       class Billing
         include Riemann::Tools
+
         require 'fog/aws'
 
         opt :fog_credentials_file, 'Fog credentials file', type: String

data/tools/riemann-aws/lib/riemann/tools/aws/elb_metrics.rb

@@ -7,6 +7,7 @@ module Riemann
     module Aws
       class ElbMetrics
         include Riemann::Tools
+
         require 'fog/aws'
         require 'time'
 

data/tools/riemann-aws/lib/riemann/tools/aws/rds_status.rb

@@ -7,6 +7,7 @@ module Riemann
     module Aws
       class RdsStatus
         include Riemann::Tools
+
         require 'fog/aws'
         require 'date'
         require 'time'

data/tools/riemann-aws/lib/riemann/tools/aws/s3_list.rb

@@ -7,6 +7,7 @@ module Riemann
     module Aws
       class S3List
         include Riemann::Tools
+
         require 'fog/aws'
         require 'time'
 

data/tools/riemann-aws/lib/riemann/tools/aws/s3_status.rb

@@ -7,6 +7,7 @@ module Riemann
     module Aws
       class S3Status
         include Riemann::Tools
+
         require 'fog/aws'
         require 'time'
 

data/tools/riemann-aws/lib/riemann/tools/aws/sqs_status.rb

@@ -7,6 +7,7 @@ module Riemann
     module Aws
       class SqsStatus
         include Riemann::Tools
+
         require 'fog/aws'
 
         opt :access_key, 'AWS access key', type: String

data/tools/riemann-aws/lib/riemann/tools/aws/status.rb

@@ -7,6 +7,7 @@ module Riemann
     module Aws
       class Status
         include Riemann::Tools
+
         require 'fog/aws'
         require 'date'
 

data/tools/riemann-chronos/lib/riemann/tools/chronos.rb

@@ -49,15 +49,15 @@ module Riemann
       def health_url
         path_prefix = options[:path_prefix]
         path_prefix[0] = '' if path_prefix[0] == '/'
-        path_prefix[path_prefix.length - 1] = '' if path_prefix[path_prefix.length - 1] == '/'
-        "http://#{options[:chronos_host]}:#{options[:chronos_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/metrics"
+        path_prefix[-1] = '' if path_prefix[-1] == '/'
+        "http://#{options[:chronos_host]}:#{options[:chronos_port]}#{'/' if path_prefix.length.positive?}#{path_prefix}/metrics"
       end
 
       def jobs_url
         path_prefix = options[:path_prefix]
         path_prefix[0] = '' if path_prefix[0] == '/'
-        path_prefix[path_prefix.length - 1] = '' if path_prefix[path_prefix.length - 1] == '/'
-        "http://#{options[:chronos_host]}:#{options[:chronos_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/scheduler/jobs"
+        path_prefix[-1] = '' if path_prefix[-1] == '/'
+        "http://#{options[:chronos_host]}:#{options[:chronos_port]}#{'/' if path_prefix.length.positive?}#{path_prefix}/scheduler/jobs"
       end
 
       def tick