sidekiq 7.1.2 → 7.2.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of sidekiq might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Changes.md +69 -0
- data/README.md +2 -2
- data/lib/sidekiq/api.rb +3 -3
- data/lib/sidekiq/client.rb +6 -3
- data/lib/sidekiq/config.rb +13 -4
- data/lib/sidekiq/deploy.rb +1 -1
- data/lib/sidekiq/job_retry.rb +19 -3
- data/lib/sidekiq/job_util.rb +2 -0
- data/lib/sidekiq/metrics/query.rb +3 -1
- data/lib/sidekiq/metrics/shared.rb +1 -1
- data/lib/sidekiq/paginator.rb +2 -2
- data/lib/sidekiq/processor.rb +27 -26
- data/lib/sidekiq/rails.rb +10 -15
- data/lib/sidekiq/redis_client_adapter.rb +17 -2
- data/lib/sidekiq/redis_connection.rb +1 -0
- data/lib/sidekiq/scheduled.rb +1 -1
- data/lib/sidekiq/testing.rb +25 -6
- data/lib/sidekiq/version.rb +1 -1
- data/lib/sidekiq/web/action.rb +3 -3
- data/lib/sidekiq/web/application.rb +72 -6
- data/lib/sidekiq/web/csrf_protection.rb +1 -1
- data/lib/sidekiq/web/helpers.rb +31 -23
- data/lib/sidekiq/web.rb +13 -1
- data/web/assets/javascripts/application.js +16 -0
- data/web/assets/javascripts/dashboard-charts.js +17 -1
- data/web/assets/javascripts/dashboard.js +7 -9
- data/web/assets/javascripts/metrics.js +34 -0
- data/web/assets/stylesheets/application.css +9 -0
- data/web/locales/en.yml +2 -0
- data/web/locales/pt-br.yml +20 -0
- data/web/views/_job_info.erb +1 -1
- data/web/views/_metrics_period_select.erb +1 -1
- data/web/views/_summary.erb +7 -7
- data/web/views/busy.erb +3 -3
- data/web/views/dashboard.erb +23 -33
- data/web/views/filtering.erb +7 -0
- data/web/views/metrics.erb +36 -27
- data/web/views/metrics_for_job.erb +26 -35
- data/web/views/queues.erb +6 -2
- metadata +4 -3
data/web/views/metrics.erb
CHANGED
@@ -1,16 +1,29 @@
|
|
1
1
|
<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
|
2
2
|
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
|
3
3
|
<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
|
4
|
-
<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
|
5
4
|
|
6
5
|
<div class="header-container">
|
7
6
|
<div class="page-title-container">
|
8
7
|
<h1><%= t('Metrics') %></h1>
|
9
|
-
|
10
8
|
<a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
|
11
9
|
</div>
|
12
10
|
|
13
|
-
|
11
|
+
<div>
|
12
|
+
<form id="metrics-form" class="form-inline" action="<%= root_path %>filter/metrics" method="post">
|
13
|
+
<%= csrf_tag %>
|
14
|
+
<label for="substr"><%= t('Filter') %></label>
|
15
|
+
<input id="class-filter" class="form-control" type="text" name="substr" placeholder="<%= t('Name') %>" value="<%= params[:substr] %>">
|
16
|
+
<select id="period-selector" class="form-control" name="period">
|
17
|
+
<% @periods.each_key do |code| %>
|
18
|
+
<% if code == @period %>
|
19
|
+
<option selected value="<%= code %>"><%= code %></option>
|
20
|
+
<% else %>
|
21
|
+
<option value="<%= code %>"><%= code %></option>
|
22
|
+
<% end %>
|
23
|
+
<% end %>
|
24
|
+
</select>
|
25
|
+
</form>
|
26
|
+
</div>
|
14
27
|
</div>
|
15
28
|
|
16
29
|
<%
|
@@ -21,22 +34,17 @@
|
|
21
34
|
%>
|
22
35
|
|
23
36
|
<% if job_results.any? %>
|
24
|
-
<canvas id="job-metrics-overview-chart"
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
units: t('Seconds').downcase,
|
36
|
-
markLabel: t('Deploy'),
|
37
|
-
}) %>
|
38
|
-
)
|
39
|
-
</script>
|
37
|
+
<canvas id="job-metrics-overview-chart">
|
38
|
+
<%= to_json({
|
39
|
+
series: job_results.map { |(kls, jr)| [kls, jr.dig("series", "s")] }.to_h,
|
40
|
+
marks: @query_result.marks.map { |m| [m.bucket, m.label] },
|
41
|
+
labels: @query_result.buckets,
|
42
|
+
visibleKls: visible_kls,
|
43
|
+
yLabel: t('TotalExecutionTime'),
|
44
|
+
units: t('Seconds').downcase,
|
45
|
+
markLabel: t('Deploy'),
|
46
|
+
}) %>
|
47
|
+
</canvas>
|
40
48
|
<% end %>
|
41
49
|
|
42
50
|
<div class="table_container">
|
@@ -46,8 +54,8 @@
|
|
46
54
|
<th><%= t('Name') %></th>
|
47
55
|
<th><%= t('Success') %></th>
|
48
56
|
<th><%= t('Failure') %></th>
|
49
|
-
<th><%= t('TotalExecutionTime')
|
50
|
-
<th><%= t('AvgExecutionTime')
|
57
|
+
<th><%= t('TotalExecutionTime') %> (Seconds)</th>
|
58
|
+
<th><%= t('AvgExecutionTime') %> (Seconds)</th>
|
51
59
|
</tr>
|
52
60
|
<% if job_results.any? %>
|
53
61
|
<% job_results.each_with_index do |(kls, jr), i| %>
|
@@ -64,12 +72,11 @@
|
|
64
72
|
/>
|
65
73
|
<code><a href="<%= root_path %>metrics/<%= kls %>?period=<%= @period %>"><%= kls %></a></code>
|
66
74
|
</div>
|
67
|
-
<script>jobMetricsChart.registerSwatch("<%= id %>")</script>
|
68
75
|
</td>
|
69
|
-
<td><%= jr.dig("totals", "p") - jr.dig("totals", "f") %></td>
|
70
|
-
<td><%= jr.dig("totals", "f") %></td>
|
71
|
-
<td><%= jr.dig("totals", "s")
|
72
|
-
<td><%= jr.total_avg("s")
|
76
|
+
<td class="num"><%= number_with_delimiter(jr.dig("totals", "p") - jr.dig("totals", "f")) %></td>
|
77
|
+
<td class="num"><%= number_with_delimiter(jr.dig("totals", "f")) %></td>
|
78
|
+
<td class="num"><%= number_with_delimiter(jr.dig("totals", "s"), precision: 2) %></td>
|
79
|
+
<td class="num"><%= number_with_delimiter(jr.total_avg("s"), precision: 2) %></td>
|
73
80
|
</tr>
|
74
81
|
<% end %>
|
75
82
|
<% else %>
|
@@ -79,4 +86,6 @@
|
|
79
86
|
</table>
|
80
87
|
</div>
|
81
88
|
|
82
|
-
|
89
|
+
<!--p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p-->
|
90
|
+
|
91
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
|
@@ -1,7 +1,6 @@
|
|
1
1
|
<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
|
2
2
|
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
|
3
3
|
<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
|
4
|
-
<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
|
5
4
|
|
6
5
|
<%
|
7
6
|
job_result = @query_result.job_results[@name]
|
@@ -24,40 +23,30 @@
|
|
24
23
|
<%= erb :_metrics_period_select, locals: { periods: @periods, period: @period, path: "#{root_path}metrics/#{@name}" } %>
|
25
24
|
</div>
|
26
25
|
|
27
|
-
<canvas id="hist-totals-chart"
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
histIntervals: bucket_intervals,
|
52
|
-
yLabel: t('ExecutionTime'),
|
53
|
-
markLabel: t('Deploy'),
|
54
|
-
yUnits: t('Seconds').downcase,
|
55
|
-
zUnits: t('Jobs').downcase,
|
56
|
-
}) %>
|
57
|
-
)
|
58
|
-
</script>
|
59
|
-
|
60
|
-
<p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p>
|
26
|
+
<canvas id="hist-totals-chart">
|
27
|
+
<%= to_json({
|
28
|
+
series: hist_totals,
|
29
|
+
labels: bucket_labels,
|
30
|
+
xLabel: t('ExecutionTime'),
|
31
|
+
yLabel: t('Jobs'),
|
32
|
+
units: t('Jobs').downcase,
|
33
|
+
}) %>
|
34
|
+
</canvas>
|
35
|
+
|
36
|
+
<canvas id="hist-bubble-chart">
|
37
|
+
<%= to_json({
|
38
|
+
hist: job_result.hist,
|
39
|
+
marks: @query_result.marks.map { |m| [m.bucket, m.label] },
|
40
|
+
labels: @query_result.buckets,
|
41
|
+
histIntervals: bucket_intervals,
|
42
|
+
yLabel: t('ExecutionTime'),
|
43
|
+
markLabel: t('Deploy'),
|
44
|
+
yUnits: t('Seconds').downcase,
|
45
|
+
zUnits: t('Jobs').downcase,
|
46
|
+
}) %>
|
47
|
+
</canvas>
|
48
|
+
|
49
|
+
<!--p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p-->
|
61
50
|
<% else %>
|
62
51
|
<h1>
|
63
52
|
<a href="<%= root_path %>/metrics"><%= t('Metrics') %></a> /
|
@@ -66,3 +55,5 @@
|
|
66
55
|
|
67
56
|
<div class="alert alert-success"><%= t('NoJobMetricsFound') %></div>
|
68
57
|
<% end %>
|
58
|
+
|
59
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
|
data/web/views/queues.erb
CHANGED
@@ -18,8 +18,12 @@
|
|
18
18
|
<span class="label label-danger"><%= t('Paused') %></span>
|
19
19
|
<% end %>
|
20
20
|
</td>
|
21
|
-
<td><%= number_with_delimiter(queue.size) %> </td>
|
22
|
-
<td
|
21
|
+
<td class="num"><%= number_with_delimiter(queue.size) %> </td>
|
22
|
+
<td class="num">
|
23
|
+
<% queue_latency = queue.latency %>
|
24
|
+
<%= (queue_latency < 60) ? '' : " (#{relative_time(Time.at(Time.now.to_f - queue_latency))})" %>
|
25
|
+
<%= number_with_delimiter(queue_latency, precision: 2) %>
|
26
|
+
</td>
|
23
27
|
<td class="delete-confirm">
|
24
28
|
<form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
|
25
29
|
<%= csrf_tag %>
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sidekiq
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 7.
|
4
|
+
version: 7.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mike Perham
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-10-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: redis-client
|
@@ -187,6 +187,7 @@ files:
|
|
187
187
|
- web/views/busy.erb
|
188
188
|
- web/views/dashboard.erb
|
189
189
|
- web/views/dead.erb
|
190
|
+
- web/views/filtering.erb
|
190
191
|
- web/views/layout.erb
|
191
192
|
- web/views/metrics.erb
|
192
193
|
- web/views/metrics_for_job.erb
|
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
222
223
|
- !ruby/object:Gem::Version
|
223
224
|
version: '0'
|
224
225
|
requirements: []
|
225
|
-
rubygems_version: 3.4.
|
226
|
+
rubygems_version: 3.4.20
|
226
227
|
signing_key:
|
227
228
|
specification_version: 4
|
228
229
|
summary: Simple, efficient background processing for Ruby
|