sidekiq 6.3.1 → 7.0.7

data/web/views/busy.erb

@@ -1,7 +1,5 @@
-<div class="row header">
-  <div class="col-sm-4 pull-left flip">
-    <h3><%= t('Status') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('Status') %></h1>
 </div>
 
 <div class="stats-wrapper">
@@ -15,7 +13,7 @@
       <p><%= t('Threads') %></p>
     </div>
     <div class="stat">
-      <h3><%= ws = workers.size; number_with_delimiter(ws) %></h3>
+      <h3><%= ws = workset.size; number_with_delimiter(ws) %></h3>
       <p><%= t('Busy') %></p>
     </div>
     <div class="stat">
@@ -29,11 +27,9 @@
   </div>
 </div>
 
-<div class="row header">
-  <div class="col-sm-4 pull-left flip">
-    <h3><%= t('Processes') %></h3>
-  </div>
-  <div class="col-sm-3 pull-right flip">
+<div class="header-container">
+  <h1><%= t('Processes') %></h1>
+  <div>
     <form method="POST" class="warning-messages">
       <%= csrf_tag %>
       <div class="btn-group pull-right flip">
@@ -43,18 +39,19 @@
     </form>
   </div>
 </div>
+
 <div class="table_container">
   <table class="processes table table-hover table-bordered table-striped">
     <thead>
       <th><%= t('Name') %></th>
       <th><%= t('Started') %></th>
-      <th class="col-sm-1"><%= t('RSS') %><a href="https://github.com/mperham/sidekiq/wiki/Memory#rss"><span class="info-circle" title="Click to learn more about RSS">?</span></a></th>
+      <th class="col-sm-1"><%= t('RSS') %><a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Memory#rss"><span class="info-circle" title="Click to learn more about RSS">?</span></a></th>
       <th class="col-sm-1"><%= t('Threads') %></th>
       <th class="col-sm-1"><%= t('Busy') %></th>
       <th>&nbsp;</th>
     </thead>
     <% lead = processes.leader %>
-    <% processes.each do |process| %>
+    <% sorted_processes.each do |process| %>
       <tr>
         <td class="box">
           <%= "#{process['hostname']}:#{process['pid']}" %>
@@ -62,6 +59,9 @@
           <% process.labels.each do |label| %>
             <span class="label label-info"><%= label %></span>
           <% end %>
+          <% if process.embedded? %>
+            <span class="label label-default">embedded</span>
+          <% end %>
           <% if process.stopping? %>
             <span class="label label-danger">quiet</span>
           <% end %>
@@ -70,32 +70,48 @@
           <% end %>
           <br>
           <b><%= "#{t('Queues')}: " %></b>
-          <%= process.queues.join(", ") %>
+          <% if process.weights %>
+            <%= busy_weights(process.weights) %>
+          <% else %>
+            <%= process.queues.sort.join(", ") %>
+          <% end %>
+          <% if process.version != Sidekiq::VERSION %>
+            <br>
+            <b><%= "#{t('Version')}: " %></b>
+            <% if process.version %>
+              <%= process.version %>
+            <% else %>
+              <%= t('Unknown') %>
+            <% end %>
+          <% end %>
         </td>
         <td><%= relative_time(Time.at(process['started_at'])) %></td>
         <td><%= format_memory(process['rss'].to_i) %></td>
         <td><%= process['concurrency'] %></td>
         <td><%= process['busy'] %></td>
         <td>
-          <form method="POST">
-            <%= csrf_tag %>
-            <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
+          <% unless process.embedded? %>
+            <form method="POST">
+              <%= csrf_tag %>
+              <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
 
-            <div class="btn-group pull-right flip">
-              <% unless process.stopping? %><button class="btn btn-xs btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
-              <button class="btn btn-xs btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
-            </div>
-          </form>
+              <div class="btn-group pull-right flip">
+                <% unless process.stopping? %><button class="btn btn-xs btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
+                <button class="btn btn-xs btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
+              </div>
+            </form>
+          <% end %>
         </td>
       </tr>
     <% end %>
   </table>
 </div>
 
