Log watcher properly #2518
Log watcher properly #2518
Conversation
michalpristas
added
bug
michalpristas
requested review from
michel-laterman and
pchila
and removed request for
a team
|
This pull request does not have a backport label. Could you fix it @michalpristas? 🙏
NOTE: |
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
💚 Flaky test reportTests succeeded. 🤖 GitHub commentsExpand to view the GitHub comments
To re-run your PR in the CI, just comment with:
|
🌐 Coverage report
|
| } | ||
|
|
||
| // using Data() + "/logs", for some reason default paths/Logs() is the home dir... | ||
| logPath := filepath.Join(paths.Home(), "logs") + string(filepath.Separator) | ||
| logPath := filepath.Join(pathsHome, "logs") + string(filepath.Separator) |
There was a problem hiding this comment.
Not introduced in this change but I am just curious: why do we need an extra separator ad the end of logPath ?
There was a problem hiding this comment.
dunno, probably something with a zip writer
You know what to add to your upgrade integration test then :-) |
The zip file did not contain a directory entry for the elastic-agent-{commit}
directory.
Relates elastic#2518
This calls filepath.ToSlash on any names used in zip entries. Relates elastic#2518
…2523) * internal/pkg/diagnostics - Fix creation of sub-directories in logs/ Prior to this change sub-directories within logs/ were not created properly and resulted in unexpected directories within diagnostics files. A path separator was missing. Before the change the new test was failing with - Name: (string) (len=13) "logs/sub-dir/", + Name: (string) (len=12) "logssub-dir/", * Update test to include the versioned sub-directory I made the test pass, but this these exposes a problem with the newly added elastic-agent-{commit} directory in that the zip file is missing a directory entry for it. * Add missing directory entry for logs/elastic-agent-{commit} The zip file did not contain a directory entry for the elastic-agent-{commit} directory. Relates #2518 * All files within the zip must use forward slash This calls filepath.ToSlash on any names used in zip entries. Relates #2518
…2523) * internal/pkg/diagnostics - Fix creation of sub-directories in logs/ Prior to this change sub-directories within logs/ were not created properly and resulted in unexpected directories within diagnostics files. A path separator was missing. Before the change the new test was failing with - Name: (string) (len=13) "logs/sub-dir/", + Name: (string) (len=12) "logssub-dir/", * Update test to include the versioned sub-directory I made the test pass, but this these exposes a problem with the newly added elastic-agent-{commit} directory in that the zip file is missing a directory entry for it. * Add missing directory entry for logs/elastic-agent-{commit} The zip file did not contain a directory entry for the elastic-agent-{commit} directory. Relates #2518 * All files within the zip must use forward slash This calls filepath.ToSlash on any names used in zip entries. Relates #2518 (cherry picked from commit 91a3122)
|
@michalpristas Is it possible to change the monitoring configuration to ingest these watcher log files? |
What does this PR do?
This PR makes watcher log into
logsdirectory.Logs are name in a similar manner as normal logs but with
watchersuffix (see picture)When rollback is performed everything except logs directory is removed. this can then be collected later.
On successful upgrade full cleanup is performed and everything except latest agent is removed.
This PR also modifies diagnostics collection.
Now logs are stored into
logs/elastic-agent-{hash}So in case of rollback watcher logs will be present in
oldhashdir and agent logs will be store innewhashdirectoryWhy is it important?
Debug-ability of agent during rollback
Checklist
./changelog/fragmentsusing the changelog toolFixes: #2262