riemann-tools 1.1.1 → 1.2.0

data/tools/riemann-marathon/bin/riemann-marathon

@@ -3,161 +3,6 @@
 
 Process.setproctitle($PROGRAM_NAME)
 
-require 'riemann/tools'
+require 'riemann/tools/marathon'
 
-module Riemann
-  module Tools
-    class Marathon
-      include Riemann::Tools
-
-      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
-
-      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]
-          end
-        rescue StandardError => e
-          report(
-            host: uri.host,
-            service: 'marathon health',
-            state: 'critical',
-            description: "HTTP connection error: #{e.class} - #{e.message}",
-          )
-        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.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.positive? ? '/' : ''}#{path_prefix}/v2/apps"
-      end
-
-      def tick
-        tick_health
-        tick_apps
-      end
-
-      def tick_health
-        uri = URI(health_url)
-        response = safe_get(uri)
-
-        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'
-
-          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|
-                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
-
-      def tick_apps
-        uri = URI(apps_url)
-        response = safe_get(uri)
-
-        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'
-
-          report(
-            host: uri.host,
-            service: 'marathon health',
-            state: state,
-          )
-
-          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

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

@@ -0,0 +1,159 @@
+# frozen_string_literal: true
+
+require 'riemann/tools'
+
+module Riemann
+  module Tools
+    class Marathon
+      include Riemann::Tools
+
+      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: '/'.dup
+      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
+
+      # 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
+        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.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.positive? ? '/' : ''}#{path_prefix}/v2/apps"
+      end
+
+      def tick
+        tick_health
+        tick_apps
+      end
+
+      def tick_health
+        uri = URI(health_url)
+        response = safe_get(uri)
+
+        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'
+
+          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|
+                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
+
+      def tick_apps
+        uri = URI(apps_url)
+        response = safe_get(uri)
+
+        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'
+
+          report(
+            host: uri.host,
+            service: 'marathon health',
+            state: state,
+          )
+
+          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

data/tools/riemann-mesos/Rakefile

@@ -11,10 +11,8 @@ ENV['COPYFILE_DISABLE'] = 'true'
 
 # Gemspec
 gemspec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'riemann-mesos'
-
   s.name = 'riemann-mesos'
-  s.version = '0.1.2'
+  s.version = '0.1.4'
   s.author = 'Giulio Eulisse'
   s.email = 'giulio.eulisse@cern.ch'
   s.homepage = 'https://github.com/riemann/riemann-tools'
@@ -22,15 +20,14 @@ gemspec = Gem::Specification.new do |s|
   s.summary = 'Submits mesos stats to riemann.'
   s.license = 'MIT'
 
-  s.add_dependency 'riemann-tools', '>= 0.2.13'
-  s.add_dependency 'faraday', '>= 0.8.5'
-  s.add_dependency 'json'
+  s.add_runtime_dependency 'riemann-tools', '~> 1.0', '>= 1.1.1'
+  s.add_runtime_dependency 'faraday', '~> 2.3', '>= 2.3.0'
+  s.add_runtime_dependency 'json', '~> 2.6', '>=2.6.2'
 
-  s.files = FileList['bin/*', 'LICENSE', 'README.md'].to_a
+  s.files = FileList['bin/*', 'lib/**/*.rb', 'LICENSE', 'README.md'].to_a
   s.executables |= Dir.entries('bin/')
-  s.has_rdoc = false
 
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 end
 
 Gem::PackageTask.new gemspec do |p|

data/tools/riemann-mesos/bin/riemann-mesos

@@ -3,144 +3,6 @@
 
 Process.setproctitle($PROGRAM_NAME)
 
-require 'riemann/tools'
+require 'riemann/tools/mesos'
 