-<div class="row header">
-  <div class="col-sm-7">
-    <h3><%= t('Jobs') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('Jobs') %></h1>
+  <% if @workset.size > 0 && @total_size > @count %>
+    <%= erb :_paging, locals: { url: "#{root_path}busy" } %>
+  <% end %>
 </div>
 
 <div class="table_container">
@@ -109,7 +125,7 @@
       <th><%= t('Arguments') %></th>
       <th><%= t('Started') %></th>
     </thead>
-    <% workers.each do |process, thread, msg| %>
+    <% @workset.each do |process, thread, msg| %>
       <% job = Sidekiq::JobRecord.new(msg['payload']) %>
       <tr>
         <td><%= process %></td>

data/web/views/dashboard.erb

@@ -1,3 +1,7 @@
+<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/dashboard-charts.js"></script>
 <script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js"></script>
 <div class= "dashboard clearfix">
   <h3 >
@@ -16,8 +20,26 @@
 </div>
 
 <div class="row chart">
-  <div id="realtime" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>"></div>
-  <div id="realtime-legend"></div>
+  <canvas id="realtime-chart"></canvas>
+  <script>
+    window.realtimeChart = new RealtimeChart(
+      document.getElementById("realtime-chart"),
+      <%= Sidekiq.dump_json({
+        processedLabel: t('Processed'),
+        failedLabel: t('Failed'),
+        labels: Array.new(50, ""),
+        processed: Array.new(50),
+        failed: Array.new(50),
+        updateUrl: "#{root_path}stats",
+      }) %>
+    )
+  </script>
+
+  <!-- start with a space in the legend so the height doesn't change when we add content dynamically -->
+  <div id="realtime-legend">&nbsp;</div>
+  <script>
+    realtimeChart.registerLegend(document.getElementById("realtime-legend"))
+  </script>
 </div>
 
 <div class="row header">
@@ -33,8 +55,18 @@
     <a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
   </div>
 
-  <div id="history" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>stats"></div>
-  <div id="history-legend"></div>
+  <canvas id="history-chart"></canvas>
+  <script>
+    window.historyChart = new DashboardChart(
+      document.getElementById("history-chart"),
+      <%= Sidekiq.dump_json({
+        processedLabel: t('Processed'),
+        failedLabel: t('Failed'),
+        processed: @processed_history.to_a.reverse,
+        failed: @failed_history.to_a.reverse,
+      }) %>
+    )
+  </script>
 </div>
 
 <br/>

data/web/views/metrics.erb

