litestack 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73ffde7dabefb83339815ca79679b0916637d50a6c70a43d13e34f8b431f2914
-  data.tar.gz: 44ef247be2a245801d6d5f25a383031941b6c6dc496fac551eca525b274da178
+  metadata.gz: a1125a2cb5a2d9ea277fb9a0774632eb297ed4d322882dd33776d8a8f1c6471e
+  data.tar.gz: 9cb917c999850b2bd668e8826a4be4f091ee4e8e0f963b54ed87f5b7a7b060d6
 SHA512:
-  metadata.gz: 8fe11c9b2d655dc39fadedb20782701ad8fe00cf8d548b1312a031122c2af5d6e66c26ab69ad22f6beb39e72419c33cf0d4b30bfd058d5a93db261122f6b29ae
-  data.tar.gz: 2ba9faecce2a926e9a8b65efe11c0766eb3ef4021510fb786e3a7a9483ff2d24f463968cb5ddab07465cf3eae2b04f28edb428589f3c95b1c7ebe6c4f826cc54
+  metadata.gz: e51460d99e66732e3dcd72e9444f1d739df7ae37804eb9b308cdae0faa7c9c34d4e7554e8f9d0bf91905f7ae3e9b4d7470509a84653da2ee736582b268fe188a
+  data.tar.gz: 873b188bd6db924f1e56034c22f5cc465b01d653ac925a2d30de648271b0b64a705894667b90005bd3d457ad318d3ee4736b16a60fa128c34d894172bc9b8e16

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+## [0.3.0] - 2023-08-13
+
+- Reworked the Litecable thread safety model
+- Fixed multiple litejob bugs (thanks Stephen Margheim)
+- Fixed Railtie dependency (thanks Marco Roth)
+- Litesupport fixes (thanks Stephen Margheim)
+- Much improved metrics reporting for Litedb, Litecache, Litejob & Litecable
+- Removed (for now, will come again later) litemetric reporting support for ad-hoc modules
+
+## [0.2.6] - 2023-07-16
+
+- Much improved database location setting (thanks Brad Gessler)
+- A Rails generator for better Rails Litestack defaults (thanks Brad Gessler)
+- Revamped Litemetric, now much faster and more accurate (still experimental)
+- Introduced Liteboard, a dashboard for viewing Litemetric data
+
 ## [0.2.3] - 2023-05-20
 
 - Cut back on options defined in the Litejob Rails adapter

data/Gemfile

@@ -6,3 +6,5 @@ source "https://rubygems.org"
 gemspec
 
 
+
+gem "rack", "~> 3.0"

data/README.md

@@ -31,19 +31,13 @@ Litestack is still pretty young and under heavy development, but you are welcome
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add the `litestack` gem line to your application's Gemfile:
 
-```ruby
-gem 'litestack'
-```
-
-And then execute:
-
-    $ bundle install
+    $ bundle add litestack
 
-Or install it yourself as:
+To configure a Rails application to run the full litestack, run:
 
-    $ gem install litestack
+    $ rails generate litestack:install
 
 ## Usage
 
@@ -189,7 +183,7 @@ production:
 
 ## Contributing
 
-Bug reports are welcome on GitHub at https://github.com/oldmoe/litestack. Please note that this is not an open contribution project and that we don't accept pull requests.
+Bug reports and pull requests are welcome on GitHub at https://github.com/oldmoe/litestack.
 
 ## License
 

data/bench/bench_jobs_rails.rb

@@ -29,7 +29,7 @@ if env == "a" # threaded
 end
 
 require_relative '../lib/active_job/queue_adapters/litejob_adapter'
-puts Litesupport.environment
+puts Litesupport.scheduler
 
 RailsJob.queue_adapter = :litejob
 t = Time.now.to_f

data/bench/bench_jobs_raw.rb

@@ -28,7 +28,7 @@ end
 
 require './uljob.rb'
 
