mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2025-11-18 03:26:17 +00:00
Update flask_server.py
This commit is contained in:
@@ -4851,6 +4851,20 @@ def api_node_metrics():
|
|||||||
# print(f"[v0] Local node: {local_node}")
|
# print(f"[v0] Local node: {local_node}")
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
zfs_arc_size = 0
|
||||||
|
try:
|
||||||
|
with open('/proc/spl/kstat/zfs/arcstats', 'r') as f:
|
||||||
|
for line in f:
|
||||||
|
if line.startswith('size'):
|
||||||
|
parts = line.split()
|
||||||
|
if len(parts) >= 3:
|
||||||
|
zfs_arc_size = int(parts[2])
|
||||||
|
break
|
||||||
|
except (FileNotFoundError, PermissionError, ValueError):
|
||||||
|
# ZFS not available or no access
|
||||||
|
pass
|
||||||
|
|
||||||
# Get RRD data for the node
|
# Get RRD data for the node
|
||||||
|
|
||||||
rrd_result = subprocess.run(['pvesh', 'get', f'/nodes/{local_node}/rrddata',
|
rrd_result = subprocess.run(['pvesh', 'get', f'/nodes/{local_node}/rrddata',
|
||||||
@@ -4858,16 +4872,20 @@ def api_node_metrics():
|
|||||||
capture_output=True, text=True, timeout=10)
|
capture_output=True, text=True, timeout=10)
|
||||||
|
|
||||||
if rrd_result.returncode == 0:
|
if rrd_result.returncode == 0:
|
||||||
|
|
||||||
rrd_data = json.loads(rrd_result.stdout)
|
rrd_data = json.loads(rrd_result.stdout)
|
||||||
|
|
||||||
|
if zfs_arc_size > 0:
|
||||||
|
for item in rrd_data:
|
||||||
|
# If zfsarc field is missing or 0, add current value
|
||||||
|
if 'zfsarc' not in item or item.get('zfsarc', 0) == 0:
|
||||||
|
item['zfsarc'] = zfs_arc_size
|
||||||
|
|
||||||
return jsonify({
|
return jsonify({
|
||||||
'node': local_node,
|
'node': local_node,
|
||||||
'timeframe': timeframe,
|
'timeframe': timeframe,
|
||||||
'data': rrd_data
|
'data': rrd_data
|
||||||
})
|
})
|
||||||
else:
|
else:
|
||||||
|
|
||||||
return jsonify({'error': f'Failed to get RRD data: {rrd_result.stderr}'}), 500
|
return jsonify({'error': f'Failed to get RRD data: {rrd_result.stderr}'}), 500
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
Reference in New Issue
Block a user