sidekiq 6.1.2 → 6.2.2

data/web/locales/ar.yml

@@ -8,6 +8,7 @@ ar:
   Realtime: الزمن الفعلي
   History: تاريخ
   Busy: مشغول
+  Utilization: الاستخدام
   Processed: تمت المعالجة
   Failed: فشل
   Scheduled: مجدول
@@ -65,11 +66,13 @@ ar:
   DeadJobs: وظائف ميتة
   NoDeadJobsFound: لاتوجد وظائف ميتة
   Dead: ميتة
+  Process: عملية
   Processes: عمليات
+  Name: الاسم
   Thread: نيسب
   Threads: نياسب
   Jobs: وظائف
-  Paused: إيقاف مؤقت
+  Paused: موقفة مؤقتاً
   Stop: إيقاف
   Quiet: هدوء
   StopAll: إيقاف الكل
@@ -78,4 +81,7 @@ ar:
   Plugins: الإضافات
   NotYetEnqueued: لم تدخل الرتل بعد
   CreatedAt: أنشئت في
-  BackToApp: العودة إلى التطبيق
+  BackToApp: العودة إلى التطبيق
+  Latency: زمن الانتظار
+  Pause: إيقاف مؤقت
+  Unpause: متابعة

data/web/locales/en.yml

@@ -7,6 +7,7 @@ en: # <---- change this to your locale code
   Realtime: Real-time
   History: History
   Busy: Busy
+  Utilization: Utilization
   Processed: Processed
   Failed: Failed
   Scheduled: Scheduled
@@ -64,7 +65,9 @@ en: # <---- change this to your locale code
   DeadJobs: Dead Jobs
   NoDeadJobsFound: No dead jobs were found
   Dead: Dead
+  Process: Process
   Processes: Processes
+  Name: Name
   Thread: Thread
   Threads: Threads
   Jobs: Jobs

data/web/locales/es.yml

@@ -7,6 +7,7 @@ es:
   Realtime: Tiempo Real
   History: Historial
   Busy: Ocupado
+  Utilization: Utilización
   Processed: Procesadas
   Failed: Fallidas
   Scheduled: Programadas
@@ -24,9 +25,9 @@ es:
   ShowAll: Mostrar Todo
   CurrentMessagesInQueue: Mensajes actualmente en <span class='title'>%{queue}</span>
   Delete: Eliminar
-  AddToQueue: Añadir a fila
+  AddToQueue: Añadir a la cola
   AreYouSureDeleteJob: ¿Estás seguro de eliminar este trabajo?
-  AreYouSureDeleteQueue: ¿Estás seguro de eliminar la fila  %{queue}?
+  AreYouSureDeleteQueue: ¿Estás seguro de eliminar la cola %{queue}?
   Queues: Colas
   Size: Tamaño
   Actions: Acciones
@@ -39,6 +40,7 @@ es:
   AreYouSure: ¿Estás seguro?
   DeleteAll: Borrar Todo
   RetryAll: Reintentar Todo
+  KillAll: Matar Todo
   NoRetriesFound: No se encontraron reintentos
   Error: Error
   ErrorClass: Clase del Error
@@ -63,8 +65,22 @@ es:
   DeadJobs: Trabajos muertos
   NoDeadJobsFound: No hay trabajos muertos
   Dead: Muerto
+  Process: Proceso
   Processes: Procesos
+  Name: Nombre
   Thread: Hilo
   Threads: Hilos
   Jobs: Trabajos
+  Paused: Pausado
+  Stop: Detener
+  Quiet: Silenciar
+  StopAll: Detener Todo
+  QuietAll: Silenciar Todo
+  PollingInterval: Intervalo de Sondeo
+  Plugins: Plugins
+  NotYetEnqueued: Aún no en cola
+  CreatedAt: Creado en
+  BackToApp: Volver a la Aplicación
   Latency: Latencia
+  Pause: Pausar
+  Unpause: Reanudar

data/web/locales/fr.yml

@@ -7,6 +7,7 @@ fr:
   Realtime: Temps réel
   History: Historique
   Busy: En cours
+  Utilization: Utilisation
   Processed: Traitées
   Failed: Échouées
   Scheduled: Planifiées
@@ -39,6 +40,7 @@ fr:
   AreYouSure: Êtes-vous certain ?
   DeleteAll: Tout supprimer
   RetryAll: Tout réessayer
+  KillAll: Tout tuer
   NoRetriesFound: Aucune tâche à réessayer n’a été trouvée
   Error: Erreur
   ErrorClass: Classe d’erreur
@@ -63,6 +65,7 @@ fr:
   DeadJobs: Tâches mortes
   NoDeadJobsFound: Aucune tâche morte n'a été trouvée
   Dead: Mortes
+  Process: Processus
   Processes: Processus
   Thread: Thread
   Threads: Threads
@@ -72,7 +75,11 @@ fr:
   Quiet: Clore
   StopAll: Tout arrêter
   QuietAll: Tout clore