-STDERR.puts "litejob started in #{Litesupport.environment} environmnet"
+STDERR.puts "litejob started in #{Litesupport.scheduler} environmnet"
 
 t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 bench("enqueuing litejobs", count) do |i|

data/bin/liteboard

@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'optparse'
+require_relative '../lib/litestack/liteboard/liteboard'
+DEFAULTS = {
+  config_path: Litemetric::DEFAULT_OPTIONS[:config_path],
+  path: Litemetric::DEFAULT_OPTIONS[:path]
+}
+
+options = { 
+  config_path: nil,
+  path: nil,
+  deamonize: false,
+  Port: 9292,
+  Host: 'localhost',
+  environment: 'production',
+  quiet: false
+}
+
+OptionParser.new do |parser|
+  parser.banner = "Usage: liteboard [options]"
+  parser.on("-d", "--database PATH", "path to SQLite file  (default: #{DEFAULTS[:path]})") { |v| options[:path] = v }
+  parser.on("-c", "--config PATH", "path to a litemetric config file (default: #{DEFAULTS[:config_path]}) ") { |v| options[:config_path] = v }
+  parser.on("-s", "--server SERVER", "use SERVER (e.g. puma/falcon/iodine)") { |v| options[:port] = v }
+  parser.on("-H", "--host HOST", "listen on HOST (default: #{options[:Host]})") { |v| options[:Host] = v }
+  parser.on("-p", "--port PORT", "use PORT (default: #{options[:Port]})") { |v| options[:Port] = v.to_i rescue options[:Port] }
+  parser.on("-D", "--deamonize", "run in the background") { |v| options[:deamonize] = true }  
+  parser.on("-E", "--env ENVIRONMENT", "which environment to use (default: #{options[:environment]})") { |v| options[:environment] = v }  
+  parser.on("-q", "--quiet", "turn off logging") { |v| options[:quiet] = true }  
+  parser.on("-h", "--help", "print this message") do
+    puts parser
+    exit
+  end
+end.parse!
+
+def check_database(path)
+  unless File.exist?(path) 
+    puts "liteboard: missing database file, please ensure the db path is correct"
+    puts "liteboard: exiting"
+    exit
+  end
+end
+
+check_database(options[:path]) if options[:path] 
+
+# if there is a config file then we need to check it
+config = nil
+if options[:config_path]
+  begin
+    config = Yaml.load_file(options[:config_path]) 
+  rescue
+    puts "liteboard: missing or bad config file, please ensure the config file path is correct"
+    puts "liteboard: exiting"
+    exit
+  end 
+else # no config path! use the default
+  config = Yaml.load_file(DEFAULTS[:config_path]) rescue nil 
+end
+
+if config
+  if options[:path].nil?
+    path = config['path'] || config[options[:environment]]['path']
+    options[:path] = path
+  end  
+end
+
+# if still no path we assume a default db path
+options[:path] = DEFAULTS[:path] if options[:path].nil?
+
+
+# check the validity of the path before starting the server
+check_database(options[:path])
+Litemetric.options = options
+litemetric = Litemetric.instance
+options[:app] = Liteboard.app
+
+require_relative '../lib/litestack'
+puts "Starting Liteboard version #{Litestack::VERSION}"
+
+Rack::Server.start(options)

data/lib/action_cable/subscription_adapter/litecable.rb

@@ -10,20 +10,10 @@ module ActionCable
       
       prepend ChannelPrefix
 
-      DEFAULT_OPTIONS = {
-        config_path: "./config/litecable.yml",
-        path: "./db/cable.db",
-        sync: 0, # no need to sync at all
-        mmap_size: 16 * 1024 * 1024, # 16MB of memory hold hot messages
-        expire_after: 10, # remove messages older than 10 seconds
-        listen_interval: 0.005, # check new messages every 5 milliseconds
-        metrics: false
-      }
-
       def initialize(server, logger=nil)
         @server = server
         @logger = server.logger
