arborist-snmp 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 833fc064ac6b821016f02ec2b427c7861cc4ebd2
-  data.tar.gz: d14a89c993c13e874b9201388999bb77ac85c06f
+  metadata.gz: 2a1e7f51762b179cee87fda4bc23a7f8e5875cf5
+  data.tar.gz: e4455394ab0a4e0f5affa2aba4053ec915585dad
 SHA512:
-  metadata.gz: be00731e69eae712e71e9881abb20ba9d1393de4acad424b8b2c7225b95d351e211a9c20551556f76fde34e59a551ff2716f9f220a247afa35b529b688301ca5
-  data.tar.gz: bd6b4d1292adec637932fc8edccd62fe1db5fbaea2350995ab9c504e2eb002e36470ca7280742fb9b4eb231523fc8744bcb0d5135017bdf4bae8e23c8d5757bd
+  metadata.gz: 61225e9bd9a10ae9ede1072b30dda70fb93910b2f1210e67d60c368ace730aaebe1ae0ee8b3fadf9ce5e1d85ec33b5970be12d6f0c262def2dc18ef4cf7b2d64
+  data.tar.gz: a725b24835f6d7a9eabd04c7ea36a4fe8ecbdbaab2a3863021aa28d125e1969009b1e8f8d569e42b89586bdbb4137010dbad9d8012b3b98e26c97c64922f0a4e

data/lib/arborist/monitor/snmp.rb

@@ -3,7 +3,7 @@
 #encoding: utf-8
 
 require 'arborist/monitor' unless defined?( Arborist::Monitor )
-require 'net-snmp2'
+require 'netsnmp'
 
 # SNMP checks for Arborist.  Requires an SNMP agent to be installed
 # on target machine, and the various "pieces" enabled for your platform.
@@ -38,13 +38,6 @@ module Arborist::Monitor::SNMP
 		setting :batchsize, default: 25
 	end
 
-	# Indicate to FFI that we're using threads.
-	Net::SNMP.thread_safe = true
-
-
-	# The system type, as advertised.
-	attr_reader :system
-
 	# The mapping of addresses back to node identifiers.
 	attr_reader :identifiers
 
@@ -86,7 +79,7 @@ module Arborist::Monitor::SNMP
 				thr = Thread.new do
 					config = self.identifiers[ host ].last || {}
 					opts = {
-						peername:  host,
+						host:      host,
 						port:      config[ 'port' ]      || Arborist::Monitor::SNMP.port,
 						version:   config[ 'version' ]   || Arborist::Monitor::SNMP.version,
 						community: config[ 'community' ] || Arborist::Monitor::SNMP.community,
@@ -94,22 +87,17 @@ module Arborist::Monitor::SNMP
 						retries:   config[ 'retries' ]   || Arborist::Monitor::SNMP.retries
 					}
 
-					snmp = Net::SNMP::Session.open( opts )
 					begin
-						@system = snmp.get( IDENTIFICATION_OID ).varbinds.first.value
-						yield( host, snmp )
+						NETSNMP::Client.new( opts ) do |snmp|
+							Thread.current[ :system ] = snmp.get( oid: IDENTIFICATION_OID )
+							yield( host, snmp )
+						end
 
-					rescue Net::SNMP::TimeoutError, Net::SNMP::Error => err
-						self.log.error "%s: %s %s" % [ host, err.message, snmp.error_message ]
-						self.results[ host ] = {
-							error: "%s" % [ snmp.error_message ]
-						}
 					rescue => err
+						self.log.error "%s: %s\n%s" % [ host, err.message, err.backtrace.join("\n  ") ]
 						self.results[ host ] = {
-							error: "Uncaught exception. (%s: %s)" % [ err.class.name, err.message ]
+							error: "Exception (%s: %s)" % [ err.class.name, err.message ]
 						}
-					ensure
-						snmp.close
 					end
 				end
 
@@ -135,6 +123,12 @@ module Arborist::Monitor::SNMP
 		@results     = {}
 	end
 
