riemann-tools 1.11.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa81e2c6ea617e2450bdc8456f8665493241b19256be9a5443b6351e5d417ace
-  data.tar.gz: 0eb2bb5e1f6caea452a2babe933acd270840a78fe15520d637b7b3eb1deeb93e
+  metadata.gz: c688bb624c4171f8baab09545f0be418766c717493f31ff1a13e3e9c20039786
+  data.tar.gz: 90d7c75b516dffb0c91201218349914cc6eb48718f99cbdc090f888a4a068d5c
 SHA512:
-  metadata.gz: eccb9331a24c1db7812365ee6c52d811a962b681563237f1e4f196aad7ae59171daaf9548db8792ff8ab548b393a04c00078c8ba59701373f8c452077960cae6
-  data.tar.gz: 75508745d0f31fd2b5457531ae68158f514ca5ac9fa65c64c00c9ceedf67df8644b87bd324ef0aca94527e862c51ad063702ab8be95181723b6c73fefd2c9fb9
+  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,14 +27,14 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - '2.6'
           - '2.7'
           - '3.0'
           - '3.1'
           - '3.2'
           - '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,46 @@
 # 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)
+
+**Implemented enhancements:**
+
+- Allow passing options to `riemann-bench` [\#300](https://github.com/riemann/riemann-tools/pull/300) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix support of Ruby 3.4 [\#301](https://github.com/riemann/riemann-tools/pull/301) ([smortex](https://github.com/smortex))
+
 ## [v1.11.0](https://github.com/riemann/riemann-tools/tree/v1.11.0) (2024-07-07)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.10.0...v1.11.0)
@@ -399,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))
@@ -415,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)
 
@@ -446,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)
@@ -544,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)
@@ -584,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))
@@ -604,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

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
-require 'rubygems'
-require 'riemann/client'
+require 'riemann/tools'
+require 'riemann/tools/version'
 
 # Connects to a server (first arg) and populates it with a constant stream of
 # events for testing.
 module Riemann
   module Tools
     class Bench
-      attr_accessor :client, :hosts, :services, :states
+      include Riemann::Tools
+
+      attr_accessor :hosts, :services, :states
 
       def initialize
         super
@@ -17,7 +19,6 @@ module Riemann
         @hosts = %w[a b c d e f g h i j]
         @services = %w[test1 test2 test3 foo bar baz xyzzy attack cat treat]
         @states = {}
-        @client = Riemann::Client.new(host: ARGV.first || 'localhost')
       end
 
       def evolve(state)
@@ -45,7 +46,7 @@ module Riemann
       def tick
         #    pp @states
         hosts.product(services).each do |id|
-          client << (states[id] = evolve(states[id]))
+          report(states[id] = evolve(states[id]))
         end
       end
 

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