sidekiq 5.1.3 → 7.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/Changes.md +756 -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 +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 +640 -330
- data/lib/sidekiq/capsule.rb +132 -0
- data/lib/sidekiq/cli.rb +244 -257
- data/lib/sidekiq/client.rb +132 -103
- data/lib/sidekiq/component.rb +68 -0
- data/lib/sidekiq/config.rb +293 -0
- data/lib/sidekiq/deploy.rb +64 -0
- data/lib/sidekiq/embedded.rb +63 -0
- data/lib/sidekiq/fetch.rb +49 -42
- data/lib/sidekiq/iterable_job.rb +55 -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 +231 -0
- data/lib/sidekiq/job.rb +385 -0
- data/lib/sidekiq/job_logger.rb +49 -12
- data/lib/sidekiq/job_retry.rb +167 -103
- data/lib/sidekiq/job_util.rb +109 -0
- data/lib/sidekiq/launcher.rb +209 -102
- data/lib/sidekiq/logger.rb +131 -0
- data/lib/sidekiq/manager.rb +43 -46
- data/lib/sidekiq/metrics/query.rb +158 -0
- data/lib/sidekiq/metrics/shared.rb +97 -0
- data/lib/sidekiq/metrics/tracking.rb +148 -0
- data/lib/sidekiq/middleware/chain.rb +113 -56
- data/lib/sidekiq/middleware/current_attributes.rb +113 -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 +28 -16
- data/lib/sidekiq/processor.rb +175 -112
- data/lib/sidekiq/rails.rb +54 -39
- data/lib/sidekiq/redis_client_adapter.rb +114 -0
- data/lib/sidekiq/redis_connection.rb +65 -86
- data/lib/sidekiq/ring_buffer.rb +31 -0
- data/lib/sidekiq/scheduled.rb +139 -48
- 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 +95 -94
- data/lib/sidekiq/transaction_aware_client.rb +51 -0
- data/lib/sidekiq/version.rb +3 -1
- data/lib/sidekiq/web/action.rb +22 -12
- data/lib/sidekiq/web/application.rb +225 -76
- data/lib/sidekiq/web/csrf_protection.rb +183 -0
- data/lib/sidekiq/web/helpers.rb +215 -118
- data/lib/sidekiq/web/router.rb +23 -19
- data/lib/sidekiq/web.rb +114 -106
- data/lib/sidekiq/worker_compatibility_alias.rb +13 -0
- data/lib/sidekiq.rb +95 -182
- data/sidekiq.gemspec +26 -23
- data/web/assets/images/apple-touch-icon.png +0 -0
- data/web/assets/javascripts/application.js +157 -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 +192 -0
- data/web/assets/javascripts/dashboard.js +35 -283
- 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 +169 -522
- data/web/assets/stylesheets/bootstrap.css +2 -2
- data/web/locales/ar.yml +71 -64
- 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 -65
- 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/tr.yml +101 -0
- 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 +4 -18
- 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 +49 -19
- data/web/views/dead.erb +3 -3
- data/web/views/filtering.erb +7 -0
- data/web/views/layout.erb +9 -7
- 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 -23
- data/web/views/queues.erb +19 -5
- data/web/views/retries.erb +19 -16
- data/web/views/retry.erb +3 -3
- data/web/views/scheduled.erb +17 -15
- metadata +84 -129
- data/.github/contributing.md +0 -32
- data/.github/issue_template.md +0 -11
- data/.gitignore +0 -13
- data/.travis.yml +0 -14
- 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 -95
- data/Ent-Changes.md +0 -216
- data/Gemfile +0 -8
- 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 -729
- data/Rakefile +0 -8
- data/bin/sidekiqctl +0 -99
- 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/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 -204
@@ -0,0 +1,298 @@
|
|
1
|
+
class JobMetricsOverviewChart extends BaseChart {
|
2
|
+
constructor(el, options) {
|
3
|
+
super(el, { ...options, chartType: "line" });
|
4
|
+
this.swatches = [];
|
5
|
+
this.visibleKls = options.visibleKls;
|
6
|
+
|
7
|
+
const countBuckets = this.options.labels.length / 60;
|
8
|
+
this.labelBuckets = this.options.labels.reduce((acc, label, index) => {
|
9
|
+
const bucket = Math.floor(index / countBuckets);
|
10
|
+
acc[bucket] = acc[bucket] || [];
|
11
|
+
acc[bucket].push(label);
|
12
|
+
return acc;
|
13
|
+
}, []);
|
14
|
+
|
15
|
+
this.init();
|
16
|
+
}
|
17
|
+
|
18
|
+
get datasets() {
|
19
|
+
return Object.entries(this.options.series)
|
20
|
+
.filter(([kls, _]) => this.visibleKls.includes(kls))
|
21
|
+
.map(([kls, _]) => this.buildDataset(kls));
|
22
|
+
}
|
23
|
+
|
24
|
+
get metric() {
|
25
|
+
return this._metric || this.options.initialMetric;
|
26
|
+
}
|
27
|
+
|
28
|
+
set metric(m) {
|
29
|
+
this._metric = m;
|
30
|
+
}
|
31
|
+
|
32
|
+
registerSwatch(id) {
|
33
|
+
const el = document.getElementById(id);
|
34
|
+
el.addEventListener("change", () => this.toggleKls(el.value, el.checked));
|
35
|
+
this.swatches[el.value] = el;
|
36
|
+
this.updateSwatch(el.value, el.checked);
|
37
|
+
}
|
38
|
+
|
39
|
+
updateSwatch(kls, checked) {
|
40
|
+
const el = this.swatches[kls];
|
41
|
+
el.checked = checked;
|
42
|
+
el.style.color = this.colors.assignments[kls] || "";
|
43
|
+
}
|
44
|
+
|
45
|
+
toggleKls(kls, visible) {
|
46
|
+
if (visible) {
|
47
|
+
this.chart.data.datasets.push(this.buildDataset(kls));
|
48
|
+
} else {
|
49
|
+
const i = this.chart.data.datasets.findIndex((ds) => ds.label == kls);
|
50
|
+
this.colors.checkIn(kls);
|
51
|
+
this.chart.data.datasets.splice(i, 1);
|
52
|
+
}
|
53
|
+
|
54
|
+
this.updateSwatch(kls, visible);
|
55
|
+
this.update();
|
56
|
+
}
|
57
|
+
|
58
|
+
buildDataset(kls) {
|
59
|
+
const color = this.colors.checkOut(kls);
|
60
|
+
|
61
|
+
return {
|
62
|
+
label: kls,
|
63
|
+
data: this.buildSeries(kls),
|
64
|
+
borderColor: color,
|
65
|
+
backgroundColor: color,
|
66
|
+
borderWidth: 2,
|
67
|
+
pointRadius: 2,
|
68
|
+
};
|
69
|
+
}
|
70
|
+
|
71
|
+
buildSeries(kls) {
|
72
|
+
// `series` is an object that maps labels to counts => { "20:15" => 2, "20:16" => 3, ... }
|
73
|
+
const series = this.options.series[kls];
|
74
|
+
return this.labelBuckets.reduce((acc, labels) => {
|
75
|
+
const bucketValues = labels.map(label => series[label]).filter(v => v);
|
76
|
+
if (bucketValues.length > 0) {
|
77
|
+
// Sum up the values for each bucket that has data.
|
78
|
+
// The new label is the bucket's first label, its start time.
|
79
|
+
acc[labels[0]] = bucketValues.reduce((a, b) => a + b, 0);
|
80
|
+
}
|
81
|
+
return acc;
|
82
|
+
}, {});
|
83
|
+
}
|
84
|
+
|
85
|
+
buildTooltipTitle(items) {
|
86
|
+
const [first, ...rest] = this.labelBuckets.find((labels) => labels[0] === items[0].label);
|
87
|
+
const title = [first, rest[rest.length - 1]].filter(v => v).join(" - ");
|
88
|
+
return `${title} UTC`
|
89
|
+
}
|
90
|
+
|
91
|
+
get chartOptions() {
|
92
|
+
return {
|
93
|
+
...super.chartOptions,
|
94
|
+
aspectRatio: 4,
|
95
|
+
scales: {
|
96
|
+
...super.chartOptions.scales,
|
97
|
+
y: {
|
98
|
+
...super.chartOptions.scales.y,
|
99
|
+
beginAtZero: true,
|
100
|
+
title: {
|
101
|
+
text: this.options.yLabel,
|
102
|
+
display: true,
|
103
|
+
},
|
104
|
+
},
|
105
|
+
},
|
106
|
+
plugins: {
|
107
|
+
...super.chartOptions.plugins,
|
108
|
+
tooltip: {
|
109
|
+
...super.chartOptions.plugins.tooltip,
|
110
|
+
callbacks: {
|
111
|
+
title: (items) => this.buildTooltipTitle(items),
|
112
|
+
label: (item) =>
|
113
|
+
`${item.dataset.label}: ${item.parsed.y.toFixed(1)} ` +
|
114
|
+
`${this.options.units}`,
|
115
|
+
footer: (items) => {
|
116
|
+
const bucket = items[0].label;
|
117
|
+
const marks = this.options.marks.filter(([b, _]) => b == bucket);
|
118
|
+
return marks.map(
|
119
|
+
([b, msg]) => `${this.options.markLabel}: ${msg}`
|
120
|
+
);
|
121
|
+
},
|
122
|
+
},
|
123
|
+
},
|
124
|
+
},
|
125
|
+
};
|
126
|
+
}
|
127
|
+
}
|
128
|
+
|
129
|
+
class HistTotalsChart extends BaseChart {
|
130
|
+
constructor(el, options) {
|
131
|
+
super(el, { ...options, chartType: "bar" });
|
132
|
+
this.init();
|
133
|
+
}
|
134
|
+
|
135
|
+
get datasets() {
|
136
|
+
return [
|
137
|
+
{
|
138
|
+
data: this.options.series,
|
139
|
+
backgroundColor: this.colors.primary,
|
140
|
+
borderWidth: 0,
|
141
|
+
},
|
142
|
+
];
|
143
|
+
}
|
144
|
+
|
145
|
+
get chartOptions() {
|
146
|
+
return {
|
147
|
+
...super.chartOptions,
|
148
|
+
aspectRatio: 6,
|
149
|
+
scales: {
|
150
|
+
...super.chartOptions.scales,
|
151
|
+
y: {
|
152
|
+
...super.chartOptions.scales.y,
|
153
|
+
beginAtZero: true,
|
154
|
+
title: {
|
155
|
+
text: this.options.yLabel,
|
156
|
+
display: true,
|
157
|
+
},
|
158
|
+
},
|
159
|
+
x: {
|
160
|
+
...super.chartOptions.scales.x,
|
161
|
+
title: {
|
162
|
+
text: this.options.xLabel,
|
163
|
+
display: true,
|
164
|
+
},
|
165
|
+
},
|
166
|
+
},
|
167
|
+
plugins: {
|
168
|
+
...super.chartOptions.plugins,
|
169
|
+
tooltip: {
|
170
|
+
...super.chartOptions.plugins.tooltip,
|
171
|
+
callbacks: {
|
172
|
+
label: (item) => `${item.parsed.y} ${this.options.units}`,
|
173
|
+
},
|
174
|
+
},
|
175
|
+
},
|
176
|
+
};
|
177
|
+
}
|
178
|
+
}
|
179
|
+
|
180
|
+
class HistBubbleChart extends BaseChart {
|
181
|
+
constructor(el, options) {
|
182
|
+
super(el, { ...options, chartType: "bubble" });
|
183
|
+
this.init();
|
184
|
+
}
|
185
|
+
|
186
|
+
get datasets() {
|
187
|
+
const data = [];
|
188
|
+
let maxCount = 0;
|
189
|
+
|
190
|
+
Object.entries(this.options.hist).forEach(([bucket, hist]) => {
|
191
|
+
hist.forEach((count, histBucket) => {
|
192
|
+
if (count > 0) {
|
193
|
+
// histogram data is ordered fastest to slowest, but this.histIntervals is
|
194
|
+
// slowest to fastest (so it displays correctly on the chart).
|
195
|
+
const index = this.options.histIntervals.length - 1 - histBucket;
|
196
|
+
|
197
|
+
data.push({
|
198
|
+
x: bucket,
|
199
|
+
y: this.options.histIntervals[index] / 1000,
|
200
|
+
count: count,
|
201
|
+
});
|
202
|
+
|
203
|
+
if (count > maxCount) maxCount = count;
|
204
|
+
}
|
205
|
+
});
|
206
|
+
});
|
207
|
+
|
208
|
+
// Chart.js will not calculate the bubble size. We have to do that.
|
209
|
+
const maxRadius = this.el.offsetWidth / this.options.labels.length;
|
210
|
+
const minRadius = 1;
|
211
|
+
const multiplier = (maxRadius / maxCount) * 1.5;
|
212
|
+
data.forEach((entry) => {
|
213
|
+
entry.r = entry.count * multiplier + minRadius;
|
214
|
+
});
|
215
|
+
|
216
|
+
return [
|
217
|
+
{
|
218
|
+
data: data,
|
219
|
+
backgroundColor: this.colors.primary,
|
220
|
+
borderColor: this.colors.primary,
|
221
|
+
},
|
222
|
+
];
|
223
|
+
}
|
224
|
+
|
225
|
+
get chartOptions() {
|
226
|
+
return {
|
227
|
+
...super.chartOptions,
|
228
|
+
aspectRatio: 3,
|
229
|
+
scales: {
|
230
|
+
...super.chartOptions.scales,
|
231
|
+
x: {
|
232
|
+
...super.chartOptions.scales.x,
|
233
|
+
type: "category",
|
234
|
+
labels: this.options.labels,
|
235
|
+
},
|
236
|
+
y: {
|
237
|
+
...super.chartOptions.scales.y,
|
238
|
+
title: {
|
239
|
+
text: this.options.yLabel,
|
240
|
+
display: true,
|
241
|
+
},
|
242
|
+
},
|
243
|
+
},
|
244
|
+
plugins: {
|
245
|
+
...super.chartOptions.plugins,
|
246
|
+
tooltip: {
|
247
|
+
...super.chartOptions.plugins.tooltip,
|
248
|
+
callbacks: {
|
249
|
+
title: (items) => `${items[0].raw.x} UTC`,
|
250
|
+
label: (item) =>
|
251
|
+
`${item.parsed.y} ${this.options.yUnits}: ${item.raw.count} ${this.options.zUnits}`,
|
252
|
+
footer: (items) => {
|
253
|
+
const bucket = items[0].raw.x;
|
254
|
+
const marks = this.options.marks.filter(([b, _]) => b == bucket);
|
255
|
+
return marks.map(
|
256
|
+
([b, msg]) => `${this.options.markLabel}: ${msg}`
|
257
|
+
);
|
258
|
+
},
|
259
|
+
},
|
260
|
+
},
|
261
|
+
},
|
262
|
+
};
|
263
|
+
}
|
264
|
+
}
|
265
|
+
|
266
|
+
var ch = document.getElementById("job-metrics-overview-chart");
|
267
|
+
if (ch != null) {
|
268
|
+
var jm = new JobMetricsOverviewChart(ch, JSON.parse(ch.textContent));
|
269
|
+
document.querySelectorAll(".metrics-swatch-wrapper > input[type=checkbox]").forEach((imp) => {
|
270
|
+
jm.registerSwatch(imp.id)
|
271
|
+
});
|
272
|
+
window.jobMetricsChart = jm;
|
273
|
+
}
|
274
|
+
|
275
|
+
var htc = document.getElementById("hist-totals-chart");
|
276
|
+
if (htc != null) {
|
277
|
+
var tc = new HistTotalsChart(htc, JSON.parse(htc.textContent));
|
278
|
+
window.histTotalsChart = tc
|
279
|
+
}
|
280
|
+
|
281
|
+
var hbc = document.getElementById("hist-bubble-chart");
|
282
|
+
if (hbc != null) {
|
283
|
+
var bc = new HistBubbleChart(hbc, JSON.parse(hbc.textContent));
|
284
|
+
window.histBubbleChart = bc
|
285
|
+
}
|
286
|
+
|
287
|
+
var form = document.getElementById("metrics-form")
|
288
|
+
document.querySelectorAll("#period-selector").forEach(node => {
|
289
|
+
node.addEventListener("input", debounce(() => form.submit()))
|
290
|
+
})
|
291
|
+
|
292
|
+
function debounce(func, timeout = 300) {
|
293
|
+
let timer;
|
294
|
+
return (...args) => {
|
295
|
+
clearTimeout(timer);
|
296
|
+
timer = setTimeout(() => { func.apply(this, args); }, timeout);
|
297
|
+
};
|
298
|
+
}
|
@@ -0,0 +1,147 @@
|
|
1
|
+
html, body {
|
2
|
+
background-color: #171717 !important;
|
3
|
+
color: #DEDEDE;
|
4
|
+
}
|
5
|
+
|
6
|
+
a,
|
7
|
+
.title,
|
8
|
+
.summary_bar ul .count,
|
9
|
+
span.current-interval,
|
10
|
+
.navbar .navbar-brand {
|
11
|
+
color: #d04;
|
12
|
+
}
|
13
|
+
|
14
|
+
.history-graph.active,
|
15
|
+
.beacon .dot {
|
16
|
+
background-color: #d04;
|
17
|
+
}
|
18
|
+
|
19
|
+
.navbar .navbar-brand:hover {
|
20
|
+
color: #ddd;
|
21
|
+
}
|
22
|
+
|
23
|
+
.navbar .navbar-brand .status {
|
24
|
+
color: #ddd;
|
25
|
+
}
|
26
|
+
|
27
|
+
.navbar-default .navbar-nav > li > a {
|
28
|
+
color: #ddd;
|
29
|
+
}
|
30
|
+
|
31
|
+
.navbar-inverse {
|
32
|
+
background-color: #222;
|
33
|
+
border-color: #444;
|
34
|
+
}
|
35
|
+
|
36
|
+
table {
|
37
|
+
background-color: #1D1D1D;
|
38
|
+
}
|
39
|
+
|
40
|
+
.table-striped > tbody > tr:nth-of-type(odd) {
|
41
|
+
background-color: #2E2E2E;
|
42
|
+
}
|
43
|
+
|
44
|
+
.table-bordered,
|
45
|
+
.table-bordered > tbody > tr > td,
|
46
|
+
.table-bordered > tbody > tr > th,
|
47
|
+
.table-bordered > tfoot > tr > td,
|
48
|
+
.table-bordered > tfoot > tr > th,
|
49
|
+
.table-bordered > thead > tr > td,
|
50
|
+
.table-bordered > thead > tr > th {
|
51
|
+
border: 1px solid #444;
|
52
|
+
}
|
53
|
+
|
54
|
+
.table-hover > tbody > tr:hover {
|
55
|
+
background-color: #444;
|
56
|
+
}
|
57
|
+
|
58
|
+
.alert {
|
59
|
+
border: none;
|
60
|
+
color: #ddd;
|
61
|
+
}
|
62
|
+
|
63
|
+
.alert-success {
|
64
|
+
background-color: #484;
|
65
|
+
}
|
66
|
+
|
67
|
+
.alert-danger {
|
68
|
+
background-color: #980035;
|
69
|
+
}
|
70
|
+
|
71
|
+
.alert-info {
|
72
|
+
background-color: #31708f;
|
73
|
+
}
|
74
|
+
|
75
|
+
.alert-warning {
|
76
|
+
background-color: #c47612;
|
77
|
+
}
|
78
|
+
|
79
|
+
a:link, a:active, a:hover, a:visited {
|
80
|
+
color: #ddd;
|
81
|
+
}
|
82
|
+
|
83
|
+
input {
|
84
|
+
background-color: #444;
|
85
|
+
color: #ccc;
|
86
|
+
padding: 3px;
|
87
|
+
}
|
88
|
+
|
89
|
+
.summary_bar .summary {
|
90
|
+
background-color: #232323;
|
91
|
+
border: 1px solid #444;
|
92
|
+
}
|
93
|
+
|
94
|
+
.navbar-default {
|
95
|
+
background-color: #0F0F0F;
|
96
|
+
border-color: #444;
|
97
|
+
}
|
98
|
+
|
99
|
+
.navbar-default .navbar-nav > .active > a,
|
100
|
+
.navbar-default .navbar-nav > .active > a:focus,
|
101
|
+
.navbar-default .navbar-nav > .active > a:hover {
|
102
|
+
color: #ddd;
|
103
|
+
background-color: #333;
|
104
|
+
}
|
105
|
+
|
106
|
+
.navbar-default .navbar-nav > li > a:hover {
|
107
|
+
color: #ddd;
|
108
|
+
}
|
109
|
+
|
110
|
+
.pagination > li > a,
|
111
|
+
.pagination > li > a:hover,
|
112
|
+
.pagination > li > span {
|
113
|
+
color: #ddd;
|
114
|
+
background-color: #333;
|
115
|
+
border-color: #444;
|
116
|
+
}
|
117
|
+
.pagination > .disabled > a,
|
118
|
+
.pagination > .disabled > a:focus,
|
119
|
+
.pagination > .disabled > a:hover,
|
120
|
+
.pagination > .disabled > span,
|
121
|
+
.pagination > .disabled > span:focus,
|
122
|
+
.pagination > .disabled > span:hover {
|
123
|
+
color: #ddd;
|
124
|
+
background-color: #333;
|
125
|
+
border-color: #444;
|
126
|
+
}
|
127
|
+
|
128
|
+
.stat {
|
129
|
+
border: 1px solid #888;
|
130
|
+
}
|
131
|
+
|
132
|
+
.rickshaw_graph .detail {
|
133
|
+
background: #888;
|
134
|
+
}
|
135
|
+
.rickshaw_graph .x_tick {
|
136
|
+
border-color: #888;
|
137
|
+
}
|
138
|
+
|
139
|
+
.rickshaw_graph .y_ticks.glow text {
|
140
|
+
fill: #ddd;
|
141
|
+
color: #ddd;
|
142
|
+
}
|
143
|
+
|
144
|
+
.info-circle {
|
145
|
+
color: #222;
|
146
|
+
background-color: #888;
|
147
|
+
}
|
@@ -46,10 +46,6 @@ form .btn-group .btn {
|
|
46
46
|
.navbar .poll-wrapper {
|
47
47
|
margin: 4px 0 0 4px;
|
48
48
|
}
|
49
|
-
|
50
|
-
.navbar .dropdown-menu a {
|
51
|
-
text-align: right;
|
52
|
-
}
|
53
49
|
}
|
54
50
|
|
55
51
|
.navbar-footer .navbar ul.nav a.navbar-brand {
|
@@ -106,22 +102,8 @@ div.interval-slider {
|
|
106
102
|
float: left;
|
107
103
|
}
|
108
104
|
|
109
|
-
#realtime-legend
|
110
|
-
|
111
|
-
text-align: right;
|
112
|
-
float: left;
|
113
|
-
}
|
114
|
-
#realtime-legend .timestamp,
|
115
|
-
#history-legend .timestamp {
|
116
|
-
text-align: left;
|
117
|
-
}
|
118
|
-
#realtime-legend .line,
|
119
|
-
#history-legend .line {
|
120
|
-
margin: 0 20px 0 0;
|
121
|
-
}
|
122
|
-
#realtime-legend .swatch,
|
123
|
-
#history-legend .swatch {
|
124
|
-
margin: 0 0 0 8px;
|
105
|
+
#realtime-legend {
|
106
|
+
justify-content: start;
|
125
107
|
}
|
126
108
|
|
127
109
|
/* Beacon
|
@@ -170,77 +152,12 @@ div.interval-slider {
|
|
170
152
|
}
|
171
153
|
}
|
172
154
|
|
173
|
-
|
174
|
-
|
175
|
-
.rickshaw_graph .detail .x_label.left {
|
176
|
-
right: 0
|
177
|
-
}
|
178
|
-
.rickshaw_graph .detail .x_label.right {
|
179
|
-
left: 0
|
180
|
-
}
|
181
|
-
.rickshaw_graph .detail .item.left {
|
182
|
-
right: 0
|
183
|
-
}
|
184
|
-
.rickshaw_graph .detail .item.right {
|
185
|
-
left: 0
|
186
|
-
}
|
187
|
-
.rickshaw_graph .detail .item.left:after {
|
188
|
-
left: 0;
|
189
|
-
right: -5px;
|
190
|
-
border-right-color: unset;
|
191
|
-
border-left-color: rgba(0, 0, 0, .8);
|
192
|
-
border-right-width: 0;
|
193
|
-
border-left-width: unset;
|
194
|
-
}
|
195
|
-
.rickshaw_graph .detail .item.right:after {
|
196
|
-
right: 0;
|
197
|
-
left: -5px;
|
198
|
-
border-left-color: unset;
|
199
|
-
border-right-color: rgba(0, 0, 0, .8);
|
200
|
-
border-left-width: 0;
|
201
|
-
border-right-width: unset;
|
202
|
-
}
|
203
|
-
.rickshaw_graph .detail .dot {
|
204
|
-
margin-right: -3px;
|
205
|
-
margin-left: unset;
|
206
|
-
}
|
207
|
-
.rickshaw_graph .x_tick {
|
208
|
-
border-left: unset;
|
209
|
-
border-right: 1px dotted rgba(0, 0, 0, .2);
|
210
|
-
}
|
211
|
-
.rickshaw_graph .x_tick .title {
|
212
|
-
margin-right: 3px;
|
213
|
-
margin-left: unset;
|
214
|
-
}
|
215
|
-
.rickshaw_annotation_timeline .annotation {
|
216
|
-
margin-right: -2px;
|
217
|
-
margin-left: unset;
|
218
|
-
}
|
219
|
-
.rickshaw_graph .annotation_line {
|
220
|
-
border-right: 2px solid rgba(0, 0, 0, .3);
|
221
|
-
border-left: unset;
|
222
|
-
}
|
223
|
-
.rickshaw_annotation_timeline .annotation .content {
|
224
|
-
left: unset;
|
225
|
-
right: -11px;
|
226
|
-
}
|
227
|
-
.rickshaw_graph .x_tick.glow .title,
|
228
|
-
.rickshaw_graph .y_ticks.glow text {
|
229
|
-
text-shadow: 1px 1px 0 rgba(255, 255, 255, .1), -1px -1px 0 rgba(255, 255, 255, .1), -1px 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1), 0 -1px 0 rgba(255, 255, 255, .1), -1px 0 0 rgba(255, 255, 255, .1), 1px 0 0 rgba(255, 255, 255, .1), 1px -1px 0 rgba(255, 255, 255, .1)
|
230
|
-
}
|
231
|
-
.rickshaw_graph .x_tick.inverse .title,
|
232
|
-
.rickshaw_graph .y_ticks.inverse text {
|
233
|
-
text-shadow: 1px 1px 0 rgba(0, 0, 0, .8), -1px -1px 0 rgba(0, 0, 0, .8), -1px 1px 0 rgba(0, 0, 0, .8), 0 1px 0 rgba(0, 0, 0, .8), 0 -1px 0 rgba(0, 0, 0, .8), -1px 0 0 rgba(0, 0, 0, .8), 1px 0 0 rgba(0, 0, 0, .8), 1px -1px 0 rgba(0, 0, 0, .8)
|
234
|
-
}
|
235
|
-
.rickshaw_legend .line {
|
236
|
-
padding-left: 15px;
|
237
|
-
padding-right: unset;
|
238
|
-
}
|
239
|
-
.rickshaw_legend .line .swatch {
|
240
|
-
margin-left: 3px;
|
241
|
-
margin-right: unset;
|
242
|
-
}
|
243
|
-
.rickshaw_legend .action {
|
244
|
-
margin-left: .2em;
|
245
|
-
margin-right: unset;
|
155
|
+
#locale-select {
|
156
|
+
float: right;
|
246
157
|
}
|
158
|
+
|
159
|
+
@media (max-width: 767px) {
|
160
|
+
#locale-select {
|
161
|
+
float: none;
|
162
|
+
}
|
163
|
+
}
|