riemann-tools 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e201bab60a1f457d506ec890d20bbda78e7229fba76acbae599b85c7d366a07b
-  data.tar.gz: 522750b32f5002d8fd799f95a4686eb576d63723781269fb489dd23da5567c22
+  metadata.gz: ad07110215b87b2b1128127294c855149bbdd0e96623c8aaaedfc7b34434994c
+  data.tar.gz: 5957f98f865a20456a063a72e293e1af2a8dfa73d7a898fb319e1485853c5313
 SHA512:
-  metadata.gz: 7e1634227dddcdd7f4223489f1193ab45168572143fae011790bc811ec346cb21743722b5a068337f8a612a0c20ea76769f7af739d74c242a9d043ec8749b625
-  data.tar.gz: 0c761697583bd243ea1788877a63ea21decdb25012bd52d59e109165e2e76efde3c11299c60b81aa8a0442fb3482957f06539074ea5cb56fb1d5b698994ddf11
+  metadata.gz: 51b9c2da5e9cc9e334903c53e086e9df1dac212dc57d5fd02d9dc234a842296eaaf433eb99b787dd618b2fa839969a44b0e2da5ede1a2b4fcc0bfb2251cbf5fb
+  data.tar.gz: a5904b787d46c07d16a581a37fc3c2561c96c858d475d4e855e3119294464f6a530a5f5e885b3910660b9678a15e085183eaefcef6ae268b2dcc5c253e18fbd0

data/.github/workflows/ci.yml

@@ -31,6 +31,7 @@ jobs:
           - 2.7
           - 3.0
           - 3.1
