sidekiq 5.2.7 → 7.0.2

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.

Files changed (146) hide show
  1. checksums.yaml +4 -4
  2. data/Changes.md +465 -5
  3. data/LICENSE.txt +9 -0
  4. data/README.md +32 -42
  5. data/bin/sidekiq +22 -3
  6. data/bin/sidekiqload +80 -77
  7. data/bin/sidekiqmon +8 -0
  8. data/lib/generators/sidekiq/job_generator.rb +57 -0
  9. data/lib/generators/sidekiq/templates/{worker.rb.erb → job.rb.erb} +2 -2
  10. data/lib/generators/sidekiq/templates/{worker_spec.rb.erb → job_spec.rb.erb} +1 -1
  11. data/lib/generators/sidekiq/templates/{worker_test.rb.erb → job_test.rb.erb} +1 -1
  12. data/lib/sidekiq/api.rb +506 -351
  13. data/lib/sidekiq/capsule.rb +110 -0
  14. data/lib/sidekiq/cli.rb +202 -226
  15. data/lib/sidekiq/client.rb +104 -95
  16. data/lib/sidekiq/component.rb +66 -0
  17. data/lib/sidekiq/config.rb +270 -0
  18. data/lib/sidekiq/deploy.rb +62 -0
  19. data/lib/sidekiq/embedded.rb +61 -0
  20. data/lib/sidekiq/fetch.rb +49 -40
  21. data/lib/sidekiq/job.rb +378 -0
  22. data/lib/sidekiq/job_logger.rb +33 -7
  23. data/lib/sidekiq/job_retry.rb +127 -107
  24. data/lib/sidekiq/job_util.rb +71 -0
  25. data/lib/sidekiq/launcher.rb +197 -103
  26. data/lib/sidekiq/logger.rb +131 -0
  27. data/lib/sidekiq/manager.rb +43 -46
  28. data/lib/sidekiq/metrics/query.rb +153 -0
  29. data/lib/sidekiq/metrics/shared.rb +95 -0
  30. data/lib/sidekiq/metrics/tracking.rb +134 -0
  31. data/lib/sidekiq/middleware/chain.rb +104 -50
  32. data/lib/sidekiq/middleware/current_attributes.rb +58 -0
  33. data/lib/sidekiq/middleware/i18n.rb +7 -7
  34. data/lib/sidekiq/middleware/modules.rb +21 -0
  35. data/lib/sidekiq/monitor.rb +148 -0
  36. data/lib/sidekiq/paginator.rb +28 -16
  37. data/lib/sidekiq/processor.rb +105 -107
  38. data/lib/sidekiq/rails.rb +41 -37
  39. data/lib/sidekiq/redis_client_adapter.rb +115 -0
  40. data/lib/sidekiq/redis_connection.rb +38 -107
  41. data/lib/sidekiq/ring_buffer.rb +29 -0
  42. data/lib/sidekiq/scheduled.rb +111 -49
  43. data/lib/sidekiq/sd_notify.rb +149 -0
  44. data/lib/sidekiq/systemd.rb +24 -0
  45. data/lib/sidekiq/testing/inline.rb +6 -5
  46. data/lib/sidekiq/testing.rb +66 -84
  47. data/lib/sidekiq/transaction_aware_client.rb +44 -0
  48. data/lib/sidekiq/version.rb +3 -1
  49. data/lib/sidekiq/web/action.rb +15 -11
  50. data/lib/sidekiq/web/application.rb +108 -79
  51. data/lib/sidekiq/web/csrf_protection.rb +180 -0
  52. data/lib/sidekiq/web/helpers.rb +128 -105
  53. data/lib/sidekiq/web/router.rb +23 -19
  54. data/lib/sidekiq/web.rb +56 -107
  55. data/lib/sidekiq/worker_compatibility_alias.rb +13 -0
  56. data/lib/sidekiq.rb +92 -182
  57. data/sidekiq.gemspec +45 -16
  58. data/web/assets/images/apple-touch-icon.png +0 -0
  59. data/web/assets/javascripts/application.js +130 -61
  60. data/web/assets/javascripts/base-charts.js +106 -0
  61. data/web/assets/javascripts/chart.min.js +13 -0
  62. data/web/assets/javascripts/chartjs-plugin-annotation.min.js +7 -0
  63. data/web/assets/javascripts/dashboard-charts.js +166 -0
  64. data/web/assets/javascripts/dashboard.js +36 -292
  65. data/web/assets/javascripts/metrics.js +236 -0
  66. data/web/assets/stylesheets/application-dark.css +147 -0
  67. data/web/assets/stylesheets/application-rtl.css +2 -95
  68. data/web/assets/stylesheets/application.css +102 -522
  69. data/web/locales/ar.yml +71 -65
  70. data/web/locales/cs.yml +62 -62
  71. data/web/locales/da.yml +52 -52
  72. data/web/locales/de.yml +65 -53
  73. data/web/locales/el.yml +43 -24
  74. data/web/locales/en.yml +84 -66
  75. data/web/locales/es.yml +70 -54
  76. data/web/locales/fa.yml +65 -65
  77. data/web/locales/fr.yml +69 -62
  78. data/web/locales/he.yml +65 -64
  79. data/web/locales/hi.yml +59 -59
  80. data/web/locales/it.yml +53 -53
  81. data/web/locales/ja.yml +73 -64
  82. data/web/locales/ko.yml +52 -52
  83. data/web/locales/lt.yml +83 -0
  84. data/web/locales/nb.yml +61 -61
  85. data/web/locales/nl.yml +52 -52
  86. data/web/locales/pl.yml +45 -45
  87. data/web/locales/pt-br.yml +63 -55
  88. data/web/locales/pt.yml +51 -51
  89. data/web/locales/ru.yml +68 -63
  90. data/web/locales/sv.yml +53 -53
  91. data/web/locales/ta.yml +60 -60
  92. data/web/locales/uk.yml +62 -61
  93. data/web/locales/ur.yml +64 -64
  94. data/web/locales/vi.yml +83 -0
  95. data/web/locales/zh-cn.yml +43 -16
  96. data/web/locales/zh-tw.yml +42 -8
  97. data/web/views/_footer.erb +6 -3
  98. data/web/views/_job_info.erb +19 -2
  99. data/web/views/_nav.erb +1 -1
  100. data/web/views/_poll_link.erb +3 -6
  101. data/web/views/_summary.erb +7 -7
  102. data/web/views/busy.erb +74 -22
  103. data/web/views/dashboard.erb +58 -18
  104. data/web/views/dead.erb +3 -3
  105. data/web/views/layout.erb +3 -1
  106. data/web/views/metrics.erb +80 -0
  107. data/web/views/metrics_for_job.erb +69 -0
  108. data/web/views/morgue.erb +10 -7
  109. data/web/views/queue.erb +23 -10
  110. data/web/views/queues.erb +10 -2
  111. data/web/views/retries.erb +12 -9
  112. data/web/views/retry.erb +3 -3
  113. data/web/views/scheduled.erb +6 -3
  114. metadata +84 -69
  115. data/.circleci/config.yml +0 -61
  116. data/.github/contributing.md +0 -32
  117. data/.github/issue_template.md +0 -11
  118. data/.gitignore +0 -15
  119. data/.travis.yml +0 -11
  120. data/3.0-Upgrade.md +0 -70
  121. data/4.0-Upgrade.md +0 -53
  122. data/5.0-Upgrade.md +0 -56
  123. data/COMM-LICENSE +0 -97
  124. data/Ent-Changes.md +0 -238
  125. data/Gemfile +0 -23
  126. data/LICENSE +0 -9
  127. data/Pro-2.0-Upgrade.md +0 -138
  128. data/Pro-3.0-Upgrade.md +0 -44
  129. data/Pro-4.0-Upgrade.md +0 -35
  130. data/Pro-Changes.md +0 -759
  131. data/Rakefile +0 -9
  132. data/bin/sidekiqctl +0 -20
  133. data/code_of_conduct.md +0 -50
  134. data/lib/generators/sidekiq/worker_generator.rb +0 -49
  135. data/lib/sidekiq/core_ext.rb +0 -1
  136. data/lib/sidekiq/ctl.rb +0 -221
  137. data/lib/sidekiq/delay.rb +0 -42
  138. data/lib/sidekiq/exception_handler.rb +0 -29
  139. data/lib/sidekiq/extensions/action_mailer.rb +0 -57
  140. data/lib/sidekiq/extensions/active_record.rb +0 -40
  141. data/lib/sidekiq/extensions/class_methods.rb +0 -40
  142. data/lib/sidekiq/extensions/generic_proxy.rb +0 -31
  143. data/lib/sidekiq/logging.rb +0 -122
  144. data/lib/sidekiq/middleware/server/active_record.rb +0 -23
  145. data/lib/sidekiq/util.rb +0 -66
  146. data/lib/sidekiq/worker.rb +0 -220
