riemann-marathon in riemann-tools-1.1.0

- old
+ new
@@ -1,147 +1,163 @@
 #!/usr/bin/env ruby
-Process.setproctitle($0)
+# frozen_string_literal: true
 
+Process.setproctitle($PROGRAM_NAME)
+
 require 'riemann/tools'
 
-class Riemann::Tools::Marathon
-  include Riemann::Tools
+module Riemann
+  module Tools
+    class Marathon
+      include Riemann::Tools
 
-  require 'faraday'
-  require 'json'
-  require 'uri'
+      require 'faraday'
+      require 'json'
+      require 'uri'
 
-  opt :read_timeout, 'Faraday read timeout', type: :int, default: 2
-  opt :open_timeout, 'Faraday open timeout', type: :int, default: 1
-  opt :path_prefix, 'Marathon path prefix for proxied installations e.g. "marathon" for target http://localhost/marathon/metrics', default: "/"
-  opt :marathon_host, 'Marathon host', default: "localhost"
-  opt :marathon_port, 'Marathon port', type: :int, default: 8080
+      opt :read_timeout, 'Faraday read timeout', type: :int, default: 2
+      opt :open_timeout, 'Faraday open timeout', type: :int, default: 1
+      opt :path_prefix,
+          'Marathon path prefix for proxied installations e.g. "marathon" for target http://localhost/marathon/metrics', default: '/'
+      opt :marathon_host, 'Marathon host', default: 'localhost'
+      opt :marathon_port, 'Marathon port', type: :int, default: 8080
 
-  def initialize
-    options[:interval] = 60
-    options[:ttl] = 120
-  end
+      def initialize
+        options[:interval] = 60
+        options[:ttl] = 120
+      end
 
-  # Handles HTTP connections and GET requests safely
-  def safe_get(uri)
-      # Handle connection timeouts
-      response = nil
-      begin
-        connection = Faraday.new(uri)
-        response = connection.get do |req|
-          req.options[:timeout] = options[:read_timeout]
-          req.options[:open_timeout] = options[:open_timeout]
+      # Handles HTTP connections and GET requests safely
+      def safe_get(uri)
+        # Handle connection timeouts
+        response = nil
+        begin
+          connection = Faraday.new(uri)
+          response = connection.get do |req|
+            req.options[:timeout] = options[:read_timeout]
+            req.options[:open_timeout] = options[:open_timeout]
+          end
+        rescue StandardError => e
+          report(
+            host: uri.host,
+            service: 'marathon health',
+            state: 'critical',
+            description: "HTTP connection error: #{e.class} - #{e.message}",
+          )
         end
-      rescue => e
-        report(:host => uri.host,
-          :service => "marathon health",
-          :state => "critical",
-          :description => "HTTP connection error: #{e.class} - #{e.message}"
-        )
+        response
       end
-      response
-  end
 
-  def health_url
-    path_prefix = options[:path_prefix]
-    path_prefix[0] = '' if path_prefix[0]=='/'
-    path_prefix[path_prefix.length-1] = '' if path_prefix[path_prefix.length-1]=='/'
-    "http://#{options[:marathon_host]}:#{options[:marathon_port]}#{path_prefix.length>0?'/':''}#{path_prefix}/metrics"
-  end
+      def health_url
+        path_prefix = options[:path_prefix]
+        path_prefix[0] = '' if path_prefix[0] == '/'
+        path_prefix[path_prefix.length - 1] = '' if path_prefix[path_prefix.length - 1] == '/'
+        "http://#{options[:marathon_host]}:#{options[:marathon_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/metrics"
+      end
 
-  def apps_url
-    path_prefix = options[:path_prefix]
-    path_prefix[0] = '' if path_prefix[0]=='/'
-    path_prefix[path_prefix.length-1] = '' if path_prefix[path_prefix.length-1]=='/'
-    "http://#{options[:marathon_host]}:#{options[:marathon_port]}#{path_prefix.length>0?'/':''}#{path_prefix}/v2/apps"
-  end
+      def apps_url
+        path_prefix = options[:path_prefix]
+        path_prefix[0] = '' if path_prefix[0] == '/'
+        path_prefix[path_prefix.length - 1] = '' if path_prefix[path_prefix.length - 1] == '/'
+        "http://#{options[:marathon_host]}:#{options[:marathon_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/v2/apps"
+      end
 
