sidekiq 6.1.1 → 6.5.10

data/web/assets/javascripts/metrics.js

@@ -0,0 +1,262 @@
+if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+  Chart.defaults.borderColor = "#333"
+  Chart.defaults.color = "#aaa"
+}
+
+class BaseChart {
+  constructor(id, options) {
+    this.ctx = document.getElementById(id);
+    this.options = options
+    this.fallbackColor = "#999";
+    this.colors = [
+      // Colors taken from https://www.chartjs.org/docs/latest/samples/utils.html
+      "#537bc4",
+      "#4dc9f6",
+      "#f67019",
+      "#f53794",
+      "#acc236",
+      "#166a8f",
+      "#00a950",
+      "#58595b",
+      "#8549ba",
+      "#991b1b",
+    ];
+
+    this.chart = new Chart(this.ctx, {
+      type: this.options.chartType,
+      data: { labels: this.options.labels, datasets: this.datasets },
+      options: this.chartOptions,
+    });
+  }
+
+  addMarksToChart() {
+    this.options.marks.forEach(([bucket, label], i) => {
+      this.chart.options.plugins.annotation.annotations[`deploy-${i}`] = {
+        type: "line",
+        xMin: bucket,
+        xMax: bucket,
+        borderColor: "rgba(220, 38, 38, 0.4)",
+        borderWidth: 2,
+      };
+    });
+  }
+}
+
+class JobMetricsOverviewChart extends BaseChart {
+  constructor(id, options) {
+    super(id, { ...options, chartType: "line" });
+    this.swatches = [];
+
+    this.addMarksToChart();
+    this.chart.update();
+  }
+
+  registerSwatch(id) {
+    const el = document.getElementById(id);
+    el.onchange = () => this.toggle(el.value, el.checked);
+    this.swatches[el.value] = el;
+    this.updateSwatch(el.value);
+  }
+
+  updateSwatch(kls) {
+    const el = this.swatches[kls];
+    const ds = this.chart.data.datasets.find((ds) => ds.label == kls);
+    el.checked = !!ds;
+    el.style.color = ds ? ds.borderColor : null;
+  }
+
+  toggle(kls, visible) {
+    if (visible) {
+      this.chart.data.datasets.push(this.dataset(kls));
+    } else {
+      const i = this.chart.data.datasets.findIndex((ds) => ds.label == kls);
+      this.colors.unshift(this.chart.data.datasets[i].borderColor);
+      this.chart.data.datasets.splice(i, 1);
+    }
+
+    this.updateSwatch(kls);
+    this.chart.update();
+  }
+
+  dataset(kls) {
+    const color = this.colors.shift() || this.fallbackColor;
+
+    return {
+      label: kls,
+      data: this.options.series[kls],
+      borderColor: color,
+      backgroundColor: color,
+      borderWidth: 2,
+      pointRadius: 2,
+    };
+  }
+
+  get datasets() {
+    return Object.entries(this.options.series)
+      .filter(([kls, _]) => this.options.visible.includes(kls))
+      .map(([kls, _]) => this.dataset(kls));
+  }
+
+  get chartOptions() {
+    return {
+      aspectRatio: 4,
+      scales: {
+        y: {
+          beginAtZero: true,
+          title: {
+            text: "Total execution time (sec)",
+            display: true,
+          },
+        },
+      },
+      interaction: {
+        mode: "x",
+      },
+      plugins: {
+        legend: {
+          display: false,
+        },
+        tooltip: {
+          callbacks: {
+            title: (items) => `${items[0].label} UTC`,
+            label: (item) =>
+              `${item.dataset.label}: ${item.parsed.y.toFixed(1)} seconds`,
+            footer: (items) => {
+              const bucket = items[0].label;
+              const marks = this.options.marks.filter(([b, _]) => b == bucket);
+              return marks.map(([b, msg]) => `Deploy: ${msg}`);
+            },
+          },
+        },
+      },
+    };
+  }
+}
+
+class HistTotalsChart extends BaseChart {
+  constructor(id, options) {
+    super(id, { ...options, chartType: "bar" });
+  }
+
+  get datasets() {
+    return [{
+      data: this.options.series,
+      backgroundColor: this.colors[0],
+      borderWidth: 0,
+    }];
+  }
+
+  get chartOptions() {
+    return {
+      aspectRatio: 6,
+      scales: {
+        y: {
+          beginAtZero: true,
+          title: {
+            text: "Total jobs",
+            display: true,
+          },
+        },
+      },
+      interaction: {
+        mode: "x",
+      },
+      plugins: {
+        legend: {
+          display: false,
+        },
+        tooltip: {
+          callbacks: {
+            label: (item) => `${item.parsed.y} jobs`,
+          },
+        },
+      },
+    };
+  }
+}
+
+class HistBubbleChart extends BaseChart {
+  constructor(id, options) {
+    super(id, { ...options, chartType: "bubble" });
+
+    this.addMarksToChart();
+    this.chart.update();
+  }
+
+  get datasets() {
+    const data = [];
+    let maxCount = 0;
+
+    Object.entries(this.options.hist).forEach(([bucket, hist]) => {
+      hist.forEach((count, histBucket) => {
+        if (count > 0) {
+          data.push({
+            x: bucket,
+            // histogram data is ordered fastest to slowest, but this.histIntervals is
+            // slowest to fastest (so it displays correctly on the chart).
+            y:
+              this.options.histIntervals[this.options.histIntervals.length - 1 - histBucket] /
+              1000,
+            count: count,
+          });
+
+          if (count > maxCount) maxCount = count;
+        }
+      });
+    });
+
+    // Chart.js will not calculate the bubble size. We have to do that.
+    const maxRadius = this.ctx.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: "#537bc4",
+      borderColor: "#537bc4",
+    }];
+  }
+
+  get chartOptions() {
+    return {
+      aspectRatio: 3,
+      scales: {
+        x: {
+          type: "category",
+          labels: this.options.labels,
+        },
+        y: {
+          title: {
+            text: "Execution time (sec)",
+            display: true,
+          },
+        },
+      },
+      interaction: {
+        mode: "x",
+      },
+      plugins: {
+        legend: {
+          display: false,
+        },
+        tooltip: {
+          callbacks: {
+            title: (items) => `${items[0].raw.x} UTC`,
+            label: (item) =>
+              `${item.parsed.y} seconds: ${item.raw.count} job${
+                item.raw.count == 1 ? "" : "s"
+              }`,
+            footer: (items) => {
+              const bucket = items[0].raw.x;
+              const marks = this.options.marks.filter(([b, _]) => b == bucket);
+              return marks.map(([b, msg]) => `Deploy: ${msg}`);
+            },
+          },
+        },
+      },
+    };
+  }
+}

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

