Support for timestamps and since as container logs args

Author: Alena Prokharchyk

code/implementation/docker/api/src/main/java/io/cattle/platform/docker/api/ContainerLogsActionHandler.java

@@ -51,7 +51,7 @@ public Object perform(String name, Object obj, ApiRequest request) {
 
         String dockerId = DockerUtils.getDockerIdentifier(container);
         Map<String, Object> data = CollectionUtils.asMap(DockerInstanceConstants.DOCKER_CONTAINER, dockerId, "Lines", logs.getLines(), "Follow",
-                logs.getFollow());
+                logs.getFollow(), "Timestamps", logs.getTimestamps(), "Since", logs.getSince());
 
         HostApiAccess apiAccess = apiService.getAccess(request, host.getId(), CollectionUtils.asMap("logs", data), HOST_LOGS_PATH.get());
 

code/implementation/docker/common/src/main/java/io/cattle/platform/docker/api/model/ContainerLogs.java

@@ -11,4 +11,10 @@ public interface ContainerLogs {
 
     @Field(defaultValue = "100", min = 0)
     Integer getLines();
+
+    @Field(defaultValue = "true")
+    Boolean getTimestamps();
+
+    @Field(defaultValue = "")
+    String getSince();
 }

resources/content/schema/user/user-auth.json

@@ -205,6 +205,8 @@
         "containerLogs":"r",
         "containerLogs.follow":"cr",
         "containerLogs.lines":"cr",
+        "containerLogs.timestamps":"cr",
+        "containerLogs.since":"cr",
 
         "containerProxy":"r",
         "containerProxy.port":"cr",

tests/integration/cattletest/core/test_container.py

@@ -493,7 +493,7 @@ def test_container_logs(context):
 
     assert callable(c.logs)
 
-    resp = c.logs(follow=True, lines=300)
+    resp = c.logs(follow=True, lines=300, timestamps=True, since="2017-05-03")
 
     assert resp.url is not None
     assert resp.token is not None
@@ -503,6 +503,8 @@ def test_container_logs(context):
     assert jwt['logs']['Container'] == c.externalId
     assert jwt['logs']['Lines'] == 300
     assert jwt['logs']['Follow'] is True
+    assert jwt['logs']['Timestamps'] is True
+    assert jwt['logs']['Since'] == "2017-05-03"
     assert jwt['exp'] is not None
 
     resp = c.logs()
@@ -515,6 +517,7 @@ def test_container_logs(context):
     assert jwt['logs']['Container'] == c.externalId
     assert jwt['logs']['Lines'] == 100
     assert jwt['logs']['Follow'] is True
+    assert jwt['logs']['Timestamps'] is True
     assert jwt['exp'] is not None
 
     context.delete(c)