sidekiq 6.5.1 → 6.5.2

data/web/locales/en.yml

@@ -84,3 +84,7 @@ en: # <---- change this to your locale code
   Latency: Latency
   Pause: Pause
   Unpause: Unpause
+  Metrics: Metrics
+  NoDataFound: No data found
+  ExecutionTime: Execution Time
+  Context: Context

data/web/views/_nav.erb

@@ -1,7 +1,7 @@
 <div class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header" data-navbar="static">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-menu">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="navbar-menu" data-target="#navbar-menu">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>

data/web/views/busy.erb

@@ -54,7 +54,7 @@
       <th>&nbsp;</th>
     </thead>
     <% lead = processes.leader %>
-    <% processes.each do |process| %>
+    <% sorted_processes.each do |process| %>
       <tr>
         <td class="box">
           <%= "#{process['hostname']}:#{process['pid']}" %>

data/web/views/dashboard.erb

@@ -1,3 +1,4 @@
+<script type="text/javascript" src="<%= root_path %>javascripts/graph.js"></script>
 <script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js"></script>
 <div class= "dashboard clearfix">
   <h3 >

data/web/views/metrics.erb

@@ -0,0 +1,59 @@
+
+<h1><%= t('Metrics') %></h1>
+
+<h3>Top Jobs by Processed Count</h3>
+<% top = @resultset[:top_classes] %>
+
+<% topp = top["p"]&.first(10) %>
+<div class="table_container">
+  <table class="table table-bordered table-striped table-hover">
+    <tbody>
+      <tr>
+        <th><%= t('Name') %></th>
+        <th><%= t('Processed') %></th>
+        <th><%= t('ExecutionTime') %></th>
+      </tr>
+      <% if topp %>
+        <% topp.each do |kls, val| %>
+          <tr>
+            <td><code><a href="<%= root_path %>metrics/<%= kls %>"><%= kls %></a></code></td>
+            <td><%= val %></td>
+            <td><%= top.dig("ms", kls) %></td>
+          </tr>
+        <% end %>
+      <% else %>
+          <tr><td colspan=3><%= t("NoDataFound") %></td></tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<h3>Top Jobs by Execution Time</h3>
+
+<% topms = top["ms"]&.first(10) %>
+<div class="table_container">
+  <table class="table table-bordered table-striped table-hover">
+    <tbody>
+      <tr>
+        <th><%= t('Name') %></th>
+        <th><%= t('Processed') %></th>
+        <th><%= t('ExecutionTime') %></th>
+      </tr>
+      <% if topms %>
+        <% topms.each do |kls, val| %>
+          <tr>
+            <td><code><a href="<%= root_path %>metrics/<%= kls %>"><%= kls %></a></code></td>
+            <td><%= top.dig("p", kls) %></td>
+            <td><%= val %></td>
+          </tr>
+        <% end %>
+      <% else %>
+          <tr><td colspan=3><%= t("NoDataFound") %></td></tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<p>
+Data from <%= @resultset[:starts_at] %> to <%= @resultset[:ends_at] %>
+</p>

data/web/views/metrics_for_job.erb

