sidekiq-statistic 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4eb622f47e1018cc66fcd471d4b6cff9c2e9c2
-  data.tar.gz: 933f7ff73ff792308ca852e0e7d1cdfe8217c706
+  metadata.gz: a5f72d1a3e51a38a18b09adb0e47f53c9aee1bc7
+  data.tar.gz: a56f6a9f5f4873da709b241cc2f58a0f15be0cb3
 SHA512:
-  metadata.gz: 5814fd4ba22afb951a089ffa6a8cc560a1792ea63faad2d1b13e09c53bcc63c1b5bacf5d9ef33665eb98d44bfdf66325dff071ff212593aa2e02f658ca49f5ea
-  data.tar.gz: c748d18674cbb9c0d95d8ae4bdc92079d5895fa130dc2dd29e2d49f4e7fe6e0ba3a7b0d03ae3caedfed30033a0caa05cf24d4944bfb82363f525d756889310d8
+  metadata.gz: 3b2dddcaa90e5ec6452edb082e9723ecd4dd77f27d611591a6c891d0078ca92ebbdb2cbbcd399123116c0683e95874b8544e2991626d3ed0a2b297640027350e
+  data.tar.gz: a6ac2d8b346e7a8f9cee3c85b81dddf72e4a10b72b91aa6f1810edda33b60996dc1d68550675ec9c8180e96c626e4f50812b4c7b43c659eeb05e422d84e01147

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## 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)
+
+  *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)
 

data/README.md

@@ -21,7 +21,7 @@ Also you can check <a href="https://sidekiq-history-gem.herokuapp.com/sidekiq/st
 ## Installation
 Add this line to your application's Gemfile:
 
-    gem 'sidekiq-statistic', github: 'davydovanton/sidekiq-statistic'
+    gem 'sidekiq-statistic'
 
 And then execute:
 
@@ -40,6 +40,7 @@ require 'sidekiq/web'
 require 'sidekiq-statistic'
 
 use Rack::Session::Cookie, secret: 'some unique secret string here'
