sidekiq 7.0.0 → 7.3.0

data/web/views/_footer.erb

@@ -12,10 +12,22 @@
             <p id="serverUtcTime" class="navbar-text server-utc-time"><%= server_utc_time %></p>
           </li>
           <li>
-            <p class="navbar-text"><a rel=help href="https://github.com/mperham/sidekiq/wiki">docs</a></p>
+            <p class="navbar-text"><a rel=help href="https://github.com/sidekiq/sidekiq/wiki">docs</a></p>
           </li>
           <li>
-            <p class="navbar-text"><a rel=external href="https://github.com/mperham/sidekiq/tree/main/web/locales"><%= locale %></a></p>
+            <form id="locale-form" class="form-inline" action="<%= root_path %>change_locale" method="post">
+              <%= csrf_tag %>
+              <label class="sr-only" for="locale">Language</label>
+              <select id="locale-select" class="form-control" name="locale">
+                <% available_locales.each do |locale_option| %>
+                  <% if locale_option == locale %>
+                    <option selected value="<%= locale_option %>"><%= locale_option %></option>
+                  <% else %>
+                    <option value="<%= locale_option %>"><%= locale_option %></option>
+                  <% end %>
+                <% end %>
+              </select>
+            </form>
           </li>
         </ul>
     </div>

data/web/views/_job_info.erb

@@ -1,6 +1,6 @@
-<header>
+<div class="header-container">
   <h3><%= t('Job') %></h3>
-</header>
+</div>
 
 <div class="table_container">
   <table class="table table-bordered table-striped table-hover">
@@ -33,6 +33,14 @@
           <code><%= job.jid %></code>
         </td>
       </tr>
+      <% if job.bid %>
+      <tr>
+        <th>BID</th>
+        <td>
+          <a href="<%= root_path %>batches/<%= job.bid %>"><%= job.bid %></a>
+        </td>
+      </tr>
+      <% end %>
       <tr>
         <th><%= t('CreatedAt') %></th>
         <td><%= relative_time(job.created_at) %></td>
@@ -84,6 +92,14 @@
           <td><%= relative_time(job.at) if job['retry_count'] %></td>
         </tr>
       <% end %>
+      <% Sidekiq::Web.custom_job_info_rows.each do |helper| %>
+        <% helper.add_pair(job) do |name, value| %>
+          <tr>
+            <th><%= name %></th>
+            <td><%= value %></td>
+          </tr>
+        <% end %>
+      <% end %>
     </tbody>
   </table>
 </div>

data/web/views/_metrics_period_select.erb

@@ -0,0 +1,12 @@
+<div>
+  <select class="form-control" data-metric-period="<%= path %>">
+    <% periods.each_key do |code| %>
+
+      <% if code == period %>
+        <option selected value="<%= code %>"><%= code %></option>
+      <% else %>
+        <option value="<%= code %>"><%= code %></option>
+      <% end %>
+    <% end %>
+  </select>
+</div>

data/web/views/_paging.erb

@@ -1,3 +1,4 @@
+<div>
 <% if @total_size > @count %>
   <ul class="pagination pull-right flip">
     <li class="<%= 'disabled' if @current_page == 1 %>">
@@ -21,3 +22,4 @@
     </li>
   </ul>
 <% end %>
+</div>

data/web/views/_poll_link.erb

@@ -1,4 +1,4 @@
-<% if current_path != '' %>
+<% if pollable? %>
     <a class="live-poll-start live-poll btn btn-primary"><%= t('LivePoll') %></a>
     <a class="live-poll-stop live-poll btn btn-primary active"><%= t('StopPolling') %></a>
 <% end %>

data/web/views/_summary.erb

@@ -1,39 +1,39 @@
 <ul class="list-unstyled summary row">
   <li class="processed col-sm-1">
-    <span id="txtProcessed" class="count"><%= number_with_delimiter(stats.processed) %></span>
+    <span id="txtProcessed" class="count" data-nwp><%= stats.processed %></span>
     <span class="desc"><%= t('Processed') %></span>
   </li>
   <li class="failed col-sm-1">
-    <span id="txtFailed" class="count"><%= number_with_delimiter(stats.failed) %></span>
+    <span id="txtFailed" class="count" data-nwp><%= stats.failed %></span>
     <span class="desc"><%= t('Failed') %></span>
   </li>
   <li class="busy col-sm-1">
     <a href="<%= root_path %>busy">
-      <span id="txtBusy" class="count"><%= number_with_delimiter(workset.size) %></span>
+      <span id="txtBusy" class="count" data-nwp><%= workset.size %></span>
       <span class="desc"><%= t('Busy') %></span>
     </a>
   </li>
   <li class="enqueued col-sm-1">
     <a href="<%= root_path %>queues">
