dohertj2/lmxopcua
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Promote service version into the dashboard title and surface the active alarm filter patterns in the Alarms panel so operators can verify scope at a glance without reading logs or the footer block

Browse Source 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Joseph Doherty
2026-04-13 10:05:47 -04:00
parent 517d92c76f
commit 4fe37fd1b7
5 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ZB.MOM.WW.LmxOpcUa.Host/Domain/AlarmObjectFilter.cs
View File

@@ -93,6 +93,12 @@ namespace ZB.MOM.WW.LmxOpcUa.Host.Domain
public IReadOnlyList<string> UnmatchedPatterns =>
_rawPatterns.Where(p => !_matchedRawPatterns.Contains(p)).ToList();
/// <summary>
/// Gets the raw pattern strings exactly as supplied by the operator after comma-splitting
/// and trimming. Surfaced on the status dashboard so operators can confirm the active filter.
/// </summary>
public IReadOnlyList<string> RawPatterns => _rawPatterns;
/// <summary>
/// Returns <see langword="true"/> when any template name in <paramref name="chain"/> matches any
/// compiled pattern. An empty chain never matches unless the operator explicitly supplied a pattern

7
src/ZB.MOM.WW.LmxOpcUa.Host/OpcUa/LmxNodeManager.cs
View File

@@ -183,6 +183,13 @@ namespace ZB.MOM.WW.LmxOpcUa.Host.OpcUa
/// </summary>
public int AlarmFilterIncludedObjectCount => _alarmFilterIncludedObjectCount;
/// <summary>
/// Gets the raw alarm filter patterns exactly as configured, for display on the status dashboard.
/// Returns an empty list when no filter is active.
/// </summary>
public IReadOnlyList<string> AlarmFilterPatterns =>
_alarmObjectFilter?.RawPatterns ?? Array.Empty<string>();
/// <summary>
/// Gets the number of distinct alarm conditions currently tracked (one per alarm attribute).
/// </summary>

5
src/ZB.MOM.WW.LmxOpcUa.Host/Status/StatusData.cs
View File

@@ -308,6 +308,11 @@ namespace ZB.MOM.WW.LmxOpcUa.Host.Status
/// Gets or sets the number of Galaxy objects included by the alarm filter during the most recent build.
/// </summary>
public int FilterIncludedObjectCount { get; set; }
/// <summary>
/// Gets or sets the raw alarm filter patterns exactly as configured, for dashboard display.
/// </summary>
public List<string> FilterPatterns { get; set; } = new();
}
/// <summary>

25
src/ZB.MOM.WW.LmxOpcUa.Host/Status/StatusReportService.cs
View File

@@ -148,7 +148,8 @@ namespace ZB.MOM.WW.LmxOpcUa.Host.Status
AckWriteFailures = _nodeManager?.AlarmAckWriteFailures ?? 0,
FilterEnabled = _nodeManager?.AlarmFilterEnabled ?? false,
FilterPatternCount = _nodeManager?.AlarmFilterPatternCount ?? 0,
FilterIncludedObjectCount = _nodeManager?.AlarmFilterIncludedObjectCount ?? 0
FilterIncludedObjectCount = _nodeManager?.AlarmFilterIncludedObjectCount ?? 0,
FilterPatterns = _nodeManager?.AlarmFilterPatterns?.ToList() ?? new List<string>()
};
}
@@ -221,8 +222,10 @@ namespace ZB.MOM.WW.LmxOpcUa.Host.Status
sb.AppendLine(
"table { width: 100%; border-collapse: collapse; } th, td { text-align: left; padding: 4px 8px; border-bottom: 1px solid #333; }");
sb.AppendLine("h2 { margin: 0 0 10px 0; } h1 { color: #66ccff; }");
sb.AppendLine("h1 .version { color: #888; font-size: 0.5em; font-weight: normal; margin-left: 12px; }");
sb.AppendLine("</style></head><body>");
sb.AppendLine("<h1>LmxOpcUa Status Dashboard</h1>");
sb.AppendLine(
$"<h1>LmxOpcUa Status Dashboard<span class='version'>v{WebUtility.HtmlEncode(data.Footer.Version)}</span></h1>");
// Connection panel
var connColor = data.Connection.State == "Connected" ? "green" :
@@ -319,8 +322,21 @@ namespace ZB.MOM.WW.LmxOpcUa.Host.Status
sb.AppendLine(
$"<p>Transitions: {data.Alarms.TransitionCount:N0} | Ack Events: {data.Alarms.AckEventCount:N0} | Ack Write Failures: {data.Alarms.AckWriteFailures}</p>");
if (data.Alarms.FilterEnabled)
{
sb.AppendLine(
$"<p>Filter: <b>{data.Alarms.FilterPatternCount}</b> pattern(s), <b>{data.Alarms.FilterIncludedObjectCount}</b> object(s) included</p>");
if (data.Alarms.FilterPatterns.Count > 0)
{
sb.AppendLine("<ul>");
foreach (var pattern in data.Alarms.FilterPatterns)
sb.AppendLine($"<li><code>{WebUtility.HtmlEncode(pattern)}</code></li>");
sb.AppendLine("</ul>");
}
}
else
{
sb.AppendLine("<p>Filter: <b>disabled</b> (all alarm-bearing objects tracked)</p>");
}
sb.AppendLine("</div>");
// Operations table
@@ -336,11 +352,6 @@ namespace ZB.MOM.WW.LmxOpcUa.Host.Status
sb.AppendLine("</table></div>");
// Footer
sb.AppendLine("<div class='panel gray'><h2>Footer</h2>");
sb.AppendLine($"<p>Generated: {data.Footer.Timestamp:O} | Version: {data.Footer.Version}</p>");
sb.AppendLine("</div>");
sb.AppendLine("</body></html>");
return sb.ToString();
}