+Sidekiq::Web.instance_eval { @middleware.reverse! } # Last added, First Run
 run Sidekiq::Web
 ```
 

data/lib/sidekiq/statistic/base.rb

@@ -1,6 +1,8 @@
 module Sidekiq
   module Statistic
     class Base
+      KEY_SEPARATOR = /(?<!:):(?!:)/.freeze
+
       def initialize(days_previous, start_date = nil)
         @start_date = start_date || Time.now.utc.to_date
         @end_date = @start_date - days_previous
@@ -29,7 +31,7 @@ module Sidekiq
         conn
           .hgetall(REDIS_HASH)
           .each do |keys, value|
-            *keys, last = keys.split(':'.freeze)
+            *keys, last = keys.split(KEY_SEPARATOR)
             keys.inject(redis_hash, &key_or_empty_hash)[last.to_sym] = to_number(value)
           end
       end

data/lib/sidekiq/statistic/locales/de.yml

@@ -0,0 +1,27 @@
+# elements like %{queue} are variables and should not be translated
+de: # <---- change this to your locale code
+  Queue: Queue
+  Exclude: Ausblenden
+  Index: Übersicht
+  RealtimeStatistic: Echtzeitstatistik
+  Statistic: Statistik
+  Start: Beginn
+  End: Ende
+  Failed: Fehlgeschlagen
+  Passed: Erfolgreich
+  WorkersTable: Arbeiter-Tabelle
+  Worker: Arbeiter
+  Date: Datum
+  Success: Erfolg
+  Failure: Fehler
+  Total: Gesamt
+  TimeSec: Zeit(sek)
+  AverageSec: Durchschnitt(sek)
+  MinTimeSec: Min. Zeit(sek)
+  MaxTimeSec: Max. Zeit(sek)
+  LastJobStatus: Letzter Job Status
+  WorkerInformation: '%{worker} Information'
+  InformationTable: Info-Tabelle
+  WorkerLog: Arbeiter-Log
+  WorkerTablePerDay: Arbeiter-Tabelle (pro Tag)
+  LastRun: Letzte Ausführung

data/lib/sidekiq/statistic/locales/en.yml

@@ -1,5 +1,6 @@
 # elements like %{queue} are variables and should not be translated
 en: # <---- change this to your locale code
+  Queue: Queue
   Exclude: Exclude
   Index: Index
   RealtimeStatistic: Realtime Statistic

data/lib/sidekiq/statistic/locales/it.yml

@@ -0,0 +1,27 @@
+# elements like %{queue} are variables and should not be translated
+it: # <---- change this to your locale code
+  Queue: Fila
+  Exclude: Escludi
+  Index: Indice
+  RealtimeStatistic: Statistiche in Tempo Reale
+  Statistic: Statistiche
+  Start: Inizio
+  End: Fine
+  Failed: Fallito
+  Passed: Passato
+  WorkersTable: Tabella Worker
+  Worker: Worker
+  Date: Data
+  Success: Successo
+  Failure: Fallito
+  Total: Totale
+  TimeSec: Tempo (sec)
+  AverageSec: Media (sec)
+  MinTimeSec: Minimo (sec)
+  MaxTimeSec: Massimo (sec)
+  LastJobStatus: Stato Ultimo Job
+  WorkerInformation: 'Informazioni %{worker}'
+  InformationTable: Tabella Informazioni
+  WorkerLog: Worker log
+  WorkerTablePerDay: Tabella Worker (per giorno)
+  LastRun: Ultima Esecuzione

data/lib/sidekiq/statistic/locales/ru.yml

@@ -1,5 +1,6 @@
 # elements like %{queue} are variables and should not be translated
 ru: # <---- change this to your locale code
+  Queue: Очередь
   Exclude: Исключить
   Index: Главная
   RealtimeStatistic: Статистика в реальном времени

data/lib/sidekiq/statistic/log_parser.rb

@@ -15,12 +15,27 @@ module Sidekiq
         File
           .readlines(@logfile)
           .first(FILE_LINES_COUNT)
-          .map{ |line| line_hash(line) if line[/\W?#@worker_name\W?/] }
+          .map{ |line| sub_line(line) if line[/\W?#@worker_name\W?/] }
           .compact
       end
 
-      def line_hash(line)
-        { color: color(line), text: line.sub(/\n/, '') }
+      def sub_line(line)
+        line
+          .sub(/\n/, '')
+          .sub(/(JID-[\w]+)/) { jid_tag($1) }
+      end
+
+      def jid_tag(jid)
+        "<span class=\"statistic__jid js-jid__#{jid[4..-1]}\""\
+          "data-target=\".js-jid__#{jid[4..-1]}\" #{jid_style jid}>#{jid}</span>"
+      end
+
+      def jid_style(worker_jid)
+        return unless worker_jid
+        color = Digest::MD5.hexdigest(worker_jid)[4..9]
+          .scan(/../).map{ |c| c.to_i(16) }.join ','
+
+        "style=\"background-color: rgba(#{color},0.2);\""
       end
 
       def color(line)

data/lib/sidekiq/statistic/middleware.rb

@@ -14,9 +14,13 @@ module Sidekiq
         raise e
       ensure
         finish = Time.now
+        worker_status[:queue] = msg['queue'.freeze]
         worker_status[:last_runtime] = finish.utc
         worker_status[:time] = (finish - start).to_f.round(3)
         worker_status[:class] = msg['wrapped'.freeze] || worker.class.to_s
+        if worker_status[:class] == 'ActionMailer::DeliveryJob'.freeze
+          worker_status[:class] = msg['args'.freeze].first['arguments'.freeze].first
+        end
 
         save_entry_for_worker worker_status
       end
@@ -31,7 +35,8 @@ module Sidekiq
           redis.pipelined do
             redis.hincrby REDIS_HASH, "#{worker_key}:#{status[:last_job_status]}", 1
             redis.hmset REDIS_HASH, "#{worker_key}:last_job_status", status[:last_job_status],
-                                    "#{worker_key}:last_time", status[:last_runtime]
+                                    "#{worker_key}:last_time", status[:last_runtime],
+                                    "#{worker_key}:queue", status[:queue]
             redis.lpush "#{worker_key}:timeslist", status[:time]
 
             redis.hincrby realtime_hash, "#{status[:last_job_status]}:#{worker_status[:class]}", 1

data/lib/sidekiq/statistic/statistic/realtime.rb

@@ -20,7 +20,7 @@ module Sidekiq
           conn
             .hgetall("#{REDIS_HASH}:realtime:#{Time.now.sec - 1}")
             .each do |keys, value|
-              *keys, last = keys.split(':'.freeze)
+              *keys, last = keys.split(KEY_SEPARATOR)
               keys.inject(redis_hash, &key_or_empty_hash)[last] = value.to_i
             end
 

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

@@ -9,6 +9,7 @@ module Sidekiq
             name: worker,
             last_job_status: last_job_status_for(worker),
             number_of_calls: number_of_calls(worker),
+            queue: last_queue(worker),
             runtime: runtime_statistic(worker).values_hash
           }
         end
@@ -60,6 +61,10 @@ module Sidekiq
           .last[:last_job_status]
       end
 
+      def last_queue(worker)
+        statistic_for(worker).last[:queue]
+      end
+
       def runtime_statistic(worker, values = nil)
         Runtime.new(self, worker, values)
       end

data/lib/sidekiq/statistic/version.rb

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

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

@@ -13,6 +13,7 @@ return d.pie(d.filterTargetsToShow(d.data.targets)).forEach(function(b){f||b.dat
 }).call(C,function(){var a,d=[],e=[],f=[];if(w){for(a=0;w>a;a++)d.push("."+l.shape+"-"+(v+a)),e.push("."+l.text+"-"+(v+a)),f.push("."+l.eventRect+"-"+(v+a));b.svg.selectAll("."+l.shapes).selectAll(d).remove(),b.svg.selectAll("."+l.texts).selectAll(e).remove(),b.svg.selectAll("."+l.eventRects).selectAll(f).remove(),b.svg.select("."+l.xgrid).remove()}D.attr("transform",null).attr(b.xgridAttr),E.attr("transform",null),E.select("line").attr("x1",c.axis_rotated?0:p).attr("x2",c.axis_rotated?b.width:p),E.select("text").attr("x",c.axis_rotated?b.width:0).attr("y",p),H.attr("transform",null).attr("d",j),I.attr("transform",null).attr("d",k),J.attr("transform",null).attr("d",m),K.attr("transform",null).attr("cx",n).attr("cy",o),G.attr("transform",null).attr("x",q).attr("y",r).style("fill-opacity",b.opacityForText.bind(b)),F.attr("transform",null),F.select("rect").filter(b.isRegionOnX).attr("x",b.regionX.bind(b)).attr("width",b.regionWidth.bind(b)),c.interaction_enabled&&b.redrawEventRect(),B(),b.flowing=!1})}},h.selected=function(a){var b=this.internal,c=b.d3;return c.merge(b.main.selectAll("."+l.shapes+b.getTargetSelectorSuffix(a)).selectAll("."+l.shape).filter(function(){return c.select(this).classed(l.SELECTED)}).map(function(a){return a.map(function(a){var b=a.__data__;return b.data?b.data:b})}))},h.select=function(a,b,c){var d=this.internal,e=d.d3,f=d.config;f.data_selection_enabled&&d.main.selectAll("."+l.shapes).selectAll("."+l.shape).each(function(g,h){var i=e.select(this),j=g.data?g.data.id:g.id,k=d.getToggle(this,g).bind(d),m=f.data_selection_grouped||!a||a.indexOf(j)>=0,n=!b||b.indexOf(h)>=0,o=i.classed(l.SELECTED);i.classed(l.line)||i.classed(l.area)||(m&&n?f.data_selection_isselectable(g)&&!o&&k(!0,i.classed(l.SELECTED,!0),g,h):q(c)&&c&&o&&k(!1,i.classed(l.SELECTED,!1),g,h))})},h.unselect=function(a,b){var c=this.internal,d=c.d3,e=c.config;e.data_selection_enabled&&c.main.selectAll("."+l.shapes).selectAll("."+l.shape).each(function(f,g){var h=d.select(this),i=f.data?f.data.id:f.id,j=c.getToggle(this,f).bind(c),k=e.data_selection_grouped||!a||a.indexOf(i)>=0,m=!b||b.indexOf(g)>=0,n=h.classed(l.SELECTED);h.classed(l.line)||h.classed(l.area)||k&&m&&e.data_selection_isselectable(f)&&n&&j(!1,h.classed(l.SELECTED,!1),f,g)})},h.transform=function(a,b){var c=this.internal,d=["pie","donut"].indexOf(a)>=0?{withTransform:!0}:null;c.transformTo(b,a,d)},i.transformTo=function(a,b,c){var d=this,e=!d.hasArcType(),f=c||{withTransitionForAxis:e};f.withTransitionForTransform=!1,d.transiting=!1,d.setTargetType(a,b),d.updateTargets(d.data.targets),d.updateAndRedraw(f)},h.groups=function(a){var b=this.internal,c=b.config;return p(a)?c.data_groups:(c.data_groups=a,b.redraw(),c.data_groups)},h.xgrids=function(a){var b=this.internal,c=b.config;return a?(c.grid_x_lines=a,b.redrawWithoutRescale(),c.grid_x_lines):c.grid_x_lines},h.xgrids.add=function(a){var b=this.internal;return this.xgrids(b.config.grid_x_lines.concat(a?a:[]))},h.xgrids.remove=function(a){var b=this.internal;b.removeGridLines(a,!0)},h.ygrids=function(a){var b=this.internal,c=b.config;return a?(c.grid_y_lines=a,b.redrawWithoutRescale(),c.grid_y_lines):c.grid_y_lines},h.ygrids.add=function(a){var b=this.internal;return this.ygrids(b.config.grid_y_lines.concat(a?a:[]))},h.ygrids.remove=function(a){var b=this.internal;b.removeGridLines(a,!1)},h.regions=function(a){var b=this.internal,c=b.config;return a?(c.regions=a,b.redrawWithoutRescale(),c.regions):c.regions},h.regions.add=function(a){var b=this.internal,c=b.config;return a?(c.regions=c.regions.concat(a),b.redrawWithoutRescale(),c.regions):c.regions},h.regions.remove=function(a){var b,c,d,e=this.internal,f=e.config;return a=a||{},b=e.getOption(a,"duration",f.transition_duration),c=e.getOption(a,"classes",[l.region]),d=e.main.select("."+l.regions).selectAll(c.map(function(a){return"."+a})),(b?d.transition().duration(b):d).style("opacity",0).remove(),f.regions=f.regions.filter(function(a){var b=!1;return a["class"]?(a["class"].split(" ").forEach(function(a){c.indexOf(a)>=0&&(b=!0)}),!b):!0}),f.regions},h.data=function(a){var b=this.internal.data.targets;return"undefined"==typeof a?b:b.filter(function(b){return[].concat(a).indexOf(b.id)>=0})},h.data.shown=function(a){return this.internal.filterTargetsToShow(this.data(a))},h.data.values=function(a){var b,c=null;return a&&(b=this.data(a),c=b[0]?b[0].values.map(function(a){return a.value}):null),c},h.data.names=function(a){return this.internal.clearLegendItemTextBoxCache(),this.internal.updateDataAttributes("names",a)},h.data.colors=function(a){return this.internal.updateDataAttributes("colors",a)},h.data.axes=function(a){return this.internal.updateDataAttributes("axes",a)},h.category=function(a,b){var c=this.internal,d=c.config;return arguments.length>1&&(d.axis_x_categories[a]=b,c.redraw()),d.axis_x_categories[a]},h.categories=function(a){var b=this.internal,c=b.config;return arguments.length?(c.axis_x_categories=a,b.redraw(),c.axis_x_categories):c.axis_x_categories},h.color=function(a){var b=this.internal;return b.color(a)},h.x=function(a){var b=this.internal;return arguments.length&&(b.updateTargetX(b.data.targets,a),b.redraw({withUpdateOrgXDomain:!0,withUpdateXDomain:!0})),b.data.xs},h.xs=function(a){var b=this.internal;return arguments.length&&(b.updateTargetXs(b.data.targets,a),b.redraw({withUpdateOrgXDomain:!0,withUpdateXDomain:!0})),b.data.xs},h.axis=function(){},h.axis.labels=function(a){var b=this.internal;arguments.length&&(Object.keys(a).forEach(function(c){b.axis.setLabelText(c,a[c])}),b.axis.updateLabels())},h.axis.max=function(a){var b=this.internal,c=b.config;return arguments.length?("object"==typeof a?(m(a.x)&&(c.axis_x_max=a.x),m(a.y)&&(c.axis_y_max=a.y),m(a.y2)&&(c.axis_y2_max=a.y2)):c.axis_y_max=c.axis_y2_max=a,void b.redraw({withUpdateOrgXDomain:!0,withUpdateXDomain:!0})):{x:c.axis_x_max,y:c.axis_y_max,y2:c.axis_y2_max}},h.axis.min=function(a){var b=this.internal,c=b.config;return arguments.length?("object"==typeof a?(m(a.x)&&(c.axis_x_min=a.x),m(a.y)&&(c.axis_y_min=a.y),m(a.y2)&&(c.axis_y2_min=a.y2)):c.axis_y_min=c.axis_y2_min=a,void b.redraw({withUpdateOrgXDomain:!0,withUpdateXDomain:!0})):{x:c.axis_x_min,y:c.axis_y_min,y2:c.axis_y2_min}},h.axis.range=function(a){return arguments.length?(q(a.max)&&this.axis.max(a.max),void(q(a.min)&&this.axis.min(a.min))):{max:this.axis.max(),min:this.axis.min()}},h.legend=function(){},h.legend.show=function(a){var b=this.internal;b.showLegend(b.mapToTargetIds(a)),b.updateAndRedraw({withLegend:!0})},h.legend.hide=function(a){var b=this.internal;b.hideLegend(b.mapToTargetIds(a)),b.updateAndRedraw({withLegend:!0})},h.resize=function(a){var b=this.internal,c=b.config;c.size_width=a?a.width:null,c.size_height=a?a.height:null,this.flush()},h.flush=function(){var a=this.internal;a.updateAndRedraw({withLegend:!0,withTransition:!1,withTransitionForTransform:!1})},h.destroy=function(){var b=this.internal;return a.clearInterval(b.intervalForObserveInserted),a.onresize=null,b.selectChart.classed("c3",!1).html(""),Object.keys(b).forEach(function(a){b[a]=null}),null},h.tooltip=function(){},h.tooltip.show=function(a){var b,c,d=this.internal;a.mouse&&(c=a.mouse),a.data?d.isMultipleX()?(c=[d.x(a.data.x),d.getYScale(a.data.id)(a.data.value)],b=null):b=m(a.data.index)?a.data.index:d.getIndexByX(a.data.x):"undefined"!=typeof a.x?b=d.getIndexByX(a.x):"undefined"!=typeof a.index&&(b=a.index),d.dispatchEvent("mouseover",b,c),d.dispatchEvent("mousemove",b,c)},h.tooltip.hide=function(){this.internal.dispatchEvent("mouseout",0)};var z;i.isSafari=function(){var b=a.navigator.userAgent;return b.indexOf("Safari")>=0&&b.indexOf("Chrome")<0},i.isChrome=function(){var b=a.navigator.userAgent;return b.indexOf("Chrome")>=0},Function.prototype.bind||(Function.prototype.bind=function(a){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var b=Array.prototype.slice.call(arguments,1),c=this,d=function(){},e=function(){return c.apply(this instanceof d?this:a,b.concat(Array.prototype.slice.call(arguments)))};return d.prototype=this.prototype,e.prototype=new d,e}),"function"==typeof define&&define.amd?define("c3",["d3"],k):"undefined"!=typeof exports&&"undefined"!=typeof module?module.exports=k:a.c3=k}(window);
 
 $(function () {
+  var path = window.location.pathname
   var failedChart
   var passedChart
   var excludedWorkers = []
@@ -43,14 +44,15 @@ $(function () {
     }
   });
 
-  $.getJSON('/sidekiq/statistic/realtime_charts_initializer.json', function (data) {
+
+  $.getJSON(path + '/charts_initializer.json', function (data) {
     initializeChart['data']['columns'] = data
   }).done(function () {
     failedChart = c3.generate($.extend(initializeChart, { bindto: '.realtime__failed-chart' }))
     passedChart = c3.generate($.extend(initializeChart, { bindto: '.realtime__passed-chart' }))
 
     setInterval(function () {
-      $.getJSON('/sidekiq/statistic/realtime_charts.json', { excluded: excludedWorkers })
+      $.getJSON(path + '/charts.json', { excluded: excludedWorkers })
         .done(function (data) {
           failedChart.flow(data['failed'])
           passedChart.flow(data['passed'])

data/lib/sidekiq/statistic/views/sidekiq-statistic.css

@@ -35,6 +35,13 @@
     .statistic__log {
       display: none;
       }
+      .statistic__jid {
+        cursor: pointer;
+        background-color: red;
+        }
+        .statistic__jid:hover {
+          background-color: inherit;
+          }
     .statistic__table {
       margin-top: 25px;
       }
@@ -43,6 +50,30 @@
   width: 300px;
   }
 
+#chartjs-tooltip {
+  opacity: 1;
+  position: absolute;
+  background: rgba(0, 0, 0, .7);
+  color: white;
+  padding: 3px;
+  border-radius: 3px;
+  -webkit-transition: all .1s ease;
+  transition: all .1s ease;
+  pointer-events: none;
+  -webkit-transform: translate(-50%, 0);
+  transform: translate(-50%, 0);
+  }
+  .chartjs-tooltip-title{
+    font-weight: 800;
+    margin-bottom: 5px;
+    }
+  .chartjs-tooltip-key{
+    display: inline-block;
+    width: 10px;
+    height: 10px;
+    margin: 0 2px 0 5px;
+    }
+
 /*!
  * jQuery UI Datepicker @VERSION
  * http://jqueryui.com

data/lib/sidekiq/statistic/views/statistic.erb

@@ -23,6 +23,7 @@
       <canvas id="js-failed-chart" width="800" height="200"></canvas>
       <h2><%= t('Passed') %></h2>
       <canvas id="js-passed-chart" width="800" height="200"></canvas>
+      <div id="chartjs-tooltip"></div>
     </div>
 
     <h2><%= t('WorkersTable') %></h2>
@@ -31,6 +32,7 @@
         <thead>
           <th><%= t('Worker') %></th>
           <th><%= t('Date') %></th>
+          <th><%= t('Queue') %></th>
           <th><%= t('Success') %></th>
           <th><%= t('Failure') %></th>
           <th><%= t('Total') %></th>
@@ -44,6 +46,7 @@
           <tr>
             <td class="worker"><a href="<%= root_path %>statistic/<%= worker[:name] %>"><%= worker[:name] %></a></td>
             <td class="worker"><%= formate_date worker[:runtime][:last] %></td>
+            <td class="worker"><%= worker[:queue] %></td>
             <td class="worker"><%= worker[:number_of_calls][:success] %></td>
             <td class="worker"><%= worker[:number_of_calls][:failure] %></td>
             <td class="worker"><%= worker[:number_of_calls][:total] %></td>

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

@@ -25,6 +25,39 @@ else{for(c=i&&i.getFullYear()===a,o=s&&s.getFullYear()===a,y+="<select class='ui
 $(function () {
   Chart.defaults.global.responsive = true
   Chart.defaults.global.scaleLineColor = 'rgba(0,0,0,.4)'
+  Chart.defaults.global.customTooltips = function(tooltip) {
+    var tooltipEl = $('#chartjs-tooltip')
+
+    if (!tooltip) {
+      tooltipEl.css({
+        opacity: 0
+      });
+      return;
+    }
+
+    tooltipEl.removeClass('above below')
+    tooltipEl.addClass(tooltip.yAlign)
+
+    var innerHtml = '<div class="chartjs-tooltip-title">' + tooltip.title + ':</div>'
+    for (var i = tooltip.labels.length - 1; i >= 0; i--) {
+      innerHtml += [
+        '<div class="chartjs-tooltip-section">',
+        '	<span class="chartjs-tooltip-key" style="background-color:' + tooltip.legendColors[i].fill.replace('0.2', '1.0') + '"></span>',
+        '	<span class="chartjs-tooltip-value">' + tooltip.labels[i] + '</span>',
+        '</div>'
+      ].join('')
+    }
+    tooltipEl.html(innerHtml)
+
+    tooltipEl.css({
+      opacity: 1,
+      left: tooltip.chart.canvas.offsetLeft + tooltip.x + 'px',
+      top: tooltip.chart.canvas.offsetTop + tooltip.y + 'px',
+      fontFamily: tooltip.fontFamily,
+      fontSize: tooltip.fontSize,
+      fontStyle: tooltip.fontStyle,
+    })
+  }
 
   var datePickerFrom, datePickerTo
   initializeDatePickers()
@@ -38,22 +71,27 @@ $(function () {
     }, parseInt(localStorage.timeInterval) || 2000)
   })
 
-  $(document).on('click', '.history__tab', function (e) {
+  $(document).on('click', '.statistic__tab', function (e) {
     var $this = $(this)
     $('.nav-tabs li').removeClass('active')
     $this.parent().toggleClass('active')
 
-    $('.history__container').children().hide()
+    $('.statistic__container').children().hide()
     $($this.data('target')).show()
   })
 
-  $('#history__search').keyup(function() {
+  $(document).on('click', '.statistic__jid', function (e) {
+    $('.statistic__i').toggle()
+    $($(this).data('target')).parent().show()
+  })
+
+  $('#statistic__search').keyup(function() {
     var $this = $(this)
     delay(function(){
       if ($this.val().length) {
-        $('.history__i:not(:contains('+ $this.val() +'))').hide()
+        $('.statistic__i:not(:contains('+ $this.val() +'))').hide()
       } else {
-        $('.history__i').show()
+        $('.statistic__i').show()
       }
     }, 200 )
   });
@@ -67,7 +105,8 @@ $(function () {
   })()
 
   function initializeChars(data) {
-    $.getJSON('/sidekiq/statistic/charts.json', data, function (data) {
+    var path = window.location.pathname
+    $.getJSON(path + '/charts.json', data, function (data) {
       createChart('failed', data, data.failed_datasets)
       createChart('passed', data, data.passed_datasets)
     })

data/lib/sidekiq/statistic/views/worker.erb

@@ -55,7 +55,7 @@
     <div class="statistic__log">
       <input type='text' name='' id='statistic__search' value='' placeholder='Search text in log file'/>
       <% @worker_log.each do |line| %>
-        <p class="statistic__i statistic__<%= line[:color] %>"><%= line[:text] %></p>
+        <p class="statistic__i"><%= line %></p>
       <% end %>
     </div>
   </div>

data/lib/sidekiq/statistic/web_extension.rb

@@ -49,14 +49,14 @@ module Sidekiq
           render(:erb, File.read(File.join(view_path, 'realtime.erb')))
         end
 
-        app.get '/statistic/realtime_charts.json' do
+        app.get '/statistic/realtime/charts.json' do
           content_type :json
 
           realtime = Sidekiq::Statistic::Realtime.new
           Sidekiq.dump_json realtime.statistic(params)
         end
 
-        app.get '/statistic/realtime_charts_initializer.json' do
+        app.get '/statistic/realtime/charts_initializer.json' do
           content_type :json
           Sidekiq.dump_json Sidekiq::Statistic::Realtime.charts_initializer
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-statistic
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Anton Davydov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -140,7 +140,9 @@ files:
 - lib/sidekiq/statistic.rb
 - lib/sidekiq/statistic/base.rb
 - lib/sidekiq/statistic/configuration.rb
+- lib/sidekiq/statistic/locales/de.yml
 - lib/sidekiq/statistic/locales/en.yml
+- lib/sidekiq/statistic/locales/it.yml
 - lib/sidekiq/statistic/locales/ru.yml
 - lib/sidekiq/statistic/log_parser.rb
 - lib/sidekiq/statistic/middleware.rb
@@ -158,7 +160,7 @@ files:
 - lib/sidekiq/statistic/web_api_extension.rb
 - lib/sidekiq/statistic/web_extension.rb
 - lib/sidekiq/statistic/web_extension_helper.rb
-- sidekiq-history.gemspec
+- sidekiq-statistic.gemspec
 homepage: https://github.com/davydovanton/sidekiq-statistic
 licenses:
 - MIT