sidekiq 6.2.2 → 7.1.0

data/web/assets/javascripts/metrics.js

@@ -0,0 +1,264 @@
+class JobMetricsOverviewChart extends BaseChart {
+  constructor(el, options) {
+    super(el, { ...options, chartType: "line" });
+    this.swatches = [];
+    this.visibleKls = options.visibleKls;
+
+    const countBuckets = this.options.labels.length / 60;
+    this.labelBuckets = this.options.labels.reduce((acc, label, index) => {
+      const bucket = Math.floor(index / countBuckets);
+      acc[bucket] = acc[bucket] || [];
+      acc[bucket].push(label);
+      return acc;
+    }, []);
+
+    this.init();
+  }
+
+  get datasets() {
+    return Object.entries(this.options.series)
+      .filter(([kls, _]) => this.visibleKls.includes(kls))
+      .map(([kls, _]) => this.buildDataset(kls));
+  }
+
+  get metric() {
+    return this._metric || this.options.initialMetric;
+  }
+
+  set metric(m) {
+    this._metric = m;
+  }
+
+  registerSwatch(id) {
+    const el = document.getElementById(id);
+    el.addEventListener("change", () => this.toggleKls(el.value, el.checked));
+    this.swatches[el.value] = el;
+    this.updateSwatch(el.value, el.checked);
+  }
+
+  updateSwatch(kls, checked) {
+    const el = this.swatches[kls];
+    el.checked = checked;
+    el.style.color = this.colors.assignments[kls] || "";
+  }
+
+  toggleKls(kls, visible) {
+    if (visible) {
+      this.chart.data.datasets.push(this.buildDataset(kls));
+    } else {
+      const i = this.chart.data.datasets.findIndex((ds) => ds.label == kls);
+      this.colors.checkIn(kls);
+      this.chart.data.datasets.splice(i, 1);
+    }
+
+    this.updateSwatch(kls, visible);
+    this.update();
+  }
+
+  buildDataset(kls) {
+    const color = this.colors.checkOut(kls);
+
+    return {
+      label: kls,
+      data: this.buildSeries(kls),
+      borderColor: color,
+      backgroundColor: color,
+      borderWidth: 2,
+      pointRadius: 2,
+    };
+  }
+
+  buildSeries(kls) {
+    // `series` is an object that maps labels to counts => { "20:15" => 2, "20:16" => 3, ... }
+    const series = this.options.series[kls];
+    return this.labelBuckets.reduce((acc, labels) => {
+      const bucketValues = labels.map(label => series[label]).filter(v => v);
+      if (bucketValues.length > 0) {
+        // Sum up the values for each bucket that has data.
+        // The new label is the bucket's first label, its start time.
+        acc[labels[0]] = bucketValues.reduce((a, b) => a + b, 0);
+      }
+      return acc;
+    }, {});
+  }
+
+  buildTooltipTitle(items) {
+    const [first, ...rest] = this.labelBuckets.find((labels) => labels[0] === items[0].label);
+    const title = [first, rest[rest.length - 1]].filter(v => v).join(" - ");
+    return `${title} UTC`
+  }
+
+  get chartOptions() {
+    return {
+      ...super.chartOptions,
+      aspectRatio: 4,
+      scales: {
+        ...super.chartOptions.scales,
+        y: {
+          ...super.chartOptions.scales.y,
+          beginAtZero: true,
+          title: {
+            text: this.options.yLabel,
+            display: true,
+          },
+        },
+      },
+      plugins: {
+        ...super.chartOptions.plugins,
+        tooltip: {
+          ...super.chartOptions.plugins.tooltip,
+          callbacks: {
+            title: (items) => this.buildTooltipTitle(items),
+            label: (item) =>
+              `${item.dataset.label}: ${item.parsed.y.toFixed(1)} ` +
+              `${this.options.units}`,
+            footer: (items) => {
+              const bucket = items[0].label;
+              const marks = this.options.marks.filter(([b, _]) => b == bucket);
+              return marks.map(
+                ([b, msg]) => `${this.options.markLabel}: ${msg}`
+              );
+            },
+          },
+        },
+      },
+    };
+  }
+}
+
+class HistTotalsChart extends BaseChart {
+  constructor(el, options) {
+    super(el, { ...options, chartType: "bar" });
+    this.init();
+  }
+
+  get datasets() {
+    return [
+      {
+        data: this.options.series,
+        backgroundColor: this.colors.primary,
+        borderWidth: 0,
+      },
+    ];
+  }
+
+  get chartOptions() {
+    return {
+      ...super.chartOptions,
+      aspectRatio: 6,
+      scales: {
+        ...super.chartOptions.scales,
+        y: {
+          ...super.chartOptions.scales.y,
+          beginAtZero: true,
+          title: {
+            text: this.options.yLabel,
+            display: true,
+          },
+        },
+        x: {
+          ...super.chartOptions.scales.x,
+          title: {
+            text: this.options.xLabel,
+            display: true,
+          },
+        },
+      },
+      plugins: {
+        ...super.chartOptions.plugins,
+        tooltip: {
+          ...super.chartOptions.plugins.tooltip,
+          callbacks: {
+            label: (item) => `${item.parsed.y} ${this.options.units}`,
+          },
+        },
+      },
+    };
+  }
+}
+
+class HistBubbleChart extends BaseChart {
+  constructor(el, options) {
+    super(el, { ...options, chartType: "bubble" });
+    this.init();
+  }
+
+  get datasets() {
+    const data = [];
+    let maxCount = 0;
+
+    Object.entries(this.options.hist).forEach(([bucket, hist]) => {
+      hist.forEach((count, histBucket) => {
+        if (count > 0) {
+          // histogram data is ordered fastest to slowest, but this.histIntervals is
+          // slowest to fastest (so it displays correctly on the chart).
+          const index = this.options.histIntervals.length - 1 - histBucket;
+
+          data.push({
+            x: bucket,
+            y: this.options.histIntervals[index] / 1000,
+            count: count,
+          });
+
+          if (count > maxCount) maxCount = count;
+        }
+      });
+    });
+
+    // Chart.js will not calculate the bubble size. We have to do that.
+    const maxRadius = this.el.offsetWidth / this.options.labels.length;
+    const minRadius = 1;
+    const multiplier = (maxRadius / maxCount) * 1.5;
+    data.forEach((entry) => {
+      entry.r = entry.count * multiplier + minRadius;
+    });
+
+    return [
+      {
+        data: data,
+        backgroundColor: this.colors.primary,
+        borderColor: this.colors.primary,
+      },
+    ];
+  }
+
+  get chartOptions() {
+    return {
+      ...super.chartOptions,
+      aspectRatio: 3,
+      scales: {
+        ...super.chartOptions.scales,
+        x: {
+          ...super.chartOptions.scales.x,
+          type: "category",
+          labels: this.options.labels,
+        },
+        y: {
+          ...super.chartOptions.scales.y,
+          title: {
+            text: this.options.yLabel,
+            display: true,
+          },
+        },
+      },
+      plugins: {
+        ...super.chartOptions.plugins,
+        tooltip: {
+          ...super.chartOptions.plugins.tooltip,
+          callbacks: {
+            title: (items) => `${items[0].raw.x} UTC`,
+            label: (item) =>
+              `${item.parsed.y} ${this.options.yUnits}: ${item.raw.count} ${this.options.zUnits}`,
+            footer: (items) => {
+              const bucket = items[0].raw.x;
+              const marks = this.options.marks.filter(([b, _]) => b == bucket);
+              return marks.map(
+                ([b, msg]) => `${this.options.markLabel}: ${msg}`
+              );
+            },
+          },
+        },
+      },
+    };
+  }
+}