@@ -0,0 +1,82 @@
+<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
+
+<div class="header-container">
+  <div class="page-title-container">
+    <h1><%= t('Metrics') %></h1>
+
+    <a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
+  </div>
+
+  <%= erb :_metrics_period_select, locals: { periods: @periods, period: @period, path: "#{root_path}metrics" } %>
+</div>
+
+<%
+  table_limit = 20
+  chart_limit = 5
+  job_results = @query_result.job_results.sort_by { |(kls, jr)| jr.totals["s"] }.reverse.first(table_limit)
+  visible_kls = job_results.first(chart_limit).map(&:first)
+%>
+
+<% if job_results.any? %>
+  <canvas id="job-metrics-overview-chart"></canvas>
+
+  <script>
+    window.jobMetricsChart = new JobMetricsOverviewChart(
+      document.getElementById("job-metrics-overview-chart"),
+      <%= Sidekiq.dump_json({
+        series: job_results.map { |(kls, jr)| [kls, jr.dig("series", "s")] }.to_h,
+        marks: @query_result.marks.map { |m| [m.bucket, m.label] },
+        labels: @query_result.buckets,
+        visibleKls: visible_kls,
+        yLabel: t('TotalExecutionTime'),
+        units: t('Seconds').downcase,
+        markLabel: t('Deploy'),
+      }) %>
+    )
+  </script>
+<% end %>
+
+<div class="table_container">
+  <table class="table table-bordered table-striped table-hover">
+    <tbody>
+      <tr>
+        <th><%= t('Name') %></th>
+        <th><%= t('Success') %></th>
+        <th><%= t('Failure') %></th>
+        <th><%= t('TotalExecutionTime') %></th>
+        <th><%= t('AvgExecutionTime') %></th>
+      </tr>
+      <% if job_results.any? %>
+        <% job_results.each_with_index do |(kls, jr), i| %>
+          <tr>
+            <td>
+              <div class="metrics-swatch-wrapper">
+                <% id = "metrics-swatch-#{kls}" %>
+                <input
+                  type="checkbox"
+                  id="<%= id %>"
+                  class="metrics-swatch"
+                  value="<%= kls %>"
+                  <%= visible_kls.include?(kls) ? 'checked' : '' %>
+                />
+                <code><a href="<%= root_path %>metrics/<%= kls %>?period=<%= @period %>"><%= kls %></a></code>
+              </div>
+              <script>jobMetricsChart.registerSwatch("<%= id %>")</script>
+            </td>
+            <td><%= jr.dig("totals", "p") - jr.dig("totals", "f") %></td>
+            <td><%= jr.dig("totals", "f") %></td>
+            <td><%= jr.dig("totals", "s").round(2) %> seconds</td>
+            <td><%= jr.total_avg("s").round(2) %> seconds</td>
+          </tr>
+        <% end %>
+      <% else %>
+          <tr><td colspan=5><%= t("NoDataFound") %></td></tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p>

data/web/views/metrics_for_job.erb

@@ -0,0 +1,71 @@
+<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
+
+<%
+  job_result = @query_result.job_results[@name]
+  hist_totals = job_result.hist.values.first.zip(*job_result.hist.values[1..-1]).map(&:sum)
+  bucket_labels =Sidekiq::Metrics::Histogram::LABELS
+  bucket_intervals =Sidekiq::Metrics::Histogram::BUCKET_INTERVALS.reverse
+
+  # Replace INFINITY since it can't be represented as JSON
+  bucket_intervals[0] = bucket_intervals[1] * 2
+%>
+
+<% if job_result.totals["s"] > 0 %>
+  <div class="header-container">
+    <div class="page-title-container">
+      <h1>
+        <a href="<%= root_path %>metrics?period=<%= @period %>"><%= t('Metrics') %></a> /
+        <%= h @name %>
+      </h1>
+
+      <a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
+    </div>
+
+    <%= erb :_metrics_period_select, locals: { periods: @periods, period: @period, path: "#{root_path}metrics/#{@name}" } %>
+  </div>
+
+  <canvas id="hist-totals-chart"></canvas>
+
+  <script>
+    window.histTotalsChart = new HistTotalsChart(
+      document.getElementById("hist-totals-chart"),
+      <%= Sidekiq.dump_json({
+        series: hist_totals,
+        labels: bucket_labels,
+        xLabel: t('ExecutionTime'),
+        yLabel: t('Jobs'),
+        units: t('Jobs').downcase,
+      }) %>
+    )
+  </script>
+
+  <canvas id="hist-bubble-chart"></canvas>
+
+  <script>
+    window.histBubbleChart = new HistBubbleChart(
+      document.getElementById("hist-bubble-chart"),
+      <%= Sidekiq.dump_json({
+        hist: job_result.hist,
+        marks: @query_result.marks.map { |m| [m.bucket, m.label] },
+        labels: @query_result.buckets,
+        histIntervals: bucket_intervals,
+        yLabel: t('ExecutionTime'),
+        markLabel: t('Deploy'),
+        yUnits: t('Seconds').downcase,
+        zUnits: t('Jobs').downcase,
+      }) %>
+    )
+  </script>
+
+  <p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p>
+<% else %>
+  <h1>
+    <a href="<%= root_path %>/metrics"><%= t('Metrics') %></a> /
+    <%= h @name %>
+  </h1>
+
+  <div class="alert alert-success"><%= t('NoJobMetricsFound') %></div>
+<% end %>

