Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/helpers/upright/public/services_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@ def feed_item_guid(issue)
[ issue[:service].code, issue[:started_at]&.to_i ].compact.join("-")
end

def average_uptime_percentage(fractions)
def uptime_percentage_label(fractions)
if fractions.present?
(fractions.sum.to_f / fractions.size) * 100
percentage = fractions.sum.fdiv(fractions.size) * 100
# Round down so a real outage never reads as 100%; strip zeros so a
# flawless window is a bare "100%", not "100.000%".
number_to_percentage(percentage, precision: 3, round_mode: :down, strip_insignificant_zeros: true)
end
end
end
5 changes: 2 additions & 3 deletions app/views/upright/public/services/_service.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<% today_status = history.last.status %>
<% avg = average_uptime_percentage(history.map(&:uptime_fraction).compact) %>

<section class="service">
<div class="service__row">
Expand All @@ -20,8 +19,8 @@

<div class="uptime__meta">
<span><%= history.size %> days ago</span>
<% if avg %>
<span class="uptime__meta-percent"><%= '%.2f' % avg %>% uptime</span>
<% if uptime = uptime_percentage_label(history.map(&:uptime_fraction).compact) %>
<span class="uptime__meta-percent"><%= uptime %> uptime</span>
<% else %>
<span class="uptime__meta-percent">No data yet</span>
<% end %>
Expand Down
25 changes: 25 additions & 0 deletions test/helpers/upright/public/services_helper_test.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
require "test_helper"

class Upright::Public::ServicesHelperTest < ActionView::TestCase
test "no data yields nil" do
assert_nil uptime_percentage_label([])
end

test "a flawless window reads as a bare 100%" do
assert_equal "100%", uptime_percentage_label([ 1.0, 1.0, 1.0 ])
end

test "a tiny outage never rounds up to 100%" do
# One 1-minute outage over 90 days ≈ 99.99923% — must not display as 100%.
fractions = [ 1.0 - 1.0 / 1440 ] + Array.new(89, 1.0)
assert_equal "99.999%", uptime_percentage_label(fractions)
end

test "trailing zeros are trimmed" do
assert_equal "99.5%", uptime_percentage_label([ 0.995 ])
end

test "floors rather than rounds to three decimals" do
assert_equal "99.999%", uptime_percentage_label([ 0.9999995 ])
end
end