Skip to content

Include previous logs from pods if available #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
divolgin merged 1 commit into from
Mar 23, 2020
Merged

Include previous logs from pods if available #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions pkg/collect/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ func getPodLogs(client *kubernetes.Clientset, pod corev1.Pod, name, container st
}
}

fileKey := fmt.Sprintf("%s/%s", name, pod.Name)
if container != "" {
fileKey = fmt.Sprintf("%s/%s/%s", name, pod.Name, container)
}

result := make(map[string][]byte)

req := client.CoreV1().Pods(pod.Namespace).GetLogs(pod.Name, &podLogOpts)
podLogs, err := req.Stream()
if err != nil {
Expand All @@ -137,15 +144,25 @@ func getPodLogs(client *kubernetes.Clientset, pod corev1.Pod, name, container st
if err != nil {
return nil, errors.Wrap(err, "failed to copy log")
}
result[fileKey+".log"] = buf.Bytes()

fileKey := fmt.Sprintf("%s/%s.txt", name, pod.Name)
if container != "" {
fileKey = fmt.Sprintf("%s/%s/%s.txt", name, pod.Name, container)
podLogOpts.Previous = true
req = client.CoreV1().Pods(pod.Namespace).GetLogs(pod.Name, &podLogOpts)
podLogs, err = req.Stream()
if err != nil {
// maybe fail on !kuberneteserrors.IsNotFound(err)?
return result, nil
}
defer podLogs.Close()

buf = new(bytes.Buffer)
_, err = io.Copy(buf, podLogs)
if err != nil {
return nil, errors.Wrap(err, "failed to copy previous log")
}
result[fileKey+"-previous.log"] = buf.Bytes()

return map[string][]byte{
fileKey: buf.Bytes(),
}, nil
return result, nil
}

func (l LogsOutput) Redact() (LogsOutput, error) {
Expand Down