resque-analytics 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e009321250d82eaca1eddd22e9d9ffd4fcca1652
-  data.tar.gz: ec141d2a85a1e9fb3208bf1bff59f0b42429dce9
+  metadata.gz: 17ae0b32a8358b7f91cbec473ec1ce6262eb42c9
+  data.tar.gz: 15252ab1873d1204e8c09d1fe01bd83623bd6a26
 SHA512:
-  metadata.gz: 23504a44a8604a81611391abc5bc27a6b876cc8b353b8cf22fead4cf98ef8c4fe19ecd886d302a1e47cdb7d4259aa44bd347e06ea1201808464a74fadb808846
-  data.tar.gz: 1911eb9a179f71e36dbb31dadfba27e4e306f5f59fc3d0a2db89f7839f746d514b0b9efdeb32238a0d50477663c8c046825f32c7b43e7b599b3fad8023256c3a
+  metadata.gz: a1abe2a07366bf72ea85e6f80726f4379f0305f65f0412eb0cdc668efc73fefaffb4d0efd1ff62d288f2b7bffc530eba48c0d3d7ca18b6e0ce363d4298c07e6d
+  data.tar.gz: 5bb4c49cf4b2560315eca59e70519e931858db7debc64e5b0eed3d7502cba13db08768829f2fc76984a6a66b68690ffc8c3e793c8225f8fadab00e10d5684b5f

data/Changelog

@@ -1,3 +1,7 @@
+## 0.6.3 (June 23, 2014)
+
+* Add ability to select worker jobs on index screen
+
 ## 0.6.2 (June 11, 2014)
 
 * Provide ignore_classes to stop collecting wait time on specific worker classes

data/README.rdoc

@@ -46,6 +46,7 @@ On the Resque screens, you will find a new tab called "Analytics".
 
 If you wish to stop collection wait time for certain classes, add the following to your resque.rb initializer:
 Resque::Plugins::Analytics.ignore_classes = ['worker_class', ...]
+
 where worker class represents a job class for which you do not want to collect wait time metrics.
 
 == TODO

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/resque-analytics/server/views/analytics.erb

@@ -4,13 +4,22 @@
   Various KPIs related to Resque jobs
 </p>
 
-<% @data.keys.each do |job| %>
-  <h2><%= job %></h2>
-  <% performed = chart_data(@data, job, Resque::Plugins::Analytics::PERFORMED) %>
-  <% failed = chart_data(@data, job, Resque::Plugins::Analytics::FAILED) %>
-  <%= chart_it("Number of jobs", [Resque::Plugins::Analytics::PERFORMED, Resque::Plugins::Analytics::FAILED], [performed, failed]) %>
+<form action='analytics', method='get'>
+  <label>Select Job</label>
+  <select name="job">
+    <% measured_jobs.each do |job| %>
+      <% selected = job == @job ? 'selected="selected"' : '' %>
+      <option value="<%= job %>"<%= selected %>><%= job %></option>
+    <% end %>
+  </select>
+  <input type="submit" />
+</form>
 
-  <% run_time = chart_data(@data, job, Resque::Plugins::Analytics::TOTAL_TIME) %>
-  <% wait_time = chart_data(@data, job, Resque::Plugins::Analytics::WAIT_TIME) %>
-  <%= chart_it("Wait and Run times", [Resque::Plugins::Analytics::WAIT_TIME, Resque::Plugins::Analytics::TOTAL_TIME], [wait_time, run_time]) %>
-<% end %>
+<h2><%= @job %></h2>
+<% performed = chart_data(@data, Resque::Plugins::Analytics::PERFORMED) %>
+<% failed = chart_data(@data, Resque::Plugins::Analytics::FAILED) %>
+<%= chart_it("Number of jobs", [Resque::Plugins::Analytics::PERFORMED, Resque::Plugins::Analytics::FAILED], [performed, failed]) %>
+
+<% run_time = chart_data(@data, Resque::Plugins::Analytics::TOTAL_TIME) %>
+<% wait_time = chart_data(@data, Resque::Plugins::Analytics::WAIT_TIME) %>
+<%= chart_it("Wait and Run times", [Resque::Plugins::Analytics::WAIT_TIME, Resque::Plugins::Analytics::TOTAL_TIME], [wait_time, run_time]) %>

data/lib/resque-analytics/server.rb

@@ -29,8 +29,8 @@ module Resque
             @legend_keys ||= (-90..0).map { |number| number.days.from_now.strftime("%y_%m_%d")}
           end
 
-          def chart_data(data, job, kpi)
-            legend_keys.map { |key| @data[job][kpi][key].to_i || 0 }
+          def chart_data(data, kpi)
+            legend_keys.map { |key| @data[kpi][key].to_i || 0 }
           end
 
           def chart_it(title, legend, data)
@@ -52,11 +52,10 @@ module Resque
         class << self
           def registered(app)
             app.get '/analytics' do
-              @data = measured_jobs.inject({}) { |res, job|
-                res[job] = {}
-                [PERFORMED, FAILED, TOTAL_TIME, WAIT_TIME].each { |kpi| res[job][kpi] = counters_for(job, kpi) }
-                res
-              }
+              @job = params[:job] || measured_jobs.first
+
+              @data = {}
+              [PERFORMED, FAILED, TOTAL_TIME, WAIT_TIME].each { |kpi| @data[kpi] = counters_for(@job, kpi) }
               erb(File.read(File.join(VIEW_PATH, 'analytics.erb')))
             end
 

data/resque-analytics.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: resque-analytics 0.6.2 ruby lib
+# stub: resque-analytics 0.6.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "resque-analytics"
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nir Tzur"]
-  s.date = "2014-06-11"
+  s.date = "2014-06-23"
   s.description = "Shows Resque jobs key performance indciators over time"
   s.email = "nir.tzur@samanage.com"
   s.extra_rdoc_files = [
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
     "lib/resque-analytics/server.rb",
     "lib/resque-analytics/server/views/analytics.erb",
     "lib/resque/plugins/analytics.rb",
-    "resque-analytics-0.6.1.gem",
     "resque-analytics.gemspec"
   ]
   s.homepage = "http://github.com/nirtzur/resque-analytics"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-analytics
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Nir Tzur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -100,7 +100,6 @@ files:
 - lib/resque-analytics/server.rb
 - lib/resque-analytics/server/views/analytics.erb
 - lib/resque/plugins/analytics.rb
-- resque-analytics-0.6.1.gem
 - resque-analytics.gemspec
 homepage: http://github.com/nirtzur/resque-analytics
 licenses: