riemann-tools 1.1.1 → 1.2.0

data/tools/riemann-munin/bin/riemann-munin

@@ -3,41 +3,6 @@
 
 Process.setproctitle($PROGRAM_NAME)
 
-# Gathers munin statistics and submits them to Riemann.
-
-require 'riemann/tools'
-
-module Riemann
-  module Tools
-    class Munin
-      include Riemann::Tools
-      require 'munin-ruby'
-
-      def initialize
-        @munin = ::Munin::Node.new
-      end
-
-      def tick
-        services = opts[:services] || @munin.list
-        services.each do |service_name|
-          @munin.fetch(service_name).each do |service, parts|
-            parts.each do |part, metric|
-              report(
-                service: "#{service} #{part}",
-                metric: metric.to_f,
-                state: 'ok',
-                tags: ['munin'],
-              )
-            end
-          end
-        end
-      end
-
-      opt :munin_host, 'Munin hostname', default: 'localhost'
-      opt :munin_port, 'Munin port', default: 4949
-      opt :services, 'Munin services to translate (if not specified, all services are relayed)', type: :strings
-    end
-  end
-end
+require 'riemann/tools/munin'
 
 Riemann::Tools::Munin.run

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'riemann/tools'
+
+# Gathers munin statistics and submits them to Riemann.
+module Riemann
+  module Tools
+    class Munin
+      include Riemann::Tools
+      require 'munin-ruby'
+
+      def initialize
+        @munin = ::Munin::Node.new
+      end
+
+      def tick
+        services = opts[:services] || @munin.list
+        services.each do |service_name|
+          @munin.fetch(service_name).each do |service, parts|
+            parts.each do |part, metric|
+              report(
+                service: "#{service} #{part}",
+                metric: metric.to_f,
+                state: 'ok',
+                tags: ['munin'],
+              )
+            end
+          end
+        end
+      end
+
+      opt :munin_host, 'Munin hostname', default: 'localhost'
+      opt :munin_port, 'Munin port', default: 4949
+      opt :services, 'Munin services to translate (if not specified, all services are relayed)', type: :strings
+    end
+  end
+end

data/tools/riemann-rabbitmq/Rakefile

@@ -11,10 +11,8 @@ ENV['COPYFILE_DISABLE'] = 'true'
 
 # Gemspec
 gemspec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'riemann-rabbitmq'
-
   s.name = 'riemann-rabbitmq'
-  s.version = '0.1.3'
+  s.version = '0.1.5'
   s.author = 'Gavin Sandie'
   s.email = 'beach@vicecity.co.uk'
   s.homepage = 'https://github.com/riemann/riemann-tools'
@@ -22,15 +20,14 @@ gemspec = Gem::Specification.new do |s|
   s.summary = 'Submits RabbitMQ 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-rabbitmq/bin/riemann-rabbitmq

@@ -3,271 +3,6 @@
 
 Process.setproctitle($PROGRAM_NAME)
 
-require 'riemann/tools'
+require 'riemann/tools/rabbitmq'
 
