Merge pull request #780 from MateSaary/srep-962-dt-logs-timerange

SREP-962: Add absolute timestamp support to fetching DT logs (--from and --to flags)

Author: openshift-merge-bot[bot]

cmd/cluster/context.go

@@ -515,18 +515,20 @@ func (o *contextOptions) generateContextData() (*contextData, []error) {
 				data.DyntraceEnvURL = "Failed to fetch Dynatrace URL"
 			}
 			return
-		} else {
-			query, err := dynatrace.GetQuery(hcpCluster)
-			if err != nil {
-				errors = append(errors, fmt.Errorf("failed to build query for Dynatrace %v", err))
-			}
-			queryTxt := query.Build()
-			data.DyntraceEnvURL = hcpCluster.DynatraceURL
-			data.DyntraceLogsURL, err = dynatrace.GetLinkToWebConsole(hcpCluster.DynatraceURL, 10, queryTxt)
-			if err != nil {
-				errors = append(errors, fmt.Errorf("failed to get url: %v", err))
-			}
 		}
+		query, err := dynatrace.GetQuery(hcpCluster, time.Time{}, time.Time{}, 1) // passing nil from/to values to use --since behaviour
+		if err != nil {
+			errors = append(errors, fmt.Errorf("failed to build query for Dynatrace %v", err))
+			data.DyntraceEnvURL = fmt.Sprintf("Failed to build Dynatrace query: %v", err)
+			return
+		}
+		queryTxt := query.Build()
+		data.DyntraceEnvURL = hcpCluster.DynatraceURL
+		data.DyntraceLogsURL, err = dynatrace.GetLinkToWebConsole(hcpCluster.DynatraceURL, "now()-10h", "now()", queryTxt)
+		if err != nil {
+			errors = append(errors, fmt.Errorf("failed to get url: %v", err))
+		}
+
 	}
 
 	GetPagerDutyAlerts := func() {

cmd/dynatrace/dtquery.go

@@ -3,8 +3,11 @@ package dynatrace
 import (
 	"fmt"
 	"strings"
+	"time"
 )
 
+const timeFormat = "2006-01-02T15:04:05Z"
+
 type DTQuery struct {
 	fragments  []string
 	finalQuery string
@@ -18,6 +21,17 @@ func (q *DTQuery) InitLogs(hours int) *DTQuery {
 	return q
 }
 
+func (q *DTQuery) InitLogsWithTimeRange(from time.Time, to time.Time) *DTQuery {
+	q.fragments = []string{}
+
+	fromStr := from.Format(timeFormat)
+	toStr := to.Format(timeFormat)
+
+	q.fragments = append(q.fragments, fmt.Sprintf("fetch logs, from:\"%s\", to:\"%s\" \n| filter matchesValue(event.type, \"LOG\") and ", fromStr, toStr))
+
+	return q
+}
+
 func (q *DTQuery) InitEvents(hours int) *DTQuery {
 	q.fragments = []string{}
 

cmd/dynatrace/dtquery_test.go

@@ -2,6 +2,7 @@ package dynatrace
 
 import (
 	"testing"
+	"time"
 )
 
 func TestDTQuery_InitLogs(t *testing.T) {
@@ -192,3 +193,29 @@ func TestDTQuery_Deployments(t *testing.T) {
 		})
 	}
 }
+
+func TestDTQuery_InitLogsWithTimeRange(t *testing.T) {
+	tests := []struct {
+		name     string
+		from     time.Time
+		to       time.Time
+		expected string
+	}{
+		{
+			name: "Standard time range",
+			from: time.Date(2025, 6, 12, 5, 0, 0, 0, time.UTC),
+			to:   time.Date(2025, 6, 17, 15, 0, 0, 0, time.UTC),
+			expected: `fetch logs, from:"2025-06-12T05:00:00Z", to:"2025-06-17T15:00:00Z" 
+| filter matchesValue(event.type, "LOG") and `,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			q := new(DTQuery).InitLogsWithTimeRange(tt.from, tt.to)
+			if q.fragments[0] != tt.expected {
+				t.Errorf("expected: %s\ngot: %s", tt.expected, q.fragments[0])
+			}
+		})
+	}
+}

cmd/dynatrace/logsCmd.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
+	"time"
 
 	k8s "github.com/openshift/osdctl/pkg/k8s"
 	"github.com/spf13/cobra"
