upright 0.1.2 → 0.3.0

data/app/assets/stylesheets/upright/tables.css

@@ -60,4 +60,64 @@
       padding: calc(var(--block-space) * 0.4) calc(var(--block-space) * 0.4);
     }
   }
+
+  /* Div-based data tables (shared by dashboard views) */
+  .data-table {
+    background: oklch(var(--lch-ink-lightest) / 85%);
+    border-radius: 0.25rem;
+    box-shadow: var(--shadow);
+  }
+
+  .data-table__header {
+    background: var(--color-ink-lighter);
+    font-size: var(--text-x-small);
+    font-weight: 500;
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+  }
+
+  .data-table__row {
+    border-top: 1px solid var(--color-ink-lighter);
+    transition: background-color 100ms;
+
+    &:hover {
+      background-color: var(--color-canvas);
+    }
+  }
+
+  .data-table__probe {
+    align-items: center;
+    color: inherit;
+    display: flex;
+    gap: 0.75em;
+    min-width: 0;
+    text-decoration: none;
+
+    &:hover {
+      color: var(--color-link);
+      text-decoration: none;
+    }
+  }
+
+  .data-table__probe-name {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  /* Utilities */
+  .text-center {
+    text-align: center;
+  }
+
+  .sticky-left {
+    background: inherit;
+    left: 0;
+    position: sticky;
+    z-index: 1;
+  }
+
+  .scrollable-x {
+    overflow-x: auto;
+  }
 }

data/app/assets/stylesheets/upright/uptime-bars.css

