riemann-tools 1.2.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa8ed5841e8d5c02ee08180af284269ca1382e174a2dfd98b28de23227a44f61
-  data.tar.gz: 3ec31579be24a493017091aaa928b6cbd091c2d578a7d577d868ac2857e7be3d
+  metadata.gz: ce2307f0dfeaad07e9b904c5f0edf2b0d7a586507c94e8ffb2ff9e3ccf6b3c6f
+  data.tar.gz: 8178becee10569b018dfdb54693cfa9e5c5a61dfe62ecdec7ca257004e2365ff
 SHA512:
-  metadata.gz: a5554c62f5ce95494f5ed677ccd6933224121c9d227bc9318ec54bed380e0635f1140fbfc5cf8cd3e2ecc919fc267c12f8fb8c47da58345925c69c6d19c82a51
-  data.tar.gz: a1e3a370c5a325eb6acd59c1ad23fb3efcde20f8ff467d75a84c1e52e1f7cd2cd3102d5045bb11bfd43a43f12b01c0823c2b08f6fa75fd1e33ae50818ffa0e02
+  metadata.gz: 7588c24abd5c87eb95ced867cc23350697ef893463e939a47c481518209a386c2b0a56e93e9d470e2fe1d9d0a78fa01d5b8d0e3f6af265d014072a00cf44570d
+  data.tar.gz: 54bd9df700e67ee112e856e6104018bac1ad54444533186cdd2425416fa2ab9a0939c5bfd7de5446045d4813c9a8fac5e34db9d997ea841c9665ae97f7224b95

data/.gitignore

@@ -5,4 +5,4 @@ pkg/
 .DS_Store
 .*.swp
 *.log
-lib/riemann/tools/uptime_parser.tab.rb
+lib/riemann/tools/*_parser.tab.rb

data/.rubocop.yml

@@ -1,7 +1,7 @@
 ---
 AllCops:
   Exclude:
-    - lib/riemann/tools/uptime_parser.tab.rb
+    - lib/riemann/tools/*_parser.tab.rb
     - vendor/bundle/**/*
 Gemspec/RequiredRubyVersion:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## [v1.5.0](https://github.com/riemann/riemann-tools/tree/v1.5.0) (2022-09-08)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.4.0...v1.5.0)
