wackamole 0.0.6 → 0.0.7

data/History.txt

@@ -17,4 +17,11 @@
 * Add set_indexes script. Use to setup mole db indexes
 
 === 0.0.5 / 2010-02-08
-* Added debug
+* Added debug
+
+=== 0.0.6 / 2010-02-08
+* Bug fixes
+
+=== 0.0.7 /2010-02-21
+* Added drilldown on dashboard
+* Bug fixes and clean up

data/lib/app.rb

@@ -46,7 +46,7 @@ configure do
       :server => "%s:%d/%s/%s" % ['localhost', '27017', 'wackamole_ses', 'sessions'],
       :log_level => :error
   end  
-  set :con, Wackamole::Control.init_config( default_config, Sinatra::Application.environment.to_s )
+  Wackamole::Control.init_config( default_config, Sinatra::Application.environment.to_s )
 end
 
 # -----------------------------------------------------------------------------

data/lib/controllers/dashboard.rb

@@ -8,7 +8,7 @@ module Dashboard
   get '/dashboard/:app_name/:stage' do    
     Wackamole::Control.switch_mole_db!( params[:app_name].downcase, params[:stage] )
     
-    load_app_details
+    @info = Wackamole::MoledInfo.collect_dashboard_info( @updated_on )
 
     # Reset app info
     load_app_info
@@ -22,21 +22,29 @@ module Dashboard
   # ---------------------------------------------------------------------------
   # Refresh dashboard
   get '/dashboard/refresh' do
-    load_app_details
+    @info = Wackamole::MoledInfo.collect_dashboard_info( @updated_on )
+
     erb :'dashboard/refresh_js', :layout => false
   end
-  
+
   # ---------------------------------------------------------------------------  
-  get '/dashboard/logs/:app_name/:stage/:type' do
-    Wackamole::Control.switch_mole_db!( params[:app_name].downcase, params[:stage] )
-    load_app_details
-    load_app_info
-    
+  get '/dashboard/logs/:type/:hour/' do
+    # Reset filter
     filter = Wackamole::SearchFilter.new
     filter.mole_type( params[:type].to_i )
-puts "SETTING FILTER", filter.inspect    
+    filter.hour = params[:hour].to_i
     session[:filter] = filter
+    
     redirect '/logs/1'
   end
   
+  # ---------------------------------------------------------------------------  
+  get '/dashboard/users/:hour/' do
+    # Reset filter
+    filter = Wackamole::SearchFilter.new
+    filter.hour = params[:hour].to_i    
+    session[:filter] = filter
+    
+    redirect '/users/1'
+  end
 end

data/lib/controllers/features.rb

@@ -3,10 +3,7 @@ module Features
   # ---------------------------------------------------------------------------
   # paginate top features
   get "/features/:page" do
-    page = params[:page] ? params[:page].to_i : 1
-        
-puts @filter.inspect
-        
+    page         = params[:page] ? params[:page].to_i : 1        
     @features    = Wackamole::Feature.paginate_tops( @filter.to_conds, page )   
     @search_path = "/features/search"
     @filter_path = "/features/filter"
@@ -38,7 +35,6 @@ puts @filter.inspect
   post "/features/filter" do
     @filter.from_options( params[:filter] )
     session[:filter] = @filter
-puts "Setting #{session[:filter].inspect}"        
     @features = Wackamole::Feature.paginate_tops( @filter.to_conds )
     erb :"features/filter.js", :layout => false
   end  

data/lib/controllers/logs.rb

@@ -21,7 +21,7 @@ module Logs
       @filter.search_terms = params[:search_filter][:search_terms]
       @logs = Wackamole::Log.paginate( @filter.to_conds )
     rescue => boom
-      puts boom
+      # puts boom
       flash_it!( :error, boom )
       @logs = [].paginate
     end
@@ -43,16 +43,7 @@ module Logs
     @filter.from_options( params[:filter] )
     session[:filter] = @filter
     
-    # elapsed = Benchmark.realtime do
-      @logs = Wackamole::Log.paginate( @filter.to_conds )
-    # end
-    # puts "Filter logs %5.4f" % elapsed
-
-    out = nil
-    # elapsed = Benchmark.realtime do
-      out = erb :"logs/filter.js", :layout => false
-    # end
-    # puts "Render logs %5.4f" % elapsed
-    out  
+    @logs = Wackamole::Log.paginate( @filter.to_conds )
+    erb :"logs/filter.js", :layout => false
   end  
 end