@@ -14,6 +15,8 @@ var (
 	dryRun        bool
 	tail          int
 	since         int
+	fromVar       time.Time
+	toVar         time.Time
 	contains      string
 	sortOrder     string
 	clusterID     string
@@ -52,6 +55,9 @@ const (
   # Only return logs newer than 2 hours old (an integer in hours)
   $ osdctl dt logs alertmanager-main-0 -n openshift-monitoring --since 2
 
+  # Get logs for a specific time range using --from and --to flags
+  $ osdctl dt logs alertmanager-main-0 -n openshift-monitoring --from "2025-06-15 04:00" --to "2025-06-17 13:00"
+
   # Restrict return of logs to those that contain a specific phrase
   $ osdctl dt logs alertmanager-main-0 -n openshift-monitoring --contains <phrase>
 `
@@ -89,6 +95,11 @@ func NewCmdLogs() *cobra.Command {
 	logsCmd.Flags().BoolVar(&dryRun, "dry-run", false, "Only builds the query without fetching any logs from the tenant")
 	logsCmd.Flags().IntVar(&tail, "tail", 1000, "Last 'n' logs to fetch (defaults to 100)")
 	logsCmd.Flags().IntVar(&since, "since", 1, "Number of hours (integer) since which to search (defaults to 1 hour)")
+	logsCmd.Flags().TimeVar(&fromVar, "from", time.Time{}, []string{time.RFC3339, "2006-01-02 15:04"}, "Datetime from which to filter logs, in the format \"YYYY-MM-DD HH:MM\"")
+	logsCmd.Flags().TimeVar(&toVar, "to", time.Time{}, []string{time.RFC3339, "2006-01-02 15:04"}, "Datetime until which to filter logs to, in the format \"YYYY-MM-DD HH:MM\"")
+	logsCmd.MarkFlagsRequiredTogether("from", "to")
+	logsCmd.MarkFlagsMutuallyExclusive("since", "from")
+	logsCmd.MarkFlagsMutuallyExclusive("since", "to")
 	logsCmd.Flags().StringVar(&contains, "contains", "", "Include logs which contain a phrase")
 	logsCmd.Flags().StringVar(&sortOrder, "sort", "asc", "Sort the results by timestamp in either ascending or descending order. Accepted values are 'asc' and 'desc'. Defaults to 'asc'")
 	logsCmd.Flags().StringSliceVar(&nodeList, "node", []string{}, "Node name(s) (comma-separated)")
@@ -100,13 +111,13 @@ func NewCmdLogs() *cobra.Command {
 	return logsCmd
 }
 
-func GetLinkToWebConsole(dtURL string, since int, finalQuery string) (string, error) {
+func GetLinkToWebConsole(dtURL string, from string, to string, finalQuery string) (string, error) {
 	SearchQuery := map[string]interface{}{
 		"version":  1,
 		"dt.query": finalQuery,
 		"dt.timeframe": map[string]interface{}{
-			"from": fmt.Sprintf("now()-%vh", since),
-			"to":   "now()",
+			"from": from,
+			"to":   to,
 		},
 		"showDqlEditor": true,
 		"tableConfig": map[string]interface{}{
@@ -132,6 +143,11 @@ func main(clusterID string) error {
 	if since <= 0 {
 		return fmt.Errorf("invalid time duration")
 	}
+
+	if !fromVar.IsZero() && !toVar.IsZero() && toVar.Before(fromVar) {
+		return fmt.Errorf("--to cannot be set to a datetime before --from")
+	}
+
 	hcpCluster, err := FetchClusterDetails(clusterID)
 	if err != nil {
 		return fmt.Errorf("failed to acquire cluster details %v", err)
@@ -141,15 +157,23 @@ func main(clusterID string) error {
 		return fmt.Errorf("invalid sort order, expecting 'asc' or 'desc'")
 	}
 
-	query, err := GetQuery(hcpCluster)
+	query, err := GetQuery(hcpCluster, fromVar, toVar, since)
 	if err != nil {
 		return fmt.Errorf("failed to build query for Dynatrace %v", err)
 	}
 
 	fmt.Println(query.Build())
 
 	if console {
-		url, err := GetLinkToWebConsole(hcpCluster.DynatraceURL, since, query.finalQuery)
+		var url string
+		var err error
+
+		if !fromVar.IsZero() && !toVar.IsZero() { // Absolute timestamp condition
+			url, err = GetLinkToWebConsole(hcpCluster.DynatraceURL, fromVar.Format(time.RFC3339), toVar.Format(time.RFC3339), query.finalQuery)
+		} else { // otherwise relative (since "mode")
+			url, err = GetLinkToWebConsole(hcpCluster.DynatraceURL, fmt.Sprintf("now()-%dh", since), "now()", query.finalQuery)
+		}
+
 		if err != nil {
 			return fmt.Errorf("failed to get url: %v", err)
 		}
@@ -179,9 +203,14 @@ func main(clusterID string) error {
 	return nil
 }
 
-func GetQuery(hcpCluster HCPCluster) (query DTQuery, error error) {
+func GetQuery(hcpCluster HCPCluster, fromVar time.Time, toVar time.Time, since int) (query DTQuery, error error) {
 	q := DTQuery{}
-	q.InitLogs(since).Cluster(hcpCluster.managementClusterName)
+
+	if !fromVar.IsZero() && !toVar.IsZero() {
+		q.InitLogsWithTimeRange(fromVar, toVar).Cluster(hcpCluster.managementClusterName)
+	} else {
+		q.InitLogs(since).Cluster(hcpCluster.managementClusterName)
+	}
 
 	if hcpCluster.hcpNamespace != "" {
 		namespaceList = append(namespaceList, hcpCluster.hcpNamespace)

docs/README.md

@@ -2308,6 +2308,7 @@ osdctl dynatrace logs --cluster-id <cluster-identifier> [flags]
       --contains string                  Include logs which contain a phrase
       --context string                   The name of the kubeconfig context to use
       --dry-run                          Only builds the query without fetching any logs from the tenant
+      --from time                        Datetime from which to filter logs, in the format "YYYY-MM-DD HH:MM" (default 0001-01-01T00:00:00Z)
   -h, --help                             help for logs
       --insecure-skip-tls-verify         If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
       --kubeconfig string                Path to the kubeconfig file to use for CLI requests.
@@ -2322,6 +2323,7 @@ osdctl dynatrace logs --cluster-id <cluster-identifier> [flags]
       --sort string                      Sort the results by timestamp in either ascending or descending order. Accepted values are 'asc' and 'desc'. Defaults to 'asc' (default "asc")
       --status strings                   Status(Info/Warn/Error) (comma-separated)
       --tail int                         Last 'n' logs to fetch (defaults to 100) (default 1000)
+      --to time                          Datetime until which to filter logs to, in the format "YYYY-MM-DD HH:MM" (default 0001-01-01T00:00:00Z)
 ```
 
 ### osdctl dynatrace url

docs/osdctl_dynatrace_logs.md

@@ -37,6 +37,9 @@ osdctl dynatrace logs --cluster-id <cluster-identifier> [flags]
   # Only return logs newer than 2 hours old (an integer in hours)
   $ osdctl dt logs alertmanager-main-0 -n openshift-monitoring --since 2
 
+  # Get logs for a specific time range using --from and --to flags
+  $ osdctl dt logs alertmanager-main-0 -n openshift-monitoring --from "2025-06-15 04:00" --to "2025-06-17 13:00"
+
   # Restrict return of logs to those that contain a specific phrase
   $ osdctl dt logs alertmanager-main-0 -n openshift-monitoring --contains <phrase>
 
@@ -50,13 +53,15 @@ osdctl dynatrace logs --cluster-id <cluster-identifier> [flags]
       --container strings   Container name(s) (comma-separated)
       --contains string     Include logs which contain a phrase
       --dry-run             Only builds the query without fetching any logs from the tenant
+      --from time           Datetime from which to filter logs, in the format "YYYY-MM-DD HH:MM" (default 0001-01-01T00:00:00Z)
   -h, --help                help for logs
   -n, --namespace strings   Namespace(s) (comma-separated)
       --node strings        Node name(s) (comma-separated)
       --since int           Number of hours (integer) since which to search (defaults to 1 hour) (default 1)
       --sort string         Sort the results by timestamp in either ascending or descending order. Accepted values are 'asc' and 'desc'. Defaults to 'asc' (default "asc")
       --status strings      Status(Info/Warn/Error) (comma-separated)
       --tail int            Last 'n' logs to fetch (defaults to 100) (default 1000)
+      --to time             Datetime until which to filter logs to, in the format "YYYY-MM-DD HH:MM" (default 0001-01-01T00:00:00Z)
 ```
 
 ### Options inherited from parent commands

go.mod

@@ -51,7 +51,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/afero v1.12.0
 	github.com/spf13/cobra v1.9.1
-	github.com/spf13/pflag v1.0.6
+	github.com/spf13/pflag v1.0.7
 	github.com/spf13/viper v1.20.1
 	github.com/stretchr/testify v1.10.0
 	github.com/zclconf/go-cty v1.13.0

go.sum

@@ -603,8 +603,9 @@ github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cA
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
+github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4=
 github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=