Compare commits
15
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6b03fe7b44 | ||
|
|
3834546f38 | ||
|
|
aeb7a89e81 | ||
|
|
9bdf5d9eed | ||
|
|
cbdae54d70 | ||
|
|
36cbdd061d | ||
|
|
6e6150f9b9 | ||
|
|
d234e36e3f | ||
|
|
7408b1feca | ||
|
|
64ef4222d0 | ||
|
|
fde1d01f27 | ||
|
|
8edaa78ad7 | ||
|
|
3bc8df6dc7 | ||
|
|
d8e827c88b | ||
|
|
a0e062493d |
No files matched your search
@@ -154,7 +154,14 @@ The rack front, drawn from the rack units set on cutsheet items, top first.
|
||||
enp2s0 (left) and enp3s0 (right), and the status glow follows the host. The "ZimaBoard 832 +
|
||||
ConnectX-3" drawing adds the single-port SFP+ card lying flat in the side PCIe slot, as in the rack,
|
||||
with a DAC attached; its round dot is Gandalf's link mark for enp1s0 (the slot is PCI bus 1), not an
|
||||
LED on the card. Anything else is a labelled box.
|
||||
LED on the card. UniFi desk switches (Flex Mini, Flex) on a shelf are drawn with their live faceplate
|
||||
at their real width. Anything else is a labelled box.
|
||||
- **More drawn fronts**: the Sliger CX4712 with its red, white or blue perforated front fitted (as in
|
||||
the rack photo, drive cages faint behind the mesh), and the UniFi brush panel
|
||||
(UACC-Rack-Panel-Brush-1U, from Ubiquiti's product images).
|
||||
- **Gear resting on other gear**: a shelf item with Front drawing "No shelf: gear resting on what is
|
||||
below" draws no tray, so a switch lying on top of the NVR is a "shelf" in the unit above the NVR whose
|
||||
contents sit directly on it.
|
||||
- **Racks**: admins name a rack and set its height with **Rack settings** on the page, and add more with
|
||||
**+ Rack** (a tab per rack). Renaming a rack moves its items; an empty rack can be deleted. Each item
|
||||
has a rack (empty means the first). Until a rack is saved, racks come from config:
|
||||
@@ -345,6 +352,18 @@ whatever Gandalf knows around the problem:
|
||||
|
||||
Titles keep the `[target][auto][production]...` tag format, which Tinker uses to spot duplicates.
|
||||
|
||||
### Unused interfaces
|
||||
|
||||
An admin can mark a host interface as unused on its device page (**Mark unused** on a down interface,
|
||||
with an optional reason; **In use again** to undo). An unused interface:
|
||||
|
||||
- never raises a link-down alert, and can't count toward the cluster-wide alert;
|
||||
- doesn't count toward the host's status, so a host whose only down ports are unused shows as up;
|
||||
- shows as "unused" (greyed, dashed dot) on the dashboard, the device page and the rack drawings;
|
||||
- has any open link-down alert closed quietly when it is marked (no recovery note: nothing recovered).
|
||||
|
||||
Marks are stored in `unused_interfaces` (host, interface, reason, who, when).
|
||||
|
||||
### Recovery notes
|
||||
|
||||
When an alert that opened a ticket clears, the monitor adds a comment to that ticket: when it cleared, how
|
||||
@@ -746,6 +765,7 @@ Take LED colors from the model's quick start guide. See the comment at the top o
|
||||
|
||||
- `cutsheet_items` gained `rack`, `shelf`, `device`, `mount`, `chassis`, `facing` and `slot` columns; they are added automatically on first use
|
||||
- `cutsheet_racks`: racks saved on the rack page (name, height, notes)
|
||||
- `unused_interfaces`: host interfaces marked unused (no alerts, not counted in host status)
|
||||
- `device_links`: each device's inventory URL, by device name; created with the cutsheet tables
|
||||
- `network_events`: one row per active event; `resolved_at` is set when recovered, and
|
||||
`recovery_notified` once the recovery note is on its ticket (column added automatically at monitor startup)
|
||||
|
||||
@@ -528,6 +528,12 @@ def api_device(name: str):
|
||||
logger.error(f'Cutsheet unavailable for {name}: {e}')
|
||||
detail['cutsheet'] = []
|
||||
detail['inventory'] = _inventory_for(name, detail.get('model') or '')
|
||||
try:
|
||||
_ensure_cutsheet_schema()
|
||||
detail['unused_interfaces'] = db.get_unused_interfaces().get(name, {})
|
||||
except Exception as e:
|
||||
logger.error(f'Unused interfaces unavailable for {name}: {e}')
|
||||
detail['unused_interfaces'] = {}
|
||||
return jsonify(detail)
|
||||
|
||||
|
||||
@@ -1114,8 +1120,8 @@ def _physical_interfaces(name: str, snapshot: dict) -> list:
|
||||
Drawn fronts light one RJ45 per NIC in this order (first NIC on the leftmost jack).
|
||||
"""
|
||||
ifaces = ((snapshot.get('hosts') or {}).get(name) or {}).get('interfaces') or {}
|
||||
return [{'name': n, 'up': str(state).lower() == 'up'} for n, state in sorted(ifaces.items())
|
||||
if not n.startswith(_VIRTUAL_IFACE)]
|
||||
return [{'name': n, 'up': str(state).lower() == 'up', 'unused': str(state).lower() == 'unused'}
|
||||
for n, state in sorted(ifaces.items()) if not n.startswith(_VIRTUAL_IFACE)]
|
||||
|
||||
|
||||
def _device_status(name: str, snapshot: dict) -> str:
|
||||
@@ -1210,7 +1216,8 @@ def api_rack():
|
||||
'status': _device_status(dev(c), snapshot) if dev(c) in known else '',
|
||||
'model': next((u.get('model') for u in snapshot.get('unifi') or [] if u.get('name') == dev(c)), '')
|
||||
or '', 'notes': c.get('notes') or '', 'chassis': c.get('chassis') or '',
|
||||
'slot': c.get('slot'), 'interfaces': _physical_interfaces(dev(c), snapshot)}
|
||||
'slot': c.get('slot'), 'interfaces': _physical_interfaces(dev(c), snapshot),
|
||||
'device': dev(c), 'ports': (switches.get(dev(c)) or {}).get('ports') or {}}
|
||||
for c in sorted(on_shelf.get(name, []), key=lambda c: (c.get('slot') or 999, c['name'].lower()))
|
||||
]
|
||||
out.append(entry)
|
||||
@@ -1256,6 +1263,36 @@ def api_cutsheet_delete_rack(rack_id: int):
|
||||
return jsonify({'success': True})
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Unused interfaces
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
_IFACE_RE = re.compile(r'^[A-Za-z0-9_.:@-]{1,64}$')
|
||||
|
||||
|
||||
@app.route('/api/device/<path:name>/interfaces/<iface>/unused', methods=['PUT', 'DELETE'])
|
||||
@require_auth
|
||||
@require_admin
|
||||
@_cutsheet_write
|
||||
def api_interface_unused(name: str, iface: str):
|
||||
"""Mark a host interface unused (PUT {reason}) or in use again (DELETE).
|
||||
|
||||
Unused interfaces raise no link-down alerts and don't count toward the host's status;
|
||||
marking one quietly closes any link-down alert it has open.
|
||||
"""
|
||||
if len(name) > 255 or not _IFACE_RE.match(iface):
|
||||
raise cutsheet.ValidationError('Not a valid host or interface name')
|
||||
user = _get_user()['username']
|
||||
if request.method == 'DELETE':
|
||||
found = db.clear_unused_interface(name, iface)
|
||||
logger.info(f'{user} marked {name} {iface} in use again')
|
||||
return jsonify({'success': True, 'changed': found})
|
||||
reason = str(_json_body().get('reason') or '').strip()[:255]
|
||||
db.set_unused_interface(name, iface, reason, user)
|
||||
logger.info(f'{user} marked {name} {iface} unused: {reason or "(no reason)"}')
|
||||
return jsonify({'success': True})
|
||||
|
||||
|
||||
@app.route('/api/cutsheet/cables', methods=['POST'])
|
||||
@require_auth
|
||||
@require_admin
|
||||
|
||||
+6
-1
@@ -37,10 +37,15 @@ CHASSIS = {
|
||||
'uacc-patch-24': 'UniFi Patch Panel Blank 24 (UACC-Rack-Panel-Patch-Blank-24)',
|
||||
'usw-pro-max-24-poe': 'UniFi Switch Pro Max 24 PoE (until UniFi reports it)',
|
||||
'usw-pro-max-48-poe': 'UniFi Switch Pro Max 48 PoE (until UniFi reports it)',
|
||||
'sliger-cx4712': 'Sliger CX4712 4U (10-bay)',
|
||||
'sliger-cx4712': 'Sliger CX4712 4U (10-bay, faceplate off)',
|
||||
'sliger-cx4712-red': 'Sliger CX4712 4U, red front',
|
||||
'sliger-cx4712-white': 'Sliger CX4712 4U, white front',
|
||||
'sliger-cx4712-blue': 'Sliger CX4712 4U, blue front',
|
||||
'uacc-brush-1u': 'UniFi Rack Panel Brush 1U (UACC-Rack-Panel-Brush-1U)',
|
||||
'rosewill-rsv-l4500u': 'Rosewill RSV-L4500U 4U (15-bay)',
|
||||
'zimaboard-832': 'IceWhale ZimaBoard 832 (shelf gear)',
|
||||
'zimaboard-832-cx3': 'IceWhale ZimaBoard 832 + ConnectX-3 SFP+ in PCIe (shelf gear)',
|
||||
'resting': 'No shelf: gear resting on what is below (for a shelf item)',
|
||||
'server-1u': 'Generic 1U server',
|
||||
'server-2u': 'Generic 2U server',
|
||||
'server-4u': 'Generic 4U server',
|
||||
|
||||
@@ -738,6 +738,15 @@ _CUTSHEET_SCHEMA = (
|
||||
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
UNIQUE KEY uq_rack_name (name)
|
||||
) ENGINE=InnoDB""",
|
||||
# Host interfaces an admin has marked as not in use: no alerts, not counted in host status
|
||||
"""CREATE TABLE IF NOT EXISTS unused_interfaces (
|
||||
host VARCHAR(255) NOT NULL,
|
||||
iface VARCHAR(64) NOT NULL,
|
||||
reason VARCHAR(255) NOT NULL DEFAULT '',
|
||||
set_by VARCHAR(255) NOT NULL,
|
||||
set_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
PRIMARY KEY (host, iface)
|
||||
) ENGINE=InnoDB""",
|
||||
# Where a device lives in the asset inventory (HomeBox), set by hand on its Gandalf page
|
||||
"""CREATE TABLE IF NOT EXISTS device_links (
|
||||
name VARCHAR(255) NOT NULL PRIMARY KEY,
|
||||
@@ -1107,3 +1116,47 @@ def cutsheet_delete_rack(rack_id: int, user: str) -> bool:
|
||||
cur.execute('DELETE FROM cutsheet_racks WHERE id=%s', (rack_id,))
|
||||
_cs_log(cur, user, 'rack', rack_id, 'delete', f'Removed rack {before["name"]}', _cs_jsonable(before), None)
|
||||
return True
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Unused interfaces: ports an admin says aren't meant to be up
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def get_unused_interfaces() -> dict:
|
||||
"""{host: {iface: {'reason', 'set_by', 'set_at'}}}"""
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute('SELECT host, iface, reason, set_by, set_at FROM unused_interfaces')
|
||||
out: dict = {}
|
||||
for r in cur.fetchall():
|
||||
at = r['set_at'].isoformat() + 'Z' if hasattr(r['set_at'], 'isoformat') else r['set_at']
|
||||
out.setdefault(r['host'], {})[r['iface']] = {'reason': r['reason'], 'set_by': r['set_by'],
|
||||
'set_at': at}
|
||||
return out
|
||||
|
||||
|
||||
def set_unused_interface(host: str, iface: str, reason: str, user: str) -> None:
|
||||
"""Mark an interface unused and quietly close any link-down alert it has open.
|
||||
|
||||
The alert is resolved without a recovery note: nothing recovered, the port just isn't used.
|
||||
"""
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""INSERT INTO unused_interfaces (host, iface, reason, set_by) VALUES (%s, %s, %s, %s)
|
||||
ON DUPLICATE KEY UPDATE reason=VALUES(reason), set_by=VALUES(set_by)""",
|
||||
(host, iface, reason, user),
|
||||
)
|
||||
cur.execute(
|
||||
"""UPDATE network_events SET resolved_at=NOW(), recovery_notified=1, last_seen=last_seen
|
||||
WHERE event_type='interface_down' AND target_name=%s AND target_detail=%s
|
||||
AND resolved_at IS NULL""",
|
||||
(host, iface),
|
||||
)
|
||||
|
||||
|
||||
def clear_unused_interface(host: str, iface: str) -> bool:
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute('DELETE FROM unused_interfaces WHERE host=%s AND iface=%s', (host, iface))
|
||||
return cur.rowcount > 0
|
||||
+45
-10
@@ -393,6 +393,8 @@ class TicketClient:
|
||||
self.comment_url = cfg.get('comment_url') or (
|
||||
urljoin(self.url, 'api/ticket_comment_api.php') if self.url else '')
|
||||
self.comments_denied = False
|
||||
# Titles whose create matched a Closed ticket Tinker couldn't reopen: {title: (ticket_id, when)}
|
||||
self._closed_matches: Dict[str, tuple] = {}
|
||||
|
||||
def comment(self, ticket_id: str, text: str) -> bool:
|
||||
"""Add a Markdown comment to a ticket. Never raises; False means try again later."""
|
||||
@@ -425,10 +427,23 @@ class TicketClient:
|
||||
logger.error(f'Ticket comment failed for #{ticket_id}: {e}')
|
||||
return False
|
||||
|
||||
# How long to wait before asking again after a create matched an unreopenable Closed ticket.
|
||||
# Each ask adds a "recurred" comment to that ticket, so once a poll would pile them up.
|
||||
CLOSED_MATCH_RETRY_S = 24 * 3600
|
||||
|
||||
def create(self, title: str, description: str, priority: str = '2') -> Optional[str]:
|
||||
"""Open a ticket. Returns its ID, or None if there is no ticket to track.
|
||||
|
||||
Tinker deduplicates: the response's `action` says what happened (new, deduplicated,
|
||||
updated, reopened, recurrence_noted). recurrence_noted means it matched a Closed ticket
|
||||
it could not reopen unattended; that ticket isn't tracking this alert, so it isn't used.
|
||||
"""
|
||||
if not self.api_key or not self.url:
|
||||
logger.warning('Ticket API not configured: skipping ticket creation')
|
||||
return None
|
||||
seen = self._closed_matches.get(title)
|
||||
if seen and time.time() - seen[1] < self.CLOSED_MATCH_RETRY_S:
|
||||
return None
|
||||
try:
|
||||
resp = requests.post(
|
||||
self.url,
|
||||
@@ -450,7 +465,16 @@ class TicketClient:
|
||||
if not tid:
|
||||
logger.warning(f'Ticket API success but no ticket_id in response: {data}')
|
||||
return None
|
||||
logger.info(f'Created ticket #{tid}: {title}')
|
||||
action = data.get('action') or 'created'
|
||||
if action == 'recurrence_noted':
|
||||
self._closed_matches[title] = (tid, time.time())
|
||||
logger.warning(
|
||||
f'Ticket API matched Closed ticket #{tid}, which it could not reopen; not using it '
|
||||
f'for this alert. Reopen #{tid} in Tinker to track it there. Retrying in 24 h: {title}'
|
||||
)
|
||||
return None
|
||||
self._closed_matches.pop(title, None)
|
||||
logger.info(f'Ticket #{tid} ({action}): {title}')
|
||||
return tid
|
||||
if data.get('existing_ticket_id'):
|
||||
logger.info(f'Duplicate suppressed by API: existing #{data["existing_ticket_id"]}')
|
||||
@@ -1021,6 +1045,16 @@ class NetworkMonitor:
|
||||
def _hostname(self, instance: str) -> str:
|
||||
return self._instance_map.get(instance, instance.split(':')[0])
|
||||
|
||||
def _unused_for(self, host: str) -> dict:
|
||||
return (getattr(self, '_unused', None) or {}).get(host) or {}
|
||||
|
||||
def _load_unused(self) -> None:
|
||||
"""Reload the interfaces marked unused (once a cycle; keeps the last list on error)."""
|
||||
try:
|
||||
self._unused = db.get_unused_interfaces()
|
||||
except Exception as e:
|
||||
logger.error(f'Could not load unused interfaces: {e}')
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Tickets: context, and notes when an alert clears
|
||||
# ------------------------------------------------------------------
|
||||
@@ -1195,10 +1229,6 @@ class NetworkMonitor:
|
||||
def _process_interfaces(self, states: Dict[str, Dict[str, bool]], suppressions: list) -> None:
|
||||
baseline = db.get_baseline()
|
||||
new_baseline = {k: dict(v) for k, v in baseline.items()}
|
||||
# An interface with an open link-down alert was up before it went down, whatever the
|
||||
# baseline says now: after a baseline reset it reads as "first seen down", which would
|
||||
# leave the alert open forever without updating, ticketing or resolving it.
|
||||
open_down = set(db.get_open_event_targets('interface_down'))
|
||||
# Only count hosts with genuine regressions (UP→DOWN) toward cluster threshold
|
||||
hosts_with_regression: List[str] = []
|
||||
|
||||
@@ -1209,10 +1239,11 @@ class NetworkMonitor:
|
||||
new_baseline.setdefault(host, {})
|
||||
host_has_regression = False
|
||||
|
||||
unused = self._unused_for(host)
|
||||
for iface, is_up in ifaces.items():
|
||||
if iface in unused:
|
||||
continue # marked unused: no alerts, and it can't count as a regression
|
||||
prev = baseline.get(host, {}).get(iface) # 'up', 'initial_down', or None
|
||||
if (host, iface) in open_down:
|
||||
prev = 'up'
|
||||
|
||||
if is_up:
|
||||
new_baseline[host][iface] = 'up'
|
||||
@@ -1781,8 +1812,11 @@ class NetworkMonitor:
|
||||
continue # skip Prometheus instances not in config (e.g. LXC app servers)
|
||||
host = self._hostname(instance)
|
||||
phys = {k: v for k, v in ifaces.items()}
|
||||
up_count = sum(1 for v in phys.values() if v)
|
||||
total = len(phys)
|
||||
# Interfaces marked unused don't count toward the host's status
|
||||
unused = self._unused_for(host)
|
||||
counted = {k: v for k, v in phys.items() if k not in unused}
|
||||
up_count = sum(1 for v in counted.values() if v)
|
||||
total = len(counted)
|
||||
if not prom_ok:
|
||||
status = 'unknown'
|
||||
elif total == 0 or up_count == total:
|
||||
@@ -1794,7 +1828,7 @@ class NetworkMonitor:
|
||||
|
||||
hosts[host] = {
|
||||
'ip': instance.split(':')[0],
|
||||
'interfaces': {k: ('up' if v else 'down') for k, v in phys.items()},
|
||||
'interfaces': {k: ('unused' if k in unused else ('up' if v else 'down')) for k, v in phys.items()},
|
||||
'status': status,
|
||||
'source': 'prometheus',
|
||||
}
|
||||
@@ -1837,6 +1871,7 @@ class NetworkMonitor:
|
||||
while True:
|
||||
try:
|
||||
logger.info('Starting network check cycle')
|
||||
self._load_unused()
|
||||
|
||||
# 1. Fetch interface states once: shared by snapshot and alert processing
|
||||
iface_states = self.prom.get_interface_states()
|
||||
|
||||
+45
-7
@@ -122,9 +122,11 @@ function hostRows(interfaces) {
|
||||
return Object.entries(interfaces)
|
||||
.sort(([a], [b]) => a.localeCompare(b, undefined, { numeric: true }))
|
||||
.map(([name, d]) => {
|
||||
const up = d.state ? d.state === 'up' : d.link_detected !== false;
|
||||
const mark = (_device.unused_interfaces || {})[name];
|
||||
const unused = !!mark || d.state === 'unused';
|
||||
const up = !unused && (d.state ? d.state === 'up' : d.link_detected !== false);
|
||||
return {
|
||||
id: name, label: name, up, data: d, sub: d.port_type || '',
|
||||
id: name, label: name, up, unused, unusedReason: mark ? mark.reason : '', data: d, sub: d.port_type || '',
|
||||
detail: `
|
||||
<div class="link-stats-grid">
|
||||
${stat('Duplex', esc(d.duplex || '-'), 'Full = both directions at once. Half can cause collisions.')}
|
||||
@@ -154,7 +156,21 @@ function portRows(ports) {
|
||||
}
|
||||
|
||||
function rowHasProblem(r) {
|
||||
return !!badges(r.data);
|
||||
return !r.unused && !!badges(r.data);
|
||||
}
|
||||
|
||||
// The Health cell: an unused interface says so (with an admin toggle) instead of reporting down
|
||||
function healthCell(r) {
|
||||
if (r.unused) {
|
||||
const tip = r.unusedReason ? ` title="${esc(r.unusedReason)}"` : '';
|
||||
const btn = CAN_EDIT ? ` <button type="button" class="lt-btn lt-btn-ghost lt-btn-xs" data-unused="0" data-iface="${esc(r.id)}">In use again</button>` : '';
|
||||
return `<span class="lt-badge badge-neutral"${tip}>unused</span>${btn}`;
|
||||
}
|
||||
const state = badges(r.data) || (r.up ? '<span class="val-good">OK</span>' : '<span class="device-row-sub">down</span>');
|
||||
const btn = CAN_EDIT && !r.up && r.num === undefined
|
||||
? ` <button type="button" class="lt-btn lt-btn-ghost lt-btn-xs" data-unused="1" data-iface="${esc(r.id)}"
|
||||
title="Not meant to be up: stop alerting and stop counting it against the host">Mark unused</button>` : '';
|
||||
return state + btn;
|
||||
}
|
||||
|
||||
function renderTable(rows) {
|
||||
@@ -173,15 +189,15 @@ function renderTable(rows) {
|
||||
? (r.neighbor.name ? `<a class="device-link" href="${esc(deviceUrl(r.neighbor.name))}">${esc(r.neighbor.name)}</a>` : esc(r.neighbor.chassis || r.neighbor.port || ''))
|
||||
: '-';
|
||||
return `
|
||||
<tr class="device-row${r.up ? '' : ' device-row--down'}"${isPorts ? ` data-port-idx="${esc(r.num)}"` : ''}>
|
||||
<tr class="device-row${r.unused ? ' device-row--unused' : (r.up ? '' : ' device-row--down')}"${isPorts ? ` data-port-idx="${esc(r.num)}"` : ''}>
|
||||
<td><button type="button" class="device-row-toggle" data-row="${esc(r.id)}"${isPorts ? '' : ` aria-expanded="${open}"`} aria-label="Details for ${esc(r.label)}">${open ? '▾' : '▸'}</button></td>
|
||||
<td><span class="dot-${r.up ? 'up' : 'down'}"></span></td>
|
||||
<td><span class="dot-${r.unused ? 'unused' : (r.up ? 'up' : 'down')}"></span></td>
|
||||
<td class="device-row-name">${r.num !== undefined ? `<span class="port-badge port-badge-num">#${esc(r.num)}</span> ` : ''}${esc(r.label)}<div class="device-row-sub">${esc(r.sub)}</div></td>
|
||||
<td class="device-num">${r.up ? fmtSpeed(d.speed_mbps) : '-'}</td>
|
||||
<td class="device-num device-col-wide">${fmtRate(d.rx_bytes_rate)}</td>
|
||||
<td class="device-num device-col-wide">${fmtRate(d.tx_bytes_rate)}</td>
|
||||
${isPorts ? `<td class="device-col-wide">${neighbor}</td>` : ''}
|
||||
<td>${badges(d) || (r.up ? '<span class="val-good">OK</span>' : '<span class="device-row-sub">down</span>')}</td>
|
||||
<td>${healthCell(r)}</td>
|
||||
</tr>
|
||||
${open ? `<tr class="device-row-detail"><td colspan="7">${r.detail}</td></tr>` : ''}`;
|
||||
}).join('');
|
||||
@@ -326,8 +342,10 @@ function updateInterfaceSection(rows, title, hasChassis) {
|
||||
document.getElementById('device-ports-title').textContent = 'Front panel';
|
||||
return;
|
||||
}
|
||||
const inUse = rows.filter(r => !r.unused);
|
||||
const unusedCount = rows.length - inUse.length;
|
||||
document.getElementById('device-ports-title').textContent =
|
||||
`${title} · ${rows.filter(r => r.up).length} of ${rows.length} up`;
|
||||
`${title} · ${inUse.filter(r => r.up).length} of ${inUse.length} up${unusedCount ? ` · ${unusedCount} unused` : ''}`;
|
||||
document.getElementById('device-table-search').setAttribute('aria-label', `Filter ${title.toLowerCase()}`);
|
||||
document.getElementById('device-error-count').textContent = rows.filter(rowHasProblem).length;
|
||||
}
|
||||
@@ -369,7 +387,27 @@ async function saveInventory(e) {
|
||||
|
||||
document.addEventListener('click', e => {
|
||||
if (e.target.closest('[data-action="edit-inventory"]')) openInventoryEditor();
|
||||
const mark = e.target.closest('[data-unused]');
|
||||
if (mark) toggleUnused(mark.dataset.iface, mark.dataset.unused === '1');
|
||||
});
|
||||
|
||||
async function toggleUnused(iface, unused) {
|
||||
const url = `/api/device/${encodeURIComponent(DEVICE_NAME)}/interfaces/${encodeURIComponent(iface)}/unused`;
|
||||
try {
|
||||
if (unused) {
|
||||
const reason = window.prompt(`Why isn't ${iface} in use? (optional, e.g. "spare, never cabled")`, '');
|
||||
if (reason === null) return;
|
||||
await lt.api.put(url, { reason });
|
||||
lt.toast.success(`${iface} marked unused: it won't alert or count against ${DEVICE_NAME}`);
|
||||
} else {
|
||||
await lt.api.delete(url);
|
||||
lt.toast.success(`${iface} is in use again`);
|
||||
}
|
||||
await loadDevice();
|
||||
} catch (err) {
|
||||
lt.toast.error(err.message || 'Save failed');
|
||||
}
|
||||
}
|
||||
const _inventoryForm = document.getElementById('inventory-form');
|
||||
if (_inventoryForm) _inventoryForm.addEventListener('submit', saveInventory);
|
||||
|
||||
|
||||
+12
-6
@@ -595,6 +595,15 @@ function faceplateLegendHtml(spec, marks) {
|
||||
// ctx: { swName, portMap, outlets, online, titleFor(port, idx, role), cutsheetFor?(idx) -> {mark, text},
|
||||
// rack? (draw only the front, spec.rackView, as mounted in a rack) }
|
||||
function renderFaceplate(model, ctx) {
|
||||
const { svg, marks } = faceplateSvg(model, ctx);
|
||||
return `<div class="fp-wrap">
|
||||
<div class="fp-frame ${FACEPLATES[model].frameClass}">${svg}</div>
|
||||
</div>${faceplateLegendHtml(FACEPLATES[model], marks)}`;
|
||||
}
|
||||
|
||||
// The faceplate's SVG on its own, for drawing inside another picture (a shelf). `attrs` adds
|
||||
// attributes to the <svg> (x, y, width, height to place it). Returns { svg, marks }.
|
||||
function faceplateSvg(model, ctx, attrs = '') {
|
||||
const spec = FACEPLATES[model];
|
||||
const anyPort = Object.values(ctx.portMap)[0];
|
||||
const marks = new Set();
|
||||
@@ -612,9 +621,7 @@ function renderFaceplate(model, ctx) {
|
||||
const outlets = (spec.outlets || []).map(o => faceplateOutletSvg(o, outletData[o.idx])).join('');
|
||||
const body = spec.noBody ? ''
|
||||
: `<rect class="fp-body" width="${spec.width}" height="${spec.height}" rx="3"/>`;
|
||||
return `<div class="fp-wrap">
|
||||
<div class="fp-frame ${spec.frameClass}">
|
||||
<svg class="fp-svg" viewBox="${((ctx.rack && spec.rackView) || [0, 0, spec.width, spec.height]).join(' ')}" role="group" aria-label="${lt.escHtml(spec.label)} front panel">
|
||||
const svg = `<svg class="fp-svg" ${attrs} viewBox="${((ctx.rack && spec.rackView) || [0, 0, spec.width, spec.height]).join(' ')}" role="group" aria-label="${lt.escHtml(spec.label)} front panel">
|
||||
<defs>
|
||||
<linearGradient id="fp-metal" x1="0" y1="0" x2="0" y2="1">
|
||||
<stop offset="0" stop-color="#e4e4e6"/><stop offset=".08" stop-color="#d6d6d8"/>
|
||||
@@ -628,9 +635,8 @@ function renderFaceplate(model, ctx) {
|
||||
${spec.decor({ online: ctx.online })}
|
||||
${outlets}
|
||||
${ports}
|
||||
</svg>
|
||||
</div>
|
||||
</div>${faceplateLegendHtml(spec, marks)}`;
|
||||
</svg>`;
|
||||
return { svg, marks };
|
||||
}
|
||||
|
||||
// Where an fp-scroll panel should start: its port area
|
||||
|
||||
+146
-23
@@ -1,5 +1,5 @@
|
||||
'use strict';
|
||||
/* exported RACK_FRONTS, CHASSIS_FACEPLATES, rackFrontSvg, shelfSvg, SHELF_GEAR */
|
||||
/* exported RACK_FRONTS, CHASSIS_FACEPLATES, rackFrontSvg, shelfSvg, SHELF_GEAR, DESK_FACEPLATES */
|
||||
// Drawn fronts for rack gear Gandalf can't read a faceplate from: custom-built servers. Chosen per cutsheet item ("Front drawing"). Each one
|
||||
// shows the device's live status on its power light when the item is linked to a device.
|
||||
//
|
||||
@@ -106,12 +106,107 @@ const RACK_FRONTS = {
|
||||
},
|
||||
},
|
||||
|
||||
// Sliger CX4712 with its coloured front fitted, as in the rack photo (wiki: rack-2026.jpg):
|
||||
// a hex-perforated panel over most of the face, the drive cages faintly visible through it,
|
||||
// black rack ears, and a power button over two USB ports at the top right.
|
||||
'sliger-cx4712-red': sligerFront('#c8161d', '#e9e5e0'),
|
||||
'sliger-cx4712-white': sligerFront('#eceae6', '#9aa0a6'),
|
||||
'sliger-cx4712-blue': sligerFront('#1f5fae', '#e9e5e0'),
|
||||
|
||||
// Ubiquiti UACC-Rack-Panel-Brush-1U, from Ubiquiti's product images (store.ui.com, UACC-Rack-Panel
|
||||
// variant Brush 1U): a light silver face with separate ear plates (two rounded slots each), a
|
||||
// recessed chamfered frame around the opening (shadowed along the top, bright bevel along the
|
||||
// bottom), and two rows of black bristles meeting at a seam along the middle.
|
||||
'uacc-brush-1u': {
|
||||
label: 'UniFi Rack Panel Brush 1U (UACC-Rack-Panel-Brush-1U)', units: 1, width: 1100, height: 105,
|
||||
draw() {
|
||||
// Bristles: each row is shaded root to tip (dark where it leaves the frame, lighter where the
|
||||
// two rows meet), with a faint strand texture on top. Strong individual strands alias into hard
|
||||
// stripes at rack size, so the texture stays low-contrast and the shading carries the look.
|
||||
// The opening runs almost the full width between the ear plates, as in Ubiquiti's image
|
||||
const strands = (y0, y1, seed) => Array.from({ length: 172 }, (_, i) => {
|
||||
const n = (i * 7919 + seed * 104729) % 97;
|
||||
return `<rect x="${60 + i * 5.7 + (n % 5) * 0.4}" y="${y0 + (n % 4)}" width="${1.4 + (n % 3) * 0.5}"
|
||||
height="${y1 - y0 - (n % 4)}" class="ub-strand" style="opacity:${0.18 + (n % 5) * 0.05}"/>`;
|
||||
}).join('');
|
||||
const slot = x => `<rect class="ua-ear-slot" x="${x - 7}" y="22" width="14" height="10" rx="5"/>
|
||||
<rect class="ua-ear-slot" x="${x - 7}" y="73" width="14" height="10" rx="5"/>`;
|
||||
return `<defs><linearGradient id="fp-metal" x1="0" y1="0" x2="0" y2="1">
|
||||
<stop offset="0" stop-color="#e4e4e6"/><stop offset=".08" stop-color="#d6d6d8"/>
|
||||
<stop offset=".92" stop-color="#cfcfd2"/><stop offset="1" stop-color="#a9a9ad"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="ub-row-top" x1="0" y1="0" x2="0" y2="1">
|
||||
<stop offset="0" stop-color="#08090a"/><stop offset=".7" stop-color="#1f2125"/><stop offset="1" stop-color="#34373c"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="ub-row-bottom" x1="0" y1="0" x2="0" y2="1">
|
||||
<stop offset="0" stop-color="#34373c"/><stop offset=".3" stop-color="#1f2125"/><stop offset="1" stop-color="#08090a"/>
|
||||
</linearGradient></defs>
|
||||
<rect class="fp-body" width="1100" height="105" rx="3"/>
|
||||
<rect class="ua-ear-plate" x="0" y="1" width="32" height="103" rx="3"/>
|
||||
<rect class="ua-ear-plate" x="1068" y="1" width="32" height="103" rx="3"/>
|
||||
<rect class="ua-ear-seam" x="31" y="1" width="1.5" height="103"/>
|
||||
<rect class="ua-ear-seam" x="1067.5" y="1" width="1.5" height="103"/>
|
||||
${slot(16)}${slot(1084)}
|
||||
<rect class="ub-frame" x="44" y="20" width="1012" height="66" rx="7"/>
|
||||
<rect class="ub-frame-shadow" x="48" y="24" width="1004" height="7" rx="3"/>
|
||||
<rect class="ub-frame-bevel" x="48" y="77" width="1004" height="5" rx="2.5"/>
|
||||
<rect class="ub-opening" x="56" y="30" width="988" height="47" rx="2"/>
|
||||
<rect x="56" y="30" width="988" height="23.5" fill="url(#ub-row-top)"/>
|
||||
<rect x="56" y="53.5" width="988" height="23.5" fill="url(#ub-row-bottom)"/>
|
||||
${strands(31, 53, 1)}${strands(54, 76, 2)}
|
||||
<rect class="ub-seam" x="56" y="53" width="988" height="1"/>`;
|
||||
},
|
||||
},
|
||||
|
||||
// Generic servers, for gear without a specific drawing
|
||||
'server-1u': genericServer(1, 4),
|
||||
'server-2u': genericServer(2, 12),
|
||||
'server-4u': genericServer(4, 24),
|
||||
};
|
||||
|
||||
// A rack handle on a Sliger ear: a vertical bar standing off the ear on two mounts
|
||||
function sligerHandle(x) {
|
||||
const top = 70, bottom = 350;
|
||||
return `<rect class="rf-sl-mount" x="${x - 2}" y="${top - 14}" width="30" height="22" rx="4"/>
|
||||
<rect class="rf-sl-mount" x="${x - 2}" y="${bottom - 8}" width="30" height="22" rx="4"/>
|
||||
<rect class="rf-sl-handle" x="${x}" y="${top - 6}" width="26" height="${bottom - top + 12}" rx="13"/>
|
||||
<rect class="rf-sl-handle-shine" x="${x + 5}" y="${top + 6}" width="5" height="${bottom - top - 12}" rx="2.5"/>`;
|
||||
}
|
||||
|
||||
function sligerFront(colour, hole) {
|
||||
const W = 1100, H = 420;
|
||||
// Hex perforations: a pattern of hexagons cut out of the panel through a mask
|
||||
const hex = (cx, cy, r) => Array.from({ length: 6 }, (_, i) => {
|
||||
const a = Math.PI / 6 + i * Math.PI / 3;
|
||||
return `${(cx + r * Math.cos(a)).toFixed(1)},${(cy + r * Math.sin(a)).toFixed(1)}`;
|
||||
}).join(' ');
|
||||
// Hole size and pitch from the rack photo: about 20 rows of holes over the panel's height
|
||||
const r = 6.9, dx = 18, dy = 15.6;
|
||||
const holes = [];
|
||||
for (let row = 0, y = 46; y < H - 34; row++, y += dy) {
|
||||
for (let x = 82 + (row % 2 ? dx / 2 : 0); x < 925; x += dx) holes.push(`<polygon points="${hex(x, y, r)}"/>`);
|
||||
}
|
||||
const bays = Array.from({ length: 10 }, (_, i) => `<rect class="rf-sl-bay" x="${140 + i * 74}" y="120" width="44" height="250" rx="3" style="fill:${hole}"/>`).join('');
|
||||
// The cages show only faintly through the mesh
|
||||
return {
|
||||
label: 'Sliger CX4712 4U (10-bay)', units: 4, width: W, height: H,
|
||||
draw({ status }) {
|
||||
const id = `sl-${colour.slice(1)}`;
|
||||
return `<defs><mask id="${id}"><rect width="${W}" height="${H}" fill="#fff"/><g fill="#000">${holes.join('')}</g></mask></defs>
|
||||
<rect class="rf-sl-inside" x="70" y="30" width="870" height="${H - 60}"/>${bays}
|
||||
<rect class="rf-sl-ear" x="0" y="0" width="70" height="${H}" rx="4"/>
|
||||
<rect class="rf-sl-ear" x="${W - 70}" y="0" width="70" height="${H}" rx="4"/>
|
||||
${sligerHandle(14)}${sligerHandle(W - 40)}
|
||||
<rect x="52" y="10" width="${W - 104}" height="${H - 20}" rx="8" style="fill:${colour}" mask="url(#${id})"/>
|
||||
<rect class="rf-sl-edge" x="52" y="10" width="${W - 104}" height="${H - 20}" rx="8"/>
|
||||
<circle class="rf-sl-button" cx="988" cy="88" r="17"/>
|
||||
<circle class="rf-power-ring" cx="988" cy="88" r="12" style="stroke:${frontLed(status)}"/>
|
||||
<rect class="rf-sl-io" x="966" y="138" width="44" height="74" rx="4"/>
|
||||
${usbA(977, 146)}${usbA(977, 168)}${usbC(980, 192)}`;
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function genericServer(units, bays) {
|
||||
const H = 105 * units;
|
||||
return {
|
||||
@@ -256,42 +351,70 @@ const SHELF_GEAR = {
|
||||
},
|
||||
};
|
||||
|
||||
// UniFi desk gear drawn from its live faceplate when it sits on a shelf: the real width of the
|
||||
// face (Ubiquiti tech specs) and the span of that face in the faceplate drawing, to scale it.
|
||||
const DESK_FACEPLATES = {
|
||||
USMINI: { mm: 107, body: [2, 661], label: 'UniFi Switch Flex Mini' }, // 107 x 70 x 21 mm
|
||||
USF5P: { mm: 122.5, body: [66, 488], label: 'UniFi Switch Flex' }, // 122.5 x 107.1 x 28 mm
|
||||
};
|
||||
|
||||
// A shelf at true scale (1100 units = 482.6 mm, a 19" panel) with what sits on it, left to right.
|
||||
// Gear with a SHELF_GEAR drawing is drawn to its real width; anything else is a labelled box.
|
||||
function shelfSvg(item, esc) {
|
||||
// Gear with a SHELF_GEAR drawing, or UniFi desk gear with a live faceplate, is drawn to its real
|
||||
// width; anything else is a labelled box. A shelf with Front drawing "resting" has no tray: its gear
|
||||
// lies directly on whatever is below it (a switch on top of the NVR).
|
||||
function shelfSvg(item, esc, faceplate) {
|
||||
const units = item.rack_height || 1;
|
||||
const W = 1100, H = 105 * units, perMm = W / 482.6;
|
||||
const floor = H - 20;
|
||||
const resting = item.chassis === 'resting';
|
||||
const floor = resting ? H - 3 : H - 20;
|
||||
let x = 64;
|
||||
const things = (item.contents || []).map(c => {
|
||||
const gear = SHELF_GEAR[c.chassis];
|
||||
const w = gear ? gear.mm * perMm : 150;
|
||||
const k = gear ? w / gear.width : 1;
|
||||
const h = gear ? gear.height * k : 58;
|
||||
const desk = !gear && faceplate && DESK_FACEPLATES[c.model];
|
||||
let w, h, body;
|
||||
if (gear) {
|
||||
w = gear.mm * perMm;
|
||||
const k = w / gear.width;
|
||||
h = gear.height * k;
|
||||
body = `<g transform="translate(${x} ${floor - h}) scale(${k})">${gear.draw(c)}</g>`;
|
||||
} else if (desk) {
|
||||
// Scale the faceplate so its body spans the switch's real width, then place the whole drawing
|
||||
const spec = faceplate.spec(c.model);
|
||||
const k = (desk.mm * perMm) / (desk.body[1] - desk.body[0]);
|
||||
w = desk.mm * perMm;
|
||||
h = spec.height * k;
|
||||
body = faceplate.svg(c, `x="${x - desk.body[0] * k}" y="${floor - h}" width="${spec.width * k}" height="${h}"`);
|
||||
} else {
|
||||
w = 150;
|
||||
h = 58;
|
||||
body = `<rect class="sh-box" x="${x}" y="${floor - h}" width="${w}" height="${h}" rx="4"/>
|
||||
<text class="sh-box-name" x="${x + w / 2}" y="${floor - h / 2 + 5}" text-anchor="middle">${esc(c.name)}</text>`;
|
||||
}
|
||||
const top = floor - h;
|
||||
const nics = (c.interfaces || []).map(n => `${n.name} ${n.up ? 'up' : 'down'}`).join(', ');
|
||||
const tip = [c.name, gear ? gear.label : c.kind, c.status, nics, gear && gear.specs].filter(Boolean).join(' · ');
|
||||
const body = gear
|
||||
? `<g transform="translate(${x} ${top}) scale(${k})">${gear.draw(c)}</g>`
|
||||
: `<rect class="sh-box" x="${x}" y="${top}" width="${w}" height="${h}" rx="4"/>
|
||||
<text class="sh-box-name" x="${x + w / 2}" y="${top + h / 2 + 5}" text-anchor="middle">${esc(c.name)}</text>`;
|
||||
const out = `<a class="sh-thing" href="${esc(c.url)}"><title>${esc(tip)}</title>
|
||||
const nics = (c.interfaces || []).map(n => `${n.name} ${n.unused ? 'unused' : (n.up ? 'up' : 'down')}`).join(', ');
|
||||
const label = gear ? gear.label : (desk ? desk.label : c.kind);
|
||||
const tip = [c.name, label, c.status, nics, gear && gear.specs].filter(Boolean).join(' · ');
|
||||
// A live faceplate's ports are links of their own, so it isn't wrapped in one
|
||||
const open = desk ? '<g class="sh-thing">' : `<a class="sh-thing" href="${esc(c.url)}">`;
|
||||
const tagY = resting ? top - 16 : floor + 5;
|
||||
const out = `${open}<title>${esc(tip)}</title>
|
||||
${body}
|
||||
<rect class="sh-hit" x="${x - 4}" y="${top - 4}" width="${w + 8}" height="${h + 8}" rx="4"/>
|
||||
<rect class="sh-tag" x="${x + w / 2 - 46}" y="${floor + 5}" width="92" height="12" rx="2"/>
|
||||
<text class="sh-tag-text" x="${x + w / 2}" y="${floor + 14}" text-anchor="middle">${esc(c.name)}</text>
|
||||
</a>`;
|
||||
${desk ? '' : `<rect class="sh-hit" x="${x - 4}" y="${top - 4}" width="${w + 8}" height="${h + 8}" rx="4"/>`}
|
||||
<rect class="sh-tag" x="${x + w / 2 - 46}" y="${tagY}" width="92" height="12" rx="2"/>
|
||||
<text class="sh-tag-text" x="${x + w / 2}" y="${tagY + 9}" text-anchor="middle">${esc(c.name)}</text>
|
||||
${desk ? '</g>' : '</a>'}`;
|
||||
x += w + 26;
|
||||
return out;
|
||||
}).join('');
|
||||
const tray = resting ? '' : `${ears(W, H, 'rf-ear-dark')}
|
||||
<rect class="sh-back" x="36" y="6" width="${W - 72}" height="${floor - 6}"/>
|
||||
<rect class="sh-floor" x="30" y="${floor}" width="${W - 60}" height="${H - floor - 2}" rx="2"/>
|
||||
<rect class="sh-lip" x="30" y="${floor}" width="${W - 60}" height="3"/>`;
|
||||
return `<svg class="rack-svg rack-shelf-svg" viewBox="0 0 ${W} ${H}" preserveAspectRatio="none" role="group"
|
||||
aria-label="${esc(item.name)}">
|
||||
<title>${esc(item.name)}</title>
|
||||
${ears(W, H, 'rf-ear-dark')}
|
||||
<rect class="sh-back" x="36" y="6" width="${W - 72}" height="${floor - 6}"/>
|
||||
<rect class="sh-floor" x="30" y="${floor}" width="${W - 60}" height="${H - floor - 2}" rx="2"/>
|
||||
<rect class="sh-lip" x="30" y="${floor}" width="${W - 60}" height="3"/>
|
||||
${things || `<text class="sh-empty" x="${W / 2}" y="${floor - 12}" text-anchor="middle">empty shelf</text>`}
|
||||
${tray}
|
||||
${things || `<text class="sh-empty" x="${W / 2}" y="${floor - 12}" text-anchor="middle">${resting ? 'nothing here' : 'empty shelf'}</text>`}
|
||||
<text class="sh-name" x="46" y="18">${esc(item.name)}</text>
|
||||
</svg>`;
|
||||
}
|
||||
+11
-2
@@ -1,5 +1,5 @@
|
||||
'use strict';
|
||||
/* global FACEPLATES, renderFaceplate, RACK_CAN_EDIT, RACK_FRONTS, CHASSIS_FACEPLATES, rackFrontSvg, shelfSvg */
|
||||
/* global FACEPLATES, renderFaceplate, faceplateSvg, RACK_CAN_EDIT, RACK_FRONTS, CHASSIS_FACEPLATES, rackFrontSvg, shelfSvg */
|
||||
// Rack page: draws the rack front from /api/rack. Switches use their real faceplates,
|
||||
// patch panels a generic panel; hovering a port lights up every port on the same cable run.
|
||||
|
||||
@@ -145,6 +145,15 @@ function plateHtml(item) {
|
||||
</div>`;
|
||||
}
|
||||
|
||||
// Live faceplates for UniFi desk gear sitting on a shelf (a Flex Mini on top of the NVR)
|
||||
const shelfFaceplates = {
|
||||
spec: model => FACEPLATES[model],
|
||||
svg: (c, attrs) => faceplateSvg(c.model, {
|
||||
swName: c.device || c.name, portMap: portMapOf(c.ports), outlets: [], online: c.status === 'up',
|
||||
titleFor: (port, idx) => portTitle(port, idx),
|
||||
}, attrs).svg,
|
||||
};
|
||||
|
||||
function backHtml(item) {
|
||||
// A full-depth item seen from the rear: its back, not its faceplate
|
||||
return `<div class="rack-plate rack-back">
|
||||
@@ -161,7 +170,7 @@ function itemHtml(item) {
|
||||
else if (item.chassis && RACK_FRONTS[item.chassis]) body = rackFrontSvg(item.chassis, item);
|
||||
else if (item.kind === 'patch_panel' && item.chassis === 'uacc-patch-24') body = uaccPanelSvg(item);
|
||||
else if (item.kind === 'patch_panel') body = panelSvg(item);
|
||||
else if (item.kind === 'shelf') body = shelfSvg(item, esc);
|
||||
else if (item.kind === 'shelf') body = shelfSvg(item, esc, shelfFaceplates);
|
||||
else body = plateHtml(item);
|
||||
return `<div class="rack-item rack-kind-${esc(item.kind)}" data-item="${esc(item.id)}">${body}</div>`;
|
||||
}
|
||||
|
||||
@@ -1630,3 +1630,29 @@ body.fp-marks-off .fp-svg .fp-mark { display: none; }
|
||||
.cx-tab { fill: none; stroke: #c9ccd0; stroke-width: 9; stroke-linejoin: round; }
|
||||
.cx-link { stroke: #101418; stroke-width: 3; }
|
||||
.fp-speedbar { fill: #b3b5ba; }
|
||||
.rf-sl-inside { fill: #141619; }
|
||||
.rf-sl-ear { fill: #17181a; }
|
||||
.rf-sl-edge { fill: none; stroke: rgba(0,0,0,.35); stroke-width: 2; }
|
||||
.rf-sl-button { fill: #c9ccd0; stroke: #8a8e93; stroke-width: 2; }
|
||||
.rf-sl-bay { opacity: .45; }
|
||||
.rf-sl-io { fill: #0e0f11; }
|
||||
.rf-sl-mount { fill: #0c0d0f; }
|
||||
.rf-sl-handle { fill: #3a3e44; stroke: #0a0b0c; stroke-width: 2; }
|
||||
.rf-sl-handle-shine { fill: #6b717a; }
|
||||
.ua-ear-plate { fill: #d3d5d8; stroke: #b2b4b8; stroke-width: 1; }
|
||||
.ua-ear-seam { fill: #9fa1a6; }
|
||||
.ua-ear-slot { fill: #2a2c30; }
|
||||
.ub-frame { fill: #bfc1c5; stroke: #a5a7ac; stroke-width: 1; }
|
||||
.ub-frame-shadow { fill: #8c8e93; }
|
||||
.ub-frame-bevel { fill: #f1f2f3; }
|
||||
.ub-opening { fill: #0d0e10; }
|
||||
.ub-seam { fill: #050506; opacity: .8; }
|
||||
.ub-strand { fill: #000; }
|
||||
|
||||
/* Interfaces marked unused: greyed, never "down" */
|
||||
.dot-unused { display: inline-block; width: 8px; height: 8px; border: 1px dashed var(--text-muted);
|
||||
background: transparent; flex-shrink: 0; vertical-align: middle; }
|
||||
.state-unused { color: var(--text-muted); }
|
||||
.device-row--unused td { opacity: .6; }
|
||||
.device-row--unused td:last-child { opacity: 1; }
|
||||
.lt-btn-xs { padding: 1px 6px; font-size: .68rem; margin-left: 6px; }
|
||||
+29
-1
@@ -37,6 +37,7 @@ def client():
|
||||
db.check_suppressed.return_value = False
|
||||
db.get_device_link.return_value = ''
|
||||
db.cutsheet_racks.return_value = []
|
||||
db.get_unused_interfaces.return_value = {}
|
||||
with patch.object(gandalf, '_cfg', CONFIG):
|
||||
yield gandalf.app.test_client()
|
||||
|
||||
@@ -551,7 +552,8 @@ class TestRackFacesAndSettings:
|
||||
things = data['items'][0]['contents']
|
||||
assert [(c['name'], c['slot'], c['chassis']) for c in things] == [('b-box', 1, 'zimaboard-832'),
|
||||
('large1', 2, '')]
|
||||
assert things[1]['interfaces'] == [{'name': 'eth0', 'up': True}]
|
||||
assert things[1]['interfaces'] == [{'name': 'eth0', 'up': True, 'unused': False}]
|
||||
assert things[0]['device'] == 'b-box' and things[0]['ports'] == {}
|
||||
|
||||
def test_saved_racks_replace_config(self, client):
|
||||
self._items()
|
||||
@@ -582,3 +584,29 @@ class TestRackFacesAndSettings:
|
||||
assert client.put('/api/cutsheet/racks/1', json={'name': 'x', 'units': 2}, headers=user).status_code == 403
|
||||
gandalf.db.cutsheet_delete_rack.return_value = False
|
||||
assert client.delete('/api/cutsheet/racks/9', headers=AUTH).status_code == 404
|
||||
|
||||
|
||||
class TestUnusedInterfaces:
|
||||
def _url(self, iface='nic1'):
|
||||
gandalf._cutsheet_schema_ready = True
|
||||
return f'/api/device/compute-storage-01/interfaces/{iface}/unused'
|
||||
|
||||
def test_mark_and_clear(self, client):
|
||||
assert client.put(self._url(), json={'reason': ' never cabled '}, headers=AUTH).status_code == 200
|
||||
gandalf.db.set_unused_interface.assert_called_with('compute-storage-01', 'nic1', 'never cabled', 'jared')
|
||||
gandalf.db.clear_unused_interface.return_value = True
|
||||
resp = client.delete(self._url(), headers=AUTH)
|
||||
assert resp.get_json() == {'success': True, 'changed': True}
|
||||
|
||||
def test_needs_admin_json_and_a_sane_name(self, client):
|
||||
user = dict(AUTH, **{'Remote-Groups': 'staff'})
|
||||
with patch.object(gandalf, '_cfg', dict(CONFIG, auth=dict(CONFIG['auth'], allowed_groups=['admin', 'staff']))):
|
||||
assert client.put(self._url(), json={}, headers=user).status_code == 403
|
||||
assert client.put(self._url(), data='x', headers=AUTH).status_code == 400
|
||||
assert client.put(self._url('bad name!'), json={}, headers=AUTH).status_code in (400, 404)
|
||||
|
||||
def test_device_api_lists_them(self, client):
|
||||
gandalf._cutsheet_schema_ready = True
|
||||
gandalf.db.get_unused_interfaces.return_value = {'large1': {'enp36s0': {'reason': 'spare'}}}
|
||||
data = client.get('/api/device/large1', headers=AUTH).get_json()
|
||||
assert data['unused_interfaces'] == {'enp36s0': {'reason': 'spare'}}
|
||||
@@ -369,7 +369,9 @@ class TestChassis:
|
||||
def test_every_drawing_has_a_label(self):
|
||||
assert all(cs.CHASSIS.values())
|
||||
assert {'sliger-cx4712', 'rosewill-rsv-l4500u', 'unvr-pro', 'uacc-patch-24',
|
||||
'usw-pro-max-24-poe', 'usw-pro-max-48-poe', 'zimaboard-832', 'zimaboard-832-cx3'} <= set(cs.CHASSIS)
|
||||
'usw-pro-max-24-poe', 'usw-pro-max-48-poe', 'zimaboard-832', 'zimaboard-832-cx3',
|
||||
'resting', 'uacc-brush-1u', 'sliger-cx4712-red', 'sliger-cx4712-white',
|
||||
'sliger-cx4712-blue'} <= set(cs.CHASSIS)
|
||||
|
||||
|
||||
class TestFacingAndSlots:
|
||||
|
||||
+45
-16
@@ -31,7 +31,6 @@ def db():
|
||||
mock_db.cutsheet_load.return_value = {'items': [], 'cables': [], 'port_labels': []}
|
||||
mock_db.get_pending_recovery_notes.return_value = []
|
||||
mock_db.get_device_link.return_value = ''
|
||||
mock_db.get_open_event_targets.return_value = []
|
||||
yield mock_db
|
||||
|
||||
|
||||
@@ -118,23 +117,18 @@ class TestDeadHostDetection:
|
||||
mon._process_interfaces({HOST_A: {'eth0': True}}, [])
|
||||
assert ('cluster_network_issue', 'test-cluster', '') in upserted(db)
|
||||
|
||||
def test_open_alert_survives_a_baseline_reset(self, mon, db):
|
||||
# The baseline lost eth1 (reset), but its link-down alert is still open: keep alerting
|
||||
db.get_open_event_targets.return_value = [('alpha', 'eth1')]
|
||||
db.upsert_event.return_value = (3, False, 2, None)
|
||||
mon._process_interfaces({HOST_A: {'eth0': True, 'eth1': False}, HOST_B: {'eth0': True}}, [])
|
||||
assert ('interface_down', 'alpha', 'eth1') in upserted(db)
|
||||
assert 'Interface eth1 link-down' in mon.tickets.create.call_args.args[0]
|
||||
|
||||
def test_open_alert_resolves_when_the_link_returns(self, mon, db):
|
||||
db.get_open_event_targets.return_value = [('alpha', 'eth1')]
|
||||
mon._process_interfaces({HOST_A: {'eth0': True, 'eth1': True}, HOST_B: {'eth0': True}}, [])
|
||||
db.resolve_event.assert_any_call('interface_down', 'alpha', 'eth1')
|
||||
|
||||
def test_first_seen_down_without_an_alert_still_stays_quiet(self, mon, db):
|
||||
db.get_open_event_targets.return_value = []
|
||||
def test_unused_interface_never_alerts(self, mon, db):
|
||||
mon._unused = {'alpha': {'eth1': {'reason': 'spare'}}}
|
||||
db.get_baseline.return_value = {'alpha': {'eth0': 'up', 'eth1': 'up'}, 'beta': {'eth0': 'up'}}
|
||||
mon._process_interfaces({HOST_A: {'eth0': True, 'eth1': False}, HOST_B: {'eth0': True}}, [])
|
||||
assert ('interface_down', 'alpha', 'eth1') not in upserted(db)
|
||||
assert not mon.tickets.create.called
|
||||
|
||||
def test_unused_interface_does_not_degrade_the_host(self, mon):
|
||||
mon._unused = {'alpha': {'eth1': {}}}
|
||||
snap = mon._collect_snapshot({HOST_A: {'eth0': True, 'eth1': False}, HOST_B: {'eth0': True}})
|
||||
assert snap['hosts']['alpha']['status'] == 'up'
|
||||
assert snap['hosts']['alpha']['interfaces'] == {'eth0': 'up', 'eth1': 'unused'}
|
||||
|
||||
def test_dead_host_shows_as_down_on_dashboard(self, mon):
|
||||
snap = mon._collect_snapshot({HOST_A: {'eth0': True}})
|
||||
@@ -767,3 +761,38 @@ class TestTicketClientComment:
|
||||
with patch.object(monitor.requests, 'post', side_effect=OSError('down')):
|
||||
assert c.comment('42', 'hi') is False
|
||||
assert not c.comments_denied
|
||||
|
||||
|
||||
class TestTicketClientCreate:
|
||||
def _client(self):
|
||||
return monitor.TicketClient({'url': 'http://t.test/create_ticket_api.php', 'api_key': 'k'})
|
||||
|
||||
def _post(self, body):
|
||||
resp = MagicMock(status_code=200)
|
||||
resp.json.return_value = body
|
||||
return patch.object(monitor.requests, 'post', return_value=resp)
|
||||
|
||||
def test_new_and_deduplicated_tickets_are_used(self):
|
||||
c = self._client()
|
||||
with self._post({'success': True, 'ticket_id': '5', 'action': 'deduplicated'}):
|
||||
assert c.create('t', 'd') == '5'
|
||||
with self._post({'success': True, 'ticket_id': '6'}):
|
||||
assert c.create('u', 'd') == '6'
|
||||
|
||||
def test_recurrence_on_a_closed_ticket_is_not_used_and_not_retried_each_poll(self):
|
||||
c = self._client()
|
||||
with self._post({'success': True, 'ticket_id': '993', 'action': 'recurrence_noted'}) as post:
|
||||
assert c.create('t', 'd') is None
|
||||
assert c.create('t', 'd') is None
|
||||
assert post.call_count == 1 # the second poll doesn't add another comment to the closed ticket
|
||||
with self._post({'success': True, 'ticket_id': '7', 'action': 'none'}) as post:
|
||||
assert c.create('other', 'd') == '7' # other alerts are unaffected
|
||||
|
||||
def test_retry_after_a_day(self):
|
||||
c = self._client()
|
||||
with self._post({'success': True, 'ticket_id': '993', 'action': 'recurrence_noted'}):
|
||||
c.create('t', 'd')
|
||||
c._closed_matches['t'] = ('993', time.time() - c.CLOSED_MATCH_RETRY_S - 1)
|
||||
with self._post({'success': True, 'ticket_id': '8', 'action': 'none'}):
|
||||
assert c.create('t', 'd') == '8'
|
||||
assert 't' not in c._closed_matches
|
||||
Reference in new issue
Block a user