arborist-snmp 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4228ee82fe30505164e68c53d64f067c0ff3a2cff6fc1f9b58b573eea6b6dfb9
-  data.tar.gz: 680f22d6e97ece0699cf02851d698fdb478588239b9c0a921ef72909dc1dd3dc
+  metadata.gz: 1249bdfdca3585ad83e5257085356af249e49ddd5691d1e5b8cd77f792c81c9a
+  data.tar.gz: 3b85bd63b62caa5554ee76f3737556b07e970999cc7ddf0153fd51169e4b7e54
 SHA512:
-  metadata.gz: bf3c4613ca94861b2744e8e461e70142701c1205d07169fc05de0fc7111b22382e34414804fde1bf399eca2363d206b91efe20bfbe2b5941ad3b22c8c9f4c52b
-  data.tar.gz: 7d089aa2b0bac1a86118659c0aa4efb82b50363f13588d21ecb1359c62650df55a7016e0d47545824c4d7a2d04adba67c8dd6e393fcc7b8516a20a5cdb43a81a
+  metadata.gz: 61a8a588eb87e99848c41c312b3eaa690a4c65ffb13d565266f89bdb850790822d5ea26132e69e26133f5bfae1eb5ed4e57c7bbd0f06c52d9d0dacc034c1d115
+  data.tar.gz: bfd1b4c4b1d7feb5c6b1726f4c73748d0e357a27983f69c8441a5882495d9d725dc04bab7550da22827fd1a7fe3316f703dc75e409fef7d048f5a9847aa243c3

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

@@ -17,9 +17,10 @@ class Arborist::Monitor::SNMP::Disk
 	# OIDS required to pull disk information from net-snmp.
 	#
 	STORAGE_NET_SNMP = {
-		path: '1.3.6.1.4.1.2021.9.1.2',
+		path:    '1.3.6.1.4.1.2021.9.1.2',
 		percent: '1.3.6.1.4.1.2021.9.1.9',
-		type: '1.3.6.1.2.1.25.3.8.1.4'
+		type:    '1.3.6.1.2.1.25.3.8.1.4',
+		access:  '1.3.6.1.2.1.25.3.8.1.5'
 	}
 
 	# The OID that matches a local windows hard disk.
@@ -32,15 +33,21 @@ class Arborist::Monitor::SNMP::Disk
 	# OIDS required to pull disk information from Windows.
 	#
 	STORAGE_WINDOWS = {
-		type: '1.3.6.1.2.1.25.2.3.1.2',
-		path: '1.3.6.1.2.1.25.2.3.1.3',
+		type:  '1.3.6.1.2.1.25.2.3.1.2',
+		path:  '1.3.6.1.2.1.25.2.3.1.3',
 		total: '1.3.6.1.2.1.25.2.3.1.5',
-		used: '1.3.6.1.2.1.25.2.3.1.6'
+		used:  '1.3.6.1.2.1.25.2.3.1.6'
 	}
 
 	# The fallback warning capacity.
 	WARN_AT = 90
 
+	# Don't alert if a mount is readonly by default.
+	ALERT_READONLY = false
+
+	# Access mode meanings
+	ACCESS_READWRITE = 1
+	ACCESS_READONLY  = 2
 
 	# Configurability API
 	#
@@ -48,6 +55,9 @@ class Arborist::Monitor::SNMP::Disk
 		# What percentage qualifies as a warning
 		setting :warn_at, default: WARN_AT
 
+		# Set down if the mounts are readonly?
+		setting :alert_readonly, default: ALERT_READONLY
+
 		# If non-empty, only these paths are included in checks.
 		#
 		setting :include do |val|
@@ -103,35 +113,42 @@ class Arborist::Monitor::SNMP::Disk
 		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
+		alert_readonly = config[ 'alert_readonly' ] || self.class.alert_readonly
 
-		self.log.warn self.identifiers[ host ]
+		self.log.debug self.identifiers[ host ]
 
 		includes = self.format_mounts( config, 'include' ) || self.class.include
 		excludes = self.format_mounts( config, 'exclude' ) || self.class.exclude
 
