sidekiq 6.2.2 → 6.5.5

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,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,7 @@ table {
   background-color: #31708f;
 }
 
-a:link,
-a:active,
-a:hover {
+a:link, a:active, a:hover, a:visited {
   color: #ddd;
 }
 
@@ -85,15 +83,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 +108,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 +118,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 {

data/web/assets/stylesheets/application.css

@@ -21,7 +21,7 @@ body {
 a {
   color: #b1003e;
 }
-a:active, a:hover {
+a:active, a:hover, a:focus {
   color: #4b001a;
 }
 
@@ -67,10 +67,15 @@ body {
   padding: 0 20px;
 }
 
-h3 {
+h1, h2, h3 {
+  font-size: 24px;
   line-height: 45px;
 }
 
+.header-with-subheader h2 {
+  margin-top: -18px;
+}
+
 .centered {
   text-align: center;
 }
@@ -89,19 +94,18 @@ header.row .pagination {
 .summary_bar .summary {
   margin-top: 12px;
   background-color: #fff;
-  box-shadow: 0 0 5px rgba(50, 50, 50, 0.25);
   border-radius: 4px;
+  border: 1px solid rgba(0, 0, 0, 0.1);
   padding: 8px;
   margin-bottom: 10px;
-  border-width: 0;
 }
 .poll-wrapper {
     margin: 9px;
 }
-#live-poll.active {
+.live-poll.active {
   background-color: #009300;
 }
-#live-poll.active:hover {
+.live-poll.active:hover {
   background-color: #777;
 }
 .summary_bar ul {
@@ -203,6 +207,7 @@ table .table-checkbox label {
 
 .navbar .navbar-brand .status {
   color: #585454;
+  display: inline;
 }
 
 
@@ -266,18 +271,6 @@ table .table-checkbox label {
   .navbar .poll-wrapper {
     margin: 4px 4px 0 0;
   }
-
-  .navbar .dropdown-menu {
-    min-width: 120px;
-  }
-
-  .navbar .dropdown-menu a {
-    text-align: left;
-  }
-}
-
-.nav .dropdown {
-  display: none;
 }
 
 .navbar-footer .navbar ul.nav {
@@ -362,6 +355,7 @@ img.smallogo {
   text-align: center;
   margin-right: 20px;
   border: 1px solid rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
   padding: 5px;
   width: 150px;
   margin-bottom: 20px;
@@ -417,8 +411,6 @@ span.current-interval {
 
 div.interval-slider input {
   width: 160px;
-  height: 3px;
-  margin-top: 5px;
   border-radius: 2px;
   background: currentcolor;
 }
@@ -502,7 +494,7 @@ div.interval-slider input {
 
 @keyframes beacon-dot-pulse {
   from {
-    background-color: #80002d;
+    background-color: #50002d;
     box-shadow: 0 0 9px #666;
   }
   50% {
@@ -510,7 +502,7 @@ div.interval-slider input {
     box-shadow: 0 0 18px #666;
   }
   to {
-    background-color: #80002d;
+    background-color: #50002d;
     box-shadow: 0 0 9px #666;
   }
 }
@@ -549,7 +541,6 @@ div.interval-slider input {
 }
 
 .history-graph {
-  font-size: 0.8em;
   padding: 3px;
   border-radius: 3px;
 }
@@ -633,7 +624,7 @@ div.interval-slider input {
     position: absolute;
     top: 0;
     z-index: 2;
-    background: rgba(0, 0, 0, .1);
+    background: rgba(0, 0, 0, .9);
     bottom: 0;
     width: 1px;
     transition: opacity .25s linear;
@@ -739,96 +730,16 @@ div.interval-slider input {
     top: 0;
     bottom: 0;
     width: 0;
-    border-left: 1px dotted rgba(0, 0, 0, .2);
+    border-left: 1px dotted rgba(0, 0, 0, .5);
     pointer-events: none
 }
 .rickshaw_graph .x_tick .title {
     position: absolute;
-    font-size: 12px;
     font-family: Arial, sans-serif;
-    opacity: .5;
     white-space: nowrap;
     margin-left: 3px;
     bottom: 1px
 }
-.rickshaw_annotation_timeline {
-    height: 1px;
-    border-top: 1px solid #e0e0e0;
-    margin-top: 10px;
-    position: relative
-}
-.rickshaw_annotation_timeline .annotation {
-    position: absolute;
-    height: 6px;
-    width: 6px;
-    margin-left: -2px;
-    top: -3px;
-    border-radius: 5px;
-    background-color: rgba(0, 0, 0, .25)
-}
-.rickshaw_graph .annotation_line {
-    position: absolute;
-    top: 0;
-    bottom: -6px;
-    width: 0;
-    border-left: 2px solid rgba(0, 0, 0, .3);
-    display: none
-}
-.rickshaw_graph .annotation_line.active {
-    display: block
-}
-.rickshaw_graph .annotation_range {
-    background: rgba(0, 0, 0, .1);
-    display: none;
-    position: absolute;
-    top: 0;
-    bottom: -6px
-}
-.rickshaw_graph .annotation_range.active {
-    display: block
-}
-.rickshaw_graph .annotation_range.active.offscreen {
-    display: none
-}
-.rickshaw_annotation_timeline .annotation .content {
-    background: #fff;
-    color: #000;
-    opacity: .9;
-    padding: 5px;
-    box-shadow: 0 0 2px rgba(0, 0, 0, .8);
-    border-radius: 3px;
-    position: relative;
-    z-index: 20;
-    font-size: 12px;
-    padding: 6px 8px 8px;
-    top: 18px;
-    left: -11px;
-    width: 160px;
-    display: none;
-    cursor: pointer
-}
-.rickshaw_annotation_timeline .annotation .content:before {
-    content: "\25b2";
-    position: absolute;
-    top: -11px;
-    color: #fff;
-    text-shadow: 0 -1px 1px rgba(0, 0, 0, .8)
-}
-.rickshaw_annotation_timeline .annotation.active,
-.rickshaw_annotation_timeline .annotation:hover {
-    background-color: rgba(0, 0, 0, .8);
-    cursor: none
-}
-.rickshaw_annotation_timeline .annotation .content:hover {
-    z-index: 50
-}
-.rickshaw_annotation_timeline .annotation.active .content {
-    display: block
-}
-.rickshaw_annotation_timeline .annotation:hover .content {
-    display: block;
-    z-index: 50
-}
 .rickshaw_graph .y_axis,
 .rickshaw_graph .x_axis_d3 {
     fill: none
@@ -880,7 +791,6 @@ div.interval-slider input {
 }
 .rickshaw_legend {
     font-family: Arial;
-    font-size: 12px;
     color: #fff;
     background: #404040;
     display: inline-block;
@@ -923,10 +833,8 @@ div.interval-slider input {
 }
 .rickshaw_legend .action {
     margin-right: .2em;
-    font-size: 10px;
-    opacity: .2;
+    opacity: .5;
     cursor: pointer;
-    font-size: 14px
 }
 .rickshaw_legend .line.disabled {
     opacity: .4
@@ -1051,3 +959,41 @@ div.interval-slider input {
   padding: 3px 7px;
   margin-left: 5px;
 }
+
+.metrics-swatch-wrapper {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.metrics-swatch[type=checkbox] {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  margin: 0;
+  border-radius: 2px;
+  appearance: none;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  border: 1px solid #bbb;
+  color: white;
+  background-color: currentColor;
+}
+
+/* We need to add the checkmark since we've taken over the appearance */
+.metrics-swatch[type=checkbox]:checked {
+  border-color: currentColor;
+  background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
+  background-size: 100% 100%;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+.metrics-swatch[type=checkbox]:focus {
+  outline: 1px solid #888;
+  outline-offset: 2px;
+}
+
+canvas {
+  margin: 20px 0 30px;
+}