add option to sort log files by file name field

Author: yxieca

scripts/storyteller

@@ -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 ls -rt | 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:
@@ -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()
 
@@ -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__':