-        super(DEFAULT_OPTIONS.dup)
+        super({config_path: "./config/litecable.yml"})
       end
             
       def shutdown

data/lib/generators/litestack/install/USAGE

@@ -0,0 +1,11 @@
+Description:
+    Installs litestack gem and configures the project to use litestack
+    in development, test, and production environments.
+
+Example:
+    bin/rails generate litestack:install
+
+    This will modify:
+        config/environments/production.rb
+        config/database.yml
+        config/cable.yml

data/lib/generators/litestack/install/install_generator.rb

@@ -0,0 +1,35 @@
+class Litestack::InstallGenerator < Rails::Generators::Base
+  source_root File.expand_path("templates", __dir__)
+
+  # Force copy configuratioon files so Rails installs don't ask questions
+  # that less experienced people might not understand. The more Sr folks.
+  # will know to check git to look at what changed.
+  def modify_database_adapater
+    copy_file "database.yml", "config/database.yml", force: true
+  end
+
+  def modify_action_cable_adapter
+    copy_file "cable.yml", "config/cable.yml", force: true
+  end
+
+  def modify_cache_store_adapter
+    gsub_file "config/environments/production.rb",
+      "# config.cache_store = :mem_cache_store",
+      "config.cache_store = :litecache"
+  end
+
+  def modify_active_job_adapter
+    gsub_file "config/environments/production.rb",
+      "# config.active_job.queue_adapter     = :resque",
+      "config.active_job.queue_adapter = :litejob"
+  end
+
+  def modify_gitignore
+    append_file ".gitignore", <<~TEXT
+
+    # Ignore default Litestack SQLite databases.
+    /db/**/*.sqlite3
+    /db/**/*.sqlite3-*
+    TEXT
+  end
+end

data/lib/generators/litestack/install/templates/cable.yml

@@ -0,0 +1,11 @@
+development:
+  adapter: litecable
+
+test:
+  adapter: test
+
+staging:
+  adapter: litecable
+
+production:
+  adapter: litecable

data/lib/generators/litestack/install/templates/database.yml

@@ -0,0 +1,34 @@
+# SQLite. Versions 3.8.0 and up are supported.
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem "sqlite3"
+#
+# `Litesupport.root.join("data.sqlite3")` stores
+# application data in the path `./db/#{Rails.env}/data.sqlite3`
+#
+# idle_timeout should be set to zero, to avoid recycling sqlite connections
+# and losing the page cache
+# 
+default: &default
+  adapter: litedb
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  idle_timeout: 0
+  database: <%= Litesupport.root.join("data.sqlite3") %>
+
+development:
+  <<: *default
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+
+# Warning: Make sure your production database path is on a persistent
+# volume, otherwise your application data could be deleted between deploys.
+#
+# You may also set the Litesupport.root in production via the
+# `LITESTACK_DATA_PATH` environment variable.
+production:
+  <<: *default

data/lib/litestack/liteboard/liteboard.rb

