tools.rb in riemann-tools-1.11.0

- old
+ new

@@ -30,11 +30,12 @@
         opt :host, 'Riemann host', default: '127.0.0.1'
         opt :port, 'Riemann port', default: 5555
         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
         opt :tls, 'Use TLS for securing traffic', default: false
         opt :tls_key, 'TLS Key to use when using TLS', type: String
@@ -42,30 +43,38 @@
         opt :tls_ca_cert, 'Trusted CA Certificate when using TLS', type: String
         opt :tls_verify, 'Verify TLS peer when using TLS', default: true
       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
     end
     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]
 
       event = event.merge(attributes)
 
@@ -90,7 +99,15 @@
         sleep(options[:interval] - ((Time.now - t0) % options[:interval]))
       end
     end
 
     def tick; end
+
+    def endpoint_name(address, port)
+      if address.ipv6?
+        "[#{address}]:#{port}"
+      else
+        "#{address}:#{port}"
+      end
+    end
   end
 end