data/lib/controllers/mission.rb

@@ -26,6 +26,21 @@ module Mission
     erb :'/mission/refresh_js', :layout => false
   end
 
+  get '/mission/logs/:app_name/:stage/:type' do
+    Wackamole::Control.switch_mole_db!( params[:app_name].downcase, params[:stage] )
+    
+    # Set app info
+    @app_info = Wackamole::Feature.get_app_info
+    session[:app_info] = @app_info
+
+    # Reset filter    
+    filter = Wackamole::SearchFilter.new
+    filter.mole_type( params[:type].to_i )
+    session[:filter] = filter
+    
+    redirect '/logs/1'
+  end
+
   # # ---------------------------------------------------------------------------
   # get '/mission/fixed/:app/:env/:type' do
   #   Wackamole::Mission.reset!( params[:app], params[:env], params[:type] )

data/lib/controllers/users.rb

@@ -4,12 +4,7 @@ module Users
   # Paginate top users
   get "/users/:page" do
     page = params[:page] ? params[:page].to_i : 1
-
-puts "User filter", @filter.inspect
-elapsed = Benchmark.realtime do  
-    @users       = Wackamole::User.paginate_tops( @filter.to_conds, page )   
-end
-puts "Find users %5.4f" % elapsed
+    @users = Wackamole::User.paginate_tops( @filter.to_conds, page )   
 
     @search_path = "/users/search"
     @filter_path = "/users/filter"
@@ -41,7 +36,6 @@ puts "Find users %5.4f" % elapsed
   post "/users/filter" do    
     @filter.from_options( params[:filter] )
     session[:filter] = @filter
-puts "Setting user filter #{session[:filter].inspect}"    
     @users = Wackamole::User.paginate_tops( @filter.to_conds )
     erb :"users/filter.js", :layout => false
   end  

data/lib/helpers/mission_helper.rb

@@ -15,10 +15,7 @@ module MissionHelper
       last_tick           = last_tick || Chronic.parse( '1 minute ago' )
       session[:last_tick] = Time.now
       
-      elapsed = Benchmark.realtime do
-        @reports = Wackamole::Mission.rollups( last_tick.utc, reset )
-      end
-      puts "Rollups %5.4f" % elapsed
+      @reports = Wackamole::Mission.rollups( last_tick.utc, reset )
     end
     
     # -------------------------------------------------------------------------

data/lib/wackamole/models/mission.rb

@@ -31,27 +31,25 @@ module Wackamole
     def self.count_logs( now=nil, single_day=false )
       counts = {}
       conds  = gen_conds( now, single_day )
-      # elapsed = Benchmark.realtime do
-        Wackamole::Control.mole_databases.each do |db_name|
-          db            = Wackamole::Control.db( db_name )
-          app_name, env = Wackamole::Control.extract_app_info( db_name )
-          logs_cltn     = db['logs']
-          
-          totals = { Rackamole.feature => 0, Rackamole.perf => 0, Rackamole.fault => 0 }
-          if counts[app_name]
-            counts[app_name][env] = totals
-          else
-            counts[app_name] = { env => totals }
-          end
-          row = counts[app_name][env]
-          [Rackamole.feature, Rackamole.perf, Rackamole.fault].each do |t|
-            conds[:typ] = t
-            logs  = logs_cltn.find( conds, :fields => [:_id] )
-            row[t] = logs.count
-          end
+
+      Wackamole::Control.mole_databases.each do |db_name|
+        db            = Wackamole::Control.db( db_name )
+        app_name, env = Wackamole::Control.extract_app_info( db_name )
+        logs_cltn     = db['logs']
+        
+        totals = { Rackamole.feature => 0, Rackamole.perf => 0, Rackamole.fault => 0 }
+        if counts[app_name]
+          counts[app_name][env] = totals
+        else
+          counts[app_name] = { env => totals }
         end
