From 94c34d8cfbc134a4cbe32fa86781cf6cfd3c3e19 Mon Sep 17 00:00:00 2001 From: Radek Wierzbicki Date: Wed, 28 Jun 2017 21:29:40 -0400 Subject: [PATCH] Support Logentries Log Driver aws/amazon-ecs-agent#768 --- agent/ecs_client/model/api/api-2.json | 3 ++- agent/ecs_client/model/ecs/api.go | 3 +++ agent/engine/dockerclient/logging_drivers.go | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/agent/ecs_client/model/api/api-2.json b/agent/ecs_client/model/api/api-2.json index 1810d8b110..03c372c91e 100644 --- a/agent/ecs_client/model/api/api-2.json +++ b/agent/ecs_client/model/api/api-2.json @@ -961,7 +961,8 @@ "journald", "gelf", "fluentd", - "awslogs" + "awslogs", + "logentries" ] }, "Long":{"type":"long"}, diff --git a/agent/ecs_client/model/ecs/api.go b/agent/ecs_client/model/ecs/api.go index faaccdf8e8..59bf9adbff 100644 --- a/agent/ecs_client/model/ecs/api.go +++ b/agent/ecs_client/model/ecs/api.go @@ -7479,6 +7479,9 @@ const ( // LogDriverAwslogs is a LogDriver enum value LogDriverAwslogs = "awslogs" + + // LogDriverLogentries is a LogDriver enum value + LogDriverLogentries = "logentries" ) const ( diff --git a/agent/engine/dockerclient/logging_drivers.go b/agent/engine/dockerclient/logging_drivers.go index 5b06bd0ba1..453a29479a 100644 --- a/agent/engine/dockerclient/logging_drivers.go +++ b/agent/engine/dockerclient/logging_drivers.go @@ -23,6 +23,7 @@ const ( FluentdDriver LoggingDriver = "fluentd" AWSLogsDriver LoggingDriver = "awslogs" SplunklogsDriver LoggingDriver = "splunk" + LogentriesDriver LoggingDriver = "logentries" ) var LoggingDriverMinimumVersion = map[LoggingDriver]DockerVersion{ @@ -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, }