-      <span id="txtEnqueued" class="count"><%= number_with_delimiter(stats.enqueued) %></span>
+      <span id="txtEnqueued" class="count" data-nwp><%= stats.enqueued %></span>
       <span class="desc"><%= t('Enqueued') %></span>
     </a>
   </li>
   <li class="retries col-sm-1">
     <a href="<%= root_path %>retries">
-      <span id="txtRetries" class="count"><%= number_with_delimiter(stats.retry_size) %></span>
+      <span id="txtRetries" class="count" data-nwp><%= stats.retry_size %></span>
       <span class="desc"><%= t('Retries') %></span>
     </a>
   </li>
   <li class="scheduled col-sm-1">
     <a href="<%= root_path %>scheduled">
-      <span id="txtScheduled" class="count"><%= number_with_delimiter(stats.scheduled_size) %></span>
+      <span id="txtScheduled" class="count" data-nwp><%= stats.scheduled_size %></span>
       <span class="desc"><%= t('Scheduled') %></span>
     </a>
   </li>
   <li class="dead col-sm-1">
     <a href="<%= root_path %>morgue">
-      <span id="txtDead" class="count"><%= number_with_delimiter(stats.dead_size) %></span>
+      <span id="txtDead" class="count" data-nwp><%= stats.dead_size %></span>
       <span class="desc"><%= t('Dead') %></span>
     </a>
   </li>

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">
@@ -29,26 +27,25 @@
   </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">
-        <button class="btn btn-warn" type="submit" name="quiet" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('QuietAll') %></button>
-        <button class="btn btn-danger" type="submit" name="stop" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('StopAll') %></button>
+        <input class="btn btn-warn" type="submit" name="quiet" value="<%= t('QuietAll') %>" data-confirm="<%= t('AreYouSure') %>"/>
+        <input class="btn btn-danger" type="submit" name="stop" value="<%= t('StopAll') %>" data-confirm="<%= t('AreYouSure') %>"/>
       </div>
     </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 target="blank" 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>
@@ -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,36 +70,47 @@
           <% 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 class="num"><%= format_memory(process['rss'].to_i) %></td>
