sidekiq 8.0.8 → 8.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a1e8c90888b4135f21e4dfef66fd9ad9ac8c72ab267599a8452f4bd172234a2
-  data.tar.gz: fa83e70c818fc3b25441e946c1a093a2d9a5f4515ee2bd88522cbafcb8097973
+  metadata.gz: ef51643693879cd574d6edd54ef41443defc4825c855d5eed0e07d42e35aa1cd
+  data.tar.gz: 2d9acb8d89326185356ee9818ca543e8a6992bac0a00262e06aa9394052978c1
 SHA512:
-  metadata.gz: 0ea8ac9585538723d941af6ce9150933669705cf1e3459dcea8989d073d234c4e233e74314a5a682e3111e1290a69671051e847b5ee97970c1edd08293e14bbc
-  data.tar.gz: 0b253cd035132f786613fbb97440f5d16f48717aedaa7f50865e0e261ce0fc17b64885bea3cdeb5aabe72258c06ed013891d83655bdcf842fc1a261d1b0aa985
+  metadata.gz: 761f705abeb6b5deb31591d07d9d9ea0d79d5d6f74367f622842994aa0a57866bd3af9add1089ce2b29d8dd4a9cd110d839036504a1ae0830ac59dbca186ff26
+  data.tar.gz: 5df2e3b47cb7ed56a51ff90b1a8d23ea96f74e9fd64a9116d249a266c7a074ef2a4bac09d66202c66a4f631c6f15bcae167df8ae733f43020f0b53886ae3e564

data/Changes.md

