PMM-5680 store agents logs

commands/summary.go

@@ -121,17 +121,15 @@ func addClientData(ctx context.Context, zipW *zip.Writer) {
 		logrus.Errorf("%s", err)
 		return
 	}
-
 	addVMAgentTargets(ctx, zipW, status.AgentsInfo)
 
-	now := time.Now()
-
 	b, err := json.MarshalIndent(status, "", "  ")
 	if err != nil {
 		logrus.Debugf("%s", err)
 		b = []byte(err.Error())
 	}
 	b = append(b, '\n')
+	now := time.Now()
 	addData(zipW, "client/status.json", now, bytes.NewReader(b))
 
 	// FIXME get it via pmm-agent's API - it is _not_ a good idea to use exec there
@@ -145,6 +143,11 @@ func addClientData(ctx context.Context, zipW *zip.Writer) {
 
 	addData(zipW, "client/pmm-admin-version.txt", now, bytes.NewReader([]byte(version.FullInfo())))
 
+	err = downloadFile(zipW, fmt.Sprintf("http://%s:%d/logs.zip", agentlocal.Localhost, agentlocal.DefaultPMMAgentListenPort), "pmm-admin")
+	if err != nil {
+		logrus.Warnf("%s", err)
+	}
+
 	if status.ConfigFilepath != "" {
 		addFile(zipW, "client/pmm-agent-config.yaml", status.ConfigFilepath)
 	}
@@ -237,6 +240,42 @@ func getURL(ctx context.Context, url string) ([]byte, error) {
 	return b, nil
 }
 
+// downloadFile download file and includes into zip file
+func downloadFile(zipW *zip.Writer, url, fileName string) error {
+	response, err := http.Get(url)
+	if err != nil {
+		return err
+	}
+	defer response.Body.Close()
+
+	if response.StatusCode != 200 {
+		return errors.New("Received non 200 response code")
+	}
+
+	b, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		return errors.Wrap(err, "cannot read response body")
+	}
+	bufR := bytes.NewReader(b)
+
+	zipR, err := zip.NewReader(bufR, bufR.Size())
+	if err != nil {
+		return errors.Wrap(err, "cannot create Zip reader")
+	}
+
+	for _, rf := range zipR.File {
+		rc, err := rf.Open()
+		if err != nil {
+			logrus.Errorf("%s", err)
+			continue
+		}
+		addData(zipW, path.Join(fileName, rf.Name), rf.Modified, rc)
+
+		rc.Close()
+	}
+	return nil
+}
+
 type pprofData struct {
 	name string
 	data []byte