-      # end
-      # puts "Computing counts %d -- %5.4f" % [counts.size, elapsed]
+        row = counts[app_name][env]
+        [Rackamole.feature, Rackamole.perf, Rackamole.fault].each do |t|
+          conds[:typ] = t
+          logs  = logs_cltn.find( conds, :fields => [:_id] )
+          row[t] = logs.count
+        end
+      end
       counts       
     end
       

data/lib/wackamole/models/mole_info.rb

@@ -12,52 +12,40 @@ module Wackamole
     # TODO - PERF - try just using cursor vs to_a
     def self.collect_dashboard_info( now )    
       info    = {}
-      day_logs = logs_cltn.find( { :did => now.to_date_id.to_s }, 
-        :fields => [:typ, :fid, :tid, :did, :uid], 
-        :sort => [ [:tid => Mongo::ASCENDING] ] ).to_a
+      
+      info[:total_users]    = users_cltn.count
+      info[:total_features] = features_cltn.count
+      info[:perf_load]      = 0
+      info[:fault_load]     = 0
         
-      # Fetch user count for this hour
-      users = day_logs.inject( Set.new ) do |set,log| 
-        set << log['uid'] if log['tid'] =~ /^#{"%02d" % now.hour}/
-        set
-      end
-      info[:total_users] = users_cltn.count
-      info[:user_load]   = users.size
+      # Fetch day logs          
+      day_logs = logs_cltn.find( { :did => now.utc.to_date_id.to_s }, 
+        :fields => [:typ, :fid, :tid, :did, :uid], 
+        :sort => [ [:tid => Mongo::ASCENDING] ] )
 
-      # Fetch features for this hour    
-      features = day_logs.inject( Set.new ) do |set,log| 
-        set << log['fid'].to_s if log['tid'] =~ /^#{"%02d" % now.hour}/
-        set 
-      end
-      info[:total_features] = features_cltn.count
-      info[:feature_load]   = features.size
-    
-      info[:perf_load] = day_logs.inject(0) do |count,log| 
-        if log['tid'] =~ /^#{"%02d" % now.hour}/
-          count += (log['typ'] == Rackamole.perf ? 1 : 0 ) 
-        end
-        count
-      end
-      info[:fault_load] = day_logs.inject(0) do |count,log| 
-        if log['tid'] =~ /^#{"%02d" % now.hour}/
-          count += (log['typ'] == Rackamole.fault ? 1 : 0 ) 
-        end
-        count
-      end
-    
       # Count all logs per hourly time period
+      users         = Set.new
+      features      = Set.new
+      local_time    = now.clone.localtime
       hours         = (0...24).to_a
       hour_info     = hours.inject(OrderedHash.new) { |res,hour| res[hour] = { :user => 0, :feature => 0, :perf => 0, :fault => 0 };res }    
       user_per_hour = {}
       day_logs.each do |log|
         date_tokens = log['did'].match( /(\d{4})(\d{2})(\d{2})/ ).captures
-        time_tokens = log['tid'].match( /(\d{2})(\d{2})(\d{2})/ ).captures
-        
-        utc         = Time.utc( date_tokens[0], date_tokens[1], date_tokens[2], time_tokens[0], time_tokens[1], time_tokens[2] )
-        local       = utc.localtime
+        time_tokens = log['tid'].match( /(\d{2})(\d{2})(\d{2})/ ).captures        
+        log_utc     = Time.utc( date_tokens[0], date_tokens[1], date_tokens[2], time_tokens[0], time_tokens[1], time_tokens[2] )
+        local       = log_utc.clone.localtime
         hour        = local.hour
-        current_day = local.day
-        next if local.day != current_day
+
+        next if hour > local_time.hour
+
+        if log_utc.hour == now.hour
+          users    << log['uid']
+          features << log['fid']
+          info[:fault_load] += 1 if log['typ'] == Rackamole.fault
+          info[:perf_load]  += 1 if log['typ'] == Rackamole.perf
+        end
+        
         if user_per_hour[hour]
           unless user_per_hour[hour].include? log['uid']
             hour_info[hour][:user] += 1
@@ -68,33 +56,22 @@ module Wackamole
           hour_info[hour][:user] += 1
         end
         case log['typ']
-          when Rackamole.feature : hour_info[hour][:feature] += 1 if features.add?( log['fid'])
+          when Rackamole.feature : hour_info[hour][:feature] += 1
           when Rackamole.perf    : hour_info[hour][:perf]    += 1
           when Rackamole.fault   : hour_info[hour][:fault]   += 1
         end
       end