+        <td class="num"><%= number_with_delimiter(process['concurrency']) %></td>
+        <td class="num"><%= number_with_delimiter(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 %>
-    <div class="col-sm-4">
-      <%= erb :_paging, locals: { url: "#{root_path}busy" } %>
-    </div>
+    <%= erb :_paging, locals: { url: "#{root_path}busy" } %>
   <% end %>
 </div>
 
@@ -114,14 +125,14 @@
       <th><%= t('Arguments') %></th>
       <th><%= t('Started') %></th>
     </thead>
-    <% @workset.each do |process, thread, msg| %>
-      <% job = Sidekiq::JobRecord.new(msg['payload']) %>
+    <% @workset.each do |process, thread, work| %>
+      <% job = work.job %>
       <tr>
         <td><%= process %></td>
         <td><%= thread %></td>
         <td><%= job.jid %></td>
         <td>
-          <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
+          <a href="<%= root_path %>queues/<%= work.queue %>"><%= work.queue %></a>
         </td>
         <td>
           <%= job.display_class %>
@@ -130,7 +141,7 @@
         <td>
           <div class="args"><%= display_args(job.display_args) %></div>
         </td>
-        <td><%= relative_time(Time.at(msg['run_at'])) %></td>
+        <td><%= relative_time(work.run_at) %></td>
       </tr>
     <% end %>
   </table>

data/web/views/dashboard.erb

@@ -1,8 +1,4 @@
-<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>
+<script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js" nonce="<%= csp_nonce %>"></script>
 <div class= "dashboard clearfix">
   <h3 >
     <%= t('Dashboard') %>
@@ -13,33 +9,26 @@
   </h3>
   <div class="interval-slider ltr">
     <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
-    <span id="sldr-text" class="current-interval">5 sec</span>
+    <span id="sldr-text" class="current-interval">5 s</span>
     <br/>
     <input id="sldr" type="range" min="2000" max="20000" step="1000" value="5000"/>
   </div>
 </div>
 
 <div class="row chart">
-  <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>
+  <canvas id="realtime-chart">
+    <%= to_json({
+      processedLabel: t('Processed'),
+      failedLabel: t('Failed'),
+      labels: Array.new(50, ""),
+      processed: Array.new(50),
+      failed: Array.new(50),
+      updateUrl: "#{root_path}stats",
+    }) %>
+  </canvas>
 
   <!-- 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">
@@ -55,18 +44,14 @@
     <a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
   </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>
+  <canvas id="history-chart">
+    <%= to_json({
+      processedLabel: t('Processed'),
+      failedLabel: t('Failed'),
+      processed: @processed_history.to_a.reverse,
+      failed: @failed_history.to_a.reverse,
+    }) %>
+  </canvas>
 </div>
 
 <br/>
@@ -113,3 +98,8 @@
     <% end %>
   </div>
 </div>
+
+<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/dashboard-charts.js" nonce="<%= csp_nonce %>"></script>

data/web/views/filtering.erb

@@ -0,0 +1,7 @@
+<div>
+  <form method="post" class="form-inline" action='<%= root_path %>filter/<%= which %>'>
+    <%= csrf_tag %>
+    <label for="substr"><%= t('Filter') %></label>
+    <input class="search form-control" type="search" name="substr" value="<%= h params[:substr] %>" placeholder="<%= t('AnyJobContent') %>"/>
+  </form>
+</div>

data/web/views/layout.erb

@@ -5,20 +5,20 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
 
-    <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
+    <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
     <% if rtl? %>
-    <link href="<%= root_path %>stylesheets/bootstrap-rtl.min.css" media="screen" rel="stylesheet" type="text/css"/>
+    <link href="<%= root_path %>stylesheets/bootstrap-rtl.min.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>"/>
     <% end %>
 
-    <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
-    <link href="<%= root_path %>stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
+    <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
+    <link href="<%= root_path %>stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
     <% if rtl? %>
-    <link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
+    <link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
     <% end %>
 
     <link rel="apple-touch-icon" href="<%= root_path %>images/apple-touch-icon.png">
     <link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
-    <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
+    <script type="text/javascript" src="<%= root_path %>javascripts/application.js" nonce="<%= csp_nonce %>"></script>
     <meta name="google" content="notranslate" />
     <%= display_custom_head %>
   </head>

data/web/views/metrics.erb

@@ -1,13 +1,28 @@
-<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>
+<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js" nonce="<%= csp_nonce %>"></script>
 
 <div class="header-container">
-  <h1><%= t('Metrics') %></h1>
+  <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>
 
   <div>
-    <a target="blank" href="https://github.com/mperham/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
+    <form id="metrics-form" class="form-inline" action="<%= root_path %>filter/metrics" method="post">
+      <%= csrf_tag %>
+      <label for="substr"><%= t('Filter') %></label>
+      <input id="class-filter" class="form-control" type="text" name="substr" placeholder="<%= t('Name') %>" value="<%= h params[:substr] %>">
+      <select id="period-selector" class="form-control" name="period">
+        <% @periods.each_key do |code| %>
+          <% if code == @period %>
+            <option selected value="<%= code %>"><%= code %></option>
+          <% else %>
+            <option value="<%= code %>"><%= code %></option>
+          <% end %>
+        <% end %>
+      </select>
+    </form>
   </div>
 </div>
 
@@ -19,22 +34,17 @@
 %>
 
 <% 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>
+  <canvas id="job-metrics-overview-chart">
+    <%= to_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'),
+    }) %>
+  </canvas>
 <% end %>
 
 <div class="table_container">
@@ -44,8 +54,8 @@
         <th><%= t('Name') %></th>
         <th><%= t('Success') %></th>
         <th><%= t('Failure') %></th>
-        <th><%= t('TotalExecutionTime') %></th>
-        <th><%= t('AvgExecutionTime') %></th>
+        <th><%= t('TotalExecutionTime') %> (Seconds)</th>
+        <th><%= t('AvgExecutionTime') %> (Seconds)</th>
       </tr>
       <% if job_results.any? %>
         <% job_results.each_with_index do |(kls, jr), i| %>
@@ -60,14 +70,13 @@
                   value="<%= kls %>"
                   <%= visible_kls.include?(kls) ? 'checked' : '' %>
                 />
-                <code><a href="<%= root_path %>metrics/<%= kls %>"><%= kls %></a></code>
+                <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>
+            <td class="num"><%= number_with_delimiter(jr.dig("totals", "p") - jr.dig("totals", "f")) %></td>
+            <td class="num"><%= number_with_delimiter(jr.dig("totals", "f")) %></td>
+            <td class="num"><%= number_with_delimiter(jr.dig("totals", "s"), precision: 2) %></td>
+            <td class="num"><%= number_with_delimiter(jr.total_avg("s"), precision: 2) %></td>
           </tr>
         <% end %>
       <% else %>
@@ -77,4 +86,6 @@
   </table>
 </div>
 
-<p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p>
+<!--p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p-->
+
+<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js" nonce="<%= csp_nonce %>"></script>