@@ -1,56 +1,10 @@
 @layer components {
-  .uptime-bars {
-    display: flex;
-    flex-direction: column;
-  }
-
-  .uptime-bars__header {
-    background: var(--color-ink-lighter);
-    display: grid;
-    font-size: var(--text-x-small);
-    font-weight: 500;
-    gap: var(--block-space);
-    grid-template-columns: minmax(200px, 1fr) 1fr auto;
-    letter-spacing: 0.04em;
-    padding: calc(var(--block-space) * 0.75) var(--block-space);
-    text-transform: uppercase;
-  }
-
-
+  .uptime-bars__header,
   .uptime-bars__row {
-    border-top: 1px solid var(--color-ink-lighter);
     display: grid;
     gap: var(--block-space);
     grid-template-columns: minmax(200px, 1fr) 1fr auto;
     padding: calc(var(--block-space) * 0.75) var(--block-space);
-    transition: background-color 100ms;
-  }
-
-  .uptime-bars__row:hover {
-    background: var(--color-canvas);
-  }
-
-  .uptime-bars__probe {
-    align-items: center;
-    color: inherit;
-    display: flex;
-    gap: 0.75em;
-    min-width: 0;
-
-    &:hover {
-      color: var(--color-link);
-      text-decoration: none;
-    }
-  }
-
-  .uptime-bars__probe .probe__badge {
-    flex-shrink: 0;
-  }
-
-  .uptime-bars__probe .probe__name {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
   }
 
   .uptime-bars__days {
@@ -83,10 +37,9 @@
     color: var(--color-negative);
   }
 
-  /* Individual uptime bar (separate block) */
+  /* Individual uptime bar */
   .uptime-bar {
     border-radius: 2px;
-    cursor: default;
     flex: 1;
     height: 24px;
     max-width: 12px;
@@ -94,6 +47,16 @@
     transition: transform 100ms, filter 100ms;
   }
 
+  a.uptime-bar {
+    cursor: pointer;
+    display: block;
+    text-decoration: none;
+  }
+
+  div.uptime-bar {
+    cursor: default;
+  }
+
   .uptime-bar:hover {
     filter: brightness(1.1);
     transform: scaleY(1.15);
@@ -131,7 +94,7 @@
       gap: calc(var(--block-space) * 0.5);
     }
 
-    .uptime-bars__probe .probe__badge {
+    .data-table__probe .probe__badge {
       display: none;
     }
   }

data/app/controllers/upright/alertmanager_proxy_controller.rb

@@ -5,7 +5,7 @@ class Upright::AlertmanagerProxyController < Upright::ApplicationController
   end
 
   def proxy
-    proxy_to_alertmanager request.fullpath.delete_prefix("/alertmanager")
+    proxy_to_alertmanager request.fullpath.delete_prefix("/alertmanager"), body: request.body&.read
   end
 
   private

data/app/controllers/upright/dashboards/probe_statuses_controller.rb

@@ -0,0 +1,7 @@
+class Upright::Dashboards::ProbeStatusesController < Upright::ApplicationController
+  def show
+    @probe_type = params.fetch(:probe_type, :http)
+    @probes = Upright::Probes::Status.for_type(@probe_type)
+    @sites = Upright.sites
+  end
+end

data/app/controllers/upright/probe_results_controller.rb

@@ -12,6 +12,7 @@ class Upright::ProbeResultsController < Upright::ApplicationController
         .by_type(params[:probe_type])
         .by_status(params[:status])
         .by_name(params[:probe_name])
+        .by_date(params[:date])
         .with_attached_artifacts
     end
 end

data/app/controllers/upright/sessions_controller.rb

@@ -8,6 +8,7 @@ class Upright::SessionsController < Upright::ApplicationController
   end
 
   def create
+    reset_session
     user = Upright::User.from_omniauth(request.env["omniauth.auth"])
     session[:user_info] = { email: user.email, name: user.name }
     redirect_to upright.root_path

data/app/helpers/upright/application_helper.rb

@@ -3,9 +3,19 @@ module Upright::ApplicationHelper
     Upright::Current.site || Upright.sites.first
   end
 
+  def site_name(site)
+    "#{country_flag(site.country)} #{site.city}"
+  end
+
   def upright_stylesheet_link_tag(**options)
     Upright::Engine.root.join("app/assets/stylesheets/upright").glob("*.css")
       .map { |f| "upright/#{f.basename('.css')}" }.sort
       .then { |stylesheets| stylesheet_link_tag(*stylesheets, **options) }
   end
+
+  private
+
+  def country_flag(country_code)
+    country_code&.upcase&.gsub(/[A-Z]/) { |c| (c.ord + 0x1F1A5).chr(Encoding::UTF_8) }
+  end
 end

data/app/helpers/upright/dashboards_helper.rb

@@ -28,4 +28,16 @@ module Upright::DashboardsHelper
       mins.zero? ? "#{hours}h" : "#{hours}h #{mins}m"
     end
   end
+
+  def probe_status_css_class(status)
+    if status.nil?
+      "probe-status-cell--unknown"
+    elsif status.stale?
+      "probe-status-cell--stale"
+    elsif status.up?
+      "probe-status-cell--up"
+    else
+      "probe-status-cell--down"
+    end
+  end
 end

data/app/helpers/upright/probe_results_helper.rb

@@ -1,15 +1,7 @@
 module Upright::ProbeResultsHelper
-  PROBE_TYPE_ICONS = {
-    http: "🌐",
-    playwright: "🎭",
-    ping: "📶",
-    smtp: "✉️",
-    traceroute: "🛤️"
-  }
-
   def probe_type_icon(probe_type)
-    icon = PROBE_TYPE_ICONS.fetch(probe_type.to_s.downcase.to_sym)
-    content_tag(:span, icon, title: probe_type.titleize)
+    registered = Upright.probe_types.find(probe_type)
+    content_tag(:span, registered.icon, title: registered.name)
   end
 
   def type_filter_link(label, probe_type = nil)
@@ -44,6 +36,7 @@ module Upright::ProbeResultsHelper
     parts << "for #{params[:probe_type].titleize} probes" if params[:probe_type].present?
     parts << "named #{params[:probe_name]}" if params[:probe_name].present?
     parts << "with status #{params[:status]}" if params[:status].present?
+    parts << "on #{Date.parse(params[:date]).to_fs(:long)}" if params[:date].present?
     parts.join(" ")
   end
 end

data/app/javascript/upright/controllers/auto_refresh_controller.js

@@ -0,0 +1,16 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static values = { interval: { type: Number, default: 60000 } }
+
+  connect() {
+    this.timer = setInterval(() => {
+      this.element.src = window.location.href
+      this.element.reload()
+    }, this.intervalValue)
+  }
+
+  disconnect() {
+    clearInterval(this.timer)
+  }
+}

data/app/models/concerns/upright/playwright/form_authentication.rb

