city-watch 0.5.3 → 0.5.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    city-watch (0.5.2)
+    city-watch (0.5.3)
       rack
       rack-mount
       redis

data/config/watch_collector.yml

@@ -1,3 +1,4 @@
+:debug: true
 :unicorn:
   :port: 62001
 :redis:

data/config/watch_commander.yml

@@ -1,3 +1,4 @@
+:debug: true
 :unicorn:
   :port: 62002
 :redis:

data/lib/city_watch/commander/server.rb

@@ -9,9 +9,9 @@ class Server
 		Watchmen.each do |watchman|
 			flags = watchman.get_flags(server)
 			alerts = watchman.get_alerts(server,2)
-			if (flags && flags.keys.count > 0) || (alerts && alerts.count > 0)
+			if (flags && flags.count > 0) || (alerts && alerts.count > 0)
 				output << "<h3>" << watchman.name.to_s << "</h3><ul>"
-				if flags && flags.keys.count > 0
+				if flags && flags.count > 0
 					output << "<li class=\"alert\"><strong>Flags:</strong> <pre><code>" << Yajl::Encoder.encode(flags,:pretty => true, :indent => "   ") << "</code></pre></li>"
 				end
 				if alerts && alerts.count > 0

data/lib/city_watch/util/alerts.rb

@@ -0,0 +1,36 @@
+module Alerts
+	module ClassMethods
+		
+		def send_alert(message,dat=nil)
+			CityWatch.redis.zadd "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::alerts", rcv_time, Yajl::Encoder.encode({:message => message, :data => dat, :when => rcv_time})
+		end
+	
+		def alerts
+			@alerts ||= []
+			if block_given?
+				@alerts.each do |a|
+					yield a
+				end
+			else
+				@alerts
+			end
+			nil
+		end
+	
+		def get_alerts(host=host,num=5)
+			CityWatch.redis.zrevrange "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::alerts", 0, num - 1
+		end
+	
+		def send_alerts!
+			get_alerts.map do |alert|
+				puts "Alert: #{alert.inspect}" if CityWatch.debug?
+			end
+		end
+		
+	end
+	
+	def self.included(base)
+		base.extend(ClassMethods)
+	end
+	
+end

data/lib/city_watch/util/collector.rb

@@ -36,7 +36,8 @@ module Collector
 		
 		data[:watchmen].each do |watchman,dat|
 			if watch_obj = Watchmen.get(watchman)
-				status, summary[watchman] = watch_obj.process(dat,rcv_time,host)
+				status, sum = watch_obj.process(dat,rcv_time,host)
+				summary[watchman] = sum if sum
 			end
 		end
 		

data/lib/city_watch/util/flags.rb

@@ -0,0 +1,63 @@
+module Flags
+	module ClassMethods
+		
+		def set_flag(name)
+			unless get_flag(name)
+				flag_flapped name, :on
+				CityWatch.redis.setbit "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::flags", flag_position(name), 1
+			end
+		end
+		
+		def clear_flag(name)
+			if get_flag(name)
+				flag_flapped name, :off
+				CityWatch.redis.setbit "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::flags", flag_position(name), 0
+			end
+		end
+		
+		def flag_flapped(name,new_val)
+			puts "Flag flipped: #{name} -> #{new_val}" if CityWatch.debug?
+		end
+		
+		def get_flag(name,host=host)
+			@host = host
+			CityWatch.redis.getbit("#{CityWatch.config[:prefix]}::#{host}::#{self.name}::flags", flag_position(name)) == 1 ? true : false
+		end
+		
+		def get_flags(host=host)
+			@host = host
+			out = []
+			map = flag_map
+			map.each_index do |idx|
+				out << map[idx] if get_flag(map[idx])
+			end
+			out
+		end
+		
+		def flag_map_key
+			"#{CityWatch.config[:prefix]}::#{self.name}::flag_map"
+		end
+		
+		def flag_map
+			CityWatch.redis.lrange flag_map_key, 0, -1
+		end
+		
+		def flag_position(name)
+			if (map = flag_map) && map.include?(name.to_s)
+				map.index(name.to_s)
+			else
+				new_flag(name)
+			end
+		end
+		
+		def new_flag(name)
+			CityWatch.redis.rpush(flag_map_key, name) - 1
+		end
+		
+	end
+	
+	def self.included(base)
+		base.extend(ClassMethods)
+	end
+	
+end

data/lib/city_watch/util/rules.rb

@@ -0,0 +1,21 @@
+module Rules
+	module ClassMethods
+		
+		def add_rule(name,&block)
+			@rules ||= {}
+			@rules[name] = block
+		end
+
+		def run_rules(dat)
+			@rules.map do |(name,rule)|
+				rule.call(dat)
+			end if @rules
+		end
+		
+	end
+	
+	def self.included(base)
+		base.extend(ClassMethods)
+	end
+	
+end

