riemann-tools 0.2.7 → 0.2.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 210cb204200a12c61ba5387331a58d573a4cf004
+  data.tar.gz: a06f02966d09ba2009d19331da18c91f4e237f2f
+SHA512:
+  metadata.gz: c61c8d015c9a1a494ab7e2311cd80d5a774eb1c089f5a2ca891b797aa7c2a4021fe4523f365c97256bfdbae3e6e781f5cafde649271e61fac90eb12b752650bf
+  data.tar.gz: 70a6995d1ce99d458b009ec94e28f4b417bfa14f24eeb2862b1073abb48100ec3f0799c70466b99347e6639d6d656367648ac3ff450d5b77558757d38f31db53

data/README.markdown

@@ -4,15 +4,73 @@ Riemann Tools
 Tiny programs to submit events to Riemann.
 
 Riemann-health, for example, submits events about the current CPU, load,
-memory, and disk use. Bench submits randomly distributed metrics for load
-testing. I've got a whole bunch of these internally for monitoring Redis, Riak,
-queues, etc. Most have internal configuration dependencies, so it'll be a while
-before I can extract them for re-use.
+memory, and disk use. Also available is `riemann-bench`, which submits
+randomly distributed metrics for load testing.
 
 Get started
-==========
+===========
 
 ``` bash
 gem install riemann-tools
 riemann-health --host my.riemann.server
 ```
