roundhouse_ui 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30b9ee99930148d47a69b86e7a4c079231f8a2504a9a24aaa17a625e39e96429
-  data.tar.gz: 333e7892afa4690288d35c671249f3fad6c3a19e304f9b4952346fe0f873a9fd
+  metadata.gz: b76009aa85c003ad62a2e6bacf8efbdf69767bda6e1b9b382de8a606ec3acb8b
+  data.tar.gz: 4ae59af49806c3536b6f709f02146338ad69e716257d2223f1fbf5061995390a
 SHA512:
-  metadata.gz: 9391d5af40b1fa0db7de47fab56009cf6d11bb80f2c16d4d65bc4b7b2b376eb7ac7cff595dfe0ebdaa0df401436f811cfc1f9a3d52028aef491c7d5821b0e322
-  data.tar.gz: 8099ad548223bbb7d91f13a51b86e62010eb269f446d380c95fa4a416a1f4f95979631e9cbdd5115973bfa98d363ab04f5ef9d1801462a51ce215a5a28f57abe
+  metadata.gz: 7df7cbc7dbdab13f4821500f1c5e3d8d9ea8357416530662d4e6cd0a38edd427f11eec13d2a7d22ff923b289a5f5dd10edc3ba405217967563bea6e55a7432d4
+  data.tar.gz: e9ebfd3e8edf616ed69ae517f92ca2bdda61dd3065e83624d524b4f5d133bd7d395ef7e4cba7d6d477c92dd1547d5495c83fd68822d58a5136db279a64963268

data/README.md

@@ -83,6 +83,11 @@ RoundhouseUi.configure do |c|
   # Fold sidekiq-failures' `failed` set into the Errors view (see below).
   # No-op unless the sidekiq-failures gem is loaded. Default: off.
   c.show_sidekiq_failures = true
