sidekiq 8.0.0.beta1 → 8.0.0

data/web/views/metrics.erb

@@ -1,6 +1,7 @@
-<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_tag "javascripts/chart.min.js" %>
+<%= script_tag "javascripts/chartjs-plugin-annotation.min.js" %>
+<%= script_tag "javascripts/chartjs-adapter-date-fns.min.js" %>
+<%= script_tag "javascripts/base-charts.js" %>
 
 <section>
   <header>
@@ -8,22 +9,8 @@
       <%= t('Metrics') %>
       <a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
     </h1>
-      
-    <div class="filter">
-      <form id="metrics-form" class="form-inline" action="<%= root_path %>metrics" 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") %>">
-        <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>
+
+    <%= erb :_metrics_period_select, locals: { periods: @periods, period: @period, path: "#{root_path}metrics" } %>
   </header>
 
   <%
@@ -38,7 +25,8 @@
       <%= 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,
+        starts_at: @query_result.starts_at.iso8601,
+        ends_at: @query_result.ends_at.iso8601,
         visibleKls: visible_kls,
         yLabel: t('TotalExecutionTime'),
         units: t('Seconds').downcase,
@@ -88,6 +76,9 @@
     </table>
   </div>
 
-  <!--p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p-->
+<% 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 type="text/javascript" src="<%= root_path %>javascripts/metrics.js" nonce="<%= csp_nonce %>"></script>
+<%= script_tag "javascripts/metrics.js" %>

data/web/views/metrics_for_job.erb

@@ -1,6 +1,7 @@
-<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_tag "javascripts/chart.min.js" %>
+<%= script_tag "javascripts/chartjs-plugin-annotation.min.js" %>
+<%= script_tag "javascripts/chartjs-adapter-date-fns.min.js" %>
+<%= script_tag "javascripts/base-charts.js" %>
 
 <%
   job_result = @query_result.job_results[@name]
@@ -33,7 +34,8 @@
       <%= to_json({
         hist: job_result.hist,
         marks: @query_result.marks.map { |m| [m.bucket, m.label] },
-        labels: @query_result.buckets,
+        starts_at: @query_result.starts_at.iso8601,
+        ends_at: @query_result.ends_at.iso8601,
         histIntervals: bucket_intervals,
         yLabel: t('ExecutionTime'),
         markLabel: t('Deploy'),
@@ -53,4 +55,4 @@
     <div class="alert alert-success"><%= t('NoJobMetricsFound') %></div>
   <% end %>
 </section>
-<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js" nonce="<%= csp_nonce %>"></script>
+<%= script_tag "javascripts/metrics.js" %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 8.0.0.beta1
+  version: 8.0.0
 platform: ruby
 authors:
 - Mike Perham
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -71,28 +71,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
 description: Simple, efficient background processing for Ruby.
 email:
 - info@contribsys.com
@@ -176,6 +162,7 @@ files:
 - web/assets/javascripts/application.js
 - web/assets/javascripts/base-charts.js
 - web/assets/javascripts/chart.min.js
+- web/assets/javascripts/chartjs-adapter-date-fns.min.js
 - web/assets/javascripts/chartjs-plugin-annotation.min.js
 - web/assets/javascripts/dashboard-charts.js
 - web/assets/javascripts/dashboard.js