data/web/views/busy.erb CHANGED
@@ -1,8 +1,39 @@
1
1
  <div class="row header">
2
- <div class="col-sm-8 pull-left flip">
2
+ <div class="col-sm-4 pull-left flip">
3
+ <h3><%= t('Status') %></h3>
4
+ </div>
5
+ </div>
6
+
7
+ <div class="stats-wrapper">
8
+ <div class="stats-container">
9
+ <div class="stat">
10
+ <h3><%= s = processes.size; number_with_delimiter(s) %></h3>
11
+ <p><%= t('Processes') %></p>
12
+ </div>
13
+ <div class="stat">
14
+ <h3><%= x = processes.total_concurrency; number_with_delimiter(x) %></h3>
15
+ <p><%= t('Threads') %></p>
16
+ </div>
17
+ <div class="stat">
18
+ <h3><%= ws = workset.size; number_with_delimiter(ws) %></h3>
19
+ <p><%= t('Busy') %></p>
20
+ </div>
21
+ <div class="stat">
22
+ <h3><%= x == 0 ? 0 : ((ws / x.to_f) * 100).round(0) %>%</h3>
23
+ <p><%= t('Utilization') %></p>
24
+ </div>
25
+ <div class="stat">
26
+ <h3><%= format_memory(processes.total_rss) %></h3>
27
+ <p><%= t('RSS') %></p>
28
+ </div>
29
+ </div>
30
+ </div>
31
+
32
+ <div class="row header">
33
+ <div class="col-sm-4 pull-left flip">
3
34
  <h3><%= t('Processes') %></h3>