+
+	### Return the current SNMP connection system string.
+	def system
+		return Thread.current[ :system ]
+	end
+
 end # Arborist::Monitor::SNMP
 
 require 'arborist/monitor/snmp/cpu'

data/lib/arborist/monitor/snmp/cpu.rb

@@ -66,18 +66,13 @@ class Arborist::Monitor::SNMP::CPU
 	protected
 	#########
 
-	### Return system CPU data.
-	###
-	def cpu( snmp )
-		return snmp.walk( OIDS[:cpu] )
-	end
-
-
 	### Find load data, add additional niceties for reporting.
 	###
 	def format_load( snmp )
 		info = { cpu: {}, load: {} }
-		cpus = self.cpu( snmp )
+		cpus = snmp.walk( oid: OIDS[:cpu] ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
+		end
 
 		info[ :cpu ][ :count ] = cpus.size
 
@@ -91,20 +86,21 @@ class Arborist::Monitor::SNMP::CPU
 		# alert after X events" pragmas.
 		#
 		if self.system =~ /windows\s+/i
-			info[ :cpu ][ :usage ] = cpus.values.inject( :+ ).to_f / cpus.size
+			info[ :cpu ][ :usage ] = cpus.inject( :+ ).to_f / cpus.size
 			info[ :message ] = "System is %0.1f%% in use." % [ info[ :cpu ][ :usage ] ]
 
+
 		# UCDavis stuff is better for alerting only after there has been
 		# an extended load event.  Use the 5 minute average to avoid
 		# state changes on transient spikes.
 		#
 		else
-			snmp.walk( OIDS[:load] ).each_with_index do |(_, value), idx|
+			snmp.walk( oid: OIDS[:load] ).each_with_index do |(_, value), idx|
 				next unless LOADKEYS[ idx + 1 ]
 				info[ :load ][ LOADKEYS[idx + 1] ] = value.to_f
 			end
 
-			percentage = (( ( info[:load][ :load5 ] / cpus.size ) - 1 ) * 100 ).round( 1 )
+			percentage = (( ( info[:load][ :load5 ] / cpus.size) - 1 ) * 100 ).round( 1 )
 
 			if percentage < 0
 				info[ :message ] = "System is %0.1f%% idle." % [ percentage.abs ]

data/lib/arborist/monitor/snmp/disk.rb

@@ -60,7 +60,7 @@ class Arborist::Monitor::SNMP::Disk
 		# Paths to exclude from checks
 		#
 		setting :exclude,
-			default: [ '^/dev(/.+)?$', '^/net(/.+)?$', '^/proc$', '^/run$', '^/sys/' ] do |val|
+			default: [ '^/dev(/.+)?$', '/dev$', '^/net(/.+)?$', '/proc$', '^/run$', '^/sys/', '/sys$' ] do |val|
 			mounts = Array( val ).map{|m| Regexp.new(m) }
 			Regexp.union( mounts )
 		end
@@ -106,6 +106,7 @@ class Arborist::Monitor::SNMP::Disk
 		excludes = self.format_mounts( config, 'exclude' ) || self.class.exclude
 
 		mounts.reject! do |path, percentage|
+			path = path.to_s
 			excludes.match( path ) || ( includes && ! includes.match( path ) )
 		end
 
@@ -113,12 +114,10 @@ class Arborist::Monitor::SNMP::Disk
 		warnings = []
 		mounts.each_pair do |path, percentage|
 
-			warn = begin
-			  if warn_at.is_a?( Hash )
-				  warn_at[ path ] || WARN_AT
-			  else
-				  warn_at
-			  end
+			warn = if warn_at.is_a?( Hash )
+				warn_at[ path ] || WARN_AT
+			else
+				warn_at
 			end
 
 			self.log.debug "%s:%s -> at %d, warn at %d" % [ host, path, percentage, warn ]
@@ -151,18 +150,32 @@ class Arborist::Monitor::SNMP::Disk
 	### Fetch information for Windows systems.
 	###
 	def windows_disks( snmp )
-		raw = snmp.get_bulk([
+		oids = [
 			STORAGE_WINDOWS[:path],
 			STORAGE_WINDOWS[:type],
 			STORAGE_WINDOWS[:total],
 			STORAGE_WINDOWS[:used]
-		]).varbinds.map( &:value )
+		]
+
+		paths = snmp.walk( oid: oids[0] ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
+		end
+		types = snmp.walk( oid: oids[1] ).each_with_object( [] ) do |(_, value), acc|
+			acc << WINDOWS_DEVICES.include?( value )
+		end
+		totals = snmp.walk( oid: oids[2] ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
+		end
+		used = snmp.walk( oid: oids[3] ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
+		end
 
 		disks = {}
-		raw.each_slice( 4 ) do |device|
-			next unless device[1].respond_to?( :oid ) && WINDOWS_DEVICES.include?( device[1].oid )
-			next if device[2].zero?
-			disks[ device[0] ] = (( device[3].to_f / device[2] ) * 100).round( 1 )
+		paths.each_with_index do |path, idx|
+			next if totals[ idx ].zero?
+			next unless types[ idx ]
+			disks[ path ] ||= {}
+			disks[ path ] = (( used[idx].to_f / totals[idx] ) * 100).round( 1 )
 		end
 
 		return disks
@@ -172,11 +185,16 @@ class Arborist::Monitor::SNMP::Disk
 	### Fetch information for Unix/MacOS systems.
 	###
 	def unix_disks( snmp )
-		raw = snmp.get_bulk([
-			STORAGE_NET_SNMP[:path],
-			STORAGE_NET_SNMP[:percent] ]).varbinds.map( &:value )
+		oids = [ STORAGE_NET_SNMP[:path], STORAGE_NET_SNMP[:percent] ]
+		paths = snmp.walk( oid: oids.first ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
+		end
+		capacities = snmp.walk( oid: oids.last ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
+		end
 
-		return Hash[ *raw ]
+		pairs = paths.zip( capacities )
+		return Hash[ *pairs.flatten ]
 	end
 
 end # class Arborist::Monitor::SNMP::Disk

data/lib/arborist/monitor/snmp/memory.rb

@@ -131,7 +131,7 @@ class Arborist::Monitor::SNMP::Memory
 		info  = { memory: {}, swap: {} }
 		mem_idx, swap_idx = nil
 
-		snmp.walk( MEMORY[:windows][:label] ).each_with_index do |(_, val), i|
+		snmp.walk( oid: MEMORY[:windows][:label] ).each_with_index do |(_, val), i|
 			mem_idx  = i + 1 if val =~ /physical memory/i
 			swap_idx = i + 1 if val =~ /virtual memory/i
 		end
@@ -148,8 +148,8 @@ class Arborist::Monitor::SNMP::Memory
 	###
 	def calc_memory( snmp, oids )
 		info = { usage: 0, available: 0 }
-		avail = snmp.get( oids[:avail] ).varbinds.first.value.to_f
-		total = snmp.get( oids[:total] ).varbinds.first.value.to_f
+		avail = snmp.get( oid: oids[:avail] ).to_f
+		total = snmp.get( oid: oids[:total] ).to_f
 		used  = total - avail
 
 		return info if avail.zero?
@@ -166,9 +166,9 @@ class Arborist::Monitor::SNMP::Memory
 		info = { usage: 0, available: 0 }
 		return info unless idx
 
-		units = snmp.get( MEMORY[:windows][:units] + ".#{idx}" ).varbinds.first.value
-		total = snmp.get( MEMORY[:windows][:total] + ".#{idx}" ).varbinds.first.value.to_f * units
-		used  = snmp.get( MEMORY[:windows][:used] + ".#{idx}" ).varbinds.first.value.to_f * units
+		units = snmp.get( oid: MEMORY[:windows][:units] + ".#{idx}" )
+		total = snmp.get( oid: MEMORY[:windows][:total] + ".#{idx}" ).to_f * units
+		used  = snmp.get( oid: MEMORY[:windows][:used] + ".#{idx}" ).to_f * units
 
 		info[ :usage ]     = (( used / total ) * 100 ).round( 2 )
 		info[ :available ] = (( total - used ) / 1024 / 1024 ).round( 2 )

data/lib/arborist/monitor/snmp/process.rb

@@ -80,7 +80,7 @@ class Arborist::Monitor::SNMP::Process
 
 		# Check against what is running.
 		#
-		Array( config['processes'] || self.class.check ).each do |process|
+		Array( config['check'] || self.class.check ).each do |process|
 			process_r = Regexp.new( process )
 			found = procs.find{|p| p.match(process_r) }
 			errors << "'%s' is not running" % [ process ] unless found
@@ -95,14 +95,24 @@ class Arborist::Monitor::SNMP::Process
 	###
 	def get_windows( snmp )
 		oids = [ PROCESS[:windows][:path], PROCESS[:windows][:list], PROCESS[:windows][:args] ]
-		return snmp.walk( oids ).each_slice( 3 ). each_with_object( [] ) do |vals, acc|
-			path, process, args = vals[0][1], vals[1][1], vals[2][1]
-			next if path.empty?
 
-			process = "%s%s" % [ path, process ]
-			process << " %s" % [ args ] unless args.empty?
-			acc << process
+		paths = snmp.walk( oid: oids[0] ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
+		end
+		procs = snmp.walk( oid: oids[1] ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
+		end
+		args = snmp.walk( oid: oids[2] ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
 		end
+
+		return paths.zip( procs, args ).collect do |(path, process, arg)|
+			next unless path && process
+			next if path.empty?
+			path << process unless process.empty?
+			path << " %s" % [ arg.to_s ] if arg && ! arg.empty?
+			path
+		end.compact
 	end
 
 
@@ -110,13 +120,19 @@ class Arborist::Monitor::SNMP::Process
 	###
 	def get_procs( snmp )
 		oids = [ PROCESS[:netsnmp][:list], PROCESS[:netsnmp][:args] ]
-		return snmp.walk( oids ).each_slice( 2 ).each_with_object( [] ) do |vals, acc|
-			process, args = vals[0][1], vals[1][1]
-			next if process.empty?
 
-			process << " %s" % [ args ] unless args.empty?
-			acc << process
+		procs = snmp.walk( oid: oids.first ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
+		end
+		args = snmp.walk( oid: oids.last ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
 		end
+
+		return procs.zip( args ).collect do |(process, arg)|
+			next if process.empty?
+			process << " %s" % [ arg.to_s ] unless arg.empty?
+			process
+		end.compact
 	end
 
 end # class Arborist::Monitor::SNMP::Process

data/lib/arborist/snmp.rb

@@ -14,10 +14,10 @@ module Arborist::SNMP
 
 
 	# Package version
-	VERSION = '0.4.0'
+	VERSION = '0.5.0'
 
 	# Version control revision
-	REVISION = %q$Revision: e0b7c95a154f $
+	REVISION = %q$Revision: e4f0fd44734d $
 
 
 	### Return the name of the library with the version, and optionally the build ID if

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arborist-snmp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mahlon E. Smith <mahlon@martini.nu>
@@ -31,7 +31,7 @@ cert_chain:
   n0YyneERGuHPSRZFgo72tGOqLpAlWnhPxRNqnayZmsg3hPPI87B6MTUI2UQ7VUdh
   UrSf3b+cPoC8PNfjp8zsdw==
   -----END CERTIFICATE-----
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arborist
@@ -48,19 +48,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: net-snmp2
+  name: netsnmp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: xorcist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.1'
 description: "\tThis library adds common SNMP resource support to Arborist monitors.\n"
 email: mahlon@martini.nu
 executables: []
@@ -93,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: SNMP support for Arborist monitors