-        
-      # BOZO !! LAME ASS...
-      info[:user_series]    = []
-      info[:fault_series]   = []
-      info[:perf_series]    = []
-      info[:feature_series] = []
-      hour_info.values.map do |hash| 
-        info[:user_series]    << hash[:user]
-        info[:fault_series]   << hash[:fault]
-        info[:perf_series]    << hash[:perf]
-        info[:feature_series] << hash[:feature]
+                
+      info[:user_load]    = users.size
+      info[:feature_load] = features.size
+      %w(user fault perf feature).each do |s|
+        k = "#{s}_series".to_sym
+        info[k] = []
+        hour_info.values.map do |hash| 
+          info[k] << hash[s.to_sym]
+        end
       end
       info
-    end  
-        
-    # ===========================================================================
-    private
-        
-      # -------------------------------------------------------------------------
-      # Makes sure we have some indexes set
-      # BOZO !! Create script to set these up ?
-      def self.ensure_indexes
-      end
+    end        
   end
 end

data/lib/wackamole/models/search_filter.rb

@@ -3,7 +3,7 @@ require 'chronic'
 module Wackamole
   class SearchFilter
   
-    attr_accessor :time_frame, :feature_id, :type, :browser_type, :search_terms
+    attr_accessor :time_frame, :feature_id, :type, :browser_type, :search_terms, :hour
 
     # ---------------------------------------------------------------------------
     # Ctor
@@ -18,6 +18,7 @@ module Wackamole
       @time_frame   = SearchFilter.time_frames.first
       @browser_type = SearchFilter.browser_types.first
       @type         = SearchFilter.mole_types.first
+      @hour         = SearchFilter.hourlies.first
       @search_terms = ""
     end
   
@@ -33,6 +34,12 @@ module Wackamole
       @time_frames ||= ['today', '2 days', '1 week', '2 weeks', '1 month', '3 months', '6 months', '1 year' ]
     end
 
+    # ---------------------------------------------------------------------------
+    # Available hours    
+    def self.hourlies
+      @hourlies ||= ['all'] + (1..23).to_a
+    end
+
     # ---------------------------------------------------------------------------
     # Collection of mole types
     def self.mole_types
@@ -107,7 +114,6 @@ module Wackamole
     def from_options( options )
       return unless options
       options.each_pair do |k,v|
-        # value = k.index( /_id$/) ? v.to_i : v
         self.send( "#{k}=", v )
       end
     end
@@ -135,6 +141,13 @@ module Wackamole
       time = Chronic.parse( time_frame + ( time_frame == SearchFilter.time_frames.first ? "" : " ago" ) )
       conds[:did] = { '$gte' => time.to_date_id.to_s }
       
+      unless self.hour == 'all'
+        now     = Time.now
+        current = "%4d/%02d/%02d %02d:%02d:%02d" % [now.year, now.month, now.day, self.hour, 0, 0]    
+        time = Chronic.parse( current ).utc
+        conds[:tid] = /^#{"%02d"%time.hour}.+/
+      end
+      
       unless search_terms.empty?
         tokens = search_terms.split( ":" ).collect{ |c| c.strip }
         key    = tokens.shift

data/lib/wackamole.rb

@@ -1,7 +1,7 @@
 module Wackamole
 
   # :stopdoc:
-  VERSION = '0.0.6'                                                          unless defined? Wackamole::VERSION
+  VERSION = '0.0.7'                                                          unless defined? Wackamole::VERSION
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR unless defined? Wackamole::LIBPATH
   PATH    = ::File.dirname(LIBPATH) + ::File::SEPARATOR                      unless defined? Wackamole::PATH
   # :startdoc:

data/public/javascripts/application.js

@@ -17,12 +17,53 @@ function truncate(str, limit)
   return bits.join('');
 }
 