-		current_mounts.reject! do |path, percentage|
+		current_mounts.reject! do |path, data|
 			path = path.to_s
 			excludes.match( path ) || ( includes && ! includes.match( path ) )
 		end
 
 		errors   = []
 		warnings = []
-		current_mounts.each_pair do |path, percentage|
+		current_mounts.each_pair do |path, data|
 			warn = if warn_at.is_a?( Hash )
-				warn_at[ path ] || WARN_AT
+				warn_at[ path ] || self.class.warn_at
 			else
 				warn_at
 			end
 
-			self.log.debug "%s:%s -> at %d, warn at %d" % [ host, path, percentage, warn ]
+			readonly = alert_readonly.is_a?( Hash ) ? alert_readonly[ path ] : alert_readonly
 
-			if percentage >= warn.to_i
-				if percentage >= 100
-					errors << "%s at %d%% capacity" % [ path, percentage ]
+			self.log.debug "%s:%s -> %p, warn at %d" % [ host, path, data, warn ]
+
+			if data[ :capacity ] >= warn.to_i
+				if data[ :capacity ] >= 100
+					errors << "%s at %d%% capacity" % [ path, data[ :capacity ] ]
 				else
-					warnings << "%s at %d%% capacity" % [ path, percentage ]
+					warnings << "%s at %d%% capacity" % [ path, data[ :capacity ] ]
 				end
 			end
+
+			if readonly && data[ :accessmode ] == ACCESS_READONLY
+				errors << "%s is mounted read-only." % [ path ]
+			end
 		end
 
 		# Remove any past mounts that configuration exclusions should
@@ -160,23 +177,16 @@ class Arborist::Monitor::SNMP::Disk
 	### Fetch information for Windows systems.
 	###
 	def windows_disks( snmp )
-		oids = [
-			STORAGE_WINDOWS[:path],
-			STORAGE_WINDOWS[:type],
-			STORAGE_WINDOWS[:total],
-			STORAGE_WINDOWS[:used]
-		]
-
-		paths = snmp.walk( oid: oids[0] ).each_with_object( [] ) do |(_, value), acc|
+		paths = snmp.walk( oid: STORAGE_WINDOWS[:path] ).each_with_object( [] ) do |(_, value), acc|
 			acc << value
 		end
-		types = snmp.walk( oid: oids[1] ).each_with_object( [] ) do |(_, value), acc|
+		types = snmp.walk( oid: STORAGE_WINDOWS[:type] ).each_with_object( [] ) do |(_, value), acc|
 			acc << WINDOWS_DEVICES.include?( value )
 		end
-		totals = snmp.walk( oid: oids[2] ).each_with_object( [] ) do |(_, value), acc|
+		totals = snmp.walk( oid: STORAGE_WINDOWS[:total] ).each_with_object( [] ) do |(_, value), acc|
 			acc << value
 		end
-		used = snmp.walk( oid: oids[3] ).each_with_object( [] ) do |(_, value), acc|
+		used = snmp.walk( oid: STORAGE_WINDOWS[:used] ).each_with_object( [] ) do |(_, value), acc|
 			acc << value
 		end
 
@@ -185,7 +195,7 @@ class Arborist::Monitor::SNMP::Disk
 			next if totals[ idx ].zero?
 			next unless types[ idx ]
 			disks[ path ] ||= {}
-			disks[ path ] = (( used[idx].to_f / totals[idx] ) * 100).round( 1 )
+			disks[ path ][ :capacity ] = (( used[idx].to_f / totals[idx] ) * 100).round( 1 )
 		end
 
 		return disks
@@ -195,16 +205,20 @@ class Arborist::Monitor::SNMP::Disk
 	### Fetch information for Unix/MacOS systems.
 	###
 	def unix_disks( snmp )
-		oids = [ STORAGE_NET_SNMP[:path], STORAGE_NET_SNMP[:percent] ]
-		paths = snmp.walk( oid: oids.first ).each_with_object( [] ) do |(_, value), acc|
+		paths = snmp.walk( oid: STORAGE_NET_SNMP[:path] ).each_with_object( [] ) do |(_, value), acc|
+			acc << value
+		end
+		capacities = snmp.walk( oid: STORAGE_NET_SNMP[:percent] ).each_with_object( [] ) do |(_, value), acc|
 			acc << value
 		end
