Merge remote-tracking branch 'origin/main' into wilm
This commit is contained in:
benjamin.baker
@@ -31,10 +31,11 @@
|
||||
#
|
||||
# WHY ONE NIC ONLY:
|
||||
# Some bays carry two NICs - a private controller NIC and the routable
|
||||
# corporate NIC. Only the routable one belongs in ShopDB. A site may name its
|
||||
# corporate ranges (-AllowedRanges, or the CollectorRanges registry value); with
|
||||
# none configured the NIC carrying the DEFAULT ROUTE is used, which expresses
|
||||
# the same intent without knowing any site's addressing.
|
||||
# corporate NIC. This script reports ALL of them and lets the server decide
|
||||
# which is the PC's address, from the collector_corporate_ranges setting.
|
||||
# Choosing here was wrong: a bay cannot know a site's addressing, and a CMM
|
||||
# whose 10Gbit controller link carries a default route reported the
|
||||
# machine-side address as the PC's - with the corporate one never sent.
|
||||
|
||||
param(
|
||||
# Flask collector endpoint for the computers plugin. Empty resolves from
|
||||
@@ -90,18 +91,6 @@ if (-not $ApiUrl) {
|
||||
exit 0
|
||||
}
|
||||
|
||||
# A site may name its routable ranges rather than rely on the default route.
|
||||
if (-not $AllowedRanges) {
|
||||
foreach ($regPath in @('HKLM:\SOFTWARE\GE\ShopDB', 'HKLM:\SOFTWARE\WOW6432Node\GE\ShopDB')) {
|
||||
try {
|
||||
if (Test-Path $regPath) {
|
||||
$v = [string](Get-ItemProperty -Path $regPath -Name CollectorRanges -ErrorAction Stop).CollectorRanges
|
||||
if ($v -and $v.Trim()) { $AllowedRanges = $v.Trim(); break }
|
||||
}
|
||||
} catch {}
|
||||
}
|
||||
}
|
||||
|
||||
# collector key from the GE-Enforce secret store when not passed via Args.
|
||||
if (-not $ApiKey) {
|
||||
foreach ($regPath in @('HKLM:\SOFTWARE\GE\ShopDB', 'HKLM:\SOFTWARE\WOW6432Node\GE\ShopDB')) {
|
||||
@@ -118,38 +107,13 @@ if (-not $ApiKey) {
|
||||
exit 0
|
||||
}
|
||||
|
||||
# Routable ranges, if this site named any. NO SITE ADDRESSING IS BAKED IN: an
|
||||
# unconfigured site falls through to the default-route NIC below (ADR-015).
|
||||
#
|
||||
# NOT named $allowedRanges: PowerShell variable names are case-insensitive, so
|
||||
# that collides with the [string] parameter above and the array is silently
|
||||
# COERCED to a string. .Count on a string is 1, so the script then believes a
|
||||
# range is configured and never falls back to the default route.
|
||||
$rangeList = @()
|
||||
foreach ($cidr in ($AllowedRanges -split ',')) {
|
||||
$cidr = $cidr.Trim()
|
||||
if (-not $cidr) { continue }
|
||||
$parts = $cidr -split '/'
|
||||
if ($parts.Count -ne 2) { Log "WARN ignoring malformed range '$cidr'"; continue }
|
||||
$rangeList += @{ Network = $parts[0].Trim(); PrefixLen = [int]$parts[1] }
|
||||
}
|
||||
|
||||
function ConvertTo-Uint32([string]$ip) {
|
||||
$bytes = ([System.Net.IPAddress]::Parse($ip)).GetAddressBytes()
|
||||
[Array]::Reverse($bytes)
|
||||
return [BitConverter]::ToUInt32($bytes, 0)
|
||||
}
|
||||
|
||||
function Test-InAllowedRange([string]$ip) {
|
||||
try {
|
||||
$ipInt = ConvertTo-Uint32 $ip
|
||||
foreach ($r in $rangeList) {
|
||||
$netInt = ConvertTo-Uint32 $r.Network
|
||||
$mask = [uint32]([math]::Pow(2, 32) - [math]::Pow(2, 32 - $r.PrefixLen))
|
||||
if (($ipInt -band $mask) -eq ($netInt -band $mask)) { return $true }
|
||||
}
|
||||
} catch {}
|
||||
return $false
|
||||
# -AllowedRanges and the CollectorRanges registry value are ACCEPTED AND
|
||||
# IGNORED. Deciding which NIC is the PC's address moved to the server, where
|
||||
# the site's addressing actually lives: this script now reports every NIC and
|
||||
# takes no view. The parameter stays so a scheduled task still passing it does
|
||||
# not fail on an unknown argument.
|
||||
if ($AllowedRanges) {
|
||||
Log 'NOTE -AllowedRanges is ignored; set collector_corporate_ranges in ShopDB settings instead.'
|
||||
}
|
||||
|
||||
Log '=== Report asset to ShopDB (collector) ==='
|
||||
@@ -299,42 +263,48 @@ try {
|
||||
Log "WARN could not read make/model: $($_.Exception.Message)"
|
||||
}
|
||||
|
||||
# The routable IPv4 - a physical, connected NIC. The collector schema takes a
|
||||
# single ipaddress string, so report the corporate NIC and drop any
|
||||
# controller/machine-LAN NIC. With ranges configured the IP must be in one;
|
||||
# with none, the NIC carrying the default route is the routable one by
|
||||
# definition, which needs no knowledge of a site's addressing.
|
||||
$corpIp = ''
|
||||
# EVERY connected hardware NIC with a routable IPv4, and no opinion about
|
||||
# which one matters. Choosing used to happen here and this was the wrong place
|
||||
# for it: a bay cannot know a site's addressing. A CMM whose Marvell AQtion
|
||||
# 10Gbit link to its controller sits on 100.0.0.1 reported THAT as the PC's
|
||||
# address - the link carries a default route too - and the corporate address
|
||||
# was never sent at all, so ShopDB could not even show it as a second row.
|
||||
#
|
||||
# The server picks the primary now, from the site's configured corporate
|
||||
# ranges, and records the rest. Report what is here; let it decide.
|
||||
$interfaces = @()
|
||||
$defaultRouteIfIndexes = @()
|
||||
if ($rangeList.Count -eq 0) {
|
||||
try {
|
||||
$defaultRouteIfIndexes = @(Get-NetRoute -DestinationPrefix '0.0.0.0/0' -ErrorAction Stop |
|
||||
Sort-Object RouteMetric |
|
||||
Select-Object -ExpandProperty InterfaceIndex -Unique)
|
||||
} catch {
|
||||
Log "WARN could not read the route table: $($_.Exception.Message)"
|
||||
}
|
||||
try {
|
||||
$defaultRouteIfIndexes = @(Get-NetRoute -DestinationPrefix '0.0.0.0/0' -ErrorAction Stop |
|
||||
Select-Object -ExpandProperty InterfaceIndex -Unique)
|
||||
} catch {
|
||||
Log "WARN could not read the route table: $($_.Exception.Message)"
|
||||
}
|
||||
try {
|
||||
$ipObjs = Get-NetIPAddress -AddressFamily IPv4 -ErrorAction Stop |
|
||||
Where-Object { $_.IPAddress -notmatch '^169\.254' -and $_.IPAddress -ne '127.0.0.1' }
|
||||
foreach ($ipo in $ipObjs) {
|
||||
if ($corpIp) { break }
|
||||
$adapter = $null
|
||||
try { $adapter = Get-NetAdapter -InterfaceIndex $ipo.InterfaceIndex -ErrorAction Stop } catch {}
|
||||
if (-not $adapter) { continue }
|
||||
if (-not $adapter.HardwareInterface) { continue }
|
||||
if ($adapter.Status -ne 'Up') { continue }
|
||||
if ($rangeList.Count -gt 0) {
|
||||
if (Test-InAllowedRange $ipo.IPAddress) { $corpIp = $ipo.IPAddress }
|
||||
} elseif ($defaultRouteIfIndexes -contains $ipo.InterfaceIndex) {
|
||||
$corpIp = $ipo.IPAddress
|
||||
$interfaces += @{
|
||||
ipaddress = $ipo.IPAddress
|
||||
macaddress = $adapter.MacAddress
|
||||
adaptername = $adapter.InterfaceDescription
|
||||
isdefaultroute = [bool]($defaultRouteIfIndexes -contains $ipo.InterfaceIndex)
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
Log "WARN interface enumeration failed: $($_.Exception.Message)"
|
||||
}
|
||||
if (-not $corpIp) { Log 'WARN no routable IPv4 NIC found; posting identity without ipaddress.' }
|
||||
if ($interfaces.Count -eq 0) {
|
||||
Log 'WARN no routable IPv4 NIC found; posting identity without any interface.'
|
||||
} else {
|
||||
Log ("Reporting {0} NIC(s): {1}" -f $interfaces.Count,
|
||||
(($interfaces | ForEach-Object { $_.ipaddress }) -join ', '))
|
||||
}
|
||||
|
||||
# collector schema fields (lowercase concatenated). hostname is required; the
|
||||
# rest are sent only when present so a partial read never blanks a good value.
|
||||
@@ -348,7 +318,7 @@ if ($model) { $body['modelnumber'] = $model }
|
||||
if ($osVersion) { $body['osname'] = $osVersion }
|
||||
if ($lastBootTime) { $body['lastboottime'] = $lastBootTime }
|
||||
if ($loggedInUser) { $body['loggedinuser'] = $loggedInUser }
|
||||
if ($corpIp) { $body['ipaddress'] = $corpIp }
|
||||
if ($interfaces.Count -gt 0) { $body['interfaces'] = $interfaces }
|
||||
$body['lastcheckin'] = (Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ss')
|
||||
|
||||
$json = $body | ConvertTo-Json -Compress -Depth 4
|
||||
|
||||
@@ -196,13 +196,35 @@
|
||||
>
|
||||
<h3 class="section-title">Entra Device Info</h3>
|
||||
<div class="info-list">
|
||||
<!-- The link sits beside the id it is built from, not in a row
|
||||
of its own at the top: the pairing is counterintuitive - the
|
||||
DEVICE id opens Intune and the OBJECT id opens Entra - and a
|
||||
separate action row would have to re-label which is which. -->
|
||||
<div v-if="computer.computer?.azuredeviceid" class="info-row">
|
||||
<span class="info-label">Device ID</span>
|
||||
<span class="info-value">{{ computer.computer.azuredeviceid }}</span>
|
||||
<span class="info-value">
|
||||
{{ computer.computer.azuredeviceid }}
|
||||
<a
|
||||
v-if="intuneDeviceLink"
|
||||
:href="intuneDeviceLink"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
class="portal-link"
|
||||
>Intune</a>
|
||||
</span>
|
||||
</div>
|
||||
<div v-if="computer.computer?.azureobjectid" class="info-row">
|
||||
<span class="info-label">Object ID</span>
|
||||
<span class="info-value">{{ computer.computer.azureobjectid }}</span>
|
||||
<span class="info-value">
|
||||
{{ computer.computer.azureobjectid }}
|
||||
<a
|
||||
v-if="entraDeviceLink"
|
||||
:href="entraDeviceLink"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
class="portal-link"
|
||||
>Entra</a>
|
||||
</span>
|
||||
</div>
|
||||
<div v-if="computer.computer?.azuredevicecategory" class="info-row">
|
||||
<span class="info-label">Device Category</span>
|
||||
@@ -342,6 +364,7 @@ import PluginAssetPanels from '@/components/PluginAssetPanels.vue'
|
||||
import AssetDetailTabs from '@/components/AssetDetailTabs.vue'
|
||||
import AssetRelationships from '@/components/AssetRelationships.vue'
|
||||
import { useIdentifierFlags } from '@/composables/identifierSettings'
|
||||
import { getEntraDeviceUrls } from '@/utils/siteSettings'
|
||||
import { setRecordTitle } from '@/composables/pageTitle'
|
||||
import { useToast } from '@/composables/toast'
|
||||
import { apiError } from '@/utils/apiError'
|
||||
@@ -374,6 +397,22 @@ const assetPanels = ref(null)
|
||||
// which is the answer somebody arriving from a search or a link came for.
|
||||
const activegroup = ref('details')
|
||||
|
||||
// Azure portal deep links, built from templates a site configures. Empty
|
||||
// templates mean no link at all, which is the default: the host differs per
|
||||
// tenant (this site is on the US Government cloud) and Microsoft moves these
|
||||
// blade paths, so guessing one would send people to a dead page.
|
||||
const entraUrlTemplate = ref('')
|
||||
const intuneUrlTemplate = ref('')
|
||||
|
||||
function fillTemplate(template, token, value) {
|
||||
if (!template || !value) return null
|
||||
return template.split(token).join(encodeURIComponent(value))
|
||||
}
|
||||
const entraDeviceLink = computed(() => fillTemplate(
|
||||
entraUrlTemplate.value, '{objectid}', computer.value?.computer?.azureobjectid))
|
||||
const intuneDeviceLink = computed(() => fillTemplate(
|
||||
intuneUrlTemplate.value, '{deviceid}', computer.value?.computer?.azuredeviceid))
|
||||
|
||||
// Only offer a tab that has something in it. An empty tab is worse than an
|
||||
// absent one - it reads as broken rather than as "this site does not collect
|
||||
// that". Details always shows because core fills it regardless of plugins.
|
||||
@@ -451,6 +490,13 @@ function relativeAge(value) {
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
// Non-critical: a site that has not configured these just gets no link, so a
|
||||
// failure here must not stop the page loading.
|
||||
getEntraDeviceUrls().then(({ entraUrl, intuneUrl }) => {
|
||||
entraUrlTemplate.value = entraUrl
|
||||
intuneUrlTemplate.value = intuneUrl
|
||||
}).catch(() => {})
|
||||
|
||||
try {
|
||||
const response = await computersApi.get(route.params.id)
|
||||
computer.value = response.data.data
|
||||
@@ -606,6 +652,18 @@ async function confirmRetire() {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.portal-link {
|
||||
font-size: 0.78rem;
|
||||
margin-left: 0.5rem;
|
||||
padding: 0.05rem 0.4rem;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 3px;
|
||||
color: var(--link, var(--primary));
|
||||
text-decoration: none;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.portal-link:hover { border-color: var(--primary); }
|
||||
|
||||
|
||||
/* PC-specific styles - shared styles are in global style.css */
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
"""Computers plugin main class."""
|
||||
|
||||
import ipaddress
|
||||
import json
|
||||
import logging
|
||||
from pathlib import Path
|
||||
@@ -59,6 +60,115 @@ PARTMARKER_LINK_ORIGIN = 'collector:partmarker'
|
||||
MACHINE_CLAIM_QUIET_HOURS = 24
|
||||
|
||||
|
||||
def _corporate_ranges():
|
||||
"""CIDRs this site considers its routable network, from settings.
|
||||
|
||||
Empty means the site has not said, and the fallback below applies. Kept
|
||||
server-side rather than pushed to the bay: a bay cannot know a site's
|
||||
addressing, and baking a range into the collector script would be an
|
||||
ADR-015 violation the moment a second site ran it.
|
||||
"""
|
||||
from shopdb.api import Setting
|
||||
raw = ''
|
||||
try:
|
||||
raw = Setting.get('collector_corporate_ranges') or ''
|
||||
except Exception:
|
||||
return []
|
||||
ranges = []
|
||||
for cidr in str(raw).split(','):
|
||||
cidr = cidr.strip()
|
||||
if not cidr:
|
||||
continue
|
||||
try:
|
||||
ranges.append(ipaddress.ip_network(cidr, strict=False))
|
||||
except ValueError:
|
||||
continue
|
||||
return ranges
|
||||
|
||||
|
||||
def _pick_primary(interfaces, ranges):
|
||||
"""Which reported NIC is the PC's address.
|
||||
|
||||
In order: inside a configured corporate range; else the one the bay says
|
||||
carries the default route; else the first. The last is a guess and is the
|
||||
reason configuring the ranges is worth doing - it is what a site sets so
|
||||
the answer stops being a guess.
|
||||
"""
|
||||
def addr(entry):
|
||||
try:
|
||||
return ipaddress.ip_address((entry.get('ipaddress') or '').strip())
|
||||
except ValueError:
|
||||
return None
|
||||
|
||||
if ranges:
|
||||
for entry in interfaces:
|
||||
parsed = addr(entry)
|
||||
if parsed and any(parsed in net for net in ranges):
|
||||
return entry
|
||||
for entry in interfaces:
|
||||
if entry.get('isdefaultroute'):
|
||||
return entry
|
||||
return interfaces[0] if interfaces else None
|
||||
|
||||
|
||||
def _record_interfaces(comp, interfaces):
|
||||
"""Write one Communication row per reported NIC, flagging exactly one.
|
||||
|
||||
Keyed on the MAC where the bay sent one, because an address moves between
|
||||
adapters and a MAC does not. Falls back to the address for a bay that
|
||||
reports no MAC, which is what the single-ipaddress payload looks like.
|
||||
|
||||
Rows this PC has that the bay did NOT report are left alone: a NIC that is
|
||||
down at check-in time is not evidence the record is wrong, and hand-entered
|
||||
detail (gateway, DNS, serial settings) lives on these same rows.
|
||||
"""
|
||||
# Imported here for the same reason the caller does: these come through the
|
||||
# shopdb.api contract surface, not from core internals.
|
||||
from shopdb.api import Communication, CommunicationType, db
|
||||
|
||||
warnings = []
|
||||
ip_comtype = CommunicationType.query.filter_by(comtype='IP').first()
|
||||
if not ip_comtype:
|
||||
return ['no IP communication type seeded; network not recorded']
|
||||
|
||||
usable = [entry for entry in interfaces if (entry.get('ipaddress') or '').strip()]
|
||||
if not usable:
|
||||
return warnings
|
||||
|
||||
primary = _pick_primary(usable, _corporate_ranges())
|
||||
existing = Communication.query.filter_by(assetid=comp.assetid).all()
|
||||
bymac = {(c.macaddress or '').strip().lower(): c for c in existing if c.macaddress}
|
||||
byip = {(c.ipaddress or '').strip(): c for c in existing if c.ipaddress}
|
||||
|
||||
touched = []
|
||||
for entry in usable:
|
||||
addr = (entry.get('ipaddress') or '').strip()
|
||||
mac = (entry.get('macaddress') or '').strip()
|
||||
row = bymac.get(mac.lower()) if mac else None
|
||||
if row is None:
|
||||
row = byip.get(addr)
|
||||
if row is None:
|
||||
row = Communication(assetid=comp.assetid, comtypeid=ip_comtype.comtypeid)
|
||||
db.session.add(row)
|
||||
row.ipaddress = addr
|
||||
if mac:
|
||||
row.macaddress = mac
|
||||
touched.append((row, entry is primary))
|
||||
|
||||
# Exactly one primary, and only among rows this report touched. An untouched
|
||||
# row keeps its flag only if nothing here claimed it, which is what stops a
|
||||
# check-in from silently demoting an address somebody set by hand.
|
||||
for row, isprimary in touched:
|
||||
row.isprimary = isprimary
|
||||
if any(isprimary for _, isprimary in touched):
|
||||
claimed = {id(row) for row, _ in touched}
|
||||
for row in existing:
|
||||
if id(row) not in claimed:
|
||||
row.isprimary = False
|
||||
|
||||
return warnings
|
||||
|
||||
|
||||
class ComputersPlugin(BasePlugin):
|
||||
"""
|
||||
Computers plugin - manages PC, server, and workstation assets.
|
||||
@@ -362,7 +472,27 @@ class ComputersPlugin(BasePlugin):
|
||||
'loggedinuser': {'type': 'string'},
|
||||
'lastboottime': {'type': 'string', 'format': 'date-time'},
|
||||
'lastcheckin': {'type': 'string', 'format': 'date-time'},
|
||||
# Kept for bays on an older collector. A payload carrying
|
||||
# both wins on `interfaces`.
|
||||
'ipaddress': {'type': 'string'},
|
||||
# EVERY routable IPv4 the bay can see, and no opinion about
|
||||
# which one matters. Choosing was the bay's job and it was the
|
||||
# wrong place for it: the bay cannot know a site's addressing,
|
||||
# so a CMM with a 10Gbit link to its controller reported the
|
||||
# machine-side address as the PC's, and the corporate address
|
||||
# was never sent at all. The server picks the primary now,
|
||||
# using collector_corporate_ranges, and records the rest.
|
||||
'interfaces': {
|
||||
'type': 'array',
|
||||
'items': {
|
||||
'ipaddress': 'string',
|
||||
'macaddress': 'string',
|
||||
'adaptername': 'string',
|
||||
'isdefaultroute': 'boolean',
|
||||
},
|
||||
'description': ('All connected hardware NICs with a '
|
||||
'routable IPv4. Order carries no meaning.'),
|
||||
},
|
||||
'vendorname': {'type': 'string'},
|
||||
'modelnumber': {'type': 'string'},
|
||||
'osname': {'type': 'string'},
|
||||
@@ -446,6 +576,26 @@ class ComputersPlugin(BasePlugin):
|
||||
site that installed an earlier one.
|
||||
"""
|
||||
return [
|
||||
{
|
||||
# Which addresses are THIS site's routable network. The
|
||||
# collector reports every NIC and takes no view; this decides
|
||||
# which one is the PC's address.
|
||||
#
|
||||
# Empty falls back to the NIC the bay says carries the default
|
||||
# route, then to the first reported - both guesses. A CMM with
|
||||
# a 10Gbit link to its controller is the case that shows why:
|
||||
# that link can carry a default route too, and the machine-side
|
||||
# address then wins over the corporate one.
|
||||
#
|
||||
# Comma-separated CIDRs, e.g. '10.48.0.0/16,10.20.0.0/23'.
|
||||
'key': 'collector_corporate_ranges',
|
||||
'value': '',
|
||||
'valuetype': 'string',
|
||||
'category': 'computers',
|
||||
'description': ('Comma-separated CIDRs naming this site routable '
|
||||
'network. The collector reports every NIC; this '
|
||||
'picks which is the primary address.'),
|
||||
},
|
||||
{
|
||||
'key': 'computers_quietreporthours',
|
||||
'value': '24',
|
||||
@@ -646,16 +796,18 @@ class ComputersPlugin(BasePlugin):
|
||||
if payload.get('pcsubtype'):
|
||||
warnings.append('pcsubtype received but not stored (no model field)')
|
||||
|
||||
if payload.get('ipaddress'):
|
||||
ip_comtype = CommunicationType.query.filter_by(comtype='IP').first()
|
||||
primary = Communication.query.filter_by(
|
||||
assetid=comp.assetid, isprimary=True).first()
|
||||
if primary:
|
||||
primary.ipaddress = payload['ipaddress']
|
||||
elif ip_comtype:
|
||||
db.session.add(Communication(
|
||||
assetid=comp.assetid, comtypeid=ip_comtype.comtypeid,
|
||||
ipaddress=payload['ipaddress'], isprimary=True))
|
||||
# NETWORK. A bay reports every NIC it can see; THIS decides which one
|
||||
# is the PC's address, because only the server knows the site's
|
||||
# addressing. A CMM whose 10Gbit link to its controller sits on
|
||||
# 100.0.0.1 used to report that as the PC's address and never send the
|
||||
# corporate one at all - the bay had no way to tell them apart.
|
||||
interfaces = payload.get('interfaces') or []
|
||||
if not interfaces and payload.get('ipaddress'):
|
||||
# An older bay sends one address and no opinion beyond it.
|
||||
interfaces = [{'ipaddress': payload['ipaddress']}]
|
||||
|
||||
if interfaces:
|
||||
warnings.extend(_record_interfaces(comp, interfaces))
|
||||
|
||||
for app_data in payload.get('installedsoftware', []) or []:
|
||||
name = app_data.get('name')
|
||||
@@ -1875,6 +2027,123 @@ class ComputersPlugin(BasePlugin):
|
||||
for t in types:
|
||||
click.echo(f" [{t.computertypeid}] {t.computertype}")
|
||||
|
||||
@computerscli.command('retype-by-role')
|
||||
@click.option('--apply', 'apply_changes', is_flag=True,
|
||||
help='Actually write. Without this the command only reports.')
|
||||
@click.option('--typename', default='Metrology PC', show_default=True,
|
||||
help='ComputerType to assign to PCs that drive a measuring tool.')
|
||||
def retype_by_role(apply_changes, typename):
|
||||
"""Type PCs that drive a measuring tool as metrology machines.
|
||||
|
||||
WHY THE RELATIONSHIP AND NOT THE NAME. A PC's role is already
|
||||
recorded in what it controls: a metrology box has an active
|
||||
relationship to a measuring_tool asset. Matching on hostnames or on
|
||||
the tool's name would guess; this reads the fact.
|
||||
|
||||
The imaging scope (gea-shopfloor-keyence and friends) is the OTHER
|
||||
source, and it is the authoritative one - but only 17 of ~292 PCs
|
||||
have ever reported an enforcement scope, so it cannot answer for the
|
||||
fleet today. Relationships can.
|
||||
"""
|
||||
from shopdb.api import Asset
|
||||
|
||||
target = ComputerType.query.filter_by(computertype=typename).first()
|
||||
if not target:
|
||||
if not apply_changes:
|
||||
click.echo(click.style(
|
||||
"Type '%s' does not exist yet; it would be created."
|
||||
% typename, fg='yellow'))
|
||||
else:
|
||||
target = ComputerType(computertype=typename, isactive=True)
|
||||
db.session.add(target)
|
||||
db.session.flush()
|
||||
click.echo("Created ComputerType '%s'." % typename)
|
||||
|
||||
rows = db.session.execute(db.text("""
|
||||
SELECT DISTINCT c.computerid, a.assetnumber, c.hostname,
|
||||
ct.computertype
|
||||
FROM computers c
|
||||
JOIN assets a ON a.assetid = c.assetid
|
||||
LEFT JOIN computertypes ct ON ct.computertypeid = c.computertypeid
|
||||
JOIN assetrelationships r ON r.sourceassetid = c.assetid
|
||||
JOIN assets ta ON ta.assetid = r.targetassetid
|
||||
JOIN assettypes at ON at.assettypeid = ta.assettypeid
|
||||
WHERE at.assettype = 'measuring_tool' AND r.isactive = 1
|
||||
ORDER BY ct.computertype, a.assetnumber
|
||||
""")).fetchall()
|
||||
|
||||
moving = [r for r in rows if (r[3] or '') != typename]
|
||||
click.echo('%d PC(s) drive a measuring tool; %d would change type.'
|
||||
% (len(rows), len(moving)))
|
||||
if not moving:
|
||||
return
|
||||
for r in moving:
|
||||
click.echo(' %-14s %-14s %-16s -> %s'
|
||||
% (r[1], r[2] or '(no hostname)', r[3] or '(none)', typename))
|
||||
|
||||
if not apply_changes:
|
||||
click.echo(click.style(
|
||||
'Dry run. Nothing was written. Re-run with --apply.', fg='yellow'))
|
||||
return
|
||||
|
||||
for r in moving:
|
||||
db.session.get(Computer, r[0]).computertypeid = target.computertypeid
|
||||
db.session.commit()
|
||||
click.echo(click.style('Retyped %d PC(s).' % len(moving), fg='green'))
|
||||
|
||||
@computerscli.command('prune-types')
|
||||
@click.option('--apply', 'apply_changes', is_flag=True,
|
||||
help='Actually delete. Without this the command only reports.')
|
||||
def prune_types(apply_changes):
|
||||
"""Delete computer types nothing uses and nothing maps to.
|
||||
|
||||
Two guards, because a type is cheap to keep and expensive to delete
|
||||
by mistake. A type is KEPT when any computer is on it, or when the
|
||||
live pctype map names it - the map is what the collector assigns
|
||||
from at check-in, so deleting a mapped type would make every future
|
||||
check-in log 'mapped ComputerType not found' instead of typing the
|
||||
machine.
|
||||
"""
|
||||
from .pctypemap import pctype_mapping
|
||||
|
||||
mapped = {str(v).strip().lower() for v in pctype_mapping().values()}
|
||||
counts = dict(db.session.execute(db.text("""
|
||||
SELECT ct.computertypeid, COUNT(c.computerid)
|
||||
FROM computertypes ct
|
||||
LEFT JOIN computers c ON c.computertypeid = ct.computertypeid
|
||||
GROUP BY ct.computertypeid
|
||||
""")).fetchall())
|
||||
|
||||
removable, kept = [], []
|
||||
for ctype in ComputerType.query.order_by(ComputerType.computertype).all():
|
||||
inuse = counts.get(ctype.computertypeid, 0)
|
||||
ismapped = ctype.computertype.strip().lower() in mapped
|
||||
if inuse:
|
||||
kept.append((ctype.computertype, '%d computer(s)' % inuse))
|
||||
elif ismapped:
|
||||
kept.append((ctype.computertype, 'named in the pctype map'))
|
||||
else:
|
||||
removable.append(ctype)
|
||||
|
||||
click.echo('KEEPING %d:' % len(kept))
|
||||
for name, why in kept:
|
||||
click.echo(' %-24s %s' % (name, why))
|
||||
click.echo('')
|
||||
click.echo('DELETING %d:' % len(removable))
|
||||
for ctype in removable:
|
||||
click.echo(' %s' % ctype.computertype)
|
||||
|
||||
if not removable:
|
||||
return
|
||||
if not apply_changes:
|
||||
click.echo(click.style(
|
||||
'Dry run. Nothing was deleted. Re-run with --apply.', fg='yellow'))
|
||||
return
|
||||
for ctype in removable:
|
||||
db.session.delete(ctype)
|
||||
db.session.commit()
|
||||
click.echo(click.style('Deleted %d type(s).' % len(removable), fg='green'))
|
||||
|
||||
@computerscli.command('stats')
|
||||
def stats():
|
||||
"""Show computer statistics."""
|
||||
@@ -1888,8 +2157,10 @@ class ComputersPlugin(BasePlugin):
|
||||
|
||||
click.echo(f"Total active computers: {total}")
|
||||
|
||||
# Shopfloor count (by the Shopfloor computer type)
|
||||
sf = ComputerType.query.filter_by(computertype='Shopfloor').first()
|
||||
# 'Shopfloor PC' - NOT 'Shopfloor', which is an empty
|
||||
# duplicate this counted for as long as both existed, so the
|
||||
# number reported was always 0.
|
||||
sf = ComputerType.query.filter_by(computertype='Shopfloor PC').first()
|
||||
shopfloor = db.session.query(Computer).join(Asset).filter(
|
||||
Asset.isactive == True,
|
||||
Computer.computertypeid == (sf.computertypeid if sf else -1)
|
||||
|
||||
Reference in New Issue
Block a user