@@ -19,9 +19,6 @@ module Upright::Playwright::FormAuthentication
     end
 
     def authenticator_for(service)
-      # First try the host app's authenticator, then fall back to engine's
       "::Playwright::Authenticator::#{service.to_s.camelize}".constantize
-    rescue NameError
-      "Upright::Playwright::Authenticator::#{service.to_s.camelize}".constantize
     end
 end

data/app/models/concerns/upright/playwright/lifecycle.rb

@@ -33,8 +33,9 @@ module Upright::Playwright::Lifecycle
       run_callbacks :page_ready
       yield
     ensure
-      page&.close
-      context&.close
+      # Rescue each step independently so a failed close doesn't prevent video capture
+      page&.close rescue Rails.error.report($!)
+      context&.close rescue Rails.error.report($!)
       run_callbacks :page_close
     end
 

data/app/models/concerns/upright/probe_result/stale_cleanup.rb

@@ -0,0 +1,23 @@
+module Upright::ProbeResult::StaleCleanup
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def cleanup_stale
+      cleanup_stale_successes
+      cleanup_stale_failures
+    end
+
+    def cleanup_stale_successes
+      ok.where(created_at: ...Upright.config.stale_success_threshold.ago).in_batches.destroy_all
+    end
+
+    def cleanup_stale_failures
+      cutoff = [
+        Upright.config.stale_failure_threshold.ago,
+        fail.order(created_at: :desc).offset(Upright.config.failure_retention_limit).pick(:created_at)
+      ].compact.max
+
+      fail.where(created_at: ..cutoff).in_batches.destroy_all
+    end
+  end
+end

data/app/models/concerns/upright/probeable.rb

@@ -2,7 +2,7 @@ module Upright::Probeable
   extend ActiveSupport::Concern
   include Upright::Staggerable
 
-  TYPES = %w[ http playwright smtp traceroute ]
+  ALERT_SEVERITIES = %i[ medium high critical ]
 
   included do
     attr_writer :logger
@@ -35,6 +35,7 @@ module Upright::Probeable
       probe_name: probe_name,
       probe_target: probe_target,
       probe_service: probe_service,
+      probe_alert_severity: probe_alert_severity,
       status: result[:status],
       duration: result[:duration],
       error: result[:error]
@@ -63,6 +64,11 @@ module Upright::Probeable
     nil
   end
 
+  def probe_alert_severity
+    severity = try(:alert_severity)&.to_sym
+    ALERT_SEVERITIES.include?(severity) ? severity : :high
+  end
+
   private
     def failsafe_check
       result, error, duration = nil

data/app/models/upright/http/request.rb

@@ -23,7 +23,7 @@ class Upright::HTTP::Request
         proxy: proxy_url,
         proxyuserpwd: proxy_userpwd,
         verbose: true,
-        forbid_reuse: true
+        forbid_reuse: proxy_url.nil?
       }.compact
     end
 

data/app/models/upright/playwright/storage_state.rb

@@ -8,12 +8,16 @@ class Upright::Playwright::StorageState
   end
 
   def load
-    JSON.parse(path.read) if exists?
+    if exists?
+      decrypted_json = encryptor.decrypt_and_verify(path.read)
+      JSON.parse(decrypted_json)
+    end
   end
 
   def save(state)
     FileUtils.mkdir_p(storage_dir)
-    path.write(JSON.pretty_generate(state))
+    encrypted_data = encryptor.encrypt_and_sign(JSON.generate(state))
+    path.write(encrypted_data)
   end
 
   def clear
@@ -26,6 +30,11 @@ class Upright::Playwright::StorageState
     end
 
     def path
-      storage_dir.join("#{@service}.json")
+      storage_dir.join("#{@service}.enc")
+    end
+
+    def encryptor
+      key = Rails.application.key_generator.generate_key("playwright_storage_state", 32)
+      ActiveSupport::MessageEncryptor.new(key)
     end
 end

data/app/models/upright/probe_result.rb

@@ -1,11 +1,16 @@
 class Upright::ProbeResult < Upright::ApplicationRecord
   include Upright::ExceptionRecording
+  include Upright::ProbeResult::StaleCleanup
+
+  attr_accessor :probe_alert_severity
 
   has_many_attached :artifacts
 
   scope :by_type,   ->(type) { where(probe_type: type) if type.present? }
   scope :by_status, ->(status) { where(status: status) if status.present? }
   scope :by_name,   ->(name) { where(probe_name: name) if name.present? }
