city-watch 0.6.2 → 0.6.3

data/.gitignore

@@ -1 +1,2 @@
 pkg/*
+.DS_Store

data/Gemfile.lock

@@ -1,7 +1,9 @@
 PATH
   remote: .
   specs:
-    city-watch (0.5.7)
+    city-watch (0.6.3)
+      erubis
+      mail
       rack
       rack-mount
       redis
@@ -13,27 +15,38 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     drydock (0.6.9)
-    kgio (2.7.4)
-    rack (1.4.1)
+    erubis (2.7.0)
+    i18n (0.6.4)
+    kgio (2.8.0)
+    mail (2.5.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.21)
+    polyglot (0.3.3)
+    rack (1.5.2)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
     raindrops (0.10.0)
-    redis (3.0.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    redis (3.0.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     storable (0.8.9)
     sysinfo (0.8.0)
       drydock
       storable
-    unicorn (4.5.0)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    unicorn (4.6.2)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)

data/city_watch.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |s|
 	s.add_dependency "rack"
 	s.add_dependency "rack-mount"
 	s.add_dependency "unicorn"
+	s.add_dependency "mail"
+	s.add_dependency "erubis"
 	s.add_dependency "yajl-ruby"
 	s.add_dependency "sysinfo"
 end

data/lib/city_watch/commander.rb

@@ -6,6 +6,8 @@ end
 
 ::Routes = CityWatch::Routes
 
+require 'city_watch/util/renderer'
 require 'city_watch/watchmen'
+require 'city_watch/reader'
 require 'city_watch/commander/server'
 require 'city_watch/commander/home'

data/lib/city_watch/commander/home.rb

@@ -1,14 +1,13 @@
 class Home
 	
+	include Renderer
+	
 	def call(env)
-		
-		output = CityWatch.header << '<h1>Known servers:</h1><ul>'
-		CityWatch.redis.smembers("#{CityWatch.config[:prefix]}::known_hosts").each do |server|
-			output << "<li><a href=\"/" << server << "\">#{server}</a>: <pre><code>" << Yajl::Encoder.encode(Yajl::Parser.parse(CityWatch.redis.zrevrange("#{CityWatch.config[:prefix]}::#{server}::summary",0,0).first),:pretty => true, :indent => "   ") << "</code></pre></li>"
-		end
-		output << "</ul></body></html>"
-		
-		[200,{"Content-Type" => "text/html"},[output]]
+		[200,{"Content-Type" => "text/html"},[render("home")]]
+	end
+	
+	def servers
+		Reader.servers
 	end
 	
 	Routes.add_route new, { :request_method => 'GET', :path_info => %r{^/$} }, {}, :home

data/lib/city_watch/reader.rb

@@ -0,0 +1,2 @@
+require 'city_watch/reader/server'
+require 'city_watch/reader/watchman'

data/lib/city_watch/reader/server.rb

@@ -0,0 +1,196 @@
+module Reader
+	
+	def self.servers
+		CityWatch.redis.smembers("#{CityWatch.config[:prefix]}::known_hosts").map do |server|
+			Reader::Host.new(server)
+		end
+	end
+	
+	class Host
+		
+		include Renderer
+	
+		def initialize(host)
+			@host = host
+		end
+		
+		def hostname
+			@host
+		end
+		
+		def watchmen
+			CityWatch.redis.smembers(watchmen_key).map do |name|
+				Reader::Watchman.new(name)
+			end
+		end
+		
+		def watchmen_key
+			key(:watchmen)
+		end
+	
+		def data_sets
+			CityWatch.redis.smembers(data_sets_key)
+		end
+	
+		def data_sets_key
+			@data_sets_key ||= key(:data_sets)
+		end
+		
+		def summary
+			summaries.first
+		end
+		
+		def summary_html
+			render "server/summary"
+		end
+		
+		def summaries(num=1)
+			CityWatch.redis.zrevrange(summary_key,0,num).map {|sum| Yajl::Parser.parse(sum) }
+		end
+		
+		def summary_key
+			@summary_key ||= key(:summary)
+		end
+		
+		def current_raw
+			raws.first
+		end
+		
+		def raws(num=1)
+			CityWatch.redis.zrevrange(raw_key,0,num)
+		end
+		
+		def raw_key
+			@raw_key ||= key(:raw_stats)
+		end
+		
+		def key(more)
+			"#{key_prefix}::#{more}"
+		end
+		
+		def key_prefix
+			@key_prefix ||= "#{CityWatch.config[:prefix]}::#{@host}"
+		end
+		
+	end
+	
+end
+
+# CityWatch::earlgray.cozy.co::raw_stats
+# CityWatch::earlgray.cozy.co::summary
+
+# CityWatch::earlgray.cozy.co::DiskUsage
+# CityWatch::earlgray.cozy.co::DiskUsage::summary
+# CityWatch::earlgray.cozy.co::DiskUsage::data_set::root_disk_usage
+# CityWatch::earlgray.cozy.co::DiskUsage::data_sets
+
+# CityWatch::earlgray.cozy.co::Uptime
+# CityWatch::earlgray.cozy.co::Uptime::summary
+# CityWatch::earlgray.cozy.co::Uptime::status
+
+# CityWatch::earlgray.cozy.co::SystemInfo
+# CityWatch::earlgray.cozy.co::SystemInfo::summary
+
+# CityWatch::earlgray.cozy.co::Nginx
+# CityWatch::earlgray.cozy.co::Nginx::summary
+
+# CityWatch::earlgray.cozy.co::CPUUsage
+# CityWatch::earlgray.cozy.co::CPUUsage::summary
+
+# CityWatch::earlgray.cozy.co::Unicorns
+# CityWatch::earlgray.cozy.co::Unicorns::summary
+
+
+
+
+
+
+# CityWatch::rooibos.cozy.co::raw_stats
+# CityWatch::jasmine.cozy.co::CPUUsage::summary
+# CityWatch::sencha.cozy.co::raw_stats
+# CityWatch::pekoe.cozy.co::DiskUsage
+# CityWatch::sencha.cozy.co::SystemInfo::summary
+# CityWatch::sencha.cozy.co::Unicorns::summary
+# CityWatch::rooibos.cozy.co::DiskUsage::flags
+# CityWatch::pekoe.cozy.co::Uptime
+# CityWatch::pekoe.cozy.co::DiskUsage::summary
+# CityWatch::jasmine.cozy.co::CPUUsage
+# CityWatch::pekoe.cozy.co::Uptime::summary
+# CityWatch::pekoe.cozy.co::Nginx::summary
+# CityWatch::sencha.cozy.co::Uptime::summary
+# CityWatch::oolong.cozy.co::CPUUsage::summary
+# CityWatch::oolong.cozy.co::Nginx::summary
+# CityWatch::oolong.cozy.co::Uptime
+# CityWatch::oolong.cozy.co::SystemInfo
+# CityWatch::sencha.cozy.co::Uptime
+# CityWatch::pekoe.cozy.co::DiskUsage::data_sets
+# CityWatch::rooibos.cozy.co::DiskUsage
+# CityWatch::pekoe.cozy.co::raw_stats
+# CityWatch::rooibos.cozy.co::Uptime::status
+# CityWatch::sencha.cozy.co::SystemInfo
+# CityWatch::rooibos.cozy.co::Nginx::summary
+# CityWatch::pekoe.cozy.co::CPUUsage
+# CityWatch::sencha.cozy.co::CPUUsage
+# CityWatch::rooibos.cozy.co::Unicorns
+# CityWatch::sencha.cozy.co::DiskUsage::summary
+# CityWatch::pekoe.cozy.co::CPUUsage::summary
+# CityWatch::jasmine.cozy.co::DiskUsage::data_sets
+# CityWatch::oolong.cozy.co::CPUUsage
+# CityWatch::rooibos.cozy.co::SystemInfo::summary
+# CityWatch::pekoe.cozy.co::Unicorns::summary
+# CityWatch::pekoe.cozy.co::Nginx
+# CityWatch::jasmine.cozy.co::Unicorns
+# CityWatch::sencha.cozy.co::summary
+# CityWatch::pekoe.cozy.co::Uptime::status
+# CityWatch::pekoe.cozy.co::SystemInfo
+# CityWatch::jasmine.cozy.co::Nginx
+# CityWatch::rooibos.cozy.co::CPUUsage
+# CityWatch::oolong.cozy.co::Uptime::status
+# CityWatch::sencha.cozy.co::Nginx::summary
+# CityWatch::pekoe.cozy.co::DiskUsage::data_set::root_disk_usage
+# CityWatch::sencha.cozy.co::Unicorns
+# CityWatch::known_hosts
+# CityWatch::sencha.cozy.co::CPUUsage::summary
+# CityWatch::jasmine.cozy.co::Uptime::summary
+# CityWatch::rooibos.cozy.co::DiskUsage::data_sets
+# CityWatch::jasmine.cozy.co::SystemInfo
+# CityWatch::oolong.cozy.co::Nginx
+# CityWatch::pekoe.cozy.co::Unicorns
+# CityWatch::oolong.cozy.co::Uptime::summary
+# CityWatch::sencha.cozy.co::DiskUsage
+# CityWatch::oolong.cozy.co::SystemInfo::summary
+# CityWatch::oolong.cozy.co::DiskUsage::data_set::root_disk_usage
+# CityWatch::sencha.cozy.co::Nginx
+# CityWatch::jasmine.cozy.co::Uptime
+# CityWatch::rooibos.cozy.co::DiskUsage::summary
+# CityWatch::DiskUsage::flag_map
+# CityWatch::oolong.cozy.co::DiskUsage::data_sets
+# CityWatch::rooibos.cozy.co::DiskUsage::alerts
+# CityWatch::jasmine.cozy.co::Unicorns::summary
+# CityWatch::sencha.cozy.co::DiskUsage::data_set::root_disk_usage
+# CityWatch::jasmine.cozy.co::DiskUsage::summary
+# CityWatch::sencha.cozy.co::Uptime::status
+# CityWatch::oolong.cozy.co::summary
+# CityWatch::jasmine.cozy.co::DiskUsage
+# CityWatch::rooibos.cozy.co::summary
+# CityWatch::rooibos.cozy.co::Unicorns::summary
+# CityWatch::oolong.cozy.co::raw_stats
+# CityWatch::rooibos.cozy.co::SystemInfo
+# CityWatch::rooibos.cozy.co::Uptime
+# CityWatch::rooibos.cozy.co::DiskUsage::data_set::root_disk_usage
+# CityWatch::pekoe.cozy.co::SystemInfo::summary
+# CityWatch::jasmine.cozy.co::SystemInfo::summary
+# CityWatch::rooibos.cozy.co::Uptime::summary
+# CityWatch::oolong.cozy.co::Unicorns::summary
+# CityWatch::oolong.cozy.co::Unicorns
+# CityWatch::jasmine.cozy.co::raw_stats
+# CityWatch::jasmine.cozy.co::Nginx::summary
+# CityWatch::rooibos.cozy.co::CPUUsage::summary
+# CityWatch::rooibos.cozy.co::Nginx
+# CityWatch::oolong.cozy.co::DiskUsage
+# CityWatch::jasmine.cozy.co::DiskUsage::data_set::root_disk_usage
+# CityWatch::pekoe.cozy.co::summary
+# CityWatch::sencha.cozy.co::DiskUsage::data_sets
+# CityWatch::jasmine.cozy.co::Uptime::status
+# CityWatch::oolong.cozy.co::DiskUsage::summary
+# CityWatch::jasmine.cozy.co::summary

data/lib/city_watch/reader/watchman.rb

@@ -0,0 +1,72 @@
+module Reader
+	
+	class Watchman
+		
+		include Renderer
+		
+		def initialize(host,name)
+			@host = host
+			@name = name
+		end
+		
+		def render_from_summary(data)
+			@current_data = data
+			return render("watchmen/#{@name}/summary", "watchmen/summary")
+			ensure
+			@current_data = nil
+		end
+		
+		def watchman_class
+			@klass ||= Object.const_get(@name.to_sym)
+		end
+		
+		def sparklines
+			data_sets.map do |set|
+				[set.to_sym,sparkline(get_data_set(set).map {|(tm,val)| val })]
+			end
+		end
+		
+		def sparkline_image_tags
+			data_sets.map do |set|
+				[set.to_sym, sparkline_img_tag(get_data_set(set).map {|(tm,val)| val })]
+			end
+		end
+		
+		def get_data_set(data_set_name,s_time=(Time.now - (60*60*12)),e_time=Time.now)
+			CityWatch.redis.zrevrangebyscore(data_set_key(data_set_name), 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)
+			key("data_set::#{data_set}")
+		end
+		
+		def data_sets
+			CityWatch.redis.smembers(data_sets_key)
+		end
+	
+		def data_sets_key
+			@data_sets_key ||= key(:data_sets)
+		end
+		
+		def sparkline(dat)
+			Base64.encode64(Spark.smooth(dat, :has_min => true, :has_max => true, :height => 14, :step => 4)).gsub("\n",'')
+		end
+
+		def sparkline_img_tag(dat)
+			"<img src=\"data:image/png;base64,#{sparkline(dat)}\"/>"
+		end
+		
+		def key(more)
+			"#{key_prefix}::#{more}"
+		end
+		
+		def key_prefix
+			@key_prefix ||= "#{CityWatch.config[:prefix]}::#{@host}::#{@name}"
+		end
+		
+	end
+	
+end

data/lib/city_watch/util/datasets.rb

@@ -19,6 +19,7 @@ module DataSets
 	end
 	
 	def data_set_key(data_set_name,host=host)
+		CityWatch.redis.sadd "#{CityWatch.config[:prefix]}::#{host}::data_sets", data_set_name
 		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

data/lib/city_watch/util/renderer.rb

@@ -0,0 +1,50 @@
+module Renderer
+	
+	require 'erubis'
+	
+	def render(*tpl)
+		layout do
+			render_bare(*tpl)
+		end
+	end
+	
+	def render_bare(*tpl)
+		Erubis::FastEruby.new(template(*tpl), filename: template_path(*tpl)).result(binding)
+	end
+	
+	private
+	
+	def layout(&block)
+		@layout ||= Proc.new {
+			file_path = "#{view_path}/layouts/default.html.erb"
+			Erubis::FastEruby.new(File.read(file_path), bufvar: '@output_buffer', filename: file_path)
+		}.call
+		@layout.result(binding)
+	end
+	
+	def template_content(file_path)
+		return "" unless file_path
+		File.read(file_path)
+	end
+	
+	def template_key(*keys)
+		keys.inject("") {|a,k| a += k.to_s}
+	end
+
+	def template_path(*tpl)
+		tpl.map {|t| "#{view_path}/#{t}.html.erb" }.detect{|p| File.exists?(p) }
+	end
+	
+	def template(*tpl)
+		return @templates[tpl.join] if @templates && @templates[tpl.join]
+		file_path = template_path(*tpl)
+		return template_content(file_path) if CityWatch.debug?
+		@templates ||= {}
+		@templates[tpl.join] ||= template_content(file_path)
+	end
+	
+	def view_path
+		File.expand_path(File.dirname(__FILE__) + "/../../../views")
+	end
+	
+end

data/lib/city_watch/util/spark_pr.rb

@@ -0,0 +1,215 @@
+# pure ruby sparklines module, generates PNG or ASCII
+# contact thomas@fesch.at for questions
+#
+# strives to be somewhat compatible with sparklines lib by 
+# {Dan Nugent}[mailto:nugend@gmail.com] and {Geoffrey Grosenbach}[mailto:boss@topfunky.com]
+#
+# png creation based on http://www.whytheluckystiff.net/bumpspark/
+
+class SparkCanvas
+  require 'zlib'
+  
+  attr_accessor :color
+  attr_reader :width, :height
+  
+  def initialize(width,height)
+    @canvas = []
+    @height = height
+    @width = width
+    height.times{ @canvas << [[0xFF,0xFF,0xFF]]*width }
+    @color = [0,0,0,0xFF] #RGBA
+  end
+  
+  # alpha blends two colors, using the alpha given by c2
+  def blend(c1, c2)
+    (0..2).map{ |i| (c1[i]*(0xFF-c2[3]) + c2[i]*c2[3]) >> 8 }
+  end
+  
+  # calculate a new alpha given a 0-0xFF intensity
+  def intensity(c,i)
+    [c[0],c[1],c[2],(c[3]*i) >> 8]
+  end
+  
+  # calculate perceptive grayscale value
+  def grayscale(c)
+    (c[0]*0.3 + c[1]*0.59 + c[2]*0.11).to_i
+  end
+  
+  def point(x,y,color = nil)
+    return if x<0 or y<0 or x>@width-1 or y>@height-1
+    @canvas[y][x] = blend(@canvas[y][x], color || @color)
+  end
+  
+  def rectangle(x0, y0, x1, y1)
+    x0, y0, x1, y1 = x0.to_i, y0.to_i, x1.to_i, y1.to_i
+    x0, x1 = x1, x0 if x0 > x1
+    y0, y1 = y1, y0 if y0 > y1
+    x0.upto(x1) { |x| y0.upto(y1) { |y| point x, y } }
+  end
+  
+  # draw an antialiased line
+  # google for "wu antialiasing"
+  def line(x0, y0, x1, y1)
+    # clean params
+    x0, y0, x1, y1 = x0.to_i, y0.to_i, x1.to_i, y1.to_i
+    y0, y1, x0, x1 = y1, y0, x1, x0 if y0>y1 
+    sx = (dx = x1-x0) < 0 ? -1 : 1 ; dx *= sx ; dy = y1-y0
+    
+    # special cases
+    x0.step(x1,sx) { |x| point x, y0 } and return if dy.zero?
+    y0.upto(y1)    { |y| point x0, y } and return if dx.zero?
+    x0.step(x1,sx) { |x| point x, y0; y0 += 1 } and return if dx==dy
+    
+    # main loops
+    point x0, y0
+    
+    e_acc = 0
+    if dy > dx
+      e = (dx << 16) / dy
+      y0.upto(y1-1) do
+        e_acc_temp, e_acc = e_acc, (e_acc + e) & 0xFFFF
+        x0 += sx if (e_acc <= e_acc_temp)
+        point x0, (y0 += 1), intensity(@color,(w=0xFF-(e_acc >> 8)))
+        point x0+sx, y0, intensity(@color,(0xFF-w))
+      end
+      point x1, y1
+      return
+    end
+    
+    e = (dy << 16) / dx
+    x0.step(x1-sx,sx) do
+      e_acc_temp, e_acc = e_acc, (e_acc + e) & 0xFFFF
+      y0 += 1 if (e_acc <= e_acc_temp)
+      point (x0 += sx), y0, intensity(@color,(w=0xFF-(e_acc >> 8)))
+      point x0, y0+1, intensity(@color,(0xFF-w))
+    end
+    point x1, y1
+  end
+    
+  def polyline(arr)
+    (0...arr.size-1).each{ |i| line(arr[i][0], arr[i][1], arr[i+1][0], arr[i+1][1]) }
+  end
+  
+  def to_png
+    header = [137, 80, 78, 71, 13, 10, 26, 10].pack("C*")
+    raw_data = @canvas.map { |row| [0] + row }.flatten.pack("C*")
+    ihdr_data = [@canvas.first.length,@canvas.length,8,2,0,0,0].pack("NNCCCCC")
+    
+    header +
+    build_png_chunk("IHDR", ihdr_data) +
+    build_png_chunk("tRNS", ([ 0xFF ]*6).pack("C6")) +
+    build_png_chunk("IDAT", Zlib::Deflate.deflate(raw_data)) +
+    build_png_chunk("IEND", "")
+  end
+  
+  def build_png_chunk(type,data)
+    to_check = type + data
+    [data.length].pack("N") + to_check + [Zlib.crc32(to_check)].pack("N")
+  end
+  
+  def to_ascii
+    chr = %w(M O # + ; - .) << ' '
+    @canvas.map{ |r| r.map { |pt| chr[grayscale(pt) >> 5] }.to_s << "\n" }.to_s
+  end
+  
+end
+  
+module Spark
+  # normalize arr to contain values between 0..1 inclusive
+  def Spark.normalize( arr, type = :linear )
+    arr.map!{|v| Math.log(v) } if type == :logarithmic
+    adj, fac = arr.min, arr.max-arr.min
+    arr.map {|v| (v-adj).quo(fac) rescue 0 }
+  end
+  
+  def Spark.process_options( options )
+    o = options.inject({}) do |o, (key, value)|
+      o[key.to_sym] = value ; o
+    end
+    [:height, :width, :step].each do |k|
+      o[k] = o[k].to_i if o.has_key?(k)
+    end
+    [:has_min, :has_max, :has_last].each do |k|
+      o[k] = (o[k] ? true : false) if o.has_key?(k)
+    end
+    o[:normalize] ||= :linear
+    o[:normalize] = o[:normalize].to_sym
+    o
+  end
+  
+  def Spark.smooth( results, options = {} )
+    options = self.process_options(options)
+    o = {
+      :step => 2,
+      :height => 14,
+      :has_min => false,
+      :has_max => false
+    }.merge(options)
+    
+    o[:width] ||= (results.size-1)*o[:step] + 5
+    
+    c = SparkCanvas.new(o[:width], o[:height])
+    
+    results = Spark.normalize(results, o[:normalize])
+    fac = c.height-5
+    i = -o[:step]
+    coords = results.map do |r| 
+      [(i += o[:step])+2, c.height - 3 - r*fac ]
+    end
+    
+    c.color = [0xB0, 0xB0, 0xB0, 0xFF]
+    c.polyline coords
+    
+    if o[:has_min]
+      min_pt = coords[results.index(results.min)]
+      c.color = [0x80, 0x80, 0x00, 0x70]
+      c.rectangle(min_pt[0]-2, min_pt[1]-2, min_pt[0]+2, min_pt[1]+2)
+    end
+    
+    if o[:has_max]
+      max_pt = coords[results.index(results.max)]
+      c.color = [0x00, 0x80, 0x00, 0x70]
+      c.rectangle(max_pt[0]-2, max_pt[1]-2, max_pt[0]+2, max_pt[1]+2)
+    end
+    
+    if o[:has_last]
+      c.color = [0xFF, 0x00, 0x00, 0x70]
+      c.rectangle(coords.last[0]-2, coords.last[1]-2, coords.last[0]+2, coords.last[1]+2)
+    end
+    
+    c
+  end
+  
+  def Spark.discrete( results, options = {} )
+    options = self.process_options(options)
+    o = {
+      :height => 14,
+      :upper => 0.5,
+      :has_min => false,
+      :has_max => false
+    }.merge(options)
+    
+    o[:width] ||= results.size*2-1
+    
+    c = SparkCanvas.new(o[:width], o[:height])
+    
+    results = Spark.normalize(results, o[:normalize])
+    fac = c.height-4
+        
+    i = -2
+    results.each do |r|
+      p = c.height - 4 - r*fac
+      c.color = r < o[:upper] ? [0x66,0x66,0x66,0xFF] : [0xFF,0x00,0x00,0xFF] 
+      c.line(i+=2, p, i, p+3)
+    end
+        
+    c
+  end
+  
+  # convenience method
+  def Spark.plot( results, options = {})
+    options = self.process_options(options)
+    options[:type] ||= 'smooth'
+    self.send(options[:type], results, options).to_png
+  end
+end

data/lib/city_watch/util/watchman.rb

@@ -16,6 +16,7 @@ module Watchman
 		def process(dat,rcv,host)
 			@host = host
 			@rcv_time = rcv
+			CityWatch.redis.sadd "#{CityWatch.config[:prefix]}::#{host}::watchmen", self.name
 			CityWatch.redis.zadd "#{CityWatch.config[:prefix]}::#{host}::#{self.name}", rcv_time, Yajl::Encoder.encode(dat.merge({:received_at => dat[:received_at]}))
 			if dat[:summary]
 				sum = dat[:summary].is_a?(Array) ? dat[:summary].inject({}) {|acc,k| acc[k.to_sym] = dat[k.to_sym]; acc} : dat[:summary]
@@ -43,7 +44,7 @@ module Watchman
 		
 		def options(*args)
 			if args.count > 1
-				return args.map {|k| opts[k]}
+				return args.map {|k| opts[k] }
 			else
 				return opts[args.first]
 			end

data/lib/city_watch/watchmen/redis.rb

@@ -0,0 +1,8 @@
+class Redis
+	
+	include Watchman
+	
+	def self.data
+	end
+	
+end

data/lib/city_watch/watchmen/twemproxy.rb

@@ -0,0 +1,9 @@
+class Twemproxy
+	
+	include Watchman
+	
+	def self.data
+		
+	end
+	
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CityWatch
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/static/stylesheets/city_watch.css

@@ -11,6 +11,9 @@ h1{
 }
 h4{
 	font-size:105%;
+	margin:1em 0 .5em;
+	padding:0;
+	opacity:.4;
 }
 a{
 	color:rgb(50,30,100);
@@ -27,4 +30,13 @@ ul,ul li{
 }
 ul li{
 	list-style-type:none;
+}
+div.server{
+	background-color:rgba(0,0,0,.02);
+	padding:1em;
+	margin-bottom:1em;
+}
+pre{
+	padding:0;
+	margin:0;
 }

data/views/home.html.erb

@@ -0,0 +1,6 @@
+<h1>Known servers:</h1>
+<ul>
+	<% servers.each do |server| %>
+	<li><%=server.summary_html%></li>
+	<% end %>
+</ul>

data/views/layouts/default.html.erb

@@ -0,0 +1,12 @@
+<html>
+	<head>
+		<link rel="stylesheet" href="/stylesheets/city_watch.css">
+		<link rel="stylesheet" href="/stylesheets/default.css">
+		<script src="/javascripts/city_watch.js"></script>
+		<script src="/javascripts/highlight.pack.js"></script>
+		<script>hljs.initHighlightingOnLoad();</script>
+	</head>
+	<body>
+		<%= yield%>
+	</body>
+</html>

data/views/server/summary.html.erb

@@ -0,0 +1,10 @@
+<%
+sum = summary
+update_time = sum.delete("received_at")
+%>
+<div class="server">
+	<a href="/<%=@host%>"><%=@host%></a>
+	<% sum.each do |watchman,dat| %>
+	<%= Reader::Watchman.new(@host,watchman).render_from_summary(dat) %>
+	<% end %>
+</div>

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

@@ -0,0 +1,2 @@
+<h4><%=@name%></h4>
+<strong>Root FS usage: </strong><%=@current_data%>

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

@@ -0,0 +1,2 @@
+<h4><%=@name%></h4>
+<strong>Server IP: </strong><%=@current_data["ipaddress_internal"]%>

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

@@ -0,0 +1,2 @@
+<h4><%=@name%></h4>
+<strong>Days up: </strong><%=@current_data["uptime_days"]%>

data/views/watchmen/summary.html.erb

@@ -0,0 +1,2 @@
+<h4><%=@name%></h4>
+<pre><code><%=Yajl::Encoder.encode(@current_data,:pretty => true, :indent => "   ")%></code></pre>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: city-watch
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -91,6 +91,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +165,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .DS_Store
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -159,13 +190,18 @@ files:
 - lib/city_watch/commands/mpstat.rb
 - lib/city_watch/commands/netstat.rb
 - lib/city_watch/commands/ps.rb
+- lib/city_watch/reader.rb
+- lib/city_watch/reader/server.rb
+- lib/city_watch/reader/watchman.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/renderer.rb
 - lib/city_watch/util/rules.rb
 - lib/city_watch/util/run_command.rb
+- lib/city_watch/util/spark_pr.rb
 - lib/city_watch/util/status.rb
 - lib/city_watch/util/watchman.rb
 - lib/city_watch/watchmen.rb
@@ -180,6 +216,7 @@ files:
 - lib/city_watch/watchmen/ruby_gc.rb
 - lib/city_watch/watchmen/server_load.rb
 - lib/city_watch/watchmen/sysinfo.rb
+- lib/city_watch/watchmen/twemproxy.rb
 - lib/city_watch/watchmen/unicorns.rb
 - lib/city_watch/watchmen/uptime.rb
 - lib/version.rb
@@ -215,8 +252,16 @@ files:
 - static/stylesheets/vs.css
 - static/stylesheets/xcode.css
 - static/stylesheets/zenburn.css
+- views/home.html.erb
+- views/layouts/default.html.erb
+- views/server/detail.html.erb
+- views/server/summary.html.erb
+- views/watchmen/DiskUsage/summary.html.erb
 - views/watchmen/SystemInfo/detail.html.erb
 - views/watchmen/SystemInfo/summary.html.erb
+- views/watchmen/Uptime/summary.html.erb
+- views/watchmen/detail.html.erb
+- views/watchmen/summary.html.erb
 - watch_collector.ru
 - watch_commander.ru
 homepage: http://cozy.co