RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/orch: include AGE column in 'orch ps'

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2020-03-04 10:46:52 -06:00
parent c6cabac263
commit 20c4a9783d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pybind/mgr/orchestrator/module.py
View File

@ -393,7 +393,7 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule):
else:
now = datetime.datetime.utcnow()
table = PrettyTable(
['NAME', 'HOST', 'STATUS', 'REFRESHED',
['NAME', 'HOST', 'STATUS', 'REFRESHED', 'AGE',
'VERSION', 'IMAGE NAME', 'IMAGE ID', 'CONTAINER ID'],
border=False)
table.align = 'l'
@ -407,15 +407,17 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule):
None: '<unknown>'
}[s.status]
if s.last_refresh:
age = to_pretty_timedelta(now - s.last_refresh) + ' ago'
else:
age = '-'
def nice_delta(t, suffix=''):
if t:
return to_pretty_timedelta(now - t) + suffix
else:
return '-'
table.add_row((
s.name(),
ukn(s.hostname),
status,
age,
nice_delta(s.last_refresh, ' ago'),
nice_delta(s.created),
ukn(s.version),
ukn(s.container_image_name),
ukn(s.container_image_id)[0:12],