-  PollingInterval: Interval de rafraîchissement
+  PollingInterval: Intervalle de rafraîchissement
   Plugins: Plugins
   NotYetEnqueued: Pas encore en file d'attente
   CreatedAt: Créée le
+  Back to App: Retour à l'application
+  Latency: Latence
+  Pause: Pause
+  Unpause: Unpause

data/web/locales/ja.yml

@@ -7,6 +7,7 @@ ja:
   Realtime: リアルタイム
   History: 履歴
   Busy: 実行中
+  Utilization: 使用率
   Processed: 完了
   Failed: 失敗
   Scheduled: 予定
@@ -64,7 +65,9 @@ ja:
   DeadJobs: デッドジョブ
   NoDeadJobsFound: デッドジョブはありません
   Dead: デッド
+  Process: プロセス
   Processes: プロセス
+  Name: 名前
   Thread: スレッド
   Threads: スレッド
   Jobs: ジョブ

data/web/locales/lt.yml

@@ -71,7 +71,7 @@ lt:
   Paused: Pristabdytas
   Stop: Sustabdyti
   Quiet: Nutildyti
-  StopAll: Sustbadyti Visus
+  StopAll: Sustabdyti Visus
   QuietAll: Nutildyti Visus
   PollingInterval: Užklausimų intervalas
   Plugins: Įskiepiai

data/web/views/_job_info.erb

@@ -3,7 +3,7 @@
 </header>
 
 <div class="table_container">
-  <table class="table table-bordered table-striped">
+  <table class="table table-bordered table-striped table-hover">
     <tbody>
       <tr>
         <th><%= t('Queue') %></th>

data/web/views/busy.erb

@@ -1,8 +1,39 @@
 <div class="row header">
-  <div class="col-sm-8 pull-left flip">
+  <div class="col-sm-4 pull-left flip">
+    <h3><%= t('Status') %></h3>
+  </div>
+</div>
+
+<div class="stats-wrapper">
+  <div class="stats-container">
+    <div class="stat">
+      <h3><%= s = processes.size; number_with_delimiter(s) %></h3>
+      <p><%= t('Processes') %></p>
+    </div>
+    <div class="stat">
+      <h3><%= x = processes.total_concurrency; number_with_delimiter(x) %></h3>
+      <p><%= t('Threads') %></p>
+    </div>
+    <div class="stat">
+      <h3><%= ws = workers.size; number_with_delimiter(ws) %></h3>
+      <p><%= t('Busy') %></p>
+    </div>
+    <div class="stat">
+      <h3><%= x == 0 ? 0 : ((ws / x.to_f) * 100).round(0) %>%</h3>
+      <p><%= t('Utilization') %></p>
+    </div>
+    <div class="stat">
+      <h3><%= format_memory(processes.total_rss) %></h3>
+      <p><%= t('RSS') %></p>
+    </div>
+  </div>
+</div>
+
+<div class="row header">
+  <div class="col-sm-4 pull-left flip">
     <h3><%= t('Processes') %></h3>
   </div>
-  <div class="col-sm-4 pull-right flip">
+  <div class="col-sm-3 pull-right flip">
     <form method="POST" class="warning-messages">
       <%= csrf_tag %>
       <div class="btn-group pull-right flip">
@@ -12,14 +43,14 @@
     </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><%= t('Threads') %></th>
-      <th><%= t('Busy') %></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('Threads') %></th>
+      <th class="col-sm-1"><%= t('Busy') %></th>
       <th>&nbsp;</th>
     </thead>
     <% lead = processes.leader %>
@@ -39,22 +70,22 @@
           <% end %>
           <br>
           <b><%= "#{t('Queues')}: " %></b>
-          <%= process['queues'] * ", " %>
+          <%= process.queues.join(", ") %>
         </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>
-          <div class="btn-group pull-right flip">
-            <form method="POST">
-              <%= csrf_tag %>
-              <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
-              <% unless process.stopping? %>
-                <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
-              <% end %>
-              <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
-            </form>
-          </div>
+          <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>
         </td>
       </tr>
     <% end %>
@@ -79,7 +110,7 @@
       <th><%= t('Started') %></th>
     </thead>
     <% workers.each do |process, thread, msg| %>
-      <% job = Sidekiq::Job.new(msg['payload']) %>
+      <% job = Sidekiq::JobRecord.new(msg['payload']) %>
       <tr>
         <td><%= process %></td>
         <td><%= thread %></td>

data/web/views/dashboard.erb

@@ -20,22 +20,30 @@
   <div id="realtime-legend"></div>
 </div>
 
-<div class="row chart">
-  <h5>
-    <span class="history-heading"><%= t('History') %></span>
+<div class="row header">
+   <div class="col-sm-4 pull-left flip">
+     <h3><%= t('History') %></h3>
+   </div>
+ </div>
+ <div class="row chart">
+   <div>
     <a href="<%= root_path %>?days=7" class="history-graph <%= "active" if params[:days] == "7" %>"><%= t('OneWeek') %></a>
     <a href="<%= root_path %>" class="history-graph <%= "active" if params[:days].nil? || params[:days] == "30" %>"><%= t('OneMonth') %></a>
     <a href="<%= root_path %>?days=90" class="history-graph <%= "active" if params[:days] == "90" %>"><%= t('ThreeMonths') %></a>
     <a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
