riemann-tools 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce2307f0dfeaad07e9b904c5f0edf2b0d7a586507c94e8ffb2ff9e3ccf6b3c6f
-  data.tar.gz: 8178becee10569b018dfdb54693cfa9e5c5a61dfe62ecdec7ca257004e2365ff
+  metadata.gz: e201bab60a1f457d506ec890d20bbda78e7229fba76acbae599b85c7d366a07b
+  data.tar.gz: 522750b32f5002d8fd799f95a4686eb576d63723781269fb489dd23da5567c22
 SHA512:
-  metadata.gz: 7588c24abd5c87eb95ced867cc23350697ef893463e939a47c481518209a386c2b0a56e93e9d470e2fe1d9d0a78fa01d5b8d0e3f6af265d014072a00cf44570d
-  data.tar.gz: 54bd9df700e67ee112e856e6104018bac1ad54444533186cdd2425416fa2ab9a0939c5bfd7de5446045d4813c9a8fac5e34db9d997ea841c9665ae97f7224b95
+  metadata.gz: 7e1634227dddcdd7f4223489f1193ab45168572143fae011790bc811ec346cb21743722b5a068337f8a612a0c20ea76769f7af739d74c242a9d043ec8749b625
+  data.tar.gz: 0c761697583bd243ea1788877a63ea21decdb25012bd52d59e109165e2e76efde3c11299c60b81aa8a0442fb3482957f06539074ea5cb56fb1d5b698994ddf11

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -32,7 +32,7 @@ jobs:
           - 3.0
           - 3.1
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [v1.6.0](https://github.com/riemann/riemann-tools/tree/v1.6.0) (2022-11-04)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.5.0...v1.6.0)
+
+**Implemented enhancements:**
+
+- Add `riemann-http-check` to monitor HTTP\(S\) resources [\#248](https://github.com/riemann/riemann-tools/pull/248) ([smortex](https://github.com/smortex))
+- Add FreeBSD support to `riemann-net` [\#247](https://github.com/riemann/riemann-tools/pull/247) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix `riemann-health` detection of `df` header [\#246](https://github.com/riemann/riemann-tools/pull/246) ([smortex](https://github.com/smortex))
+- Fix/Improve `riemann-md` mdstat parser [\#245](https://github.com/riemann/riemann-tools/pull/245) ([smortex](https://github.com/smortex))
+
 ## [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)

data/README.markdown

@@ -40,6 +40,7 @@ ship with the `riemann-tools` gem, including:
 * riemann-kvminstance - Monitor KVM instances.
 * riemann-ntp - Monitor NTP.
 * riemann-portcheck - Monitor open TCP ports.
+* riemann-http-check - Monitor reachability of HTTP(S) resources.
 
 Also contained in the repository are a number of stand-alone monitoring
 tools, which are shipped as separate gems.

data/bin/riemann-http-check

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+Process.setproctitle($PROGRAM_NAME)
+
+require 'riemann/tools/http_check'
+
+raise("Ruby #{Riemann::Tools::HttpCheck::REQUIRED_RUBY_VERSION} or better is required for using riemann-http-check") unless Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(Riemann::Tools::HttpCheck::REQUIRED_RUBY_VERSION)
+
+Riemann::Tools::HttpCheck.run

data/lib/riemann/tools/bench.rb

@@ -2,7 +2,6 @@
 
 require 'rubygems'
 require 'riemann/client'
-require 'pp'
 
 # Connects to a server (first arg) and populates it with a constant stream of
 # events for testing.

data/lib/riemann/tools/health.rb

@@ -387,9 +387,8 @@ module Riemann
       end
 
       def disk
-        df.split(/\n/).each do |r|
+        df.lines[1..].each do |r|
           f = r.split(/\s+/)
-          next if f[0] == 'Filesystem'
 
           # Calculate capacity
           used = f[2].to_i

data/lib/riemann/tools/http_check.rb

@@ -0,0 +1,208 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'resolv'
+require 'socket'
+
+require 'riemann/tools'
+
+# Test for HTTP requests
+module Riemann
+  module Tools
+    class HttpCheck
+      REQUIRED_RUBY_VERSION = '2.7.0'
+
+      include Riemann::Tools
+
+      opt :uri, 'URI to fetch', short: :none, type: :strings, default: ['http://localhost']
+      opt :response, 'Expected response codes', short: :none, type: :strings, default: [
+        '200', # OK
+        '301', # Moved Permanently
+        '401', # Unauthorized
+      ]
+      opt :connection_latency_warning, 'Lattency warning threshold', short: :none, default: 0.1
+      opt :connection_latency_critical, 'Lattency critical threshold', short: :none, default: 0.25
+      opt :response_latency_warning, 'Lattency warning threshold', short: :none, default: 0.5
+      opt :response_latency_critical, 'Lattency critical threshold', short: :none, default: 1.0
+      opt :http_timeout, 'Timeout (in seconds) for HTTP requests', short: :none, default: 5.0
+      opt :checks, 'A list of checks to run.', short: :none, type: :strings, default: %w[consistency connection-latency response-code response-latency]
+
+      def tick
+        opts[:uri].each do |uri|
+          test_uri(uri)
+        end
+      end
+
+      def test_uri(uri)
+        uri = URI(uri)
+
+        request = ::Net::HTTP::Get.new(uri)
+        request.basic_auth(uri.user, uri.password)
+
+        responses = []
+
+        with_each_address(uri.host) do |address|
+          responses << test_uri_address(uri, address, request)
+        end
+
+        responses.compact!
+
+        return unless opts[:checks].include?('consistency')
+
+        raise StandardError, "Could not get any response from #{uri.host}" unless responses.any?
+
+        uniq_code = responses.map(&:code).uniq
+        uniq_body = responses.map(&:body).uniq
+
+        issues = []
+        issues << "#{uniq_code.count} different response code" unless uniq_code.one?
+        issues << "#{uniq_body.count} different response body" unless uniq_body.one?
+
+        if issues.none?
+          state = 'ok'
+          description = "consistent response on all #{responses.count} endpoints"
+        else
+          state = 'critical'
+          description = "#{issues.join(' and ')} on #{responses.count} endpoints"
+        end
+
+        report(
+          service: service(uri, 'consistency'),
+          state: state,
+          description: description,
+          hostname: uri.host,
+          port: uri.port,
+        )
+      rescue StandardError => e
+        report(
+          service: service(uri, 'consistency'),
+          state: 'critical',
+          description: e.message,
+          hostname: uri.host,
+          port: uri.port,
+        )
+      end
+
+      def test_uri_address(uri, address, request)
+        response = nil
+
+        start = Time.now
+        connected = nil
+        done = nil
+
+        http = nil
+        begin
+          Timeout.timeout(opts[:http_timeout]) do
+            http = ::Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https', verify_mode: OpenSSL::SSL::VERIFY_NONE, ipaddr: address)
+            connected = Time.now
+            response = http.request(request)
+          end
+        rescue Timeout::Error
+          # Ignore
+        else
+          done = Time.now
+        ensure
+          http&.finish
+        end
+
+        report_http_endpoint_response_code(http, uri, response) if opts[:checks].include?('response-code')
+        report_http_endpoint_latency(http, uri, 'connection', start, connected) if opts[:checks].include?('connection-latency')
+        report_http_endpoint_latency(http, uri, 'response', start, done) if opts[:checks].include?('response-latency')
+
+        response
+      rescue StandardError
+        # Ignore this address
+        nil
+      end
+
+      def with_each_address(host, &block)
+        addresses = Resolv::DNS.new.getaddresses(host)
+        if addresses.empty?
+          host = host[1...-1] if host[0] == '[' && host[-1] == ']'
+          addresses << IPAddr.new(host)
+        end
+
+        addresses.each do |address|
+          block.call(address.to_s)
+        end
+      end
+
+      def report_http_endpoint_response_code(http, uri, response)
+        return unless response
+
+        report(
+          {
+            state: response_code_state(response.code),
+            metric: response.code.to_i,
+            description: "#{response.code} #{response.message}",
+          }.merge(endpoint_report(http, uri, 'response code')),
+        )
+      end
+
+      def response_code_state(code)
+        opts[:response].include?(code) ? 'ok' : 'critical'
+      end
+
+      def report_http_endpoint_latency(http, uri, latency, start, stop)
+        if stop
+          metric = stop - start
+          report(
+            {
+              state: latency_state(latency, metric),
+              metric: metric,
+              description: format('%.3f ms', metric * 1000),
+            }.merge(endpoint_report(http, uri, "#{latency} latency")),
+          )
+        else
+          report(
+            {
+              state: 'critical',
+              description: 'timeout',
+            }.merge(endpoint_report(http, uri, "#{latency} latency")),
+          )
+        end
+      end
+
+      def latency_state(name, latency)
+        if latency > opts["#{name}_latency_critical".to_sym]
+          'critical'
+        elsif latency > opts["#{name}_latency_warning".to_sym]
+          'warning'
+        else
+          'ok'
+        end
+      end
+
+      def endpoint_report(http, uri, service)
+        {
+          service: endpoint_service(http, uri, service),
+          hostname: uri.host,
+          address: http.ipaddr,
+          port: uri.port,
+        }
+      end
+
+      def endpoint_service(http, uri, service)
+        "get #{redact_uri(uri)} #{endpoint_name(IPAddr.new(http.ipaddr), http.port)} #{service}"
+      end
+
+      def service(uri, service)
+        "get #{redact_uri(uri)} #{service}"
+      end
+
+      def redact_uri(uri)
+        reported_uri = uri.dup
+        reported_uri.password = '**redacted**' if reported_uri.password
+        reported_uri
+      end
+
+      def endpoint_name(address, port)
+        if address.ipv6?
+          "[#{address}]:#{port}"
+        else
+          "#{address}:#{port}"
+        end
+      end
+    end
+  end
+end

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

@@ -15,53 +15,59 @@ module Riemann
   module Tools
     class MdstatParser < Racc::Parser
 
-module_eval(<<'...end mdstat_parser.y/module_eval...', 'mdstat_parser.y', 49)
+module_eval(<<'...end mdstat_parser.y/module_eval...', 'mdstat_parser.y', 58)
 
   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(/\n/)               then s.push_token(nil)
+      when s.scan(/\s+/)              then s.push_token(nil)
+
+      when s.scan(/\([WJFSR]\)/)      then s.push_token(:DISK_STATUS)
+      when s.scan(/<none>/)           then s.push_token(:NONE)
+
+      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(/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)
+      when s.scan(/PENDING\b/)        then s.push_token(:PENDING)
+      when s.scan(/Personalities :/)  then s.push_token(:PERSONALITIES)
+      when s.scan(/REMOTE\b/)         then s.push_token(:REMOTE)
+      when s.scan(/algorithm\b/)      then s.push_token(:ALGORITHM)
+      when s.scan(/bitmap\b/)         then s.push_token(:BITMAP)
+      when s.scan(/blocks\b/)         then s.push_token(:BLOCKS)
+      when s.scan(/check\b/)          then s.push_token(:CHECK)
+      when s.scan(/chunk\b/)          then s.push_token(:CHUNK)
+      when s.scan(/finish\b/)         then s.push_token(:FINISH)
+      when s.scan(/k\b/)              then s.push_token(:UNIT)
+      when s.scan(/level\b/)          then s.push_token(:LEVEL)
+      when s.scan(/min\b/)            then s.push_token(:MIN)
+      when s.scan(/pages\b/)          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)
+      when s.scan(/recover\b/)        then s.push_token(:RECOVER)
+      when s.scan(/recovery\b/)       then s.push_token(:RECOVERY)
+      when s.scan(/reshape\b/)        then s.push_token(:RESHAPE)
+      when s.scan(/resync\b/)         then s.push_token(:RESYNC)
+      when s.scan(/speed\b/)          then s.push_token(:SPEED)
+      when s.scan(/super\b/)          then s.push_token(:SUPER)
+      when s.scan(/unused devices:/)  then s.push_token(:UNUSED_DEVICES)
+
+      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(/\w+/)              then s.push_token(:IDENTIFIER)
       else
         s.unexpected_token
       end
@@ -83,97 +89,109 @@ module_eval(<<'...end mdstat_parser.y/module_eval...', 'mdstat_parser.y', 49)
 ##### 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 ]
+    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 ]
 
 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 ]
+    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 ]
 
 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 ]