@@ -0,0 +1,305 @@
+# frozen_string_literal: true
+require 'hanami/router'
+require 'tilt'
+require 'erubi'
+
+# require relative so we pick the gem version that corresponds to the liteboard binary
+require_relative '../../litestack/litemetric'
+
+class Liteboard 
+
+  @@resolutions = {'minute' => [300, 12], 'hour' => [3600, 24], 'day' => [3600*24, 7], 'week' => [3600*24*7, 53], 'year' => [3600*24*365, 100] }
+  @@res_mapping = {'hour' => 'minute', 'day' => 'hour', 'week' => 'day', 'year' => 'week'}
+  @@templates = {}
+  @@app = Hanami::Router.new do
+
+    get "/", to: ->(env) do
+      Liteboard.new(env).call(:index)
+    end
+
+    get "/topics/Litejob", to: ->(env) do
+      Liteboard.new(env).call(:litejob)
+    end
+
+    get "/topics/Litecache", to: ->(env) do
+      Liteboard.new(env).call(:litecache)
+    end
+    
+    get "/topics/Litedb", to: ->(env) do
+      Liteboard.new(env).call(:litedb)
+    end
+
+    get "/topics/Litecable", to: ->(env) do
+      Liteboard.new(env).call(:litecable)
+    end
+
+  end 
+
+
+  def initialize(env)
+    @env = env
+    @params = @env["router.params"]
+    @running = true
+    @lm = Litemetric.instance
+  end
+
+  def params(key)    
+    URI.decode_uri_component("#{@params[key]}")
+  end
+
+  def call(method)
+    before
+    res = send(method)
+    after(res)
+  end
+  
+  def after(body=nil)
+    [200, {'Cache-Control' => 'no-cache'}, [body]]    
+  end
+
+  def before
+    @res = params(:res) || 'day'
+    @resolution = @@res_mapping[@res]
+    if not @resolution
+      @res = 'day'
+      @resolution = @@res_mapping[@res]      
+    end
+    @step = @@resolutions[@resolution][0]
+    @count = @@resolutions[@resolution][1]
+    @order = params(:order) 
+    @order = nil if @order == ''
+    @dir = params(:dir) 
+    @dir = 'desc' if @dir.nil? || @dir == ''
+    @dir = @dir.downcase
+    @idir = if @dir == "asc"
+      "desc"
+    else
+      "asc"
+    end
+    @search = params(:search)
+    @search = nil if @search == ''
+    @topics = @lm.topic_summaries(@resolution, @step * @count, @order, @dir, @search)
+  end
+  
+  def index
+    @order = 'topic' unless @order
+    @topics.each do |topic|
+        data_points = @lm.topic_data_points(@step, @count, @resolution, topic[0])      
+        topic << data_points.collect{|r| [r[0],r[2] || 0]}
+    end    
+    render :index
+  end
+  
+  def litecache
+    @order = 'rcount' unless @order
+    @topic = 'Litecache'
+    @events = @lm.events_summaries(@topic, @resolution, @order, @dir, @search, @step * @count)
+    @events.each do |event|
+      data_points = @lm.event_data_points(@step, @count, @resolution, @topic, event['name'])
+      event['counts'] = data_points.collect{|r| [r['rtime'],r['rcount']]}
+      event['values'] = data_points.collect{|r| [r['rtime'],r['ravg']]}
+    end
+    @snapshot = read_snapshot(@topic)
+    @size = @snapshot[0][:summary][:size] rescue 0
+    @max_size = @snapshot[0][:summary][:max_size] rescue 0
+    @full = (@size / @max_size)*100 rescue 0
+    @entries = @snapshot[0][:summary][:entries] rescue 0
+    @gets = @events.find{|t| t['name'] == 'get'}
+    @sets = @events.find{|t| t['name'] == 'set'}
+    @reads = @gets['rcount'] rescue 0
+    @writes = @sets['rcount'] rescue 0
+    @hitrate = @gets['ravg'] rescue 0
+    @hits = @reads * @hitrate
+    @misses = @reads - @hits
+    @reads_vs_writes = @gets['counts'].collect.with_index{|obj, i| obj.clone << @sets['counts'][i][1] } rescue []
+    @hits_vs_misses = @gets['values'].collect.with_index{|obj, i| [obj[0], obj[1].to_f * @gets['counts'][i][1].to_f, (1 - obj[1].to_f) * @gets['counts'][i][1].to_f] } rescue []
+    @top_reads = @lm.keys_summaries(@topic, 'get', @resolution, @order, @dir, nil, @step * @count).first(8)
+    @top_writes = @lm.keys_summaries(@topic, 'set', @resolution, @order, @dir, nil, @step * @count).first(8)
+    render :litecache
+  end
+  
+  def litedb
+    @order = 'rcount' unless @order
+    @topic = 'Litedb'
+    @events = @lm.events_summaries(@topic, @resolution, @order, @dir, @search, @step * @count)
+    @events.each do |event|
+      data_points = @lm.event_data_points(@step, @count, @resolution, @topic, event['name'])
+      event['counts'] = data_points.collect{|r| [r['rtime'],r['rcount'] || 0]}
+      event['values'] = data_points.collect{|r| [r['rtime'],r['rtotal'] || 0]}
+    end
+    @snapshot = read_snapshot(@topic)
+    @size = @snapshot[0][:summary][:size] rescue 0
+    @tables = @snapshot[0][:summary][:tables] rescue 0
+    @indexes = @snapshot[0][:summary][:indexes] rescue 0
+    @gets = @events.find{|t| t['name'] == 'Read'}
+    @sets = @events.find{|t| t['name'] == 'Write'}
+    @reads = @gets['rcount'] rescue 0
+    @writes = @sets['rcount'] rescue 0
+    @time = @gets['ravg'] rescue 0
+    @reads_vs_writes = @gets['counts'].collect.with_index{|obj, i| obj.clone << @sets['counts'][i][1] } rescue []
+    @reads_vs_writes_times = @gets['values'].collect.with_index{|obj, i| [obj[0], obj[1], @sets['values'][i][1].to_f] } rescue []
+    @read_times = @gets['rtotal'] rescue 0
+    @write_times = @sets['rtotal'] rescue 0
+    @slowest = @lm.keys_summaries(@topic, 'Read', @resolution, 'ravg', 'desc', nil, @step * @count).first(8)
+    @slowest += @lm.keys_summaries(@topic, 'Write', @resolution, 'ravg', 'desc', nil, @step * @count).first(8)
+    @slowest = @slowest.sort{|a, b| a['ravg'] <=> b['ravg']}.reverse.first(8) 
+    @popular = @lm.keys_summaries(@topic, 'Read', @resolution, 'rtotal', 'desc', nil, @step * @count).first(8)
+    @popular += @lm.keys_summaries(@topic, 'Write', @resolution, 'rtotal', 'desc', nil, @step * @count).first(8)
+    @popular = @popular.sort{|a, b| a['rtotal'] <=> b['rtotal']}.reverse.first(8) 
+    render :litedb
+  end
+  
+  def litejob
+    @order = 'rcount' unless @order
+    @topic = 'Litejob'
+    @events = @lm.events_summaries(@topic, @resolution, @order, @dir, @search, @step * @count)
+    @events.each do |event|
+      data_points = @lm.event_data_points(@step, @count, @resolution, @topic, event['name'])
+      event['counts'] = data_points.collect{|r| [r['rtime'],r['rcount'] || 0]}
+      event['values'] = data_points.collect{|r| [r['rtime'],r['rtotal'] || 0]}
+    end
+    @snapshot = read_snapshot(@topic)
+    @size = @snapshot[0][:summary][:size] rescue 0
+    @jobs = @snapshot[0][:summary][:jobs] rescue 0
+    @queues = @snapshot[0][:queues] rescue {}
+    @processed_jobs = @events.find{|e|e['name'] == 'perform'}
+    @processed_count = @processed_jobs['rcount'] rescue 0
+    @processing_time = @processed_jobs['rtotal'] rescue 0 
+    keys_summaries = @lm.keys_summaries(@topic, 'perform', @resolution, 'rcount', 'desc', nil, @step * @count)
+    @processed_count_by_queue = keys_summaries.collect{|r|[r['key'], r['rcount']]}
+    @processing_time_by_queue = keys_summaries.collect{|r|[r['key'], r['rtotal']]} #.sort{|r1, r2| r1['rtotal'] > r2['rtotal'] }
+    @processed_count_over_time = @events.find{|e| e['name'] == 'perform'}['counts'] rescue []
+    @processing_time_over_time = @events.find{|e| e['name'] == 'perform'}['values'] rescue []
+    @processed_count_over_time_by_queues = [] 
+    @processing_time_over_time_by_queues = []
+    keys = ['Time']
+    keys_summaries.each_with_index do |summary,i|
+      key = summary['key']
+      keys << key
+      data_points = @lm.key_data_points(@step, @count, @resolution, @topic, 'perform', key)
+      if i == 0
+        data_points.each do |dp|        
+          @processed_count_over_time_by_queues << [dp['rtime']] 
+          @processing_time_over_time_by_queues << [dp['rtime']] 
+        end
+      end
+      data_points.each_with_index do |dp, j|
+        @processed_count_over_time_by_queues[j] << (dp['rcount'] || 0)
+        @processing_time_over_time_by_queues[j] << (dp['rtotal'] || 0)
+      end
+    end
+    @processed_count_over_time_by_queues.unshift(keys)
+    @processing_time_over_time_by_queues.unshift(keys)      
+    render :litejob
+  end
+  
+  def litecable
+    @order = 'rcount' unless @order
+    @topic = 'Litecable'
+    @events = @lm.events_summaries(@topic, @resolution, @order, @dir, @search, @step * @count)
+    @events.each do |event|
+      data_points = @lm.event_data_points(@step, @count, @resolution, @topic, event['name'])
+      event['counts'] = data_points.collect{|r| [r['rtime'],r['rcount'] || 0]}
+    end
+
+    @subscription_count = @events.find{|t| t['name'] == 'subscribe'}['rcount'] rescue 0
+    @broadcast_count = @events.find{|t| t['name'] == 'broadcast'}['rcount'] rescue 0
+    @message_count = @events.find{|t| t['name'] == 'message'}['rcount'] rescue 0
+
+    @subscriptions_over_time = @events.find{|t| t['name'] == 'subscribe'}['counts'] rescue []
+    @broadcasts_over_time = @events.find{|t| t['name'] == 'broadcast'}['counts'] rescue []
+    @messages_over_time = @events.find{|t| t['name'] == 'message'}['counts'] rescue []
+    @messages_over_time = @messages_over_time.collect.with_index{|msg, i| [msg[0], @broadcasts_over_time[i][1], msg[1]]}
+    
+    @top_subscribed_channels = @lm.keys_summaries(@topic, 'subscribe', @resolution, @order, @dir, @search, @step * @count).first(8)
+    @top_messaged_channels = @lm.keys_summaries(@topic, 'message', @resolution, @order, @dir, @search, @step * @count).first(8)
+    render :litecable
+  end
+  
+  def index_url
+    "/?res=#{@res}&order=#{@order}&dir=#{@dir}&search=#{@search}"
+  end
+  
+  def topic_url(topic)
+    "/topics/#{encode(topic)}?res=#{@res}&order=#{@order}&dir=#{@dir}&search=#{@search}"
+  end
+
+  def index_sort_url(field)
+    "/?#{compose_query(field)}"
+  end
+  
+  def topic_sort_url(field)
+    "/topics/#{encode(@topic)}?#{compose_query(field)}"
+  end
+  
+  def event_sort_url(field)
+    "/topics/#{encode(@topic)}/events/#{encode(@event)}?#{compose_query(field)}"
+  end
+  
+  def compose_query(field)
+    field.downcase!
+    "res=#{@res}&order=#{field}&dir=#{@order == field ? @idir : @dir}&search=#{@search}"
+  end
+  
+  def sorted?(field)
+    @order == field
+  end
+  
+  def dir(field)
+    if sorted?(field)
+      if @dir == 'asc'
+        return "<span class='material-icons'>arrow_drop_up</span>"  
+      else
+        return "<span class='material-icons'>arrow_drop_down</span>"
+      end
+    end
+    '&nbsp;&nbsp;'
+  end
+  
+  def encode(text)
+    URI.encode_uri_component(text)
+  end
+  
+  def round(float)
+    return 0 unless float.is_a? Numeric
+    ((float * 100).round).to_f / 100
+  end
+  
+  def format(float)
+    string = float.to_s
+    whole, decimal = string.split('.')
+    whole = whole.split('').reverse.each_slice(3).map(&:join).join(',').reverse
+    whole = [whole, decimal].join('.') if decimal
+    whole
+  end
+  
+  def self.app
+   @@app
+  end
+
+  private
+  
+  def read_snapshot(topic)
+    snapshot = @lm.snapshot(topic)
+    if snapshot.empty?
+      snapshot = []
+    else
+      snapshot[0] = Oj.load(snapshot[0]) unless snapshot[0].nil?
+    end
+    snapshot  
+  end
+  
+  def render(tpl_name)
+    layout = Tilt.new("#{__dir__}/views/layout.erb")
+    tpl_path = "#{__dir__}/views/#{tpl_name.to_s}.erb"
+    tpl = Tilt.new(tpl_path)
+    res = layout.render(self){tpl.render(self)}
+  end
+
+
+end
+
+
+
+
+#Rack::Server.start({app: Litebaord.app, daemonize: false})

