Detect and report stray arguments

lib/riemann/tools.rb

@@ -44,6 +44,14 @@ def options
       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
+    end
+
     # Returns parsed options (cached) from command line.
     def options
       @options ||= self.class.options
@@ -58,10 +66,7 @@ def attributes
     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)
 

lib/riemann/tools/apache_status.rb

@@ -18,6 +18,8 @@ class ApacheStatus
       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
+
         @uri = URI.parse("#{opts[:uri]}?auto")
         # Sample Response with ExtendedStatus On
         # Total Accesses: 20643

lib/riemann/tools/bench.rb

@@ -11,6 +11,8 @@ class Bench
       attr_accessor :client, :hosts, :services, :states
 
       def initialize
+        super
+
         @hosts = [nil] + (0...10).map { |i| "host#{i}" }
         @hosts = %w[a b c d e f g h i j]
         @services = %w[test1 test2 test3 foo bar baz xyzzy attack cat treat]

lib/riemann/tools/consul_health.rb

@@ -20,6 +20,8 @@ class ConsulHealth
       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
+
         @hostname = opts[:consul_host]
         @prefix = opts[:prefix]
         @minimum_services_per_node = opts[:minimum_services_per_node]

lib/riemann/tools/dir_files_count.rb

@@ -15,6 +15,8 @@ class DirFilesCount
       opt :alert_on_missing, 'Send a critical metric if the directory is missing?', default: true
 
       def initialize
+        super
+
         @dir = opts.fetch(:directory)
         @service_prefix = opts.fetch(:service_prefix)
         @warning = opts.fetch(:warning, nil)

lib/riemann/tools/dir_space.rb

@@ -15,6 +15,8 @@ class DirSpace
       opt :alert_on_missing, 'Send a critical metric if the directory is missing?', default: true
 
       def initialize
+        super
+
         @dir = opts.fetch(:directory)
         @service_prefix = opts.fetch(:service_prefix)
         @warning = opts.fetch(:warning, nil)

lib/riemann/tools/diskstats.rb

@@ -11,6 +11,8 @@ class Diskstats
       opt :ignore_devices, 'Devices to ignore', type: :strings, default: nil
 
       def initialize
+        super
+
         @old_state = nil
       end
 

lib/riemann/tools/fd.rb

@@ -16,6 +16,8 @@ class Fd
       opt :processes, 'list of processes to measure fd usage in addition to system total', type: :ints
 
       def initialize
+        super
+
         @limits = {
           fd: { critical: opts[:fd_sys_critical], warning: opts[:fd_sys_warning] },
           process: { critical: opts[:fd_proc_critical], warning: opts[:fd_proc_warning] },

lib/riemann/tools/freeswitch.rb

@@ -13,6 +13,8 @@ class Freeswitch
       opt :pid_file, 'FreeSWITCH daemon pidfile', type: String, default: '/var/run/freeswitch/freeswitch.pid'
 
       def initialize
+        super
+
         @limits = {
           calls: { critical: opts[:calls_critical], warning: opts[:calls_warning] },
         }

lib/riemann/tools/haproxy.rb

@@ -16,6 +16,8 @@ class Haproxy
       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
+
         @uri = URI("#{opts[:stats_url]};csv")
       end
 

lib/riemann/tools/health.rb

@@ -35,6 +35,8 @@ class Health
       opt :checks, 'A list of checks to run.', type: :strings, default: %w[cpu load memory disk swap]
 
       def initialize
+        super
+
         @limits = {
           cpu: { critical: opts[:cpu_critical], warning: opts[:cpu_warning] },
           disk: { critical: opts[:disk_critical], warning: opts[:disk_warning], critical_leniency_kb: human_size_to_number(opts[:disk_critical_leniency]) / 1024, warning_leniency_kb: human_size_to_number(opts[:disk_warning_leniency]) / 1024 },

lib/riemann/tools/http_check.rb

@@ -34,6 +34,8 @@ class HttpCheck
       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
+
         @resolve_queue = Queue.new
         @work_queue = Queue.new
 
@@ -73,8 +75,6 @@ def initialize
             end
           end
         end
-
-        super
       end
 
       # Under normal operation, we have a single instance of this class for the

lib/riemann/tools/net.rb

@@ -12,6 +12,8 @@ class Net
       opt :ignore_interfaces, 'Interfaces to ignore', type: :strings, default: ['\Alo\d*\z']
 
       def initialize
+        super
+
         @old_state = nil
         @interfaces = if opts[:interfaces]
                         opts[:interfaces].reject(&:empty?).map(&:dup)

lib/riemann/tools/nginx_status.rb

@@ -26,6 +26,8 @@ class NginxStatus
       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
+
         @uri = URI.parse(opts[:uri])
 
         # sample response:

lib/riemann/tools/ntp.rb

@@ -9,6 +9,8 @@ class Ntp
       include Riemann::Tools
 
       def initialize
+        super
+
         @hostname = `hostname`.chomp
         @ostype = `uname -s`.chomp.downcase
         abort 'WARNING: macOS not explicitly supported. Exiting.' if @ostype == 'darwin'

lib/riemann/tools/portcheck.rb

@@ -14,6 +14,8 @@ class Portcheck
       opt :ports, "List of ports to check, e.g. '-r 80 443'", type: :ints
 
       def initialize
+        super
+
         @hostname = opts.fetch(:hostname)
         @ports = opts.fetch(:ports)
       end

lib/riemann/tools/proc.rb

@@ -13,6 +13,8 @@ class Proc
       opt :proc_max_critical, 'running process count maximum', default: 65_536
 
       def initialize
+        super
+
         @limits = { critical: { min: opts[:proc_min_critical], max: opts[:proc_max_critical] } }
 
         abort 'FATAL: specify a process regular expression, see --help for usage' unless opts[:proc_regex]

lib/riemann/tools/varnish.rb

@@ -12,6 +12,8 @@ class Varnish
       opt :varnish_host, 'Varnish hostname', default: `hostname`.chomp
 
       def initialize
+        super
+
         cmd = 'varnishstat -V'
         Open3.popen3(cmd) do |_stdin, _stdout, stderr, _wait_thr|
           @ver = /varnishstat \(varnish-(\d+)/.match(stderr.read)[1].to_i

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

@@ -21,6 +21,8 @@ class Billing
         opt :time_end, 'End time in seconds of the metrics period ', type: Integer, default: 60
 
         def initialize
+          super
+
           if opts[:fog_credentials_file]
             Fog.credentials_path = opts[:fog_credentials_file]
             Fog.credential = opts[:fog_credential].to_sym

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

@@ -17,6 +17,8 @@ class RdsStatus
         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]
                     {

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

@@ -14,6 +14,8 @@ class SqsStatus
         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],

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

@@ -20,6 +20,8 @@ class Status
         opt :event_warning, 'Number of days before event. Defaults to nil (i.e. when the event appears)', default: nil
 
         def initialize
+          super
+
           if opts[:fog_credentials_file]
             Fog.credentials_path = opts[:fog_credentials_file]
             Fog.credential = opts[:fog_credential].to_sym

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

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

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

@@ -31,6 +31,8 @@ def get_container_name(container)
       end
 
       def initialize
+        super
+
         Docker.url = opts[:docker_host] unless opts[:docker_host].nil?
 
         @hostname = opts[:host_hostname]

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

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

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

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

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

@@ -30,6 +30,8 @@ class Riak
       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