4
35
  </div>
5
- <div class="col-sm-4 pull-right flip">
36
+ <div class="col-sm-3 pull-right flip">
6
37
  <form method="POST" class="warning-messages">
7
38
  <%= csrf_tag %>
8
39
  <div class="btn-group pull-right flip">
@@ -12,18 +43,18 @@
12
43
  </form>
13
44
  </div>
14
45
  </div>
15
-
16
46
  <div class="table_container">
17
- <table class="processes table table-hover table-bordered table-striped table-white">
47
+ <table class="processes table table-hover table-bordered table-striped">
18
48
  <thead>
19
49
  <th><%= t('Name') %></th>
20
50
  <th><%= t('Started') %></th>
21
- <th><%= t('Threads') %></th>
22
- <th><%= t('Busy') %></th>
51
+ <th class="col-sm-1"><%= t('RSS') %><a target="blank" href="https://github.com/mperham/sidekiq/wiki/Memory#rss"><span class="info-circle" title="Click to learn more about RSS">?</span></a></th>
52
+ <th class="col-sm-1"><%= t('Threads') %></th>
53
+ <th class="col-sm-1"><%= t('Busy') %></th>
23
54
  <th>&nbsp;</th>
24
55
  </thead>
25
56
  <% lead = processes.leader %>
26
- <% processes.each do |process| %>
57
+ <% sorted_processes.each do |process| %>
27
58
  <tr>
28
59
  <td class="box">
29
60
  <%= "#{process['hostname']}:#{process['pid']}" %>
@@ -39,22 +70,35 @@
39
70
  <% end %>
40
71
  <br>
41
72
  <b><%= "#{t('Queues')}: " %></b>
