Topology: power map, what each outlet feeds
Lint / JS (eslint) (push) Successful in 21s
Lint / Python (flake8) (push) Successful in 2m36s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Skipped
Test / Python Tests (pytest) (push) Successful in 2m46s
Lint / JS (eslint) (pull_request) Successful in 15s
Lint / Python (flake8) (pull_request) Successful in 2m14s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (push) Successful in 1m33s
Security / Python Security (bandit) (pull_request) Successful in 54s
Test / Python Tests (pytest) (pull_request) Successful in 1m3s
Lint / JS (eslint) (push) Successful in 21s
Lint / Python (flake8) (push) Successful in 2m36s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Skipped
Test / Python Tests (pytest) (push) Successful in 2m46s
Lint / JS (eslint) (pull_request) Successful in 15s
Lint / Python (flake8) (pull_request) Successful in 2m14s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (push) Successful in 1m33s
Security / Python Security (bandit) (pull_request) Successful in 54s
Test / Python Tests (pytest) (pull_request) Successful in 1m3s
- Each PDU, UPS and power strip card lists its outlets that feed something, draw power or are off, with live watts. Each device fed gets a power badge with what it draws. Hovering a power card or a device draws its feeds as dotted lines and keeps both ends lit. - What an outlet feeds: a saved assignment, else the outlet's UniFi name when it names a device (or the modem), else a MAC in its name that belongs to a host NIC (the monitor's host_macs) or UniFi device. - Admins click an outlet to set what it feeds, nothing, or automatic. Saved in a new power_feeds table (created with the cutsheet tables); PUT /api/topology/power/<device>/<outlet>, admin and JSON only, with the device, outlet and target checked. UniFi is never changed. - An outlet that is off but feeds something is listed under "to look at". - Power gear is shown by default again, now that it has something to say. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
dcf5fdf4cc
commit
415d2222e7
10 files changed
+492
-22
No files matched your search
@@ -1312,7 +1312,8 @@ def api_rack():
|
||||
@app.route('/topology')
|
||||
@require_auth
|
||||
def topology_page():
|
||||
return render_template('topology.html', user=_get_user())
|
||||
user = _get_user()
|
||||
return render_template('topology.html', user=user, can_edit='admin' in user['groups'])
|
||||
|
||||
|
||||
@app.route('/api/topology')
|
||||
@@ -1324,14 +1325,48 @@ def api_topology():
|
||||
try:
|
||||
_ensure_cutsheet_schema()
|
||||
sheet = db.cutsheet_load()
|
||||
feeds = db.get_power_feeds()
|
||||
except Exception as e:
|
||||
logger.error(f'Cutsheet unavailable for topology: {e}')
|
||||
sheet = {'items': [], 'cables': []}
|
||||
graph = topology.build_graph(
|
||||
sheet, feeds = {'items': [], 'cables': []}, []
|
||||
return jsonify(_topology_graph(events, sheet, feeds))
|
||||
|
||||
|
||||
def _topology_graph(events: list, sheet: dict, feeds: list) -> dict:
|
||||
return topology.build_graph(
|
||||
_state_json('network_snapshot'), _state_json('link_stats'), _state_json('modem_stats'),
|
||||
events, sheet['items'], sheet['cables'], _state_json('known_uplinks'),
|
||||
events, sheet['items'], sheet['cables'], _state_json('known_uplinks'), feeds,
|
||||
)
|
||||
return jsonify(graph)
|
||||
|
||||
|
||||
@app.route('/api/topology/power/<path:source>/<int:outlet>', methods=['PUT'])
|
||||
@require_auth
|
||||
@require_admin
|
||||
@_cutsheet_write
|
||||
def api_topology_power(source: str, outlet: int):
|
||||
"""Say what a power outlet feeds. Body: {"target": "<device>"} or "" for nothing, or
|
||||
null to go back to the guess from the outlet's name."""
|
||||
body = _json_body()
|
||||
if 'target' not in body:
|
||||
raise cutsheet.ValidationError('Send target: a device name, "" for nothing, or null for automatic')
|
||||
target = body['target']
|
||||
if target is not None and not isinstance(target, str):
|
||||
raise cutsheet.ValidationError('target must be a device name, "" or null')
|
||||
graph = _topology_graph([], {'items': [], 'cables': []}, [])
|
||||
src = next((p for p in graph['power'] if p['node'] == source), None)
|
||||
if src is None:
|
||||
return jsonify({'error': f'No power device named "{source}"'}), 404
|
||||
if not any(o['index'] == outlet for o in src['outlets']):
|
||||
return jsonify({'error': f'{source} has no outlet {outlet}'}), 404
|
||||
names = {n['name'] for n in graph['nodes'] if n['kind'] not in ('stub', 'internet')}
|
||||
if target and target.strip() not in names:
|
||||
raise cutsheet.ValidationError(f'No device named "{target}"')
|
||||
target = target.strip() if target else target
|
||||
user = _get_user()['username']
|
||||
db.set_power_feed(source, outlet, target, user)
|
||||
shown = '(automatic)' if target is None else (target or '(nothing)')
|
||||
logger.info(f'{user} set {source} outlet {outlet} to feed {shown}')
|
||||
return jsonify({'success': True, 'source': source, 'outlet': outlet, 'target': target})
|
||||
|
||||
|
||||
@app.route('/api/cutsheet/racks', methods=['POST'])
|
||||
|
||||
Reference in new issue
Block a user