+
+**Implemented enhancements:**
+
+- Improve error reporting on parse error [\#242](https://github.com/riemann/riemann-tools/pull/242) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix `riemann-haproxy` HTTP response processing [\#243](https://github.com/riemann/riemann-tools/pull/243) ([ahoetker-deca](https://github.com/ahoetker-deca))
+- Fix `riemann-md` parsing of mdstat when device is being checked [\#241](https://github.com/riemann/riemann-tools/pull/241) ([smortex](https://github.com/smortex))
+
+## [v1.4.0](https://github.com/riemann/riemann-tools/tree/v1.4.0) (2022-08-30)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.3.0...v1.4.0)
+
+**Implemented enhancements:**
+
+- Improve zpool state reporting [\#239](https://github.com/riemann/riemann-tools/pull/239) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix zpool/md informational messages reporting [\#238](https://github.com/riemann/riemann-tools/pull/238) ([smortex](https://github.com/smortex))
+- Fix detection of degraded zpool [\#237](https://github.com/riemann/riemann-tools/pull/237) ([smortex](https://github.com/smortex))
+
+## [v1.3.0](https://github.com/riemann/riemann-tools/tree/v1.3.0) (2022-08-29)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.2.0...v1.3.0)
+
+**Implemented enhancements:**
+
+- Add support for configuration file to riemann-wrapper [\#235](https://github.com/riemann/riemann-tools/pull/235) ([smortex](https://github.com/smortex))
+- Add `riemann-md` to monitor Linux RAID/md health [\#232](https://github.com/riemann/riemann-tools/pull/232) ([smortex](https://github.com/smortex))
+- Add `riemann-zpool` to monitor zpool health [\#231](https://github.com/riemann/riemann-tools/pull/231) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix race condition in riemann-wrapper [\#233](https://github.com/riemann/riemann-tools/pull/233) ([smortex](https://github.com/smortex))
+
+**Closed issues:**
+
+- There is some kind of race condition in riemann-wrapper [\#230](https://github.com/riemann/riemann-tools/issues/230)
+
+**Merged pull requests:**
+
+- Stop riemann-wrapper if a tool raise an error [\#234](https://github.com/riemann/riemann-tools/pull/234) ([smortex](https://github.com/smortex))
+
 ## [v1.2.0](https://github.com/riemann/riemann-tools/tree/v1.2.0) (2022-08-17)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.1.1...v1.2.0)

data/Rakefile

@@ -22,8 +22,15 @@ end
 
 task build: :gen_parser
 
-desc 'Generate the uptime parser'
-task gen_parser: 'lib/riemann/tools/uptime_parser.tab.rb'
+desc 'Generate parsers'
+task gen_parser: [
+  'lib/riemann/tools/mdstat_parser.tab.rb',
+  'lib/riemann/tools/uptime_parser.tab.rb',
+]
+
+file 'lib/riemann/tools/mdstat_parser.tab.rb' => 'lib/riemann/tools/mdstat_parser.y' do
+  sh 'racc -S lib/riemann/tools/mdstat_parser.y'
+end
 
 file 'lib/riemann/tools/uptime_parser.tab.rb' => 'lib/riemann/tools/uptime_parser.y' do
   sh 'racc -S lib/riemann/tools/uptime_parser.y'

data/bin/riemann-md

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+Process.setproctitle($PROGRAM_NAME)
+
+require 'riemann/tools/md'
+
+Riemann::Tools::Md.run

data/bin/riemann-wrapper

@@ -27,9 +27,10 @@ def read_flags(argv)
   res
 end
 
-if ARGV.empty?
+def usage
   warn <<~USAGE
     usage: riemann-wrapper [common options] -- tool1 [tool1 options] [-- tool2 [tool2 options] ...]
+           riemann-wrapper /path/to/configuration/file.yml
 
     Run multiple Riemann tools in a single process.  A single connection to
     riemann is maintained and shared for all tools, the connection flags should
@@ -47,16 +48,53 @@ if ARGV.empty?
                          fd     --tag=fd     -- \\
                          health --tag=health -- \\
                          ntp    --tag=ntp
+
+      3. Same as above example, but using a configuration file (more verbose but
+         easier to handle when running riemann-wrapper manually of managing it
+         with a Configuration Management system):
+
+         cat > config.yml << EOT
+         ---
+         options: --host riemann.example.com --tcp
+         tools:
+         - name: fd
+           options: --tag=fd
+         - name: health
+           options: --tag=health
+         - name: ntp
+           options: --tag=ntp
+         EOT
+         riemann-wrapper config.yml
   USAGE
   exit 1
 end
 
+usage if ARGV.empty?
+
+if ARGV.size == 1
+  unless File.readable?(ARGV[0])
+    warn "Cannot open file for reading: #{ARGV[0]}"
+    usage
+  end
+
+  require 'yaml'
+  config = YAML.safe_load(File.read(ARGV[0]))
+
+  commandline = config['options']
+  config['tools'].each { |tool| commandline << " -- #{tool['name']} #{tool['options']}" }
+
+  ARGV.replace(commandline.split)
+end
+
 argv = ARGV.dup
 
 common_argv = read_flags(argv)
 
 threads = []
 
+# Terminate the whole process is some thread fail
+Thread.abort_on_exception = true
+
 while argv.any?
   tool = argv.shift
   tool_argv = read_flags(argv)
@@ -69,7 +107,7 @@ while argv.any?
   # Force evaluation of options.  This rely on ARGV and needs to be done before
   # we launch multiple threads which compete to read information from there.
   instance.options
-  threads << Thread.new { instance.run }
+  threads << Thread.new(instance, &:run)
 end
 
 threads.each(&:join)

data/bin/riemann-zpool

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+Process.setproctitle($PROGRAM_NAME)
+
+require 'riemann/tools/zpool'
+
+Riemann::Tools::Zpool.run

data/lib/riemann/tools/haproxy.rb

@@ -44,7 +44,7 @@ module Riemann
       def csv
         http = ::Net::HTTP.new(@uri.host, @uri.port)
         http.use_ssl = true if @uri.scheme == 'https'
-        http.start do |h|
+        res = http.start do |h|
           get = ::Net::HTTP::Get.new(@uri.request_uri)
           unless @uri.userinfo.nil?
             userinfo = @uri.userinfo.split(':')
@@ -52,7 +52,7 @@ module Riemann
           end
           h.request get
         end
-        CSV.parse(http.body.split('# ')[1], { headers: true })
+        CSV.parse(res.body.split('# ')[1], { headers: true })
       end
     end
   end

data/lib/riemann/tools/health.rb

@@ -103,6 +103,8 @@ module Riemann
             @swap_enabled = true
           end
         end
+
+        invalidate_cache
       end
 
       def alert(service, state, metric, description)
@@ -139,6 +141,8 @@ module Riemann
       end
 
       def report_uptime(uptime)
+        return unless uptime
+
         description = uptime_to_human(uptime)
 
         if uptime < @limits[:uptime][:critical]
@@ -262,6 +266,13 @@ module Riemann
 
       def uptime
         @cached_data[:uptime] ||= uptime_parser.parse(`uptime`)
+      rescue Racc::ParseError => e
+        report(
+          service: 'uptime',
+          description: "Error parsing uptime: #{e.message}",
+          state: 'critical',
+        )
+        @cached_data[:uptime] = {}
       end
 
       def bsd_load

data/lib/riemann/tools/md.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'riemann/tools'
+require 'riemann/tools/mdstat_parser.tab'
+
+module Riemann
+  module Tools
+    class Md
+      include Riemann::Tools
+
+      def mdstat_parser
+        @mdstat_parser ||= MdstatParser.new
+      end
+
+      def tick
+        status = File.read('/proc/mdstat')
+        res = mdstat_parser.parse(status)
+
+        state = res.values.all? { |value| value =~ /\AU+\z/ } ? 'ok' : 'critical'
+
+        report(
+          service: 'mdstat',
+          description: status,
+          state: state,
+        )
+      rescue Racc::ParseError => e
+        report(
+          service: 'mdstat',
+          description: "Error parsing mdstat: #{e.message}",
+          state: 'critical',
+        )
+      rescue Errno::ENOENT => e
+        report(
+          service: 'mdstat',
+          description: e.message,
+          state: 'critical',
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,371 @@
+#
+# DO NOT MODIFY!!!!
+# This file is automatically generated by Racc 1.6.0
+# from Racc grammar file "".
+#
+
+require 'racc/parser.rb'
+
+
+require 'strscan'
+
+require 'riemann/tools/utils'
+
+module Riemann
+  module Tools
+    class MdstatParser < Racc::Parser
+
+module_eval(<<'...end mdstat_parser.y/module_eval...', 'mdstat_parser.y', 49)
+
+  def parse(text)
+    s = Utils::StringTokenizer.new(text)
+
+    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(/\[=*>.*\]/)       then s.push_token(:PROGRESS)
+      when s.scan(/%/)               then s.push_token('%')
+      when s.scan(/,/)               then s.push_token(',')
+      when s.scan(/:/)               then s.push_token(':')
+      when s.scan(/</)               then s.push_token('<')
+      when s.scan(/=/)               then s.push_token('=')
+      when s.scan(/>/)               then s.push_token('>')
+      when s.scan(/\(/)              then s.push_token('(')
+      when s.scan(/\)/)              then s.push_token(')')
+      when s.scan(/\./)              then s.push_token('.')
+      when s.scan(/\//)              then s.push_token('/')
+      when s.scan(/\[/)              then s.push_token('[')
+      when s.scan(/]/)               then s.push_token(']')
+      when s.scan(/algorithm/)       then s.push_token(:ALGORITHM)
+      when s.scan(/bitmap/)          then s.push_token(:BITMAP)
+      when s.scan(/blocks/)          then s.push_token(:BLOCKS)
+      when s.scan(/check/)           then s.push_token(:CHECK)
+      when s.scan(/chunk/)           then s.push_token(:CHUNK)
+      when s.scan(/finish/)          then s.push_token(:FINISH)
+      when s.scan(/level/)           then s.push_token(:LEVEL)
+      when s.scan(/min/)             then s.push_token(:MIN)
+      when s.scan(/pages/)           then s.push_token(:PAGES)
+      when s.scan(/(raid([014-6]|10)|linear|multipath|faulty)\b/) then s.push_token(:PERSONALITY)
+      when s.scan(/Personalities/)   then s.push_token(:PERSONALITIES)
+      when s.scan(/recovery/)        then s.push_token(:RECOVERY)
+      when s.scan(/reshape/)         then s.push_token(:RESHAPE)
+      when s.scan(/resync/)          then s.push_token(:RESYNC)
+      when s.scan(/speed/)           then s.push_token(:SPEED)
+      when s.scan(/super/)           then s.push_token(:SUPER)
+      when s.scan(/unused devices/)  then s.push_token(:UNUSED_DEVICES)
+      when s.scan(/K\/sec/)          then s.push_token(:SPEED_UNIT)
+      when s.scan(/KB/)              then s.push_token(:BYTE_UNIT)
+      when s.scan(/k/)               then s.push_token(:UNIT)
+      when s.scan(/\d+\.\d+/)        then s.push_token(:FLOAT, s.matched.to_f)
+      when s.scan(/\d+/)             then s.push_token(:INTEGER, s.matched.to_i)
+      when s.scan(/F\b/)             then s.push_token(:FAILED)
+      when s.scan(/\w+/)             then s.push_token(:IDENTIFIER)
+      else
+        s.unexpected_token
+      end
+    end
+
+    @tokens = s.tokens
+
+    do_parse
+  end
+
+  def next_token
+    @tokens.shift
+  end
+
+  def on_error(error_token_id, error_value, value_stack)
+    raise(Racc::ParseError, "parse error on value \"#{error_value[:value]}\" (#{token_to_str(error_token_id)}) on line #{error_value[:lineno]}:\n#{error_value[:line]}\n#{' ' * error_value[:pos]}^#{'~' * (error_value[:value].to_s.length - 1)}")
+  end
+...end mdstat_parser.y/module_eval...
+##### State transition tables begin ###
+
+racc_action_table = [
+    10,    13,    14,    60,    10,    29,     3,     4,     6,     7,
+    15,    16,    17,    18,    19,    11,    61,    62,    63,    20,
+    21,    22,    23,    24,    10,    27,    28,    31,    32,    33,
+    35,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+    46,    47,    48,    49,    50,    51,    52,    53,    54,    56,
+    58,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+    73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+    83,    84,    85,    86,    87,    88,    89,    90,    91,    92 ]
+
+racc_action_check = [
+     5,    10,    10,    56,    25,    25,     0,     1,     3,     4,
+    11,    12,    13,    14,    15,     5,    56,    56,    56,    16,
+    17,    18,    19,    20,    21,    22,    23,    27,    29,    31,
+    32,    34,    35,    36,    37,    39,    40,    41,    42,    43,
+    44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+    55,    58,    59,    64,    65,    66,    67,    68,    69,    70,
+    71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+    81,    82,    83,    84,    85,    86,    87,    89,    90,    91 ]
+
+racc_action_pointer = [
+   -10,     7,   nil,   -19,     9,   -11,   nil,   nil,   nil,   nil,
+   -26,   -17,   -17,     1,     1,   -22,     2,     3,    -8,    11,
+    -6,    13,    -6,   -11,   nil,    -7,   nil,    19,   nil,    24,
+   nil,    -3,     6,   nil,    18,    22,     5,    22,   nil,    23,
+     3,     7,    26,    27,    15,    12,    35,    15,    11,    34,
+    44,    18,    36,    31,   nil,    47,    -3,   nil,    24,    18,
+   nil,   nil,   nil,   nil,    41,    44,    25,    21,    45,    27,
+    44,    48,    33,    32,    51,    52,    60,    34,    38,    59,
+    36,    36,    59,    62,    68,    60,    68,    54,   nil,    43,
+    66,    56,   nil ]
+
+racc_action_default = [
+   -25,   -25,    -6,   -25,   -25,   -25,    -4,    93,    -1,    -5,
+   -25,   -25,    -2,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
+   -25,   -25,   -11,   -25,    -3,   -25,    -9,   -25,   -24,   -25,
+    -8,   -25,   -13,   -10,   -15,   -25,   -25,   -25,   -12,   -25,
+   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
+   -25,   -25,   -25,   -19,   -14,   -17,   -25,    -7,   -25,   -25,
+   -20,   -21,   -22,   -23,   -25,   -25,   -25,   -25,   -25,   -25,
+   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
+   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -16,   -25,
+   -25,   -25,   -18 ]
+
+racc_goto_table = [
+     9,     1,     2,     5,     8,    12,    25,    34,    36,    55,
+    57,    59,   nil,   nil,   nil,   nil,    26,   nil,   nil,   nil,
+    30 ]
+
+racc_goto_check = [
+     6,     1,     2,     3,     4,     5,     7,     8,     9,    10,
+    11,    12,   nil,   nil,   nil,   nil,     6,   nil,   nil,   nil,
+     6 ]
+
+racc_goto_pointer = [
+   nil,     1,     2,     1,    -1,    -1,    -5,   -15,   -25,   -26,
+   -44,   -45,   -45 ]
+
+racc_goto_default = [
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil ]
+
+racc_reduce_table = [
+  0, 0, :racc_error,
+  3, 39, :_reduce_1,
+  3, 40, :_reduce_none,
+  4, 43, :_reduce_none,
+  0, 43, :_reduce_none,
+  2, 41, :_reduce_5,
+  0, 41, :_reduce_6,
+  19, 44, :_reduce_7,
+  2, 45, :_reduce_none,
+  1, 45, :_reduce_none,
+  7, 44, :_reduce_none,
+  4, 44, :_reduce_none,
+  2, 46, :_reduce_none,
+  0, 46, :_reduce_none,
+  9, 47, :_reduce_none,
+  0, 47, :_reduce_none,
+  14, 49, :_reduce_none,
+  0, 49, :_reduce_none,
+  18, 48, :_reduce_none,
+  0, 48, :_reduce_none,
+  1, 50, :_reduce_none,
+  1, 50, :_reduce_none,
+  1, 50, :_reduce_none,
+  1, 50, :_reduce_none,
+  5, 42, :_reduce_none ]
+
+racc_reduce_n = 25
+
+racc_shift_n = 93
+
+racc_token_table = {
+  false => 0,
+  :error => 1,
+  :ALGORITHM => 2,
+  :BITMAP => 3,
+  :BLOCKS => 4,
+  :BYTE_UNIT => 5,
+  :CHECK => 6,
+  :CHUNK => 7,
+  :FAILED => 8,
+  :FINISH => 9,
+  :FLOAT => 10,
+  :IDENTIFIER => 11,
+  :INTEGER => 12,
+  :LEVEL => 13,
+  :MIN => 14,
+  :PAGES => 15,
+  :PERSONALITIES => 16,
+  :PERSONALITY => 17,
+  :PROGRESS => 18,
+  :RECOVERY => 19,
+  :RESHAPE => 20,
+  :RESYNC => 21,
+  :SPEED => 22,
+  :SPEED_UNIT => 23,
+  :SUPER => 24,
+  :UNIT => 25,
+  :UNUSED_DEVICES => 26,
+  ":" => 27,
+  "[" => 28,
+  "]" => 29,
+  "/" => 30,
+  "(" => 31,
+  ")" => 32,
+  "," => 33,
+  "=" => 34,
+  "%" => 35,
+  "<" => 36,
+  ">" => 37 }
+
+racc_nt_base = 38
+
+racc_use_result_var = true
+
+Racc_arg = [
+  racc_action_table,
+  racc_action_check,
+  racc_action_default,
+  racc_action_pointer,
+  racc_goto_table,
+  racc_goto_check,
+  racc_goto_default,
+  racc_goto_pointer,
+  racc_nt_base,
+  racc_reduce_table,
+  racc_token_table,
+  racc_shift_n,
+  racc_reduce_n,
+  racc_use_result_var ]
+
+Racc_token_to_s_table = [
+  "$end",
+  "error",
+  "ALGORITHM",
+  "BITMAP",
+  "BLOCKS",
+  "BYTE_UNIT",
+  "CHECK",
+  "CHUNK",
+  "FAILED",
+  "FINISH",
+  "FLOAT",
+  "IDENTIFIER",
+  "INTEGER",
+  "LEVEL",
+  "MIN",
+  "PAGES",
+  "PERSONALITIES",
+  "PERSONALITY",
+  "PROGRESS",
+  "RECOVERY",
+  "RESHAPE",
+  "RESYNC",
+  "SPEED",
+  "SPEED_UNIT",
+  "SUPER",
+  "UNIT",
+  "UNUSED_DEVICES",
+  "\":\"",
+  "\"[\"",
+  "\"]\"",
+  "\"/\"",
+  "\"(\"",
+  "\")\"",
+  "\",\"",
+  "\"=\"",
+  "\"%\"",
+  "\"<\"",
+  "\">\"",
+  "$start",
+  "target",
+  "personalities",
+  "devices",
+  "unused_devices",
+  "list_of_personalities",
+  "device",
+  "list_of_devices",
+  "super",
+  "level",
+  "progress",
+  "bitmap",
+  "progress_action" ]
+
+Racc_debug_parser = false
+
+##### State transition tables end #####
+
+# reduce 0 omitted
+
+module_eval(<<'.,.,', 'mdstat_parser.y', 3)
+  def _reduce_1(val, _values, result)
+     result = val[1]
+    result
+  end
+.,.,
+
+# reduce 2 omitted
+
+# reduce 3 omitted
+
+# reduce 4 omitted
+
+module_eval(<<'.,.,', 'mdstat_parser.y', 10)
+  def _reduce_5(val, _values, result)
+     result = val[0].merge(val[1])
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mdstat_parser.y', 11)
+  def _reduce_6(val, _values, result)
+     result = {}
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mdstat_parser.y', 13)
+  def _reduce_7(val, _values, result)
+     result = { val[0][:value] => val[15][:value] }
+    result
+  end
+.,.,
+
+# reduce 8 omitted
+
+# reduce 9 omitted
+
+# reduce 10 omitted
+
+# reduce 11 omitted
+
+# reduce 12 omitted
+
+# reduce 13 omitted
+
+# reduce 14 omitted
+
+# reduce 15 omitted
+
+# reduce 16 omitted
+
+# reduce 17 omitted
+
+# reduce 18 omitted
+
+# reduce 19 omitted
+
+# reduce 20 omitted
+
+# reduce 21 omitted
+
+# reduce 22 omitted
+
+# reduce 23 omitted
+
+# reduce 24 omitted
+
+def _reduce_none(val, _values, result)
+  val[0]
+end
+
+    end   # class MdstatParser
+  end   # module Tools
+end   # module Riemann

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

@@ -9,45 +9,52 @@ require 'racc/parser.rb'
 
 require 'strscan'
 
+require 'riemann/tools/utils'
+
 module Riemann
   module Tools
     class UptimeParser < Racc::Parser
 
-module_eval(<<'...end uptime_parser.y/module_eval...', 'uptime_parser.y', 43)
+module_eval(<<'...end uptime_parser.y/module_eval...', 'uptime_parser.y', 45)
 
   def parse(text)
-    s = StringScanner.new(text)
-    @tokens = []
+    s = Utils::StringTokenizer.new(text)
 
     until s.eos? do
       case
-      when s.scan(/\n/)              then # ignore
-      when s.scan(/\s+/)             then # ignore
-
-      when s.scan(/:/)               then @tokens << [':', s.matched]
-      when s.scan(/,/)               then @tokens << [',', s.matched]
-      when s.scan(/\d+[,.]\d+/)      then @tokens << [:FLOAT, s.matched.sub(',', '.').to_f]
-      when s.scan(/\d+/)             then @tokens << [:INTEGER, s.matched.to_i]
-      when s.scan(/AM/)              then @tokens << [:AM, s.matched]
-      when s.scan(/PM/)              then @tokens << [:PM, s.matched]
-      when s.scan(/up/)              then @tokens << [:UP, s.matched]
-      when s.scan(/days?/)           then @tokens << [:DAYS, s.matched]
-      when s.scan(/hrs?/)            then @tokens << [:HRS, s.matched]
-      when s.scan(/mins?/)           then @tokens << [:MINS, s.matched]
-      when s.scan(/secs?/)           then @tokens << [:SECS, s.matched]
-      when s.scan(/users?/)          then @tokens << [:USERS, s.matched]
-      when s.scan(/load averages?:/) then @tokens << [:LOAD_AVERAGES, s.matched]
+      when s.scan(/\n/)              then s.push_token(nil)
+      when s.scan(/\s+/)             then s.push_token(nil)
+
+      when s.scan(/:/)               then s.push_token(':')
+      when s.scan(/,/)               then s.push_token(',')
+      when s.scan(/\d+[,.]\d+/)      then s.push_token(:FLOAT, s.matched.sub(',', '.').to_f)
+      when s.scan(/\d+/)             then s.push_token(:INTEGER, s.matched.to_i)
+      when s.scan(/AM/)              then s.push_token(:AM)
+      when s.scan(/PM/)              then s.push_token(:PM)
+      when s.scan(/up/)              then s.push_token(:UP)
+      when s.scan(/days?/)           then s.push_token(:DAYS)
+      when s.scan(/hrs?/)            then s.push_token(:HRS)
+      when s.scan(/mins?/)           then s.push_token(:MINS)
+      when s.scan(/secs?/)           then s.push_token(:SECS)
+      when s.scan(/users?/)          then s.push_token(:USERS)
+      when s.scan(/load averages?:/) then s.push_token(:LOAD_AVERAGES)
       else
-        raise s.rest
+        raise s.unexpected_token
       end
     end
 
+    @tokens = s.tokens
+
     do_parse
   end
 
   def next_token
     @tokens.shift
   end
+
+  def on_error(error_token_id, error_value, value_stack)
+    raise(Racc::ParseError, "parse error on value \"#{error_value[:value]}\" (#{token_to_str(error_token_id)}) on line #{error_value[:lineno]}:\n#{error_value[:line]}\n#{' ' * error_value[:pos]}^#{'~' * (error_value[:value].to_s.length - 1)}")
+  end
 ...end uptime_parser.y/module_eval...
 ##### State transition tables begin ###
 
@@ -113,7 +120,7 @@ racc_reduce_table = [
   2, 23, :_reduce_16,
   2, 24, :_reduce_17,
   2, 25, :_reduce_18,
-  2, 19, :_reduce_none,
+  2, 19, :_reduce_19,
   4, 20, :_reduce_20,
   6, 20, :_reduce_21 ]
 
@@ -265,51 +272,56 @@ module_eval(<<'.,.,', 'uptime_parser.y', 18)
 
 module_eval(<<'.,.,', 'uptime_parser.y', 20)
   def _reduce_14(val, _values, result)
-     result = val[0] * 86400
+     result = val[0][:value] * 86400
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'uptime_parser.y', 22)
   def _reduce_15(val, _values, result)
-     result = val[0] * 3600 + val[2] * 60
+     result = val[0][:value] * 3600 + val[2][:value] * 60
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'uptime_parser.y', 24)
   def _reduce_16(val, _values, result)
-     result = val[0] * 3600
+     result = val[0][:value] * 3600
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'uptime_parser.y', 26)
   def _reduce_17(val, _values, result)
-     result = val[0] * 60
+     result = val[0][:value] * 60
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'uptime_parser.y', 28)
   def _reduce_18(val, _values, result)
-     result = val[0]
+     result = val[0][:value]
     result
   end
 .,.,
 
-# reduce 19 omitted
+module_eval(<<'.,.,', 'uptime_parser.y', 30)
+  def _reduce_19(val, _values, result)
+     result = val[0][:value]
+    result
+  end
+.,.,
 
 module_eval(<<'.,.,', 'uptime_parser.y', 32)
   def _reduce_20(val, _values, result)
-     result = { 1 => val[1], 5 => val[2], 15 => val[3] }
+     result = { 1 => val[1][:value], 5 => val[2][:value], 15 => val[3][:value] }
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'uptime_parser.y', 33)
   def _reduce_21(val, _values, result)
-     result = { 1 => val[1], 5 => val[3], 15 => val[5] }
+     result = { 1 => val[1][:value], 5 => val[3][:value], 15 => val[5][:value] }
     result
   end
 .,.,

data/lib/riemann/tools/utils.rb

@@ -3,6 +3,54 @@
 module Riemann
   module Tools
     module Utils # :nodoc:
+      class StringTokenizer
+        attr_reader :tokens
+
+        def initialize(text)
+          @scanner = StringScanner.new(text)
+
+          @lineno = 1
+          @pos = 0
+          @line = next_line
+          @tokens = []
+        end
+
+        def scan(expression)
+          @scanner.scan(expression)
+        end
+
+        def eos?
+          @scanner.eos?
+        end
+
+        def matched
+          @scanner.matched
+        end
+
+        def next_line
+          (@scanner.check_until(/\n/) || @scanner.rest).chomp
+        end
+
+        def push_token(token, value = nil)
+          value ||= @scanner.matched
+
+          if value == "\n"
+            @lineno += 1
+            @line = next_line
+            @pos = pos = 0
+          else
+            pos = @pos
+            @pos += @scanner.matched.length
+          end
+
+          @tokens << [token, { value: value, line: @line, lineno: @lineno, pos: pos }] if token
+        end
+
+        def unexpected_token
+          raise(Racc::ParseError, "unexpected data on line #{@lineno}:\n#{@line}\n#{' ' * @pos}^")
+        end
+      end
+
       def reverse_numeric_sort_with_header(data, header: 1, count: 10)
         lines = data.chomp.split("\n")
         header = lines.shift(header)

data/lib/riemann/tools/version.rb

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

data/lib/riemann/tools/zpool.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'open3'
+
+require 'riemann/tools'
+
+module Riemann
+  module Tools
+    class Zpool
+      include Riemann::Tools
+
+      def tick
+        output, status = Open3.capture2e('zpool status -x')
+
+        state = if status.success?
+                  case output
+                  when "all pools are healthy\n" then 'ok'
+                  when /state: (DEGRADED|FAULTED)/ then 'critical'
+                  else
+                    'warning'
+                  end
+                else
+                  'critical'
+                end
+
+        report(
+          service: 'zpool health',
+          description: output,
+          state: state,
+        )
+      rescue Errno::ENOENT => e
+        report(
+          service: 'zpool health',
+          description: e.message,
+          state: 'critical',
+        )
+      end
+    end
+  end
+end

data/riemann-tools.gemspec

@@ -24,8 +24,14 @@ Gem::Specification.new do |spec|
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } -
-      ['lib/riemann/tools/uptime_parser.y'] +
-      ['lib/riemann/tools/uptime_parser.tab.rb']
+      [
+        'lib/riemann/tools/mdstat_parser.y',
+        'lib/riemann/tools/uptime_parser.y',
+      ] +
+      [
+        'lib/riemann/tools/mdstat_parser.tab.rb',
+        'lib/riemann/tools/uptime_parser.tab.rb',
+      ]
   end
   spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -172,6 +172,7 @@ executables:
 - riemann-haproxy
 - riemann-health
 - riemann-kvminstance
+- riemann-md
 - riemann-memcached
 - riemann-net
 - riemann-nginx-status
@@ -181,6 +182,7 @@ executables:
 - riemann-varnish
 - riemann-wrapper
 - riemann-zookeeper
+- riemann-zpool
 extensions: []
 extra_rdoc_files: []
 files:
@@ -212,6 +214,7 @@ files:
 - bin/riemann-haproxy
 - bin/riemann-health
 - bin/riemann-kvminstance
+- bin/riemann-md
 - bin/riemann-memcached
 - bin/riemann-net
 - bin/riemann-nginx-status
@@ -221,6 +224,7 @@ files:
 - bin/riemann-varnish
 - bin/riemann-wrapper
 - bin/riemann-zookeeper
+- bin/riemann-zpool
 - lib/riemann/tools.rb
 - lib/riemann/tools/apache_status.rb
 - lib/riemann/tools/bench.rb
@@ -234,6 +238,8 @@ files:
 - lib/riemann/tools/haproxy.rb
 - lib/riemann/tools/health.rb
 - lib/riemann/tools/kvm.rb
+- lib/riemann/tools/md.rb
+- lib/riemann/tools/mdstat_parser.tab.rb
 - lib/riemann/tools/memcached.rb
 - lib/riemann/tools/net.rb
 - lib/riemann/tools/nginx_status.rb
@@ -246,6 +252,7 @@ files:
 - lib/riemann/tools/varnish.rb
 - lib/riemann/tools/version.rb
 - lib/riemann/tools/zookeeper.rb
+- lib/riemann/tools/zpool.rb
 - riemann-tools.gemspec
 - tools/riemann-aws/LICENSE
 - tools/riemann-aws/README.md