-		capacities = snmp.walk( oid: oids.last ).each_with_object( [] ) do |(_, value), acc|
+		accessmodes = snmp.walk( oid: STORAGE_NET_SNMP[:access] ).each_with_object( [] ) do |(_, value), acc|
 			acc << value
 		end
 
-		pairs = paths.zip( capacities )
-		return Hash[ *pairs.flatten ]
+		pairs = paths.each_with_object( {} ).with_index do |(p, acc), idx|
+			acc[p] = { capacity: capacities[idx], accessmode: accessmodes[idx] }
+		end
+		return pairs
 	end
 
 end # class Arborist::Monitor::SNMP::Disk

data/lib/arborist/snmp.rb

@@ -1,5 +1,6 @@
 # -*- ruby -*-
 #encoding: utf-8
+# vim: set noet nosta sw=4 ts=4 :
 
 require 'loggability'
 require 'arborist'
@@ -14,7 +15,7 @@ module Arborist::SNMP
 
 
 	# Package version
-	VERSION = '0.6.2'
+	VERSION = '0.7.0'
 
 	# Version control revision
 	REVISION = %q$Revision$

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arborist-snmp
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Mahlon E. Smith <mahlon@martini.nu>
@@ -11,31 +11,26 @@ bindir: bin
 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
+  MIIDMDCCAhigAwIBAgIBAjANBgkqhkiG9w0BAQsFADA+MQ8wDQYDVQQDDAZtYWhs
+  b24xFzAVBgoJkiaJk/IsZAEZFgdtYXJ0aW5pMRIwEAYKCZImiZPyLGQBGRYCbnUw
+  HhcNMjAwNzA5MjIxMzE4WhcNMjEwNzA5MjIxMzE4WjA+MQ8wDQYDVQQDDAZtYWhs
+  b24xFzAVBgoJkiaJk/IsZAEZFgdtYXJ0aW5pMRIwEAYKCZImiZPyLGQBGRYCbnUw
+  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDpXGN0YbMVpYv4EoiCxpQw
+  sxKdyhlkvpvENUkpEhbpnEuMKXgUfRHO4T/vBZf0h8eYgwnrHCRhAeIqesFKfoj9
+  mpEJk5JUuADOAz18aT+v24UqAtJdiwBJLuqhslSNB6CFXZv3OOMny9bjoJegz0hI
+  Fht9ppCuNmxJNd+L3zAX8lD01RUWNRC+8L5QLCjViJtjFDDCFfh9NCirs+XnTCzo
+  AJgFbsZIzFJtSiXUtFgscKr4Ik8ruhRbPbYbmx9rf6W74aTMPxggq/d3gj0Eh32y
+  WsXsQ5giVnmkbsRkBNu3QyZ8Xr5+7mvy5AWyqXKOrcW7lnYaob6Z9x/MGXGNeD6j
+  AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRY8ea6
+  +6kAaW7ukKph2/4MTAD8/TANBgkqhkiG9w0BAQsFAAOCAQEAryZehbiEumHsUsce
+  FoBVuDoVdlJf8ae11G8IPXnEHCT8S5b+MBSYd55V3aGQm4bKoZA3GmmD8Y0a+oxt
+  l2kkTvE0r1bBb/qYQI97AjnqzHByseBRoaHtJ12JtrDEdi8y4jd5AJt4aW+G/roD
+  I2/ymUodKw9Cteom0RdJNzBUJ+Bq+qFOy7mVKNIfhXRRFYEy11y1712FsJXqUEku
+  qr3lnAEvEy9hQila4NoJT2+aQEKsjVON9D3a727naKDFUcKDg6P4KqS+yOKgR+QH
+  D8llK3JPaqKXuJkbd8jKchDk0Q+fA8Klan5SSnm7pMD51QM1mPsVPm5bEw5ib0bn
+  oR3hTQ==
   -----END CERTIFICATE-----
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arborist