sidekiq 5.2.7 → 8.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Changes.md +845 -8
- data/LICENSE.txt +9 -0
- data/README.md +54 -54
- data/bin/multi_queue_bench +271 -0
- data/bin/sidekiq +22 -3
- data/bin/sidekiqload +219 -112
- data/bin/sidekiqmon +11 -0
- data/bin/webload +69 -0
- data/lib/active_job/queue_adapters/sidekiq_adapter.rb +120 -0
- data/lib/generators/sidekiq/job_generator.rb +59 -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 +757 -373
- data/lib/sidekiq/capsule.rb +132 -0
- data/lib/sidekiq/cli.rb +210 -233
- data/lib/sidekiq/client.rb +145 -103
- data/lib/sidekiq/component.rb +128 -0
- data/lib/sidekiq/config.rb +315 -0
- data/lib/sidekiq/deploy.rb +64 -0
- data/lib/sidekiq/embedded.rb +64 -0
- data/lib/sidekiq/fetch.rb +49 -42
- data/lib/sidekiq/iterable_job.rb +56 -0
- data/lib/sidekiq/job/interrupt_handler.rb +24 -0
- data/lib/sidekiq/job/iterable/active_record_enumerator.rb +53 -0
- data/lib/sidekiq/job/iterable/csv_enumerator.rb +47 -0
- data/lib/sidekiq/job/iterable/enumerators.rb +135 -0
- data/lib/sidekiq/job/iterable.rb +306 -0
- data/lib/sidekiq/job.rb +385 -0
- data/lib/sidekiq/job_logger.rb +34 -7
- data/lib/sidekiq/job_retry.rb +164 -109
- data/lib/sidekiq/job_util.rb +113 -0
- data/lib/sidekiq/launcher.rb +208 -107
- data/lib/sidekiq/logger.rb +80 -0
- data/lib/sidekiq/manager.rb +42 -46
- data/lib/sidekiq/metrics/query.rb +184 -0
- data/lib/sidekiq/metrics/shared.rb +109 -0
- data/lib/sidekiq/metrics/tracking.rb +150 -0
- data/lib/sidekiq/middleware/chain.rb +113 -56
- data/lib/sidekiq/middleware/current_attributes.rb +119 -0
- data/lib/sidekiq/middleware/i18n.rb +7 -7
- data/lib/sidekiq/middleware/modules.rb +23 -0
- data/lib/sidekiq/monitor.rb +147 -0
- data/lib/sidekiq/paginator.rb +41 -16
- data/lib/sidekiq/processor.rb +146 -127
- data/lib/sidekiq/profiler.rb +72 -0
- data/lib/sidekiq/rails.rb +46 -43
- data/lib/sidekiq/redis_client_adapter.rb +113 -0
- data/lib/sidekiq/redis_connection.rb +79 -108
- data/lib/sidekiq/ring_buffer.rb +31 -0
- data/lib/sidekiq/scheduled.rb +112 -50
- data/lib/sidekiq/sd_notify.rb +149 -0
- data/lib/sidekiq/systemd.rb +26 -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 +7 -1
- data/lib/sidekiq/web/action.rb +125 -60
- data/lib/sidekiq/web/application.rb +363 -259
- data/lib/sidekiq/web/config.rb +120 -0
- data/lib/sidekiq/web/csrf_protection.rb +183 -0
- data/lib/sidekiq/web/helpers.rb +241 -120
- data/lib/sidekiq/web/router.rb +62 -71
- data/lib/sidekiq/web.rb +69 -161
- data/lib/sidekiq/worker_compatibility_alias.rb +13 -0
- data/lib/sidekiq.rb +94 -182
- data/sidekiq.gemspec +26 -16
- data/web/assets/images/apple-touch-icon.png +0 -0
- data/web/assets/javascripts/application.js +150 -61
- data/web/assets/javascripts/base-charts.js +120 -0
- data/web/assets/javascripts/chart.min.js +13 -0
- data/web/assets/javascripts/chartjs-adapter-date-fns.min.js +7 -0
- data/web/assets/javascripts/chartjs-plugin-annotation.min.js +7 -0
- data/web/assets/javascripts/dashboard-charts.js +194 -0
- data/web/assets/javascripts/dashboard.js +41 -293
- data/web/assets/javascripts/metrics.js +280 -0
- data/web/assets/stylesheets/style.css +766 -0
- data/web/locales/ar.yml +72 -65
- data/web/locales/cs.yml +63 -62
- data/web/locales/da.yml +61 -53
- data/web/locales/de.yml +66 -53
- data/web/locales/el.yml +44 -24
- data/web/locales/en.yml +94 -66
- data/web/locales/es.yml +92 -54
- data/web/locales/fa.yml +66 -65
- data/web/locales/fr.yml +83 -62
- data/web/locales/gd.yml +99 -0
- data/web/locales/he.yml +66 -64
- data/web/locales/hi.yml +60 -59
- data/web/locales/it.yml +93 -54
- data/web/locales/ja.yml +75 -64
- data/web/locales/ko.yml +53 -52
- data/web/locales/lt.yml +84 -0
- data/web/locales/nb.yml +62 -61
- data/web/locales/nl.yml +53 -52
- data/web/locales/pl.yml +46 -45
- data/web/locales/{pt-br.yml → pt-BR.yml} +84 -56
- data/web/locales/pt.yml +52 -51
- data/web/locales/ru.yml +69 -63
- data/web/locales/sv.yml +54 -53
- data/web/locales/ta.yml +61 -60
- data/web/locales/tr.yml +101 -0
- data/web/locales/uk.yml +86 -61
- data/web/locales/ur.yml +65 -64
- data/web/locales/vi.yml +84 -0
- data/web/locales/zh-CN.yml +106 -0
- data/web/locales/{zh-tw.yml → zh-TW.yml} +43 -9
- data/web/views/_footer.erb +31 -19
- data/web/views/_job_info.erb +94 -75
- data/web/views/_metrics_period_select.erb +15 -0
- data/web/views/_nav.erb +14 -21
- data/web/views/_paging.erb +23 -19
- data/web/views/_poll_link.erb +3 -6
- data/web/views/_summary.erb +23 -23
- data/web/views/busy.erb +139 -87
- data/web/views/dashboard.erb +82 -53
- data/web/views/dead.erb +31 -27
- data/web/views/filtering.erb +6 -0
- data/web/views/layout.erb +15 -29
- data/web/views/metrics.erb +84 -0
- data/web/views/metrics_for_job.erb +58 -0
- data/web/views/morgue.erb +60 -70
- data/web/views/profiles.erb +43 -0
- data/web/views/queue.erb +50 -39
- data/web/views/queues.erb +45 -29
- data/web/views/retries.erb +65 -75
- data/web/views/retry.erb +32 -27
- data/web/views/scheduled.erb +58 -52
- data/web/views/scheduled_job_info.erb +1 -1
- metadata +96 -76
- data/.circleci/config.yml +0 -61
- data/.github/contributing.md +0 -32
- data/.github/issue_template.md +0 -11
- data/.gitignore +0 -15
- data/.travis.yml +0 -11
- data/3.0-Upgrade.md +0 -70
- data/4.0-Upgrade.md +0 -53
- data/5.0-Upgrade.md +0 -56
- data/COMM-LICENSE +0 -97
- data/Ent-Changes.md +0 -238
- data/Gemfile +0 -23
- 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 -759
- data/Rakefile +0 -9
- data/bin/sidekiqctl +0 -20
- data/code_of_conduct.md +0 -50
- data/lib/generators/sidekiq/worker_generator.rb +0 -49
- data/lib/sidekiq/core_ext.rb +0 -1
- data/lib/sidekiq/ctl.rb +0 -221
- 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 -220
- data/web/assets/stylesheets/application-rtl.css +0 -246
- data/web/assets/stylesheets/application.css +0 -1144
- data/web/assets/stylesheets/bootstrap-rtl.min.css +0 -9
- data/web/assets/stylesheets/bootstrap.css +0 -5
- data/web/locales/zh-cn.yml +0 -68
- data/web/views/_status.erb +0 -4
data/web/views/busy.erb
CHANGED
@@ -1,98 +1,150 @@
|
|
1
|
-
<
|
2
|
-
<
|
3
|
-
<
|
1
|
+
<section>
|
2
|
+
<header>
|
3
|
+
<h1><%= t('Status') %></h1>
|
4
|
+
</header>
|
5
|
+
|
6
|
+
<div class="cards-container">
|
7
|
+
<article>
|
8
|
+
<h3><%= s = processes.size; number_with_delimiter(s) %></h3>
|
9
|
+
<p><%= t('Processes') %></p>
|
10
|
+
</article>
|
11
|
+
<article>
|
12
|
+
<h3><%= x = processes.total_concurrency; number_with_delimiter(x) %></h3>
|
13
|
+
<p><%= t('Threads') %></p>
|
14
|
+
</article>
|
15
|
+
<article>
|
16
|
+
<h3><%= ws = workset.size; number_with_delimiter(ws) %></h3>
|
17
|
+
<p><%= t('Busy') %></p>
|
18
|
+
</article>
|
19
|
+
<article>
|
20
|
+
<h3><%= x == 0 ? 0 : ((ws / x.to_f) * 100).round(0) %>%</h3>
|
21
|
+
<p><%= t('Utilization') %></p>
|
22
|
+
</article>
|
23
|
+
<article>
|
24
|
+
<h3><%= format_memory(processes.total_rss) %></h3>
|
25
|
+
<p><%= t('RSS') %></p>
|
26
|
+
</article>
|
4
27
|
</div>
|
5
|
-
|
6
|
-
|
28
|
+
</section>
|
29
|
+
|
30
|
+
<section>
|
31
|
+
<header>
|
32
|
+
<h2><%= t('Processes') %></h2>
|
33
|
+
<form method="POST" class="filter 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
|
-
</
|
14
|
-
</div>
|
40
|
+
</header>
|
15
41
|
|
16
|
-
<div class="table_container">
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
<
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
42
|
+
<div class="table_container">
|
43
|
+
<table>
|
44
|
+
<thead>
|
45
|
+
<th><%= t('Name') %></th>
|
46
|
+
<th><%= t('Started') %></th>
|
47
|
+
<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>
|
48
|
+
<th class="col-sm-1"><%= t('Threads') %></th>
|
49
|
+
<th class="col-sm-1"><%= t('Busy') %></th>
|
50
|
+
<th> </th>
|
51
|
+
</thead>
|
52
|
+
<% lead = processes.leader %>
|
53
|
+
<% sorted_processes.each do |process| %>
|
54
|
+
<tr>
|
55
|
+
<td class="box">
|
56
|
+
<%= "#{process['hostname']}:#{process['pid']}" %>
|
57
|
+
<span class="label label-success"><%= process.tag %></span>
|
58
|
+
<% process.labels.each do |label| %>
|
59
|
+
<span class="label label-info"><%= label %></span>
|
60
|
+
<% end %>
|
61
|
+
<% if process.embedded? %>
|
62
|
+
<span class="label label-default">embedded</span>
|
63
|
+
<% end %>
|
64
|
+
<% if process.stopping? %>
|
65
|
+
<span class="label label-danger">quiet</span>
|
66
|
+
<% end %>
|
67
|
+
<% if process.identity == lead %>
|
68
|
+
<span class="label label-warning">leader</span>
|
69
|
+
<% end %>
|
70
|
+
<br>
|
71
|
+
<b><%= "#{t('Queues')}: " %></b>
|
72
|
+
<% if process.weights %>
|
73
|
+
<%= busy_weights(process.weights) %>
|
74
|
+
<% else %>
|
75
|
+
<%= process.queues.sort.join(", ") %>
|
76
|
+
<% end %>
|
77
|
+
<% if process.version != Sidekiq::VERSION %>
|
78
|
+
<br>
|
79
|
+
<b><%= "#{t('Version')}: " %></b>
|
80
|
+
<% if process.version %>
|
81
|
+
<%= process.version %>
|
82
|
+
<% else %>
|
83
|
+
<%= t('Unknown') %>
|
54
84
|
<% end %>
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
85
|
+
<% end %>
|
86
|
+
</td>
|
87
|
+
<td><%= relative_time(Time.at(process['started_at'])) %></td>
|
88
|
+
<td class="num"><%= format_memory(process['rss'].to_i) %></td>
|
89
|
+
<td class="num"><%= number_with_delimiter(process['concurrency']) %></td>
|
90
|
+
<td class="num"><%= number_with_delimiter(process['busy']) %></td>
|
91
|
+
<td>
|
92
|
+
<% unless process.embedded? %>
|
93
|
+
<form method="POST">
|
94
|
+
<%= csrf_tag %>
|
95
|
+
<input type="hidden" name="identity" value="<%= process['identity'] %>"/>
|
63
96
|
|
64
|
-
<div class="
|
65
|
-
|
66
|
-
|
97
|
+
<div class="btn-group">
|
98
|
+
<% unless process.stopping? %><button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
|
99
|
+
<button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
|
100
|
+
</div>
|
101
|
+
</form>
|
102
|
+
<% end %>
|
103
|
+
</td>
|
104
|
+
</tr>
|
105
|
+
<% end %>
|
106
|
+
</table>
|
67
107
|
</div>
|
68
|
-
</
|
108
|
+
</section>
|
69
109
|
|
70
|
-
<
|
71
|
-
<
|
72
|
-
<
|
73
|
-
|
74
|
-
|
75
|
-
<th><%= t('JID') %></th>
|
76
|
-
<th><%= t('Queue') %></th>
|
77
|
-
<th><%= t('Job') %></th>
|
78
|
-
<th><%= t('Arguments') %></th>
|
79
|
-
<th><%= t('Started') %></th>
|
80
|
-
</thead>
|
81
|
-
<% workers.each do |process, thread, msg| %>
|
82
|
-
<% job = Sidekiq::Job.new(msg['payload']) %>
|
83
|
-
<tr>
|
84
|
-
<td><%= process %></td>
|
85
|
-
<td><%= thread %></td>
|
86
|
-
<td><%= job.jid %></td>
|
87
|
-
<td>
|
88
|
-
<a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
|
89
|
-
</td>
|
90
|
-
<td><%= job.display_class %></td>
|
91
|
-
<td>
|
92
|
-
<div class="args"><%= display_args(job.display_args) %></div>
|
93
|
-
</td>
|
94
|
-
<td><%= relative_time(Time.at(msg['run_at'])) %></td>
|
95
|
-
</tr>
|
110
|
+
<section>
|
111
|
+
<header>
|
112
|
+
<h2><%= t('Jobs') %></h2>
|
113
|
+
<% if @workset.size > 0 && @total_size > @count %>
|
114
|
+
<%= erb :_paging, locals: { url: "#{root_path}busy" } %>
|
96
115
|
<% end %>
|
97
|
-
</
|
98
|
-
|
116
|
+
</header>
|
117
|
+
|
118
|
+
<div class="table_container">
|
119
|
+
<table>
|
120
|
+
<thead>
|
121
|
+
<th><%= t('Process') %></th>
|
122
|
+
<th><%= t('TID') %></th>
|
123
|
+
<th><%= t('JID') %></th>
|
124
|
+
<th><%= t('Queue') %></th>
|
125
|
+
<th><%= t('Job') %></th>
|
126
|
+
<th><%= t('Arguments') %></th>
|
127
|
+
<th><%= t('Started') %></th>
|
128
|
+
</thead>
|
129
|
+
<% @workset.each do |process, thread, work| %>
|
130
|
+
<% job = work.job %>
|
131
|
+
<tr>
|
132
|
+
<td><%= process %></td>
|
133
|
+
<td><%= thread %></td>
|
134
|
+
<td><%= job.jid %></td>
|
135
|
+
<td>
|
136
|
+
<a href="<%= root_path %>queues/<%= work.queue %>"><%= work.queue %></a>
|
137
|
+
</td>
|
138
|
+
<td>
|
139
|
+
<%= job.display_class %>
|
140
|
+
<%= display_tags(job, nil) %>
|
141
|
+
</td>
|
142
|
+
<td>
|
143
|
+
<code><div class="args"><%= display_args(job.display_args) %></div></code>
|
144
|
+
</td>
|
145
|
+
<td><%= relative_time(work.run_at) %></td>
|
146
|
+
</tr>
|
147
|
+
<% end %>
|
148
|
+
</table>
|
149
|
+
</div>
|
150
|
+
</section>
|
data/web/views/dashboard.erb
CHANGED
@@ -1,75 +1,104 @@
|
|
1
|
-
<script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js"></script>
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
<
|
6
|
-
|
7
|
-
<span class="
|
8
|
-
</
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
1
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js" nonce="<%= csp_nonce %>"></script>
|
2
|
+
|
3
|
+
<section>
|
4
|
+
<header>
|
5
|
+
<h1>
|
6
|
+
<%= t('Dashboard') %>
|
7
|
+
<span id="beacon" class="beacon"></span>
|
8
|
+
</h1>
|
9
|
+
<div class="filter interval-slider">
|
10
|
+
<span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
|
11
|
+
<span id="sldr-text" class="current-interval">5 s</span>
|
12
|
+
<br/>
|
13
|
+
<input id="sldr" aria-label="<%= t("PollingIntervalMilliseconds") %>" role="slider" type="range" min="2000" max="20000" step="1000" value="5000"/>
|
14
|
+
</div>
|
15
|
+
</header>
|
16
|
+
|
17
|
+
<div class="chart">
|
18
|
+
<span id="sr-last-dashboard-update-template" hidden="hidden"><%= t("LastDashboardUpdateTemplateLiteral") %></span>
|
19
|
+
<span id="sr-last-dashboard-update" class="sr-only" role="status"></span>
|
20
|
+
|
21
|
+
<canvas id="realtime-chart">
|
22
|
+
<%= to_json({
|
23
|
+
processedLabel: t('Processed'),
|
24
|
+
failedLabel: t('Failed'),
|
25
|
+
labels: Array.new(50, ""),
|
26
|
+
processed: Array.new(50),
|
27
|
+
failed: Array.new(50),
|
28
|
+
updateUrl: "#{root_path}stats",
|
29
|
+
}) %>
|
30
|
+
</canvas>
|
31
|
+
|
32
|
+
<!-- start with a space in the legend so the height doesn't change when we add content dynamically -->
|
33
|
+
<div id="realtime-legend"> </div>
|
15
34
|
</div>
|
16
|
-
</
|
35
|
+
</section>
|
17
36
|
|
18
|
-
<
|
19
|
-
<
|
20
|
-
|
21
|
-
</div>
|
37
|
+
<section>
|
38
|
+
<header>
|
39
|
+
<h2><%= t('History') %></h2>
|
22
40
|
|
23
|
-
<div class="
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
</
|
41
|
+
<div class="filter">
|
42
|
+
<% d = url_params("days") %>
|
43
|
+
<a href="<%= root_path %>?days=7" class="history-graph <%= "active" if d == "7" %>"><%= t('OneWeek') %></a>
|
44
|
+
<a href="<%= root_path %>" class="history-graph <%= "active" if d.nil? || d == "30" %>"><%= t('OneMonth') %></a>
|
45
|
+
<a href="<%= root_path %>?days=90" class="history-graph <%= "active" if d == "90" %>"><%= t('ThreeMonths') %></a>
|
46
|
+
<a href="<%= root_path %>?days=180" class="history-graph <%= "active" if d == "180" %>"><%= t('SixMonths') %></a>
|
47
|
+
</div>
|
48
|
+
</header>
|
31
49
|
|
32
|
-
<
|
33
|
-
|
34
|
-
|
50
|
+
<canvas id="history-chart">
|
51
|
+
<%= to_json({
|
52
|
+
processedLabel: t('Processed'),
|
53
|
+
failedLabel: t('Failed'),
|
54
|
+
processed: @processed_history.to_a.reverse,
|
55
|
+
failed: @failed_history.to_a.reverse,
|
56
|
+
}) %>
|
57
|
+
</canvas>
|
58
|
+
</section>
|
35
59
|
|
36
|
-
<
|
37
|
-
<
|
38
|
-
<
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
<% end %>
|
60
|
+
<section>
|
61
|
+
<header>
|
62
|
+
<h2><%= store_name %></h2>
|
63
|
+
</header>
|
64
|
+
<div class="cards-container">
|
65
|
+
<article>
|
66
|
+
<h3 id="redis_version"><%= store_version %></h3>
|
67
|
+
<p><%= t('Version') %></p>
|
68
|
+
</article>
|
46
69
|
|
47
70
|
<% if @redis_info.fetch("uptime_in_days", nil) %>
|
48
|
-
<
|
49
|
-
<h3
|
71
|
+
<article>
|
72
|
+
<h3 id="uptime_in_days"><%= @redis_info.fetch("uptime_in_days") %></h3>
|
50
73
|
<p><%= t('Uptime') %></p>
|
51
|
-
</
|
74
|
+
</article>
|
52
75
|
<% end %>
|
53
76
|
|
54
77
|
<% if @redis_info.fetch("connected_clients", nil) %>
|
55
|
-
<
|
56
|
-
<h3
|
78
|
+
<article>
|
79
|
+
<h3 id="connected_clients"><%= @redis_info.fetch("connected_clients") %></h3>
|
57
80
|
<p><%= t('Connections') %></p>
|
58
|
-
</
|
81
|
+
</article>
|
59
82
|
<% end %>
|
60
83
|
|
61
84
|
<% if @redis_info.fetch("used_memory_human", nil) %>
|
62
|
-
<
|
63
|
-
<h3
|
85
|
+
<article>
|
86
|
+
<h3 id="used_memory_human"><%= @redis_info.fetch("used_memory_human") %></h3>
|
64
87
|
<p><%= t('MemoryUsage') %></p>
|
65
|
-
</
|
88
|
+
</article>
|
66
89
|
<% end %>
|
67
90
|
|
68
91
|
<% if @redis_info.fetch("used_memory_peak_human", nil) %>
|
69
|
-
<
|
70
|
-
<h3
|
92
|
+
<article>
|
93
|
+
<h3 id="used_memory_peak_human"><%= @redis_info.fetch("used_memory_peak_human") %></h3>
|
71
94
|
<p><%= t('PeakMemoryUsage') %></p>
|
72
|
-
</
|
95
|
+
</article>
|
73
96
|
<% end %>
|
74
97
|
</div>
|
75
|
-
</
|
98
|
+
</section>
|
99
|
+
|
100
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js" nonce="<%= csp_nonce %>"></script>
|
101
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js" nonce="<%= csp_nonce %>"></script>
|
102
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-adapter-date-fns.min.js" nonce="<%= csp_nonce %>"></script>
|
103
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js" nonce="<%= csp_nonce %>"></script>
|
104
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/dashboard-charts.js" nonce="<%= csp_nonce %>"></script>
|
data/web/views/dead.erb
CHANGED
@@ -1,34 +1,38 @@
|
|
1
1
|
<%= erb :_job_info, locals: { job: @dead, type: :dead } %>
|
2
2
|
|
3
|
-
<
|
4
|
-
<
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
<code><%= @dead['error_class'] %></code>
|
11
|
-
</td>
|
12
|
-
</tr>
|
13
|
-
<tr>
|
14
|
-
<th><%= t('ErrorMessage') %></th>
|
15
|
-
<td><%= h(@dead['error_message']) %></td>
|
16
|
-
</tr>
|
17
|
-
<% if !@dead['error_backtrace'].nil? %>
|
3
|
+
<section>
|
4
|
+
<header>
|
5
|
+
<h1><%= t('Error') %></h1>
|
6
|
+
</header>
|
7
|
+
<div class="table_container">
|
8
|
+
<table>
|
9
|
+
<tbody>
|
18
10
|
<tr>
|
19
|
-
<th><%= t('
|
11
|
+
<th><%= t('ErrorClass') %></th>
|
20
12
|
<td>
|
21
|
-
<code><%= @dead['
|
13
|
+
<code><%= @dead['error_class'] %></code>
|
22
14
|
</td>
|
23
15
|
</tr>
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
</
|
16
|
+
<tr>
|
17
|
+
<th><%= t('ErrorMessage') %></th>
|
18
|
+
<td><%= h(@dead['error_message']) %></td>
|
19
|
+
</tr>
|
20
|
+
<% if @dead.error_backtrace %>
|
21
|
+
<tr>
|
22
|
+
<th><%= t('ErrorBacktrace') %></th>
|
23
|
+
<td>
|
24
|
+
<code><%= @dead.error_backtrace.join("<br/>") %></code>
|
25
|
+
</td>
|
26
|
+
</tr>
|
27
|
+
<% end %>
|
28
|
+
</tbody>
|
29
|
+
</table>
|
30
|
+
</div>
|
28
31
|
|
29
|
-
<form
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
</form>
|
32
|
+
<form action="<%= root_path %>morgue/<%= job_params(@dead, @dead.score) %>" method="post">
|
33
|
+
<%= csrf_tag %>
|
34
|
+
<a class="btn btn-default" href="<%= root_path %>morgue"><%= t('GoBack') %></a>
|
35
|
+
<input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
|
36
|
+
<input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
|
37
|
+
</form>
|
38
|
+
</section>
|
@@ -0,0 +1,6 @@
|
|
1
|
+
<div class="filter">
|
2
|
+
<form role="search" method="get" class="form-inline" action='<%= root_path %><%= which %>'>
|
3
|
+
<label for="substr"><%= t('Filter') %></label>
|
4
|
+
<input class="form-control" type="search" name="substr" value="<%= h url_params("substr") %>" placeholder="<%= t('AnyJobContent') %>"/>
|
5
|
+
</form>
|
6
|
+
</div>
|
data/web/views/layout.erb
CHANGED
@@ -1,40 +1,26 @@
|
|
1
1
|
<!doctype html>
|
2
|
-
<html dir="<%= text_direction %>">
|
2
|
+
<html dir="<%= text_direction %>" lang="<%= locale %>">
|
3
3
|
<head>
|
4
4
|
<title><%= environment_title_prefix %><%= Sidekiq::NAME %></title>
|
5
|
-
<meta charset="utf-8"
|
6
|
-
<meta name="viewport" content="width=device-width,initial-scale=1.0"
|
7
|
-
|
8
|
-
<link href="<%= root_path %>stylesheets/
|
9
|
-
|
10
|
-
<link
|
11
|
-
|
12
|
-
|
13
|
-
<link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
|
14
|
-
<% if rtl? %>
|
15
|
-
<link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
|
16
|
-
<% end %>
|
17
|
-
|
18
|
-
<link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
|
19
|
-
<script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
|
20
|
-
<meta name="google" content="notranslate" />
|
5
|
+
<meta charset="utf-8"/>
|
6
|
+
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
|
7
|
+
<meta name="color-scheme" content="light dark"/>
|
8
|
+
<link href="<%= root_path %>stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>"/>
|
9
|
+
<link rel="apple-touch-icon" href="<%= root_path %>images/apple-touch-icon.png"/>
|
10
|
+
<link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico"/>
|
11
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/application.js" nonce="<%= csp_nonce %>"></script>
|
12
|
+
<meta name="google" content="notranslate"/>
|
21
13
|
<%= display_custom_head %>
|
22
14
|
</head>
|
23
|
-
<body class="admin" data-
|
15
|
+
<body class="admin" data-locale="<%= locale %>">
|
24
16
|
<%= erb :_nav %>
|
25
|
-
<
|
17
|
+
<main id="page">
|
26
18
|
<div class="container">
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
</div>
|
31
|
-
|
32
|
-
<div class="col-sm-12">
|
33
|
-
<%= yield %>
|
34
|
-
</div>
|
35
|
-
</div>
|
19
|
+
<%= erb :_summary %>
|
20
|
+
<% if flash? %><p class="flash"><%= get_flash %></p><% end %>
|
21
|
+
<%= yield %>
|
36
22
|
</div>
|
37
|
-
</
|
23
|
+
</main>
|
38
24
|
<%= erb :_footer %>
|
39
25
|
</body>
|
40
26
|
</html>
|
@@ -0,0 +1,84 @@
|
|
1
|
+
<%= script_tag "javascripts/chart.min.js" %>
|
2
|
+
<%= script_tag "javascripts/chartjs-plugin-annotation.min.js" %>
|
3
|
+
<%= script_tag "javascripts/chartjs-adapter-date-fns.min.js" %>
|
4
|
+
<%= script_tag "javascripts/base-charts.js" %>
|
5
|
+
|
6
|
+
<section>
|
7
|
+
<header>
|
8
|
+
<h1>
|
9
|
+
<%= t('Metrics') %>
|
10
|
+
<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
|
+
</h1>
|
12
|
+
|
13
|
+
<%= erb :_metrics_period_select, locals: { periods: @periods, period: @period, path: "#{root_path}metrics" } %>
|
14
|
+
</header>
|
15
|
+
|
16
|
+
<%
|
17
|
+
table_limit = 20
|
18
|
+
chart_limit = 5
|
19
|
+
job_results = @query_result.job_results.sort_by { |(kls, jr)| jr.totals["s"] }.reverse.first(table_limit)
|
20
|
+
visible_kls = job_results.first(chart_limit).map(&:first)
|
21
|
+
%>
|
22
|
+
|
23
|
+
<% if job_results.any? %>
|
24
|
+
<canvas id="job-metrics-overview-chart">
|
25
|
+
<%= to_json({
|
26
|
+
series: job_results.map { |(kls, jr)| [kls, jr.dig("series", "s")] }.to_h,
|
27
|
+
marks: @query_result.marks.map { |m| [m.bucket, m.label] },
|
28
|
+
starts_at: @query_result.starts_at.iso8601,
|
29
|
+
ends_at: @query_result.ends_at.iso8601,
|
30
|
+
visibleKls: visible_kls,
|
31
|
+
yLabel: t('TotalExecutionTime'),
|
32
|
+
units: t('Seconds').downcase,
|
33
|
+
markLabel: t('Deploy'),
|
34
|
+
}) %>
|
35
|
+
</canvas>
|
36
|
+
<% end %>
|
37
|
+
|
38
|
+
<div class="table_container">
|
39
|
+
<table>
|
40
|
+
<thead>
|
41
|
+
<tr>
|
42
|
+
<th><%= t('Name') %></th>
|
43
|
+
<th><%= t('Success') %></th>
|
44
|
+
<th><%= t('Failure') %></th>
|
45
|
+
<th><%= t('TotalExecutionTime') %> (<%= t('Seconds') %>)</th>
|
46
|
+
<th><%= t('AvgExecutionTime') %> (<%= t('Seconds') %>)</th>
|
47
|
+
</tr>
|
48
|
+
</thead>
|
49
|
+
<tbody>
|
50
|
+
<% if job_results.any? %>
|
51
|
+
<% job_results.each_with_index do |(kls, jr), i| %>
|
52
|
+
<tr>
|
53
|
+
<td>
|
54
|
+
<div class="metrics-swatch-wrapper">
|
55
|
+
<% id = "metrics-swatch-#{kls}" %>
|
56
|
+
<input
|
57
|
+
type="checkbox"
|
58
|
+
id="<%= id %>"
|
59
|
+
class="metrics-swatch"
|
60
|
+
value="<%= kls %>"
|
61
|
+
<%= visible_kls.include?(kls) ? 'checked' : '' %>
|
62
|
+
/>
|
63
|
+
<code><a href="<%= root_path %>metrics/<%= kls %>?period=<%= @period %>"><%= kls %></a></code>
|
64
|
+
</div>
|
65
|
+
</td>
|
66
|
+
<td class="num"><%= number_with_delimiter(jr.dig("totals", "p") - jr.dig("totals", "f")) %></td>
|
67
|
+
<td class="num"><%= number_with_delimiter(jr.dig("totals", "f")) %></td>
|
68
|
+
<td class="num"><%= number_with_delimiter(jr.dig("totals", "s"), precision: 2) %></td>
|
69
|
+
<td class="num"><%= number_with_delimiter(jr.total_avg("s"), precision: 2) %></td>
|
70
|
+
</tr>
|
71
|
+
<% end %>
|
72
|
+
<% else %>
|
73
|
+
<tr><td colspan=5><%= t("NoDataFound") %></td></tr>
|
74
|
+
<% end %>
|
75
|
+
</tbody>
|
76
|
+
</table>
|
77
|
+
</div>
|
78
|
+
|
79
|
+
<% if job_results.any? %>
|
80
|
+
<p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %>.<% if @period == "1h" %> Auto-refreshing every 60 seconds.<% end %></small></p>
|
81
|
+
<% end %>
|
82
|
+
|
83
|
+
</section>
|
84
|
+
<%= script_tag "javascripts/metrics.js" %>
|