-module Riemann
-  module Tools
-    class Rabbitmq
-      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 :monitor_user, 'RabbitMQ monitoring user', type: :string
-      opt :monitor_pass, 'RabbitMQ monitoring user password', type: :string
-      opt :monitor_port, 'RabbitMQ monitoring port', type: :int, default: 15_672
-      opt :monitor_host, 'RabbitMQ monitoring host', type: :string, default: 'localhost'
-      opt :monitor_use_tls, 'RabbitMQ use tls', type: :bool, default: false
-
-      opt :max_queue_size, 'max number of items in a queue that is acceptable', type: :int, default: 1_000_000
-      opt :ignore_max_size_queues, "A regular expression to match queues that shouldn't be size-checked", type: :string
-
-      opt :node, 'Specify a node to monitor', type: :strings
-
-      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"
-      end
-
-      def overview_url
-        "#{base_url}/overview"
-      end
-
-      def node_url(node)
-        "#{base_url}/nodes/#{node}"
-      end
-
-      def queues_url
-        "#{base_url}/queues"
-      end
-
-      def event_host
-        options[:event_host] || :monitor_host
-      end
-
-      def safe_get(uri, event_host)
-        # 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
-          report(
-            host: event_host,
-            service: 'rabbitmq monitoring',
-            state: 'ok',
-            description: 'Monitoring operational',
-          )
-        rescue StandardError => e
-          report(
-            host: event_host,
-            service: 'rabbitmq monitoring',
-            state: 'critical',
-            description: "HTTP connection error: #{e.class} - #{e.message}",
-          )
-        end
-        response
-      end
-
-      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])
-
-        return if response.nil?
-
-        if response.status != 200
-          report(
-            host: event_host,
-            service: 'rabbitmq.queue',
-            state: 'critical',
-            description: "HTTP connection error to /api/queues: #{response.status} - #{response.body}",
-          )
-        else
-          report(
-            host: event_host,
-            service: 'rabbitmq.queue',
-            state: 'ok',
-            description: 'HTTP connection ok',
-          )
-
-          json = JSON.parse(response.body)
-
-          json.each do |queue|
-            svc = "rabbitmq.queue.#{queue['vhost']}.#{queue['name']}"
-            errs = []
-
-            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])
-
-            if errs.empty?
-              report(
-                host: event_host,
-                service: svc,
-                state: 'ok',
-                description: 'Queue is looking good',
-              )
-            else
-              report(
-                host: event_host,
-                service: svc,
-                state: 'critical',
-                description: errs.join('; '),
-              )
-            end
-
-            stats = (queue['message_stats'] || {}).merge(
-              'messages'                        => queue['messages'],
-              'messages_details'                => queue['messages_details'],
-              'messages_ready'                  => queue['messages_ready'],
-              'messages_ready_details'          => queue['messages_ready_details'],
-              'messages_unacknowledged'         => queue['messages_unacknowledged'],
-              'messages_unacknowledged_details' => queue['messages_unacknowledged_details'],
-              'consumers'                       => queue['consumers'],
-              'memory'                          => queue['memory'],
-            )
-
-            stats.each_pair do |k, v|
-              service = "#{svc}.#{k}"
-              metric = if k =~ (/details$/) && !v.nil?
-                         v['rate']
-                       else
-                         v
-                       end
-
-              # TODO: Set state via thresholds which can be configured
-
-              report(
-                host: event_host,
-                service: service,
-                metric: metric,
-                description: 'RabbitMQ monitor',
-              )
-            end
-          end
-        end
-      end
-
-      def check_overview
-        uri = URI(overview_url)
-        response = safe_get(uri, event_host)
-
-        return if response.nil?
-
-        json = JSON.parse(response.body)
-
-        if response.status != 200
-          report(
-            host: event_host,
-            service: 'rabbitmq',
-            state: 'critical',
-            description: "HTTP connection error: #{response.status} - #{response.body}",
-          )
-        else
-          report(
-            host: event_host,
-            service: 'rabbitmq monitoring',
-            state: 'ok',
-            description: 'HTTP connection ok',
-          )
-
-          %w[message_stats queue_totals object_totals].each do |stat|
-            # NOTE: / BUG ?
-            # Brand new servers can have blank message stats. Is this ok?
-            # I can't decide.
-            next if json[stat].empty?
-
-            json[stat].each_pair do |k, v|
-              service = "rabbitmq.#{stat}.#{k}"
-              metric = if k =~ /details$/
-                         v['rate']
-                       else
-                         v
-                       end
-
-              # TODO: Set state via thresholds which can be configured
-
-              report(
-                host: event_host,
-                service: service,
-                metric: metric,
-                description: 'RabbitMQ monitor',
-              )
-            end
-          end
-        end
-      end
-
-      def check_node
-        opts[:node].each do |n|
-          uri = URI(node_url(n))
-          response = safe_get(uri, event_host)
-
-          break if response.nil?
-
-          if response.status != 200
-            if response.status == 404
-              report(
-                host: event_host,
-                service: "rabbitmq.node.#{n}",
-                state: 'critical',
-                description: 'Node was not found in the cluster',
-              )
-            else
-              report(
-                host: event_host,
-                service: "rabbitmq.node.#{n}",
-                state: 'critical',
-                description: "HTTP error: #{response.status} - #{response.body}",
-              )
-            end
-            break
-          end
-
-          json = JSON.parse(response.body)
-
-          if json['mem_alarm']
-            report(
-              host: event_host,
-              service: "rabbitmq.node.#{n}",
-              state: 'critical',
-              description: 'Memory alarm has triggered; job submission throttled',
-            )
-            break
-          end
-
-          if json['disk_free_alarm']
-            report(
-              host: event_host,
-              service: "rabbitmq.node.#{n}",
-              state: 'critical',
-              description: 'Disk free alarm has triggered; job submission throttled',
-            )
-            break
-          end
-
-          report(
-            host: event_host,
-            service: "rabbitmq.node.#{n}",
-            state: 'ok',
-            description: 'Node looks OK to me',
-          )
-        end
-      end
-
-      def tick
-        check_overview
-        check_node if opts[:node]
-        check_queues
-      end
-    end
-  end
-end
 Riemann::Tools::Rabbitmq.run

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

