riemann-tools 1.10.0 → 1.12.0

data/lib/riemann/tools.rb

@@ -32,7 +32,8 @@ module Riemann
         opt :event_host, 'Event hostname', type: String
         opt :interval, 'Seconds between updates', default: 5
         opt :tag, 'Tag to add to events', type: String, multi: true
-        opt :ttl, 'TTL for events', type: Integer
+        opt :ttl, 'TTL for events (twice the interval when unspecified)', type: Integer
+        opt :minimum_ttl, 'Minimum TTL for events', type: Integer, short: :none
         opt :attribute, 'Attribute to add to the event', type: String, multi: true
         opt :timeout, 'Timeout (in seconds) when waiting for acknowledgements', default: 30
         opt :tcp, 'Use TCP transport instead of UDP (improves reliability, slight overhead.', default: true
@@ -44,6 +45,17 @@ module Riemann
       end
     end
 
+    attr_reader :argv
+
+    def initialize(allow_arguments: false)
+      options
+      @argv = ARGV.dup
+      abort "Error: stray arguments: #{ARGV.map(&:inspect).join(', ')}" if ARGV.any? && !allow_arguments
+
+      options[:ttl] ||= options[:interval] * 2
+      options[:ttl] = [options[:minimum_ttl], options[:ttl]].compact.max
+    end
+
     # Returns parsed options (cached) from command line.
     def options
       @options ||= self.class.options
@@ -51,19 +63,16 @@ module Riemann
     alias opts options
 
     def attributes
-      @attributes ||= Hash[options[:attribute].map do |attr|
-        k, v = attr.split(/=/)
+      @attributes ||= options[:attribute].to_h do |attr|
+        k, v = attr.split('=')
         [k, v] if k && v
-      end]
+      end
     end
 
     def report(event)
-      if options[:tag]
-        # Work around a bug with beefcake which can't take frozen strings.
-        event[:tags] = [*event.fetch(:tags, [])] + options[:tag].map(&:dup)
-      end
+      event[:tags] = event.fetch(:tags, []) + options[:tag]
 
-      event[:ttl] ||= options[:ttl] || (options[:interval] * 2)
+      event[:ttl] ||= options[:ttl]
 
       event[:host] = options[:event_host].dup if options[:event_host]
 
@@ -92,5 +101,13 @@ module Riemann
     end
 
     def tick; end
+
+    def endpoint_name(address, port)
+      if address.ipv6?
+        "[#{address}]:#{port}"
+      else
+        "#{address}:#{port}"
+      end
+    end
   end
 end

data/riemann-tools.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
+  spec.metadata['allowed_push_host']     = 'https://rubygems.org/'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.metadata['homepage_uri']    = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
@@ -37,17 +38,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'json', '>= 1.8'
-  spec.add_runtime_dependency 'optimist', '~> 3.0', '>= 3.0.0'
-  spec.add_runtime_dependency 'riemann-client', '~> 1.1'
-
-  spec.add_development_dependency 'github_changelog_generator'
-  spec.add_development_dependency 'racc'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  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'
+  spec.add_dependency 'csv', '~> 3.0'
+  spec.add_dependency 'json', '>= 1.8'
+  spec.add_dependency 'optimist', '~> 3.0', '>= 3.0.0'
+  spec.add_dependency 'riemann-client', '~> 1.1'
 end

data/tools/riemann-aws/lib/riemann/tools/aws/billing.rb

@@ -21,7 +21,9 @@ module Riemann
         opt :time_end, 'End time in seconds of the metrics period ', type: Integer, default: 60
 
         def initialize
-          if options[:fog_credentials_file]
+          super
+
+          if opts[:fog_credentials_file]
             Fog.credentials_path = opts[:fog_credentials_file]
             Fog.credential = opts[:fog_credential].to_sym
             @cloudwatch = Fog::AWS::CloudWatch.new

data/tools/riemann-aws/lib/riemann/tools/aws/rds_status.rb

@@ -17,6 +17,8 @@ module Riemann
         opt :region, 'AWS region', type: String, default: 'eu-west-1'
         opt :dbinstance_identifier, 'DBInstanceIdentifier', type: String
         def initialize
