Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

logview: add header, extract play run date from path for easier filtering with -d option

Browse source
This commit is contained in:
Francois Andrieu 2020-10-29 12:16:08 +01:00
parent 5e91005e93
commit 0bfc8b728d
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
scripts/logview
View file

@ -118,6 +118,11 @@ def date_from_path(path):
return datetime(*map(int, date_comp.groups())) return datetime(*map(int, date_comp.groups()))
def datetime_from_path(path):
date_comp = re.search(r'/(\d{4})/(\d{2})/(\d{2})/(\d{2})\.(\d{2})\.(\d{2})', path)
return datetime(*map(int, date_comp.groups()))
def parse_args(args): def parse_args(args):
usage = """ usage = """
logview [options] [-d datestr] [-p playbook] logview [options] [-d datestr] [-p playbook]
@ -156,11 +161,12 @@ def parse_args(args):
def search_logs(opts, logfiles): def search_logs(opts, logfiles):
rows = [] rows = [("Play Date", colorByCat("Hostname"), "Task Time", "Id", colorByCat("State"), "Task Name", "")]
# rows = []
msg = '' msg = ''
for fn in sorted(logfiles): for fn in sorted(logfiles):
hostname = os.path.basename(fn).replace('.log', '').replace('.gz', '') hostname = os.path.basename(fn).replace('.log', '').replace('.gz', '')
timestamp = os.path.basename(os.path.dirname(fn)) timestamp = datetime_from_path(fn).strftime("%a %b %d %Y %H:%M:%S")
if opts.hostname and hostname not in opts.hostname: if opts.hostname and hostname not in opts.hostname:
continue continue
@ -261,7 +267,7 @@ def main(args):
if file.endswith('.info'): if file.endswith('.info'):
pb = parse_info(os.path.join(r, file)) pb = parse_info(os.path.join(r, file))
pb_name = os.path.splitext(os.path.basename(pb['playbook']))[0] pb_name = os.path.splitext(os.path.basename(pb['playbook']))[0]
pb_date = datetime.fromtimestamp(pb['playbook_start']) pb_date = datetime_from_path(r)
if ( if (
opts.list_all or opts.since opts.list_all or opts.since
or ( or (
@ -282,7 +288,7 @@ def main(args):
summary = format_stats(stats) summary = format_stats(stats)
# summary = "ok:%s chd:%s unr:%s faild:%s" % (stats['ok'], stats['changed'], stats['unreachable'], stats['failures']) # summary = "ok:%s chd:%s unr:%s faild:%s" % (stats['ok'], stats['changed'], stats['unreachable'], stats['failures'])
rows.append([str(pb_date), pb_name, pb['userid'], str(host_count), summary]) rows.append([pb_date.isoformat(), pb_name, pb['userid'], str(host_count), summary])
m_widths = col_width(rows) m_widths = col_width(rows)
if len(rows) <= 1: if len(rows) <= 1:
@ -300,16 +306,15 @@ def main(args):
else: else:
date_glob = glob.glob(os.path.join(pb, opts.datestr.strftime("%Y/%m/%d"))) date_glob = glob.glob(os.path.join(pb, opts.datestr.strftime("%Y/%m/%d")))
for pb_logdir in date_glob: for pb_logdir in date_glob:
if opts.since: run_date = date_from_path(pb_logdir)
run_date = date_from_path(pb_logdir) if opts.since and run_date < opts.since:
if run_date < opts.since: continue
continue
if opts.datestr != opts.datestr.replace(hour=0, minute=0, second=0, microsecond=0): if opts.datestr != opts.datestr.replace(hour=0, minute=0, second=0, microsecond=0):
logfiles = glob.glob(pb_logdir + '/' + opts.datestr.strftime("%H.%M.%S") + '/*.log*') logfiles = glob.glob(pb_logdir + '/' + opts.datestr.strftime("%H.%M.%S") + '/*.log*')
else: else:
logfiles = glob.glob(pb_logdir + '/*/*.log*') logfiles = glob.glob(pb_logdir + '/*/*.log*')
rows = search_logs(opts, logfiles) rows = search_logs(opts, logfiles)
if rows: if len(rows) > 1:
m_widths = col_width(rows) m_widths = col_width(rows)
print("%s\n-------" % (pb_name,)) print("%s\n-------" % (pb_name,))
for row in rows: for row in rows: