Filter on time. Flatten logs json

1 files changed, 11 insertions, 2 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
index 2702bbdbc6e..746ed8635e0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
@@ -97,7 +97,16 @@ public class ApplicationHandler extends HttpHandler {
         }
 
         if (isLogRequest(request)) {
-            String apiParams = request.hasProperty("numberOf") ? request.getProperty("numberOfLogs") : "";
+            String apiParams = "?";
+            if (request.hasProperty("from")) {
+                apiParams = apiParams + "from=" + request.getProperty("from") + "&";
+            }
+            if (request.hasProperty("to")) {
+                apiParams = apiParams + "to=" + request.getProperty("to");
+            }
+            StringBuilder api = new StringBuilder("?");
+            request.propertyMap().entrySet().stream().forEach(entry -> api.append(entry.getKey() + "=" + entry.getValue() + "&"));
+            apiParams = getPathSuffix(request);
             return applicationRepository.getLogs(applicationId, apiParams);
         }
 
@@ -146,7 +155,7 @@ public class ApplicationHandler extends HttpHandler {
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/clustercontroller/*/status/*",
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*",
                 "http://*/application/v2/tenant/*/application/*",
-                "http://*/application/v2/tenant/*/application/*/logs");
+                "http://*/application/v2/tenant/*/application/*/logs/*");
     }
 
     private static boolean isLogRequest(HttpRequest request) {