-module Riemann
-  module Tools
-    class Mesos
-      include Riemann::Tools
-
-      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,
-          'Mesos path prefix for proxied installations e.g. "mesos" for target http://localhost/mesos/metrics/snapshot', default: '/'
-      opt :mesos_host, 'Mesos host', default: 'localhost'
-      opt :mesos_port, 'Mesos port', type: :int, default: 5050
-
-      # 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: 'mesos health',
-            state: 'critical',
-            description: "HTTP connection error: #{e.class} - #{e.message}",
-          )
-        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[:mesos_host]}:#{options[:mesos_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/metrics/snapshot"
-      end
-
-      def slaves_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[:mesos_host]}:#{options[:mesos_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/master/slaves"
-      end
-
-      def tick
-        tick_slaves
-        uri = URI(health_url)
-        response = safe_get(uri)
-
-        return if response.nil?
-
-        if response.status != 200
-          report(
-            host: uri.host,
-            service: 'mesos 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: 'mesos health',
-            state: state,
-          )
-
-          json.each_pair do |k, v|
-            report(
-              host: uri.host,
-              service: "mesos #{k}",
-              metric: v,
-            )
-          end
-        end
-      end
-
-      def tick_slaves
-        uri = URI(slaves_url)
-        response = safe_get(uri)
-
-        return if response.nil?
-
-        if response.status != 200
-          report(
-            host: uri.host,
-            service: 'mesos 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: 'mesos health',
-            state: state,
-          )
-
-          json['slaves'].each do |slave|
-            next unless slave.respond_to? 'each_pair'
-
-            slave.each_pair do |k, v|
-              if v.respond_to? 'each_pair'
-                v.each_pair do |k1, v1|
-                  next unless v1.is_a? Numeric
-
-                  report(
-                    host: slave['hostname'],
-                    service: "mesos slave/#{k}/#{k1}",
-                    metric: v1,
-                  )
-                end
-              elsif v.is_a? Numeric
-                report(
-                  host: slave['hostname'],
-                  service: "mesos slave/#{k}",
-                  metric: v,
-                )
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
 Riemann::Tools::Mesos.run

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

@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+require 'riemann/tools'
+
+module Riemann
+  module Tools
+    class Mesos
+      include Riemann::Tools
+
+      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,
+          'Mesos path prefix for proxied installations e.g. "mesos" for target http://localhost/mesos/metrics/snapshot', default: '/'.dup
+      opt :mesos_host, 'Mesos host', default: 'localhost'
+      opt :mesos_port, 'Mesos port', type: :int, default: 5050
+
+      # 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: 'mesos health',
+            state: 'critical',
+            description: "HTTP connection error: #{e.class} - #{e.message}",
+          )
+        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[:mesos_host]}:#{options[:mesos_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/metrics/snapshot"
+      end
+
+      def slaves_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[:mesos_host]}:#{options[:mesos_port]}#{path_prefix.length.positive? ? '/' : ''}#{path_prefix}/master/slaves"
+      end
+
+      def tick
+        tick_slaves
+        uri = URI(health_url)
+        response = safe_get(uri)
+
+        return if response.nil?
+
+        if response.status != 200
+          report(
+            host: uri.host,
+            service: 'mesos 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: 'mesos health',
+            state: state,
+          )
+
+          json.each_pair do |k, v|
+            report(
+              host: uri.host,
+              service: "mesos #{k}",
+              metric: v,
+            )
+          end
+        end
+      end
+
+      def tick_slaves
+        uri = URI(slaves_url)
+        response = safe_get(uri)
+
+        return if response.nil?
+
+        if response.status != 200
+          report(
+            host: uri.host,
+            service: 'mesos 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: 'mesos health',
+            state: state,
+          )
+
+          json['slaves'].each do |slave|
+            next unless slave.respond_to? 'each_pair'
+
+            slave.each_pair do |k, v|
+              if v.respond_to? 'each_pair'
+                v.each_pair do |k1, v1|
+                  next unless v1.is_a? Numeric
+
+                  report(
+                    host: slave['hostname'],
+                    service: "mesos slave/#{k}/#{k1}",
+                    metric: v1,
+                  )
+                end
+              elsif v.is_a? Numeric
+                report(
+                  host: slave['hostname'],
+                  service: "mesos slave/#{k}",
+                  metric: v,
+                )
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/tools/riemann-munin/Rakefile

@@ -11,10 +11,8 @@ ENV['COPYFILE_DISABLE'] = 'true'
 
 # Gemspec
 gemspec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'riemann-munin'
-
   s.name = 'riemann-munin'
-  s.version = '0.1.2'
+  s.version = '0.1.4'
   s.author = 'Kyle Kingsbury'
   s.email = 'aphyr@aphyr.com'
   s.homepage = 'https://github.com/riemann/riemann-tools'
@@ -22,14 +20,13 @@ gemspec = Gem::Specification.new do |s|
   s.summary = 'Submits munin stats to riemann.'
   s.license = 'MIT'
 
-  s.add_dependency 'riemann-tools', '>= 0.2.13'
-  s.add_dependency 'munin-ruby', '>= 0.2.1'
+  s.add_runtime_dependency 'riemann-tools', '~> 1.0', '>= 1.1.1'
+  s.add_runtime_dependency 'munin-ruby', '~> 0.2', '>= 0.2.5'
 
-  s.files = FileList['bin/*', 'LICENSE', 'README.md'].to_a
+  s.files = FileList['bin/*', 'lib/**/*.rb', 'LICENSE', 'README.md'].to_a
   s.executables |= Dir.entries('bin/')
-  s.has_rdoc = false
 
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 end
 
 Gem::PackageTask.new gemspec do |p|