city-watch 0.5.4 → 0.5.5

data/Gemfile.lock

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

data/lib/city_watch/util/alerts.rb

@@ -1,36 +1,29 @@
 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?
+	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 self.included(base)
-		base.extend(ClassMethods)
+
+	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

data/lib/city_watch/util/datasets.rb

@@ -0,0 +1,7 @@
+module DataSets
+	
+	def data_set(name,&block)
+		
+	end
+	
+end

data/lib/city_watch/util/flags.rb

@@ -1,63 +1,56 @@
 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
+	
+	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
-		
-		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 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
-		
-		def new_flag(name)
-			CityWatch.redis.rpush(flag_map_key, name) - 1
+	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 self.included(base)
-		base.extend(ClassMethods)
+	def new_flag(name)
+		CityWatch.redis.rpush(flag_map_key, name) - 1
 	end
 	
 end

data/lib/city_watch/util/notifications.rb

@@ -0,0 +1,8 @@
+module Notifications
+	
+	def notify(*args)
+		@notifications ||= []
+		@notifications << [*args]
+	end
+	
+end

data/lib/city_watch/util/rules.rb

@@ -1,21 +1,14 @@
 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)
+	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

data/lib/city_watch/util/watchman.rb

@@ -1,6 +1,8 @@
 require 'city_watch/util/alerts'
 require 'city_watch/util/rules'
 require 'city_watch/util/flags'
+require 'city_watch/util/notifications'
+require 'city_watch/util/datasets'
 
 module Watchman
 	
@@ -52,9 +54,11 @@ module Watchman
 	end
 	
 	def self.included(base)
-		base.extend(Alerts::ClassMethods)
-		base.extend(Rules::ClassMethods)
-		base.extend(Flags::ClassMethods)
+		base.extend(Alerts)
+		base.extend(Rules)
+		base.extend(Flags)
+		base.extend(Notifications)
+		base.extend(DataSets)
 		base.extend(ClassMethods)
 		Watchmen.register(base)
 	end

data/lib/city_watch/watchmen/sysinfo.rb

@@ -5,7 +5,7 @@ class SystemInfo
 	require 'sysinfo'
 	
 	def self.data
-		SysInfo.new.to_hash
+		SysInfo.new.to_hash.merge({:summary => ["ipaddress_internal", "uptime"]})
 	end
 	
 end

data/lib/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: city-watch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - John Bragg
@@ -129,7 +129,9 @@ files:
 - lib/city_watch/commands/ps.rb
 - lib/city_watch/util/alerts.rb
 - lib/city_watch/util/collector.rb
+- lib/city_watch/util/datasets.rb
 - lib/city_watch/util/flags.rb
+- lib/city_watch/util/notifications.rb
 - lib/city_watch/util/rules.rb
 - lib/city_watch/util/run_command.rb
 - lib/city_watch/util/watchman.rb