From b3695ac4baf94cf747e715d4a015dd3d8072bd6d Mon Sep 17 00:00:00 2001
From: Cyrill Troxler <cyrill@nine.ch>
Date: Fri, 7 Feb 2025 11:12:24 +0100
Subject: [PATCH] feat: add from/to flags to get logs in an absolute timeframe

This adds two new flags that when set, override the since parameter to
only show logs in this absolute time frame. This can be useful when
looking for logs beyond the (server-side) line limit of 5000 lines.
---
 logs/logs.go      | 16 +++++++++++++---
 logs/logs_test.go | 19 +++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/logs/logs.go b/logs/logs.go
index 9f417af..57d1c33 100644
--- a/logs/logs.go
+++ b/logs/logs.go
@@ -26,6 +26,8 @@ type logsCmd struct {
 	Follow   bool          `help:"Follow the logs by live tailing." short:"f"`
 	Lines    int           `help:"Amount of lines to output" default:"50" short:"l"`
 	Since    time.Duration `help:"Duration how long to look back for logs" short:"s" default:"${log_retention}"`
+	From     time.Time     `help:"Ignore since flag and start looking for logs at this absolute time (RFC3339)" placeholder:"2025-01-01T14:00:00+01:00"`
+	To       time.Time     `help:"Ignore since flag and stop looking for logs at this absolute time (RFC3339)" placeholder:"2025-01-01T15:00:00+01:00"`
 	Output   string        `help:"Configures the log output format. ${enum}" short:"o" enum:"default,json" default:"default"`
 	NoLabels bool          `help:"disable labels in log output"`
 	out      output.LogOutput
@@ -34,15 +36,23 @@ type logsCmd struct {
 var logRetention = time.Duration(time.Hour * 24 * 30)
 
 func (cmd *logsCmd) Run(ctx context.Context, client *api.Client, queryString string, labels ...string) error {
-	if cmd.Since > logRetention {
+	now := time.Now()
+	start, end := now.Add(-cmd.Since), now
+	if !cmd.From.IsZero() {
+		start = cmd.From
+	}
+	if !cmd.To.IsZero() {
+		end = cmd.To
+	}
+	if now.Sub(start) > logRetention {
 		return fmt.Errorf("the logs requested exceed the retention period of %.f days", logRetention.Hours()/24)
 	}
 
 	query := log.Query{
 		QueryString: queryString,
 		Limit:       cmd.Lines,
-		Start:       time.Now().Add(-cmd.Since),
-		End:         time.Now(),
+		Start:       start,
+		End:         end,
 		Direction:   logproto.BACKWARD,
 		Quiet:       true,
 	}
diff --git a/logs/logs_test.go b/logs/logs_test.go
index 80c05f8..bd1bd20 100644
--- a/logs/logs_test.go
+++ b/logs/logs_test.go
@@ -74,6 +74,25 @@ func TestRun(t *testing.T) {
 			},
 			expectedErrContains: "the logs requested exceed the retention period",
 		},
+		"from/to flags override since": {
+			cmd: logsCmd{
+				Output: "default",
+				Lines:  len(lines),
+				Since:  logRetention * 2,
+				From:   time.Now().Add(-time.Hour),
+				To:     time.Now(),
+			},
+			expectedLines: len(lines),
+		},
+		"from flag alone overrides since": {
+			cmd: logsCmd{
+				Output: "default",
+				Lines:  len(lines),
+				Since:  logRetention * 2,
+				From:   time.Now().Add(-time.Hour),
+			},
+			expectedLines: len(lines),
+		},
 	}
 
 	for name, tc := range cases {