42
- <%= process['queues'] * ", " %>
73
+ <% if process.weights %>
74
+ <%= process.weights.sort_by { |weight| weight[0] }.map { |weight| weight.join(": ") }.join(", ") %>
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>
89
+ <td><%= format_memory(process['rss'].to_i) %></td>
45
90
  <td><%= process['concurrency'] %></td>
46
91
  <td><%= process['busy'] %></td>
47
92
  <td>
48
- <div class="btn-group pull-right flip">
49
- <form method="POST">
50
- <%= csrf_tag %>
51
- <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
52
- <% unless process.stopping? %>
53
- <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
54
- <% end %>
55
- <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
56
- </form>
57
- </div>
93
+ <form method="POST">
94
+ <%= csrf_tag %>
95
+ <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
96
+
97
+ <div class="btn-group pull-right flip">
98
+ <% unless process.stopping? %><button class="btn btn-xs btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
99
+ <button class="btn btn-xs btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
100
+ </div>
101
+ </form>
58
102
  </td>
59
103
  </tr>
60
104
  <% end %>
@@ -65,10 +109,15 @@
65
109
  <div class="col-sm-7">
66
110
  <h3><%= t('Jobs') %></h3>
67
111
  </div>
112
+ <% if @workset.size > 0 && @total_size > @count %>
113
+ <div class="col-sm-4">
114
+ <%= erb :_paging, locals: { url: "#{root_path}busy" } %>
115
+ </div>
116
+ <% end %>
68
117
  </div>
69
118
 
70
119
  <div class="table_container">
71
- <table class="workers table table-hover table-bordered table-striped table-white">
120
+ <table class="workers table table-hover table-bordered table-striped">
72
121
  <thead>
73
122
  <th><%= t('Process') %></th>
74
123
  <th><%= t('TID') %></th>
@@ -78,8 +127,8 @@
78
127
  <th><%= t('Arguments') %></th>
79
128
  <th><%= t('Started') %></th>
80
129
  </thead>
81
- <% workers.each do |process, thread, msg| %>
82
- <% job = Sidekiq::Job.new(msg['payload']) %>
130
+ <% @workset.each do |process, thread, msg| %>
131
+ <% job = Sidekiq::JobRecord.new(msg['payload']) %>
83
132
  <tr>
84
133
  <td><%= process %></td>
85
134
  <td><%= thread %></td>
@@ -87,7 +136,10 @@
87
136
  <td>
88
137
  <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
89
138
  </td>
90
- <td><%= job.display_class %></td>
139
+ <td>
140
+ <%= job.display_class %>
141
+ <%= display_tags(job, nil) %>
142
+ </td>
91
143
  <td>
92
144
  <div class="args"><%= display_args(job.display_args) %></div>
93
145
  </td>
@@ -1,73 +1,113 @@
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
+ <script type="text/javascript" src="<%= root_path %>javascripts/dashboard-charts.js"></script>
1
5
  <script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js"></script>
2
6
  <div class= "dashboard clearfix">
3
7
  <h3 >
4
8
  <%= t('Dashboard') %>
5
- <span class="beacon">
9
+ <span id="beacon" class="beacon">
6
10
  <span class="ring"></span>
7
11
  <span class="dot"></span>
8
12
  </span>
9
13
  </h3>
10
14
  <div class="interval-slider ltr">
11
15
  <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
12
- <span class="current-interval">5 sec</span>
16
+ <span id="sldr-text" class="current-interval">5 sec</span>
13
17
  <br/>
14
- <input type="range" min="2000" max="20000" step="1000" value="5000"/>
18
+ <input id="sldr" type="range" min="2000" max="20000" step="1000" value="5000"/>
15
19
  </div>
16
20
  </div>
17
21
 
18
22
  <div class="row chart">