+
+  # Set false to hide queue pause/resume controls and the "not enforced" warning,
+  # e.g. when you run reliable fetch (super_fetch) instead of RoundhouseUi::Fetch.
+  # Default: true.
+  # c.pause_enabled = false
 end
 ```
 
@@ -110,7 +115,8 @@ Roundhouse detects whether a fetcher has reported in).
 > ⚠️ **Sidekiq Pro/Enterprise users:** super_fetch / reliable fetch sets its own
 > `fetch_class`, and Sidekiq allows only one. Installing `RoundhouseUi::Fetch` would
 > **replace reliable fetch and lose its crash-recovery guarantees** — don't. On those
-> tiers, leave the fetch strategy out; pause/resume stays inert and the UI says so.
+> tiers, leave the fetch strategy out and set `RoundhouseUi.pause_enabled = false` to
+> hide the pause controls and the (otherwise permanent) "not enforced" warning.
 
 ## Surfacing sidekiq-failures
 

data/app/controllers/roundhouse_ui/busy_controller.rb

@@ -9,9 +9,7 @@ module RoundhouseUi
 
     def index
       @threshold = LONG_RUNNING
-      @work = Sidekiq::WorkSet.new.map do |process_id, tid, work|
-        { process: process_id, tid: tid, queue: work.queue, run_at: work.run_at, job: work.job }
-      end
+      @work = Sidekiq::WorkSet.new.map { |process_id, tid, work| normalize(process_id, tid, work) }
     end
 
     def cancel
@@ -21,6 +19,18 @@ module RoundhouseUi
 
     private
 
+    # Sidekiq 7+ yields a Sidekiq::Work (queue/run_at/job methods); Sidekiq 6.x
+    # yields a plain Hash (string keys, an epoch run_at, a JSON payload). Normalize
+    # both to the same shape the view expects (run_at as a Time, job as a JobRecord).
+    def normalize(process_id, tid, work)
+      if work.respond_to?(:queue)
+        { process: process_id, tid: tid, queue: work.queue, run_at: work.run_at, job: work.job }
+      else
+        { process: process_id, tid: tid, queue: work["queue"],
+          run_at: Time.at(work["run_at"]), job: Sidekiq::JobRecord.new(work["payload"]) }
+      end
+    end
+
     def require_writable!
       return unless RoundhouseUi.read_only
       redirect_to busy_path, alert: "Roundhouse is in read-only mode — cancellation is disabled."

data/app/controllers/roundhouse_ui/capsules_controller.rb

@@ -13,6 +13,10 @@ module RoundhouseUi
       capsules = Hash.new { |h, k| h[k] = { name: k, concurrency: 0, processes: 0, queues: {} } }
 
       Sidekiq::ProcessSet.new.each do |process|
+        # `capsules` is a Sidekiq 8.0.8+ Process attribute; absent on 6.x/early 7,
+        # where calling it would raise NoMethodError. Skip → view shows empty state.
+        next unless process.respond_to?(:capsules)
+
         (process.capsules || {}).each do |name, data|
           cap = capsules[name]
           cap[:concurrency] += data["concurrency"].to_i

data/app/views/layouts/roundhouse_ui/application.html.erb

@@ -166,15 +166,29 @@
         return "~" + (s / 86400).toFixed(1) + "d";
       }
 
+      // Points to display, from the window picker (24 pts ≈ 1m at the 2.5s poll).
+      function chartWindow() { var s = document.getElementById("rh-chart-window"); return s ? parseInt(s.value, 10) : 24; }
+      // Moving average sized to the window — flattens the per-poll spikes into a
+      // sustained line instead of a noisy sawtooth.
+      function smooth(arr) {
+        var k = Math.max(2, Math.round(arr.length / 12)), out = [];
+        for (var i = 0; i < arr.length; i++) {
+          var a = Math.max(0, i - k + 1), sum = 0, c = 0;
+          for (var j = a; j <= i; j++) { sum += arr[j]; c++; }
+          out.push(sum / c);
+        }
+        return out;
+      }
       function draw() {
         var cv = document.getElementById("rh-chart"); if (!cv) return;
-        var ctx = cv.getContext("2d"), w = cv.width, h = cv.height, pad = 6, n = series.length;
-        ctx.clearRect(0, 0, w, h); if (n < 2) return;
-        var max = Math.max.apply(null, series) * 1.25 || 1;
+        var ctx = cv.getContext("2d"), w = cv.width, h = cv.height, pad = 6;
+        ctx.clearRect(0, 0, w, h);
+        var pts = smooth(series.slice(-chartWindow())), n = pts.length; if (n < 2) return;
+        var max = Math.max.apply(null, pts) * 1.25 || 1;
         var x = function (i) { return i / (n - 1) * w; }, y = function (v) { return h - pad - v / max * (h - pad * 2); };
         var g = ctx.createLinearGradient(0, 0, 0, h); g.addColorStop(0, "rgba(110,139,255,.30)"); g.addColorStop(1, "rgba(110,139,255,0)");
-        ctx.beginPath(); ctx.moveTo(0, h); series.forEach(function (v, i) { ctx.lineTo(x(i), y(v)); }); ctx.lineTo(w, h); ctx.closePath(); ctx.fillStyle = g; ctx.fill();
-        ctx.beginPath(); series.forEach(function (v, i) { i ? ctx.lineTo(x(i), y(v)) : ctx.moveTo(x(i), y(v)); }); ctx.strokeStyle = "#6E8BFF"; ctx.lineWidth = 2; ctx.lineJoin = "round"; ctx.stroke();
+        ctx.beginPath(); ctx.moveTo(0, h); pts.forEach(function (v, i) { ctx.lineTo(x(i), y(v)); }); ctx.lineTo(w, h); ctx.closePath(); ctx.fillStyle = g; ctx.fill();
+        ctx.beginPath(); pts.forEach(function (v, i) { i ? ctx.lineTo(x(i), y(v)) : ctx.moveTo(x(i), y(v)); }); ctx.strokeStyle = "#6E8BFF"; ctx.lineWidth = 2; ctx.lineJoin = "round"; ctx.stroke();
       }
       function apply(d) {
         Object.keys(d).forEach(function (k) {
@@ -196,7 +210,7 @@
               var rate = dt > 0 ? Math.max(0, dp / dt) : 0;
               var re = document.querySelector('[data-stat="rate"]'); if (re) re.textContent = fmt(Math.round(rate * 60));
               var ne = document.getElementById("rh-chart-now"); if (ne) ne.textContent = Math.round(rate);
-              series.push(rate); if (series.length > 60) series.shift(); draw();
+              series.push(rate); if (series.length > 360) series.shift(); draw();
 
               // Metrics tab live rates (these elements exist only on that page).
               setText("rh-m-throughput", Math.round(rate) + "/s");
@@ -255,7 +269,7 @@
         { label: "Retries", path: "<%= retries_path %>", icon: "↻" },
         { label: "Errors", path: "<%= errors_path %>", icon: "⚠" },
         { label: "Dead", path: "<%= dead_set_path %>", icon: "✕" },
-        { label: "Capsules", path: "<%= capsules_path %>", icon: "⊞" },
+        <% if defined?(Sidekiq::Capsule) %>{ label: "Capsules", path: "<%= capsules_path %>", icon: "⊞" },<% end %>
         { label: "Redis", path: "<%= redis_info_path %>", icon: "◈" },
         { label: "Snapshots", path: "<%= snapshots_path %>", icon: "⛁" },
         { label: "Audit log", path: "<%= audit_log_path %>", icon: "☷" },
@@ -303,6 +317,17 @@
         if (e.target && e.target.id === "rh-palette") { palClose(); return; }
         if (e.target.closest && e.target.closest("#rh-palette-open")) { e.preventDefault(); palOpen(); }
       });
+      // Throughput window picker — persist the choice and redraw the smoothed line.
+      function restoreChartWindow() {
+        var s = document.getElementById("rh-chart-window"); if (!s) return;
+        try { var v = localStorage.getItem("rh-chart-win"); if (v) s.value = v; } catch (_) {}
+      }
+      document.addEventListener("change", function (e) {
+        if (!e.target || e.target.id !== "rh-chart-window") return;
+        try { localStorage.setItem("rh-chart-win", e.target.value); } catch (_) {}
+        draw();
+      });
+
       document.addEventListener("keydown", function (e) {
         if ((e.metaKey || e.ctrlKey) && (e.key === "k" || e.key === "K")) { e.preventDefault(); var p = palEl(); (p && p.hidden) ? palOpen() : palClose(); return; }
         var p = palEl(); if (!p || p.hidden) return;
@@ -312,8 +337,8 @@
         else if (e.key === "Enter") { e.preventDefault(); if (palFiltered[palSel]) palRun(palFiltered[palSel]); }
       });
 
-      document.addEventListener("turbo:load", function () { startOnce(); syncTheme(); syncWidth(); setActiveNav(); draw(); });
-      document.addEventListener("DOMContentLoaded", function () { startOnce(); syncTheme(); syncWidth(); setActiveNav(); });
+      document.addEventListener("turbo:load", function () { startOnce(); syncTheme(); syncWidth(); setActiveNav(); restoreChartWindow(); draw(); });
+      document.addEventListener("DOMContentLoaded", function () { startOnce(); syncTheme(); syncWidth(); setActiveNav(); restoreChartWindow(); });
       document.addEventListener("visibilitychange", function () { if (!document.hidden) poll(); });
     })();
   </script>
@@ -343,7 +368,10 @@
       </nav>
       <nav class="rh-grp">
         <div class="rh-grp-label">Infrastructure</div>
-        <%= nav_link "Capsules", capsules_path, icon: "⊞" %>
+        <%# Capsules are a Sidekiq 7+ concept — hide the nav entirely on 6.x. %>
+        <% if defined?(Sidekiq::Capsule) %>
+          <%= nav_link "Capsules", capsules_path, icon: "⊞" %>
+        <% end %>
         <%= nav_link "Redis", redis_info_path, icon: "◈" %>
         <%= nav_link "Snapshots", snapshots_path, icon: "⛁" %>
         <%= nav_link "Audit log", audit_log_path, icon: "☷" %>

data/app/views/roundhouse_ui/dashboard/show.html.erb

@@ -42,7 +42,7 @@
 </div>
 
 <div class="rh-chart-wrap">
-  <div class="top"><h3>Throughput</h3><span class="rh-sub">jobs / sec · live</span><span class="now"><span id="rh-chart-now">—</span>/s</span></div>
+  <div class="top"><h3>Throughput</h3><span class="rh-sub">jobs / sec · live</span><span class="now"><span id="rh-chart-now">—</span>/s</span><select id="rh-chart-window" aria-label="Throughput window" style="margin-left:12px;background:var(--panel-2);color:var(--muted);border:1px solid var(--line);border-radius:7px;padding:3px 6px;font:12px var(--sans)"><option value="24">1m</option><option value="120">5m</option><option value="360">15m</option></select></div>
   <canvas id="rh-chart" width="1100" height="180"></canvas>
 </div>
 

data/app/views/roundhouse_ui/queues/index.html.erb

@@ -4,7 +4,7 @@
   <div class="rh-toolbar"><%= link_to "+ Enqueue job", new_job_path, class: "rh-btn rh-btn-primary" %></div>
 <% end %>
 
-<% unless @fetch_installed %>
+<% if RoundhouseUi.pause_enabled && !@fetch_installed %>
   <div class="rh-warn">
     Pausing is <strong>recorded but not enforced</strong> — no Roundhouse fetcher has reported in.
     Add it to your Sidekiq config: <code>config[:fetch_class] = RoundhouseUi::Fetch</code>
@@ -26,10 +26,12 @@
           <td class="r"><%= number_with_delimiter q.size %></td>
           <td class="r <%= "rh-lat-warn" if q.latency > 60 %>"><%= q.latency.round(2) %>s</td>
           <td class="r">
-            <% if paused %>
-              <%= button_to "Resume", resume_queue_path(q.name), method: :post, class: "rh-btn", form_class: "rh-inline" %>
-            <% else %>
-              <%= button_to "Pause", pause_queue_path(q.name), method: :post, class: "rh-btn", form_class: "rh-inline" %>
+            <% if RoundhouseUi.pause_enabled %>
+              <% if paused %>
+                <%= button_to "Resume", resume_queue_path(q.name), method: :post, class: "rh-btn", form_class: "rh-inline" %>
+              <% else %>
+                <%= button_to "Pause", pause_queue_path(q.name), method: :post, class: "rh-btn", form_class: "rh-inline" %>
+              <% end %>
             <% end %>
             <%= button_to "Snapshot", snapshot_queue_path(q.name), method: :post, class: "rh-btn", form_class: "rh-inline" %>
             <%= button_to "Purge", purge_queue_path(q.name),

data/app/views/roundhouse_ui/workers/index.html.erb

@@ -1,15 +1,17 @@
 <% content_for :title, "Workers" %>
 
 <h2 class="rh-h2">Workers · <%= @processes.size %> <%= "process".pluralize(@processes.size) %></h2>
-<p class="rh-sub" style="margin:-4px 0 16px">
-  Fetch strategy:
-  <% if @fetch_active %>
-    <span class="rh-st rh-st-ok">RoundhouseUi::Fetch — pause-aware</span>
-  <% else %>
-    <span class="rh-st rh-st-paused">default — pause not enforced</span>
-  <% end %>
-  <span class="rh-sub" style="margin-left:6px">crash-reliable fetch (super_fetch) is Sidekiq Pro</span>
-</p>
+<% if RoundhouseUi.pause_enabled %>
+  <p class="rh-sub" style="margin:-4px 0 16px">
+    Fetch strategy:
+    <% if @fetch_active %>
+      <span class="rh-st rh-st-ok">RoundhouseUi::Fetch — pause-aware</span>
+    <% else %>
+      <span class="rh-st rh-st-paused">default — pause not enforced</span>
+    <% end %>
+    <span class="rh-sub" style="margin-left:6px">crash-reliable fetch (super_fetch) is Sidekiq Pro</span>
+  </p>
+<% end %>
 <table class="rh-table">
   <thead><tr><th>Process</th><th class="r">Threads</th><th>Queues</th><th class="r">Started</th><th class="r">Heartbeat</th><th class="r">Actions</th></tr></thead>
   <tbody>

data/lib/roundhouse_ui/version.rb

@@ -1,3 +1,3 @@
 module RoundhouseUi
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/roundhouse_ui.rb

@@ -57,6 +57,13 @@ module RoundhouseUi
     # Sidekiq's retry/dead sets, so this is the only way to surface them here.
     attr_accessor :show_sidekiq_failures
 
+    # Queue pause/resume is only enforced when RoundhouseUi::Fetch is installed
+    # as the server's fetch strategy. If you run reliable fetch (Sidekiq
+    # Pro/Enterprise super_fetch) you can't also run our fetcher, so pause can't
+    # be enforced — set this to false to hide the pause controls and the
+    # "not enforced" warning entirely. Default: true.
+    attr_accessor :pause_enabled
+
     # Configure in an initializer:
     #
     #   RoundhouseUi.configure do |c|
@@ -77,4 +84,5 @@ module RoundhouseUi
   self.allow_job_editing = false
   self.redact_args = []
   self.show_sidekiq_failures = false
+  self.pause_enabled = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roundhouse_ui
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - R.J. Robinson