Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[storyteller] sort output by time and improve lag support #1430

Merged
merged 2 commits into from
Feb 12, 2021
Merged

[storyteller] sort output by time and improve lag support #1430

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
681b185
[storyteller] sort output by time and improve lag support
yxieca Feb 11, 2021
1e1617e
add option to sort log files by file name field
yxieca Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions scripts/storyteller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ regex_dict = {
'bgp' : 'bgpcfgd',
'crash' : r'what\|unexpected exception\|notify_OA_about_syncd_exception\|SIG\|not expected',
'interface' : r'updatePortOperStatus\|Configure .* to',
'lag' : r'link becomes\|addLag',
'lag' : r'link becomes\|addLag\|PortChannel.*oper state',
'reboot' : r'BOOT\|rc.local\|old_config\|minigraph.xml\|Rebooting\|reboot\|executeOperationsOnAsic\|getAsicView\|dumpVidToAsicOperatioId\|neighbor_adv\|Pausing\|shutdown\|warm',
'service' : r'Starting\|Stopping\|Started\|Stopped',
}
Expand All @@ -44,9 +44,13 @@ def build_options(after=0, before=0, context=0):
return ' '.join(x for x in options)


def find_log(logpath, log, regex, after=0, before=0, context=0):
def find_log(logpath, log, regex, after=0, before=0, context=0, field=0):
options = build_options(after, before, context)
cmd = 'find -L {}/{}* -newer {} | xargs zgrep -a {} "{}"'.format(logpath, log, reference_file, options, regex)
if field <= 0:
cmd = 'find -L {}/{}* -newer {} | xargs ls -rt | xargs zgrep -a {} "{}"'.format(logpath, log, reference_file, options, regex)
else:
cmd = 'find -L {0}/{1}* -newer {2} | sort -rn -t . -k {3},{3} | xargs zgrep -a {4} "{5}"'.format(logpath, log, reference_file, field, options, regex)

_, out, _ = exec_cmd(cmd)
'''
Opportunity to improve:
Expand Down Expand Up @@ -92,8 +96,10 @@ def main():
type=int, required=False, default=0)
parser.add_argument('-C', '--context', help='Show N lines before and after match',
type=int, required=False, default=0)
parser.add_argument('-S', '--since', help='Filter logs since the given date',
parser.add_argument('-s', '--since', help='Filter logs since the given date',
type=str, required=False, default="@0")
parser.add_argument('-f', '--sortfield', help='Use Nth field separted by "." in file name to sort. e.g. syslog.1.gz: -f 2, swss.rec.2.gz: -f 3, default 0: sort by timestamp',
type=int, required=False, default=0)

args = parser.parse_args()

Expand All @@ -106,7 +112,7 @@ def main():
reg = build_regex(category)
configure_time_filter(since)

find_log(log_path, log, reg, args.after, args.before, args.context)
find_log(log_path, log, reg, args.after, args.before, args.context, args.sortfield)


if __name__ == '__main__':
Expand Down