19
- <div id="realtime" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>"></div>
20
- <div id="realtime-legend"></div>
23
+ <canvas id="realtime-chart"></canvas>
24
+ <script>
25
+ window.realtimeChart = new RealtimeChart(
26
+ document.getElementById("realtime-chart"),
27
+ <%= Sidekiq.dump_json({
28
+ processedLabel: t('Processed'),
29
+ failedLabel: t('Failed'),
30
+ labels: Array.new(50, ""),
31
+ processed: Array.new(50),
32
+ failed: Array.new(50),
33
+ updateUrl: "#{root_path}stats",
34
+ }) %>
35
+ )
36
+ </script>
37
+
38
+ <!-- start with a space in the legend so the height doesn't change when we add content dynamically -->
39
+ <div id="realtime-legend">&nbsp;</div>
40
+ <script>
41
+ realtimeChart.registerLegend(document.getElementById("realtime-legend"))
42
+ </script>
21
43
  </div>
22
44
 
23
- <div class="row chart">
24
- <h5>
25
- <span class="history-heading"><%= t('History') %></span>
45
+ <div class="row header">
46
+ <div class="col-sm-4 pull-left flip">
47
+ <h3><%= t('History') %></h3>
48
+ </div>
49
+ </div>
50
+ <div class="row chart">
51
+ <div>
26
52
  <a href="<%= root_path %>?days=7" class="history-graph <%= "active" if params[:days] == "7" %>"><%= t('OneWeek') %></a>
27
53
  <a href="<%= root_path %>" class="history-graph <%= "active" if params[:days].nil? || params[:days] == "30" %>"><%= t('OneMonth') %></a>
28
54
  <a href="<%= root_path %>?days=90" class="history-graph <%= "active" if params[:days] == "90" %>"><%= t('ThreeMonths') %></a>
29
55
  <a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
30
- </h5>
56
+ </div>
31
57
 
32
- <div id="history" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>stats"></div>
33
- <div id="history-legend"></div>
58
+ <canvas id="history-chart"></canvas>
59
+ <script>
60
+ window.historyChart = new DashboardChart(
61
+ document.getElementById("history-chart"),
62
+ <%= Sidekiq.dump_json({
63
+ processedLabel: t('Processed'),
64
+ failedLabel: t('Failed'),
65
+ processed: @processed_history.to_a.reverse,
66
+ failed: @failed_history.to_a.reverse,
67
+ }) %>
68
+ )
69
+ </script>
34
70
  </div>
35
71
 
36
72
  <br/>
37
- <h5>Redis</h5>
38
- <div class="redis-wrapper">
73
+ <div class="row header">
74
+ <div class="col-sm-4 pull-left flip">
75
+ <h3>Redis</h3>
76
+ </div>
77
+ </div>
78
+ <div class="stats-wrapper">
39
79
  <div class="stats-container">
40
80
  <% if @redis_info.fetch("redis_version", nil) %>
41
81
  <div class="stat">
42
- <h3 class="redis_version"><%= @redis_info.fetch("redis_version") %></h3>
82
+ <h3 id="redis_version"><%= @redis_info.fetch("redis_version") %></h3>
43
83
  <p><%= t('Version') %></p>
44
84
  </div>
45
85
  <% end %>
46
86
 
47
87
  <% if @redis_info.fetch("uptime_in_days", nil) %>
48
88
  <div class="stat">
49
- <h3 class="uptime_in_days"><%= @redis_info.fetch("uptime_in_days") %></h3>
89
+ <h3 id="uptime_in_days"><%= @redis_info.fetch("uptime_in_days") %></h3>
50
90
  <p><%= t('Uptime') %></p>
51
91
  </div>
52
92
  <% end %>
53
93
 
54
94
  <% if @redis_info.fetch("connected_clients", nil) %>
55
95
  <div class="stat">
56
- <h3 class="connected_clients"><%= @redis_info.fetch("connected_clients") %></h3>
96
+ <h3 id="connected_clients"><%= @redis_info.fetch("connected_clients") %></h3>
57
97
  <p><%= t('Connections') %></p>
58
98
  </div>
59
99
  <% end %>
60
100
 
61
101
  <% if @redis_info.fetch("used_memory_human", nil) %>
62
102
  <div class="stat">
63
- <h3 class="used_memory_human"><%= @redis_info.fetch("used_memory_human") %></h3>
103
+ <h3 id="used_memory_human"><%= @redis_info.fetch("used_memory_human") %></h3>
64
104
  <p><%= t('MemoryUsage') %></p>