+          super
+
           abort 'FATAL: specify a DB instance name, see --help for usage' unless opts[:dbinstance_identifier]
           creds = if opts[:access_key] && opts[:secret_key]
                     {

data/tools/riemann-aws/lib/riemann/tools/aws/s3_status.rb

@@ -21,7 +21,7 @@ module Riemann
 
         def base_metrics
           # get last 60 seconds
-          start_time = (Time.now.utc - 3600 * 24 * 1).iso8601
+          start_time = (Time.now.utc - (3600 * 24 * 1)).iso8601
           end_time = Time.now.utc.iso8601
 
           # The base query that all metrics would get

data/tools/riemann-aws/lib/riemann/tools/aws/sqs_status.rb

@@ -14,6 +14,8 @@ module Riemann
         opt :region, 'AWS region', type: String, default: 'us-east-1'
         opt :queue, 'SQS Queue name', type: String
         def initialize
+          super
+
           creds = if opts.key?('access_key') && opts.key?('secret_key')
                     {
                       aws_access_key_id: opts[:access_key],

data/tools/riemann-aws/lib/riemann/tools/aws/status.rb

@@ -20,21 +20,23 @@ module Riemann
         opt :event_warning, 'Number of days before event. Defaults to nil (i.e. when the event appears)', default: nil
 
         def initialize
-          if options[:fog_credentials_file]
-            Fog.credentials_path = options[:fog_credentials_file]
-            Fog.credential = options[:fog_credential].to_sym
+          super
+
+          if opts[:fog_credentials_file]
+            Fog.credentials_path = opts[:fog_credentials_file]
+            Fog.credential = opts[:fog_credential].to_sym
             @compute = Fog::AWS::Compute.new
           else
-            @compute = if options[:access_key] && options[:secret_key]
+            @compute = if opts[:access_key] && opts[:secret_key]
                          Fog::AWS::Compute.new({
-                                                 access_key_key_id: options[:access_key],
-                                                 secret_key_access_key: options[:secret_key],
-                                                 region: options[:region],
+                                                 access_key_key_id: opts[:access_key],
+                                                 secret_key_access_key: opts[:secret_key],
+                                                 region: opts[:region],
                                                })
                        else
                          Fog::AWS::Compute.new({
                                                  use_iam_profile: true,
-                                                 region: options[:region],
+                                                 region: opts[:region],
                                                })
                        end
           end
@@ -61,7 +63,7 @@ module Riemann
                     elsif opts[:event_warning] && (Date.today >= before - opts[:event_warning])
                       { state: 'warning' }
                     else
-                      { state: 'warning' }
+                      {}
                     end
 
               report ev.merge(ev2)

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

@@ -21,6 +21,8 @@ module Riemann
       def initialize
         options[:interval] = 60
         options[:ttl] = 120
+
+        super
       end
 
       # Handles HTTP connections and GET requests safely

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

@@ -31,6 +31,8 @@ module Riemann
       end
 
       def initialize
+        super
+
         Docker.url = opts[:docker_host] unless opts[:docker_host].nil?
 
         @hostname = opts[:host_hostname]
@@ -121,7 +123,7 @@ module Riemann
       end
 
       def disk
-        `df -P`.split(/\n/).each do |r|
+        `df -P`.split("\n").each do |r|
           f = r.split(/\s+/)
           next if f[0] == 'Filesystem'
           next unless f[0] =~ %r{/} # Needs at least one slash in the mount path
@@ -171,10 +173,8 @@ module Riemann
         disk if @disk_enabled
 
         # Get CPU, Memory and Load of each container
-        threads = []
-
-        containers.each do |ctr|
-          threads << Thread.new(ctr) do |container|
+        threads = containers.map do |ctr|
+          Thread.new(ctr) do |container|
             id = container.id
             name = get_container_name(container)
 

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

@@ -21,6 +21,8 @@ module Riemann
       def initialize
         options[:interval] = 60
         options[:ttl] = 120
+
+        super
       end
 
       # Handles HTTP connections and GET requests safely

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

@@ -10,6 +10,8 @@ module Riemann
       require 'munin-ruby'
 
       def initialize
+        super
+
         @munin = ::Munin::Node.new
       end
 

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

@@ -27,8 +27,8 @@ module Riemann
 
       def base_url
         protocol = 'http'
-        protocol = 'https' if options[:monitor_use_tls] && (options[:monitor_use_tls] == true)
-        "#{protocol}://#{options[:monitor_user]}:#{options[:monitor_pass]}@#{options[:monitor_host]}:#{options[:monitor_port]}/api"
+        protocol = 'https' if opts[:monitor_use_tls] && (opts[:monitor_use_tls] == true)
+        "#{protocol}://#{opts[:monitor_user]}:#{opts[:monitor_pass]}@#{opts[:monitor_host]}:#{opts[:monitor_port]}/api"
       end
 
       def overview_url
@@ -44,7 +44,7 @@ module Riemann
       end
 
       def event_host
-        options[:event_host] || :monitor_host
+        opts[:event_host] || :monitor_host
       end
 
       def safe_get(uri, event_host)
@@ -53,8 +53,8 @@ module Riemann
         begin
           connection = Faraday.new(uri)
           response = connection.get do |req|
-            req.options[:timeout] = options[:read_timeout]
-            req.options[:open_timeout] = options[:open_timeout]
+            req.opts[:timeout] = opts[:read_timeout]
+            req.opts[:open_timeout] = opts[:open_timeout]
           end
           report(
             host: event_host,
@@ -75,7 +75,7 @@ module Riemann
 
       def check_queues
         response = safe_get(queues_url, event_host)
-        max_size_check_filter = (Regexp.new(options[:ignore_max_size_queues]) if options[:ignore_max_size_queues])
+        max_size_check_filter = (Regexp.new(opts[:ignore_max_size_queues]) if opts[:ignore_max_size_queues])
 
         return if response.nil?
 
@@ -102,7 +102,7 @@ module Riemann
 
             errs << 'Queue has jobs but no consumers' if !queue['messages_ready'].nil? && (queue['messages_ready']).positive? && (queue['consumers']).zero?
 
-            errs << "Queue has #{queue['messages_ready']} jobs" if (max_size_check_filter.nil? || queue['name'] !~ (max_size_check_filter)) && !queue['messages_ready'].nil? && (queue['messages_ready'] > options[:max_queue_size])
+            errs << "Queue has #{queue['messages_ready']} jobs" if (max_size_check_filter.nil? || queue['name'] !~ (max_size_check_filter)) && !queue['messages_ready'].nil? && (queue['messages_ready'] > opts[:max_queue_size])
 
             if errs.empty?
               report(

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

@@ -30,6 +30,8 @@ module Riemann
       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
+        super
+
         detect_features
 
         @httpstatus = true
@@ -151,7 +153,7 @@ module Riemann
 
       # Returns the alerts state for the given fsm.
       def fsm_state(type, percentile, val)
-        limit = opts["#{type}_#{percentile}_warning".to_sym]
+        limit = opts[:"#{type}_#{percentile}_warning"]
         case val
         when 0..limit
           'ok'
@@ -201,7 +203,7 @@ module Riemann
         str = `riak-admin status`
         raise 'riak-admin failed' unless $CHILD_STATUS == 0
 
-        Hash[str.split(/\n/).map { |i| i.split(/ : /) }]
+        str.split("\n").to_h { |i| i.split(' : ') }
       end
 
       # Get current stats as a hash

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Kyle Kingsbury
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -58,132 +71,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  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: racc
-  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: rake
-  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: rspec
-  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: rubocop
-  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: rubocop-rake
-  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: rubocop-rspec
-  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: 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
@@ -200,6 +87,7 @@ executables:
 - riemann-haproxy
 - riemann-health
 - riemann-http-check
+- riemann-hwmon
 - riemann-kvminstance
 - riemann-md
 - riemann-memcached
@@ -208,6 +96,7 @@ executables:
 - riemann-ntp
 - riemann-portcheck
 - riemann-proc
+- riemann-tls-check
 - riemann-varnish
 - riemann-wrapper
 - riemann-zookeeper
@@ -243,6 +132,7 @@ files:
 - bin/riemann-haproxy
 - bin/riemann-health
 - bin/riemann-http-check
+- bin/riemann-hwmon
 - bin/riemann-kvminstance
 - bin/riemann-md
 - bin/riemann-memcached
@@ -251,6 +141,7 @@ files:
 - bin/riemann-ntp
 - bin/riemann-portcheck
 - bin/riemann-proc
+- bin/riemann-tls-check
 - bin/riemann-varnish
 - bin/riemann-wrapper
 - bin/riemann-zookeeper
@@ -268,6 +159,7 @@ files:
 - lib/riemann/tools/haproxy.rb
 - lib/riemann/tools/health.rb
 - lib/riemann/tools/http_check.rb
+- lib/riemann/tools/hwmon.rb
 - lib/riemann/tools/kvm.rb
 - lib/riemann/tools/md.rb
 - lib/riemann/tools/mdstat_parser.tab.rb
@@ -278,6 +170,7 @@ files:
 - lib/riemann/tools/portcheck.rb
 - lib/riemann/tools/proc.rb
 - lib/riemann/tools/riemann_client_wrapper.rb
+- lib/riemann/tools/tls_check.rb
 - lib/riemann/tools/uptime_parser.tab.rb
 - lib/riemann/tools/utils.rb
 - lib/riemann/tools/varnish.rb
@@ -349,10 +242,10 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org/
+  rubygems_mfa_required: 'true'
   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:
 rdoc_options: []
 require_paths:
 - lib
@@ -367,8 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Utilities which submit events to Riemann.
 test_files: []