{% if d.state in ('down', 'paused', 'pending') %}{{ status_badge(d.state) }}
{% elif latest.response_ms is not none %}
+ {% if d.spark %}{{ d.spark|safe }} {% endif %}
{{ "%.0f"|format(latest.response_ms) }} ms
{% elif m.type == 'dns' and latest.resolved_ip %}{{ latest.resolved_ip }}
{% else %}{{ status_badge('up') }}{% endif %}
Built-in ways to monitor your hosts (agent metrics, SNMP, Docker). These are
- facets of a host — you'll see their data in the Hosts and
- Status sections, not as separate areas. On by default.
+ facets of a host — you'll see their data on each host in Hosts ,
+ not as separate areas. On by default.
diff --git a/steward/templates/status/index.html b/steward/templates/status/index.html
deleted file mode 100644
index 8de5b21..0000000
--- a/steward/templates/status/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Status — Steward{% endblock %}
-{% block content %}
-
-
Status
- Live — refreshes every {{ poll_interval }}s
-
-
-
-{% endblock %}
diff --git a/steward/templates/status/rows.html b/steward/templates/status/rows.html
deleted file mode 100644
index 9011149..0000000
--- a/steward/templates/status/rows.html
+++ /dev/null
@@ -1,108 +0,0 @@
-{# status/rows.html — what is wrong first (down monitors, active alerts), then
- every monitor; refreshed on poll #}
-{% from "_macros.html" import status_badge, status_dot, stat_tile, empty_state %}
-{% macro uptime_cell(pct) -%}
-{%- if pct is none -%}
—
-{%- else -%}
{{ "%.2f"|format(pct) }}% {%- endif -%}
-{%- endmacro %}
-{% macro since(e) -%}
-{%- if e.since -%}{{ "for at least " if e.since_at_least else "since " }}{{ e.since|ago }}{%- endif -%}
-{%- endmacro %}
-
-{# ── What is wrong ───────────────────────────────────────────────────────── #}
-{% if problems or alerts %}
-
- Needs attention
-
- {% for e in problems %}
-
- {{ status_badge('down') }}
- {% if e.detail_url %}{{ e.name }} {% else %}{{ e.name }} {% endif %}
- {{ e.kind|upper }} · {{ e.target }} · down {{ since(e) }}
-
- {% endfor %}
- {% for state, rule in alerts %}
-
- {{ status_badge('no_data' if state.no_data_since and state.state.value == 'inactive' else state.state) }}
- {{ rule.name }}
- {{ rule.resource_name }} {{ rule_condition(rule) }} · since {{ (state.no_data_since if state.state.value == 'inactive' else state.last_transition_at)|ago }}
-
- {% endfor %}
-
-
-{% endif %}
-
-{# ── Counts ──────────────────────────────────────────────────────────────── #}
-
- {{ stat_tile("Down", down, state="down" if down else "inactive") }}
- {{ stat_tile("Active alerts", alerts|length, state="firing" if alerts else "inactive", href="/alerts/") }}
- {{ stat_tile("Pending", pending, state="pending" if pending else "inactive") }}
- {{ stat_tile("Up", up, state="up") }}
-
-
-{% if not entries %}
-
{{ empty_state("No monitors yet. Add a host (ping or DNS) or an HTTP monitor to fill the board.", "Add a monitor", "/monitors/new") }}
-{% else %}
-
- {# header row #}
-
- Monitor
- Recent checks
- Latest
- 24h
- 7d
- 30d
- TLS
-
-
- {% for e in entries %}
-
- {# name + kind #}
-
-
- {{ status_dot(e.status) }}
- {% if e.detail_url %}
{{ e.name }}
- {% else %}
{{ e.name }} {% endif %}
-
-
- {{ e.kind }} · {{ e.target }}
-
-
-
- {# heartbeat bar #}
-
- {% set pad = 30 - e.heartbeat|length %}
- {% if pad > 0 %}{% for _ in range(pad) %}
-
- {# latest latency + sparkline #}
-
- {% if e.status == 'down' %}{{ status_badge('down') }}
- {% elif e.latency_ms is not none %}
- {% if e.spark_svg %}{{ e.spark_svg|safe }} {{ "%.0f"|format(e.latency_ms) }} ms
- {% elif e.status == 'up' %}{{ status_badge('up') }}
- {% else %}— {% endif %}
-
-
- {# uptime windows #}
-
{{ uptime_cell(e.uptime.get('24h')) }}
-
{{ uptime_cell(e.uptime.get('7d')) }}
-
{{ uptime_cell(e.uptime.get('30d')) }}
-
- {# TLS expiry countdown #}
-
- {% if e.tls_days is none %}—
- {% elif e.tls_days < 0 %}expired
- {% else %}{{ e.tls_days|round|int }}d {% endif %}
-
-
- {% endfor %}
-
-
- Heartbeat shows the last 30 checks (newest on the right). Uptime % is over the rolling window. TLS countdown applies to HTTPS monitors.
-
-{% endif %}
diff --git a/tests/core/test_monitors_page.py b/tests/core/test_monitors_page.py
index 9266e75..8ad92de 100644
--- a/tests/core/test_monitors_page.py
+++ b/tests/core/test_monitors_page.py
@@ -49,7 +49,8 @@ def test_problems_come_first_then_by_name():
def _row(m, state, latest, uptime=None, tls_days=None):
- return {"monitor": m, "state": state, "latest": latest, "uptime_pct": uptime, "tls_days": tls_days,
+ return {"monitor": m, "state": state, "latest": latest, "uptime": {"24h": uptime} if uptime is not None else {},
+ "tls_days": tls_days, "spark": "",
"heartbeat": [{"state": "up" if latest.is_up else "down", "title": "t"}] if latest else []}
@@ -62,14 +63,18 @@ async def test_the_list_counts_then_shows_problems_first(app):
counts = {"up": 1, "degraded": 0, "down": 1, "pending": 0, "paused": 1}
async with app.test_request_context("/monitors/rows"):
session["user_role"] = "operator"
- page = await render_template("monitors/rows.html", monitor_data=data, counts=counts, range_key="24h")
+ page = await render_template("monitors/rows.html", monitor_data=data, counts=counts)
assert page.index('
Down ') < page.index("ping-row")
assert page.index('href="/monitors/m2"') < page.index('href="/monitors/m1"') < page.index('href="/monitors/m3"')
assert "HTTP · https://web/" in page and "Ping · https://nas/" in page
assert '
30 ms ' in page
- assert '
90.0% ' in page and '
100.0% ' in page
- assert 'class="tone-crit" title="TLS certificate expires in 2 days">cert 2d' in page
+ assert '
90.00% ' in page and '
100.00% ' in page
+ assert 'class="tone-crit" title="TLS certificate expires in 2 days">2d' in page
+ # One header row names every column (#5270, absorbing the Status page).
+ head = page[page.index("mon-head"):page.index('href="/monitors/m2"')]
+ for label in ("Monitor", "Last 30 checks", "Latest", "24h", "7d", "30d", "TLS"):
+ assert f">{label}<" in head, label
assert '
Down ' in page and '
Paused ' in page
assert 'aria-label="Delete api"' in page and 'data-confirm="Delete monitor api?"' in page
assert "onclick" not in page and not hex_colours(page), hex_colours(page)
@@ -78,9 +83,8 @@ async def test_the_list_counts_then_shows_problems_first(app):
async def test_a_viewer_gets_no_row_actions_and_an_empty_board_says_so(app):
async with app.test_request_context("/monitors/rows"):
page = await render_template("monitors/rows.html", monitor_data=[_row(_mon("web"), "up", _check())],
- counts={"up": 1, "degraded": 0, "down": 0, "pending": 0, "paused": 0},
- range_key="24h")
- empty = await render_template("monitors/rows.html", monitor_data=[], range_key="24h",
+ counts={"up": 1, "degraded": 0, "down": 0, "pending": 0, "paused": 0})
+ empty = await render_template("monitors/rows.html", monitor_data=[],
counts=dict.fromkeys(("up", "degraded", "down", "pending", "paused"), 0))
assert "row-actions" not in page
assert "No monitors yet" in empty and "/monitors/new" not in empty
@@ -133,8 +137,7 @@ async def test_a_down_monitor_says_since_when_and_why_in_the_list(app):
down_reason="connection refused")
async with app.test_request_context("/monitors/rows"):
page = await render_template("monitors/rows.html", monitor_data=[row],
- counts={"up": 0, "degraded": 0, "down": 1, "pending": 0, "paused": 0},
- range_key="24h")
+ counts={"up": 0, "degraded": 0, "down": 1, "pending": 0, "paused": 0})
page = " ".join(page.split())
assert re.search(r'Down
]*>12m · connection refused', page), page
diff --git a/tests/core/test_status_page.py b/tests/core/test_status_page.py
index 8071dfe..0e4ea87 100644
--- a/tests/core/test_status_page.py
+++ b/tests/core/test_status_page.py
@@ -1,13 +1,11 @@
-"""The Status page says what is wrong, and since when, before anything else
-(#5120)."""
+"""How long a monitor has been in its state (#5120). The Status page that
+first showed it was folded into Monitors (#5270)."""
from datetime import datetime, timedelta, timezone
from types import SimpleNamespace
import pytest
-from quart import render_template
-from steward.core.status import StatusEntry, streak_start
-from tests.test_style_tokens import hex_colours
+from steward.core.status import streak_start
T0 = datetime(2026, 10, 6, 18, 0, tzinfo=timezone.utc)
@@ -26,45 +24,3 @@ def _checks(*ups):
def test_streak_start(ups, since, at_least):
checks = _checks(*ups)
assert streak_start(checks) == ((checks[since].checked_at if since is not None else None), at_least)
-
-
-async def _rows(app, entries, alerts):
- async with app.test_request_context("/status/rows"):
- return await render_template(
- "status/rows.html", entries=entries, alerts=alerts,
- problems=[e for e in entries if e.status == "down"],
- up=sum(e.status == "up" for e in entries), down=sum(e.status == "down" for e in entries), pending=0)
-
-
-async def test_the_problems_come_first_and_say_since_when(app):
- now = datetime.now(timezone.utc)
- entries = [
- StatusEntry(kind="http", key="1", name="shop-api", target="https://shop/x", status="down",
- since=now - timedelta(minutes=12), uptime={"24h": 93.0}, tls_days=2.0),
- StatusEntry(kind="icmp", key="2", name="nas", target="10.0.0.5", status="up",
- since=now - timedelta(days=3), since_at_least=True, uptime={"24h": 100.0}),
- ]
- state = SimpleNamespace(state=SimpleNamespace(value="firing"), no_data_since=None,
- last_transition_at=now - timedelta(minutes=4))
- rule = SimpleNamespace(id="r1", name="CPU high", resource_name="web01", metric_name="cpu_pct",
- operator=SimpleNamespace(value=">"), threshold=90)
- page = await _rows(app, entries, [(state, rule)])
-
- attention = page.index("Needs attention")
- assert attention < page.index("Recent checks") # before the full list
- problem_card = page[attention:page.index("")]
- assert "shop-api" in problem_card and "nas" not in problem_card
- assert "down since
12m ago" in problem_card
- assert "CPU high" in problem_card and "web01 CPU > 90%" in problem_card and ">4m ago" in problem_card
- assert 'Firing ' in problem_card
- # Uptime and TLS coloured by Settings → Thresholds, not by literals.
- assert '93.00% ' in page and '100.00% ' in page
- assert 'class="tone-crit" title="TLS certificate expires in 2 days">2d' in page
- assert not hex_colours(page), hex_colours(page)
-
-
-async def test_a_quiet_board_has_no_problem_card(app):
- entries = [StatusEntry(kind="icmp", key="2", name="nas", target="10.0.0.5", status="up")]
- page = await _rows(app, entries, [])
- assert "Needs attention" not in page and "nas" in page
- assert "No monitors yet" in await _rows(app, [], [])
diff --git a/tests/test_breadcrumbs.py b/tests/test_breadcrumbs.py
index b56fca5..19e1d76 100644
--- a/tests/test_breadcrumbs.py
+++ b/tests/test_breadcrumbs.py
@@ -12,7 +12,6 @@ from tests._templates import REPO, template_files
TOP_LEVEL = {
"steward/templates/dashboard/index.html",
- "steward/templates/status/index.html",
"steward/templates/hosts/list.html",
"steward/templates/monitors/index.html",
"steward/templates/alerts/list.html",