65
105
  </div>
66
106
  <% end %>
67
107
 
68
108
  <% if @redis_info.fetch("used_memory_peak_human", nil) %>
69
109
  <div class="stat">
70
- <h3 class="used_memory_peak_human"><%= @redis_info.fetch("used_memory_peak_human") %></h3>
110
+ <h3 id="used_memory_peak_human"><%= @redis_info.fetch("used_memory_peak_human") %></h3>
71
111
  <p><%= t('PeakMemoryUsage') %></p>
72
112
  </div>
73
113
  <% end %>
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 !@dead['error_backtrace'].nil? %>
17
+ <% if @dead.error_backtrace %>
18
18
  <tr>
19
19
  <th><%= t('ErrorBacktrace') %></th>
20
20
  <td>
21
- <code><%= @dead['error_backtrace'].join("<br/>") %></code>
21
+ <code><%= @dead.error_backtrace.join("<br/>") %></code>
22
22
  </td>
23
23
  </tr>
24
24
  <% end %>
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-poll-path="<%= poll_path %>" data-locale="<%= locale %>">
25
+ <body class="admin" data-locale="<%= locale %>">
24
26
  <%= erb :_nav %>
25
27
  <div id="page">
26
28
  <div class="container">
@@ -0,0 +1,80 @@
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
+ <script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
5
+
6
+ <div class="header-container">
7
+ <h1><%= t('Metrics') %></h1>
8
+
9
+ <div>
10
+ <a target="blank" href="https://github.com/mperham/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
11
+ </div>
12
+ </div>
13
+
14
+ <%
15
+ table_limit = 20
16
+ chart_limit = 5
17
+ job_results = @query_result.job_results.sort_by { |(kls, jr)| jr.totals["s"] }.reverse.first(table_limit)
18
+ visible_kls = job_results.first(chart_limit).map(&:first)
19
+ %>
20
+
21
+ <% if job_results.any? %>
22
+ <canvas id="job-metrics-overview-chart"></canvas>
23
+
24
+ <script>
25
+ window.jobMetricsChart = new JobMetricsOverviewChart(
26
+ document.getElementById("job-metrics-overview-chart"),
27
+ <%= Sidekiq.dump_json({
28
+ series: job_results.map { |(kls, jr)| [kls, jr.dig("series", "s")] }.to_h,
29
+ marks: @query_result.marks.map { |m| [m.bucket, m.label] },
30
+ labels: @query_result.buckets,
31
+ visibleKls: visible_kls,
32
+ yLabel: t('TotalExecutionTime'),
33
+ units: t('Seconds').downcase,
34
+ markLabel: t('Deploy'),
35
+ }) %>
36
+ )
37
+ </script>
38
+ <% end %>
39
+
40
+ <div class="table_container">
41
+ <table class="table table-bordered table-striped table-hover">
42
+ <tbody>
43
+ <tr>
44
+ <th><%= t('Name') %></th>
45
+ <th><%= t('Success') %></th>
46
+ <th><%= t('Failure') %></th>
47
+ <th><%= t('TotalExecutionTime') %></th>
48
+ <th><%= t('AvgExecutionTime') %></th>
49
+ </tr>
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 %>"><%= kls %></a></code>
64
+ </div>
65
+ <script>jobMetricsChart.registerSwatch("<%= id %>")</script>
66
+ </td>
67
+ <td><%= jr.dig("totals", "p") - jr.dig("totals", "f") %></td>
68
+ <td><%= jr.dig("totals", "f") %></td>
69
+ <td><%= jr.dig("totals", "s").round(2) %> seconds</td>
70
+ <td><%= jr.total_avg("s").round(2) %> seconds</td>
71
+ </tr>
72
+ <% end %>
73
+ <% else %>
74
+ <tr><td colspan=5><%= t("NoDataFound") %></td></tr>
75
+ <% end %>
76
+ </tbody>
77
+ </table>
78
+ </div>
79
+
80
+ <p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p>
@@ -0,0 +1,69 @@
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
+ <script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
5
+
6
+ <%
7
+ job_result = @query_result.job_results[@name]
8
+ hist_totals = job_result.hist.values.first.zip(*job_result.hist.values[1..-1]).map(&:sum)
9
+ bucket_labels =Sidekiq::Metrics::Histogram::LABELS
10
+ bucket_intervals =Sidekiq::Metrics::Histogram::BUCKET_INTERVALS.reverse
11
+
12
+ # Replace INFINITY since it can't be represented as JSON
13
+ bucket_intervals[0] = bucket_intervals[1] * 2
14
+ %>
15
+
16
+ <% if job_result.totals["s"] > 0 %>
17
+ <div class="header-container">
18
+ <h1>
19
+ <a href="<%= root_path %>metrics"><%= t(:metrics).to_s.titleize %></a> /
20
+ <%= h @name %>
21
+ </h1>
22
+
23
+ <div>
24
+ <a target="blank" href="https://github.com/mperham/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
25
+ </div>
26
+ </div>
27
+
28
+ <canvas id="hist-totals-chart"></canvas>
29
+
30
+ <script>
31
+ window.histTotalsChart = new HistTotalsChart(
32
+ document.getElementById("hist-totals-chart"),
33
+ <%= Sidekiq.dump_json({
34
+ series: hist_totals,
35
+ labels: bucket_labels,
36
+ xLabel: t('ExecutionTime'),
37
+ yLabel: t('Jobs'),
38
+ units: t('Jobs').downcase,
39
+ }) %>
40
+ )
41
+ </script>
42
+
43
+ <canvas id="hist-bubble-chart"></canvas>
44
+
45
+ <script>
46
+ window.histBubbleChart = new HistBubbleChart(
47
+ document.getElementById("hist-bubble-chart"),
48
+ <%= Sidekiq.dump_json({
49
+ hist: job_result.hist,
50
+ marks: @query_result.marks.map { |m| [m.bucket, m.label] },
51
+ labels: @query_result.buckets,
52
+ histIntervals: bucket_intervals,
53
+ yLabel: t('ExecutionTime'),
54
+ markLabel: t('Deploy'),
55
+ yUnits: t('Seconds').downcase,
56
+ zUnits: t('Jobs').downcase,
57
+ }) %>
58
+ )
59
+ </script>
60
+
61
+ <p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p>
62
+ <% else %>
63
+ <h1>
64
+ <a href="<%= root_path %>/metrics"><%= t(:metrics).to_s.titleize %></a> /
65
+ <%= h @name %>
66
+ </h1>
67
+
68
+ <div class="alert alert-success"><%= t('NoJobMetricsFound') %></div>
69
+ <% end %>
data/web/views/morgue.erb CHANGED
@@ -14,7 +14,7 @@
14
14
  <form action="<%= root_path %>morgue" method="post">
