riemann-tools 1.12.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 074d3c18c2108c352d43fec2b29ccff5f717a2369ee5649a61b91f9eaded3eaf
-  data.tar.gz: bf6c07e31ce1723645429924e3ad9ae6a2500dd83495518038a40f33fab22fad
+  metadata.gz: c688bb624c4171f8baab09545f0be418766c717493f31ff1a13e3e9c20039786
+  data.tar.gz: 90d7c75b516dffb0c91201218349914cc6eb48718f99cbdc090f888a4a068d5c
 SHA512:
-  metadata.gz: 1cedba2b8086abf960e954f26646049146cd3ba3fab037f612299a0754e6d60504dd9610f05b34a96c089a1f3312e93b936976143d50e500cf967ed0c4c48855
-  data.tar.gz: c177966cf0e558ff52569d44f08bf1bfe9c07975cf7b01a3ee13aed71e30742186855943647cc7c3c74e24a3d6953cf3652cbffd42caed9ab7485abeb85745e3
+  metadata.gz: f5a1698690f11146fc1ebab73f6b5e7a6f0afcaef291eb8270032e8be142639f23a2ce34ceeb621d98a4294c083840137b2882d13cd1fc2615cd58faf2173638
+  data.tar.gz: 84eef56087c0d462d4f7f97f977cccb312cfcfa6431f071d2957ff0b99a471e71a208a85ee81f6ef3f4edb83eec03417eae5e20d50fbd6494cee4685dec6ed24

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -27,7 +27,6 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - '2.6'
           - '2.7'
           - '3.0'
           - '3.1'
@@ -35,7 +34,7 @@ jobs:
           - '3.3'
           - '3.4'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,4 +69,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

data/.rubocop.yml

@@ -4,7 +4,7 @@ AllCops:
   Exclude:
     - lib/riemann/tools/*_parser.tab.rb
     - vendor/bundle/**/*