-
-function blee( url )
+// Graphs...
+function gen_load( name, value, total )
 {
-  if( url == "/explore")
-    window.location = url;
-  else
-    $.ajax( {url: url, dataType: 'script', method: 'GET'} );
-  return false;
+  var p      = Raphael( name, 300, 20 );
+  var range  = Math.ceil( ((value/total)*100)/10 );
+  var x      = 2;
+  var y      = 2;
+  var spacer = 5;
+      
+  for( var i=1; i <= range; i++ )
+  {
+    var l = p.rect( x, y, 10, 16, 2 );
+    l.attr( 'fill', 'green' );
+    l.attr( 'gradient', '45-#0f0-#fff' );
+    l.attr( 'stroke-width', 0 );
+    x += 10 + spacer;
+
+  }
+  var text = p.text( 230, 10, Math.ceil((value/total)*100) + '% (' + value + " of " + total + ')' );
+  text.attr( 'fill'     , '#434343' );  
+  text.attr( 'font-size', 15 );      
 }
+
+function gen_heat_map( url, id, series, symbol, xs, ys, axisx, axisy )
+{
+  var r = Raphael( id );
+  var urls = [];
+  
+  for( hour in xs ) { 
+    var u = url + hour + "/";
+    urls[hour] = u;
+  }
+    
+  var chart = r.g.dotchart(0, -10, 620, 60, xs, ys, series, {href: urls, symbol: symbol, max: 10, heat: true, axis: "0 0 1 0", axisxstep: 23, axisystep: 1, axisxlabels: axisx, axisxtype: " ", axisytype: " ", axisylabels: axisy})
+  
+  chart.hover( function () {
+      this.tag = this.tag || r.g.tag(this.x, this.y, this.value, 0, this.r + 2).insertBefore(this);
+      this.tag.show();
+    }, 
+    function () {
+      this.tag && this.tag.hide();
+    }
+  );
+  
+  chart.click( function() {
+    // this.tag = this.tag || r.g.tag(this.x, this.y, this.value, 0, this.r + 2).insertBefore(this);
+    // console.log( "Clicked url " + this.href );
+    // return false;
+  }) 
+}

data/public/stylesheets/wackamole.css

@@ -549,16 +549,16 @@ ul#summary li p{
 
 
 p#perfs {
-  background: transparent url(/images/perf_small.png) no-repeat 2px 2px;
+  background: transparent url(/images/perf_small.png) no-repeat 1px 2px;
 }
 p#faults {
-  background: transparent url(/images/fault_small.png) no-repeat 2px 2px;
+  background: transparent url(/images/fault_small.png) no-repeat 1px 2px;
 }
 p#users {
-  background: transparent url(/images/users.png) no-repeat 2px 2px;
+  background: transparent url(/images/users.png) no-repeat 1px 2px;
 }
 p#features {