15
15
  <%= csrf_tag %>
16
16
  <div class="table_container">
17
- <table class="table table-striped table-bordered table-white">
17
+ <table class="table table-striped table-bordered table-hover">
18
18
  <thead>
19
19
  <tr>
20
20
  <th class="table-checkbox checkbox-column">
@@ -33,7 +33,7 @@
33
33
  <tr>
34
34
  <td class="table-checkbox">
35
35
  <label>
36
- <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
36
+ <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
37
37
  </label>
38
38
  </td>
39
39
  <td>
@@ -42,7 +42,10 @@
42
42
  <td>
43
43
  <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
44
44
  </td>
45
- <td><%= entry.display_class %></td>
45
+ <td>
46
+ <%= entry.display_class %>
47
+ <%= display_tags(entry, "dead") %>
48
+ </td>
46
49
  <td>
47
50
  <div class="args"><%= display_args(entry.display_args) %></div>
48
51
  </td>
@@ -55,18 +58,18 @@
55
58
  <% end %>
56
59
  </table>
57
60
  </div>
58
- <input class="btn btn-primary btn-xs pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
59
- <input class="btn btn-danger btn-xs pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
61
+ <input class="btn btn-primary pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
62
+ <input class="btn btn-danger pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
60
63
  </form>
61
64
 
62
65
  <% unfiltered? do %>
