riemann-tools 0.2.11 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 379e84d65f11764bb686f8e6f0e30de4d781aba2
-  data.tar.gz: 471fa6319632b5d50a5a353a817049cd2637fbe6
+  metadata.gz: 524cc2711592ff6612b4bcde6b96ab3fa11ae537
+  data.tar.gz: b1091049d8dac7ac940bc17f08484b4c4466e3f1
 SHA512:
-  metadata.gz: a514901352bad1d586732b665f03de228d05eb5540dbfbd78bea7c558f523dc17f7f7a5f8d6b21930367d23eb70d288d443a9c964395c130194422bc32ac9ee2
-  data.tar.gz: 49fffcc4b0712fe5ac27e92ccf36278d09c85c31cc7004975514d49f9fcd4ba23c233a5e1268cd741712f9bf0e5b6268723672c446b6a710e1958f96fa45e7f3
+  metadata.gz: ba5628dc40a128aed32394cdce2a8a6a63506c6eeb488d736ab1fa678c34fb209f260ff3dbfcc1c08de5c7cd35fcef57d38bb0058993fa7af417a8125a2c5555
+  data.tar.gz: 7c2db71785ca6e9f4effd8ef383156a9baf3337e6b9dc9ddd293b01c2578e4b0faf8f5dc1daeebd998f219cd5561b88283e29c04edbcb0f2f4eabad090a8b8ab

data/README.markdown

@@ -38,7 +38,8 @@ ship with the `riemann-tools` gem, including:
 * riemann-consul - Monitor Consul.
 * riemann-fd - Linux file descriptor use.
 * riemann-kvminstance - Monitor KVM instances.
-* riemann-ntp - Monitor NTP
+* riemann-ntp - Monitor NTP.
+* riemann-portcheck - Monitor open TCP ports.
 
 Also contained in the repository are a number of stand-alone monitoring
 tools, which are shipped as separate gems.

data/bin/riemann-consul

@@ -48,8 +48,8 @@ class Riemann::Tools::ConsulHealth
 
   def tick
 
-    leader = get(@consul_leader_url)
-    leader_hostname = URI.parse("http://" + leader[1..-2]).hostname
+    leader = JSON.parse(get(@consul_leader_url))
+    leader_hostname = URI.parse("http://" + leader).hostname
 
     if (leader_hostname == @underlying_ip)
       nodes = JSON.parse(get(@consul_nodes_url))

data/bin/riemann-health

@@ -36,8 +36,20 @@ class Riemann::Tools::Health
       @cores = `sysctl -n hw.ncpu`.to_i
       @cpu = method :freebsd_cpu
       @disk = method :disk
-      @load = method :freebsd_load
+      @load = method :bsd_load
       @memory = method :freebsd_memory
+    when 'openbsd'
+      @cores = `sysctl -n hw.ncpu`.to_i
+      @cpu = method :openbsd_cpu
+      @disk = method :disk
+      @load = method :bsd_load
+      @memory = method :openbsd_memory
+    when 'sunos'
+      @cores = `mpstat -a 2>/dev/null`.split[33].to_i
+      @cpu = method :sunos_cpu
+      @disk = method :disk
+      @load = method :bsd_load
+      @memory = method :sunos_memory
     else
       @cores = `nproc`.to_i
       puts "WARNING: OS '#{@ostype}' not explicitly supported. Falling back to Linux" unless @ostype == "linux"
@@ -145,7 +157,47 @@ class Riemann::Tools::Health
     @old_cpu = [u2, n2, s2, t2, i2]
   end
 
-  def freebsd_load
+  def openbsd_cpu
+    u2, n2, s2, t2, i2 = `sysctl -n kern.cp_time 2>/dev/null`.split(',').map{ |e| e.to_i } #OpenBSD separates with ,
+
+    if @old_cpu
+      u1, n1, s1, t1, i1 = @old_cpu
+
+      used = (u2+n2+s2+t2) - (u1+n1+s1+t1)
+      total = used + i2-i1
+      fraction = used.to_f / total
+
+      report_pct :cpu, fraction, "user+nice+sytem+interrupt\n\n#{`ps -axo pcpu,pid,comm | sort -nrb -k1 | head -10`.chomp}"
+    end
+
+    @old_cpu = [u2, n2, s2, t2, i2]
+  end
+
+  def sunos_cpu
+    mpstats = `mpstat -a 2>/dev/null`.split
+    u2 = mpstats[29].to_i
+    s2 = mpstats[30].to_i
+    t2 = mpstats[31].to_i
+    i2 = mpstats[32].to_i
+
+    if @old_cpu
+      u1, s1, t1, i1 = @old_cpu
+
+      used = (u2+s2+t2) - (u1+s1+t1)
+      total = used + i2-i1
+      if i2 == i1 && used == 0 #If the system is <1% used in both samples then total will be 0 + (99 - 99), avoid a div by 0
+        fraction = 0
+      else
+        fraction = used.to_f / total
+      end
+
+      report_pct :cpu, fraction, "user+sytem+interrupt\n\n#{`ps -ao pcpu,pid,comm | sort -nrb -k1 | head -10`.chomp}"
+    end
+
+    @old_cpu = [u2, s2, t2, i2]
+  end
+
+  def bsd_load
     m = `uptime`.split(':')[-1].chomp.gsub(/\s+/,'').split(',')
     load = m[0].to_f / @cores
     if load > @limits[:load][:critical]