-  background: transparent url(/images/feature.png) no-repeat 2px 2px;
+  background: transparent url(/images/feature.png) no-repeat 1px 2px;
 }
 
 div.section ul li p.result {

data/spec/models/moled_info_spec.rb

@@ -6,7 +6,7 @@ describe Wackamole::MoledInfo do
     Wackamole::Control.init_config( File.join(File.dirname(__FILE__), %w[.. config test.yml]), 'test' )
     Wackamole::Control.connection.should_not be_nil
     Wackamole::Control.db( "mole_fred_test_mdb" )
-    @test_time = Chronic.parse( "2010/01/01 01:00:00" ).utc     
+    @test_time = Chronic.parse( "2010/01/01 01:00:00" )
   end
   
   it "should gather dashboard info correctly" do

data/views/dashboard/_report.erb

@@ -10,11 +10,23 @@
       <div id="feature_load" class="load"></div>        
     <li>
       <p class="status">Performance</p>
-      <p class="result"><%=pluralize( @info[:perf_load], 'issue' )%></p>        
+      <p class="result">
+        <% if @info[:perf_load] > 0 %>
+          <%= link_to pluralize( @info[:perf_load], 'issue' ), "/dashboard/logs/#{Rackamole.perf}/", :class => "site_link" %>
+        <% else %>
+          <%=pluralize( @info[:perf_load], 'issue' )%>
+        <% end %>
+      </p>  
     </li>
     <li>
       <p class="status">Uncaught Exceptions</p>
-      <p class="result"><%=pluralize( @info[:fault_load], 'issue' )%></p>
+      <p class="result">
+        <% if @info[:fault_load] > 0 %>
+          <%= link_to pluralize( @info[:fault_load], 'issue' ), "/dashboard/logs/#{Rackamole.fault}/", :class => "site_link" %>
+        <% else %>
+          <%=pluralize( @info[:fault_load], 'issue' )%>
+        <% end %>
+      </p>
     </li>
   </ul>
 </div>
@@ -47,72 +59,43 @@
       <% end %>
     </li>
     <li>
-      <p id="features">Features</p>
+      <p id="features">Logs</p>
       <% unless zeroed_series?( @info[:feature_series] ) %>
         <div class="heat" id="svg_features"></div>
       <% else %>
-        <p class="no_report">No Features reported.</p>
+        <p class="no_report">No Logs reported.</p>
       <% end %>
     </li>
   </ul>
 </div>
 
-<script>
-  function gen_load( name, value, total )
-  {
-    var p      = Raphael( name, 300, 20 );
-    var range  = Math.ceil( ((value/total)*100)/10 );
-    var x      = 2;
-    var y      = 2;
-    var spacer = 5;
-        
-    for( var i=1; i <= range; i++ )
-    {
-      var l = p.rect( x, y, 10, 16, 2 );
-      l.attr( 'fill', 'green' );
-      l.attr( 'gradient', '45-#0f0-#fff' );
-      l.attr( 'stroke-width', 0 );
-      x += 10 + spacer;
-
-    }
-    var text = p.text( 230, 10, Math.ceil((value/total)*100) + '% (' + value + " of " + total + ')' );
-    text.attr( 'fill'     , '#434343' );  
-    text.attr( 'font-size', 15 );      
-  }
-
-  function gen_heat_map( id, series, symbol )
-  {
-    var r = Raphael( id ), 
-      xs    = <%= (0..23).to_a.to_json %>,
+<script>    
+  $( function() {
+    $('a.dash').addClass( 'current' );
+    
+    var xs = <%= (0..23).to_a.to_json %>,
       ys    = <%= y = [];24.times{ y << 1 };y.to_json %>,
       axisy = <%= %w[Mon].to_json %>,
       axisx = <%= %w[12am 1 2 3 4 5 6 7 8 9 10 11 12 1 2 3 4 5 6 7 8 9 10 11].to_json %>;
-            
-    r.g.dotchart(0, -10, 620, 60, xs, ys, series, {symbol: symbol, max: 10, heat: true, axis: "0 0 1 0", axisxstep: 23, axisystep: 1, axisxlabels: axisx, axisxtype: " ", axisytype: " ", axisylabels: axisy}).hover(function () {
-      this.tag = this.tag || r.g.tag(this.x, this.y, this.value, 0, this.r + 2).insertBefore(this);
-      this.tag.show();
-    }, function () {
-      this.tag && this.tag.hide();
-    });      
-  }
-    
-  $( function() {
-    $('a.dash').addClass( 'current' );
     
     gen_load( 'user_load'   , <%=@info[:user_load]%>, <%=@info[:total_users]%> );
     gen_load( 'feature_load', <%=@info[:feature_load]%>, <%=@info[:total_features]%> );
-      
+          
     <% unless zeroed_series?( @info[:fault_series] ) %>
-      gen_heat_map( 'svg_faults'  , <%=@info[:fault_series].to_json%>  , 'cross' );
+      var url = "/dashboard/logs/<%=Rackamole.fault%>/";
+      gen_heat_map( url, 'svg_faults', <%=@info[:fault_series].to_json%>, 'cross'  , xs, ys, axisx, axisy );
     <% end %>
     <% unless zeroed_series?( @info[:perf_series] ) %>
-      gen_heat_map( 'svg_perf'    , <%=@info[:perf_series].to_json%>   , 'diamond' );
+      var url = "/dashboard/logs/<%=Rackamole.perf%>/";
+      gen_heat_map( url, 'svg_perf', <%=@info[:perf_series].to_json%>, 'diamond', xs, ys, axisx, axisy );
     <% end %>
     <% unless zeroed_series?( @info[:user_series] ) %>
-      gen_heat_map( 'svg_users'   , <%=@info[:user_series].to_json%>   , 'disc' );
+      var url = "/dashboard/users/";
+      gen_heat_map( url, 'svg_users', <%=@info[:user_series].to_json%>, 'disc', xs, ys, axisx, axisy );
     <% end %>
-    <% unless zeroed_series?( @info[:user_series] ) %>
-      gen_heat_map( 'svg_features', <%=@info[:feature_series].to_json%>, 'flower' );
+    <% unless zeroed_series?( @info[:feature_series] ) %>
+      var url = "/dashboard/logs/<%=Rackamole.feature%>/";
+      gen_heat_map( url, 'svg_features', <%=@info[:feature_series].to_json%>, 'flower', xs, ys, axisx, axisy );
     <% end %>
   });
 </script>

data/views/dashboard/index.erb

@@ -1,4 +1,4 @@
-<%= javascripts %w[raphael.min g.raphael.min g.dot.min] %>
+<%= javascripts %w[application raphael.min g.raphael.min g.dot.min] %>
 
 <div id="dash">
   <%= partial :'dashboard/report' %>

data/views/dashboard/refresh_js.erb

@@ -1,3 +1,4 @@
-$('p#timestamp').html( "<%=escape_javascript(partial(:'shared/timestamp'))%>" );
+$('span#timestamp').html( "<%=escape_javascript(partial(:'shared/timestamp'))%>" );
+$("span#timestamp").effect( 'pulsate', { times:1 }, 500 );
 
 $('div#dash').html( "<%=escape_javascript(partial(:'dashboard/report'))%>" );

data/views/mission/_report.erb

@@ -28,7 +28,7 @@ table#mission tr.div {
         <th width="25%">application</th>
         <th width="10%">environment</th>
         <th width="20%">to date</th>
-        <th width="20%">today</th>
+        <th width="20%">24 hours</th>
         <th width="20%">last tick</th>
       </tr>
     </thead>
@@ -48,7 +48,7 @@ table#mission tr.div {
                         <% clazz = ( (count > 0 and %w(last_tick today).include?(period)) ? assign_class( type, count ) : nil) %>
                         <td width="25px">
                           <% if( %w(last_tick today).include?( period ) and count > 0 ) %>
-                            <%= link_to Wackamole::Mission.to_type_name(type), "/dashboard/logs/#{app_name}/#{env}/#{type}", :class => "site_link" %>:
+                            <%= link_to Wackamole::Mission.to_type_name(type), "/mission/logs/#{app_name}/#{env}/#{type}", :class => "site_link" %>:
                           <% else %>
                             <%=Wackamole::Mission.to_type_name(type)%>:
                           <% end %>

data/views/shared/_filter.erb

@@ -1,5 +1,13 @@
 <div id="filters" class="corners">
   <form id="filter_form">
+  	<fieldset id="submit">
+  	  <label>
+  	    &nbsp;
+    	  <input type="submit" name="commit" value="Filter"/>
+        <%= image_tag 'loading.gif', :border => '0', :size => '24x24', :id => 'loading' %>
+  	  </label>
+  	</fieldset>  	
+    
     <fieldset class="inline">
   		<label for="time_frame">
   		  Time range:
@@ -9,6 +17,15 @@
   	  </label>
     </fieldset>	                
 
+    <fieldset class="inline">
+  		<label for="hourly_frame">
+  		  Hour of Day:
+  			<select id="hourly_frame" name="filter[hour]">
+  		    <%= options_for_select Wackamole::SearchFilter.hourlies, @filter.hour %>
+  		  </select>  			  
+  	  </label>
+    </fieldset>	                
+
   	<fieldset class="inline">
   		<label for="type">
   		  Type:
@@ -35,13 +52,6 @@
   		  </select>						  
   	  </label>
   	</fieldset>
-  	<fieldset id="submit">
-  	  <label>
-  	    &nbsp;
-    	  <input type="submit" name="commit" value="Filter"/>
-        <%= image_tag 'loading.gif', :border => '0', :size => '24x24', :id => 'loading' %>
-  	  </label>
-  	</fieldset>  	
   </form>
 </div>
 

data/views/shared/_timestamp.erb

@@ -1 +1 @@
-<%= @updated_on.strftime( "%m/%d/%y %H:%M:%S") %>
+<%= @updated_on.clone.localtime.strftime( "%m/%d/%y %H:%M:%S") %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wackamole
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -07:00
+date: 2010-02-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency