sidekiq-statistic 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5f72d1a3e51a38a18b09adb0e47f53c9aee1bc7
-  data.tar.gz: a56f6a9f5f4873da709b241cc2f58a0f15be0cb3
+  metadata.gz: 204eadc3fb3cee1ccf67c444c6d605bcbf605071
+  data.tar.gz: 0fccef486519aa0e2d83768f799489cd84526401
 SHA512:
-  metadata.gz: 3b2dddcaa90e5ec6452edb082e9723ecd4dd77f27d611591a6c891d0078ca92ebbdb2cbbcd399123116c0683e95874b8544e2991626d3ed0a2b297640027350e
-  data.tar.gz: a6ac2d8b346e7a8f9cee3c85b81dddf72e4a10b72b91aa6f1810edda33b60996dc1d68550675ec9c8180e96c626e4f50812b4c7b43c659eeb05e422d84e01147
+  metadata.gz: cd21216040203ef9fbe3d119f246635e22b58a0593b35055ca4e6d26e9bbb553170710f76afd73cad262576ebef37d60ffcf6ec2e0480eebc5c6a60f4801d381
+  data.tar.gz: 7a84e030ce3dd3820e9b4c428c4f3a052b91409026eeb29d29513ff23ce5866af808d0d3c0cf88ab04ce685f42fde21908ce22b51b82ea5cb2b63f1d05f9f9da

data/CHANGELOG.md

@@ -1,115 +1,47 @@
 ## HEAD
 
-## v1.1
-* 29.08.2015: Create custom tooltip for charts on index page (fix #63)
-
-  *Anton Davydov*
-* 26.08.2015: Add queue to workers table in index page
-
-  *Anton Davydov*
-* 25.08.2015: Italian localization
-
-  *Fabio Napoleoni*
-* 25.08.2015: Fix worker naming for AJ mailers (fix #59)
-
-  *Anton Davydov*
-* 21.08.2015: Use dynamic path generation for json requests (fix #56)
+## v1.2
+* 15.11.2015: Update gemspec to allow usage with sidekiq 4 (#83) *Felix Bünemann*
+* 21.10.2015: Fix charts initialize and Uncaught TypeError (#70, #79) *Anton Davydov*
+* 17.10.2015: Fix worker's per day stats (#78) *Alexander Yunin*
+* 28.09.2015: Use strftime to ensure date string format (#77) *@stan*
+* 02.09.2015: Sort worker names in GUI (#69) *Anton Davydov*
 
-  *Anton Davydov*
-* 21.08.2015: Add button in log page for display only special job (#40)
-
-  *Anton Davydov*
-* 20.08.2015: Add German Localization (#54)
-
-  *Felix Bünemann*
-
-* 20.08.2015: Fix statistics display for nested worker classes (#48)
-
-  *Felix Bünemann*
+## v1.1
+* 29.08.2015: Create custom tooltip for charts on index page (fix #63) *Anton Davydov*
+* 26.08.2015: Add queue to workers table in index page *Anton Davydov*
+* 25.08.2015: Italian localization *Fabio Napoleoni*
+* 25.08.2015: Fix worker naming for AJ mailers (fix #59) *Anton Davydov*
+* 21.08.2015: Use dynamic path generation for json requests (fix #56) *Anton Davydov*
+* 21.08.2015: Add button in log page for display only special job (#40) *Anton Davydov*
+* 20.08.2015: Add German Localization (#54) *Felix Bünemann*
+* 20.08.2015: Fix statistics display for nested worker classes (#48) *Felix Bünemann*
 
 ## v1.0
-* 19.08.2015: Middleware refactoring (#45)
-
-  *Mike Perham*
-* 19.08.2015: Use redis lists for save all job runtimes
-
-  *Anton Davydov*
-* 12.08.2015: Add filters (by worker) for realtime charts
-
-  *Anton Davydov*
-* 11.08.2015: Realtime chart for each worker and job
-
-  *Anton Davydov*
-* 31.07.2015: Add JSON API
-
-  *Anton Davydov*
-* 29.07.2015: Add localizations for plugin
-
-  *Anton Davydov*
-* 28.07.2015: Read first 1_000 lines from changelog
-
-  *Anton Davydov*
-* 28.07.2015: Rename plugin to sidekiq-statistic
-
-  *Anton Davydov*
-* 23.07.2015: Use native redis hash instead json serialization
-
-  *Anton Davydov*
-* 15.07.2015: Improve integration with active job
-
-  *Anton Davydov*
-* 01.07.2015: New realisation for thread safe history middleware
-
-  *Anton Davydov*
-* 13.05.2015: Add ability to change any date range on any history page
-
-  *Anton Davydov*
-* 12.05.2015: Add last job status data parameter for each worker
-
-  *Anton Davydov*
-* 11.05.2015: Add page woth worker data table for each day
-
-  *Anton Davydov*
-* 28.04.2015: Formating worker date in web UI
-
-  *Anton Davydov*
-* 27.04.2015: Set specific color for any worker
-
-  *Anton Davydov*
-* 10.04.2015: Add search field on worker page
-
-  *Anton Davydov*
-* 04.04.2015: Fix livereload button in index page
-
-  *Anton Davydov*
-* 23.03.2015: Add max runtime column to worker web table
-
-  *Anton Davydov*
-* 19.03.2015: Add functionality for adding custom css and js files to web page
-
-  *Anton Davydov*
-* 18.03.2015: Add configuration class with log_file options
-
-  *Anton Davydov*
-* 16.03.2015: Add worker page where user can see log for this worker
-
-  *Anton Davydov*
-* 15.03.2015: Add worker statistic table to index history page
-
-  *Anton Davydov*
-* 08.03.2015: Add charts for each passed and failed jobs for each worker.
-
-  *Anton Davydov*
-* 08.03.2015: Add Statistic class which provide statistics
-              for each day and each worker.
-
-  Sidekiq::History::Statistic.new(0).workers_hash
-  # =>[{"2015-03-07"=>{"HistoryWorker"=>{:failed=>1, :passed=>1}}}]
-
-  *Anton Davydov*
-* 08.03.2015: Save in redis json with failed and passed jobs for each worker.
-
-  *Anton Davydov*
-* 04.03.2015: Created simple midelware and static page.
-
-  *Anton Davydov*
+* 19.08.2015: Middleware refactoring (#45) *Mike Perham*
+* 19.08.2015: Use redis lists for save all job runtimes *Anton Davydov*
+* 12.08.2015: Add filters (by worker) for realtime charts *Anton Davydov*
+* 11.08.2015: Realtime chart for each worker and job *Anton Davydov*
+* 31.07.2015: Add JSON API *Anton Davydov*
+* 29.07.2015: Add localizations for plugin *Anton Davydov*
+* 28.07.2015: Read first 1_000 lines from changelog *Anton Davydov*
+* 28.07.2015: Rename plugin to sidekiq-statistic *Anton Davydov*
+* 23.07.2015: Use native redis hash instead json serialization *Anton Davydov*
+* 15.07.2015: Improve integration with active job *Anton Davydov*
+* 01.07.2015: New realisation for thread safe history middleware *Anton Davydov*
+* 13.05.2015: Add ability to change any date range on any history page *Anton Davydov*
+* 12.05.2015: Add last job status data parameter for each worker *Anton Davydov*
+* 11.05.2015: Add page woth worker data table for each day *Anton Davydov*
+* 28.04.2015: Formating worker date in web UI *Anton Davydov*
+* 27.04.2015: Set specific color for any worker *Anton Davydov*
+* 10.04.2015: Add search field on worker page *Anton Davydov*
+* 04.04.2015: Fix livereload button in index page *Anton Davydov*
+* 23.03.2015: Add max runtime column to worker web table *Anton Davydov*
+* 19.03.2015: Add functionality for adding custom css and js files to web page *Anton Davydov*
+* 18.03.2015: Add configuration class with log_file options *Anton Davydov*
+* 16.03.2015: Add worker page where user can see log for this worker *Anton Davydov*
+* 15.03.2015: Add worker statistic table to index history page *Anton Davydov*
+* 08.03.2015: Add charts for each passed and failed jobs for each worker. *Anton Davydov*
+* 08.03.2015: Add Statistic class which provide statistics for each day and each worker. *Anton Davydov*
+* 08.03.2015: Save in redis json with failed and passed jobs for each worker. *Anton Davydov*
+* 04.03.2015: Created simple midelware and static page. *Anton Davydov*

data/README.md

@@ -28,12 +28,11 @@ And then execute:
     $ bundle
 
 ## Usage
-Open in your browser `<sidekiq-path>/statistic` page.
+Open Statistic tab on your sidekiq page.
 
 ### Not rails application
-First step: read [sidekiq documentation](https://github.com/mperham/sidekiq/wiki/Monitoring#standalone).
-
-Second step: add `require 'sidekiq-statistic'` to you `config.ru`. For example:
+Read [sidekiq documentation](https://github.com/mperham/sidekiq/wiki/Monitoring#standalone).
+After that add `require 'sidekiq-statistic'` to you `config.ru`. For example:
 ``` ruby
 # config.ru
 require 'sidekiq/web'
@@ -124,6 +123,19 @@ $ curl http://example.com/sidekiq/api/statistic/Worker.json?dateFrom=2015-07-30&
 }
 ```
 
+## Update statistic inside middleware
+You can update your worker statistic inside middleware. For this you should to update `sidekiq:statistic` redis hash.
+This hash has the following structure:
+* `sideki:statistic` - redis hash with all statistic
+  - `yyyy-mm-dd:WorkerName:passed` - count of passed jobs for Worker name on yyyy-mm-dd
+  - `yyyy-mm-dd:WorkerName:failed` - count of failed jobs for Worker name on yyyy-mm-dd
+  - `yyyy-mm-dd:WorkerName:failed` - count of failed jobs for Worker name on yyyy-mm-dd
+  - `yyyy-mm-dd:WorkerName:last_job_status` - string with status (`passed` or `failed`) for last job
+  - `yyyy-mm-dd:WorkerName:last_time` - date of lact job performing
+  - `yyyy-mm-dd:WorkerName:queue` - name of job queue (`defauld` by default)
+
+For time information you should push the runtime value to `yyyy-mm-dd:WorkerName:timeslist` redis list.
+
 ## How it works
 ![how-it-works](https://cloud.githubusercontent.com/assets/1147484/8802272/fc0a1302-2fc8-11e5-86a5-817409259338.png)
 

data/lib/sidekiq/statistic/base.rb

@@ -13,7 +13,7 @@ module Sidekiq
       end
 
       def worker_names
-        @worker_names ||= statistic_hash.flat_map{ |h| h.values.first.keys }.uniq
+        @worker_names ||= statistic_hash.flat_map{ |h| h.values.first.keys }.uniq.sort
       end
 
       def statistic_hash
@@ -41,7 +41,7 @@ module Sidekiq
       end
 
       def desired_dates
-        (@end_date..@start_date).map(&:to_s)
+        (@end_date..@start_date).map { |date| date.strftime "%Y-%m-%d" }
       end
 
       def result_hash(redis_hash, key)

data/lib/sidekiq/statistic/middleware.rb

@@ -29,7 +29,7 @@ module Sidekiq
         status = worker_status.dup
         time = worker_status[:last_runtime]
         realtime_hash = "#{REDIS_HASH}:realtime:#{time.sec}"
-        worker_key = "#{time.to_date}:#{status.delete :class}"
+        worker_key = "#{time.strftime "%Y-%m-%d"}:#{status.delete :class}"
 
         Sidekiq.redis do |redis|
           redis.pipelined do

data/lib/sidekiq/statistic/statistic/charts.rb

@@ -2,7 +2,7 @@ module Sidekiq
   module Statistic
     class Charts < Base
       def information_for(type)
-        worker_names.map do |worker|
+        worker_names.reverse.map do |worker|
           color = color_for(worker)
           {
             label: worker,

data/lib/sidekiq/statistic/statistic/runtime.rb

@@ -44,6 +44,7 @@ module Sidekiq
 
       def values(key)
         @values ||= @redis_statistic.statistic_for(@worker)
+        @values = @values.is_a?(Array) ? @values : [@values]
         @values.map{ |s| s[key] }.compact
       end
     end

data/lib/sidekiq/statistic/statistic/workers.rb

@@ -34,9 +34,9 @@ module Sidekiq
       end
 
       def runtime_for_day(worker_name, worker_data)
-        runtime_statistic(worker_name, worker_data[:runtime])
+        runtime_statistic(worker_name, worker_data)
           .values_hash
-          .merge!(last: worker_data[:last_runtime])
+          .merge!(last: worker_data[:last_time])
       end
 
       def number_of_calls(worker)

data/lib/sidekiq/statistic/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Statistic
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/lib/sidekiq/statistic/views/statistic.js

@@ -61,7 +61,7 @@ $(function () {
 
   var datePickerFrom, datePickerTo
   initializeDatePickers()
-  initializeChars({})
+  if (isHaveCharts()) { initializeChars({}) }
 
   $(document).on('click', '#live-poll', function (e) {
     e.preventDefault()
@@ -174,6 +174,10 @@ $(function () {
     })
   }
 
+  function isHaveCharts() {
+    return document.getElementById("js-passed-chart") && document.getElementById("js-failed-chart")
+  }
+
   function createChart(type, data, datasets) {
     var ctxFailed = document.getElementById("js-" + type + "-chart").getContext("2d")
 

data/sidekiq-statistic.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^exe/}) { |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'sidekiq', '~> 3.3', '>= 3.3.4'
+  gem.add_dependency 'sidekiq', '>= 3.3.4', '< 5'
 
   gem.add_development_dependency 'rake', '~> 0'
   gem.add_development_dependency 'sinatra', '~> 1.4.6'

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-statistic
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Anton Davydov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement