upright 0.1.2 → 0.3.0

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: current_or_default_site.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| %>
@@ -11,8 +11,10 @@
       <% else %>
         <% uptime_percent = uptime * 100 %>
         <% downtime_minutes = ((1 - uptime) * 24 * 60).round %>
-        <div class="uptime-bar uptime-bar--<%= uptime_label(uptime_percent) %>"
-             title="<%= uptime_bar_tooltip(date, uptime_percent, downtime_minutes) %>"></div>
+        <%= link_to "", upright.site_root_url(subdomain: current_or_default_site.code, probe_type: probe.type, probe_name: probe.name, date: date.iso8601),
+              class: "uptime-bar uptime-bar--#{uptime_label(uptime_percent)}",
+              title: uptime_bar_tooltip(date, uptime_percent, downtime_minutes),
+              aria: { label: uptime_bar_tooltip(date, uptime_percent, downtime_minutes) } %>
       <% end %>
     <% end %>
   </div>

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.probe_types, :type, :name,
+              { 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/dashboards/uptimes/show.html.erb

@@ -4,7 +4,7 @@
 
     <div class="dashboard-filters">
       <%= form_with url: dashboards_uptime_path, method: :get, data: { controller: "form", turbo_frame: :uptime_bars } do %>
-        <%= collection_select nil, :probe_type, Upright::Probeable::TYPES, :itself, :titleize,
+        <%= collection_select nil, :probe_type, Upright.probe_types, :type, :name,
               { selected: @probe_type },
               { class: "input--select", data: { action: "change->form#submit" } } %>
       <% end %>

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

@@ -2,10 +2,9 @@
   <aside>
     <ul>
       <li><%= type_filter_link "All" %></li>
-      <li><%= type_filter_link "HTTP", "http" %></li>
-      <li><%= type_filter_link "Playwright", "playwright" %></li>
-      <li><%= type_filter_link "SMTP", "smtp" %></li>
-      <li><%= type_filter_link "Traceroute", "traceroute" %></li>
+      <% Upright.probe_types.each do |probe_type| %>
+        <li><%= type_filter_link probe_type.name, probe_type.type %></li>
+      <% end %>
     </ul>
   </aside>
 
@@ -16,6 +15,7 @@
     <div class="filters">
       <%= form_with url: site_root_path, method: :get, data: { controller: "form" } do |f| %>
         <%= hidden_field_tag :probe_type, params[:probe_type] if params[:probe_type].present? %>
+        <%= hidden_field_tag :date, params[:date] if params[:date].present? %>
         <label for="probe_name">Name</label>
         <%= select_tag :probe_name,
               options_for_select([["All", ""]] + @probe_names, params[:probe_name]),
@@ -26,6 +26,9 @@
               options_for_select([["All", ""]] + Upright::ProbeResult.statuses.keys.map { |s| [s.titleize, s] }, params[:status]),
               class: "input--select",
               data: { action: "change->form#submit" } %>
+        <% if params[:date].present? %>
+          <%= link_to "Clear date filter", site_root_path(probe_type: params[:probe_type], probe_name: params[:probe_name], status: params[:status]), class: "filter-clear" %>
+        <% end %>
       <% end %>
     </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/ci.rb

@@ -3,5 +3,7 @@
 CI.run do
   step "Style: Ruby", "bin/rubocop"
   step "Security: Brakeman code analysis", "bin/brakeman --quiet --no-pager --exit-on-warn --exit-on-error"
+  step "Lint: GitHub Actions (actionlint)", "actionlint"
+  step "Lint: GitHub Actions (zizmor)", "zizmor ."
   step "Tests: Rails", "bin/rails test"
 end

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

@@ -5,6 +5,15 @@ module Upright
 
       desc "Install Upright engine into your application"
 
+      def set_ruby_version
+        ruby_version = RUBY_VERSION
+        create_file ".ruby-version", "#{ruby_version}\n"
+        create_file "mise.toml", <<~TOML
+          [tools]
+          ruby = "#{ruby_version}"
+        TOML
+      end
+
       def copy_initializers
         template "upright.rb", "config/initializers/upright.rb"
         template "omniauth.rb", "config/initializers/omniauth.rb"
@@ -19,6 +28,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
@@ -42,23 +52,63 @@ module Upright
         template "puma.rb", "config/puma.rb"
       end
 
+      def install_solid_queue
+        rails_command "solid_queue:install"
+      end
+
+      def add_queue_database
+        gsub_file "config/database.yml",
+          "development:\n  <<: *default\n  database: storage/development.sqlite3",
+          "development:\n  primary:\n    <<: *default\n    database: storage/development.sqlite3\n  queue:\n    <<: *default\n    database: storage/development_queue.sqlite3\n    migrations_paths: db/queue_migrate"
+
+        gsub_file "config/database.yml",
+          "test:\n  <<: *default\n  database: storage/test.sqlite3",
+          "test:\n  primary:\n    <<: *default\n    database: storage/test.sqlite3\n  queue:\n    <<: *default\n    database: storage/test_queue.sqlite3\n    migrations_paths: db/queue_migrate"
+      end
+
+      def copy_recurring_config
+        template "recurring.yml", "config/recurring.yml", force: true
+      end
+
+      def add_jobs_to_procfile
+        procfile = File.join(destination_root, "Procfile.dev")
+        if File.exist?(procfile)
+          unless File.read(procfile).include?("jobs:")
+            append_to_file "Procfile.dev", "jobs: OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES bin/rails solid_queue:start\n"
+          end
+        else
+          create_file "Procfile.dev", <<~PROCFILE
+            web: bin/rails server -b '0.0.0.0' -p ${PORT:-3000}
+            jobs: OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES bin/rails solid_queue:start
+          PROCFILE
+        end
+      end
+
       def add_routes
         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
         say ""
         say "Next steps:"
-        say "  1. Run migrations: bin/rails db:migrate"
+        say "  1. Prepare the database: bin/rails db:prepare"
         say "  2. Configure your servers in config/deploy.yml"
         say "  3. Configure sites in config/sites.yml"
         say "  4. Add probes in probes/*.yml"
         say "  5. Set ADMIN_PASSWORD env var (default: upright)"
         say ""
         say "For production, review config/initializers/upright.rb and update:"
-        say "  config.hostname = \"honcho-upright.com\""
+        say "  config.hostname = \"example.com\""
         say ""
         say "Start dev services (Prometheus, Alertmanager, Playwright):"
         say "  docker compose up -d"

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

@@ -7,6 +7,7 @@
 #
 # Optional fields:
 #   - expected_status: HTTP status code to expect (default: 200-399)
+#   - alert_severity: Alert severity when probe fails: medium, high (default), critical
 #   - basic_auth_credentials: Key in Rails credentials for basic auth
 #   - proxy: Key in Rails credentials for proxy settings
 

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

@@ -0,0 +1,25 @@
+development:
+  http_probes:
+    schedule: every minute
+    command: "Upright::Probes::HTTPProbe.check_and_record_all_later"
+
+  smtp_probes:
+    schedule: every minute
+    command: "Upright::Probes::SMTPProbe.check_and_record_all_later"
+
+production:
+  http_probes:
+    schedule: "*/30 * * * * *"
+    command: "Upright::Probes::HTTPProbe.check_and_record_all_later"
+
+  smtp_probes:
+    schedule: "*/30 * * * * *"
+    command: "Upright::Probes::SMTPProbe.check_and_record_all_later"
+
+  clear_solid_queue_finished_jobs:
+    command: "SolidQueue::Job.clear_finished_in_batches(sleep_between_batches: 0.3)"
+    schedule: every hour at minute 12
+
+  cleanup_stale_probe_results:
+    command: "Upright::ProbeResult.cleanup_stale"
+    schedule: every hour at minute 30

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

@@ -4,6 +4,9 @@
 # Required fields:
 #   - name: Unique identifier for the probe
 #   - host: SMTP server hostname
+#
+# Optional fields:
+#   - alert_severity: Alert severity when probe fails: medium, high (default), critical
 
 # - name: Example Mail Server
 #   host: mail.example.com

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

@@ -0,0 +1,12 @@
+# Traceroute Probe Definitions
+# Add your traceroute probes here
+#
+# Required fields:
+#   - name: Unique identifier for the probe
+#   - host: Hostname or IP address to trace
+#
+# Optional fields:
+#   - alert_severity: Alert severity when probe fails: medium, high (default), critical
+
+# - 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"]
@@ -18,4 +18,7 @@ Upright.configure do |config|
   #   client_id: ENV["OIDC_CLIENT_ID"],
   #   client_secret: ENV["OIDC_CLIENT_SECRET"]
   # }
+
+  # Register custom probe types (built-in types: http, playwright, smtp, traceroute)
+  # config.probe_types.register :ftp_file, name: "FTP File", icon: "📂"
 end

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

@@ -8,9 +8,9 @@ groups:
       # Fraction of regions reporting DOWN (0.0 to 1.0)
       - record: upright:probe_down_fraction
         expr: |
-          count by (name, type, probe_target) (upright_probe_up == 0)
+          count by (name, type, probe_target, alert_severity) (upright_probe_up == 0)
           /
-          count by (name, type, probe_target) (upright_probe_up)
+          count by (name, type, probe_target, alert_severity) (upright_probe_up)
 
       # Daily uptime percentage (0.0 to 1.0)
       # Uptime = percentage of time in past day when majority of sites reported UP
@@ -148,7 +148,7 @@ groups:
           upright: "https://app.<%= app_domain %>/?probe_type={{ $labels.type }}&status=fail&probe_name={{ $labels.name | urlquery }}"
         expr: upright:probe_down_fraction{type="http"} > 0.5
         labels:
-          severity: page
+          severity: "{{ $labels.alert_severity }}"
           group: upright
 
       - alert: UprightHTTPProbeDegraded
@@ -187,7 +187,7 @@ groups:
           upright: "https://app.<%= app_domain %>/?probe_type={{ $labels.type }}&status=fail&probe_name={{ $labels.name | urlquery }}"
         expr: upright:probe_down_fraction{type="smtp"} > 0.5
         labels:
-          severity: page
+          severity: "{{ $labels.alert_severity }}"
           group: upright
 
       - alert: UprightSMTPProbeDegraded
@@ -226,7 +226,7 @@ groups:
           upright: "https://app.<%= app_domain %>/?probe_type={{ $labels.type }}&status=fail&probe_name={{ $labels.name | urlquery }}"
         expr: upright:probe_down_fraction{type="playwright"} > 0.5
         labels:
-          severity: page
+          severity: "{{ $labels.alert_severity }}"
           group: upright
 
       - alert: UprightPlaywrightProbeDegraded

data/lib/upright/configuration.rb

@@ -29,6 +29,14 @@ class Upright::Configuration
   attr_accessor :prometheus_url
   attr_accessor :alert_webhook_url
 
+  # Probe types
+  attr_reader :probe_types
+
+  # Probe result cleanup
+  attr_accessor :stale_success_threshold
+  attr_accessor :stale_failure_threshold
+  attr_accessor :failure_retention_limit
+
   def initialize
     @service_name = "upright"
     @user_agent = "Upright/1.0"
@@ -41,11 +49,17 @@ class Upright::Configuration
     @probes_path = nil
     @authenticators_path = nil
 
+    @probe_types = Upright::ProbeTypeRegistry.new
+
     @playwright_server_url = ENV["PLAYWRIGHT_SERVER_URL"]
     @otel_endpoint = ENV["OTEL_EXPORTER_OTLP_ENDPOINT"]
 
     @auth_provider = :static_credentials
     @auth_options = {}
+
+    @stale_success_threshold = 24.hours
+    @stale_failure_threshold = 30.days
+    @failure_retention_limit = 20_000
   end
 
   def global_subdomain

data/lib/upright/engine.rb

@@ -56,6 +56,13 @@ class Upright::Engine < ::Rails::Engine
     end
   end
 
+  initializer "upright.probe_types", before: :load_config_initializers do
+    Upright.config.probe_types.register :http, name: "HTTP", icon: "🌐"
+    Upright.config.probe_types.register :playwright, name: "Playwright", icon: "🎭"
+    Upright.config.probe_types.register :smtp, name: "SMTP", icon: "✉️"
+    Upright.config.probe_types.register :traceroute, name: "Traceroute", icon: "🛤️"
+  end
+
   initializer "upright.frozen_record" do
     FrozenRecord::Base.base_path = Upright.configuration.frozen_record_path
   end

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/metrics.rb

@@ -44,12 +44,12 @@ module Upright::Metrics
             gauge :probe_duration_seconds,
               comment: "Duration of each probe",
               aggregation: :max,
-              tags: %i[type name probe_target probe_service status]
+              tags: %i[type name probe_target probe_service alert_severity status]
 
             gauge :probe_up,
               comment: "Probe status (1 = up, 0 = down)",
               aggregation: :most_recent,
-              tags: %i[type name probe_target probe_service]
+              tags: %i[type name probe_target probe_service alert_severity]
 
             gauge :http_response_status,
               comment: "HTTP response status code",

data/lib/upright/probe_type_registry.rb

@@ -0,0 +1,33 @@
+module Upright
+  class ProbeTypeRegistry
+    ProbeType = Data.define(:type, :name, :icon)
+
+    include Enumerable
+
+    def initialize
+      @probe_types = []
+    end
+
+    def register(type, name:, icon:)
+      type = type.to_s
+      @probe_types.reject! { |pt| pt.type == type }
+      @probe_types << ProbeType.new(type:, name:, icon:)
+    end
+
+    def types
+      @probe_types.map(&:type)
+    end
+
+    def find(type)
+      @probe_types.find { |pt| pt.type == type.to_s }
+    end
+
+    def unregister(type)
+      @probe_types.reject! { |pt| pt.type == type.to_s }
+    end
+
+    def each(&block)
+      @probe_types.each(&block)
+    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.3.0"
 end

data/lib/upright.rb

@@ -14,12 +14,13 @@ 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/probe_type_registry"
+require "upright/geohash"
 require "upright/site"
 require "upright/metrics"
 require "upright/tracing"
@@ -38,6 +39,10 @@ module Upright
       yield(configuration)
     end
 
+    def probe_types
+      configuration.probe_types
+    end
+
     def sites
       @sites ||= load_sites
     end