city-watch 0.5.6 → 0.5.7

data/Gemfile.lock

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

data/lib/city_watch/util/datasets.rb

@@ -1,7 +1,30 @@
 module DataSets
 	
-	def data_set(name,&block)
-		
+	def dataset(name,&block)
+		@datasets ||= {}
+		@datasets[name] = block
+	end
+	
+	def run_dataset_collector(dat)
+		@datasets.map do |(name,dataset)|
+			dataset.call(dat)
+		end if @datasets
+	end
+	
+	def get_data_set(data_set_name,s_time,e_time=Time.now,host=host)
+		CityWatch.redis.zrevrangebyscore(data_set_key(data_set_name,host), s_time.to_i, e_time.to_i, :with_scores => true).map do |(val,score)|
+			timestamp,value = val.split(",")
+			[Time.at(timestamp.to_i),value]
+		end
+	end
+	
+	def data_set_key(data_set_name,host=host)
+		CityWatch.redis.sadd "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::data_sets", data_set_name
+		"#{CityWatch.config[:prefix]}::#{host}::#{self.name}::data_set::#{data_set_name}"
+	end
+	
+	def add_to_data_set(data_set_name,val,time=Time.now,host=host)
+		CityWatch.redis.zadd data_set_key(data_set_name,host), time.to_i, "#{Time.now.to_i},#{val}"
 	end
 	
 end

data/lib/city_watch/util/rules.rb

@@ -4,7 +4,7 @@ module Rules
 		@rules ||= {}
 		@rules[name] = block
 	end
-
+	
 	def run_rules(dat)
 		@rules.map do |(name,rule)|
 			rule.call(dat)

data/lib/city_watch/util/status.rb

@@ -0,0 +1,15 @@
+module Status
+	
+	def set_status_var(var,val,host=host)
+		CityWatch.redis.hset "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::status", var, val
+	end
+	
+	def status_vars(host=host)
+		CityWatch.redis.hgetall "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::status"
+	end
+	
+	def status_var(var,host=host)
+		CityWatch.redis.hget "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::status", var
+	end
+	
+end

data/lib/city_watch/util/watchman.rb

@@ -3,6 +3,7 @@ require 'city_watch/util/rules'
 require 'city_watch/util/flags'
 require 'city_watch/util/notifications'
 require 'city_watch/util/datasets'
+require 'city_watch/util/status'
 
 module Watchman
 	
@@ -21,6 +22,7 @@ module Watchman
 				CityWatch.redis.zadd "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::summary", rcv_time, Yajl::Encoder.encode(sum)
 			end
 			run_rules(dat)
+			run_dataset_collector(dat)
 			send_alerts!
 			return 0, sum || nil
 		end
@@ -59,6 +61,7 @@ module Watchman
 		base.extend(Flags)
 		base.extend(Notifications)
 		base.extend(DataSets)
+		base.extend(Status)
 		base.extend(ClassMethods)
 		Watchmen.register(base)
 	end

data/lib/city_watch/watchmen/disk_usage.rb

@@ -21,4 +21,8 @@ class DiskUsage
 		
 	end
 	
+	dataset(:save_dataset) do |data|
+		add_to_data_set(:root_disk_usage,data[:summary].to_f)
+	end
+	
 end

data/lib/city_watch/watchmen/sysinfo.rb

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

data/lib/city_watch/watchmen/uptime.rb

@@ -2,9 +2,12 @@ class Uptime
 	
 	include Watchman
 	
+	set_default :uptime_file, '/proc/uptime'
+	
 	def self.data
+		return {} if !File.exists?(option(:uptime_file))
 		out = {}
-		out[:uptime], out[:idle] = File.read('/proc/uptime').strip.split.map {|t| Float(t) }
+		out[:uptime], out[:idle] = File.read(option(:uptime_file)).strip.split.map {|t| Float(t) }
 		base = out.dup
 		[[:minutes,Proc.new{|t| t / 60 }],[:hours,Proc.new{|t| t / (60*60) }],[:days,Proc.new{|t| t / (60*60*24) }]].each do |(id,func)|
 			base.each do |k,v|

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CityWatch
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

metadata

@@ -2,7 +2,7 @@
 name: city-watch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - John Bragg
@@ -134,6 +134,7 @@ files:
 - lib/city_watch/util/notifications.rb
 - lib/city_watch/util/rules.rb
 - lib/city_watch/util/run_command.rb
+- lib/city_watch/util/status.rb
 - lib/city_watch/util/watchman.rb
 - lib/city_watch/watchmen.rb
 - lib/city_watch/watchmen/cpu_usage.rb