Ports 37 of Benjamin Baker's commits from the wilm branch, mirrored from the
corporate GitHub at 7905917c. wilm rides the publication lineage and shares no
ancestor with wj, so this is a filtered tree patch rather than a merge:
94 files, and every path the publication export strips (docs/, tools/, mcp/,
CLAUDE.md, start-*.sh, .gitea/, the three excluded tests) is held back, because
a raw diff would delete each of them from this tree.
What comes across:
* Endpoint telemetry, phase 2. Physical disk health from two sources, NIC link
state, boot type, Defender health, processor/memory/chassis inventory, the
listening TCP set, mapped network drives and Windows Update history. Five
additive migrations, 0012 through 0016, off the 0011 head.
* Mapped drives are collected by a probe running in the interactive user's
session, because they do not exist in the agent's session 0. Two Windows
sources can disagree about one drive and the worse status wins, so a
half-broken share is never rendered as healthy.
* Windows events are reported once each, keyed on the channel's own record id,
instead of being re-sent whenever a report overlapped the last one.
* PC Detail rework: Details cards flow, the hand-written Network card gives way
to a full address history, Storage and disk health merge into one card with
two sections, Operator Reports and Corporate Tools get their own tabs.
* An opt-in restic backup overlay with a third container, restore gated on the
dump's own data revision rather than the code head, and backup/restore history.
* The agent's version is read from the binary's PE version rather than trusted
from the csproj, and the Fleet view gains an Agent Version column.
* The enqueue route now asks caller_holds instead of the owner's permissions,
which closes the scoped-token elevation on run_script, update_app and
system_restart.
Held back deliberately:
* agent/installer/install-shopdbagent.ps1 stays deleted, as upstream deleted it.
The installer that reaches a bay is generated by _install_script() in
plugins/endpoints/api/siteagent.py; the standalone script had stopped being
shipped and was collecting fixes no endpoint ever ran.
* The .gitignore hunk adding docs/*.md. Correct on the publication lineage,
where docs/ becomes the wiki and its absence is how the gates detect a
published checkout. Here it would silently ignore every new doc.
* Their deletions of docs/DEV-BUILD-TEST.md and docs/PLUGIN-HOOKS.md. Upstream
those were stubs; here PLUGIN-HOOKS.md is the 31KB document CLAUDE.md points
readers at.
* Five zero-byte files committed by an accidental `git add -A`, a run log from
the author's own machine, and docs/notes/, which is working scratch that says
so in its own header and belongs in devnotes/ on this side.
Carried with the import so it lands green: the 17 new routes are described in
docs/api-inventory.json with the spec and project map regenerated, and two new
frontend specs read fixtures through fileURLToPath(URL) which node rejects under
jsdom's own URL global.
Suite 2591 passed / 9 skipped; frontend 391 passed; naming, style and doc gates
clean.
Scope: product
120 lines
4.7 KiB
PowerShell
120 lines
4.7 KiB
PowerShell
<#
|
|
.SYNOPSIS
|
|
ShopDB agent utility: reports pending Dell Command | Update items.
|
|
|
|
.DESCRIPTION
|
|
Discovered and executed by PowerShellUtilityRunner on the telemetry cadence.
|
|
Emits a single JSON object on stdout, which the agent attaches to the report
|
|
as `dellupdates`. Never throws and never writes anything but JSON: a failure
|
|
here must not break a telemetry run, so every error path still emits a valid
|
|
object with a `status` explaining why the list is empty.
|
|
|
|
THIS SCRIPT DOES NOT SCAN. It only reads the log a previous scan wrote. The
|
|
scan itself is fired by the \ShopDB-DellCommandScan scheduled task, which is
|
|
what pins dcu-cli.exe's -outputLog to the path below. Keeping the two apart
|
|
is deliberate: a telemetry collector that shelled out to dcu-cli would block
|
|
the cadence for minutes and hammer Dell's servers every 15 minutes.
|
|
|
|
OUTPUT CONTRACT (keep in sync with plugins/endpoints/plugin.py):
|
|
status unknown | ok | error - "unknown" means no scan has ever run,
|
|
which is NOT the same as "ok" with an empty list (known clean).
|
|
scannedat ISO-8601 UTC timestamp of the scan log's last write, or null.
|
|
count total pending updates found.
|
|
updates up to $MaxUpdates entries of { name, severity, version }.
|
|
truncated true when count exceeded $MaxUpdates.
|
|
|
|
Dell's own long description text is deliberately NOT carried: it is
|
|
sentence-length marketing prose per update, which would add roughly an order
|
|
of magnitude to every report for no operational value. Name plus severity is
|
|
what an operator decides on.
|
|
#>
|
|
|
|
$ErrorActionPreference = 'Stop'
|
|
|
|
# Cap the list rather than the payload. A machine that is years behind can have
|
|
# dozens of pending updates, and an unbounded list would bloat every report on
|
|
# the cadence. Mirrors the MaxReportedConnections precedent in CommandExecutor:
|
|
# a truncated answer is more useful than a rejected payload.
|
|
$MaxUpdates = 25
|
|
|
|
# Must match the -outputLog path set in the \ShopDB-DellCommandScan task
|
|
# definition. ShopDB-initiated scans write HERE rather than to Dell's default
|
|
# location, which is what keeps them distinguishable from the corporate-managed
|
|
# DCU tasks that also run on these machines.
|
|
$ScanLog = Join-Path $env:ProgramData 'ShopDB\EndpointAgent\dellcommand\scan.xml'
|
|
|
|
function Write-Result {
|
|
param($Status, $ScannedAt, $Count, $Updates, $Truncated)
|
|
# Compress so the payload carries no pretty-printing whitespace. Depth 3
|
|
# covers the nested updates array.
|
|
[pscustomobject]@{
|
|
status = $Status
|
|
scannedat = $ScannedAt
|
|
count = $Count
|
|
updates = @($Updates)
|
|
truncated = [bool]$Truncated
|
|
} | ConvertTo-Json -Depth 3 -Compress
|
|
}
|
|
|
|
try {
|
|
if (-not (Test-Path -LiteralPath $ScanLog)) {
|
|
# No scan has run yet. This is the normal state for a freshly adopted
|
|
# endpoint, not an error, but it must stay distinct from "scanned and
|
|
# found nothing" or the UI would claim a machine is up to date when
|
|
# nobody has ever checked.
|
|
Write-Result -Status 'unknown' -ScannedAt $null -Count 0 -Updates @() -Truncated $false
|
|
return
|
|
}
|
|
|
|
$logFile = Get-Item -LiteralPath $ScanLog
|
|
$scannedAt = $logFile.LastWriteTimeUtc.ToString('o')
|
|
|
|
[xml]$report = Get-Content -LiteralPath $ScanLog -Raw
|
|
|
|
# dcu-cli's scan report shape has varied across DCU versions, so select the
|
|
# update nodes by name anywhere in the tree rather than by a fixed path.
|
|
$nodes = @($report.SelectNodes('//update'))
|
|
if ($nodes.Count -eq 0) {
|
|
$nodes = @($report.SelectNodes('//Update'))
|
|
}
|
|
|
|
$updates = foreach ($node in $nodes) {
|
|
# Attribute casing also varies by version; take whichever is present and
|
|
# fall back rather than emitting a null-filled row.
|
|
$name = $node.name
|
|
if (-not $name) { $name = $node.Name }
|
|
if (-not $name) { $name = $node.display }
|
|
if (-not $name) { continue }
|
|
|
|
$severity = $node.urgency
|
|
if (-not $severity) { $severity = $node.Urgency }
|
|
if (-not $severity) { $severity = $node.criticality }
|
|
|
|
$version = $node.version
|
|
if (-not $version) { $version = $node.Version }
|
|
|
|
[pscustomobject]@{
|
|
name = [string]$name
|
|
severity = if ($severity) { [string]$severity } else { 'unknown' }
|
|
version = if ($version) { [string]$version } else { $null }
|
|
}
|
|
}
|
|
|
|
$updates = @($updates)
|
|
$count = $updates.Count
|
|
$truncated = $count -gt $MaxUpdates
|
|
if ($truncated) {
|
|
$updates = $updates[0..($MaxUpdates - 1)]
|
|
}
|
|
|
|
Write-Result -Status 'ok' -ScannedAt $scannedAt -Count $count `
|
|
-Updates $updates -Truncated $truncated
|
|
}
|
|
catch {
|
|
# Emit a valid object rather than failing: the runner would log a non-JSON
|
|
# utility and drop it, which looks identical to "never ran" on the server.
|
|
# An explicit error status tells an operator the scan log exists but could
|
|
# not be read, which is a different problem from no scan at all.
|
|
Write-Result -Status 'error' -ScannedAt $null -Count 0 -Updates @() -Truncated $false
|
|
}
|