-
Notifications
You must be signed in to change notification settings - Fork 613
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
Support Logentries Log Driver #870
Conversation
Integration and functional tests fail to build, so can't execute. |
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.
Thanks for sending this! I believe we need a somewhat larger change to actually make this (I don't think the logentries
driver will actually register because the 1.25 API version is not "supported"), but I've gone ahead and made the logic change in #875.
@@ -961,7 +961,8 @@ | |||
"journald", | |||
"gelf", | |||
"fluentd", | |||
"awslogs" | |||
"awslogs", | |||
"logentries" |
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.
Can you undo the change here? This file is generated from a different one we have internally. Once we get this merged, I can make the change internally.
agent/ecs_client/model/ecs/api.go
Outdated
@@ -7479,6 +7479,9 @@ const ( | |||
|
|||
// LogDriverAwslogs is a LogDriver enum value | |||
LogDriverAwslogs = "awslogs" | |||
|
|||
// LogDriverLogentries is a LogDriver enum value | |||
LogDriverLogentries = "logentries" |
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.
Same as above.
changes successfully validated on a clean container instance using a Logentries trial account. |
Have people been experiencing an issue with this Driver? We've had problems for several months with containers seemingly stopping logging to LE. It seems consistent on only ECS containers using the driver (different apps, too). We've had to switch to awslog driver / app logging with some forwarding for out-of-app stuff :/ we are still trying to troubleshoot the issue |
Summary
Adding support for Logentries log driver introduced in docker API 1.25 (docker version 1.13.0).
Implementation details
Adding logger names to appropriate places.
Testing
Tested on newest AWS Linux ECS by replacing the stock image with this one, updating
ECS_AVAILABLE_LOGGING_DRIVERS
variable, and scheduling a task withlogentries
log driver configured.make release
)go build -out amazon-ecs-agent.exe ./agent
)make test-in-docker
) passgo test -timeout=25s ./agent/...
) passmake run-integ-tests
) pass.\scripts\run-integ-tests.ps1
) passmake run-functional-tests
) pass.\scripts\run-functional-tests.ps1
) passNew tests cover the changes: no
Description for the changelog
Support Logentries Log Driver
Licensing
This contribution is under the terms of the Apache 2.0 License: yes