arborist-snmp 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2018a5dacf04f2cd6b821c5438fe71b2950d512f4c3f8e1f398c6cba4ca7f52
-  data.tar.gz: '084f3b0db42917d34889931ca62a7f45830975024d410b35b715f64d87be1566'
+  metadata.gz: 4228ee82fe30505164e68c53d64f067c0ff3a2cff6fc1f9b58b573eea6b6dfb9
+  data.tar.gz: 680f22d6e97ece0699cf02851d698fdb478588239b9c0a921ef72909dc1dd3dc
 SHA512:
-  metadata.gz: 174317ae1282ceadba0660f528e51147395801a3f26956acc950e44159f53567f4393d1f171e1378067ef441f2aac340b196b0902ff0a455f61dc0eed20a68c6
-  data.tar.gz: 2e23e9e51ba7b583396f6b35d522e6d855dec586c619ba11c4e6004a6e53590ecd404c8d9cc222abbdf4defdc27d5675ae1e00e8dc3964e886cb3a06cd8d6567
+  metadata.gz: bf3c4613ca94861b2744e8e461e70142701c1205d07169fc05de0fc7111b22382e34414804fde1bf399eca2363d206b91efe20bfbe2b5941ad3b22c8c9f4c52b
+  data.tar.gz: 7d089aa2b0bac1a86118659c0aa4efb82b50363f13588d21ecb1359c62650df55a7016e0d47545824c4d7a2d04adba67c8dd6e393fcc7b8516a20a5cdb43a81a

data.tar.gz.sig

