diff --git a/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/Components/Pages/Overview.razor b/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/Components/Pages/Overview.razor index b7e6b6b..df7fcaa 100644 --- a/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/Components/Pages/Overview.razor +++ b/ZB.MOM.WW.Overview/src/ZB.MOM.WW.Overview/Components/Pages/Overview.razor @@ -76,7 +76,7 @@ else

@application.Name

- @RollupLabel(application) + @RollupLabel(application, now) @AppMeta(application)
@@ -216,9 +216,13 @@ else private static string GroupMeta(IGrouping group, DateTimeOffset now) { var members = group.Count(); - var missing = group.Count(i => i.Status is InstanceStatus.Unreachable || i.IsStale(now)); + var unreachable = group.Count(i => i.Status is InstanceStatus.Unreachable); + var stale = group.Count(i => i.IsStale(now)); + var pending = group.Count(i => i.Status is null); + var pendingText = pending == 0 ? string.Empty : $" · {pending} pending"; - return $"{members} member{(members == 1 ? "" : "s")} · {missing} unreachable"; + // These are explicitly named, overlapping observations, not a summed unique total. + return $"{members} member{(members == 1 ? "" : "s")} · {unreachable} unreachable · {stale} stale{pendingText}"; } private static bool IsLeader(ApplicationSnapshot application, InstanceSnapshot instance) => @@ -226,22 +230,34 @@ else application.GroupFor(group)?.LeaderInstance is { } leader && string.Equals(leader, instance.Instance, StringComparison.Ordinal); - private static StatusState RollupState(ApplicationSnapshot application) => application.Worst switch + private static StatusState RollupState(ApplicationSnapshot application, DateTimeOffset now) { - InstanceStatus.Up => StatusState.Ok, - InstanceStatus.Degraded => StatusState.Warn, - InstanceStatus.Down or InstanceStatus.Unreachable => StatusState.Bad, - _ => StatusState.Idle, - }; + if (application.Worst == InstanceStatus.Up && application.Instances.Any(i => i.IsStale(now))) + return StatusState.Warn; - private static string RollupLabel(ApplicationSnapshot application) => application.Worst switch + return application.Worst switch + { + InstanceStatus.Up => StatusState.Ok, + InstanceStatus.Degraded => StatusState.Warn, + InstanceStatus.Down or InstanceStatus.Unreachable => StatusState.Bad, + _ => StatusState.Idle, + }; + } + + private static string RollupLabel(ApplicationSnapshot application, DateTimeOffset now) { - InstanceStatus.Up => "Up", - InstanceStatus.Degraded => "Degraded", - InstanceStatus.Down => "Down", - InstanceStatus.Unreachable => "Unreachable", - _ => "Pending", - }; + var status = application.Worst switch + { + InstanceStatus.Up => "Up", + InstanceStatus.Degraded => "Degraded", + InstanceStatus.Down => "Down", + InstanceStatus.Unreachable => "Unreachable", + _ => "Pending", + }; + return application.Instances.Any(i => i.IsStale(now)) + ? $"Last known {status} · includes stale observations" + : status; + } /// public void Dispose() diff --git a/ZB.MOM.WW.Overview/tests/ZB.MOM.WW.Overview.Tests/OverviewPageTests.cs b/ZB.MOM.WW.Overview/tests/ZB.MOM.WW.Overview.Tests/OverviewPageTests.cs index 32f9e1f..5179737 100644 --- a/ZB.MOM.WW.Overview/tests/ZB.MOM.WW.Overview.Tests/OverviewPageTests.cs +++ b/ZB.MOM.WW.Overview/tests/ZB.MOM.WW.Overview.Tests/OverviewPageTests.cs @@ -58,6 +58,52 @@ public class OverviewPageTests : BunitContext private IRenderedComponent RenderPage() => Render(); + [Theory] + [InlineData(InstanceStatus.Up, false, 0, 0)] + [InlineData(InstanceStatus.Up, true, 0, 1)] + [InlineData(InstanceStatus.Unreachable, false, 1, 0)] + [InlineData(InstanceStatus.Unreachable, true, 1, 1)] + [InlineData(null, true, 0, 0)] + public void GroupSummary_SeparatesStoredReachabilityFromObservationAge( + InstanceStatus? status, bool old, int unreachable, int stale) + { + _store.Publish(Snapshot(Node("a", status, "site-a", lastPolled: old ? Now.AddMinutes(-5) : Now))); + var cut = RenderPage(); + var text = cut.Find(".group-meta").TextContent; + Assert.Contains($"{unreachable} unreachable", text, StringComparison.Ordinal); + Assert.Contains($"{stale} stale", text, StringComparison.Ordinal); + if (status is null) Assert.Contains("1 pending", text, StringComparison.Ordinal); + if (stale > 0) + { + Assert.Contains("Last known", cut.Find(".app-head .chip").TextContent, StringComparison.Ordinal); + Assert.Contains("stale", cut.Find(".app-head .chip").TextContent, StringComparison.Ordinal); + } + else Assert.DoesNotContain("Last known", cut.Find(".app-head .chip").TextContent, StringComparison.Ordinal); + } + + [Fact] + public void MixedGroup_DoesNotCountStaleHealthyAsUnreachableOrHideKnownFailure() + { + _store.Publish(Snapshot(Node("fresh", InstanceStatus.Up, "site-a"), + Node("old", InstanceStatus.Up, "site-a", lastPolled: Now.AddMinutes(-5)), + Node("down", InstanceStatus.Down, "site-a"))); + var cut = RenderPage(); + Assert.Contains("3 members", cut.Find(".group-meta").TextContent, StringComparison.Ordinal); + Assert.Contains("0 unreachable", cut.Find(".group-meta").TextContent, StringComparison.Ordinal); + Assert.Contains("1 stale", cut.Find(".group-meta").TextContent, StringComparison.Ordinal); + Assert.Contains("Last known Down", cut.Find(".app-head .chip").TextContent, StringComparison.Ordinal); + Assert.Contains("chip-bad", cut.Find(".app-head .chip").ClassList); + } + + [Fact] + public void StaleHealthyRollup_IsQualifiedAndNotPresentedAsFreshSuccess() + { + _store.Publish(Snapshot(Node("old", InstanceStatus.Up, "site-a", lastPolled: Now.AddMinutes(-5)))); + var chip = RenderPage().Find(".app-head .chip"); + Assert.Equal("Last known Up · includes stale observations", chip.TextContent); + Assert.Contains("chip-warn", chip.ClassList); + } + [Fact] public void Pause_IsAViewStateRatherThanADisconnection() {