+  scope :by_date,   ->(date) { where(created_at: Date.parse(date).all_day) if date.present? }
+
   scope :stale,     -> { where(created_at: ...24.hours.ago) }
 
   enum :status, [ :ok, :fail ]
@@ -23,7 +28,7 @@ class Upright::ProbeResult < Upright::ApplicationRecord
 
   private
     def increment_metrics
-      labels = { type: probe_type, name: probe_name, probe_target: probe_target, probe_service: probe_service }
+      labels = { type: probe_type, name: probe_name, probe_target: probe_target, probe_service: probe_service, alert_severity: probe_alert_severity || :high }
 
       Yabeda.upright_probe_duration_seconds.set(labels.merge(status: status), duration.to_f)
       Yabeda.upright_probe_up.set(labels, ok? ? 1 : 0)

data/app/models/upright/probes/http_probe.rb

@@ -74,11 +74,15 @@ class Upright::Probes::HTTPProbe < FrozenRecord::Base
     end
 
     def proxy_credentials
-      if try(:proxy)
-        Rails.application.credentials.dig(:proxies, proxy.to_sym)
+      if selected_proxy
+        Rails.application.credentials.dig(:proxies, selected_proxy.to_sym)
       end
     end
 
+    def selected_proxy
+      Array(try(:proxies) || try(:proxy)).sample
+    end
+
     def record_response_status
       if last_response && !last_response.network_error? && defined?(Yabeda)
         Yabeda.upright_http_response_status.set(

data/app/models/upright/probes/status/probe.rb

@@ -0,0 +1,24 @@
+class Upright::Probes::Status::Probe
+  include Comparable
+
+  attr_reader :name, :type, :probe_target, :site_statuses
+
+  def initialize(name:, type:, probe_target:, site_statuses:)
+    @name = name
+    @type = type
+    @probe_target = probe_target
+    @site_statuses = site_statuses
+  end
+
+  def status_for_site(code)
+    site_statuses.find { |s| s.site_code == code.to_s }
+  end
+
+  def any_down?
+    site_statuses.any?(&:down?)
+  end
+
+  def <=>(other)
+    [ any_down? ? 0 : 1, type, name ] <=> [ other.any_down? ? 0 : 1, other.type, other.name ]
+  end
+end

data/app/models/upright/probes/status/site_status.rb

@@ -0,0 +1,71 @@
+class Upright::Probes::Status::SiteStatus
+  STALE_THRESHOLD = 5.minutes
+
+  attr_reader :site_code, :site_city
+
+  def initialize(site_code:, site_city:, values:)
+    @site_code = site_code
+    @site_city = site_city
+    @values = values
+  end
+
+  def up?
+    latest_value == 1
+  end
+
+  def down?
+    !up?
+  end
+
+  def stale?
+    if @values.empty?
+      true
+    else
+      Time.at(latest_timestamp) < STALE_THRESHOLD.ago
+    end
+  end
+
+  def down_since
+    if down? && @values.any?
+      Time.at(down_start_timestamp)
+    end
+  end
+
+  def down_since_known?
+    if down? && @values.any?
+      down_start_timestamp != sorted_values.first.first
+    else
+      false
+    end
+  end
+
+  private
+    def sorted_values
+      @sorted_values ||= @values.sort_by(&:first)
+    end
+
+    def down_start_timestamp
+      @down_start_timestamp ||= begin
+        result = sorted_values.last.first
+
+        sorted_values.reverse_each do |timestamp, value|
+          break if value.to_f == 1
+          result = timestamp
+        end
+
+        result
+      end
+    end
+
+    def latest_value
+      if @values.any?
+        sorted_values.last.last.to_f
+      end
+    end
+
+    def latest_timestamp
+      if @values.any?
+        sorted_values.last.first
+      end
+    end
+end

data/app/models/upright/probes/status.rb

@@ -0,0 +1,54 @@
+class Upright::Probes::Status
+  class << self
+    def for_type(probe_type)
+      results = prometheus_client.query_range(
+        query: query(probe_type),
+        start: 30.minutes.ago.iso8601,
+        end:   Time.current.iso8601,
+        step:  "30s"
+      ).deep_symbolize_keys
+
+      build_probes(results[:result])
+    end
+
+    private
+      def query(probe_type)
+        "upright_probe_up#{label_selector(probe_type)}"
+      end
+
+      def label_selector(probe_type)
+        matchers = [ "alert_severity!=\"\"" ]
+        matchers << "type=\"#{probe_type}\"" if probe_type.present?
+        "{#{matchers.join(",")}}"
+      end
+
+      def prometheus_client
+        Prometheus::ApiClient.client(
+          url: ENV.fetch("PROMETHEUS_URL", "http://localhost:9090"),
+          options: { timeout: 30.seconds }
+        )
+      end
+
+      def build_probes(results)
+        # Group results by probe identity (name + type + probe_target)
+        grouped = results.group_by { |r| [ r[:metric][:name], r[:metric][:type], r[:metric][:probe_target] ] }
+
+        grouped.map do |(_name, _type, _target), series|
+          site_statuses = series.map do |s|
+            SiteStatus.new(
+              site_code: s[:metric][:site_code],
+              site_city: s[:metric][:site_city],
+              values: s[:values]
+            )
+          end
+
+          Probe.new(
+            name: _name,
+            type: _type,
+            probe_target: _target,
+            site_statuses: site_statuses
+          )
+        end.sort
+      end
+  end
+end

data/app/models/upright/probes/uptime.rb

@@ -17,13 +17,13 @@ class Upright::Probes::Uptime
 
     private
       def query(probe_type)
-        "upright:probe_uptime_daily#{label_selector(probe_type)}"
+        "min by (name, type, probe_target) (upright:probe_uptime_daily#{label_selector(probe_type)})"
       end
 
       def label_selector(probe_type)
-        if probe_type.present?
-          "{type=\"#{probe_type}\"}"
-        end
+        matchers = [ "alert_severity!=\"\"" ]
+        matchers << "type=\"#{probe_type}\"" if probe_type.present?
+        "{#{matchers.join(",")}}"
       end
 
       def prometheus_client

data/app/models/upright/traceroute/ip_metadata_lookup.rb

@@ -1,7 +1,6 @@
 require "net/http"
 require "json"
 require "resolv"
-require "geohash_ruby"
 
 class Upright::Traceroute::IpMetadataLookup
   API_URL = "http://ip-api.com/batch"
@@ -84,7 +83,7 @@ class Upright::Traceroute::IpMetadataLookup
 
       def encode_geohash(latitude, longitude)
         if latitude && longitude
-          Geohash.encode(latitude, longitude, GEOHASH_PRECISION)
+          Upright::Geohash.encode(latitude, longitude, GEOHASH_PRECISION)
         end
       end
 

data/app/views/layouts/upright/_header.html.erb

@@ -2,13 +2,14 @@
   <div class="header__left">
     <%= link_to "Upright", root_url(subdomain: Upright.configuration.global_subdomain), class: "header__logo" %>
     <% if Upright::Current.site.present? %>
-      <span class="header__site"><%= Upright::Current.site.city %></span>
+      <span class="header__site"><%= site_name(Upright::Current.site) %></span>
     <% end %>
   </div>
 
   <nav class="header__nav">
     <%= link_to "Probes", upright.site_root_url(subdomain: current_or_default_site.code), class: "header__link" %>
     <%= link_to "Uptime", upright.dashboards_uptime_url(subdomain: Upright.configuration.global_subdomain), class: "header__link" %>
+    <%= link_to "Status", upright.dashboards_probe_status_url(subdomain: Upright.configuration.global_subdomain), class: "header__link" %>
     <span class="header__divider"></span>
     <%= link_to "Jobs", upright.jobs_url(subdomain: current_or_default_site.code), class: "header__link" %>
     <span class="header__divider"></span>

data/app/views/upright/dashboards/_uptime_bars.html.erb

@@ -3,8 +3,8 @@
     No probe data available for the selected filters.
   </div>
 <% else %>
-  <div class="uptime-bars">
-    <div class="uptime-bars__header">
+  <div class="data-table">
+    <div class="data-table__header uptime-bars__header">
       <div>Probe</div>
       <div>Past 30 days</div>
       <div>Uptime</div>