Change : dashboard , containers
This commit is contained in:
@@ -91,19 +91,23 @@ def dashboard():
|
||||
vm_backups = get_vm_backups()
|
||||
|
||||
if RUNNING_ON_MAIN_SERVER:
|
||||
containers = get_containers()
|
||||
running_count = sum(1 for c in containers if 'Up' in c.get('status', ''))
|
||||
root_ctrs = get_all_root_containers()
|
||||
user_ctrs = get_rootless_user_containers_remote()
|
||||
all_ctrs = root_ctrs + user_ctrs
|
||||
running_count = sum(1 for c in all_ctrs if c.get('running'))
|
||||
system = get_system_info()
|
||||
users = get_all_users()
|
||||
container_count = len(all_ctrs)
|
||||
else:
|
||||
containers = []
|
||||
running_count = 0
|
||||
system = {}
|
||||
users = []
|
||||
container_count = 0
|
||||
|
||||
return render_template('pages/dashboard.html',
|
||||
containers=containers,
|
||||
container_count=container_count,
|
||||
running_count=running_count,
|
||||
site_count=len(SITES),
|
||||
backups=backups,
|
||||
vm_backups=vm_backups,
|
||||
main_server=MAIN_SERVER_IP,
|
||||
@@ -295,15 +299,18 @@ def api_dashboard():
|
||||
user_ctrs = get_rootless_user_containers_remote()
|
||||
all_ctrs = root_ctrs + user_ctrs
|
||||
users = get_all_users()
|
||||
running = sum(1 for c in all_ctrs if 'Up' in c.get('status', ''))
|
||||
running = sum(1 for c in all_ctrs if c.get('running'))
|
||||
stopped = len(all_ctrs) - running
|
||||
|
||||
return jsonify({
|
||||
'system': system,
|
||||
'containers': all_ctrs,
|
||||
'running_count': running,
|
||||
'user_count': len(users),
|
||||
'local_backups': len(get_local_backups()),
|
||||
'vm_backups': len(get_vm_backups()),
|
||||
'system': system,
|
||||
'container_count': len(all_ctrs),
|
||||
'running_count': running,
|
||||
'stopped_count': stopped,
|
||||
'sites_count': len(SITES),
|
||||
'user_count': len(users),
|
||||
'local_backups': len(get_local_backups()),
|
||||
'vm_backups': len(get_vm_backups()),
|
||||
})
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user