@@ -2,6 +2,19 @@
 
 [Sidekiq Changes](https://github.com/sidekiq/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/sidekiq/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/sidekiq/sidekiq/blob/main/Ent-Changes.md)
 
+8.0.9
+----------
+
+- Implement idle Redis connection reaping, will be activated in 8.1 [#6663]
+- Updated `Sidekiq::Process` API to provide capsule data. The `queues` and `weights` 
+  data will be removed from Redis in Sidekiq 8.1, as this data can now be found in the
+  `capsules` element. [#6295]
+- Restore bulk action buttons on Scheduled, Retry and Dead tabs [#6833, deve1212]
+- Support logging additional job attributes [#6846, bschrag620]
+- Fix display of long job args [#6836]
+- Create development lifecycle (`docs/sdlc.md`) and security (`docs/SECURITY.md`) policy
+  documentation for Sidekiq's current workflows
+
 8.0.8
 ----------
 

data/lib/generators/sidekiq/templates/job.rb.erb

@@ -6,4 +6,4 @@ class <%= class_name %>Job
     # Do something
   end
 end
-<% end -%>
+<% end -%>

data/lib/sidekiq/api.rb

@@ -1059,9 +1059,9 @@ module Sidekiq
   #   'started_at' => <process start time>,
   #   'pid' => 12345,
   #   'tag' => 'myapp'
-  #   'concurrency' => 25,
-  #   'queues' => ['default', 'low'],
-  #   'busy' => 10,
+  #   'concurrency' => 5,
+  #   'capsules' => {"default" => {"mode" => "weighted", "concurrency" => 5, "weights" => {"default" => 2, "low" => 1}}},
+  #   'busy' => 3,
   #   'beat' => <last heartbeat>,
   #   'identity' => <unique string identifying the process>,
   #   'embedded' => true,
@@ -1089,12 +1089,25 @@ module Sidekiq
       self["identity"]
     end
 
+    # deprecated, use capsules below
     def queues
-      self["queues"]
+      capsules.values.flat_map { |x| x["weights"].keys }.uniq
     end
 
+    # deprecated, use capsules below
     def weights
-      self["weights"]
+      hash = {}
+      capsules.values.each do |cap|
+        # Note: will lose data if two capsules are processing the same named queue
+        cap["weights"].each_pair do |queue, weight|
+          hash[queue] = weight
+        end
+      end
+      hash
+    end
+
+    def capsules
+      self["capsules"]
     end
 
     def version

data/lib/sidekiq/capsule.rb

@@ -38,6 +38,10 @@ module Sidekiq
       @mode = :strict
     end
 
+    def to_h
+      {concurrency: concurrency, mode: mode, weights: weights}
+    end
+
     def fetcher
       @fetcher ||= begin
         instance = (config[:fetch_class] || Sidekiq::BasicFetch).new(self)

data/lib/sidekiq/config.rb

@@ -35,7 +35,8 @@ module Sidekiq
       dead_max_jobs: 10_000,
       dead_timeout_in_seconds: 180 * 24 * 60 * 60, # 6 months
       reloader: proc { |&block| block.call },
-      backtrace_cleaner: ->(backtrace) { backtrace }
+      backtrace_cleaner: ->(backtrace) { backtrace },
+      logged_job_attributes: ["bid", "tags"]
     }
 
     ERROR_HANDLER = ->(ex, ctx, cfg = Sidekiq.default_configuration) {
@@ -144,11 +145,16 @@ module Sidekiq
       @redis_config = @redis_config.merge(hash)
     end
 
+    def reap_idle_redis_connections(timeout = nil)
+      self[:reap_connections] = timeout
+    end
+    alias_method :reap, :reap_idle_redis_connections
+
     def redis_pool
       Thread.current[:sidekiq_redis_pool] || Thread.current[:sidekiq_capsule]&.redis_pool || local_redis_pool
     end
 
-    private def local_redis_pool
+    def local_redis_pool
       # this is our internal client/housekeeping pool. each capsule has its
       # own pool for executing threads.
       @redis ||= new_redis_pool(10, "internal")

data/lib/sidekiq/fetch.rb

@@ -7,6 +7,7 @@ require "sidekiq/capsule"
 module Sidekiq # :nodoc:
   class BasicFetch
     include Sidekiq::Component
+
     # We want the fetch operation to timeout every few seconds so the thread
     # can check if the process is shutting down.
     TIMEOUT = 2

data/lib/sidekiq/job/iterable.rb

@@ -55,7 +55,7 @@ module Sidekiq
       def cancel!
         return @_cancelled if cancelled?
 
-        key = "it-#{jid}"
+        key = iteration_key
         _, result, _ = Sidekiq.redis do |c|
           c.pipelined do |p|
             p.hsetnx(key, "cancelled", Time.now.to_i)
@@ -177,7 +177,7 @@ module Sidekiq
       private
 
       def is_cancelled?
-        @_cancelled = Sidekiq.redis { |c| c.hget("it-#{jid}", "cancelled") }
+        @_cancelled = Sidekiq.redis { |c| c.hget(iteration_key, "cancelled") }
       end
 
       def fetch_previous_iteration_state

data/lib/sidekiq/job_logger.rb

@@ -29,8 +29,10 @@ module Sidekiq
         jid: job_hash["jid"],
         class: job_hash["wrapped"] || job_hash["class"]
       }
-      h[:bid] = job_hash["bid"] if job_hash.has_key?("bid")
-      h[:tags] = job_hash["tags"] if job_hash.has_key?("tags")
+
+      @config[:logged_job_attributes].each do |attr|
+        h[attr.to_sym] = job_hash[attr] if job_hash.has_key?(attr)
+      end
 
       Thread.current[:sidekiq_context] = h
       level = job_hash["log_level"]

data/lib/sidekiq/launcher.rb

@@ -142,6 +142,12 @@ module Sidekiq
       key = identity
       fails = procd = 0
 
+      idle = config[:reap_connections]
+      if idle
+        config.capsules.each_value { |cap| cap.local_redis_pool.reap(idle, &:close) }
+        config.local_redis_pool.reap(idle, &:close)
+      end
+
       begin
         flush_stats
 
@@ -252,8 +258,15 @@ module Sidekiq
         "pid" => ::Process.pid,
         "tag" => @config[:tag] || "",
         "concurrency" => @config.total_concurrency,
+        "capsules" => @config.capsules.each_with_object({}) { |(name, cap), memo|
+          memo[name] = cap.to_h
+        },
+        #####
+        # TODO deprecated, remove in 9.0
+        # This data is now found in the `capsules` element above
         "queues" => @config.capsules.values.flat_map { |cap| cap.queues }.uniq,
-        "weights" => to_weights,
+        "weights" => @config.capsules.values.map(&:weights),
+        #####
         "labels" => @config[:labels].to_a,
         "identity" => identity,
         "version" => Sidekiq::VERSION,
@@ -261,10 +274,6 @@ module Sidekiq
       }
     end
 
-    def to_weights
-      @config.capsules.values.map(&:weights)
-    end
-
     def to_json
       # this data changes infrequently so dump it to a string
       # now so we don't need to dump it every heartbeat.

data/lib/sidekiq/middleware/i18n.rb

@@ -11,6 +11,7 @@ module Sidekiq::Middleware::I18n
   # to be sent to Sidekiq.
   class Client
     include Sidekiq::ClientMiddleware
+
     def call(_jobclass, job, _queue, _redis)
       job["locale"] ||= I18n.locale
       yield
@@ -20,6 +21,7 @@ module Sidekiq::Middleware::I18n
   # Pull the msg locale out and set the current thread to use it.
   class Server
     include Sidekiq::ServerMiddleware
+
     def call(_jobclass, job, _queue, &block)
       I18n.with_locale(job.fetch("locale", I18n.default_locale), &block)
     end

data/lib/sidekiq/monitor.rb

@@ -49,14 +49,10 @@ class Sidekiq::Monitor
       puts "---- Processes (#{process_set.size}) ----"
       process_set.each_with_index do |process, index|
         # Keep compatibility with legacy versions since we don't want to break sidekiqmon during rolling upgrades or downgrades.
-        #
-        # Before:
-        #   ["default", "critical"]
-        #
-        # After:
-        #   {"default" => 1, "critical" => 10}
         queues =
-          if process["weights"]
+          if process["capsules"] # 8.0.6+
+            process["capsules"].values.map { |x| x["weights"].keys.join(", ") }
+          elsif process["weights"]
             process["weights"].sort_by { |queue| queue[0] }.map { |capsule| capsule.map { |name, weight| (weight > 0) ? "#{name}: #{weight}" : name }.join(", ") }
           else
             process["queues"].sort
@@ -105,7 +101,7 @@ class Sidekiq::Monitor
           out << line
           line = " " * pad
         end
-        line << value + ", "
+        line << value + "; "
       end
       out << line[0..-3]
       out.join("\n")

data/lib/sidekiq/profiler.rb

@@ -11,6 +11,7 @@ module Sidekiq
     }
 
     include Sidekiq::Component
+
     def initialize(config)
       @config = config
       @vernier_output_dir = ENV.fetch("VERNIER_OUTPUT_DIR") { Dir.tmpdir }

data/lib/sidekiq/ring_buffer.rb

@@ -6,6 +6,7 @@ module Sidekiq
   class RingBuffer
     include Enumerable
     extend Forwardable
+
     def_delegators :@buf, :[], :each, :size
 
     def initialize(size, default = 0)

data/lib/sidekiq/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "8.0.8"
+  VERSION = "8.0.9"
   MAJOR = 8
 
   def self.gem_version

data/lib/sidekiq/web/application.rb

@@ -318,6 +318,16 @@ module Sidekiq
         redirect_with_query("#{root_path}scheduled")
       end
 
+      post "/scheduled/all/delete" do
+        Sidekiq::ScheduledSet.new.clear
+        redirect "#{root_path}scheduled"
+      end
+
+      post "/scheduled/all/add_to_queue" do
+        Sidekiq::ScheduledSet.new.each(&:add_to_queue)
+        redirect "#{root_path}scheduled"
+      end
+
       get "/dashboard/stats" do
         redirect "#{root_path}stats"
       end

data/lib/sidekiq/web/helpers.rb

@@ -256,14 +256,6 @@ module Sidekiq
       end
     end
 
-    def busy_weights(capsule_weights)
-      # backwards compat with 7.0.0, remove in 7.1
-      cw = [capsule_weights].flatten
-      cw.map { |hash|
-        hash.map { |name, weight| (weight > 0) ? +name << ": " << weight.to_s : name }.join(", ")
-      }.join("; ")
-    end
-
     def stats
       @stats ||= Sidekiq::Stats.new
     end

data/web/assets/javascripts/application.js

@@ -22,6 +22,7 @@ function addListeners() {
     node.addEventListener("click", addDataToggleListeners)
   })
 
+  initializeBulkToggle();
   addShiftClickListeners();
   updateFuzzyTimes();
   updateNumbers();
@@ -63,6 +64,21 @@ function addDataToggleListeners(event) {
   full.classList.toggle("is-open");
 }
 
+function toggleBulkButtons() {
+  const checkboxes = document.querySelectorAll('.select-item-checkbox, .check-all-items');
+  const anyChecked = Array.from(checkboxes).some(cb => cb.checked);
+  const buttons = document.querySelectorAll('.bulk-action-buttons');
+  buttons.forEach(btn => {
+    btn.style.display = anyChecked ? 'none' : 'block';
+  });
+}
+
+function initializeBulkToggle(){
+  document.querySelectorAll('.check-all-items, .select-item-checkbox').forEach(cb => {
+    cb.addEventListener('change', toggleBulkButtons);
+  });
+}
+
 function addShiftClickListeners() {
   let checkboxes = Array.from(document.querySelectorAll(".shift_clickable"));
   let lastChecked = null;

data/web/assets/stylesheets/style.css

@@ -454,6 +454,10 @@ canvas + .table_container {
   gap: 8px;
 }
 
+.bulk-action-buttons.bulk-lead-button {
+  margin-inline-start: auto;
+}
+
 table {
   background-color: var(--color-elevated);
   border: 1px solid var(--color-border);
@@ -757,3 +761,16 @@ body > footer .nav {
   padding: 20px;
   background: var(--color-success);
 }
+
+.args {
+  overflow-y: auto;
+  max-height: 50px;
+  word-break: break-word
+} 
+.args-extended {
+  overflow-y: scroll;
+  max-height: 500px;
+}
+
+.toggle { display: none; }
+.toggle.is-open { display: block; }

data/web/locales/ar.yml

@@ -3,6 +3,7 @@ ar:
   LanguageName: العربية
   Actions: إجراءات
   AddToQueue: إضافة إلى الرتل
+  AddAllToQueue: إضافة الكل إلى الرتل
   AreYouSure: هل انت متأكد؟
   AreYouSureDeleteJob: هل أنت متأكد من حذف الوظيفة؟
   AreYouSureDeleteQueue: هل أنت متأكد من حذف الرتل %{queue}؟

data/web/locales/cs.yml

@@ -3,6 +3,7 @@ cs:
   LanguageName: Čeština
   Actions: Akce
   AddToQueue: Přidat do fronty
+  AddAllToQueue: Přidat vše do fronty
   AreYouSure: Jste si jisti?
   AreYouSureDeleteJob: Jste si jisti, že chcete odstranit tento úkol?
   AreYouSureDeleteQueue: Jste si jisti, že chcete odstranit frontu %{queue}?

data/web/locales/da.yml

@@ -3,6 +3,7 @@ da:
   LanguageName: Dansk
   Actions: Handlinger
   AddToQueue: Tilføj til kø
+  AddAllToQueue: Tilføj alle til kø
   AreYouSure: Er du sikker?
   AreYouSureDeleteJob: Er du sikker på at du vil slette dette job?
   AreYouSureDeleteQueue: Er du sikker på at du vil slette %{queue} køen?

data/web/locales/de.yml

@@ -3,6 +3,7 @@ de:
   LanguageName: Deutsch
   Actions: Aktionen
   AddToQueue: In Warteschlange einreihen
+  AddAllToQueue: Alle in Warteschlange einreihen
   AreYouSure: Bist du sicher?
   AreYouSureDeleteJob: Möchtest du diesen Job wirklich löschen?
   AreYouSureDeleteQueue: Möchtest du %{queue} wirklich löschen?

data/web/locales/el.yml

@@ -26,6 +26,7 @@ el: # <---- change this to your locale code
   ShowAll: Εμφάνιση Όλων
   Enqueued: Μπήκαν στην στοίβα
   AddToQueue: Προσθήκη στην στοίβα
+  AddAllToQueue: Προσθήκη όλων στην στοίβα
   AreYouSureDeleteJob: Θέλετε να διαγράψετε αυτή την εργασία;
   AreYouSureDeleteQueue: Θέλετε να διαγράψετε την στοίβα %{queue}; Αυτό θα διαγράψει όλες τις εργασίες εντός της στοίβας, θα εμφανιστεί ξανά εάν προωθήσετε περισσότερες εργασίες σε αυτήν στο μέλλον.
   Queues: Στοίβες

data/web/locales/en.yml

@@ -3,6 +3,7 @@ en:
   LanguageName: English
   Actions: Actions
   AddToQueue: Add to queue
+  AddAllToQueue: Add All to Queue
   AreYouSure: Are you sure?
   AreYouSureDeleteJob: Are you sure you want to delete this job?
   AreYouSureDeleteQueue: Are you sure you want to delete the %{queue} queue? This will delete all jobs within the queue, it will reappear if you push more jobs to it in the future.

data/web/locales/es.yml

@@ -3,6 +3,7 @@ es:
   LanguageName: Español
   Actions: Acciones
   AddToQueue: Añadir a la cola
+  AddAllToQueue: Añadir todo a la cola
   AreYouSure: ¿Estás seguro?
   AreYouSureDeleteJob: ¿Estás seguro de eliminar este trabajo?
   AreYouSureDeleteQueue: ¿Estás seguro de eliminar la cola %{queue}?

data/web/locales/fa.yml

@@ -3,6 +3,7 @@ fa:
   LanguageName: فارسى
   Actions: اعمال
   AddToQueue: افزودن به صف
+  AddAllToQueue: افزودن همه به صف
   AreYouSure: آیا مطمعن هستید?
   AreYouSureDeleteJob: آیا شما مطمعن هستید از حذف این کار ؟
   AreYouSureDeleteQueue: ایا شما مطمعنید از حذف %{queue} ?

data/web/locales/fr.yml

@@ -3,6 +3,7 @@ fr:
   LanguageName: Français
   Actions: Actions
   AddToQueue: Ajouter à la queue
+  AddAllToQueue: Ajouter tout à la queue
   AreYouSure: Êtes-vous certain ?
   AreYouSureDeleteJob: Êtes-vous certain de vouloir supprimer cette tâche ?
   AreYouSureDeleteQueue: Êtes-vous certain de vouloir supprimer la queue %{queue} ?

data/web/locales/gd.yml

@@ -3,6 +3,7 @@ gd:
   LanguageName: Gaeilge
   Actions: Gnìomhan
   AddToQueue: Cuir ris a’ chiutha
+  AddAllToQueue: Cuir a h-uile ris a’ chiutha
   AreYouSure: A bheil thu cinnteach?
   AreYouSureDeleteJob: A bheil thu cinnteach gu bheil thu airson an obair seo a sguabadh às?
   AreYouSureDeleteQueue: A bheil thu cinnteach gu bheil thu airson ciutha %{queue} a sguabadh às? Sguabaidh seo às gach obair sa chiutha seo, nochdaidh e a-rithist nuair a phutas tu barrachd obraichean dha an uairsin.

data/web/locales/he.yml

@@ -3,6 +3,7 @@ he:
   LanguageName: עברית
   Actions: פעולות
   AddToQueue: הוסף לתור
+  AddAllToQueue: הוסף הכל לתור
   AreYouSure: אתם בטוחים?
   AreYouSureDeleteJob: האם אתם בטוחים שברצונכם למחוק את העבודה הזאת?
   AreYouSureDeleteQueue: האם אתם בטוחים שברצונכם למחוק את התור %{queue}?

data/web/locales/hi.yml

@@ -3,6 +3,7 @@ hi:
   LanguageName: हिन्दी
   Actions: कार्रवाई
   AddToQueue: कतार मे जोड़ें
+  AddAllToQueue: सभी को कतार मे जोड़ें
   AreYouSure: क्या आपको यकीन है?
   AreYouSureDeleteJob: क्या आप इस कार्य को हटाना चाहते है?
   AreYouSureDeleteQueue: क्या आप %{queue} कतार को हटाना चाहते है?

data/web/locales/it.yml

@@ -3,6 +3,7 @@ it:
   LanguageName: Italiano
   Actions: Azioni
   AddToQueue: Aggiungi alla coda
+  AddAllToQueue: Aggiungi tutto alla coda
   AreYouSure: Sei sicuro?
   AreYouSureDeleteJob: Sei sicuro di voler cancellare questo lavoro?
   AreYouSureDeleteQueue: Sei sicuro di voler cancellare la coda %{queue}?

data/web/locales/ja.yml

@@ -3,6 +3,7 @@ ja:
   LanguageName: 日本語
   Actions: アクション
   AddToQueue: キューに追加
+  AddAllToQueue: すべてをキューに追加
   AreYouSure: よろしいですか？
   AreYouSureDeleteJob: このジョブを削除しますか？
   AreYouSureDeleteQueue: この %{queue} キューを削除しますか?

data/web/locales/ko.yml

@@ -3,6 +3,7 @@ ko:
   LanguageName: 한국어
   Actions: 동작
   AddToQueue: 큐 추가
+  AddAllToQueue: 모든 것을 큐에 추가
   AreYouSure: 정말입니까?
   AreYouSureDeleteJob: 이 작업을 삭제하시겠습니까?
   AreYouSureDeleteQueue: 이 %{queue} 큐를 삭제하시겠습니까?

data/web/locales/lt.yml

@@ -3,6 +3,7 @@ lt:
   LanguageName: Lietuvių
   Actions: Veiksmai
   AddToQueue: Pridėti į eilę
+  AddAllToQueue: Pridėti viską į eilę
   AreYouSure: Ar jūs įsitikinę?
   AreYouSureDeleteJob: Ar tikrai norite pašalinti šį darbą?
   AreYouSureDeleteQueue: Ar tikrai norite pašalinti šią eilę %{queue}?

data/web/locales/nb.yml

@@ -3,6 +3,7 @@ nb:
   LanguageName: Norsk
   Actions: Handlinger
   AddToQueue: Legg til i kø
+  AddAllToQueue: Legg alt til i kø
   AreYouSure: Er du sikker?
   AreYouSureDeleteJob: Er du sikker på at du vil slette denne jobben?
   AreYouSureDeleteQueue: Er du sikker på at du vil slette køen %{queue}?

data/web/locales/nl.yml

@@ -3,6 +3,7 @@ nl:
   LanguageName: Nederlands
   Actions: Acties
   AddToQueue: Toevoegen aan wachtrij
+  AddAllToQueue: Alles toevoegen aan wachtrij
   AreYouSure: Weet u het zeker?
   AreYouSureDeleteJob: Weet u zeker dat u deze taak wilt verwijderen?
   AreYouSureDeleteQueue: Weet u zeker dat u wachtrij %{queue} wilt verwijderen?

data/web/locales/pl.yml

@@ -3,6 +3,7 @@ pl:
   LanguageName: Polski
   Actions: Akcje
   AddToQueue: dodaj do kolejki
+  AddAllToQueue: dodaj wszystko do kolejki
   AreYouSure: Na pewno?
   AreYouSureDeleteJob: Czy na pewno usunąć to zadanie?
   AreYouSureDeleteQueue: Czy na pewno usunąć kolejkę %{queue}?

data/web/locales/pt-BR.yml

@@ -2,6 +2,7 @@
   LanguageName: Português (Brasil)
   Actions: Ações
   AddToQueue: Adicionar à fila
+  AddAllToQueue: Adicionar tudo à fila
   AreYouSure: Tem certeza?
   AreYouSureDeleteJob: Deseja deletar esta tarefa?
   AreYouSureDeleteQueue: Deseja deletar a fila %{queue}? Isso irá deletar todas as tarefas desta fila.

data/web/locales/pt.yml

@@ -3,6 +3,7 @@ pt:
   LanguageName: Português
   Actions: Acções
   AddToQueue: Adicionar à fila
+  AddAllToQueue: Adicionar tudo à fila
   AreYouSure: Tem a certeza?
   AreYouSureDeleteJob: Tem a certeza que deseja eliminar esta tarefa?
   AreYouSureDeleteQueue: Tem a certeza que deseja eliminar a fila %{queue}?

data/web/locales/ru.yml

@@ -3,6 +3,7 @@ ru:
   LanguageName: Русский
   Actions: Действия
   AddToQueue: Добавить в очередь
+  AddAllToQueue: Добавить все в очередь
   AreYouSure: Вы уверены?
   AreYouSureDeleteJob: Вы уверены, что хотите удалить эту задачу?
   AreYouSureDeleteQueue: Вы уверены, что хотите удалить очередь %{queue}?

data/web/locales/sv.yml

@@ -3,6 +3,7 @@ sv:
   LanguageName: Svenska
   Actions: Åtgärder
   AddToQueue: Lägg till i kö
+  AddAllToQueue: Lägg till allt i kö
   AreYouSure: Är du säker?
   AreYouSureDeleteJob: Är du säker på att du vill ta bort detta jobb?
   AreYouSureDeleteQueue: Är du säker på att du vill ta bort kön %{queue}?

data/web/locales/ta.yml

@@ -3,6 +3,7 @@ ta:
   LanguageName: தமிழ்
   Actions: செயல்கள்
   AddToQueue: வரிசையில் சேர்
+  AddAllToQueue: அனைத்தையும் வரிசையில் சேர்
   AreYouSure: நீங்கள் உறுதியாக இருக்கிறீர்களா?
   AreYouSureDeleteJob: நீ இந்த வேலையை நீக்க வேண்டும் என்று உறுதியாக இருக்கிறீர்களா?
   AreYouSureDeleteQueue: நீங்கள் %{queue} வரிசையில் நீக்க வேண்டும் என்பதில் உறுதியாக இருக்கிறீர்களா?

data/web/locales/tr.yml

@@ -3,6 +3,7 @@ tr:
   LanguageName: Türkçe
   Actions: Eylemler
   AddToQueue: Kuyruğa ekle
+  AddAllToQueue: Hepsini kuyruğa ekle
   AreYouSure: Emin misiniz?
   AreYouSureDeleteJob: Bu işi silmek istediğinizden emin misiniz?
   AreYouSureDeleteQueue: "%{queue} kuyruğunu silmek istediğinizden emin misiniz?"

data/web/locales/uk.yml

@@ -3,6 +3,7 @@ uk:
   LanguageName: Українська
   Actions: Дії
   AddToQueue: Додати до черги
+  AddAllToQueue: Додати все до черги
   AreYouSure: Ви впевнені?
   AreYouSureDeleteJob: Ви впевнені у тому, що хочете видалити задачу?
   AreYouSureDeleteQueue: Ви впевнені у тому, що хочете видалити чергу %{queue}?

data/web/locales/ur.yml

@@ -3,6 +3,7 @@ ur:
   LanguageName: اردو
   Actions: ﻋﻮاﻣﻞ
   AddToQueue: ﻗﻄﺎﺭ ميں شامل کريں
+  AddAllToQueue: سب کو ﻗﻄﺎﺭ ميں شامل کريں
   AreYouSure: کيا یقین ؟
   AreYouSureDeleteJob: کيا آپ یقین جاب حتم کرنا چاھتے ہيں ؟
   AreYouSureDeleteQueue: کيا آپ یقین قطار حتم کرنا چاھتے ہيں ؟

data/web/locales/vi.yml

@@ -3,6 +3,7 @@ vi:
   LanguageName: Tiếng Việt
   Actions: Những hành động
   AddToQueue: Thêm vào hàng đợi
+  AddAllToQueue: Thêm tất cả vào hàng đợi
   AreYouSure: Bạn chắc chứ?
   AreYouSureDeleteJob: Bạn có chắc là muốn xóa tác vụ này?
   AreYouSureDeleteQueue: Bạn có chắc là muốn xóa %{queue} này?

data/web/locales/zh-CN.yml

@@ -3,6 +3,7 @@ zh-CN: # <---- change this to your locale code
   LanguageName: 中文
   Actions: 操作
   AddToQueue: 添加至队列
+  AddAllToQueue: 添加所有至队列
   AreYouSure: 你确定？
   AreYouSureDeleteJob: 你确定要删除这个任务么？
   AreYouSureDeleteQueue: 你确定要删除 %{queue} 队列吗？这将删除当前队列中的所有任务，当新的任务添加到该队列时，它会重新出现。

data/web/locales/zh-TW.yml

@@ -27,6 +27,7 @@ zh-TW: # <---- change this to your locale code
   CurrentMessagesInQueue: 目前在<span class='title'>%{queue}</span>的工作
   Delete: 刪除
   AddToQueue: 增加至佇列
+  AddAllToQueue: 增加所有至佇列
   AreYouSureDeleteJob: 確定要刪除這個工作嗎？
   AreYouSureDeleteQueue: 確定要刪除%{queue}佇列？這會刪除佇列裡的所有工作，佇列將會在有新工作時重新出現。
   Queues: 佇列

data/web/views/_footer.erb

@@ -11,7 +11,7 @@
         <p id="serverUtcTime"><%= server_utc_time %></p>
       </li>
       <li>
-        <p><a rel=help href="https://github.com/sidekiq/sidekiq/wiki">docs</a></p>
+        <p><a rel="help" href="https://github.com/sidekiq/sidekiq/wiki">docs</a></p>
       </li>
       <li>
         <form id="locale-form" action="<%= root_path %>change_locale" method="post">

data/web/views/_metrics_period_select.erb

@@ -1,7 +1,7 @@
 <div class="filter">
   <form id="metrics-form" class="form-inline" action="<%= path %>" method="get">
     <label for="substr"><%= t('Filter') %></label>
-    <input id="class-filter" class="form-control" type="text" name="substr" placeholder="<%= t('Name') %>" value="<%= h url_params("substr") %>">
+    <input id="class-filter" class="form-control" type="text" name="substr" placeholder="<%= t('Name') %>" value="<%= h url_params("substr") %>" autocomplete="off">
     <select id="period-selector" class="form-control" name="period">
       <% periods.each_key do |code| %>
         <% if code == period %>

data/web/views/_paging.erb

@@ -24,4 +24,3 @@
     </ul>
   </div>
 <% end %>
-

data/web/views/_poll_link.erb

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

data/web/views/busy.erb

@@ -33,8 +33,8 @@
     <form method="POST" class="filter warning-messages">
       <%= csrf_tag %>
       <div class="btn-group pull-right flip">
-        <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') %>"/>
+        <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>
   </header>
@@ -69,11 +69,7 @@
             <% end %>
             <br>
             <b><%= "#{t('Queues')}: " %></b>
-            <% if process.weights %>
-              <%= busy_weights(process.weights) %>
-            <% else %>
-              <%= process.queues.sort.join(", ") %>
-            <% end %>
+            <%= process.queues.sort.join(", ") %>
             <% if process.version != Sidekiq::VERSION %>
               <br>
               <b><%= "#{t('Version')}: " %></b>
@@ -92,7 +88,7 @@
             <% unless process.embedded? %>
               <form method="POST">
                 <%= csrf_tag %>
-                <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
+                <input type="hidden" name="identity" value="<%= process['identity'] %>">
 
                 <div class="btn-group">
                   <% unless process.stopping? %><button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>

data/web/views/dashboard.erb

@@ -9,13 +9,13 @@
     <div class="filter interval-slider">
       <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
       <span id="sldr-text" class="current-interval">5 s</span>
-      <br/>
-      <input id="sldr" aria-label="<%= t("PollingIntervalMilliseconds") %>" role="slider" type="range" min="2000" max="20000" step="1000" value="5000"/>
+      <br>
+      <input id="sldr" aria-label="<%= t("PollingIntervalMilliseconds") %>" role="slider" type="range" min="2000" max="20000" step="1000" value="5000" autocomplete="off">
     </div>
   </header>
 
   <div class="chart">
-    <span id="sr-last-dashboard-update-template" hidden="hidden"><%= t("LastDashboardUpdateTemplateLiteral") %></span>
+    <span id="sr-last-dashboard-update-template" hidden><%= t("LastDashboardUpdateTemplateLiteral") %></span>
     <span id="sr-last-dashboard-update" class="sr-only" role="status"></span>
 
     <canvas id="realtime-chart">

data/web/views/dead.erb

@@ -32,7 +32,7 @@
   <form action="<%= root_path %>morgue/<%= job_params(@dead, @dead.score) %>" method="post">
     <%= csrf_tag %>
     <a class="btn btn-default" href="<%= root_path %>morgue"><%= t('GoBack') %></a>
-    <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>">
+    <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>">
   </form>
-</section>
+</section>

data/web/views/filtering.erb

@@ -1,6 +1,6 @@
 <div class="filter">
-  <form role="search" method="get" class="form-inline" action='<%= root_path %><%= which %>'>
+  <form role="search" method="get" class="form-inline" action="<%= root_path %><%= which %>">
     <label for="substr"><%= t('Filter') %></label>
-    <input class="form-control" type="search" name="substr" value="<%= h url_params("substr") %>" placeholder="<%= t('AnyJobContent') %>"/>
+    <input class="form-control" type="search" name="substr" value="<%= h url_params("substr") %>" placeholder="<%= t('AnyJobContent') %>" autocomplete="off">
   </form>
 </div>

data/web/views/layout.erb

@@ -2,14 +2,14 @@
 <html dir="<%= text_direction %>" lang="<%= locale %>">
   <head>
     <title><%= environment_title_prefix %><%= Sidekiq::NAME %></title>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
-    <meta name="color-scheme" content="light dark"/>
-    <link href="<%= root_path %>stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>"/>
-    <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"/>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="color-scheme" content="light dark">
+    <link href="<%= root_path %>stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>">
+    <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" nonce="<%= csp_nonce %>"></script>
-    <meta name="google" content="notranslate"/>
+    <meta name="google" content="notranslate">
     <%= display_custom_head %>
   </head>
   <body class="admin" data-locale="<%= locale %>">

data/web/views/metrics.erb

@@ -59,7 +59,7 @@
                     class="metrics-swatch"
                     value="<%= kls %>"
                     <%= visible_kls.include?(kls) ? 'checked' : '' %>
-                  />
+                  >
                   <code><a href="<%= root_path %>metrics/<%= kls %>?period=<%= @period %>"><%= kls %></a></code>
                 </div>
               </td>
@@ -70,15 +70,15 @@
             </tr>
           <% end %>
         <% else %>
-            <tr><td colspan=5><%= t("NoDataFound") %></td></tr>
+          <tr><td colspan="5"><%= t("NoDataFound") %></td></tr>
         <% end %>
       </tbody>
     </table>
   </div>
 
-<% if job_results.any? %>
-  <p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %>.<% if @period == "1h" %> Auto-refreshing every 60 seconds.<% end %></small></p>
-<% end %>
-
+  <% if job_results.any? %>
+    <p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %>.<% if @period == "1h" %> Auto-refreshing every 60 seconds.<% end %></small></p>
+  <% end %>
 </section>
-<%= script_tag "javascripts/metrics.js" %>
+
+<%= script_tag "javascripts/metrics.js" %>

data/web/views/morgue.erb

@@ -16,7 +16,7 @@
             <tr>
               <th>
                 <label>
-                  <input type="checkbox" class="check_all" />
+                  <input type="checkbox" class="check_all check-all-items">
                 </label>
               </th>
               <th><%= t('LastRetry') %></th>
@@ -30,7 +30,7 @@
             <tr>
               <td>
                 <label>
-                  <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
+                  <input type="checkbox" name="key[]" value="<%= job_params(entry.item, entry.score) %>" class="shift_clickable select-item-checkbox">
                 </label>
               </td>
               <td>
@@ -55,8 +55,12 @@
           <% end %>
         </table>
       </div>
-      <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') %>" />
+      <div class="buttons-row">
+        <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') %>">
+        <button class="btn btn-primary bulk-action-buttons bulk-lead-button" type="submit" name="action" value="retry_all" formaction="<%= "#{root_path}morgue/all/retry" %>"><%= t('RetryAll') %></button>
+        <button class="btn btn-danger bulk-action-buttons" type="submit" name="action" value="delete_all" formaction="<%= "#{root_path}morgue/all/delete" %>"><%= t('DeleteAll') %></button>
+      </div>
     </form>
 
   <% else %>

data/web/views/queue.erb

@@ -45,8 +45,8 @@
           <td>
             <form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
               <%= csrf_tag %>
-              <input name="key_val" value="<%= h job.value %>" type="hidden" />
-              <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
+              <input name="key_val" value="<%= h job.value %>" type="hidden">
+              <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>">
             </form>
           </td>
         </tr>

data/web/views/queues.erb

@@ -26,15 +26,15 @@
             <%= number_with_delimiter(queue_latency, precision: 2) %>
           </td>
           <td class="delete-confirm">
-            <form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
+            <form action="<%= root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
               <%= csrf_tag %>
-              <input class="btn btn-danger" type="submit" name="delete" title="This will delete all jobs within the queue, it will reappear if you push more jobs to it in the future." value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
+              <input class="btn btn-danger" type="submit" name="delete" title="This will delete all jobs within the queue, it will reappear if you push more jobs to it in the future." value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>">
 
               <% if Sidekiq.pro? %>
                 <% if queue.paused? %>
-                  <input class="btn btn-danger" 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" 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

@@ -16,7 +16,7 @@
             <tr>
               <th>
                 <label>
-                  <input type="checkbox" class="check_all" />
+                  <input type="checkbox" class="check_all check-all-items">
                 </label>
               </th>
               <th><%= t('NextRetry') %></th>
@@ -31,7 +31,7 @@
             <tr>
               <td>
                 <label>
-                  <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
+                  <input type="checkbox" name="key[]" value="<%= job_params(entry.item, entry.score) %>" class="shift_clickable select-item-checkbox">
                 </label>
               </td>
               <td>
@@ -58,9 +58,13 @@
         </table>
       </div>
       <div class="buttons-row">
-        <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-        <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
-        <input class="btn btn-danger" type="submit" name="kill" value="<%= t('Kill') %>" />
+        <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>">
+        <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>">
+        <input class="btn btn-danger" type="submit" name="kill" value="<%= t('Kill') %>">
+        <!-- Retry all -->
+        <button class="btn btn-primary bulk-action-buttons bulk-lead-button" type="submit" name="action" value="retry_all" formaction="<%= "#{root_path}retries/all/retry" %>"><%= t('RetryAll') %></button>
+        <button class="btn btn-danger bulk-action-buttons" type="submit" name="action" value="delete_all" formaction="<%= "#{root_path}retries/all/delete" %>"><%= t('DeleteAll') %></button>
+        <button class="btn btn-danger bulk-action-buttons" type="submit" name="action" value="kill_all" formaction="<%= "#{root_path}retries/all/kill" %>"><%= t('KillAll') %></button>
       </div>
     </form>
     

data/web/views/retry.erb

@@ -33,7 +33,7 @@
   <form action="<%= root_path %>retries/<%= job_params(@retry, @retry.score) %>" method="post">
     <%= csrf_tag %>
     <a class="btn btn-default" href="<%= root_path %>retries"><%= t('GoBack') %></a>
-    <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>">
+    <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>">
   </form>
 </section>

data/web/views/scheduled.erb

@@ -16,7 +16,7 @@
             <tr>
               <th>
                 <label>
-                  <input type="checkbox" class="check_all" />
+                  <input type="checkbox" class="check_all check-all-items">
                 </label>
               </th>
               <th><%= t('When') %></th>
@@ -29,7 +29,7 @@
             <tr>
               <td>
                 <label>
-                  <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
+                  <input type="checkbox" name="key[]" value="<%= job_params(entry.item, entry.score) %>" class="shift_clickable select-item-checkbox">
                 </label>
               </td>
               <td>
@@ -51,8 +51,12 @@
           <% end %>
         </table>
       </div>
-      <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
-      <input class="btn btn-danger" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
+      <div class="buttons-row">
+        <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>">
+        <input class="btn btn-danger" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>">
+        <button class="btn btn-danger bulk-action-buttons bulk-lead-button" type="submit" name="action" value="delete_all" formaction="<%= "#{root_path}scheduled/all/delete" %>"><%= t('DeleteAll') %></button>
+        <button class="btn btn-danger bulk-action-buttons" type="submit" name="action" value="add_all_to_queue" formaction="<%= "#{root_path}scheduled/all/add_to_queue" %>"><%= t('AddAllToQueue') %></button>
+      </div>
     </form>
   <% else %>
     <div class="alert alert-success"><%= t('NoScheduledFound') %></div>

data/web/views/scheduled_job_info.erb

@@ -3,6 +3,6 @@
 <form action="<%= root_path %>scheduled/<%= job_params(@job, @job.score) %>" method="post">
   <%= csrf_tag %>
   <a class="btn btn-default" href="<%= root_path %>scheduled"><%= t('GoBack') %></a>
-  <input class="btn btn-primary" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
-  <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
+  <input class="btn btn-primary" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>">
+  <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>">
 </form>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 8.0.8
+  version: 8.0.9
 platform: ruby
 authors:
 - Mike Perham