@@ -0,0 +1,92 @@
+
+<h2><%= t('Metrics') %> / <%= h @name %></h2>
+
+<div class="row chart">
+  <div id="realtime" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>"></div>
+</div>
+
+<% data = @resultset[:data] %>
+<div class="table_container">
+  <table class="table table-bordered table-striped table-hover">
+    <tbody>
+      <tr>
+        <th><%= t('Time') %></th>
+        <th><%= t('Processed') %></th>
+        <th><%= t('ExecutionTime') %></th>
+        <th><%= t('Failed') %></th>
+        <th><%= t('Deploy') %></th>
+        <th><%= t('Histogram') %></th>
+      </tr>
+      <% data.each do |hash| %>
+        <tr><td><%= hash[:time] %></td><td><%= hash[:p] %></td><td><%= hash[:ms] %></td><td><%= hash[:f] %></td><td><%= hash[:mark] %></td><td><%= hash[:hist] %></td></tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<p>
+Data from <%= @resultset[:starts_at] %> to <%= @resultset[:ends_at] %>
+</p>
+
+<% atad = data.reverse %>
+<script type="text/javascript" src="<%= root_path %>javascripts/graph.js"></script>
+<script>
+var palette = new Rickshaw.Color.Palette();
+var data = [ {
+    name: "Processed",
+    color: palette.color(),
+    data: [ <% atad.each do |hash| %>
+      { x: <%= hash[:epoch] %>, y: <%= hash[:p] %> },
+    <% end %> ]
+  }, {
+    name: "Failed",
+    color: palette.color(),
+    data: [ <% atad.each do |hash| %>
+      { x: <%= hash[:epoch] %>, y: <%= hash[:f] %> },
+    <% end %>
+    ]
+  }, {
+    name: "Execution Time",
+    color: palette.color(),
+    data: [ <% atad.each do |hash| %>
+      { x: <%= hash[:epoch] %>, y: <%= hash[:ms] %> },
+    <% end %>
+    ]
+   } ];
+
+// TODO What to do with this? Minutely hover detail with a histogram bar chart?
+var histogramData = [ <% atad.each do |hash| %>
+  { x: <%= hash[:epoch] %>, hist: <%= hash[:hist] %> },
+<% end %> ]
+var histogramLabels = <%= Sidekiq::Metrics::Histogram::LABELS.inspect %>;
+
+var timeInterval = 60000;
+var graphElement = document.getElementById("realtime");
+
+var graph = new Rickshaw.Graph({
+  element: graphElement,
+  width: responsiveWidth(),
+  renderer: 'line',
+  interpolation: 'linear',
+  series: data,
+});
+var x_axis = new Rickshaw.Graph.Axis.Time( { graph: graph } );
+
+var y_axis = new Rickshaw.Graph.Axis.Y( {
+  graph: graph,
+  tickFormat: Rickshaw.Fixtures.Number.formatKMBT,
+  ticksTreatment: 'glow'
+});
+
+graph.render();
+
+var hoverDetail = new Rickshaw.Graph.HoverDetail( {
+	graph: graph,
+	// formatter: function(series, x, y) {
+		// var date = '<span class="date">' + new Date(x * 1000).toUTCString() + '</span>';
+		// var swatch = '<span class="detail_swatch" style="background-color: ' + series.color + '"></span>';
+		// var content = swatch + series.name + ": " + parseInt(y) + '<br>' + date;
+		// return content;
+	// }
+} );
+</script>

data/web/views/queue.erb

@@ -18,6 +18,7 @@
       <th><a href="<%= url %>?direction=<%= params[:direction] == 'asc' ? 'desc' : 'asc' %>"># <%= sort_direction_label %></a></th>
       <th><%= t('Job') %></th>
       <th><%= t('Arguments') %></th>
+      <th><%= t('Context') %></th>
       <th></th>
     </thead>
     <% @jobs.each_with_index do |job, index| %>
@@ -35,12 +36,15 @@
           <% a = job.display_args %>
           <% if a.inspect.size > 100 %>
             <span id="job_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
-            <button data-toggle="job_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
+            <button data-toggle="job_<%= index %>_full" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
             <div class="toggle" id="job_<%= index %>_full"><%= display_args(a) %></div>
           <% else %>
             <%= display_args(job.display_args) %>
           <% end %>
         </td>
+        <td>
+          <%= h(job["cattr"].inspect) if job["cattr"]&.any? %>
+        </td>
         <td>
           <form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
             <%= csrf_tag %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 6.5.1
+  version: 6.5.2
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +72,6 @@ files:
 - lib/generators/sidekiq/templates/job_spec.rb.erb
 - lib/generators/sidekiq/templates/job_test.rb.erb
 - lib/sidekiq.rb
-- lib/sidekiq/.DS_Store
 - lib/sidekiq/api.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
@@ -90,6 +89,10 @@ files:
 - lib/sidekiq/launcher.rb
 - lib/sidekiq/logger.rb
 - lib/sidekiq/manager.rb
+- lib/sidekiq/metrics/deploy.rb
+- lib/sidekiq/metrics/query.rb
+- lib/sidekiq/metrics/shared.rb
+- lib/sidekiq/metrics/tracking.rb
 - lib/sidekiq/middleware/chain.rb
 - lib/sidekiq/middleware/current_attributes.rb
 - lib/sidekiq/middleware/i18n.rb
@@ -122,6 +125,7 @@ files:
 - web/assets/images/status.png
 - web/assets/javascripts/application.js
 - web/assets/javascripts/dashboard.js
+- web/assets/javascripts/graph.js
 - web/assets/stylesheets/application-dark.css
 - web/assets/stylesheets/application-rtl.css
 - web/assets/stylesheets/application.css
@@ -166,6 +170,8 @@ files:
 - web/views/dashboard.erb
 - web/views/dead.erb
 - web/views/layout.erb
+- web/views/metrics.erb
+- web/views/metrics_for_job.erb
 - web/views/morgue.erb
 - web/views/queue.erb
 - web/views/queues.erb