feat(logcli): add --to flag to specify latest RFC3339 time for query (#…

…776) Fixes #774
grafana · Jul 18, 2019 · f74f2c8 · f74f2c8
1 parent 4bf7766
commit f74f2c8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/cmd/logcli/main.go b/cmd/logcli/main.go
@@ -26,7 +26,8 @@ var (
 	regexpStr       = queryCmd.Arg("regex", "").String()
 	limit           = queryCmd.Flag("limit", "Limit on number of entries to print.").Default("30").Int()
 	since           = queryCmd.Flag("since", "Lookback window.").Default("1h").Duration()
-	from            = queryCmd.Flag("from", "Start looking for logs at this absolute time").String()
+	from            = queryCmd.Flag("from", "Start looking for logs at this absolute time (inclusive)").String()
+	to              = queryCmd.Flag("to", "Stop looking for logs at this absolute time (exclusive)").String()
 	forward         = queryCmd.Flag("forward", "Scan forwards through logs.").Default("false").Bool()
 	tail            = queryCmd.Flag("tail", "Tail the logs").Short('t').Default("false").Bool()
 	delayFor        = queryCmd.Flag("delay-for", "Delay in tailing by number of seconds to accumulate logs").Default("0").Int()

diff --git a/cmd/logcli/query.go b/cmd/logcli/query.go
@@ -29,7 +29,15 @@ func doQuery() {
 		var err error
 		start, err = time.Parse(time.RFC3339Nano, *from)
 		if err != nil {
-			log.Fatalf("error parsing date '%s': %s", *from, err)
+			log.Fatalf("error parsing --from date '%s': %s", *from, err)
+		}
+	}
+
+	if *to != "" {
+		var err error
+		end, err = time.Parse(time.RFC3339Nano, *to)
+		if err != nil {
+			log.Fatalf("error parsing --to date '%s': %s", *to, err)
 		}
 	}