riemann-tools 1.8.2 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4332ce7f616ae97148796f5563e9d1920e104da9f22ce5fade96204a46e83538
-  data.tar.gz: 4a84364a07bba6d111d124491ac65bf310075cf439fac30717c9aa5f95f0b68c
+  metadata.gz: 8a687b20923e917950674963afc61f94986d17067dbaa847b882898b9efd213b
+  data.tar.gz: 3ecceb218ec5603f4b15a8aae99ddca0578377eb45c6e22877e61e78f07a3eee
 SHA512:
-  metadata.gz: 9791c57e10683c4509f08a75ef454545bf90fc3ab33a852c2797b302937a6d17aeb2ce19de6e4f1ee91d99291f442c5ac06e019cf8d893718487c70645a431e7
-  data.tar.gz: 7ab5ebb5ede098d648ff78033bac1b0743f99a98fb8a68a9898e70a2e7f29d60901b089f905c4b7afa2e32c50bdab025e68df7d2b6bc0c9c3806733ebcd8693c
+  metadata.gz: 3d7e1dda53482e7725ab3fe23d49488db45dfbf69bcf2e33550d385ae1fb79f4d868be1685c225b46180bd6f00d9c1ce723959d02e739570d0c021bdd9cf84e8
+  data.tar.gz: e99bb824d6d3a17d9f2ea47bbf31bf468ce3f567949ae632db2927c4e8922a8d6f6b3141bda0f11da624493bfc7fe982749a5bae971a40572e134bff9e839b6f

