diff --git a/steward/templates/alerts/widget.html b/steward/templates/alerts/widget.html index debafb6..8f3fd01 100644 --- a/steward/templates/alerts/widget.html +++ b/steward/templates/alerts/widget.html @@ -38,7 +38,7 @@ {{ rule.resource_name }} · fires on {{ r.condition }} {%- endif %} - + {%- if r.label == "no_data" %}—{% else %}{{ metric_value(rule.metric_name, r.value) }}{% endif -%} {% if r.since %}{{ r.since|ago }}{% else %}—{% endif %} diff --git a/tests/core/test_alerts_widget.py b/tests/core/test_alerts_widget.py index dff416d..bc02074 100644 --- a/tests/core/test_alerts_widget.py +++ b/tests/core/test_alerts_widget.py @@ -65,9 +65,9 @@ async def test_firing_and_silent_come_first_then_who_acknowledged(app): assert re.search(r'w-verdict tone-crit">\s*1 firing, 1 silent, 1 acknowledged\.', page) assert page.index("web-1 CPU high") < page.index("nas agent") < page.index("db disk") assert 'href="/alerts/history?rule=r1"' in page - assert "web-1 · fires on CPU > 90%" in page and "94%" in page and "12m ago" in page + assert "web-1 · fires on CPU > 90%" in page and ">94%<" in page and ">12m " in page assert "nas · no reading" in page - assert "db-1:/var · acknowledged by bryan" in page and "40m ago" in page + assert "db-1:/var · acknowledged by bryan 40m " in page assert "+1 rule quiet" in page and 'href="/alerts/"' in page assert len(re.findall(r"]", page)) == 3 assert not hex_colours(page), hex_colours(page)