--since flag added

cmd/preflight/cli/root.go

@@ -36,6 +36,7 @@ that a cluster meets the requirements to run an application.`,
 	cmd.Flags().String("collector-pullpolicy", "", "the pull policy of the collector image")
 	cmd.Flags().Bool("collect-without-permissions", false, "always run preflight checks even if some require permissions that preflight does not have")
 	cmd.Flags().String("since-time", "", "forces pod's logs collectors to return logs after a specific date (RFC3339)")
+	cmd.Flags().String("since", "", "forces pod's logs collectors to  return logs newer than a relative duration like 5s, 2m, or 3h.")
 
 	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
 

cmd/preflight/cli/run.go

@@ -130,11 +130,20 @@ func runPreflights(v *viper.Viper, arg string) error {
 	}
 
 	if v.GetString("since-time") != "" {
+		if v.GetString("since") != "" {
+			progressChan <- errors.Errorf("Only one of since-time / since may be used. The flag since-time will be used.")
+		}
 		for _, collectors := range preflightSpec.Spec.Collectors {
 			if collectors.Logs != nil {
 				collectors.Logs.Limits.SinceTime = v.GetString("since-time")
 			}
 		}
+	} else if v.GetString("since") != "" {
+		for _, collectors := range preflightSpec.Spec.Collectors {
+			if collectors.Logs != nil {
+				collectors.Logs.Limits.Since = v.GetString("since")
+			}
+		}
 	}
 
 	collectResults, err := preflight.Collect(collectOpts, preflightSpec)

cmd/troubleshoot/cli/root.go

@@ -40,6 +40,7 @@ from a server that can be used to assist when troubleshooting a Kubernetes clust
 	cmd.Flags().Bool("redact", true, "enable/disable default redactions")
 	cmd.Flags().Bool("collect-without-permissions", false, "always generate a support bundle, even if it some require additional permissions")
 	cmd.Flags().String("since-time", "", "forces pods logs collectors to return logs after a specific date (RFC3339)")
+	cmd.Flags().String("since", "", "forces pod's logs collectors to  return logs newer than a relative duration like 5s, 2m, or 3h.")
 
 	// hidden in favor of the `insecure-skip-tls-verify` flag
 	cmd.Flags().Bool("allow-insecure-connections", false, "when set, do not verify TLS certs when retrieving spec and reporting results")

cmd/troubleshoot/cli/run.go

@@ -440,6 +440,15 @@ func runCollectors(v *viper.Viper, collectors []*troubleshootv1beta2.Collect, ad
 	}
 
 	if v.GetString("since-time") != "" {
+		if v.GetString("since") != "" {
+			progressChan <- errors.Errorf("Only one of since-time / since may be used. The flag since-time will be used.")
+		}
+		for _, collectors := range cleanedCollectors {
+			if collectors.Collect.Logs != nil {
+				collectors.Collect.Logs.Limits.SinceTime = v.GetString("since-time")
+			}
+		}
+	} else if v.GetString("since") != "" {
 		for _, collectors := range cleanedCollectors {
 			if collectors.Collect.Logs != nil {
 				collectors.Collect.Logs.Limits.SinceTime = v.GetString("since-time")

pkg/apis/troubleshoot/v1beta2/collector_shared.go

@@ -34,6 +34,7 @@ type LogLimits struct {
 	MaxAge    string `json:"maxAge,omitempty" yaml:"maxAge,omitempty"`
 	MaxLines  int64  `json:"maxLines,omitempty" yaml:"maxLines,omitempty"`
 	SinceTime string
+	Since     string
 }
 
 type Logs struct {

pkg/collect/logs.go

@@ -120,14 +120,16 @@ func getPodLogs(ctx context.Context, client *kubernetes.Clientset, pod corev1.Po
 	if limits != nil && limits.SinceTime != "" {
 		t, err := time.Parse(time.RFC3339, limits.SinceTime)
 		if err != nil {
-			//should this return an error?
 			logger.Printf("unable to parse --since-time=%s\n", limits.SinceTime)
 		}
 
 		sinceTime := metav1.NewTime(t)
 		podLogOpts.SinceTime = &sinceTime
 
 	} else if limits != nil && limits.MaxAge != "" {
+		if limits.Since != "" {
+			limits.MaxAge = limits.Since
+		}
 		parsedDuration, err := time.ParseDuration(limits.MaxAge)
 		if err != nil {
 			logger.Printf("unable to parse time duration %s\n", limits.MaxAge)