sidekiq 5.2.4 → 7.2.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Changes.md +672 -8
- data/LICENSE.txt +9 -0
- data/README.md +48 -51
- data/bin/multi_queue_bench +271 -0
- data/bin/sidekiq +22 -3
- data/bin/sidekiqload +213 -115
- data/bin/sidekiqmon +11 -0
- data/lib/generators/sidekiq/job_generator.rb +57 -0
- data/lib/generators/sidekiq/templates/{worker.rb.erb → job.rb.erb} +2 -2
- data/lib/generators/sidekiq/templates/{worker_spec.rb.erb → job_spec.rb.erb} +1 -1
- data/lib/generators/sidekiq/templates/{worker_test.rb.erb → job_test.rb.erb} +1 -1
- data/lib/sidekiq/api.rb +623 -352
- data/lib/sidekiq/capsule.rb +127 -0
- data/lib/sidekiq/cli.rb +214 -229
- data/lib/sidekiq/client.rb +127 -102
- data/lib/sidekiq/component.rb +68 -0
- data/lib/sidekiq/config.rb +287 -0
- data/lib/sidekiq/deploy.rb +62 -0
- data/lib/sidekiq/embedded.rb +61 -0
- data/lib/sidekiq/fetch.rb +49 -42
- data/lib/sidekiq/job.rb +374 -0
- data/lib/sidekiq/job_logger.rb +33 -7
- data/lib/sidekiq/job_retry.rb +157 -108
- data/lib/sidekiq/job_util.rb +107 -0
- data/lib/sidekiq/launcher.rb +206 -106
- data/lib/sidekiq/logger.rb +131 -0
- data/lib/sidekiq/manager.rb +43 -46
- data/lib/sidekiq/metrics/query.rb +156 -0
- data/lib/sidekiq/metrics/shared.rb +95 -0
- data/lib/sidekiq/metrics/tracking.rb +140 -0
- data/lib/sidekiq/middleware/chain.rb +113 -56
- data/lib/sidekiq/middleware/current_attributes.rb +95 -0
- data/lib/sidekiq/middleware/i18n.rb +7 -7
- data/lib/sidekiq/middleware/modules.rb +21 -0
- data/lib/sidekiq/monitor.rb +146 -0
- data/lib/sidekiq/paginator.rb +28 -16
- data/lib/sidekiq/processor.rb +126 -117
- data/lib/sidekiq/rails.rb +52 -38
- data/lib/sidekiq/redis_client_adapter.rb +111 -0
- data/lib/sidekiq/redis_connection.rb +41 -112
- data/lib/sidekiq/ring_buffer.rb +29 -0
- data/lib/sidekiq/scheduled.rb +112 -50
- data/lib/sidekiq/sd_notify.rb +149 -0
- data/lib/sidekiq/systemd.rb +24 -0
- data/lib/sidekiq/testing/inline.rb +6 -5
- data/lib/sidekiq/testing.rb +91 -90
- data/lib/sidekiq/transaction_aware_client.rb +51 -0
- data/lib/sidekiq/version.rb +3 -1
- data/lib/sidekiq/web/action.rb +20 -11
- data/lib/sidekiq/web/application.rb +202 -80
- data/lib/sidekiq/web/csrf_protection.rb +183 -0
- data/lib/sidekiq/web/helpers.rb +165 -114
- data/lib/sidekiq/web/router.rb +23 -19
- data/lib/sidekiq/web.rb +68 -107
- data/lib/sidekiq/worker_compatibility_alias.rb +13 -0
- data/lib/sidekiq.rb +92 -182
- data/sidekiq.gemspec +25 -16
- data/web/assets/images/apple-touch-icon.png +0 -0
- data/web/assets/javascripts/application.js +152 -61
- data/web/assets/javascripts/base-charts.js +106 -0
- data/web/assets/javascripts/chart.min.js +13 -0
- data/web/assets/javascripts/chartjs-plugin-annotation.min.js +7 -0
- data/web/assets/javascripts/dashboard-charts.js +182 -0
- data/web/assets/javascripts/dashboard.js +35 -293
- data/web/assets/javascripts/metrics.js +298 -0
- data/web/assets/stylesheets/application-dark.css +147 -0
- data/web/assets/stylesheets/application-rtl.css +10 -93
- data/web/assets/stylesheets/application.css +124 -522
- data/web/assets/stylesheets/bootstrap.css +1 -1
- data/web/locales/ar.yml +71 -65
- data/web/locales/cs.yml +62 -62
- data/web/locales/da.yml +60 -53
- data/web/locales/de.yml +65 -53
- data/web/locales/el.yml +43 -24
- data/web/locales/en.yml +86 -66
- data/web/locales/es.yml +70 -54
- data/web/locales/fa.yml +65 -65
- data/web/locales/fr.yml +83 -62
- data/web/locales/gd.yml +99 -0
- data/web/locales/he.yml +65 -64
- data/web/locales/hi.yml +59 -59
- data/web/locales/it.yml +53 -53
- data/web/locales/ja.yml +75 -64
- data/web/locales/ko.yml +52 -52
- data/web/locales/lt.yml +83 -0
- data/web/locales/nb.yml +61 -61
- data/web/locales/nl.yml +52 -52
- data/web/locales/pl.yml +45 -45
- data/web/locales/pt-br.yml +83 -55
- data/web/locales/pt.yml +51 -51
- data/web/locales/ru.yml +68 -63
- data/web/locales/sv.yml +53 -53
- data/web/locales/ta.yml +60 -60
- data/web/locales/uk.yml +62 -61
- data/web/locales/ur.yml +64 -64
- data/web/locales/vi.yml +83 -0
- data/web/locales/zh-cn.yml +43 -16
- data/web/locales/zh-tw.yml +42 -8
- data/web/views/_footer.erb +18 -3
- data/web/views/_job_info.erb +21 -4
- data/web/views/_metrics_period_select.erb +12 -0
- data/web/views/_nav.erb +1 -1
- data/web/views/_paging.erb +2 -0
- data/web/views/_poll_link.erb +3 -6
- data/web/views/_summary.erb +7 -7
- data/web/views/busy.erb +79 -29
- data/web/views/dashboard.erb +48 -18
- data/web/views/dead.erb +3 -3
- data/web/views/filtering.erb +7 -0
- data/web/views/layout.erb +3 -1
- data/web/views/metrics.erb +91 -0
- data/web/views/metrics_for_job.erb +59 -0
- data/web/views/morgue.erb +14 -15
- data/web/views/queue.erb +33 -24
- data/web/views/queues.erb +19 -5
- data/web/views/retries.erb +16 -17
- data/web/views/retry.erb +3 -3
- data/web/views/scheduled.erb +17 -15
- metadata +71 -72
- data/.github/contributing.md +0 -32
- data/.github/issue_template.md +0 -11
- data/.gitignore +0 -15
- data/.travis.yml +0 -17
- data/3.0-Upgrade.md +0 -70
- data/4.0-Upgrade.md +0 -53
- data/5.0-Upgrade.md +0 -56
- data/Appraisals +0 -9
- data/COMM-LICENSE +0 -95
- data/Ent-Changes.md +0 -225
- data/Gemfile +0 -29
- data/LICENSE +0 -9
- data/Pro-2.0-Upgrade.md +0 -138
- data/Pro-3.0-Upgrade.md +0 -44
- data/Pro-4.0-Upgrade.md +0 -35
- data/Pro-Changes.md +0 -752
- data/Rakefile +0 -9
- data/bin/sidekiqctl +0 -237
- data/code_of_conduct.md +0 -50
- data/gemfiles/rails_4.gemfile +0 -31
- data/gemfiles/rails_5.gemfile +0 -31
- data/lib/generators/sidekiq/worker_generator.rb +0 -49
- data/lib/sidekiq/core_ext.rb +0 -1
- data/lib/sidekiq/delay.rb +0 -42
- data/lib/sidekiq/exception_handler.rb +0 -29
- data/lib/sidekiq/extensions/action_mailer.rb +0 -57
- data/lib/sidekiq/extensions/active_record.rb +0 -40
- data/lib/sidekiq/extensions/class_methods.rb +0 -40
- data/lib/sidekiq/extensions/generic_proxy.rb +0 -31
- data/lib/sidekiq/logging.rb +0 -122
- data/lib/sidekiq/middleware/server/active_record.rb +0 -23
- data/lib/sidekiq/util.rb +0 -66
- data/lib/sidekiq/worker.rb +0 -215
data/web/views/busy.erb
CHANGED
@@ -1,29 +1,57 @@
|
|
1
|
-
<div class="
|
2
|
-
<
|
3
|
-
|
1
|
+
<div class="header-container">
|
2
|
+
<h1><%= t('Status') %></h1>
|
3
|
+
</div>
|
4
|
+
|
5
|
+
<div class="stats-wrapper">
|
6
|
+
<div class="stats-container">
|
7
|
+
<div class="stat">
|
8
|
+
<h3><%= s = processes.size; number_with_delimiter(s) %></h3>
|
9
|
+
<p><%= t('Processes') %></p>
|
10
|
+
</div>
|
11
|
+
<div class="stat">
|
12
|
+
<h3><%= x = processes.total_concurrency; number_with_delimiter(x) %></h3>
|
13
|
+
<p><%= t('Threads') %></p>
|
14
|
+
</div>
|
15
|
+
<div class="stat">
|
16
|
+
<h3><%= ws = workset.size; number_with_delimiter(ws) %></h3>
|
17
|
+
<p><%= t('Busy') %></p>
|
18
|
+
</div>
|
19
|
+
<div class="stat">
|
20
|
+
<h3><%= x == 0 ? 0 : ((ws / x.to_f) * 100).round(0) %>%</h3>
|
21
|
+
<p><%= t('Utilization') %></p>
|
22
|
+
</div>
|
23
|
+
<div class="stat">
|
24
|
+
<h3><%= format_memory(processes.total_rss) %></h3>
|
25
|
+
<p><%= t('RSS') %></p>
|
26
|
+
</div>
|
4
27
|
</div>
|
5
|
-
|
28
|
+
</div>
|
29
|
+
|
30
|
+
<div class="header-container">
|
31
|
+
<h1><%= t('Processes') %></h1>
|
32
|
+
<div>
|
6
33
|
<form method="POST" class="warning-messages">
|
7
34
|
<%= csrf_tag %>
|
8
35
|
<div class="btn-group pull-right flip">
|
9
|
-
<
|
10
|
-
<
|
36
|
+
<input class="btn btn-warn" type="submit" name="quiet" value="<%= t('QuietAll') %>" data-confirm="<%= t('AreYouSure') %>"/>
|
37
|
+
<input class="btn btn-danger" type="submit" name="stop" value="<%= t('StopAll') %>" data-confirm="<%= t('AreYouSure') %>"/>
|
11
38
|
</div>
|
12
39
|
</form>
|
13
40
|
</div>
|
14
41
|
</div>
|
15
42
|
|
16
43
|
<div class="table_container">
|
17
|
-
<table class="processes table table-hover table-bordered table-striped
|
44
|
+
<table class="processes table table-hover table-bordered table-striped">
|
18
45
|
<thead>
|
19
46
|
<th><%= t('Name') %></th>
|
20
47
|
<th><%= t('Started') %></th>
|
21
|
-
<th><%= t('
|
22
|
-
<th><%= t('
|
48
|
+
<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>
|
49
|
+
<th class="col-sm-1"><%= t('Threads') %></th>
|
50
|
+
<th class="col-sm-1"><%= t('Busy') %></th>
|
23
51
|
<th> </th>
|
24
52
|
</thead>
|
25
53
|
<% lead = processes.leader %>
|
26
|
-
<%
|
54
|
+
<% sorted_processes.each do |process| %>
|
27
55
|
<tr>
|
28
56
|
<td class="box">
|
29
57
|
<%= "#{process['hostname']}:#{process['pid']}" %>
|
@@ -31,6 +59,9 @@
|
|
31
59
|
<% process.labels.each do |label| %>
|
32
60
|
<span class="label label-info"><%= label %></span>
|
33
61
|
<% end %>
|
62
|
+
<% if process.embedded? %>
|
63
|
+
<span class="label label-default">embedded</span>
|
64
|
+
<% end %>
|
34
65
|
<% if process.stopping? %>
|
35
66
|
<span class="label label-danger">quiet</span>
|
36
67
|
<% end %>
|
@@ -39,36 +70,52 @@
|
|
39
70
|
<% end %>
|
40
71
|
<br>
|
41
72
|
<b><%= "#{t('Queues')}: " %></b>
|
42
|
-
|
73
|
+
<% if process.weights %>
|
74
|
+
<%= busy_weights(process.weights) %>
|
75
|
+
<% else %>
|
76
|
+
<%= process.queues.sort.join(", ") %>
|
77
|
+
<% end %>
|
78
|
+
<% if process.version != Sidekiq::VERSION %>
|
79
|
+
<br>
|
80
|
+
<b><%= "#{t('Version')}: " %></b>
|
81
|
+
<% if process.version %>
|
82
|
+
<%= process.version %>
|
83
|
+
<% else %>
|
84
|
+
<%= t('Unknown') %>
|
85
|
+
<% end %>
|
86
|
+
<% end %>
|
43
87
|
</td>
|
44
88
|
<td><%= relative_time(Time.at(process['started_at'])) %></td>
|
45
|
-
<td><%= process['
|
46
|
-
<td><%= process['
|
89
|
+
<td class="num"><%= format_memory(process['rss'].to_i) %></td>
|
90
|
+
<td class="num"><%= number_with_delimiter(process['concurrency']) %></td>
|
91
|
+
<td class="num"><%= number_with_delimiter(process['busy']) %></td>
|
47
92
|
<td>
|
48
|
-
|
93
|
+
<% unless process.embedded? %>
|
49
94
|
<form method="POST">
|
50
95
|
<%= csrf_tag %>
|
51
96
|
<input type="hidden" name="identity" value="<%= process['identity'] %>"/>
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
97
|
+
|
98
|
+
<div class="btn-group pull-right flip">
|
99
|
+
<% unless process.stopping? %><button class="btn btn-xs btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
|
100
|
+
<button class="btn btn-xs btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
|
101
|
+
</div>
|
56
102
|
</form>
|
57
|
-
|
103
|
+
<% end %>
|
58
104
|
</td>
|
59
105
|
</tr>
|
60
106
|
<% end %>
|
61
107
|
</table>
|
62
108
|
</div>
|
63
109
|
|
64
|
-
<div class="
|
65
|
-
<
|
66
|
-
|
67
|
-
|
110
|
+
<div class="header-container">
|
111
|
+
<h1><%= t('Jobs') %></h1>
|
112
|
+
<% if @workset.size > 0 && @total_size > @count %>
|
113
|
+
<%= erb :_paging, locals: { url: "#{root_path}busy" } %>
|
114
|
+
<% end %>
|
68
115
|
</div>
|
69
116
|
|
70
117
|
<div class="table_container">
|
71
|
-
<table class="workers table table-hover table-bordered table-striped
|
118
|
+
<table class="workers table table-hover table-bordered table-striped">
|
72
119
|
<thead>
|
73
120
|
<th><%= t('Process') %></th>
|
74
121
|
<th><%= t('TID') %></th>
|
@@ -78,20 +125,23 @@
|
|
78
125
|
<th><%= t('Arguments') %></th>
|
79
126
|
<th><%= t('Started') %></th>
|
80
127
|
</thead>
|
81
|
-
<%
|
82
|
-
<% job =
|
128
|
+
<% @workset.each do |process, thread, work| %>
|
129
|
+
<% job = work.job %>
|
83
130
|
<tr>
|
84
131
|
<td><%= process %></td>
|
85
132
|
<td><%= thread %></td>
|
86
133
|
<td><%= job.jid %></td>
|
87
134
|
<td>
|
88
|
-
<a href="<%= root_path %>queues/<%=
|
135
|
+
<a href="<%= root_path %>queues/<%= work.queue %>"><%= work.queue %></a>
|
136
|
+
</td>
|
137
|
+
<td>
|
138
|
+
<%= job.display_class %>
|
139
|
+
<%= display_tags(job, nil) %>
|
89
140
|
</td>
|
90
|
-
<td><%= job.display_class %></td>
|
91
141
|
<td>
|
92
142
|
<div class="args"><%= display_args(job.display_args) %></div>
|
93
143
|
</td>
|
94
|
-
<td><%= relative_time(
|
144
|
+
<td><%= relative_time(work.run_at) %></td>
|
95
145
|
</tr>
|
96
146
|
<% end %>
|
97
147
|
</table>
|
data/web/views/dashboard.erb
CHANGED
@@ -2,74 +2,104 @@
|
|
2
2
|
<div class= "dashboard clearfix">
|
3
3
|
<h3 >
|
4
4
|
<%= t('Dashboard') %>
|
5
|
-
<span class="beacon">
|
5
|
+
<span id="beacon" class="beacon">
|
6
6
|
<span class="ring"></span>
|
7
7
|
<span class="dot"></span>
|
8
8
|
</span>
|
9
9
|
</h3>
|
10
10
|
<div class="interval-slider ltr">
|
11
11
|
<span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
|
12
|
-
<span class="current-interval">5 sec</span>
|
12
|
+
<span id="sldr-text" class="current-interval">5 sec</span>
|
13
13
|
<br/>
|
14
|
-
<input type="range" min="2000" max="20000" step="1000" value="5000"/>
|
14
|
+
<input id="sldr" type="range" min="2000" max="20000" step="1000" value="5000"/>
|
15
15
|
</div>
|
16
16
|
</div>
|
17
17
|
|
18
18
|
<div class="row chart">
|
19
|
-
<
|
20
|
-
|
19
|
+
<canvas id="realtime-chart">
|
20
|
+
<%= to_json({
|
21
|
+
processedLabel: t('Processed'),
|
22
|
+
failedLabel: t('Failed'),
|
23
|
+
labels: Array.new(50, ""),
|
24
|
+
processed: Array.new(50),
|
25
|
+
failed: Array.new(50),
|
26
|
+
updateUrl: "#{root_path}stats",
|
27
|
+
}) %>
|
28
|
+
</canvas>
|
29
|
+
|
30
|
+
<!-- start with a space in the legend so the height doesn't change when we add content dynamically -->
|
31
|
+
<div id="realtime-legend"> </div>
|
21
32
|
</div>
|
22
33
|
|
23
|
-
<div class="row
|
24
|
-
|
25
|
-
|
34
|
+
<div class="row header">
|
35
|
+
<div class="col-sm-4 pull-left flip">
|
36
|
+
<h3><%= t('History') %></h3>
|
37
|
+
</div>
|
38
|
+
</div>
|
39
|
+
<div class="row chart">
|
40
|
+
<div>
|
26
41
|
<a href="<%= root_path %>?days=7" class="history-graph <%= "active" if params[:days] == "7" %>"><%= t('OneWeek') %></a>
|
27
42
|
<a href="<%= root_path %>" class="history-graph <%= "active" if params[:days].nil? || params[:days] == "30" %>"><%= t('OneMonth') %></a>
|
28
43
|
<a href="<%= root_path %>?days=90" class="history-graph <%= "active" if params[:days] == "90" %>"><%= t('ThreeMonths') %></a>
|
29
44
|
<a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
|
30
|
-
</
|
45
|
+
</div>
|
31
46
|
|
32
|
-
<
|
33
|
-
|
47
|
+
<canvas id="history-chart">
|
48
|
+
<%= to_json({
|
49
|
+
processedLabel: t('Processed'),
|
50
|
+
failedLabel: t('Failed'),
|
51
|
+
processed: @processed_history.to_a.reverse,
|
52
|
+
failed: @failed_history.to_a.reverse,
|
53
|
+
}) %>
|
54
|
+
</canvas>
|
34
55
|
</div>
|
35
56
|
|
36
57
|
<br/>
|
37
|
-
<
|
38
|
-
<div class="
|
58
|
+
<div class="row header">
|
59
|
+
<div class="col-sm-4 pull-left flip">
|
60
|
+
<h3>Redis</h3>
|
61
|
+
</div>
|
62
|
+
</div>
|
63
|
+
<div class="stats-wrapper">
|
39
64
|
<div class="stats-container">
|
40
65
|
<% if @redis_info.fetch("redis_version", nil) %>
|
41
66
|
<div class="stat">
|
42
|
-
<h3
|
67
|
+
<h3 id="redis_version"><%= @redis_info.fetch("redis_version") %></h3>
|
43
68
|
<p><%= t('Version') %></p>
|
44
69
|
</div>
|
45
70
|
<% end %>
|
46
71
|
|
47
72
|
<% if @redis_info.fetch("uptime_in_days", nil) %>
|
48
73
|
<div class="stat">
|
49
|
-
<h3
|
74
|
+
<h3 id="uptime_in_days"><%= @redis_info.fetch("uptime_in_days") %></h3>
|
50
75
|
<p><%= t('Uptime') %></p>
|
51
76
|
</div>
|
52
77
|
<% end %>
|
53
78
|
|
54
79
|
<% if @redis_info.fetch("connected_clients", nil) %>
|
55
80
|
<div class="stat">
|
56
|
-
<h3
|
81
|
+
<h3 id="connected_clients"><%= @redis_info.fetch("connected_clients") %></h3>
|
57
82
|
<p><%= t('Connections') %></p>
|
58
83
|
</div>
|
59
84
|
<% end %>
|
60
85
|
|
61
86
|
<% if @redis_info.fetch("used_memory_human", nil) %>
|
62
87
|
<div class="stat">
|
63
|
-
<h3
|
88
|
+
<h3 id="used_memory_human"><%= @redis_info.fetch("used_memory_human") %></h3>
|
64
89
|
<p><%= t('MemoryUsage') %></p>
|
65
90
|
</div>
|
66
91
|
<% end %>
|
67
92
|
|
68
93
|
<% if @redis_info.fetch("used_memory_peak_human", nil) %>
|
69
94
|
<div class="stat">
|
70
|
-
<h3
|
95
|
+
<h3 id="used_memory_peak_human"><%= @redis_info.fetch("used_memory_peak_human") %></h3>
|
71
96
|
<p><%= t('PeakMemoryUsage') %></p>
|
72
97
|
</div>
|
73
98
|
<% end %>
|
74
99
|
</div>
|
75
100
|
</div>
|
101
|
+
|
102
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
|
103
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
|
104
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
|
105
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/dashboard-charts.js"></script>
|
data/web/views/dead.erb
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
<h3><%= t('Error') %></h3>
|
4
4
|
<div class="table_container">
|
5
|
-
<table class="error table table-bordered table-striped">
|
5
|
+
<table class="error table table-bordered table-striped table-hover">
|
6
6
|
<tbody>
|
7
7
|
<tr>
|
8
8
|
<th><%= t('ErrorClass') %></th>
|
@@ -14,11 +14,11 @@
|
|
14
14
|
<th><%= t('ErrorMessage') %></th>
|
15
15
|
<td><%= h(@dead['error_message']) %></td>
|
16
16
|
</tr>
|
17
|
-
<% if
|
17
|
+
<% if @dead.error_backtrace %>
|
18
18
|
<tr>
|
19
19
|
<th><%= t('ErrorBacktrace') %></th>
|
20
20
|
<td>
|
21
|
-
<code><%= @dead
|
21
|
+
<code><%= @dead.error_backtrace.join("<br/>") %></code>
|
22
22
|
</td>
|
23
23
|
</tr>
|
24
24
|
<% end %>
|
@@ -0,0 +1,7 @@
|
|
1
|
+
<div>
|
2
|
+
<form method="post" class="form-inline" action='<%= root_path %>filter/<%= which %>'>
|
3
|
+
<%= csrf_tag %>
|
4
|
+
<label for="substr"><%= t('Filter') %></label>
|
5
|
+
<input class="search form-control" type="search" name="substr" value="<%= h params[:substr] %>" placeholder="<%= t('AnyJobContent') %>"/>
|
6
|
+
</form>
|
7
|
+
</div>
|
data/web/views/layout.erb
CHANGED
@@ -11,16 +11,18 @@
|
|
11
11
|
<% end %>
|
12
12
|
|
13
13
|
<link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
|
14
|
+
<link href="<%= root_path %>stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
|
14
15
|
<% if rtl? %>
|
15
16
|
<link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
|
16
17
|
<% end %>
|
17
18
|
|
19
|
+
<link rel="apple-touch-icon" href="<%= root_path %>images/apple-touch-icon.png">
|
18
20
|
<link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
|
19
21
|
<script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
|
20
22
|
<meta name="google" content="notranslate" />
|
21
23
|
<%= display_custom_head %>
|
22
24
|
</head>
|
23
|
-
<body class="admin" data-
|
25
|
+
<body class="admin" data-locale="<%= locale %>">
|
24
26
|
<%= erb :_nav %>
|
25
27
|
<div id="page">
|
26
28
|
<div class="container">
|
@@ -0,0 +1,91 @@
|
|
1
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
|
2
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
|
3
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
|
4
|
+
|
5
|
+
<div class="header-container">
|
6
|
+
<div class="page-title-container">
|
7
|
+
<h1><%= t('Metrics') %></h1>
|
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>
|
9
|
+
</div>
|
10
|
+
|
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="<%= h 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>
|
27
|
+
</div>
|
28
|
+
|
29
|
+
<%
|
30
|
+
table_limit = 20
|
31
|
+
chart_limit = 5
|
32
|
+
job_results = @query_result.job_results.sort_by { |(kls, jr)| jr.totals["s"] }.reverse.first(table_limit)
|
33
|
+
visible_kls = job_results.first(chart_limit).map(&:first)
|
34
|
+
%>
|
35
|
+
|
36
|
+
<% if job_results.any? %>
|
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>
|
48
|
+
<% end %>
|
49
|
+
|
50
|
+
<div class="table_container">
|
51
|
+
<table class="table table-bordered table-striped table-hover">
|
52
|
+
<tbody>
|
53
|
+
<tr>
|
54
|
+
<th><%= t('Name') %></th>
|
55
|
+
<th><%= t('Success') %></th>
|
56
|
+
<th><%= t('Failure') %></th>
|
57
|
+
<th><%= t('TotalExecutionTime') %> (Seconds)</th>
|
58
|
+
<th><%= t('AvgExecutionTime') %> (Seconds)</th>
|
59
|
+
</tr>
|
60
|
+
<% if job_results.any? %>
|
61
|
+
<% job_results.each_with_index do |(kls, jr), i| %>
|
62
|
+
<tr>
|
63
|
+
<td>
|
64
|
+
<div class="metrics-swatch-wrapper">
|
65
|
+
<% id = "metrics-swatch-#{kls}" %>
|
66
|
+
<input
|
67
|
+
type="checkbox"
|
68
|
+
id="<%= id %>"
|
69
|
+
class="metrics-swatch"
|
70
|
+
value="<%= kls %>"
|
71
|
+
<%= visible_kls.include?(kls) ? 'checked' : '' %>
|
72
|
+
/>
|
73
|
+
<code><a href="<%= root_path %>metrics/<%= kls %>?period=<%= @period %>"><%= kls %></a></code>
|
74
|
+
</div>
|
75
|
+
</td>
|
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>
|
80
|
+
</tr>
|
81
|
+
<% end %>
|
82
|
+
<% else %>
|
83
|
+
<tr><td colspan=5><%= t("NoDataFound") %></td></tr>
|
84
|
+
<% end %>
|
85
|
+
</tbody>
|
86
|
+
</table>
|
87
|
+
</div>
|
88
|
+
|
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>
|
@@ -0,0 +1,59 @@
|
|
1
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
|
2
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
|
3
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
|
4
|
+
|
5
|
+
<%
|
6
|
+
job_result = @query_result.job_results[@name]
|
7
|
+
hist_totals = job_result.hist.values.first.zip(*job_result.hist.values[1..-1]).map(&:sum).reverse
|
8
|
+
bucket_labels = Sidekiq::Metrics::Histogram::LABELS
|
9
|
+
bucket_intervals = Sidekiq::Metrics::Histogram::BUCKET_INTERVALS
|
10
|
+
%>
|
11
|
+
|
12
|
+
<% if job_result.totals["s"] > 0 %>
|
13
|
+
<div class="header-container">
|
14
|
+
<div class="page-title-container">
|
15
|
+
<h1>
|
16
|
+
<a href="<%= root_path %>metrics?period=<%= @period %>"><%= t('Metrics') %></a> /
|
17
|
+
<%= h @name %>
|
18
|
+
</h1>
|
19
|
+
|
20
|
+
<a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
|
21
|
+
</div>
|
22
|
+
|
23
|
+
<%= erb :_metrics_period_select, locals: { periods: @periods, period: @period, path: "#{root_path}metrics/#{@name}" } %>
|
24
|
+
</div>
|
25
|
+
|
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-->
|
50
|
+
<% else %>
|
51
|
+
<h1>
|
52
|
+
<a href="<%= root_path %>/metrics"><%= t('Metrics') %></a> /
|
53
|
+
<%= h @name %>
|
54
|
+
</h1>
|
55
|
+
|
56
|
+
<div class="alert alert-success"><%= t('NoJobMetricsFound') %></div>
|
57
|
+
<% end %>
|
58
|
+
|
59
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
|
data/web/views/morgue.erb
CHANGED
@@ -1,20 +1,16 @@
|
|
1
|
-
<
|
2
|
-
<
|
3
|
-
<h3><%= t('DeadJobs') %></h3>
|
4
|
-
</div>
|
1
|
+
<div class="header-container">
|
2
|
+
<h1><%= t('DeadJobs') %></h1>
|
5
3
|
<% if @dead.size > 0 && @total_size > @count %>
|
6
|
-
|
7
|
-
<%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
|
8
|
-
</div>
|
4
|
+
<%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
|
9
5
|
<% end %>
|
10
6
|
<%= filtering('dead') %>
|
11
|
-
</
|
7
|
+
</div>
|
12
8
|
|
13
9
|
<% if @dead.size > 0 %>
|
14
10
|
<form action="<%= root_path %>morgue" method="post">
|
15
11
|
<%= csrf_tag %>
|
16
12
|
<div class="table_container">
|
17
|
-
<table class="table table-striped table-bordered table-
|
13
|
+
<table class="table table-striped table-bordered table-hover">
|
18
14
|
<thead>
|
19
15
|
<tr>
|
20
16
|
<th class="table-checkbox checkbox-column">
|
@@ -33,7 +29,7 @@
|
|
33
29
|
<tr>
|
34
30
|
<td class="table-checkbox">
|
35
31
|
<label>
|
36
|
-
<input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
|
32
|
+
<input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
|
37
33
|
</label>
|
38
34
|
</td>
|
39
35
|
<td>
|
@@ -42,7 +38,10 @@
|
|
42
38
|
<td>
|
43
39
|
<a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
|
44
40
|
</td>
|
45
|
-
<td
|
41
|
+
<td>
|
42
|
+
<%= entry.display_class %>
|
43
|
+
<%= display_tags(entry, "dead") %>
|
44
|
+
</td>
|
46
45
|
<td>
|
47
46
|
<div class="args"><%= display_args(entry.display_args) %></div>
|
48
47
|
</td>
|
@@ -55,18 +54,18 @@
|
|
55
54
|
<% end %>
|
56
55
|
</table>
|
57
56
|
</div>
|
58
|
-
<input class="btn btn-primary
|
59
|
-
<input class="btn btn-danger
|
57
|
+
<input class="btn btn-primary pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
|
58
|
+
<input class="btn btn-danger pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
|
60
59
|
</form>
|
61
60
|
|
62
61
|
<% unfiltered? do %>
|
63
62
|
<form action="<%= root_path %>morgue/all/delete" method="post">
|
64
63
|
<%= csrf_tag %>
|
65
|
-
<input class="btn btn-danger
|
64
|
+
<input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
66
65
|
</form>
|
67
66
|
<form action="<%= root_path %>morgue/all/retry" method="post">
|
68
67
|
<%= csrf_tag %>
|
69
|
-
<input class="btn btn-danger
|
68
|
+
<input class="btn btn-danger pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
70
69
|
</form>
|
71
70
|
<% end %>
|
72
71
|
|