data/web/views/morgue.erb

@@ -1,14 +1,10 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3><%= t('DeadJobs') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('DeadJobs') %></h1>
   <% if @dead.size > 0 && @total_size > @count %>
-    <div class="col-sm-4">
-      <%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
-    </div>
+    <%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
   <% end %>
   <%= filtering('dead') %>
-</header>
+</div>
 
 <% if @dead.size > 0 %>
   <form action="<%= root_path %>morgue" method="post">
@@ -33,7 +29,7 @@
           <tr>
             <td class="table-checkbox">
               <label>
-                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
               </label>
             </td>
             <td>

data/web/views/queue.erb

@@ -1,23 +1,20 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3>
-      <%= t('CurrentMessagesInQueue', :queue => h(@name)) %>
-      <% if @queue.paused? %>
-        <span class="label label-danger"><%= t('Paused') %></span>
-      <% end %>
-      <span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
-    </h3>
-  </div>
-  <div class="col-sm-4 pull-right flip">
-    <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
-  </div>
-</header>
+<div class="header-container">
+  <h1><%= t('CurrentMessagesInQueue', :queue => h(@name)) %>
+    <% if @queue.paused? %>
+      <span class="label label-danger"><%= t('Paused') %></span>
+    <% end %>
+    <span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
+  </h1>
+  <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
+</div>
+
 <div class="table_container">
   <table class="queue table table-hover table-bordered table-striped">
     <thead>
       <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 +32,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 %>

data/web/views/queues.erb

@@ -1,4 +1,6 @@
-<h3><%= t('Queues') %></h3>
+<div class="header-container">
+  <h1><%= t('Queues') %></h1>
+</div>
 
 <div class="table_container">
   <table class="queues table table-hover table-bordered table-striped">

data/web/views/retries.erb

@@ -1,14 +1,10 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3><%= t('Retries') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('Retries') %></h1>
   <% if @retries.size > 0 && @total_size > @count %>
-    <div class="col-sm-4">
-      <%= erb :_paging, locals: { url: "#{root_path}retries" } %>
-    </div>
+    <%= erb :_paging, locals: { url: "#{root_path}retries" } %>
   <% end %>
   <%= filtering('retries') %>
-</header>
+</div>
 
 <% if @retries.size > 0 %>
   <form action="<%= root_path %>retries" method="post">
@@ -34,7 +30,7 @@
           <tr>
             <td class="table-checkbox">
               <label>
-                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
               </label>
             </td>
             <td>

data/web/views/scheduled.erb

@@ -1,25 +1,22 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3><%= t('ScheduledJobs') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('ScheduledJobs') %></h1>
   <% if @scheduled.size > 0 && @total_size > @count %>
-    <div class="col-sm-4">
-      <%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
-    </div>
+    <%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
   <% end %>
   <%= filtering('scheduled') %>
-</header>
+</div>
 
 <% if @scheduled.size > 0 %>
-
   <form action="<%= root_path %>scheduled" method="post">
     <%= csrf_tag %>
     <div class="table_container">
       <table class="table table-striped table-bordered table-hover">
         <thead>
           <tr>
-            <th class="checkbox-column">
-              <input type="checkbox" class="check_all" />
+            <th class="table-checkbox checkbox-column">
+              <label>
+                <input type="checkbox" class="check_all" />
+              </label>
             </th>
             <th><%= t('When') %></th>
             <th><%= t('Queue') %></th>
@@ -29,8 +26,10 @@
         </thead>
         <% @scheduled.each do |entry| %>
           <tr>
-            <td>
-              <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+            <td class="table-checkbox">
+              <label>
+                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
+              </label>
             </td>
             <td>
                <a href="<%= root_path %>scheduled/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>