data/web/assets/stylesheets/application-dark.css

@@ -1,6 +1,6 @@
 html, body {
-  background-color: #333 !important;
-  color: #ddd;
+  background-color: #171717 !important;
+  color: #DEDEDE;
 }
 
 a,
@@ -8,12 +8,12 @@ a,
 .summary_bar ul .count,
 span.current-interval,
 .navbar .navbar-brand {
-  color: #c04;
+  color: #d04;
 }
 
-.history-graph + .active,
+.history-graph.active,
 .beacon .dot {
-  background-color: #c04;
+  background-color: #d04;
 }
 
 .navbar .navbar-brand:hover {
@@ -30,15 +30,15 @@ span.current-interval,
 
 .navbar-inverse {
   background-color: #222;
-  border-color: #555;
+  border-color: #444;
 }
 
 table {
-  background-color: #282828;
+  background-color: #1D1D1D;
 }
 
 .table-striped > tbody > tr:nth-of-type(odd) {
-  background-color: #333;
+  background-color: #2E2E2E;
 }
 
 .table-bordered,
@@ -48,7 +48,7 @@ table {
 .table-bordered > tfoot > tr > th,
 .table-bordered > thead > tr > td,
 .table-bordered > thead > tr > th {
-  border: 1px solid #555;
+  border: 1px solid #444;
 }
 
 .table-hover > tbody > tr:hover {
@@ -72,9 +72,11 @@ table {
   background-color: #31708f;
 }
 
-a:link,
-a:active,
-a:hover {
+.alert-warning {
+  background-color: #c47612;
+}
+
+a:link, a:active, a:hover, a:visited {
   color: #ddd;
 }
 
@@ -85,15 +87,13 @@ input {
 }
 
 .summary_bar .summary {
-  background-color: #222;
-  border: 1px solid #555;
-
-  box-shadow: 0 0 5px rgba(255, 255, 255, 0.1);
+  background-color: #232323;
+  border: 1px solid #444;
 }
 
 .navbar-default {
-  background-color: #222;
-  border-color: #555;
+  background-color: #0F0F0F;
+  border-color: #444;
 }
 
 .navbar-default .navbar-nav > .active > a,
@@ -112,7 +112,7 @@ input {
 .pagination > li > span {
   color: #ddd;
   background-color: #333;
-  border-color: #555;
+  border-color: #444;
 }
 .pagination > .disabled > a,
 .pagination > .disabled > a:focus,
@@ -122,18 +122,18 @@ input {
 .pagination > .disabled > span:hover {
   color: #ddd;
   background-color: #333;
-  border-color: #555;
+  border-color: #444;
 }
 
 .stat {
-  border: 1px solid rgba(255, 255, 255, 0.1);
+  border: 1px solid #888;
 }
 
 .rickshaw_graph .detail {
-  background: rgba(255, 255, 255, .1)
+  background: #888;
 }
 .rickshaw_graph .x_tick {
-  border-color: rgba(255, 255, 255, .2);
+  border-color: #888;
 }
 
 .rickshaw_graph .y_ticks.glow text {

data/web/assets/stylesheets/application-rtl.css

@@ -46,10 +46,6 @@ form .btn-group .btn {
   .navbar .poll-wrapper {
     margin: 4px 0 0 4px;
   }
-
-  .navbar .dropdown-menu a {
-    text-align: right;
-  }
 }
 
 .navbar-footer .navbar ul.nav a.navbar-brand {
@@ -106,22 +102,8 @@ div.interval-slider {
   float: left;
 }
 
-#realtime-legend,
-#history-legend {
-  text-align: right;
-  float: left;
-}
-#realtime-legend .timestamp,
-#history-legend .timestamp {
-  text-align: left;
-}
-#realtime-legend .line,
-#history-legend .line {
-  margin: 0 20px 0 0;
-}
-#realtime-legend .swatch,
-#history-legend .swatch {
-  margin: 0 0 0 8px;
+#realtime-legend {
+  justify-content: start;
 }
 
 /* Beacon
@@ -169,78 +151,3 @@ div.interval-slider {
     padding-left: 5px;
   }
 }
-
-/* Rickshaw */
-
-.rickshaw_graph .detail .x_label.left {
-    right: 0
-}
-.rickshaw_graph .detail .x_label.right {
-    left: 0
-}
-.rickshaw_graph .detail .item.left {
-    right: 0
-}
-.rickshaw_graph .detail .item.right {
-    left: 0
-}
-.rickshaw_graph .detail .item.left:after {
-    left: 0;
-    right: -5px;
-    border-right-color: unset;
-    border-left-color: rgba(0, 0, 0, .8);
-    border-right-width: 0;
-    border-left-width: unset;
-}
-.rickshaw_graph .detail .item.right:after {
-    right: 0;
-    left: -5px;
-    border-left-color: unset;
-    border-right-color: rgba(0, 0, 0, .8);
-    border-left-width: 0;
-    border-right-width: unset;
-}
-.rickshaw_graph .detail .dot {
-    margin-right: -3px;
-    margin-left: unset;
-}
-.rickshaw_graph .x_tick {
-    border-left: unset;
-    border-right: 1px dotted rgba(0, 0, 0, .2);
-}
-.rickshaw_graph .x_tick .title {
-    margin-right: 3px;
-    margin-left: unset;
-}
-.rickshaw_annotation_timeline .annotation {
-    margin-right: -2px;
-    margin-left: unset;
-}
-.rickshaw_graph .annotation_line {
-    border-right: 2px solid rgba(0, 0, 0, .3);
-    border-left: unset;
-}
-.rickshaw_annotation_timeline .annotation .content {
-    left: unset;
-    right: -11px;
-}
-.rickshaw_graph .x_tick.glow .title,
-.rickshaw_graph .y_ticks.glow text {
-    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)
-}
-.rickshaw_graph .x_tick.inverse .title,
-.rickshaw_graph .y_ticks.inverse text {
-    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)
-}
-.rickshaw_legend .line {
-    padding-left: 15px;
-    padding-right: unset;
-}
-.rickshaw_legend .line .swatch {
-    margin-left: 3px;
-    margin-right: unset;
-}
-.rickshaw_legend .action {
-    margin-left: .2em;
-    margin-right: unset;
-}