+Riemann-tools programs
+======================
+
+This repository contains a number of different programs. Some of them
+ship with the `riemann-tools` gem, including:
+
+* riemann-apache-status - Apache monitoring.
+* riemann-dir-files-count - File counts.
+* riemann-freeswitch - FreeSwitch monitoring.
+* riemann-memcached - Monitor Memcache.
+* riemann-proc - Linux process monitoring.
+* riemann-bench - Load testing for Riemann.
+* riemann-dir-space - Directory space monitoring.
+* riemann-haproxy - Monitor HAProxy.
+* riemann-net - Network interface monitoring.
+* riemann-varnish - Monitor Varnish.
+* riemann-cloudant - Cloudant monitoring.
+* riemann-diskstats - Disk statistics.
+* riemann-health - General CPU, memory, disk and load monitoring.
+* riemann-nginx-status - Monitor Nginx.
+* riemann-zookeeper - Monitor Zookeeper.
+* riemann-consul - Monitor Consul.
+* riemann-fd - Linux file descriptor use.
+* riemann-kvminstance - Monitor KVM instances.
+* riemann-ntp - Monitor NTP
+
+Also contained in the repository are a number of stand-alone monitoring
+tools, which are shipped as separate gems.
+
+Riemann stand-alone tools
+=========================
+
+Use these tools by installing their individual gems, usually named for
+the specific tool, for example:
+
+```bash
+gem install riemann-aws
+```
+
+To install the AWS tools.
+
+* riemann-aws - Monitor various AWS services.
+* riemann-elasticsearch - Monitor Elasticsearch.
+* riemann-mesos - Monitor Mesos.
+* riemann-rabbitmq - Monitor RabbitMQ.
+* riemann-docker - Monitor Docker.
+* riemann-marathon - Monitor Marathon.
+* riemann-munin - Monitor Munin.
+* riemann-riak - Monitor Riak.
+
+There are also a number of additional, stand-alone tools, contained in
+the [Riemann GitHub account](https://github.com/riemann/).
+
+License
+=======
+
+The MIT License
+
+Copyright (c) 2011-2016 Kyle Kingsbury
+

data/bin/riemann-consul

@@ -0,0 +1,106 @@
+#!/usr/bin/env ruby
+
+# Reports service and node status to riemann
+
+require File.expand_path('../../lib/riemann/tools', __FILE__)
+require 'socket'
+require 'net/http'
+require 'uri'
+require 'json'
+
+class Riemann::Tools::ConsulHealth
+  include Riemann::Tools
+
+  opt :consul_host, "Consul API Host (default to localhost)", :default => "localhost"
+  opt :consul_port, "Consul API Host (default to 8500)", :default => "8500"
+  opt :prefix, "prefix to use for all service names when reporting", :default => "consul "
+  opt :minimum_services_per_node, "minimum services per node (default: 0)", :default => 0
+
+  def initialize
+
+    @hostname = opts[:consul_host]
+    @prefix = opts[:prefix]
+    @minimum_services_per_node = opts[:minimum_services_per_node]
+    @underlying_ip = IPSocket.getaddress(@hostname)
+    @consul_leader_url = URI.parse("http://" + opts[:consul_host] + ":" + opts[:consul_port] + "/v1/status/leader")
+    @consul_services_url = URI.parse("http://" + opts[:consul_host] + ":" + opts[:consul_port] + "/v1/catalog/services")
+    @consul_nodes_url = URI.parse("http://" + opts[:consul_host] + ":" + opts[:consul_port] + "/v1/catalog/nodes")
+    @consul_health_url_prefix = "http://" + opts[:consul_host] + ":" + opts[:consul_port] + "/v1/health/service/"
+
+    @last_services_read = Hash.new
+
+  end
+
+  def alert(hostname, service, state, metric, description)
+
+    opts = {  :host => hostname,
+              :service => service.to_s,
+              :state => state.to_s,
+              :metric => metric,
+              :description => description }
+
+    report(opts)
+  end
+
+  def get(url)
+    Net::HTTP.get_response(url).body
+  end
+
+  def tick
+
+    leader = get(@consul_leader_url)
+    leader_hostname = URI.parse("http://" + leader[1..-2]).hostname
+
+    if (leader_hostname == @underlying_ip)
+      nodes = JSON.parse(get(@consul_nodes_url))
+      services = JSON.parse(get(@consul_services_url))
+      services_by_nodes = Hash.new
+
+      for node in nodes
+        node_name = node["Node"]
+        services_by_nodes[node_name] = 0
+      end
+
+
+      # For every service
+      for service in services
+        service_name = service[0]
+        health_url = URI.parse(@consul_health_url_prefix + service_name)
+        health_nodes = JSON.parse(get(health_url))
+
+        totalCount = 0
+        okCount = 0
+
+        for node in health_nodes
+          hostname = node["Node"]["Node"]
+          ok = node["Checks"].all? {|check| check["Status"] == "passing"}
+          alert(hostname, "#{@prefix}#{service_name}", ok ? :ok : :critical, ok ? 1 : 0, JSON.generate(node))
+          totalCount += 1
+          okCount += ok ? 1 : 0
+
+          last_services_by_nodes = services_by_nodes[hostname].to_i
+          services_by_nodes[hostname] = last_services_by_nodes + 1
+        end
+
+        if (@last_services_read[service_name] != nil)
+          lastOk = @last_services_read[service_name]
+          if (lastOk != okCount)
+            alert("total", "#{@prefix}#{service_name}-count", okCount >= lastOk ? :ok : :critical, okCount, "Number of passing #{service_name} is: #{okCount}/#{totalCount}, Last time it was: #{lastOk}")
+          end
+        end
+
+        @last_services_read[service_name] = okCount
+
+      end
+
+      # For every node
+      for node,count in services_by_nodes
+        alert(node, "#{@prefix}total-services", (count >= @minimum_services_per_node) ? :ok : :critical, count, "#{count} services in the specified node")
+      end
+
+    end
+
+  end
+end
+
+Riemann::Tools::ConsulHealth.run

data/bin/riemann-haproxy

@@ -26,11 +26,17 @@ class Riemann::Tools::Haproxy
             :host    => @uri.host,
             :service => "#{ns} #{property}",
             :metric  => metric.to_f,
-            :state   =>  (['UP', 'OPEN'].include?(row['status']) ? 'ok' : 'critical'),
             :tags    => ['haproxy']
           )
         end
       end
+
+      report(
+        :host    => @uri.host,
+        :service => "#{ns} state",
+        :state   => (['UP', 'OPEN'].include?(row['status']) ? 'ok' : 'critical'),
+        :tags    => ['haproxy']
+      )
     end
   end
 

data/bin/riemann-health

@@ -27,6 +27,7 @@ class Riemann::Tools::Health
     case (ostype = `uname -s`.chomp.downcase)
     when 'darwin'
       @cores = `sysctl -n hw.ncpu`.to_i
+      @df = `df -P -t noiso9660`
       @cpu = method :darwin_cpu
       @disk = method :disk
       @load = method :darwin_load
@@ -34,12 +35,14 @@ class Riemann::Tools::Health
       darwin_top
     when 'freebsd'
       @cores = `sysctl -n hw.ncpu`.to_i
+      @df = `df -P -t noiso9660`
       @cpu = method :freebsd_cpu
       @disk = method :disk
       @load = method :freebsd_load
       @memory = method :freebsd_memory
     else
       @cores = cores