@@ -1,34 +1,44 @@
 html, body {
-  background-color: #070707 !important;
-  color: #ccc;
+  background-color: #171717 !important;
+  color: #DEDEDE;
 }
 
 a,
 .title,
 .summary_bar ul .count,
+span.current-interval,
 .navbar .navbar-brand {
-  color: #af0014;
+  color: #d04;
+}
+
+.history-graph.active,
+.beacon .dot {
+  background-color: #d04;
 }
 
 .navbar .navbar-brand:hover {
-  color: #ccc;
+  color: #ddd;
 }
 
 .navbar .navbar-brand .status {
-  color: #ccc;
+  color: #ddd;
+}
+
+.navbar-default .navbar-nav > li > a {
+  color: #ddd;
 }
 
 .navbar-inverse {
-  background-color: #000;
-  border-color: #333;
+  background-color: #222;
+  border-color: #444;
 }
 
-table.table-white {
-  background-color: #111;
+table {
+  background-color: #1D1D1D;
 }
 
 .table-striped > tbody > tr:nth-of-type(odd) {
-  background-color: #222;
+  background-color: #2E2E2E;
 }
 
 .table-bordered,
@@ -38,64 +48,67 @@ table.table-white {
 .table-bordered > tfoot > tr > th,
 .table-bordered > thead > tr > td,
 .table-bordered > thead > tr > th {
-  border: 1px solid #333;
+  border: 1px solid #444;
 }
 
 .table-hover > tbody > tr:hover {
-  background-color: #333;
+  background-color: #444;
 }
 
 .alert {
   border: none;
-  color: #ccc;
+  color: #ddd;
 }
 
 .alert-success {
-  background-color: #182d11;
+  background-color: #484;
 }
 
-a:link,
-a:active,
-a:hover,
-a:visited {
-  color: #63798c;
+.alert-danger {
+  background-color: #980035;
 }
 
-a.btn {
-  color: #000;
+.alert-info {
+  background-color: #31708f;
 }
 
-.summary_bar .summary {
-  background-color: #111;
-  border: 1px solid #333;
+a:link, a:active, a:hover, a:visited {
+  color: #ddd;
+}
 
-  -webkit-box-shadow: 0 0 5px rgba(255, 255, 255, 0.1);
-  -moz-box-shadow: 0 0 5px rgba(255, 255, 255, 0.1);
-  box-shadow: 0 0 5px rgba(255, 255, 255, 0.1);
+input {
+  background-color: #444;
+  color: #ccc;
+  padding: 3px;
+}
+
+.summary_bar .summary {
+  background-color: #232323;
+  border: 1px solid #444;
 }
 
 .navbar-default {
-  background-color: #000;
-  border-color: #3d3d3d;
+  background-color: #0F0F0F;
+  border-color: #444;
 }
 
 .navbar-default .navbar-nav > .active > a,
 .navbar-default .navbar-nav > .active > a:focus,
 .navbar-default .navbar-nav > .active > a:hover {
-  color: #ccc;
-  background-color: #282828;
+  color: #ddd;
+  background-color: #333;
 }
 
 .navbar-default .navbar-nav > li > a:hover {
-  color: #ccc;
+  color: #ddd;
 }
 
 .pagination > li > a,
 .pagination > li > a:hover,
 .pagination > li > span {
-  color: #ccc;
-  background-color: #282828;
-  border-color: #353535;
+  color: #ddd;
+  background-color: #333;
+  border-color: #444;
 }
 .pagination > .disabled > a,
 .pagination > .disabled > a:focus,
@@ -103,31 +116,28 @@ a.btn {
 .pagination > .disabled > span,
 .pagination > .disabled > span:focus,
 .pagination > .disabled > span:hover {
-  color: #a5a5a5;
-  background-color: #282828;
-  border-color: #353535;
+  color: #ddd;
+  background-color: #333;
+  border-color: #444;
 }
 
 .stat {
-  border: 1px solid rgba(255, 255, 255, 0.1);
-}
-
-#live-poll {
-  color: #ccc;
-}
-
-.btn-warn {
-  color: #333;
+  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 {
-  fill: #ccc;
-  color: #ccc;
+  fill: #ddd;
+  color: #ddd;
+}
+
+.info-circle {
+  color: #222;
+  background-color: #888;
 }

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 {