-require:
+plugins:
   - rubocop-rake
   - rubocop-rspec
 Gemspec/RequiredRubyVersion:

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [v2.0.0](https://github.com/riemann/riemann-tools/tree/v2.0.0) (2026-05-28)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.12.0...v2.0.0)
+
+**Breaking changes:**
+
+- Drop support for Ruby \< 2.7 [\#305](https://github.com/riemann/riemann-tools/pull/305) ([smortex](https://github.com/smortex))
+
+**Implemented enhancements:**
+
+- Ignore null-critical value for `riemann-hwmon` [\#307](https://github.com/riemann/riemann-tools/pull/307) ([smortex](https://github.com/smortex))
+- Distinguish i2c devices in `riemann-hwmon` [\#306](https://github.com/riemann/riemann-tools/pull/306) ([smortex](https://github.com/smortex))
+- Ignore `efivarfs` disks in `riemann-health` checks [\#304](https://github.com/riemann/riemann-tools/pull/304) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix `riemann-wrapper` connection sharing [\#315](https://github.com/riemann/riemann-tools/pull/315) ([smortex](https://github.com/smortex))
+- Fix reporting of free disk space [\#314](https://github.com/riemann/riemann-tools/pull/314) ([smortex](https://github.com/smortex))
+- Fix `riemann-md` not recognizing mdstat `auto-read-only` mode [\#312](https://github.com/riemann/riemann-tools/pull/312) ([smortex](https://github.com/smortex))
+- Ignore invalid data in `riemann-hwmon` [\#303](https://github.com/riemann/riemann-tools/pull/303) ([smortex](https://github.com/smortex))
+
+**Closed issues:**
+
+- RFC: retire tools that monitor Mesos and related projects [\#311](https://github.com/riemann/riemann-tools/issues/311)
+
+**Merged pull requests:**
+
+- Mark Mesos monitoring tools as deprecated [\#313](https://github.com/riemann/riemann-tools/pull/313) ([l2dy](https://github.com/l2dy))
+
 ## [v1.12.0](https://github.com/riemann/riemann-tools/tree/v1.12.0) (2025-01-15)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.11.0...v1.12.0)
@@ -411,7 +440,7 @@
 
 - Send out "expired" state when riemann-net stops seeing an interface [\#114](https://github.com/riemann/riemann-tools/pull/114) ([md5](https://github.com/md5))
 - Skip network metric comparison for newly added interfaces [\#113](https://github.com/riemann/riemann-tools/pull/113) ([md5](https://github.com/md5))
-- riemann-proc alerts output which processes matched [\#111](https://github.com/riemann/riemann-tools/pull/111) ([tcrayford](https://github.com/tcrayford))
+- riemann-proc alerts output which processes matched [\#111](https://github.com/riemann/riemann-tools/pull/111) ([tom-pang](https://github.com/tom-pang))
 - abort if no DB specified [\#110](https://github.com/riemann/riemann-tools/pull/110) ([peterneubauer](https://github.com/peterneubauer))
 - Adding monitoring of an RDS instance [\#109](https://github.com/riemann/riemann-tools/pull/109) ([peterneubauer](https://github.com/peterneubauer))
 - Added NTP statistics collector [\#108](https://github.com/riemann/riemann-tools/pull/108) ([jamtur01](https://github.com/jamtur01))
@@ -427,7 +456,7 @@
 
 - Adding support for https connection [\#102](https://github.com/riemann/riemann-tools/pull/102) ([peterneubauer](https://github.com/peterneubauer))
 - Adds monitoring a folder based on its number of files [\#100](https://github.com/riemann/riemann-tools/pull/100) ([iramello](https://github.com/iramello))
-- add directory space use monitoring [\#96](https://github.com/riemann/riemann-tools/pull/96) ([tcrayford](https://github.com/tcrayford))
+- add directory space use monitoring [\#96](https://github.com/riemann/riemann-tools/pull/96) ([tom-pang](https://github.com/tom-pang))
 
 ## [0.2.3](https://github.com/riemann/riemann-tools/tree/0.2.3) (2015-01-06)
 
@@ -458,19 +487,22 @@
 
 - one-character fix: Make riemann-aws-billing work again [\#85](https://github.com/riemann/riemann-tools/pull/85) ([benley](https://github.com/benley))
 - Fix for latest riemann-client changes [\#83](https://github.com/riemann/riemann-tools/pull/83) ([eric](https://github.com/eric))
-- riemann proc regex should quote args to grep [\#82](https://github.com/riemann/riemann-tools/pull/82) ([tcrayford](https://github.com/tcrayford))
+- riemann proc regex should quote args to grep [\#82](https://github.com/riemann/riemann-tools/pull/82) ([tom-pang](https://github.com/tom-pang))
 - riemann-redis migrated to https://github.com/riemann/riemann-redis [\#81](https://github.com/riemann/riemann-tools/pull/81) ([fborgnia](https://github.com/fborgnia))
 
 ## [0.2.1](https://github.com/riemann/riemann-tools/tree/0.2.1) (2014-03-26)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/0.2.0...0.2.1)
 
+**Implemented enhancements:**
+
+- rieman-tools aws billing [\#74](https://github.com/riemann/riemann-tools/pull/74) ([jespada](https://github.com/jespada))
+
 **Merged pull requests:**
 
 - Update FreeBSD load average for 1 min [\#79](https://github.com/riemann/riemann-tools/pull/79) ([zachfi](https://github.com/zachfi))
 - Added riemann-varnish collector script [\#77](https://github.com/riemann/riemann-tools/pull/77) ([pradeepchhetri](https://github.com/pradeepchhetri))
 - allow dashes in diskstats volume names to support lvm volumes like "dm-0" [\#75](https://github.com/riemann/riemann-tools/pull/75) ([cmerrick](https://github.com/cmerrick))
-- rieman-tools aws billing [\#74](https://github.com/riemann/riemann-tools/pull/74) ([jespada](https://github.com/jespada))
 - Added basic metric monitoring for zookeeper [\#73](https://github.com/riemann/riemann-tools/pull/73) ([aterreno](https://github.com/aterreno))
 
 ## [0.2.0](https://github.com/riemann/riemann-tools/tree/0.2.0) (2014-01-23)
@@ -556,22 +588,31 @@
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/0.1.2...0.1.3)
 
+**Implemented enhancements:**
+
+- Add ability to add attributes from CLI [\#38](https://github.com/riemann/riemann-tools/pull/38) ([lwf](https://github.com/lwf))
+
+**Fixed bugs:**
+
+- Handle timeouts [\#42](https://github.com/riemann/riemann-tools/pull/42) ([lwf](https://github.com/lwf))
+
 **Closed issues:**
 
 - riemann-kvminstance\(s\) duplicate scripts [\#34](https://github.com/riemann/riemann-tools/issues/34)
 
 **Merged pull requests:**
 
-- Remove dead code [\#43](https://github.com/riemann/riemann-tools/pull/43) ([lwf](https://github.com/lwf))
-- Handle timeouts [\#42](https://github.com/riemann/riemann-tools/pull/42) ([lwf](https://github.com/lwf))
 - Allow riemann resmon to use hostname or FQDN for events [\#41](https://github.com/riemann/riemann-tools/pull/41) ([gsandie](https://github.com/gsandie))
 - Remove duplicated file riemann-kvminstances. [\#39](https://github.com/riemann/riemann-tools/pull/39) ([default50](https://github.com/default50))
-- Add ability to add attributes from CLI [\#38](https://github.com/riemann/riemann-tools/pull/38) ([lwf](https://github.com/lwf))
 
 ## [0.1.2](https://github.com/riemann/riemann-tools/tree/0.1.2) (2013-04-30)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/0.0.9...0.1.2)
 
+**Implemented enhancements:**
+
+- Add riemann-aws-status [\#13](https://github.com/riemann/riemann-tools/pull/13) ([lwf](https://github.com/lwf))
+
 **Closed issues:**
 
 - riemann-nginx? [\#31](https://github.com/riemann/riemann-tools/issues/31)
@@ -596,18 +637,21 @@
 - Default event hostname [\#20](https://github.com/riemann/riemann-tools/pull/20) ([timshadel](https://github.com/timshadel))
 - Add memcached monitoring support for riemann-tools. [\#19](https://github.com/riemann/riemann-tools/pull/19) ([fcuny](https://github.com/fcuny))
 - Typo in rieman-riak using :servie instead of :service [\#18](https://github.com/riemann/riemann-tools/pull/18) ([dgtized](https://github.com/dgtized))
-- Add riemann-aws-status [\#13](https://github.com/riemann/riemann-tools/pull/13) ([lwf](https://github.com/lwf))
 
 ## [0.0.9](https://github.com/riemann/riemann-tools/tree/0.0.9) (2012-12-08)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/version-0.0.2...0.0.9)
 
+**Implemented enhancements:**
+
+- Add riemann-diskstats [\#12](https://github.com/riemann/riemann-tools/pull/12) ([lwf](https://github.com/lwf))
+- Add --tag option to specify tags [\#2](https://github.com/riemann/riemann-tools/pull/2) ([lwf](https://github.com/lwf))
+
 **Merged pull requests:**
 
 - fix overflowing text from ps by swapping args for comm [\#17](https://github.com/riemann/riemann-tools/pull/17) ([dch](https://github.com/dch))
 - Fix darwin cpu usage. Show used cpu instead of idle [\#15](https://github.com/riemann/riemann-tools/pull/15) ([henrikno](https://github.com/henrikno))
 - Fix core count on darwin [\#14](https://github.com/riemann/riemann-tools/pull/14) ([henrikno](https://github.com/henrikno))
-- Add riemann-diskstats [\#12](https://github.com/riemann/riemann-tools/pull/12) ([lwf](https://github.com/lwf))
 - Reflect each haproxy config as its own unique status [\#11](https://github.com/riemann/riemann-tools/pull/11) ([perezd](https://github.com/perezd))
 - allow for a commandline configurable TTL. [\#10](https://github.com/riemann/riemann-tools/pull/10) ([perezd](https://github.com/perezd))
 - add host properties to cloudant, haproxy, redis. [\#8](https://github.com/riemann/riemann-tools/pull/8) ([perezd](https://github.com/perezd))
@@ -616,7 +660,6 @@
 - adds redis monitoring support to riemann-tools. [\#5](https://github.com/riemann/riemann-tools/pull/5) ([perezd](https://github.com/perezd))
 - Prevent riemann-health from failing to report memory on OpenVZ virtual machines.  [\#4](https://github.com/riemann/riemann-tools/pull/4) ([mindreframer](https://github.com/mindreframer))
 - added a script to report kvm instances running on a host [\#3](https://github.com/riemann/riemann-tools/pull/3) ([wjimenez5271](https://github.com/wjimenez5271))
-- Add --tag option to specify tags [\#2](https://github.com/riemann/riemann-tools/pull/2) ([lwf](https://github.com/lwf))
 - add freebsd and darwin support to riemann-health [\#1](https://github.com/riemann/riemann-tools/pull/1) ([joecaswell](https://github.com/joecaswell))
 
 ## [version-0.0.2](https://github.com/riemann/riemann-tools/tree/version-0.0.2) (2012-04-17)

data/Gemfile

@@ -8,6 +8,7 @@ gemspec
 gem 'github_changelog_generator'
 gem 'maxmind-geoip2'
 gem 'racc'
+gem 'rackup'
 gem 'rake'
 gem 'rspec'
 gem 'rubocop'
@@ -15,14 +16,3 @@ gem 'rubocop-rake'
 gem 'rubocop-rspec'
 gem 'sinatra'
 gem 'webrick'
-
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0')
-  # XXX: Needed for Ruby 2.6 compatibility
-  #
-  # With Ruby 2.6 an older version of rakup is installed that cause other gems
-  # to be installed with a legacy version.
-  #
-  # Because rakup is only needed when using rack 3, we can just ignore this
-  # with Ruby 2.6.
-  gem 'rackup'
-end

data/README.markdown

@@ -56,13 +56,14 @@ gem install riemann-aws
 
 * riemann-aws - Monitor various AWS services.
 * riemann-elasticsearch - Monitor Elasticsearch.
-* riemann-mesos - Monitor Mesos.
 * riemann-rabbitmq - Monitor RabbitMQ.
 * riemann-docker - Monitor Docker.
-* riemann-marathon - Monitor Marathon.
 * riemann-munin - Monitor Munin.
 * riemann-riak - Monitor Riak.
-* riemann-chronos - Monitor Chronos.
+* Mesos (deprecated)
+  * riemann-mesos - Monitor Mesos.
+  * riemann-marathon - Monitor Marathon.
+  * riemann-chronos - Monitor Chronos.
 
 There are also a number of additional, stand-alone tools, contained in
 the [Riemann GitHub account](https://github.com/riemann/).

data/lib/riemann/tools/apache_status.rb

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

data/lib/riemann/tools/bench.rb

@@ -9,6 +9,7 @@ module Riemann
   module Tools
     class Bench
       include Riemann::Tools
+
       attr_accessor :hosts, :services, :states
 
       def initialize

data/lib/riemann/tools/cloudant.rb

@@ -8,6 +8,7 @@ module Riemann
   module Tools
     class Cloudant
       include Riemann::Tools
+
       require 'net/http'
       require 'json'
 

data/lib/riemann/tools/haproxy.rb

@@ -8,6 +8,7 @@ module Riemann
   module Tools
     class Haproxy
       include Riemann::Tools
+
       require 'net/http'
       require 'csv'
 

data/lib/riemann/tools/health.rb

@@ -21,7 +21,7 @@ module Riemann
       opt :disk_warning_leniency, 'Disk warning threshold (amount of free space)', short: :none, default: '500G'
       opt :disk_critical_leniency, 'Disk critical threshold (amount of free space)', short: :none, default: '250G'
       opt :disk_ignorefs, 'A list of filesystem types to ignore',
-          default: %w[anon_inodefs autofs cd9660 devfs devtmpfs fdescfs iso9660 linprocfs linsysfs nfs overlay procfs squashfs tmpfs]
+          default: %w[anon_inodefs autofs cd9660 devfs devtmpfs efivarfs fdescfs iso9660 linprocfs linsysfs nfs overlay procfs squashfs tmpfs]
       opt :load_warning, 'Load warning threshold (load average / core)', default: 3.0
       opt :load_critical, 'Load critical threshold (load average / core)', default: 8.0
       opt :memory_warning, 'Memory warning threshold (fraction of RAM)', default: 0.85
@@ -441,9 +441,9 @@ module Riemann
           x = used.to_f / total_without_reservation
 
           if x > @limits[:disk][:critical] && available < @limits[:disk][:critical_leniency_kb]
-            alert "disk #{f[5]}", :critical, x, "#{f[4]} used"
+            alert "disk #{f[5]}", :critical, x, "#{f[4]} used, #{number_to_human_size(available * 1024, :floor)} free"
           elsif x > @limits[:disk][:warning] && available < @limits[:disk][:warning_leniency_kb]
-            alert "disk #{f[5]}", :warning, x, "#{f[4]} used"
+            alert "disk #{f[5]}", :warning, x, "#{f[4]} used, #{number_to_human_size(available * 1024, :floor)} free"
           else
             alert "disk #{f[5]}", :ok, x, "#{f[4]} used, #{number_to_human_size(available * 1024, :floor)} free"
           end
@@ -530,10 +530,12 @@ module Riemann
       end
 
       def number_to_human_size(value, rounding = :round)
-        return value.to_s if value < 1024
+        return "#{value}B" if value.abs < 1024
 
+        neg = value.negative?
+        value = value.abs
         r = Math.log(value, 1024).floor
-        format('%<size>.1f%<unit>ciB', size: (value.to_f / (1024**r)).send(rounding, 1), unit: SI_UNITS[r])
+        format('%<sign>s%<size>.1f%<unit>ciB', sign: (neg ? '-' : ''), size: (value.to_f / (1024**r)).send(rounding, 1), unit: SI_UNITS[r])
       end
 
       def tick

data/lib/riemann/tools/hwmon.rb

@@ -17,8 +17,16 @@ module Riemann
           @number = number
 
           @crit = scale(read_hwmon_i('crit'))
+          @crit = nil if @crit&.zero? # Some buggy drivers report a zero critical value.  Ignore these
           @lcrit = scale(read_hwmon_i('lcrit'))
-          @service = ['hwmon', read_hwmon_file('name'), read_hwmon_s('label')].compact.join(' ')
+          @service = ['hwmon', name, read_hwmon_s('label')].compact.join(' ')
+        end
+
+        def name
+          result = read_hwmon_file('name')
+          filename = File.realpath(hwmon_file_path('name'))
+          result.concat(' at ', Regexp.last_match[1]) if filename.match(%r{/(i2c-\d+/\d+-[[:xdigit:]]+)/hwmon/})
+          result
         end
 
         def input
@@ -28,14 +36,17 @@ module Riemann
         def report
           value = scale(input)
 
-          state = :ok
-          state = :critical if crit && value >= crit
-          state = :critical if lcrit && value <= lcrit
+          state = nil
+          if crit || lcrit
+            state = :ok
+            state = :critical if crit && value >= crit
+            state = :critical if lcrit && value <= lcrit
+          end
           {
             service: service,
             state: state,
             metric: value,
-            description: fromat_input(value),
+            description: format_input(value),
           }
         end
 
@@ -52,7 +63,7 @@ module Riemann
           end
         end
 
-        def fromat_input(value)
+        def format_input(value)
           case type
           when :in then format('%<value>.3f V', { value: value })
           when :fan then "#{value} RPM"
@@ -76,10 +87,14 @@ module Riemann
         end
 
         def read_hwmon_file(file)
-          File.read("/sys/class/hwmon/hwmon#{hwmon}/#{file}").chomp
+          File.read(hwmon_file_path(file)).chomp
         rescue Errno::ENOENT
           nil
         end
+
+        def hwmon_file_path(file)
+          "/sys/class/hwmon/hwmon#{hwmon}/#{file}"
+        end
       end
 
       attr_reader :devices
@@ -104,6 +119,8 @@ module Riemann
       def tick
         devices.each do |device|
           report(device.report)
+        rescue Errno::ENODATA
+          # Some sensors are buggy and cannot report properly
         end
       end
     end

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|

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.12.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'

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

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,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Kyle Kingsbury
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-15 00:00:00.000000000 Z
+date: 2026-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -246,6 +247,7 @@ metadata:
   homepage_uri: https://github.com/aphyr/riemann-tools
   source_code_uri: https://github.com/aphyr/riemann-tools
   changelog_uri: https://github.com/aphyr/riemann-tools
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -253,14 +255,15 @@ 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.6.2
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Utilities which submit events to Riemann.
 test_files: []