upright 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ec7e02ebd4e740ce3d54364ad34d3d0e65df4ad2f6801ffb2a8ebbbf9af12cf
-  data.tar.gz: 898bccbce30edeb9ab0f38e92e49b894ea197aace8e824bb3f0164e6c050e91b
+  metadata.gz: 1d1bb4a1f14f8e4dc16cf5bebcd5868917b2c0703f6dd94592d6f8c818dfa0b9
+  data.tar.gz: 4d3a0593d1f49f256145340f3e64c9ab6f467a759f1c0a60e81e58635528e0d1
 SHA512:
-  metadata.gz: ed90551122e4fba67b74cae406d70ab58b4e419cffab41df84e816fbe4b53aeba8a1805a0c6f7949fd5fbc232589ca812b458056cd24098f38884d0d50acf364
-  data.tar.gz: 68df1174db51f31b0a7e4d466fc9d451ca3f81151fe1c4048e1d5ea0cb2859f1689e875edaa02a7e03b010902efbc9e895b37ac8a3c78d7cb0bdfcd649257346
+  metadata.gz: 5d06f946c9874af94e42bca38bb58671e227b3c4f2ac2f9a523d36b3efca04771a3d0a087bb2644ea067e5a8094d35e1370ee85ded8ea140af084afbf4a4e29a
+  data.tar.gz: c2ac9d3d2822197887e22308dbdce7be1b47692825dcb25cbb660f0de8e24643788b2cd5a63c72c4863041b619a35e3b31b9e241c69861b59ff66c8398fcd9b2

data/LICENSE.md

@@ -1,10 +1,9 @@
-# O'Saasy License Agreement
+# MIT License
 
 Copyright © 2026, 37signals LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-1. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-2. No licensee or downstream recipient may use the Software (including any modified or derivative versions) to directly compete with the original Licensor by offering it to third parties as a hosted, managed, or Software-as-a-Service (SaaS) product or cloud service where the primary value of the service is the functionality of the Software itself.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -2,6 +2,23 @@
 
 Upright is a self-hosted synthetic monitoring system. It provides a framework for running health check probes from multiple geographic sites and reporting metrics via Prometheus. Alerts can then be configured with AlertManager.
 
+<table>
+  <tr>
+    <td><img src="docs/screenshots/dashboard.png" alt="Dashboard" width="100%"></td>
+    <td><img src="docs/screenshots/uptime.png" alt="Uptime" width="100%"></td>
+  </tr>
+  <tr>
+    <td><em>Site overview with world map</em></td>
+    <td><em>30-day uptime history</em></td>
+  </tr>
+  <tr>
+    <td colspan="2"><img src="docs/screenshots/probe-status.png" alt="Probe status" width="100%"></td>
+  </tr>
+  <tr>
+    <td colspan="2"><em>Probe status across all sites</em></td>
+  </tr>
+</table>
+
 ## Features
 
 - **Playwright Probes** - Browser-based probes for user flows with video recording and logs
@@ -14,7 +31,6 @@ Upright is a self-hosted synthetic monitoring system. It provides a framework fo
 
 ### Not Included
 
-- **Dashboards** - Instead, Grafana is suggested for monitoring the Prometheus metrics generated here
 - **Notifications** - Instead, Alertmanager is included for alerting and notifications
 - **Hosting** - Instead, you can use a VPS from DigitalOcean, Hetzner, etc.
 
@@ -40,9 +56,9 @@ Create a new Rails application and install Upright:
 ```bash
 rails new my-upright --database=sqlite3 --skip-test
 cd my-upright
-bundle add upright --github=basecamp/upright
+bundle add upright
 bin/rails generate upright:install
-bin/rails db:setup
+bin/rails db:migrate
 ```
 
 Start the server:
@@ -227,18 +243,15 @@ Configure probe scheduling with Solid Queue in `config/recurring.yml`:
 ```yaml
 production:
   http_probes:
-    class: Upright::ProbeCheckJob
-    args: [http]
+    command: "Upright::Probes::HTTPProbe.check_and_record_all_later"
     schedule: every 30 seconds
 
   smtp_probes:
-    class: Upright::ProbeCheckJob
-    args: [smtp]
+    command: "Upright::Probes::SMTPProbe.check_and_record_all_later"
     schedule: every 30 seconds
 
   my_service_auth:
-    class: Upright::ProbeCheckJob
-    args: [playwright, MyServiceAuth]
+    command: "Probes::Playwright::MyServiceAuthProbe.check_and_record_later"
     schedule: every 15 minutes
 ```
 
@@ -452,4 +465,4 @@ bin/rails test
 
 ## License
 
-The gem is available under the terms of the [O'Saasy License](LICENSE.md).
+The gem is available under the terms of the [MIT License](LICENSE.md).

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

@@ -34,227 +34,83 @@
     width: auto;
   }
 
-  .dashboard-section {
-    margin-bottom: calc(var(--block-space) * 2);
-  }
-
-  .dashboard-section h2 {
-    font-size: var(--text-large);
-    margin-bottom: var(--block-space);
-  }
-
-  .dashboard-section h3 {
-    font-size: var(--text-normal);
-    font-weight: 500;
-    margin-bottom: var(--block-space);
-  }
-
-  .dashboard-loading {
-    align-items: center;
-    background: oklch(var(--lch-ink-lightest) / 85%);
-    border-radius: 0.25rem;
-    display: flex;
-    gap: var(--inline-space);
-    justify-content: center;
-    margin-bottom: var(--block-space);
-    padding: var(--block-space);
-  }
-
-  .dashboard-loading.hidden {
-    display: none;
-  }
-
-  .loading-spinner {
-    animation: spin 1s linear infinite;
-    border: 2px solid var(--color-ink-light);
-    border-radius: 50%;
-    border-top-color: var(--color-link);
-    height: 1rem;
-    width: 1rem;
-  }
-
-  @keyframes spin {
-    to { transform: rotate(360deg); }
-  }
-
-  .uptime-card {
+  .no-data-message {
     background: oklch(var(--lch-ink-lightest) / 85%);
     border-radius: 0.25rem;
     box-shadow: var(--shadow);
-    display: inline-block;
-    padding: calc(var(--block-space) * 1.5) calc(var(--block-space) * 2);
-    text-align: center;
-  }
-
-  .uptime-value {
-    font-size: 3rem;
-    font-weight: 600;
-    letter-spacing: -0.02em;
-    line-height: 1;
-    margin-bottom: 0.25rem;
-  }
-
-  .uptime-label {
     color: var(--color-ink-dark);
-    font-size: var(--text-small);
-    font-weight: 500;
-    text-transform: uppercase;
-  }
-
-  .uptime-period {
-    color: var(--color-ink-medium);
-    font-size: var(--text-x-small);
-    margin-top: 0.25rem;
+    padding: calc(var(--block-space) * 2);
+    text-align: center;
   }
 
-  .dashboard-chart {
-    background: oklch(var(--lch-ink-lightest) / 85%);
+  .error-message {
+    background: oklch(var(--lch-red-dark) / 15%);
     border-radius: 0.25rem;
-    box-shadow: var(--shadow);
-    min-height: 250px;
-    padding: var(--block-space);
-  }
-
-  .dashboard-chart circle {
-    stroke: none;
-  }
-
-  .dashboard-chart text {
-    font-family: var(--font-mono);
-    font-size: var(--text-x-small);
-  }
-
-  .uptime-table {
-    width: 100%;
-  }
-
-  .uptime-table tbody tr {
-    cursor: default;
-  }
-
-  .status-2xx {
-    color: var(--color-positive);
-    font-weight: 500;
-  }
-
-  .status-3xx {
-    color: oklch(70% 0.12 250);
-    font-weight: 500;
-  }
-
-  .status-4xx {
-    color: oklch(75% 0.15 85);
-    font-weight: 500;
-  }
-
-  .status-5xx {
     color: var(--color-negative);
-    font-weight: 600;
-  }
-
-  .status-unknown {
-    color: var(--color-ink-medium);
-  }
-
-  .heatmap-wrapper {
-    background: oklch(var(--lch-ink-lightest) / 85%);
-    border-radius: 0.25rem;
-    box-shadow: var(--shadow);
-    overflow-x: auto;
+    padding: var(--block-space);
+    text-align: center;
   }
 
-  .heatmap-table {
-    border-collapse: collapse;
-    box-shadow: none;
-    min-width: 100%;
+  /* Probe Status Matrix */
+  .probe-status__header,
+  .probe-status__row {
+    display: grid;
+    gap: 0;
+    grid-template-columns: minmax(200px, 1fr) repeat(var(--cols), 1fr);
   }
 
-  .heatmap-table th,
-  .heatmap-table td {
-    border: 1px solid var(--color-ink-lighter);
-    font-size: var(--text-x-small);
-    padding: 0.5em 0.75em;
-    text-align: center;
+  .probe-status__header > *,
+  .probe-status__row > * {
+    min-width: 8em;
+    padding: calc(var(--block-space) * 0.75) var(--block-space);
     white-space: nowrap;
   }
 
-  .heatmap-probe-header,
-  .heatmap-probe {
-    background: var(--color-ink-lighter);
-    font-weight: 500;
-    left: 0;
-    position: sticky;
-    text-align: left;
+  .probe-status-cell-link {
+    color: inherit;
+    display: block;
+    text-decoration: none;
   }
 
-  .heatmap-time {
-    font-size: calc(var(--text-x-small) * 0.9);
-    font-weight: 400;
-  }
-
-  .heatmap-cell {
-    font-weight: 500;
-    min-width: 3em;
+  .probe-status-cell-link:hover {
+    opacity: 0.8;
   }
 
-  .heatmap-cell.status-2xx {
-    background: oklch(var(--lch-green-dark) / 15%);
+  .probe-status-row--down {
+    background: oklch(var(--lch-red-dark) / 8%);
   }
 
-  .heatmap-cell.status-3xx {
-    background: oklch(70% 0.08 250 / 15%);
+  .probe-status-cell--up {
+    background: oklch(var(--lch-green-dark) / 10%);
   }
 
-  .heatmap-cell.status-4xx {
-    background: oklch(75% 0.1 85 / 20%);
+  .probe-status-cell--down {
+    background: oklch(var(--lch-red-dark) / 15%);
   }
 
-  .heatmap-cell.status-5xx {
-    background: oklch(var(--lch-red-dark) / 20%);
+  .probe-status-cell--stale {
+    background: oklch(75% 0.1 85 / 15%);
   }
 
-  .error-table {
-    width: 100%;
+  .probe-status-indicator {
+    font-weight: 600;
+    display: block;
   }
 
-  .error-table tbody tr {
-    cursor: default;
+  .probe-status-indicator--up {
+    color: var(--color-positive);
   }
 
-  .error-time {
-    color: var(--color-ink-dark);
-    white-space: nowrap;
+  .probe-status-indicator--down {
+    color: var(--color-negative);
   }
 
-  .error-probe {
-    font-weight: 500;
+  .probe-status-indicator--stale {
+    color: oklch(75% 0.15 85);
   }
 
-  .error-target {
+  .probe-status-indicator--unknown {
     color: var(--color-ink-medium);
-    font-size: var(--text-x-small);
-    max-width: 300px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .no-data-message,
-  .no-errors-message {
-    background: oklch(var(--lch-ink-lightest) / 85%);
-    border-radius: 0.25rem;
-    box-shadow: var(--shadow);
-    color: var(--color-ink-dark);
-    padding: calc(var(--block-space) * 2);
-    text-align: center;
-  }
-
-  .error-message {
-    background: oklch(var(--lch-red-dark) / 15%);
-    border-radius: 0.25rem;
-    color: var(--color-negative);
-    padding: var(--block-space);
-    text-align: center;
   }
 
   @media (max-width: 85ch) {
@@ -271,17 +127,33 @@
     .dashboard-filters {
       flex-wrap: wrap;
     }
-
-    .uptime-value {
-      font-size: 2rem;
-    }
   }
 
   @media (max-width: 55ch) {
-    .heatmap-table th,
-    .heatmap-table td {
-      padding: 0.25em 0.5em;
-      font-size: calc(var(--text-x-small) * 0.9);
+    .probe-status__header {
+      display: none;
+    }
+
+    .probe-status__row {
+      grid-template-columns: 1fr;
+    }
+
+    .probe-status__row > .sticky-left {
+      position: static;
+    }
+
+    .probe-status__row > [data-label] {
+      display: flex;
+      align-items: center;
+      gap: var(--inline-space);
+      text-align: left;
+
+      &::before {
+        content: attr(data-label);
+        font-size: var(--text-x-small);
+        font-weight: 500;
+        min-width: 10em;
+      }
     }
   }
 }

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,7 +37,7 @@
     color: var(--color-negative);
   }
 
-  /* Individual uptime bar (separate block) */
+  /* Individual uptime bar */
   .uptime-bar {
     border-radius: 2px;
     cursor: default;
@@ -131,7 +85,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/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/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/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/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/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)
+        if probe_type.present?
+          "{type=\"#{probe_type}\"}"
+        end
+      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/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>

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

@@ -1,7 +1,7 @@
-<div class="uptime-bars__row">
-  <%= link_to upright.site_root_url(subdomain: Upright.sites.first.code, probe_type: probe.type, probe_name: probe.name), class: "uptime-bars__probe" do %>
+<div class="data-table__row uptime-bars__row">
+  <%= link_to upright.site_root_url(subdomain: Upright.sites.first.code, probe_type: probe.type, probe_name: probe.name), class: "data-table__probe" do %>
     <%= probe_type_icon(probe.type) %>
-    <span class="probe__name"><%= probe.name %></span>
+    <span class="data-table__probe-name"><%= probe.name %></span>
   <% end %>
   <div class="uptime-bars__days">
     <% dates.each do |date| %>

data/app/views/upright/dashboards/probe_statuses/_matrix.html.erb

@@ -0,0 +1,48 @@
+<% if probes.empty? %>
+  <div class="no-data-message">
+    No probe data available for the selected type.
+  </div>
+<% else %>
+  <div class="scrollable-x">
+    <div class="data-table" style="--cols: <%= sites.size %>">
+      <div class="data-table__header probe-status__header">
+        <div class="sticky-left">Probe</div>
+        <% sites.each do |site| %>
+          <div class="text-center"><%= site_name(site) %></div>
+        <% end %>
+      </div>
+      <% probes.each do |probe| %>
+        <div class="data-table__row probe-status__row <%= "probe-status-row--down" if probe.any_down? %>">
+          <div class="sticky-left">
+            <%= link_to upright.site_root_url(subdomain: Upright.sites.first.code, probe_type: probe.type, probe_name: probe.name), class: "data-table__probe" do %>
+              <%= probe_type_icon(probe.type) %>
+              <span><%= probe.name %></span>
+            <% end %>
+          </div>
+          <% sites.each do |site| %>
+            <% status = probe.status_for_site(site.code) %>
+            <div class="text-center <%= probe_status_css_class(status) %>" data-label="<%= site_name(site) %>">
+              <%= link_to upright.site_root_url(subdomain: site.code, probe_type: probe.type, probe_name: probe.name), class: "probe-status-cell-link" do %>
+                <% if status.nil? %>
+                  <span class="probe-status-indicator probe-status-indicator--unknown">—</span>
+                <% elsif status.stale? %>
+                  <span class="probe-status-indicator probe-status-indicator--stale">STALE</span>
+                <% elsif status.up? %>
+                  <span class="probe-status-indicator probe-status-indicator--up">UP</span>
+                <% else %>
+                  <span class="probe-status-indicator probe-status-indicator--down">
+                    <% if status.down_since_known? %>
+                      DOWN for <%= time_ago_in_words(status.down_since) %>
+                    <% else %>
+                      DOWN
+                    <% end %>
+                  </span>
+                <% end %>
+              <% end %>
+            </div>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/app/views/upright/dashboards/probe_statuses/show.html.erb

@@ -0,0 +1,17 @@
+<div class="dashboard probe-status-dashboard">
+  <header class="dashboard-header">
+    <h1>Probe Status</h1>
+
+    <div class="dashboard-filters">
+      <%= form_with url: dashboards_probe_status_path, method: :get, data: { controller: "form", turbo_frame: :probe_status_matrix } do %>
+        <%= collection_select nil, :probe_type, Upright::Probeable::TYPES, :itself, :titleize,
+              { selected: @probe_type },
+              { class: "input--select", data: { action: "change->form#submit" } } %>
+      <% end %>
+    </div>
+  </header>
+
+  <turbo-frame id="probe_status_matrix" data-controller="auto-refresh" data-auto-refresh-interval-value="60000">
+    <%= render "matrix", probes: @probes, sites: @sites %>
+  </turbo-frame>
+</div>

data/app/views/upright/sites/index.html.erb

@@ -14,7 +14,7 @@
       <% @sites.each do |site| %>
         <tr>
           <td><%= link_to site.host, site.url %></td>
-          <td><%= site.city %></td>
+          <td><%= site_name(site) %></td>
         </tr>
       <% end %>
     </tbody>

data/config/credentials/development.key

@@ -0,0 +1 @@
+40451408e038d0fe36a8f4aed0cef429

data/config/credentials/test.key

@@ -0,0 +1 @@
+40451408e038d0fe36a8f4aed0cef429

data/config/routes.rb

@@ -10,6 +10,7 @@ Upright::Engine.routes.draw do
 
     namespace :dashboards do
       resource :uptime, only: :show
+      resource :probe_status, only: :show
     end
 
     scope :framed do

data/lib/generators/upright/install/install_generator.rb

@@ -19,6 +19,7 @@ module Upright
         empty_directory "probes/authenticators"
         template "http_probes.yml", "probes/http_probes.yml"
         template "smtp_probes.yml", "probes/smtp_probes.yml"
+        template "traceroute_probes.yml", "probes/traceroute_probes.yml"
       end
 
       def copy_observability_configs
@@ -46,6 +47,14 @@ module Upright
         route 'mount Upright::Engine => "/", as: :upright'
       end
 
+      def install_active_storage
+        rails_command "active_storage:install"
+      end
+
+      def configure_javascript
+        append_to_file "app/javascript/application.js", 'import "upright/application"'
+      end
+
       def show_post_install_message
         say ""
         say "Upright has been installed!", :green

data/lib/generators/upright/install/templates/traceroute_probes.yml

@@ -0,0 +1,9 @@
+# Traceroute Probe Definitions
+# Add your traceroute probes here
+#
+# Required fields:
+#   - name: Unique identifier for the probe
+#   - host: Hostname or IP address to trace
+
+# - name: Example Service
+#   host: example.com

data/lib/generators/upright/install/templates/upright.rb

@@ -3,7 +3,7 @@
 Upright.configure do |config|
   config.service_name = "<%= Rails.application.class.module_parent_name.underscore %>"
   config.user_agent   = "<%= Rails.application.class.module_parent_name.underscore %>/1.0"
-  config.hostname     = Rails.env.local? ? "<%= Rails.application.class.module_parent_name.downcase %>.localhost" : "<%= Rails.application.class.module_parent_name.downcase %>.com"
+  config.hostname     = Rails.env.local? ? "<%= Rails.application.class.module_parent_name.underscore.dasherize %>.localhost" : "<%= Rails.application.class.module_parent_name.underscore.dasherize %>.com"
 
   # Playwright browser server URL
   # config.playwright_server_url = ENV["PLAYWRIGHT_SERVER_URL"]

data/lib/upright/geohash.rb

@@ -0,0 +1,46 @@
+module Upright
+  module Geohash
+    BASE32 = "0123456789bcdefghjkmnpqrstuvwxyz"
+
+    module_function
+
+    def decode(geohash)
+      bounds = [ [ -90.0, +90.0 ], [ -180.0, +180.0 ] ]
+
+      geohash.downcase.each_char.with_index do |c, i|
+        d = BASE32.index c
+
+        5.times do |j|
+          bit = (d & (1 << (4 - j))) >> (4 - j)
+          k = (~i & 1) ^ (j & 1)
+          bounds[k][bit ^ 1] = (bounds[k][0] + bounds[k][1]) / 2
+        end
+      end
+
+      bounds.transpose
+    end
+
+    def encode(latitude, longitude, precision = 12)
+      mids = [ latitude, longitude ]
+      bounds = [ [ -90.0, +90.0 ], [ -180.0, +180.0 ] ]
+
+      geohash = +""
+
+      precision.times do |i|
+        d = 0
+
+        5.times do |j|
+          k = (~i & 1) ^ (j & 1)
+          mid = (bounds[k][0] + bounds[k][1]) / 2
+          bit = mids[k] > mid ? 1 : 0
+          bounds[k][bit ^ 1] = mid
+          d |= bit << (4 - j)
+        end
+
+        geohash << BASE32[d]
+      end
+
+      geohash
+    end
+  end
+end

data/lib/upright/site.rb

@@ -1,5 +1,3 @@
-require "geohash_ruby"
-
 module Upright
   class Site
     attr_reader :code, :city, :country, :geohash, :stagger_index
@@ -43,7 +41,7 @@ module Upright
 
     private
       def coordinates
-        @coordinates ||= Geohash.decode(geohash).first
+        @coordinates ||= Upright::Geohash.decode(geohash).first
       end
   end
 end

data/lib/upright/version.rb

@@ -1,3 +1,3 @@
 module Upright
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/upright.rb

@@ -14,12 +14,12 @@ require "importmap-rails"
 require "turbo-rails"
 require "stimulus-rails"
 require "geared_pagination"
-require "geohash_ruby"
 require "yabeda/prometheus"
 require "yabeda/puma/plugin"
 
 require "upright/version"
 require "upright/configuration"
+require "upright/geohash"
 require "upright/site"
 require "upright/metrics"
 require "upright/tracing"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upright
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Lewis Buckley
@@ -163,20 +163,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: geohash_ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: playwright-ruby-client
   requirement: !ruby/object:Gem::Requirement
@@ -390,6 +376,7 @@ files:
 - app/controllers/upright/alertmanager_proxy_controller.rb
 - app/controllers/upright/application_controller.rb
 - app/controllers/upright/artifacts_controller.rb
+- app/controllers/upright/dashboards/probe_statuses_controller.rb
 - app/controllers/upright/dashboards/uptimes_controller.rb
 - app/controllers/upright/jobs_controller.rb
 - app/controllers/upright/probe_results_controller.rb
@@ -401,6 +388,7 @@ files:
 - app/helpers/upright/probe_results_helper.rb
 - app/javascript/upright/application.js
 - app/javascript/upright/controllers/application.js
+- app/javascript/upright/controllers/auto_refresh_controller.js
 - app/javascript/upright/controllers/form_controller.js
 - app/javascript/upright/controllers/index.js
 - app/javascript/upright/controllers/popover_controller.js
@@ -431,6 +419,9 @@ files:
 - app/models/upright/probes/http_probe.rb
 - app/models/upright/probes/playwright/base.rb
 - app/models/upright/probes/smtp_probe.rb
+- app/models/upright/probes/status.rb
+- app/models/upright/probes/status/probe.rb
+- app/models/upright/probes/status/site_status.rb
 - app/models/upright/probes/traceroute_probe.rb
 - app/models/upright/probes/uptime.rb
 - app/models/upright/probes/uptime/summary.rb
@@ -446,6 +437,8 @@ files:
 - app/views/upright/artifacts/show.html.erb
 - app/views/upright/dashboards/_uptime_bars.html.erb
 - app/views/upright/dashboards/_uptime_probe_row.html.erb
+- app/views/upright/dashboards/probe_statuses/_matrix.html.erb
+- app/views/upright/dashboards/probe_statuses/show.html.erb
 - app/views/upright/dashboards/uptimes/show.html.erb
 - app/views/upright/jobs/show.html.erb
 - app/views/upright/probe_results/_pagination.html.erb
@@ -455,6 +448,8 @@ files:
 - app/views/upright/sites/index.html.erb
 - config/brakeman.ignore
 - config/ci.rb
+- config/credentials/development.key
+- config/credentials/test.key
 - config/importmap.rb
 - config/routes.rb
 - db/migrate/20250114000001_create_upright_probe_results.rb
@@ -471,6 +466,7 @@ files:
 - lib/generators/upright/install/templates/puma.rb
 - lib/generators/upright/install/templates/sites.yml
 - lib/generators/upright/install/templates/smtp_probes.yml
+- lib/generators/upright/install/templates/traceroute_probes.yml
 - lib/generators/upright/install/templates/upright.rb
 - lib/generators/upright/install/templates/upright.rules.yml
 - lib/generators/upright/playwright_probe/playwright_probe_generator.rb
@@ -481,6 +477,7 @@ files:
 - lib/upright.rb
 - lib/upright/configuration.rb
 - lib/upright/engine.rb
+- lib/upright/geohash.rb
 - lib/upright/metrics.rb
 - lib/upright/playwright/collect_performance_metrics.js
 - lib/upright/site.rb
@@ -488,7 +485,7 @@ files:
 - lib/upright/version.rb
 homepage: https://github.com/basecamp/upright
 licenses:
-- O'Saasy
+- MIT
 metadata:
   homepage_uri: https://github.com/basecamp/upright
   source_code_uri: https://github.com/basecamp/upright
@@ -507,7 +504,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Synthetic monitoring engine with Playwright and Prometheus metrics
 test_files: []