data/lib/city_watch/util/watchman.rb

@@ -1,3 +1,7 @@
+require 'city_watch/util/alerts'
+require 'city_watch/util/rules'
+require 'city_watch/util/flags'
+
 module Watchman
 	
 	def data
@@ -15,6 +19,7 @@ module Watchman
 				CityWatch.redis.zadd "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::summary", rcv_time, Yajl::Encoder.encode(sum)
 			end
 			run_rules(dat)
+			send_alerts!
 			return 0, sum || nil
 		end
 		
@@ -26,97 +31,6 @@ module Watchman
 			@rcv_time || Time.now.to_i
 		end
 		
-		def add_rule(name,&block)
-			@rules ||= {}
-			@rules[name] = block
-		end
-
-		def run_rules(dat)
-			@rules.map do |(name,rule)|
-				rule.call(dat)
-			end if @rules
-		end
-		
-		def send_alert(message,dat=nil)
-			CityWatch.redis.zadd "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::alerts", rcv_time, Yajl::Encoder.encode({:message => message, :data => dat, :when => rcv_time})
-		end
-		
-		def alerts
-			@alerts ||= []
-			if block_given?
-				@alerts.each do |a|
-					yield a
-				end
-			else
-				@alerts
-			end
-			nil
-		end
-		
-		def get_alerts(host=host,num=5)
-			CityWatch.redis.zrevrange "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::alerts", 0, num - 1
-		end
-		
-		def send_alerts!
-			@alerts.map do |alert|
-				puts "Alert: #{alert.inspect}" #if CityWatch.debug?
-			end if @alerts
-		end
-		
-		def set_flag(name)
-			unless get_flag(name)
-				flag_flapped name, :on
-			end
-			CityWatch.redis.setbit "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::flags", flag_position(name), 1
-		end
-		
-		def clear_flag(name)
-			if get_flag(name)
-				flag_flapped name, :off
-			end
-			CityWatch.redis.setbit "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::flags", flag_position(name), 0
-		end
-		
-		def flag_flapped(name,new_val)
-			# should have some event to watch for a flag switching position
-			puts "Flag flipped: #{name} -> #{new_val}" #if CityWatch.debug?
-		end
-		
-		def get_flag(name,host=host)
-			@host = host
-			CityWatch.redis.getbit("#{CityWatch.config[:prefix]}::#{host}::#{self.name}::flags", flag_position(name)) ? true : false
-		end
-		
-		def get_flags(host=host)
-			@host = host
-			out = {}
-			map = flag_map
-			map.each_index do |idx|
-				out[map[idx]] = get_flag(map[idx])
-			end
-			out
-		end
-		
-		def flag_map_key
-			"#{CityWatch.config[:prefix]}::#{self.name}::flag_map"
-		end
-		
-		def flag_map
-			CityWatch.redis.lrange flag_map_key, 0, -1
-		end
-		
-		def flag_position(name)
-			if (map = flag_map) && map.include?(name.to_s)
-				map.index(name.to_s)
-			else
-				new_flag(name)
-			end
-		end
-		
-		def new_flag(name)
-			CityWatch.redis.rpush(flag_map_key, name) - 1
-		end
-		
 		def set_default(k,val)
 			opts[k] = val
 		end
@@ -138,6 +52,9 @@ module Watchman
 	end
 	
 	def self.included(base)
+		base.extend(Alerts::ClassMethods)
+		base.extend(Rules::ClassMethods)
+		base.extend(Flags::ClassMethods)
 		base.extend(ClassMethods)
 		Watchmen.register(base)
 	end

data/lib/city_watch/watchmen/disk_usage.rb

@@ -2,7 +2,7 @@ class DiskUsage
 	
 	include Watchman
 	
-	set_default :usage_threshold, 60
+	set_default :usage_threshold, 75
 	
 	def self.data
 		dat = DF.data

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CityWatch
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -2,7 +2,7 @@
 name: city-watch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - John Bragg
@@ -127,7 +127,10 @@ files:
 - lib/city_watch/commands/mpstat.rb
 - lib/city_watch/commands/netstat.rb
 - lib/city_watch/commands/ps.rb
+- lib/city_watch/util/alerts.rb
 - lib/city_watch/util/collector.rb
+- lib/city_watch/util/flags.rb
+- lib/city_watch/util/rules.rb
 - lib/city_watch/util/run_command.rb
 - lib/city_watch/util/watchman.rb
 - lib/city_watch/watchmen.rb