63
66
  <form action="<%= root_path %>morgue/all/delete" method="post">
64
67
  <%= csrf_tag %>
65
- <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
68
+ <input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
66
69
  </form>
67
70
  <form action="<%= root_path %>morgue/all/retry" method="post">
68
71
  <%= csrf_tag %>
69
- <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
72
+ <input class="btn btn-danger pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
70
73
  </form>
71
74
  <% end %>
72
75
 
data/web/views/queue.erb CHANGED
@@ -15,27 +15,40 @@
15
15
  <div class="table_container">
16
16
  <table class="queue table table-hover table-bordered table-striped">
17
17
  <thead>
18
+ <th><a href="<%= url %>?direction=<%= params[:direction] == 'asc' ? 'desc' : 'asc' %>"># <%= sort_direction_label %></a></th>
18
19
  <th><%= t('Job') %></th>
19
20
  <th><%= t('Arguments') %></th>
21
+ <th><%= t('Context') %></th>
20
22
  <th></th>
21
23
  </thead>
22
- <% @messages.each_with_index do |msg, index| %>
23
- <tr>
24
- <td><%= h(msg.display_class) %></td>
24
+ <% @jobs.each_with_index do |job, index| %>
25
+ <tr title="<%= job.jid %>">
26
+ <% if params[:direction] == 'asc' %>
27
+ <td><%= @count * (@current_page - 1) + index + 1 %></td>
28
+ <% else %>
29
+ <td><%= @total_size - (@count * (@current_page - 1) + index) %></td>
30
+ <% end %>
25
31
  <td>
26
- <% a = msg.display_args %>
32
+ <%= h(job.display_class) %>
33
+ <%= display_tags(job, nil) %>
34
+ </td>
35
+ <td>
36
+ <% a = job.display_args %>
27
37
  <% if a.inspect.size > 100 %>
28
- <span class="worker_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
29
- <button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
30
- <div class="toggle worker_<%= index %>"><%= display_args(a) %></div>
38
+ <span id="job_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
39
+ <button data-toggle="job_<%= index %>_full" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
40
+ <div class="toggle" id="job_<%= index %>_full"><%= display_args(a) %></div>
31
41
  <% else %>
32
- <%= display_args(msg.display_args) %>
42
+ <%= display_args(job.display_args) %>
33
43
  <% end %>
34
44
  </td>
45
+ <td>
46
+ <%= h(job["cattr"].inspect) if job["cattr"]&.any? %>
47
+ </td>
35
48
  <td>
36
49
  <form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
37
50
  <%= csrf_tag %>
38
- <input name="key_val" value="<%= h msg.value %>" type="hidden" />
51
+ <input name="key_val" value="<%= h job.value %>" type="hidden" />
39
52
  <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
40
53
  </form>
41
54
  </td>
@@ -43,4 +56,4 @@
43
56
  <% end %>
44
57
  </table>
45
58
  </div>
46
- <%= erb :_paging, locals: { url: "#{root_path}queues/#{@name}" } %>
59
+ <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
data/web/views/queues.erb CHANGED
@@ -1,7 +1,7 @@
1
1
  <h3><%= t('Queues') %></h3>
2
2
 
3
3
  <div class="table_container">
4
- <table class="queues table table-hover table-bordered table-striped table-white">
4
+ <table class="queues table table-hover table-bordered table-striped">
5
5
  <thead>
6
6
  <th><%= t('Queue') %></th>
7
7
  <th><%= t('Size') %></th>
@@ -21,7 +21,15 @@
21
21
  <td class="delete-confirm">
22
22
  <form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
23
23
  <%= csrf_tag %>
24
- <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
24
+ <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)) %>" />
25
+
26
+ <% if Sidekiq.pro? %>
27
+ <% if queue.paused? %>
28
+ <input class="btn btn-danger" type="submit" name="unpause" value="<%= t('Unpause') %>" />
29
+ <% else %>
30
+ <input class="btn btn-danger" type="submit" name="pause" value="<%= t('Pause') %>" />
31
+ <% end %>
32
+ <% end %>
25
33
  </form>
26
34
  </td>
27
35
  </tr>