-  def tick
-    tick_health
-    tick_apps
-  end
-  
-  def tick_health
-    uri = URI(health_url)
-    response = safe_get(uri)
+      def tick
+        tick_health
+        tick_apps
+      end
 
-    return if response.nil?
+      def tick_health
+        uri = URI(health_url)
+        response = safe_get(uri)
 
-    if response.status != 200
-        report(:host => uri.host,
-          :service => "marathon health",
-          :state => "critical",
-          :description => "HTTP connection error: #{response.status} - #{response.body}"
-        )
-    else
-      # Assuming that a 200 will give json
-      json = JSON.parse(response.body)
-      state = "ok"
+        return if response.nil?
 
-      report(:host => uri.host,
-             :service => "marathon health",
-             :state => state)
+        if response.status != 200
+          report(
+            host: uri.host,
+            service: 'marathon health',
+            state: 'critical',
+            description: "HTTP connection error: #{response.status} - #{response.body}",
+          )
+        else
+          # Assuming that a 200 will give json
+          json = JSON.parse(response.body)
+          state = 'ok'
 
-      json.each_pair do |t, d|
-        if d.respond_to? :each_pair
-          d.each_pair do |service, counters|
-            report(:host => uri.host,
-                   :service => "marathon_metric #{t} #{service}",
-                   :metric => 1,
-                   :tags => ["metric_name"],
-                   :ttl => 600
-            )
-            if counters.respond_to? :each_pair
+          report(
+            host: uri.host,
+            service: 'marathon health',
+            state: state,
+          )
+
+          json.each_pair do |t, d|
+            next unless d.respond_to? :each_pair
+
+            d.each_pair do |service, counters|
+              report(
+                host: uri.host,
+                service: "marathon_metric #{t} #{service}",
+                metric: 1,
+                tags: ['metric_name'],
+                ttl: 600,
+              )
+              next unless counters.respond_to? :each_pair
+
               counters.each_pair do |k, v|
-                if v.is_a? Numeric
-                  report(:host => uri.host,
-                         :service => "marathon #{service} #{k}",
-                         :metric => v,
-                         :tags => ["metric", "#{t}"],
-                         :ttl => 600
-                  )
-                end
+                next unless v.is_a? Numeric
+
+                report(
+                  host: uri.host,
+                  service: "marathon #{service} #{k}",
+                  metric: v,
+                  tags: ['metric', t.to_s],
+                  ttl: 600,
+                )
               end
             end
           end
         end
       end
-    end
-  end
 
-  def tick_apps
-    uri = URI(apps_url)
-    response = safe_get(uri)
+      def tick_apps
+        uri = URI(apps_url)
+        response = safe_get(uri)
 
-    return if response.nil?
+        return if response.nil?
 
-    if response.status != 200
-        report(:host => uri.host,
-          :service => "marathon health",
-          :state => "critical",
-          :description => "HTTP connection error: #{response.status} - #{response.body}"
-        )
-    else
-      # Assuming that a 200 will give json
-      json = JSON.parse(response.body)
-      state = "ok"
+        if response.status != 200
+          report(
+            host: uri.host,
+            service: 'marathon health',
+            state: 'critical',
+            description: "HTTP connection error: #{response.status} - #{response.body}",
+          )
+        else
+          # Assuming that a 200 will give json
+          json = JSON.parse(response.body)
+          state = 'ok'
 
-      report(:host => uri.host,
-             :service => "marathon health",
-             :state => state)
+          report(
+            host: uri.host,
+            service: 'marathon health',
+            state: state,
+          )
 
-      json["apps"].each do |app|
-        app.each_pair do |k, v|
-          if v.is_a? Numeric
-            report(:host => uri.host,
-                   :service => "marathon apps#{app["id"]}/#{k}",
-                   :metric => v,
-                   :ttl => 120
-            )
+          json['apps'].each do |app|
+            app.each_pair do |k, v|
+              next unless v.is_a? Numeric
+
+              report(
+                host: uri.host,
+                service: "marathon apps#{app['id']}/#{k}",
+                metric: v,
+                ttl: 120,
+              )
+            end
           end
         end
       end
     end
   end
 end
 Riemann::Tools::Marathon.run
-