servicemonitor 0.0.18 → 0.0.19

data/README.md

@@ -1,6 +1,6 @@
 #ServiceMonitor
 
-Monitor various parts of a system
+The fastest way to reliably monitor your system
 
 ##Principles
 	#This is aimed at people with computer knowledge

data/bin/servicemonitor

@@ -19,11 +19,9 @@ require "helper_functions"
 #Don't buffer stdout
 $stdout.sync = true
 
-if ARGV.length == 1 then
-        dslName = ARGV[0]
-else
-        abort( "Usage: monitor <path to dsl>" )
-end
+abort( "Usage: servicemonitor <path to dsl>" ) if ARGV.length != 1
+
+dslName = ARGV[0]
 
 #Need to remove file name extension 
 ENV["APP_NAME"] = File.basename( dslName ) if ENV["APP_NAME"].nil?

data/lib/MonitorType/Dir.rb

@@ -2,7 +2,7 @@ require "MonitorType/Threshold"
 
 #A directory class for checking how many files are in a directory
 class MonitorType_Dir<MonitorType_Threshold
-    
+
     #Extract parameters
     #
     # @param [String] path Path to directory to check
@@ -13,16 +13,16 @@ class MonitorType_Dir<MonitorType_Threshold
             raise MonitorTypeParameterMissingError.new(string)
         end
         @path = @params[:path]
-        
+
         @context_sentence = "Checking number of files in, #{@path}"
     end
 
 
 	def setup
         inputDir = Dir.new( @path )
-		@path = inputDir.path
+		    @path = inputDir.path
         @params[:dir] = inputDir
-        
+
         rescue Errno::ENOENT => e
         string = "***** Directory does not exist, #{@path}.\n"
         string = "#{string}***** Create the directory, #{@path}, and try again.\n"
@@ -34,7 +34,7 @@ class MonitorType_Dir<MonitorType_Threshold
         string = "#{string}***** eg, rm #{@path} && mkdir #{@path}"
         raise MonitorTypeExceptionHandled.new(string)
 	end
-    
+
 	def getValue
 		return Dir.glob( "#{@path}/*" ).length
 	end
@@ -43,4 +43,3 @@ end
 def dir( params )
     $a.add( MonitorType_Dir.new( params ) )
 end
-

data/lib/MonitorType/Drive.rb

@@ -0,0 +1,50 @@
+require "MonitorType/Threshold"
+require "sys/filesystem"
+include Sys
+
+class MonitorType_Drive<MonitorType_Threshold
+
+	def extractParams
+		if @params[:path].nil? then
+			string = "*** Drive parameter missing, drive\n"
+			string = "#{string}*** :drive => <name of the drive to be monitored>"
+			raise MonitorTypeParameterMissingError.new(string)
+		end
+		@path = @params[:path]
+
+		log "#{@process_name}", "result: #{(@process_name =~ /^(.*\[{1}.+\]{1}.*)$|^(\w+)$/) == 0}"
+
+		if @params[:min].nil? then
+			string = "*** Min parameter missing, min\n"
+			string = "#{string}*** :min => <the minimum amount of free space on the drive to be monitored>"
+			raise MonitorTypeParameterMissingError.new(string)
+		end
+
+  	log "*** Max value will be ignored, setting to nil" unless @params[:max].nil?
+  	@max = nil
+
+		@context_sentence = "Checking that available drive space is greater than min, #{@process_name}"
+	end
+
+	def setup
+		begin
+		#Check that the path exists
+		drive = Filesystem.stat(@path)
+
+		rescue=>e
+			string = "*** Unable to mount the specifed path\n"
+			string = "#{string}*** path: #{@path}\n"
+      string = "#{string}*** Please fix the error and run again\n"
+			raise MonitorTypeExceptionHandled.new("Unable to mount path: #{@path}")
+		end
+	end
+
+	def getValue
+		return ((Filesystem.stat(@path).blocks_available.to_f / Filesystem.stat(@path).blocks.to_f) * 100).round(2)
+	end
+
+end
+
+def process(params)
+	$a.add(MonitorType_Drive.new(params))
+end

data/lib/MonitorType/FluidDb.rb

@@ -8,7 +8,7 @@ require "MonitorType/Threshold"
 #  => check that the number is not greater than 2
 
 class MonitorType_FluidDb<MonitorType_Threshold
-    
+
     #Extract parameters
     #
     # @param [String] uri Connection string to db
@@ -27,18 +27,18 @@ class MonitorType_FluidDb<MonitorType_Threshold
             string = "#{string}*** Please fix the uri and run again"
             raise MonitorTypeParameterMissingError.new(string)
         end
-        
+
         if @params[:sql].nil? then
             string = "*** FluidDb parameter missing, sql"
             string = "#{string}*** :sql => <sql statement, producing a single column, single row which yeidls a number>"
             raise MonitorTypeParameterMissingError.new(string)
         end
         @sql = @params[:sql]
-        
+
         @context_sentence = "Checking result of sql query, #{@sql}"
-        
+
 	end
-    
+
     #Create the connection to the db, and get the value
     #This ensures that all params are correct.
 	def setup
@@ -49,13 +49,13 @@ class MonitorType_FluidDb<MonitorType_Threshold
             string = "*** FluidDb encountered an error while connecting to the db\n"
             string = "#{string}*** Error: #{e.message}\n"
             string = "#{string}*** uri: #{@uri}\n"
-            string = "#{string}*** Please 3fix the error and run again\n"
+            string = "#{string}*** Please fix the error and run again\n"
             raise MonitorTypeExceptionHandled.new(string)
         end
 
         @params[:fluidDb] = @fluidDb
 	end
-    
+
 	def getValue
         begin
             return @fluidDb.queryForValue( @sql, [] )

data/lib/MonitorType/Process.rb

@@ -1,48 +1,54 @@
 require "MonitorType/Threshold"
+require "helper_functions"
+
+InvalidProcessNameError = Class.new(StandardError)
 
 #A class for checking if a Process is running in Unix based systems
 class MonitorType_Process<MonitorType_Threshold
 
+  #Extract parameters
+  #
+  # @param [String] :process_name THe name of the process to monitor
+  def extractParams
+  	if @params[:process_name].nil? then
+  		string = "*** Process Name parameter missing, process_name\n"
+  		string = "#{string}*** :process_name => <name of the process to be monitored>"
+  		raise MonitorTypeParameterMissingError.new(string)
+  	end
+  	@process_name = @params[:process_name]
+
+  	log "#{@process_name}", "result: #{(@process_name =~ /^(.*\[{1}.+\]{1}.*)$|^(\w+)$/) == 0}"
+
+  	unless (@process_name =~ /^(.*\[{1}.+\]{1}.*)$|^(\w+)$/) == 0 then
+  		string = "*** Process Name parameter doest not match the required pattern, #{@process_name}\n"
+  		string = "#{string}*** :process_name => <plain string, or a string with one or more characters enclosed in square brackets, i.e. 'foo', '[f]oo' or '[foo]'>"
+  		raise InvalidProcessNameError.new(string)
+  	end
+
+  	log "*** Min value will be ignored, setting to 1" unless (params[:min].nil? || params[:min] == 0)
+  	@min = 1
+
+  	log "*** Max value will be ignored, setting to nil" unless params[:max].nil?
+  	@max = nil
+
+  	@context_sentence = "Checking that process is running, #{@process_name}"
+  end
+
+  def setup
+  	self.sanitise
+  rescue MonitorTypeExceptionHandled => e
+  	puts e.message
+  	abort
+  end
+
 	def sanitise
 		#Ensure that the process name contains a single character surrounded by square brackets
 		@process_name = @process_name.insert(0,'[').insert(2,']') unless @process_name =~ /^.*\[.+\].*/
 	end
 
-	def initialize(params)
-		super(params)
-
-		if params[:process_name].nil? then
-			puts "*** Process Name parameter missing, process_name"
-			puts "*** :process_name => <name of the process to be monitored>"
-			abort
-		end
-		@process_name = params[:process_name]
-
-		puts "#{@process_name}", "result: #{(@process_name =~ /^(.*\[{1}.+\]{1}.*)$|^(\w+)$/) == 0}"
-
-		unless (@process_name =~ /^(.*\[{1}.+\]{1}.*)$|^(\w+)$/) == 0 then
-			puts "*** Process Name parameter doest not match the required pattern, #{@process_name}"
-			puts "*** :process_name => <plain string, or a string with one or more characters enclosed in square brackets, i.e. 'foo', '[f]oo' or '[foo]'>"
-			abort
-		end
-
-		puts "*** Min value will be ignored, setting to 1" unless (params[:min].nil? || params[:min] == 0)
-		@min = 1
-
-		puts "*** Max value will be ignored, setting to nil" unless params[:max].nil?
-		@max = nil
-
-		@context_sentence = "Checking that process is running, #{@process_name}"
-
-		self.sanitise
-	rescue MonitorTypeExceptionHandled => e
-		puts e.message
-		abort
-	end
-
-	def getValue
-		return `ps aux | grep #{@process_name}`.length
-	end
+  def getValue
+  	return `ps aux | grep #{@process_name}`.length
+  end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servicemonitor
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
-dependencies: []
+date: 2014-07-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: parse-cron
+  requirement: &70139175033600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70139175033600
+- !ruby/object:Gem::Dependency
+  name: beanstalk-client
+  requirement: &70139175033160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70139175033160
+- !ruby/object:Gem::Dependency
+  name: fluiddb
+  requirement: &70139175032720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70139175032720
 description: The fastest way to reliably monitor your system.
 email: guy@guyirvine.com
 executables:
@@ -24,6 +57,7 @@ files:
 - lib/MonitorManager.rb
 - lib/MonitorType/Beanstalk.rb
 - lib/MonitorType/Dir.rb
+- lib/MonitorType/Drive.rb
 - lib/MonitorType/FluidDb.rb
 - lib/MonitorType/Process.rb
 - lib/MonitorType/Threshold.rb