+    -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 ]
 
 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 ]
+   -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 ]
 
 racc_goto_table = [
-     9,     1,     2,     5,     8,    12,    25,    34,    36,    55,
-    57,    59,   nil,   nil,   nil,   nil,    26,   nil,   nil,   nil,
-    30 ]
+     9,     1,     2,     5,     8,     6,    25,    31,    33,    52,
+    57,    59,    16,   nil,   nil,   nil,   nil,   nil,    26,   nil,
+    29 ]
 
 racc_goto_check = [
      6,     1,     2,     3,     4,     5,     7,     8,     9,    10,
-    11,    12,   nil,   nil,   nil,   nil,     6,   nil,   nil,   nil,
+    11,    12,    13,   nil,   nil,   nil,   nil,   nil,     6,   nil,
      6 ]
 
 racc_goto_pointer = [
-   nil,     1,     2,     1,    -1,    -1,    -5,   -15,   -25,   -26,
-   -44,   -45,   -45 ]
+   nil,     1,     2,     1,    -1,     2,    -5,   -17,   -23,   -23,
+   -41,   -42,   -42,     1 ]
 
 racc_goto_default = [
    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, 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,
+  3, 42, :_reduce_1,
+  2, 43, :_reduce_none,
+  4, 46, :_reduce_none,
   0, 46, :_reduce_none,
-  9, 47, :_reduce_none,
-  0, 47, :_reduce_none,
-  14, 49, :_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,
+  4, 47, :_reduce_none,
+  2, 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 ]
+  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,
+  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 = 25
+racc_reduce_n = 33
 