-  </h5>
+  </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>
 </div>
 
 <br/>
-<h5>Redis</h5>
-<div class="redis-wrapper">
+<div class="row header">
+  <div class="col-sm-4 pull-left flip">
+    <h3>Redis</h3>
+  </div>
+</div>
+<div class="stats-wrapper">
   <div class="stats-container">
     <% if @redis_info.fetch("redis_version", nil) %>
       <div class="stat">

data/web/views/dead.erb

@@ -2,7 +2,7 @@
 
 <h3><%= t('Error') %></h3>
 <div class="table_container">
-  <table class="error table table-bordered table-striped">
+  <table class="error table table-bordered table-striped table-hover">
     <tbody>
       <tr>
         <th><%= t('ErrorClass') %></th>

data/web/views/layout.erb

@@ -16,6 +16,7 @@
     <link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
     <% 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>
     <meta name="google" content="notranslate" />

data/web/views/morgue.erb

@@ -14,7 +14,7 @@
   <form action="<%= root_path %>morgue" method="post">
     <%= csrf_tag %>
     <div class="table_container">
-      <table class="table table-striped table-bordered">
+      <table class="table table-striped table-bordered table-hover">
         <thead>
           <tr>
             <th class="table-checkbox checkbox-column">
@@ -44,7 +44,7 @@
             </td>
             <td>
               <%= entry.display_class %>
-              <%= display_tags(entry, "morgue") %>
+              <%= display_tags(entry, "dead") %>
             </td>
             <td>
               <div class="args"><%= display_args(entry.display_args) %></div>
@@ -58,18 +58,18 @@
         <% end %>
       </table>
     </div>
-    <input class="btn btn-primary btn-xs pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger btn-xs pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <input class="btn btn-primary pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
+    <input class="btn btn-danger pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
   </form>
 
   <% unfiltered? do %>
     <form action="<%= root_path %>morgue/all/delete" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
     </form>
     <form action="<%= root_path %>morgue/all/retry" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <input class="btn btn-danger pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
     </form>
   <% end %>
 

data/web/views/queue.erb

@@ -52,4 +52,4 @@
     <% end %>
   </table>
 </div>
-<%= erb :_paging, locals: { url: "#{root_path}queues/#{@name}" } %>
+<%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>

data/web/views/queues.erb

@@ -21,13 +21,13 @@
         <td class="delete-confirm">
           <form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
             <%= csrf_tag %>
-            <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
+            <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
 
             <% if Sidekiq.pro? %>
               <% if queue.paused? %>
-                <input class="btn btn-danger btn-xs" type="submit" name="unpause" value="<%= t('Unpause') %>" />
+                <input class="btn btn-danger" type="submit" name="unpause" value="<%= t('Unpause') %>" />
               <% else %>
-                <input class="btn btn-danger btn-xs" type="submit" name="pause" value="<%= t('Pause') %>" />
+                <input class="btn btn-danger" type="submit" name="pause" value="<%= t('Pause') %>" />
               <% end %>
             <% end %>
           </form>

data/web/views/retries.erb

@@ -14,7 +14,7 @@
   <form action="<%= root_path %>retries" method="post">
     <%= csrf_tag %>
     <div class="table_container">
-      <table class="table table-striped table-bordered">
+      <table class="table table-striped table-bordered table-hover">
         <thead>
           <tr>
             <th class="table-checkbox checkbox-column">
@@ -58,23 +58,23 @@
         <% end %>
       </table>
     </div>
-    <input class="btn btn-primary btn-xs pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger btn-xs pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
-    <input class="btn btn-danger btn-xs pull-left flip" type="submit" name="kill" value="<%= t('Kill') %>" />
+    <input class="btn btn-primary pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
+    <input class="btn btn-danger pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <input class="btn btn-danger pull-left flip" type="submit" name="kill" value="<%= t('Kill') %>" />
   </form>
 
   <% unfiltered? do %>
     <form action="<%= root_path %>retries/all/delete" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
     </form>
     <form action="<%= root_path %>retries/all/retry" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <input class="btn btn-danger pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
     </form>
     <form action="<%= root_path %>retries/all/kill" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="kill" value="<%= t('KillAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <input class="btn btn-danger pull-right flip" type="submit" name="kill" value="<%= t('KillAll') %>" data-confirm="<%= t('AreYouSure') %>" />
     </form>
   <% end %>
 

data/web/views/retry.erb

@@ -2,7 +2,7 @@
 
 <h3><%= t('Error') %></h3>
 <div class="table_container">
-  <table class="error table table-bordered table-striped">
+  <table class="error table table-bordered table-striped table-hover">
     <tbody>
       <tr>
         <th><%= t('ErrorClass') %></th>