@@ -164,6 +216,21 @@ class Riemann::Tools::Health
     report_pct :memory, fraction, "used\n\n#{`ps -axo pmem,pid,comm | sort -nrb -k1 | head -10`.chomp}"
   end
 
+  def openbsd_memory
+    meminfo = `vmstat 2>/dev/null`.chomp.split
+    fraction = meminfo[28].to_f / meminfo[29].to_f #The ratio of active to free memory unlike the others :(
+
+    report_pct :memory, fraction, "used\n\n#{`ps -axo pmem,pid,comm | sort -nrb -k1 | head -10`.chomp}"
+  end
+
+  def sunos_memory
+    meminfo = `vmstat 2>/dev/null`.chomp.split
+    total_mem = `prtconf | grep Memory`.split[2].to_f * 1024 # reports in GB but vmstat is in MB
+    fraction = ( total_mem - meminfo[32].to_f ) / total_mem
+
+    report_pct :memory, fraction, "used\n\n#{`ps -ao pmem,pid,comm | sort -nrb -k1 | head -10`.chomp}"
+  end
+
   def darwin_top
     raw = `top -l 1 | grep -i "^\\(cpu\\|physmem\\|load\\)"`.chomp
     @topdata = {:stamp => Time.now.to_i }
@@ -227,8 +294,10 @@ class Riemann::Tools::Health
 
   def df
     case @ostype
-    when 'darwin', 'freebsd'
+    when 'darwin', 'freebsd', 'openbsd'
       `df -P -t noiso9660`
+    when 'sunos'
+      `df -P` # Is there a good way to exlude iso9660 here?
     else
       `df -P --exclude-type=iso9660`
     end

data/bin/riemann-net

@@ -79,13 +79,13 @@ class Riemann::Tools::Net
         delta = metric - @old_state[service]
         svc_state = case service
           when /drop$/
-            if metric > 0
+            if delta > 0
               'warning'
             else
               'ok'
             end
           when /errs$/
-            if metric > 0
+            if delta > 0
               'warning'
             else
               'ok'

data/bin/riemann-portcheck

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+
+# Checks for open tcp ports.
+# (c) Max Voit 2017
+
+require File.expand_path('../../lib/riemann/tools', __FILE__)
+
+class Riemann::Tools::Portcheck
+  include Riemann::Tools
+  require 'socket'
+
+  opt :hostname, "Host, defaults to localhost", :default => `hostname`.chomp
+  opt :ports, "List of ports to check, e.g. '-r 80 443'", :type => :ints
+
+  def initialize
+    @hostname = opts.fetch(:hostname)
+    @ports = opts.fetch(:ports)
+  end
+
+  def tick
+    for thisport in @ports
+	  # try opening tcp connection with 5s timeout;
+      # if this fails, the port is considered closed
+      portopen = Socket.tcp(@hostname, thisport, connect_timeout: 5) { true } rescue false
+        if portopen
+          state = "ok"
+        else
+          state = "critical"
+        end
+      report(
+        :host    => "#{@hostname}",
+        :service => "port #{thisport}",
+        :state   => "#{state}",
+        :tags    => ["portcheck"]
+      )
+    end
+  end
+
+end
+
+Riemann::Tools::Portcheck.run

data/bin/riemann-proc

@@ -50,7 +50,7 @@ class Riemann::Tools::Proc
     # value should be either process RSS, VSIZE, or 1 if running
     # state is always unknown for the moment
     #
-    ps_regex = /([0-9]+)[ ]+([0-9]+)[ ]+([0-9]+)[ ]+([A-Z])[ ]+([0-9:.]+)[ ]+[A-Za-z]{3}[ ]+([A-Za-z]{3} [0-9]+ [0-9:]+ [0-9]+)[ ]+(.*)/
+    ps_regex = /([0-9]+)[ ]+([0-9]+)[ ]+([0-9]+)[ ]+([A-Z])[ ]+([0-9:.]+)[ ]+[A-Za-z]{3}[ ]+([A-Za-z]{3}[ ]{1,2}[0-9]+ [0-9:]+ [0-9]+)[ ]+(.*)/
     found.each_line do |line|
       m = ps_regex.match(line)
       if not m.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.13
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-04 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -42,38 +42,39 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 description: Utilities which submit events to Riemann.
 email: aphyr@aphyr.com
 executables:
-- riemann-apache-status
-- riemann-bench
-- riemann-cloudant
-- riemann-consul
-- riemann-dir-files-count
+- riemann-kvminstance
 - riemann-dir-space
-- riemann-diskstats
+- riemann-bench
+- riemann-net
 - riemann-fd
-- riemann-freeswitch
+- riemann-dir-files-count
+- riemann-zookeeper
 - riemann-haproxy
-- riemann-health
-- riemann-kvminstance
-- riemann-memcached
-- riemann-net
+- riemann-consul
+- riemann-freeswitch
+- riemann-apache-status
 - riemann-nginx-status
-- riemann-ntp
 - riemann-proc
+- riemann-portcheck
+- riemann-ntp
+- riemann-health
+- riemann-memcached
 - riemann-varnish
-- riemann-zookeeper
+- riemann-diskstats
+- riemann-cloudant
 extensions: []
 extra_rdoc_files: []
 files:
@@ -95,6 +96,7 @@ files:
 - bin/riemann-net
 - bin/riemann-nginx-status
 - bin/riemann-ntp
+- bin/riemann-portcheck
 - bin/riemann-proc
 - bin/riemann-varnish
 - bin/riemann-zookeeper
@@ -119,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riemann-tools
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Utilities which submit events to Riemann.