@@ -0,0 +1,3 @@
+|U�M�8D�n�s���P]+a<��J��w�Y*��q�l���4�U����/j�,O*��*\k�����Q�; ��6S���f3�E�dvR���k�8?#���7`mq�D���SKG����XH,�s�nD� I[zȭ���fZ��kQ���Jbh���^�������@.ס�ΉחT�[��n�;
+
+�W����2f�s7�2/�I�	o��hD�
<Sl��筒�m2����F���Z@�o�5Ё��-�~mY��C���j�`���14��w{�&^X�����О�Y�B�;��2�[�

data/lib/arborist/monitor/snmp.rb

@@ -57,7 +57,7 @@ module Arborist::Monitor::SNMP
 		nodes.each_pair do |(identifier, props)|
 			next unless props.key?( 'addresses' )
 			address = props[ 'addresses' ].first
-			self.identifiers[ address ] = [ identifier, props['config'] ]
+			self.identifiers[ address ] = [ identifier, props ]
 		end
 
 		# Perform the work!

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

@@ -117,7 +117,7 @@ class Arborist::Monitor::SNMP::CPU
 	def find_load( host, snmp )
 		info = self.format_load( snmp )
 
-		config  = identifiers[ host ].last || {}
+		config  = self.identifiers[ host ].last['config'] || {}
 		warn_at = config[ 'warn_at' ] || self.class.warn_at
 		usage   = info.dig( :cpu, :usage ) || 0
 

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

@@ -70,7 +70,9 @@ class Arborist::Monitor::SNMP::Disk
 	### Return the properties used by this monitor.
 	###
 	def self::node_properties
-		return USED_PROPERTIES
+		used_properties = USED_PROPERTIES.dup
+		used_properties << :mounts
+		return used_properties
 	end
 
 
@@ -98,22 +100,23 @@ class Arborist::Monitor::SNMP::Disk
 	### +snmp+ connection.
 	###
 	def gather_disks( host, snmp )
-		mounts  =  self.system =~ /windows\s+/i ? self.windows_disks( snmp ) : self.unix_disks( snmp )
-		config  = self.identifiers[ host ].last || {}
-		warn_at = config[ 'warn_at' ] || self.class.warn_at
+		current_mounts = self.system =~ /windows\s+/i ? self.windows_disks( snmp ) : self.unix_disks( snmp )
+		config         = self.identifiers[ host ].last['config'] || {}
+		warn_at        = config[ 'warn_at' ] || self.class.warn_at
+
+		self.log.warn self.identifiers[ host ]
 
 		includes = self.format_mounts( config, 'include' ) || self.class.include
 		excludes = self.format_mounts( config, 'exclude' ) || self.class.exclude
 
-		mounts.reject! do |path, percentage|
+		current_mounts.reject! do |path, percentage|
 			path = path.to_s
 			excludes.match( path ) || ( includes && ! includes.match( path ) )
 		end
 
 		errors   = []
 		warnings = []
-		mounts.each_pair do |path, percentage|
-
+		current_mounts.each_pair do |path, percentage|
 			warn = if warn_at.is_a?( Hash )
 				warn_at[ path ] || WARN_AT
 			else
@@ -131,6 +134,13 @@ class Arborist::Monitor::SNMP::Disk
 			end
 		end
 
+		# Remove any past mounts that configuration exclusions should
+		# now omit.
+		mounts = self.identifiers[ host ].last[ 'mounts' ] || {}
+		mounts.keys.each{|k| mounts[k] = nil }
+
+		mounts.merge!( current_mounts )
+
 		self.results[ host ] = { mounts: mounts }
 		self.results[ host ][ :error ]   = errors.join(', ')   unless errors.empty?
 		self.results[ host ][ :warning ] = warnings.join(', ') unless warnings.empty?

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

@@ -84,7 +84,7 @@ class Arborist::Monitor::SNMP::Memory
 	def gather_memory( host, snmp )
 		info = self.system =~ /windows\s+/i ? self.get_windows( snmp ) : self.get_mem( snmp )
 
-		config           = identifiers[ host ].last || {}
+		config           = self.identifiers[ host ].last['config'] || {}
 		physical_warn_at = config[ 'physical_warn_at' ] || self.class.physical_warn_at
 		swap_warn_at     = config[ 'swap_warn_at' ] || self.class.swap_warn_at
 

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

@@ -71,7 +71,7 @@ class Arborist::Monitor::SNMP::Process
 	#### +snmp+ connection.
 	###
 	def gather_processlist( host, snmp )
-		config = self.identifiers[ host ].last || {}
+		config = self.identifiers[ host ].last['config'] || {}
 		errors = []
 		procs  = self.system =~ /windows\s+/i ? self.get_windows( snmp ) : self.get_procs( snmp )
 

data/lib/arborist/monitor/snmp/ups/battery.rb

@@ -104,7 +104,7 @@ class Arborist::Monitor::SNMP::UPS::Battery
 	def check_battery( host, snmp )
 		info = self.format_battery( snmp )
 
-		config    = identifiers[ host ].last || {}
+		config    = self.identifiers[ host ].last['config'] || {}
 		cap_warn  = config[ 'capacity_warn_at' ] || self.class.capacity_warn_at
 		temp_warn = config[ 'temperature_warn_at' ] || self.class.temperature_warn_at
 

data/lib/arborist/snmp.rb

@@ -14,7 +14,7 @@ module Arborist::SNMP
 
 
 	# Package version
-	VERSION = '0.6.1'
+	VERSION = '0.6.2'
 
 	# Version control revision
 	REVISION = %q$Revision$

metadata

@@ -1,15 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: arborist-snmp
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Mahlon E. Smith <mahlon@martini.nu>
 - Michael Granger <ged@faeriemud.org>
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdtYWhs
+  b24vREM9bWFydGluaS9EQz1udTAeFw0yMDAyMTkyMTU4NDBaFw0yMTAyMTgyMTU4
+  NDBaMCIxIDAeBgNVBAMMF21haGxvbi9EQz1tYXJ0aW5pL0RDPW51MIIBojANBgkq
+  hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA3cz7ILM8n+Y5nvz7mVRVqE8LusWdT8NX
+  nlnETynDndenI+a2S3j22DR+U4ooGUjuCHE3iR1CVmTDGbxFfNRfmnC1AN9Hybat
+  ewW+onvMBye7yfO0bJB5vkqaW5vd35rzquOffgBtJMo7rPRu6pX8RkL34Wnew4J7
+  POooUcYbWSAO934HSCUC8wVm6b4v/ejVF1Lk44Dz45jtMqtR7KTAtpipdbTXAarO
+  HQy3eVes/0oTqhk4CP50r1KP09nUHTn2lzVaCN9vmNE/Jwe0AuQ9ImvZXPpCsMMl
+  V03/tuJ++48sVmOIusJkASPupXcdI6zqsjYw2vLMFtuYNskRSvwbn6Wm6x9hLWWj
+  IRp5FvHPORLRCHFizXRmXZ3PyFHqbv6m4yG0SyfMzOXPk3Hn5dqqmK+BFCihTZIN
+  fqpBmuxyNEE21fSO9ALLlWeW9ffg9Ye5Sc1n3yEyv8rPb9VDvi1B5N6xIcDFMNVs
+  RiCamNbET4Sq9VIYwYtcB1f6EataqFEhAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBR8KtAhZIhe2uPQHCgU5HurIG7crTAcBgNVHREE
+  FTATgRFtYWhsb25AbWFydGluaS5udTAcBgNVHRIEFTATgRFtYWhsb25AbWFydGlu
+  aS5udTANBgkqhkiG9w0BAQsFAAOCAYEAHXlLXIKQUjd0VYj2mPgMheMjLEtmhHu+
+  7NdIv8Bz4rpKAdhypy30xjukGLTOKBp1C0TjfHXowW/icK0bv9CO9Chbc09/+Ed2
+  K5IsyENen+YLeLfE8dguq5tHlfocbFilRGHt8BHHO9BpPpAYoPt/76SCC2NaU5vN
+  33YTCpaVP0raS6E4i+xtx5PNdKoeTdrgwCQtUBhGf3L9YbZy1UaSeAyng5keuOzV
+  Mu2osihEB0GE0pOZJNpI6ow+0emwN/XvBKHpN9D2bjbvKetyQSrm0OniaZBXIGzW
+  Bg0JmajxUaGYWnz+QFADT+HLPmekxF3mB4+0ymZCHKPC+04h6RDjvkEOji6Jm+VB
+  JHjnceUEejSXTkZAKAmiOAtnX4j1MM1DLiFMlZ5Wbt7hbiOiO5HoN9p9snZhYqSU
+  JyAQQloqY/KyzQqxPlKdMNmBxRU+Cdarp05lEI6Sfj9MdrndoIL6MT/f6PgoCWZQ
+  xEarK1Fn47yS4UZqRi6VgKc3JHscX9x4
+  -----END CERTIFICATE-----
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arborist
@@ -86,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: SNMP support for Arborist monitors