+      @df = `df -P --exclude-type=iso9660`
       puts "WARNING: OS '#{ostype}' not explicitly supported. Falling back to Linux" unless ostype == "linux"
       @cpu = method :linux_cpu
       @disk = method :disk
@@ -243,7 +246,7 @@ class Riemann::Tools::Health
   end
 
   def disk
-    `df -P`.split(/\n/).each do |r|
+    @df.split(/\n/).each do |r|
       f = r.split(/\s+/)
       next if f[0] == 'Filesystem'
       next unless f[0] =~ /\// # Needs at least one slash in the mount path

data/bin/riemann-net

@@ -6,7 +6,7 @@ require File.expand_path('../../lib/riemann/tools', __FILE__)
 
 class Riemann::Tools::Net
   include Riemann::Tools
-  
+
   opt :interfaces, "Interfaces to monitor", :type => :strings, :default => nil
   opt :ignore_interfaces, "Interfaces to ignore", :type => :strings, :default =>['lo']
 

data/lib/riemann/tools.rb

@@ -55,7 +55,7 @@ module Riemann
     def report(event)
       if options[:tag]
         # Work around a bug with beefcake which can't take frozen strings.
-        event[:tags] = options[:tag].map(&:dup)
+        event[:tags] = [*event.fetch(:tags, [])] + options[:tag].map(&:dup)
       end
 
       event[:ttl] ||= (options[:ttl] || (options[:interval] * 2))
@@ -63,7 +63,7 @@ module Riemann
       if options[:event_host]
         event[:host] = options[:event_host].dup
       end
-      
+
       event = event.merge(attributes)
 
       riemann << event

metadata

@@ -1,218 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.7
-  prerelease: 
+  version: 0.2.8
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.16.2
 - !ruby/object:Gem::Dependency
-  name: munin-ruby
+  name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '0'
 description: Utilities which submit events to Riemann.
 email: aphyr@aphyr.com
 executables:
-- riemann-aws-status
-- riemann-munin
-- riemann-dir-space
-- riemann-zookeeper
-- riemann-resmon
+- riemann-apache-status
 - riemann-bench
-- riemann-aws-rds-status
-- riemann-proc
-- riemann-freeswitch
-- riemann-aws-billing
-- riemann-elb-metrics
-- riemann-riak
-- riemann-health
+- riemann-cloudant
+- riemann-consul
 - riemann-dir-files-count
-- riemann-varnish
-- riemann-memcached
-- riemann-haproxy
-- riemann-elasticsearch
-- riemann-riak-keys
+- riemann-dir-space
 - riemann-diskstats
 - riemann-fd
-- riemann-riak-ring
-- riemann-cloudant
-- riemann-nginx-status
-- riemann-rabbitmq
-- riemann-ntp
+- riemann-freeswitch
+- riemann-haproxy
+- riemann-health
 - riemann-kvminstance
+- riemann-memcached
 - riemann-net
-- riemann-apache-status
+- riemann-nginx-status
+- riemann-ntp
+- riemann-proc
+- riemann-varnish
+- riemann-zookeeper
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/riemann/tools.rb
+- LICENSE
+- README.markdown
 - bin/riemann-apache-status
-- bin/riemann-aws-billing
-- bin/riemann-aws-rds-status
-- bin/riemann-aws-status
 - bin/riemann-bench
 - bin/riemann-cloudant
+- bin/riemann-consul
 - bin/riemann-dir-files-count
 - bin/riemann-dir-space
 - bin/riemann-diskstats
-- bin/riemann-elasticsearch
-- bin/riemann-elb-metrics
 - bin/riemann-fd
 - bin/riemann-freeswitch
 - bin/riemann-haproxy
 - bin/riemann-health
 - bin/riemann-kvminstance
 - bin/riemann-memcached
-- bin/riemann-munin
 - bin/riemann-net
 - bin/riemann-nginx-status
 - bin/riemann-ntp
 - bin/riemann-proc
-- bin/riemann-rabbitmq
-- bin/riemann-resmon
-- bin/riemann-riak
-- bin/riemann-riak-keys
-- bin/riemann-riak-ring
 - bin/riemann-varnish
 - bin/riemann-zookeeper
-- LICENSE
-- README.markdown
+- lib/riemann/tools.rb
 homepage: https://github.com/aphyr/riemann-tools
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: riemann-tools
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Utilities which submit events to Riemann.
 test_files: []