riemann-tools 1.11.0 → 2.0.0

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

@@ -6,6 +6,7 @@ module Riemann
   module Tools
     class Elasticsearch
       include Riemann::Tools
+
       require 'faraday'
       require 'json'
       require 'uri'
@@ -42,8 +43,8 @@ module Riemann
       def make_es_url(path)
         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[:es_host]}:#{options[:es_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/#{path}"
+        path_prefix[-1] = '' if path_prefix[-1] == '/'
+        "http://#{options[:es_host]}:#{options[:es_port]}#{'/' if path_prefix.length.positive?}#{path_prefix}/#{path}"
       end
 
       def health_url

data/tools/riemann-marathon/lib/riemann/tools/marathon.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[:marathon_host]}:#{options[:marathon_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/metrics"
+        path_prefix[-1] = '' if path_prefix[-1] == '/'
+        "http://#{options[:marathon_host]}:#{options[:marathon_port]}#{'/' if path_prefix.length.positive?}#{path_prefix}/metrics"
       end
 
       def apps_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[:marathon_host]}:#{options[:marathon_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/v2/apps"
+        path_prefix[-1] = '' if path_prefix[-1] == '/'
+        "http://#{options[:marathon_host]}:#{options[:marathon_port]}#{'/' if path_prefix.length.positive?}#{path_prefix}/v2/apps"
       end
 
       def tick

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

@@ -42,15 +42,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[:mesos_host]}:#{options[:mesos_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/metrics/snapshot"
+        path_prefix[-1] = '' if path_prefix[-1] == '/'
+        "http://#{options[:mesos_host]}:#{options[:mesos_port]}#{'/' if path_prefix.length.positive?}#{path_prefix}/metrics/snapshot"
       end
 
       def slaves_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[:mesos_host]}:#{options[:mesos_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/master/slaves"
+        path_prefix[-1] = '' if path_prefix[-1] == '/'
+        "http://#{options[:mesos_host]}:#{options[:mesos_port]}#{'/' if path_prefix.length.positive?}#{path_prefix}/master/slaves"
       end
 
       def tick

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

@@ -7,6 +7,7 @@ module Riemann
   module Tools
     class Munin
       include Riemann::Tools
+
       require 'munin-ruby'
 
       def initialize

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

@@ -100,9 +100,9 @@ module Riemann
             svc = "rabbitmq.queue.#{queue['vhost']}.#{queue['name']}"
             errs = []
 
-            errs << 'Queue has jobs but no consumers' if !queue['messages_ready'].nil? && (queue['messages_ready']).positive? && (queue['consumers']).zero?
+            errs << 'Queue has jobs but no consumers' if !queue['messages_ready'].nil? && queue['messages_ready'].positive? && queue['consumers'].zero?
 
-            errs << "Queue has #{queue['messages_ready']} jobs" if (max_size_check_filter.nil? || queue['name'] !~ (max_size_check_filter)) && !queue['messages_ready'].nil? && (queue['messages_ready'] > opts[:max_queue_size])
+            errs << "Queue has #{queue['messages_ready']} jobs" if (max_size_check_filter.nil? || queue['name'] !~ max_size_check_filter) && !queue['messages_ready'].nil? && (queue['messages_ready'] > opts[:max_queue_size])
 
             if errs.empty?
               report(
@@ -133,7 +133,7 @@ module Riemann
 
             stats.each_pair do |k, v|
               service = "#{svc}.#{k}"
-              metric = if k =~ (/details$/) && !v.nil?
+              metric = if k =~ /details$/ && !v.nil?
                          v['rate']
                        else
                          v

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

@@ -9,6 +9,7 @@ module Riemann
   module Tools
     class Riak
       include Riemann::Tools
+
       require 'net/http'
       require 'net/https'
       require 'yajl/json_gem'
@@ -157,7 +158,7 @@ module Riemann
         case val
         when 0..limit
           'ok'
-        when limit..limit * 2
+        when limit..(limit * 2)
           'warning'
         else
           'critical'
@@ -289,7 +290,7 @@ module Riemann
         fsm_types.each do |typespec|
           typespec.each do |type, prop|
             fsm_percentiles.each do |percentile|
-              val = stats[fsm_stat(type, prop, percentile)].to_i || 0
+              val = stats[fsm_stat(type, prop, percentile)].to_i
               val = 0 if val == 'undefined'
               val /= 1000.0 if prop == 'time' # Convert us to ms
               state = if prop == 'time'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-07 00:00:00.000000000 Z
+date: 2026-05-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -241,14 +255,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.13
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Utilities which submit events to Riemann.