city-watch 0.6.8 → 0.6.9

data/lib/city_watch/watchmen/cpu_usage.rb

@@ -2,6 +2,8 @@ class CPUUsage
 	
 	include Watchman
 	
+	set_default :usage_threshold, 60
+	
 	def self.data
 		out = MPstat.data.select do |line|
 			line[:run][/^Average:/]
@@ -9,4 +11,21 @@ class CPUUsage
 		out.length > 0 ? out.first.merge({:summary => [:usr, :idle, :sys]}) : {:nodata => true}
 	end
 	
+	add_rule(:cpu_usage_high) do |data|
+		
+		if (usage = data[:usr].to_i) && usage > option(:usage_threshold)
+			send_alert "CPU usage is over #{option(:usage_threshold)}% (#{usage}%)", data
+			set_flag :cpu_usage_high
+		else
+			clear_flag :cpu_usage_high
+		end
+		
+	end
+	
+	dataset(:save_dataset) do |data|
+		add_to_data_set(:cpu_user,data[:usr].to_f)
+		add_to_data_set(:cpu_idle,data[:idle].to_f)
+		add_to_data_set(:cpu_system,data[:sys].to_f)
+	end
+	
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CityWatch
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

data/views/watchmen/CPUUsage/summary.html.erb

@@ -0,0 +1,5 @@
+<h4><%=@name%></h4>
+<%= sparkline_image_tags.map {|(name,tag)| tag }.join("&nbsp;")%><br/>
+<strong>User: </strong><%=@current_data["usr"]%><br/>
+<strong>Idle: </strong><%=@current_data["idle"]%><br/>
+<strong>System: </strong><%=@current_data["sys"]%><br/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: city-watch
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -256,6 +256,7 @@ files:
 - views/layouts/default.html.erb
 - views/server/detail.html.erb
 - views/server/summary.html.erb
+- views/watchmen/CPUUsage/summary.html.erb
 - views/watchmen/DiskUsage/summary.html.erb
 - views/watchmen/SystemInfo/detail.html.erb
 - views/watchmen/SystemInfo/summary.html.erb