added flag --since-time for Logs Collectors

cmd/preflight/cli/root.go

@@ -35,6 +35,8 @@ that a cluster meets the requirements to run an application.`,
 	cmd.Flags().String("collector-image", "", "the full name of the collector image to use")
 	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

@@ -129,6 +129,29 @@ func runPreflights(v *viper.Viper, arg string) error {
 		KubernetesRestConfig:   restConfig,
 	}
 
+	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 _, collector := range preflightSpec.Spec.Collectors {
+			if collector.Logs != nil {
+				if collector.Logs.Limits == nil {
+					collector.Logs.Limits = new(troubleshootv1beta2.LogLimits)
+				}
+				collector.Logs.Limits.SinceTime = v.GetString("since-time")
+			}
+		}
+	} else if v.GetString("since") != "" {
+		for _, collector := range preflightSpec.Spec.Collectors {
+			if collector.Logs != nil {
+				if collector.Logs.Limits == nil {
+					collector.Logs.Limits = new(troubleshootv1beta2.LogLimits)
+				}
+				collector.Logs.Limits.Since = v.GetString("since")
+			}
+		}
+	}
+
 	collectResults, err := preflight.Collect(collectOpts, preflightSpec)
 	if err != nil {
 		if !collectResults.IsRBACAllowed {

cmd/troubleshoot/cli/root.go

@@ -39,6 +39,8 @@ from a server that can be used to assist when troubleshooting a Kubernetes clust
 	cmd.Flags().StringSlice("redactors", []string{}, "names of the additional redactors to use")
 	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

@@ -439,6 +439,29 @@ func runCollectors(v *viper.Viper, collectors []*troubleshootv1beta2.Collect, ad
 		globalRedactors = additionalRedactors.Spec.Redactors
 	}
 
+	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 _, collector := range cleanedCollectors {
+			if collector.Collect.Logs != nil {
+				if collector.Collect.Logs.Limits == nil {
+					collector.Collect.Logs.Limits = new(troubleshootv1beta2.LogLimits)
+				}
+				collector.Collect.Logs.Limits.SinceTime = v.GetString("since-time")
+			}
+		}
+	} else if v.GetString("since") != "" {
+		for _, collector := range cleanedCollectors {
+			if collector.Collect.Logs != nil {
+				if collector.Collect.Logs.Limits == nil {
+					collector.Collect.Logs.Limits = new(troubleshootv1beta2.LogLimits)
+				}
+				collector.Collect.Logs.Limits.Since = v.GetString("since")
+			}
+		}
+	}
+
 	// Run preflights collectors synchronously
 	for _, collector := range cleanedCollectors {
 		if len(collector.RBACErrors) > 0 {

pkg/apis/troubleshoot/v1beta2/collector_shared.go

@@ -31,8 +31,10 @@ type Secret struct {
 }
 
 type LogLimits struct {
-	MaxAge   string `json:"maxAge,omitempty" yaml:"maxAge,omitempty"`
-	MaxLines int64  `json:"maxLines,omitempty" yaml:"maxLines,omitempty"`
+	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

@@ -117,7 +117,10 @@ func getPodLogs(ctx context.Context, client *kubernetes.Clientset, pod corev1.Po
 		podLogOpts.TailLines = &limits.MaxLines
 	}
 
-	if limits != nil && limits.MaxAge != "" {
+	if limits != nil && (limits.MaxAge != "" || limits.Since != "") {
+		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)
@@ -130,6 +133,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)
+		fmt.Println("time", t)
+		if err != nil {
+			logger.Printf("unable to parse --since-time=%s\n", limits.SinceTime)
+		} else {
+			sinceTime := metav1.NewTime(t)
+			podLogOpts.SinceTime = &sinceTime
+		}
+	}
 	fileKey := fmt.Sprintf("%s/%s", name, pod.Name)
 	if container != "" {
 		fileKey = fmt.Sprintf("%s/%s/%s", name, pod.Name, container)