-
Notifications
You must be signed in to change notification settings - Fork 119
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.
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
Update cleanup to remove service logs from independent Elastic Agents #2033
Conversation
internal/cleanup/service_logs.go
Outdated
packageFolder := filepath.Base(packageRootPath) | ||
serviceLogsDir := agentdeployer.ServiceLogsDir(profile) | ||
|
||
folderGlob := fmt.Sprintf("%s/agent-%s-*", serviceLogsDir, packageFolder) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As this package removes the built packages of the given package (folder), I tried to remove just the service logs folders for the given package.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we use the name of the directory for these logs directories or the name of the package in the manifest? (There are packages with names different to their directories).
Maybe we could have a function to obtain this directory path, so we use the same when creating and when deleting it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking at the code, it was the folder package name what it was used.
But it is true, that this was not clear and easy to know from the code.
I tried to refactor the code a little in 031c2cc to help about that.
internal/cleanup/service_logs.go
Outdated
packageFolder := filepath.Base(packageRootPath) | ||
serviceLogsDir := agentdeployer.ServiceLogsDir(profile) | ||
|
||
folderGlob := fmt.Sprintf("%s/agent-%s-*", serviceLogsDir, packageFolder) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we use the name of the directory for these logs directories or the name of the package in the manifest? (There are packages with names different to their directories).
Maybe we could have a function to obtain this directory path, so we use the same when creating and when deleting it.
Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
💚 Build Succeeded
History
cc @mrodm |
Update
elastic-package cleanup
to remove also service logs folders created for independent Elastic Agents.Tested with
nginx
(from test package) andsql_input
(from integrations repository).How to test locally