app/models/response_code.rb config/initializers/time_formats.rb db/migrate/20091104233239_create_response_codes.rb test/fixtures/response_codes.yml test/unit/response_code_test.rb @@ -14,8 +14,8 @@ class WatchesController < ApplicationController respond_to do |format| format.html # index.html.erb format.xml { render :xml => @watches } - format.json { render :json => @watches.to_json( :methods => :from_average, - :except => [:created_at, :updated_at, :status_id, :content_match, :active], + format.json { render :json => @watches.to_json( :methods => [:from_average, :since], + :except => [:created_at, :updated_at, :last_status_change_at, :status_id, :content_match, :active], :include => { :status => { :except => [:id] } } ) } end end @@ -80,7 +80,7 @@ class WatchesController < ApplicationController respond_to do |format| if @watch.update_attributes(params[:watch]) flash[:notice] = 'Watch was successfully updated.' - format.html { redirect_to root_path } + format.html { redirect_to :controller => 'dashboard', :action => 'compact' } format.xml { head :ok } else format.html { render :action => "edit" } app/controllers/watches_controller.rb @@ -11,15 +11,22 @@ class Watch < ActiveRecord::Base DEFAULT_INTERVAL = 1.hour DEFAULT_COUNT = 10 + # Computes the standard deviation for the last response time of this watch compared to a certain number of checks in the past. # By default we look at the average of the last 10 ten minute spans def from_average(interval=DEFAULT_INTERVAL) - # puts interval average = Response.average(:time, :conditions => ['watch_id = ? and time != 0 and created_at < ? and created_at > ?', self.id, Time.zone.now.to_s(:db), (Time.zone.now-interval).to_s(:db)]).to_i logger.debug(" *** average: #{average}, last_response_time: #{self.last_response_time}") return (average == 0 || last_response_time == 0) ? nil : (average.to_f / self.last_response_time.to_f * 100.0).to_i end + + # Says how long we've been in the current state (either last_status_update_at or created_at) + def since + return self.last_status_change_at.nil? ? self.created_at.to_s(:javascript) : self.last_status_change_at.to_s(:javascript) + end + + private def set_status app/models/watch.rb @@ -11,7 +11,7 @@ = yield :head # if you want to add any other code to the head, add it via `content_for :head do` in any view and it'll end up here %body - %h1= link_to '<span>Owl</span>', root_path + %h1= link_to '<span>Owl</span>', :controller => 'dashboard', :action => 'compact' = yield = yield :body app/views/layouts/application.html.haml @@ -1,6 +1,8 @@ %div[site] %h2= link_to(site.name, site_path(site)) - site.watches.each do |watch| - %div[watch]{:class => watch.status.css} - = render :partial => 'watches/watch', :locals => { :watch => watch, :mode => mode } + -# to change the size of a watch, make sure the container fills the empty space then set .watch to position:absolute + .container + %div[watch]{:class => watch.status.css} + = render :partial => 'watches/watch', :locals => { :watch => watch, :mode => mode } %h3.new_watch= link_to '+ Add URL', new_watch_path(:site_id => site.id) app/views/sites/_site.html.haml @@ -1,12 +1,7 @@ -- if params[:action] == 'slides' - = stylesheet_link_tag 'slides' += render 'dashboard/display', :locals => { :sites => @sites, :mode => :extended } -#sites - = render :partial => 'sites/site', :collection => @sites - - #add_site - %h2= link_to '+ Add Group', new_site_path +#add_site + %h2= link_to '+ Add Group', new_site_path :javascript Event.observe(window,'dom:loaded',function() { watchBlock.setGraphsFromCookie() }); - \ No newline at end of file app/views/sites/index.html.haml @@ -1,7 +1,8 @@ #sites - = render :partial => 'sites/site', :locals => { :site => @site } + = render :partial => 'sites/site', :locals => { :site => @site, :mode => :extended } = link_to 'Delete This Group', @site, :confirm => 'Are you sure?', :method => :delete, :class => 'delete' :javascript - Event.observe(window,'dom:loaded',function() { watchBlock.setGraphsFromCookie() }); \ No newline at end of file + Event.observe(window,'dom:loaded',function() { watchBlock.setGraphsFromCookie() }); + \ No newline at end of file app/views/sites/show.html.haml @@ -1,8 +1,3 @@ -- if (watch.warning_time && watch.last_response_time > watch.warning_time) - - warning = true -- else - - warning = false - .name{:onclick => "location.href = '#{edit_watch_path(watch)}'"} %span.site_name= watch.site.name %span.full_name= watch.name @@ -20,16 +15,6 @@ .status %span.response_title Last: %span.response= watch.last_response_time.to_s + " ms" - %span.since_title For: + %span.since_title= watch.status.name + " for " %span.since_text= time_ago_in_words(watch.last_status_change_at || watch.created_at) %span.since_date= watch.last_status_change_at || watch.created_at - - --# - .status - %span.status - = warning ? 'Warning' : watch.status.name - - unless watch.status.id == Status::DISABLED - %span.response= watch.last_response_time.to_s + " ms" - - else - %span.enable= link_to_remote 'Enable?', :url => { :controller => 'watches', :action => 'update', :id => watch.id }, :success => "$('watch_#{watch.id}').down('span.status').update('Enabled'); $('watch_#{watch.id}').down('span.enable').update('').addClassName('response').removeClassName('enable');", :method => :put, :with => "'watch[active]=1'" app/views/watches/_watch.html.haml @@ -7,9 +7,11 @@ class CreateWatches < ActiveRecord::Migration t.integer :warning_time t.boolean :active, :default => true t.string :content_match + t.integer :expected_response, :default => 200 t.integer :status_id, :default => Status::UP t.integer :site_id t.datetime :last_status_change_at + t.string :status_reason t.timestamps end db/migrate/20091027230701_create_watches.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20091028171657) do +ActiveRecord::Schema.define(:version => 20091104233239) do create_table "headers", :force => true do |t| t.string "key" @@ -19,6 +19,13 @@ ActiveRecord::Schema.define(:version => 20091028171657) do t.datetime "updated_at" end + create_table "response_codes", :force => true do |t| + t.integer "code" + t.string "name" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "responses", :force => true do |t| t.integer "time" t.integer "status" @@ -46,9 +53,11 @@ ActiveRecord::Schema.define(:version => 20091028171657) do t.integer "warning_time" t.boolean "active", :default => true t.string "content_match" + t.integer "expected_response", :default => 200 t.integer "status_id", :default => 1 t.integer "site_id" t.datetime "last_status_change_at" + t.string "status_reason" t.datetime "created_at" t.datetime "updated_at" end db/schema.rb @@ -10,4 +10,16 @@ Status.create([ { :id => 1, :name => 'Up', :css => 'up' }, { :id => 3, :name => 'Disabled', :css => 'disabled' }, { :id => 4, :name => 'Unknown', :css => 'unknown' }, { :id => 5, :name => 'Warning', :css => 'warning'} ]) - \ No newline at end of file + +ResponseCode.create([ { :id => 1, :code => 200, :name => 'OK' }, + { :id => 2, :code => 301, :name => 'Moved Permanently' }, + { :id => 3, :code => 302, :name => 'Found (Moved Temporarily)' }, + { :id => 4, :code => 307, :name => 'Moved Temporarily' }, + { :id => 5, :code => 400, :name => 'Bad Request' }, + { :id => 6, :code => 401, :name => 'Unauthorized' }, + { :id => 7, :code => 403, :name => 'Forbidden' }, + { :id => 8, :code => 404, :name => 'Not Found' }, + { :id => 9, :code => 500, :name => 'Internal Server Error' }, + { :id => 10, :code => 502, :name => 'Bad Gateway' }, + { :id => 11, :code => 503, :name => 'Service Unavailable' }]) + db/seeds.rb @@ -16,27 +16,27 @@ module Mouse watches = Watch.active watches.each do |watch| - #threads << Thread.new do - Mouse.logger.debug(" - Checking watch #{watch.id}: #{watch.url}...") - begin - time = Time.now - http = HTTPClient.get(watch.url) - time = ((Time.now - time) * 1000).to_i - up(watch, http, time) - rescue SocketError => e - # URL is invalid - down(watch, 'URL is invalid') - rescue HTTPClient::ReceiveTimeoutError => e - # Apparently the uncatchable error - down(watch, 'ReceiveTimeoutError') - rescue HTTPClient::ConnectTimeoutError => e - # Site isn't responding - down(watch, 'Site not responding (timeout)') + Mouse.logger.debug(" - Checking watch #{watch.id}: #{watch.url}...") + begin + time = Time.now + http = HTTPClient.get(watch.url) + time = ((Time.now - time) * 1000).to_i + if http.status != watch.expected_response # status code wasn't what was expected + down(watch, :time => time, :status_reason => "Response code #{http.status} did not match expected (#{watch.expected_response})", :message => 'Response codes do not match expected') + elsif watch.content_match && !http.body.content.match(watch.content_match) # content on the page wasn't found + down(watch, :time => time, :status_reason => "Required content ('#{watch.content_match}') was not found on the page", :message => 'Required content not found on page') + else # everything looks good, mark as up + up(watch, :http => http, :time => time) end - #end + rescue SocketError => e # URL is invalid + down(watch, :status_reason => 'URL invalid', :message => 'URL is invalid') + rescue HTTPClient::ReceiveTimeoutError => e # Apparently the uncatchable error + down(watch, :message => 'ReceiveTimeoutError') + rescue HTTPClient::ConnectTimeoutError => e # Site isn't responding + down(watch, :status_reason => 'Timed out waiting for response', :message => 'Site not responding (timeout)') + end end - #threads.each { |t| t.join } cleanup # removes responses older than a day end @@ -44,30 +44,27 @@ module Mouse private # called when a site is considered up - def up(watch, http, time) - update_watch(watch, time, Status::UP) - #watch.update_attributes(:last_response_time => time, :status_id => Status::UP) - response = add_response(watch, time, http.status, http.reason) - #response = watch.responses.create(:time => time, :status => http.status, :reason => http.reason) + def up(watch, options={}) + defaults = { :time => 0, :http => nil, :status_reason => 'Site responding normally' } + options = defaults.merge!(options) + update_watch(watch, options[:time], Status::UP, options[:status_reason]) + response = add_response(watch, options[:time], options[:http].status, options[:http].reason) if Mouse.options.write_headers Mouse.logger.debug(" Saving headers...") - http.header.get.each do |header| + options[:http].header.get.each do |header| response.headers.create(:key => header.first, :value => header.last) end end - # set this to a warning if the response time was greater than the warning time - #if watch.warning_time && time > watch.warning_time - # warning(watch) - #end end # called when a site is considered down - def down(watch, message='') - update_watch(watch, 0, Status::DOWN) - response = add_response(watch, 0, 0, 'error') - #watch.responses.create(:time => 0, :status => 0, :reason => 'error') - Mouse.logger.error(" ** #{message}") + def down(watch, options={}) + defaults = { :time => 0, :http => nil, :status_reason => 'Site is down', :message => 'Error with response' } + options = defaults.merge!(options) + update_watch(watch, options[:time], Status::DOWN, options[:status_reason]) + response = add_response(watch, options[:time], options[:http] ? options[:http].status : 0, options[:http] ? options[:http].reason : 'error') + Mouse.logger.error(" ** #{options[:message]}") end @@ -78,10 +75,11 @@ module Mouse # updates the watch record - def update_watch(watch, time, status) + def update_watch(watch, time, status, status_reason) watch.status_id = status watch.last_status_change_at = Time.zone.now.to_s(:db) if watch.changed? # only updates the last status change watch.last_response_time = time + watch.status_reason = status_reason return watch.save end lib/mouse/lib/engine.rb @@ -3,7 +3,7 @@ function resizePanels() { var watches = $$('.watch'); var container_margin = $('sites').getStyle('marginLeft').match(/\d+/); // how much space we need to reserve for the margins of the page var browser_width = parseInt(document.viewport.getWidth()); // browser width - var watch_margin = parseInt(watches.first().getStyle('marginRight').match(/\d+/)); // how much margin for each watch + var watch_margin = parseInt(watches.first().up().getStyle('marginRight').match(/\d+/)); // how much margin for each watch var watch_min_width = parseInt(watches.first().getStyle('minWidth').match(/\d+/)); // the minimum width a watch is allowed to be var i = watches.length; @@ -15,7 +15,8 @@ function resizePanels() { // resize each slide watches.each(function(element) { - element.setStyle({'width':watch_width+'px'}); + //element.setStyle({'width':watch_width+'px'}); + element.up().setStyle({'width':watch_width+'px'}); resizeLink(element, watch_width); resizeName(element, watch_width); }); @@ -129,6 +130,15 @@ watchBlock = { updateWatch:function(obj,data) { // update text labels and times + obj.down('span.full_name').update(data.name); + obj.down('span.full_url').update(data.url); + + obj.down('span.since_date').update(data.since); + obj.down('span.since_title').update(data.status.name+' for '); + obj.down('span.since_text').update(DateHelper.time_ago_in_words_with_parsing(data.since)); + + obj.title = data.status_reason + if (obj.down('span.enable')) { obj.down('span.enable').removeClassName('enable').addClassName('response'); } @@ -139,7 +149,10 @@ watchBlock = { obj.down('img.graph').src = '/watches/response_graph/'+data.id+'?'+Date.now(); } - + // call resize panels so if the name or URL is too long, it'll get resized right now + resizeLink(obj,obj.getWidth()); + resizeName(obj,obj.getWidth()); + // change color based on watch.from_average value. from_average represents a percentage of the average response // time for the last hour. So if from_average is 75, that means that ping was 75% of the speed of the average, so // it was _slower_ than the average by 25%. 110 would be 10% faster than the average @@ -165,10 +178,13 @@ watchBlock = { var new_color = new Color('666666'); break; } - - console.info('watch_id:',data.id,' css:',data.status.css,' color:',new_color.hex_color); - + obj.morph('background-color: #'+new_color.hex_color); + + // pulsate the watch if its response time is greater than the preset limit + if (data.warning_time && data.last_response_time > data.warning_time) { + new Effect.Pulsate(obj,{'delay':1}); + } }, // converts from the server's range to a 0 - 100 scale @@ -202,3 +218,38 @@ function Color(hex_color) { this.b = parseInt(hex_color.slice(4,6),16); this.hex_color = this.r.toString(16) + this.g.toString(16) + this.b.toString(16); } + +// DateHelper from http://gist.github.com/58761 with a couple mods to display number of seconds +// gets us nicely formatted time spans (ie: 3 minutes ago) + +var DateHelper = { + // Takes the format of "Thu Jul 23 17:44:00 PDT 2009" and converts it to a relative time + // Ruby strftime: %a %b %d %H:%M:%S %Z %Y + time_ago_in_words_with_parsing: function(from) { + var date = new Date; + date.setTime(Date.parse(from)); + return this.time_ago_in_words(date); + }, + + time_ago_in_words: function(from) { + return this.distance_of_time_in_words(new Date, from); + }, + + distance_of_time_in_words: function(to, from) { + var distance_in_seconds = ((to - from) / 1000).floor(); + var distance_in_minutes = (distance_in_seconds / 60).floor(); + + if (distance_in_minutes == 0) { return distance_in_seconds + ' seconds'; } + if (distance_in_minutes == 1) { return 'a minute'; } + if (distance_in_minutes < 45) { return distance_in_minutes + ' minutes'; } + if (distance_in_minutes < 90) { return 'about 1 hour'; } + if (distance_in_minutes < 1440) { return 'about ' + (distance_in_minutes / 60).floor() + ' hours'; } + if (distance_in_minutes < 2880) { return '1 day'; } + if (distance_in_minutes < 43200) { return (distance_in_minutes / 1440).floor() + ' days'; } + if (distance_in_minutes < 86400) { return 'about 1 month'; } + if (distance_in_minutes < 525960) { return (distance_in_minutes / 43200).floor() + ' months'; } + if (distance_in_minutes < 1051199) { return 'about 1 year'; } + + return 'over ' + (distance_in_minutes / 525960).floor() + ' years'; + } +}; \ No newline at end of file public/javascripts/application.js @@ -70,6 +70,8 @@ h1 text-shadow: 1px 1px 2px rgba(0,0,0,.6) span.response font-size: 85% + span.since_date + display: none a color: #ffffff &.graph public/stylesheets/sass/shared.sass @@ -10,11 +10,14 @@ h1 padding: 0 h2 display: none - .watch + .container + overflow: hidden float: left - width: 300px - height: 112px + min-height: 1px margin: 0 10px 10px 0 + .watch + width: auto + height: 112px display: block min-width: 200px -moz-box-shadow: 2px 2px 2px rgba(0,0,0,.2) @@ -28,6 +31,7 @@ h1 span.name font-size: 131% span.url + white-space: nowrap a font-size: 85% &.status @@ -44,8 +48,6 @@ h1 font-size: 85% &.response margin: 0 1.3em 0 0 - &.since_date - display: none &.graph display: none .new_watch public/stylesheets/sass/slides.sass @@ -88,6 +88,9 @@ h1 a span { #sites .site .watch div.status span.response { font-size: 85%; } +#sites .site .watch div.status span.since_date { + display: none; +} #sites .site .watch div.status a { color: #ffffff; } public/stylesheets/shared.css @@ -14,11 +14,15 @@ h1 { #sites .site h2 { display: none; } -#sites .site .watch { +#sites .site .container { + overflow: hidden; float: left; - width: 300px; - height: 112px; + min-height: 1px; margin: 0 10px 10px 0; +} +#sites .site .watch { + width: auto; + height: 112px; display: block; min-width: 200px; -moz-box-shadow: 2px 2px 2px rgba(0,0,0,.2); @@ -35,6 +39,9 @@ h1 { #sites .site .watch div.name span.name { font-size: 131%; } +#sites .site .watch div.name span.url { + white-space: nowrap; +} #sites .site .watch div.name span.url a { font-size: 85%; } @@ -55,9 +62,6 @@ h1 { #sites .site .watch div.status span.response { margin: 0 1.3em 0 0; } -#sites .site .watch div.status span.since_date { - display: none; -} #sites .site .watch div.graph { display: none; } public/stylesheets/slides.css @@ -4,10 +4,10 @@ ihoops: id: 1 name: Homepage url: http://www.ihoops.com/ - last_response_time: 124 + last_response_time: 500 active: true - content_match: 'Welcome to iHoops.com' - warning_time: 600 + content_match: Welcome to iHoops.com + warning_time: 2000 status_id: 1 site_id: 1 @@ -15,7 +15,8 @@ sportsstudiocasting1: id: 2 name: Homepage url: http://sportsstudiocasting.com - last_response_time: 243 + last_response_time: 500 + warning_time: 2000 active: true status_id: 1 site_id: 2 @@ -24,9 +25,9 @@ sportsstudiocasting2: id: 3 name: Login url: http://sportsstudiocasting.com/login - last_response_time: 3413 + last_response_time: 500 active: true - warning_time: 1000 + warning_time: 2000 status_id: 1 site_id: 2 \ No newline at end of file test/fixtures/watches.yml 35edecc668f4d857631c7d5c4c981b3fe853fa68 Cannikin cannikinn@gmail.com http://github.com/cannikin/owl/commit/649b223b95ee34161bd831e2b00e10c792643ef1 649b223b95ee34161bd831e2b00e10c792643ef1 2009-11-04T16:15:28-08:00 2009-11-04T16:15:28-08:00 Added response code and content tracking 5fac9ccf7a2af5155dc61abfe6c02bf9896a280b Cannikin cannikinn@gmail.com