Skip to content
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

Support Logentries Log Driver #870

Merged
merged 2 commits into from
Aug 1, 2017
Merged

Support Logentries Log Driver #870

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94c34d8
Support Logentries Log Driver
opsline-radek Jun 29, 2017
95e3a98
removing auto-generated code
opsline-radek Jul 4, 2017
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
3 changes: 2 additions & 1 deletion agent/ecs_client/model/api/api-2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,8 @@
"journald",
"gelf",
"fluentd",
"awslogs"
"awslogs",
"logentries"
Copy link
Contributor

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.

]
},
"Long":{"type":"long"},
Expand Down
3 changes: 3 additions & 0 deletions agent/ecs_client/model/ecs/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7479,6 +7479,9 @@ const (

// LogDriverAwslogs is a LogDriver enum value
LogDriverAwslogs = "awslogs"

// LogDriverLogentries is a LogDriver enum value
LogDriverLogentries = "logentries"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

)

const (
Expand Down
2 changes: 2 additions & 0 deletions agent/engine/dockerclient/logging_drivers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const (
FluentdDriver LoggingDriver = "fluentd"
AWSLogsDriver LoggingDriver = "awslogs"
SplunklogsDriver LoggingDriver = "splunk"
LogentriesDriver LoggingDriver = "logentries"
)

var LoggingDriverMinimumVersion = map[LoggingDriver]DockerVersion{
Expand All @@ -33,4 +34,5 @@ var LoggingDriverMinimumVersion = map[LoggingDriver]DockerVersion{
FluentdDriver: Version_1_20,
AWSLogsDriver: Version_1_21,
SplunklogsDriver: Version_1_22,
LogentriesDriver: Version_1_25,
}