-racc_shift_n = 93
+racc_shift_n = 101
 
 racc_token_table = {
   false => 0,
@@ -184,38 +202,41 @@ racc_token_table = {
   :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
+  :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
 
 racc_use_result_var = true
 
@@ -244,18 +265,23 @@ Racc_token_to_s_table = [
   "BYTE_UNIT",
   "CHECK",
   "CHUNK",
-  "FAILED",
+  "DELAYED",
+  "DISK_STATUS",
   "FINISH",
   "FLOAT",
   "IDENTIFIER",
   "INTEGER",
   "LEVEL",
   "MIN",
+  "NONE",
   "PAGES",
   "PERSONALITIES",
   "PERSONALITY",
+  "PENDING",
   "PROGRESS",
+  "RECOVER",
   "RECOVERY",
+  "REMOTE",
   "RESHAPE",
   "RESYNC",
   "SPEED",
@@ -263,17 +289,15 @@ Racc_token_to_s_table = [
   "SUPER",
   "UNIT",
   "UNUSED_DEVICES",
-  "\":\"",
   "\"[\"",
   "\"]\"",
+  "\":\"",
   "\"/\"",
-  "\"(\"",
-  "\")\"",
   "\",\"",
   "\"=\"",
   "\"%\"",
-  "\"<\"",
-  "\">\"",
+  "\"(\"",
+  "\")\"",
   "$start",
   "target",
   "personalities",
@@ -286,7 +310,8 @@ Racc_token_to_s_table = [
   "level",
   "progress",
   "bitmap",
-  "progress_action" ]
+  "progress_action",
+  "identifiers" ]
 
 Racc_debug_parser = false
 
@@ -362,6 +387,22 @@ module_eval(<<'.,.,', 'mdstat_parser.y', 13)
 
 # reduce 24 omitted
 
+# reduce 25 omitted
+
+# reduce 26 omitted
+
+# reduce 27 omitted
+
+# reduce 28 omitted
+
+# reduce 29 omitted
+
+# reduce 30 omitted
+
+# reduce 31 omitted
+
+# reduce 32 omitted
+
 def _reduce_none(val, _values, result)
   val[0]
 end

data/lib/riemann/tools/net.rb

@@ -9,7 +9,7 @@ module Riemann
       include Riemann::Tools
 
       opt :interfaces, 'Interfaces to monitor', type: :strings, default: nil
-      opt :ignore_interfaces, 'Interfaces to ignore', type: :strings, default: ['lo']
+      opt :ignore_interfaces, 'Interfaces to ignore', type: :strings, default: ['\Alo\d*\z']
 
       def initialize
         @old_state = nil
@@ -19,9 +19,54 @@ module Riemann
                         []
                       end
         @ignore_interfaces = opts[:ignore_interfaces].reject(&:empty?).map(&:dup)
+
+        ostype = `uname -s`.chomp.downcase
+        case ostype
+        when 'freebsd'
+          @state = method :freebsd_state
+        else
+          puts "WARNING: OS '#{ostype}' not explicitly supported. Falling back to Linux" unless ostype == 'linux'
+          @state = method :linux_state
+        end
+      end
+
+      def report_interface?(iface)
+        if !@interfaces.empty?
+          @interfaces.any? { |pattern| iface.match?(pattern) }
+        else
+          @ignore_interfaces.none? { |pattern| iface.match?(pattern) }
+        end
+      end
+
+      FREEBSD_MAPPING = {
+        'collisions'       => 'tx colls',
+        'dropped-packets'  => 'rx drop',
+        'received-bytes'   => 'rx bytes',
+        'received-packets' => 'rx packets',
+        'received-errors'  => 'rx errs',
+        'sent-bytes'       => 'tx bytes',
+        'sent-packets'     => 'tx packets',
+        'send-errors'      => 'tx errs',
+      }.freeze
+
+      def freebsd_state
+        require 'json'
+
+        state = {}
+
+        all_stats = JSON.parse(`netstat -inb --libxo=json`)
+        all_stats.dig('statistics', 'interface').select { |s| s['mtu'] }.each do |interface_stats|
+          next unless report_interface?(interface_stats['name'])
+
+          FREEBSD_MAPPING.each do |key, service|
+            state["#{interface_stats['name']} #{service}"] = interface_stats[key]
+          end
+        end
+
+        state
       end
 
-      def state
+      def linux_state
         f = File.read('/proc/net/dev')
         state = {}
         f.split("\n").each do |line|
@@ -29,8 +74,7 @@ module Riemann
 
           iface = Regexp.last_match(1)
 
-          next unless @interfaces.empty? || @interfaces.any? { |pattern| iface.match?(pattern) }
-          next if @ignore_interfaces.any? { |pattern| iface.match?(pattern) }
+          next unless report_interface?(iface)
 
           ['rx bytes',
            'rx packets',
@@ -60,7 +104,7 @@ module Riemann
       end
 
       def tick
-        state = self.state
+        state = @state.call
 
         if @old_state
           # Report services from `@old_state` that don't exist in `state` as expired

data/lib/riemann/tools/version.rb

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

data/riemann-tools.gemspec

@@ -48,4 +48,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'sinatra'
+  spec.add_development_dependency 'webrick'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Kyle Kingsbury
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -156,6 +156,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Collection of utilities which submit events to Riemann,
 email:
 - aphyr@aphyr.com
@@ -171,6 +199,7 @@ executables:
 - riemann-freeswitch
 - riemann-haproxy
 - riemann-health
+- riemann-http-check
 - riemann-kvminstance
 - riemann-md
 - riemann-memcached
@@ -213,6 +242,7 @@ files:
 - bin/riemann-freeswitch
 - bin/riemann-haproxy
 - bin/riemann-health
+- bin/riemann-http-check
 - bin/riemann-kvminstance
 - bin/riemann-md
 - bin/riemann-memcached
@@ -237,6 +267,7 @@ files:
 - lib/riemann/tools/freeswitch.rb
 - lib/riemann/tools/haproxy.rb
 - lib/riemann/tools/health.rb
+- lib/riemann/tools/http_check.rb
 - lib/riemann/tools/kvm.rb
 - lib/riemann/tools/md.rb
 - lib/riemann/tools/mdstat_parser.tab.rb
@@ -321,7 +352,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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -336,8 +367,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.3.23
+signing_key:
 specification_version: 4
 summary: Utilities which submit events to Riemann.
 test_files: []