+          - 3.2
     steps:
       - uses: actions/checkout@v3
       - name: Setup Ruby

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [v1.7.0](https://github.com/riemann/riemann-tools/tree/v1.7.0) (2023-01-11)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.6.0...v1.7.0)
+
+**Implemented enhancements:**
+
+- Override default HTTP User-Agent and make it tuneable [\#257](https://github.com/riemann/riemann-tools/pull/257) ([smortex](https://github.com/smortex))
+- Allow opting out of `riemann-http-check` latency state [\#255](https://github.com/riemann/riemann-tools/pull/255) ([smortex](https://github.com/smortex))
+- Speed-up `riemann-http-check` with resolver and worker threads [\#254](https://github.com/riemann/riemann-tools/pull/254) ([smortex](https://github.com/smortex))
+- Allow mdstat device filtering [\#252](https://github.com/riemann/riemann-tools/pull/252) ([smortex](https://github.com/smortex))
+- Report mdstat health by device [\#251](https://github.com/riemann/riemann-tools/pull/251) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix `riemann-http-check` with unresolvable domains [\#256](https://github.com/riemann/riemann-tools/pull/256) ([smortex](https://github.com/smortex))
+
 ## [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)

data/lib/riemann/tools/apache_status.rb

@@ -14,9 +14,10 @@ module Riemann
       require 'uri'
 
       opt :uri, 'Apache Server Status URI', default: 'http://localhost/server-status'
+      opt :user_agent, 'User-Agent header for HTTP requests', short: :none, default: "#{File.basename($PROGRAM_NAME)}/#{Riemann::Tools::VERSION} (+https://github.com/riemann/riemann-tools)"
 
       def initialize
-        @uri = "#{URI.parse(opts[:uri])}?auto"
+        @uri = URI.parse("#{opts[:uri]}?auto")
         # Sample Response with ExtendedStatus On
         # Total Accesses: 20643
         # Total kBytes: 36831
@@ -68,7 +69,7 @@ module Riemann
       def connection
         response = nil
         begin
-          response = ::Net::HTTP.get(@uri)
+          response = ::Net::HTTP.new(@uri.host, @uri.port).get(@uri, { 'user-agent' => opts[:user_agent] }).body
         rescue StandardError => e
           report(
             service: 'httpd health',

data/lib/riemann/tools/cloudant.rb

@@ -12,6 +12,7 @@ module Riemann
 
       opt :cloudant_username, 'Cloudant username', type: :string, required: true
       opt :cloudant_password, 'Cloudant pasword', type: :string, required: true
+      opt :user_agent, 'User-Agent header for HTTP requests', short: :none, default: "#{File.basename($PROGRAM_NAME)}/#{Riemann::Tools::VERSION} (+https://github.com/riemann/riemann-tools)"
 
       def tick
         json.each do |node|
@@ -46,7 +47,7 @@ module Riemann
         http = ::Net::HTTP.new('cloudant.com', 443)
         http.use_ssl = true
         http.start do |h|
-          get = ::Net::HTTP::Get.new('/api/load_balancer')
+          get = ::Net::HTTP::Get.new('/api/load_balancer', { 'user-agent' => opts[:user_agent] })
           get.basic_auth opts[:cloudant_username], opts[:cloudant_password]
           h.request get
         end

data/lib/riemann/tools/consul_health.rb

@@ -16,6 +16,7 @@ module Riemann
       opt :consul_port, 'Consul API Host (default to 8500)', default: '8500'
       opt :prefix, 'prefix to use for all service names when reporting', default: 'consul '
       opt :minimum_services_per_node, 'minimum services per node (default: 0)', default: 0
+      opt :user_agent, 'User-Agent header for HTTP requests', short: :none, default: "#{File.basename($PROGRAM_NAME)}/#{Riemann::Tools::VERSION} (+https://github.com/riemann/riemann-tools)"
 
       def initialize
         @hostname = opts[:consul_host]
@@ -43,7 +44,7 @@ module Riemann
       end
 
       def get(url)
-        ::Net::HTTP.get_response(url).body
+        ::Net::HTTP.new(url.host, url.port).get(url, { 'user-agent' => opts[:user_agent] }).body
       end
 
       def tick

data/lib/riemann/tools/diskstats.rb

@@ -17,7 +17,7 @@ module Riemann
       def state
         f = File.read('/proc/diskstats')
         state = f.split("\n").reject { |d| d =~ /(ram|loop)/ }.each_with_object({}) do |line, s|
-          next unless line =~ /^(?:\s+\d+){2}\s+([\w\d\-]+) (.*)$/
+          next unless line =~ /^(?:\s+\d+){2}\s+([\w\d-]+) (.*)$/
 
           dev = Regexp.last_match(1)
 

data/lib/riemann/tools/haproxy.rb

@@ -12,6 +12,7 @@ module Riemann
 
       opt :stats_url, 'Full url to haproxy stats (eg: https://user:password@host.com:9999/stats)', required: true,
                                                                                                    type: :string
+      opt :user_agent, 'User-Agent header for HTTP requests', short: :none, default: "#{File.basename($PROGRAM_NAME)}/#{Riemann::Tools::VERSION} (+https://github.com/riemann/riemann-tools)"
 
       def initialize
         @uri = URI("#{opts[:stats_url]};csv")
@@ -45,7 +46,7 @@ module Riemann
         http = ::Net::HTTP.new(@uri.host, @uri.port)
         http.use_ssl = true if @uri.scheme == 'https'
         res = http.start do |h|
-          get = ::Net::HTTP::Get.new(@uri.request_uri)
+          get = ::Net::HTTP::Get.new(@uri.request_uri, { 'user-agent' => opts[:user_agent] })
           unless @uri.userinfo.nil?
             userinfo = @uri.userinfo.split(':')
             get.basic_auth userinfo[0], userinfo[1]

data/lib/riemann/tools/http_check.rb

@@ -26,23 +26,86 @@ module Riemann
       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]
+      opt :resolvers, 'Run this number of resolver threads', short: :none, type: :integer, default: 5
+      opt :workers, 'Run this number of worker threads', short: :none, type: :integer, default: 20
+      opt :user_agent, 'User-Agent header for HTTP requests', short: :none, default: "#{File.basename($PROGRAM_NAME)}/#{Riemann::Tools::VERSION} (+https://github.com/riemann/riemann-tools)"
+
+      def initialize
+        @resolve_queue = Queue.new
+        @work_queue = Queue.new
+
+        opts[:resolvers].times do
+          Thread.new do
+            loop do
+              uri = @resolve_queue.pop
+              host = uri.host
+
+              addresses = Resolv::DNS.new.getaddresses(host)
+              if addresses.empty?
+                host = host[1...-1] if host[0] == '[' && host[-1] == ']'
+                begin
+                  addresses << IPAddr.new(host)
+                rescue IPAddr::InvalidAddressError
+                  # Ignore
+                end
+              end
+
+              @work_queue.push([uri, addresses])
+            end
+          end
+        end
+
+        opts[:workers].times do
+          Thread.new do
+            loop do
+              uri, addresses = @work_queue.pop
+              test_uri_addresses(uri, addresses)
+            end
+          end
+        end
+
+        super
+      end
 
       def tick
+        report(
+          service: 'riemann http-check resolvers utilization',
+          metric: (opts[:resolvers].to_f - @resolve_queue.num_waiting) / opts[:resolvers],
+          state: @resolve_queue.num_waiting.positive? ? 'ok' : 'critical',
+          tags: %w[riemann],
+        )
+        report(
+          service: 'riemann http-check resolvers saturation',
+          metric: @resolve_queue.length,
+          state: @resolve_queue.empty? ? 'ok' : 'critical',
+          tags: %w[riemann],
+        )
+        report(
+          service: 'riemann http-check workers utilization',
+          metric: (opts[:workers].to_f - @work_queue.num_waiting) / opts[:workers],
+          state: @work_queue.num_waiting.positive? ? 'ok' : 'critical',
+          tags: %w[riemann],
+        )
+        report(
+          service: 'riemann http-check workers saturation',
+          metric: @work_queue.length,
+          state: @work_queue.empty? ? 'ok' : 'critical',
+          tags: %w[riemann],
+        )
+
         opts[:uri].each do |uri|
-          test_uri(uri)
+          @resolve_queue.push(URI(uri))
         end
       end
 
-      def test_uri(uri)
-        uri = URI(uri)
-
-        request = ::Net::HTTP::Get.new(uri)
+      def test_uri_addresses(uri, addresses)
+        request = ::Net::HTTP::Get.new(uri, { 'user-agent' => opts[:user_agent] })
         request.basic_auth(uri.user, uri.password)
 
         responses = []
 
-        with_each_address(uri.host) do |address|
-          responses << test_uri_address(uri, address, request)
+        addresses.each do |address|
+          responses << test_uri_address(uri, address.to_s, request)
         end
 
         responses.compact!
@@ -115,18 +178,6 @@ module Riemann
         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
 
@@ -156,7 +207,7 @@ module Riemann
         else
           report(
             {
-              state: 'critical',
+              state: latency_state(latency, nil),
               description: 'timeout',
             }.merge(endpoint_report(http, uri, "#{latency} latency")),
           )
@@ -164,9 +215,14 @@ module Riemann
       end
 
       def latency_state(name, latency)
-        if latency > opts["#{name}_latency_critical".to_sym]
+        critical_threshold = opts["#{name}_latency_critical".to_sym]
+        warning_threshold = opts["#{name}_latency_warning".to_sym]
+
+        return if critical_threshold.zero? || warning_threshold.zero?
+
+        if latency.nil? || latency > critical_threshold
           'critical'
-        elsif latency > opts["#{name}_latency_warning".to_sym]
+        elsif latency > warning_threshold
           'warning'
         else
           'ok'

data/lib/riemann/tools/md.rb

@@ -8,6 +8,9 @@ module Riemann
     class Md
       include Riemann::Tools
 
+      opt :devices, 'Devices to monitor', type: :strings, default: []
+      opt :ignore_devices, 'Devices to ignore', type: :strings, default: []
+
       def mdstat_parser
         @mdstat_parser ||= MdstatParser.new
       end
@@ -16,13 +19,15 @@ module Riemann
         status = File.read('/proc/mdstat')
         res = mdstat_parser.parse(status)
 
-        state = res.values.all? { |value| value =~ /\AU+\z/ } ? 'ok' : 'critical'
+        res.each do |device, member_status|
+          next unless report_device?(device)
 
-        report(
-          service: 'mdstat',
-          description: status,
-          state: state,
-        )
+          report(
+            service: "mdstat #{device}",
+            description: member_status,
+            state: member_status =~ /\AU+\z/ ? 'ok' : 'critical',
+          )
+        end
       rescue Racc::ParseError => e
         report(
           service: 'mdstat',
@@ -36,6 +41,14 @@ module Riemann
           state: 'critical',
         )
       end
+
+      def report_device?(device)
+        if !opts[:devices].empty?
+          opts[:devices].include?(device)
+        else
+          !opts[:ignore_devices].include?(device)
+        end
+      end
     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.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 

data/lib/riemann/tools/nginx_status.rb

@@ -22,6 +22,7 @@ module Riemann
       opt :writing_critical, 'Writing connections critical threshold', default: 0
       opt :waiting_warning, 'Waiting connections warning threshold', default: 0
       opt :waiting_critical, 'Waiting connections critical threshold', default: 0
+      opt :user_agent, 'User-Agent header for HTTP requests', short: :none, default: "#{File.basename($PROGRAM_NAME)}/#{Riemann::Tools::VERSION} (+https://github.com/riemann/riemann-tools)"
 
       def initialize
         @uri = URI.parse(opts[:uri])
@@ -53,7 +54,7 @@ module Riemann
       def tick
         response = nil
         begin
-          response = ::Net::HTTP.get(@uri)
+          response = ::Net::HTTP.new(@uri.host, @uri.port).get(@uri, { 'user-agent' => opts[:user_agent] }).body
         rescue StandardError => e
           report(
             service: 'nginx health',

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.6.0'
+    VERSION = '1.7.0'
   end
 end

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

@@ -26,6 +26,8 @@ module Riemann
       opt :get_99_warning, 'FSM 99% get time warning threshold (ms)', default: 10_000
       opt :put_99_warning, 'FSM 99% put time warning threshold (ms)', default: 10_000
 
+      opt :user_agent, 'User-Agent header for HTTP requests', short: :none, default: "#{File.basename($PROGRAM_NAME)}/#{Riemann::Tools::VERSION} (+https://github.com/riemann/riemann-tools)"
+
       def initialize
         detect_features
 
@@ -38,7 +40,7 @@ module Riemann
           http.use_ssl = uri.scheme == 'https'
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl?
           http.start do |h|
-            h.get opts[:stats_path]
+            h.get(opts[:stats_path], { 'user-agent' => opts[:user_agent] })
           end
         rescue StandardError => _e
           @httpstatus = false
@@ -168,7 +170,7 @@ module Riemann
           http.use_ssl = uri.scheme == 'https'
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl?
           res = http.start do |h|
-            h.get opts[:stats_path]
+            h.get(opts[:stats_path], { 'user-agent' => opts[:user_agent] })
           end
         rescue StandardError => e
           report(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Kyle Kingsbury
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2023-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -352,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
@@ -367,8 +367,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.23
-signing_key:
+rubygems_version: 3.2.5
+signing_key: 
 specification_version: 4
 summary: Utilities which submit events to Riemann.
 test_files: []