@@ -0,0 +1,269 @@
+# frozen_string_literal: true
+
+require 'riemann/tools'
+
+module Riemann
+  module Tools
+    class Rabbitmq
+      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 :monitor_user, 'RabbitMQ monitoring user', type: :string
+      opt :monitor_pass, 'RabbitMQ monitoring user password', type: :string
+      opt :monitor_port, 'RabbitMQ monitoring port', type: :int, default: 15_672
+      opt :monitor_host, 'RabbitMQ monitoring host', type: :string, default: 'localhost'
+      opt :monitor_use_tls, 'RabbitMQ use tls', type: :bool, default: false
+
+      opt :max_queue_size, 'max number of items in a queue that is acceptable', type: :int, default: 1_000_000
+      opt :ignore_max_size_queues, "A regular expression to match queues that shouldn't be size-checked", type: :string
+
+      opt :node, 'Specify a node to monitor', type: :strings
+
+      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"
+      end
+
+      def overview_url
+        "#{base_url}/overview"
+      end
+
+      def node_url(node)
+        "#{base_url}/nodes/#{node}"
+      end
+
+      def queues_url
+        "#{base_url}/queues"
+      end
+
+      def event_host
+        options[:event_host] || :monitor_host
+      end
+
+      def safe_get(uri, event_host)
+        # 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
+          report(
+            host: event_host,
+            service: 'rabbitmq monitoring',
+            state: 'ok',
+            description: 'Monitoring operational',
+          )
+        rescue StandardError => e
+          report(
+            host: event_host,
+            service: 'rabbitmq monitoring',
+            state: 'critical',
+            description: "HTTP connection error: #{e.class} - #{e.message}",
+          )
+        end
+        response
+      end
+
+      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])
+
+        return if response.nil?
+
+        if response.status != 200
+          report(
+            host: event_host,
+            service: 'rabbitmq.queue',
+            state: 'critical',
+            description: "HTTP connection error to /api/queues: #{response.status} - #{response.body}",
+          )
+        else
+          report(
+            host: event_host,
+            service: 'rabbitmq.queue',
+            state: 'ok',
+            description: 'HTTP connection ok',
+          )
+
+          json = JSON.parse(response.body)
+
+          json.each do |queue|
+            svc = "rabbitmq.queue.#{queue['vhost']}.#{queue['name']}"
+            errs = []
+
+            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])
+
+            if errs.empty?
+              report(
+                host: event_host,
+                service: svc,
+                state: 'ok',
+                description: 'Queue is looking good',
+              )
+            else
+              report(
+                host: event_host,
+                service: svc,
+                state: 'critical',
+                description: errs.join('; '),
+              )
+            end
+
+            stats = (queue['message_stats'] || {}).merge(
+              'messages'                        => queue['messages'],
+              'messages_details'                => queue['messages_details'],
+              'messages_ready'                  => queue['messages_ready'],
+              'messages_ready_details'          => queue['messages_ready_details'],
+              'messages_unacknowledged'         => queue['messages_unacknowledged'],
+              'messages_unacknowledged_details' => queue['messages_unacknowledged_details'],
+              'consumers'                       => queue['consumers'],
+              'memory'                          => queue['memory'],
+            )
+
+            stats.each_pair do |k, v|
+              service = "#{svc}.#{k}"
+              metric = if k =~ (/details$/) && !v.nil?
+                         v['rate']
+                       else
+                         v
+                       end
+
+              # TODO: Set state via thresholds which can be configured
+
+              report(
+                host: event_host,
+                service: service,
+                metric: metric,
+                description: 'RabbitMQ monitor',
+              )
+            end
+          end
+        end
+      end
+
+      def check_overview
+        uri = URI(overview_url)
+        response = safe_get(uri, event_host)
+
+        return if response.nil?
+
+        json = JSON.parse(response.body)
+
+        if response.status != 200
+          report(
+            host: event_host,
+            service: 'rabbitmq',
+            state: 'critical',
+            description: "HTTP connection error: #{response.status} - #{response.body}",
+          )
+        else
+          report(
+            host: event_host,
+            service: 'rabbitmq monitoring',
+            state: 'ok',
+            description: 'HTTP connection ok',
+          )
+
+          %w[message_stats queue_totals object_totals].each do |stat|
+            # NOTE: / BUG ?
+            # Brand new servers can have blank message stats. Is this ok?
+            # I can't decide.
+            next if json[stat].empty?
+
+            json[stat].each_pair do |k, v|
+              service = "rabbitmq.#{stat}.#{k}"
+              metric = if k =~ /details$/
+                         v['rate']
+                       else
+                         v
+                       end
+
+              # TODO: Set state via thresholds which can be configured
+
+              report(
+                host: event_host,
+                service: service,
+                metric: metric,
+                description: 'RabbitMQ monitor',
+              )
+            end
+          end
+        end
+      end
+
+      def check_node
+        opts[:node].each do |n|
+          uri = URI(node_url(n))
+          response = safe_get(uri, event_host)
+
+          break if response.nil?
+
+          if response.status != 200
+            if response.status == 404
+              report(
+                host: event_host,
+                service: "rabbitmq.node.#{n}",
+                state: 'critical',
+                description: 'Node was not found in the cluster',
+              )
+            else
+              report(
+                host: event_host,
+                service: "rabbitmq.node.#{n}",
+                state: 'critical',
+                description: "HTTP error: #{response.status} - #{response.body}",
+              )
+            end
+            break
+          end
+
+          json = JSON.parse(response.body)
+
+          if json['mem_alarm']
+            report(
+              host: event_host,
+              service: "rabbitmq.node.#{n}",
+              state: 'critical',
+              description: 'Memory alarm has triggered; job submission throttled',
+            )
+            break
+          end
+
+          if json['disk_free_alarm']
+            report(
+              host: event_host,
+              service: "rabbitmq.node.#{n}",
+              state: 'critical',
+              description: 'Disk free alarm has triggered; job submission throttled',
+            )
+            break
+          end
+
+          report(
+            host: event_host,
+            service: "rabbitmq.node.#{n}",
+            state: 'ok',
+            description: 'Node looks OK to me',
+          )
+        end
+      end
+
+      def tick
+        check_overview
+        check_node if opts[:node]
+        check_queues
+      end
+    end
+  end
+end

data/tools/riemann-riak/Rakefile

@@ -11,10 +11,8 @@ ENV['COPYFILE_DISABLE'] = 'true'
 
 # Gemspec
 gemspec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'riemann-riak'
-
   s.name = 'riemann-riak'
-  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 riak stats to riemann.'
   s.license = 'MIT'
 
-  s.add_dependency 'riemann-tools', '>= 0.2.13'
-  s.add_dependency 'yajl-ruby', '>= 1.1.0'
+  s.add_runtime_dependency 'riemann-tools', '~> 1.0', '>= 1.1.1'
+  s.add_runtime_dependency 'yajl-ruby', '~> 1.4', '>= 1.4.3'
 
-  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|