data/.github/workflows/ci.yml

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

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [v1.9.0](https://github.com/riemann/riemann-tools/tree/v1.9.0) (2023-12-08)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.8.2...v1.9.0)
+
+**Implemented enhancements:**
+
+- Use truncated exponential backoff for reconnection [\#272](https://github.com/riemann/riemann-tools/pull/272) ([smortex](https://github.com/smortex))
+- Add redirect support to `riemann-http-check` [\#270](https://github.com/riemann/riemann-tools/pull/270) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix `riemann-haproxy` with Ruby 3.0+ [\#273](https://github.com/riemann/riemann-tools/pull/273) ([smortex](https://github.com/smortex))
+
+**Merged pull requests:**
+
+- Bump actions/checkout from 3 to 4 [\#271](https://github.com/riemann/riemann-tools/pull/271) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [v1.8.2](https://github.com/riemann/riemann-tools/tree/v1.8.2) (2023-05-22)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.8.1...v1.8.2)
@@ -95,7 +112,7 @@
 
 **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 support for a 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))
 

data/lib/riemann/tools/bench.rb

@@ -15,7 +15,7 @@ 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'))
+        @client = Riemann::Client.new(host: ARGV.first || 'localhost')
       end
 
       def evolve(state)

data/lib/riemann/tools/haproxy.rb

@@ -44,6 +44,10 @@ module Riemann
       end
 
       def csv
+        CSV.parse(body.split('# ')[1], headers: true)
+      end
+
+      def body
         http = ::Net::HTTP.new(@uri.host, @uri.port)
         http.use_ssl = true if @uri.scheme == 'https'
         res = http.start do |h|
@@ -53,8 +57,8 @@ module Riemann
             get.basic_auth userinfo[0], userinfo[1]
           end
           h.request get
+          res.body
         end
-        CSV.parse(res.body.split('# ')[1], { headers: true })
       end
     end
   end

data/lib/riemann/tools/http_check.rb

@@ -25,6 +25,8 @@ module Riemann
       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 :follow_redirects, 'Follow redirects (301, 302)', short: :none, default: true
+      opt :max_redirects, 'Stop following redirects after this number of hops', short: :none, default: 5
       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
@@ -100,8 +102,7 @@ module Riemann
       end
 
       def test_uri_addresses(uri, addresses)
-        request = ::Net::HTTP::Get.new(uri, { 'user-agent' => opts[:user_agent] })
-        request.basic_auth(uri.user, uri.password)
+        request = get_request(uri)
 
         responses = []
 
@@ -147,7 +148,15 @@ module Riemann
         )
       end
 
-      def test_uri_address(uri, address, request)
+      def get_request(uri)
+        request = ::Net::HTTP::Get.new(uri, { 'user-agent' => opts[:user_agent] })
+
+        request.basic_auth(uri.user, uri.password)
+
+        request
+      end
+
+      def test_uri_address(uri, address, request, redirect_count: 0)
         response = nil
 
         start = Time.now
@@ -173,12 +182,43 @@ module Riemann
         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')
 
+        if opts[:follow_redirects] && %w[301 302].include?(response.code)
+          next_uri = redirect_uri(uri, response['Location'])
+
+          if same_origin?(uri, next_uri)
+            if redirect_count == opts[:max_redirects]
+              report_http_endpoint_max_redirects(http, uri)
+              return nil
+            else
+              response = test_uri_address(next_uri, address, get_request(next_uri), redirect_count: redirect_count + 1)
+            end
+          end
+        end
+
         response
       rescue StandardError
         # Ignore this address
         nil
       end
 
+      def redirect_uri(uri, location)
+        res = URI.parse(location)
+
+        res.scheme   ||= uri.scheme
+        res.host     ||= uri.host
+        res.port     ||= uri.port
+        res.user     ||= res.user
+        res.password ||= res.password
+
+        res
+      end
+
+      def same_origin?(left, right)
+        left.scheme == right.scheme &&
+          left.host == right.host &&
+          left.port == right.port
+      end
+
       def report_http_endpoint_response_code(http, uri, response)
         return unless response
 
@@ -215,6 +255,15 @@ module Riemann
         end
       end
 
+      def report_http_endpoint_max_redirects(http, uri)
+        report(
+          {
+            state: 'critical',
+            description: "Reached the limit of #{opts[:max_redirects]} redirects",
+          }.merge(endpoint_report(http, uri, 'redirects')),
+        )
+      end
+
       def latency_state(name, latency)
         critical_threshold = opts["#{name}_latency_critical".to_sym]
         warning_threshold = opts["#{name}_latency_warning".to_sym]

data/lib/riemann/tools/net.rb

@@ -108,7 +108,7 @@ module Riemann
 
         if @old_state
           # Report services from `@old_state` that don't exist in `state` as expired
-          @old_state.reject { |k| state.key?(k) }.each do |service, _metric|
+          @old_state.reject { |k| state.key?(k) }.each_key do |service|
             report(service: service.dup, state: 'expired')
           end
 

data/lib/riemann/tools/riemann_client_wrapper.rb

@@ -9,6 +9,10 @@ module Riemann
     class RiemannClientWrapper
       attr_reader :options
 
+      BACKOFF_TMIN = 0.5  # Minimum delay between reconnection attempts
+      BACKOFF_TMAX = 30.0 # Maximum delay
+      BACKOFF_FACTOR = 2
+
       def initialize(options)
         @options = options
 
@@ -18,6 +22,8 @@ module Riemann
 
         @worker = Thread.new do
           Thread.current.abort_on_exception = true
+          backoff_delay = BACKOFF_TMIN
+
           loop do
             events = []
 
@@ -25,8 +31,16 @@ module Riemann
             events << @queue.pop while !@queue.empty? && events.size < @max_bulk_size
 
             client.bulk_send(events)
+            backoff_delay = BACKOFF_TMIN
           rescue StandardError => e
-            warn "Dropping #{events.size} event#{'s' if events.size > 1} due to #{e}"
+            sleep(backoff_delay)
+
+            dropped_count = events.size + @queue.size
+            @queue.clear
+            warn "Dropped #{dropped_count} event#{'s' if dropped_count > 1} due to #{e}"
+
+            backoff_delay *= BACKOFF_FACTOR
+            backoff_delay = BACKOFF_TMAX if backoff_delay > BACKOFF_TMAX
           end
         end
 

data/lib/riemann/tools/version.rb

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

data/lib/riemann/tools.rb

@@ -63,7 +63,7 @@ module Riemann
         event[:tags] = [*event.fetch(:tags, [])] + options[:tag].map(&:dup)
       end
 
-      event[:ttl] ||= (options[:ttl] || (options[:interval] * 2))
+      event[:ttl] ||= options[:ttl] || (options[:interval] * 2)
 
       event[:host] = options[:event_host].dup if options[:event_host]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -367,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Utilities which submit events to Riemann.