data/lib/litestack/liteboard/views/event.erb

@@ -0,0 +1,32 @@
+    <h5><a href="/?res=<%=@res%>">All Topics</a> > <a href="/topics/<%=@topic%>?res=<%=@res%>"><%=@topic%></a> > <%= @event %></h5>
+    <div id="search"><form><input id="search-field" type="text" placeholder="Search keys" onkeydown="search_kd(this)" onkeyup="search_ku(this)" value="<%=@search%>"/></form></div>
+    <table class="table sortable">
+      <tr>
+        <th width="16%" class="<%='sorted' if @order == 'key'%>"><a href="<%=event_sort_url('key')%>">Key</a> <%=dir('key')%></th>
+        <th width="8%" class="<%='sorted' if @order == 'rcount'%>"><a href="<%=event_sort_url('rcount')%>">Event Count</a> <%=dir('rcount')%></th>
+        <th width="8%" class="<%='sorted' if @order == 'ravg'%>"><a href="<%=event_sort_url('ravg')%>">Avg Value</a> <%=dir('ravg')%></th>
+        <th width="8%" class="<%='sorted' if @order == 'rtotal'%>"><a href="<%=event_sort_url('rtotal')%>">Total Value</a> <%=dir('rtotal')%></th>
+        <th width="8%" class="<%='sorted' if @order == 'rmin'%>"><a href="<%=event_sort_url('rmin')%>">Min Value</a> <%=dir('rmin')%></th>
+        <th width="8%" class="<%='sorted' if @order == 'rmax'%>"><a href="<%=event_sort_url('rmax')%>">Max Value</a> <%=dir('rmax')%></th>
+        <th width="22%">Events over time</th>
+        <th width="22%">Average value over time</th>
+      </tr>
+      <% @keys.each do |key|%>
+      <tr>
+        <td title="<%=key[0]%>"><div class="label"><span><%=key[0]%></span></div></td>
+        <td><%=key[1]%></td>
+        <td><%="%0.2f" % [key[2]] if key[2]%></td>
+        <td><%="%0.2f" % [key[3]] if key[3]%></td>
+        <td><%="%0.2f" % [key[4]] if key[4]%></td>
+        <td><%="%0.2f" % [key[5]] if key[5]%></td>
+        <td class="chart"><span class="inlinecolumn hidden" data-label="Count"><%=Oj.dump(key[6]) if key[7]%></span></td>
+        <td class="chart"><span class="inlinecolumn hidden" data-label="Avg Value"><%=Oj.dump(key[7]) if key[7]%></span></td>
+      </tr>
+      <% end %>
+      <% if @keys.empty? %>
+        <tr>
+         <td class="empty" colspan="8">No data to display</td>
+        </tr>
+      <% end %>
+      </table>
+