feat(core, jdbc, webserver): allow to filter logs by triggerId

Part-of: #4245
kestra-io · Jul 15, 2024 · 0125d50 · 0125d50
1 parent 2416760
commit 0125d50
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/core/src/main/java/io/kestra/core/repositories/LogRepositoryInterface.java b/core/src/main/java/io/kestra/core/repositories/LogRepositoryInterface.java
@@ -50,6 +50,7 @@ ArrayListTotal<LogEntry> find(
         @Nullable String tenantId,
         @Nullable String namespace,
         @Nullable String flowId,
+        @Nullable String triggerId,
         @Nullable Level minLevel,
         @Nullable ZonedDateTime startDate,
         @Nullable ZonedDateTime endDate

diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractLogRepositoryTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractLogRepositoryTest.java
@@ -40,23 +40,23 @@ private static LogEntry.LogEntryBuilder logEntry(Level level) {
     void all() {
         LogEntry.LogEntryBuilder builder = logEntry(Level.INFO);
 
-        ArrayListTotal<LogEntry> find = logRepository.find(Pageable.UNPAGED, null, null, null, null, null, null, null);
+        ArrayListTotal<LogEntry> find = logRepository.find(Pageable.UNPAGED, null, null, null, null, null, null, null, null);
         assertThat(find.size(), is(0));
 
         LogEntry save = logRepository.save(builder.build());
 
-        find = logRepository.find(Pageable.UNPAGED, "doe", null, null, null, null, null, null);
+        find = logRepository.find(Pageable.UNPAGED, "doe", null, null, null, null, null, null, null);
         assertThat(find.size(), is(1));
         assertThat(find.getFirst().getExecutionId(), is(save.getExecutionId()));
 
-        find = logRepository.find(Pageable.UNPAGED,  "doe", null, null, null, Level.WARN,null,  null);
+        find = logRepository.find(Pageable.UNPAGED,  "doe", null, null, null, null, Level.WARN,null,  null);
         assertThat(find.size(), is(0));
 
-        find = logRepository.find(Pageable.UNPAGED, null, null, null, null, null, null, null);
+        find = logRepository.find(Pageable.UNPAGED, null, null, null, null, null, null, null, null);
         assertThat(find.size(), is(1));
         assertThat(find.getFirst().getExecutionId(), is(save.getExecutionId()));
 
-        logRepository.find(Pageable.UNPAGED, "kestra-io/kestra", null, null, null, null, null, null);
+        logRepository.find(Pageable.UNPAGED, "kestra-io/kestra", null, null, null, null, null, null, null);
         assertThat(find.size(), is(1));
         assertThat(find.getFirst().getExecutionId(), is(save.getExecutionId()));
 

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcLogRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcLogRepository.java
@@ -33,12 +33,14 @@ public AbstractJdbcLogRepository(io.kestra.jdbc.AbstractJdbcRepository<LogEntry>
 
     abstract protected Condition findCondition(String query);
 
+    @Override
     public ArrayListTotal<LogEntry> find(
         Pageable pageable,
         @Nullable String query,
         @Nullable String tenantId,
         @Nullable String namespace,
         @Nullable String flowId,
+        @Nullable String triggerId,
         @Nullable Level minLevel,
         @Nullable ZonedDateTime startDate,
         @Nullable ZonedDateTime endDate
@@ -54,7 +56,7 @@ public ArrayListTotal<LogEntry> find(
                     .from(this.jdbcRepository.getTable())
                     .where(this.defaultFilter(tenantId));
 
-                this.filter(select, query, namespace, flowId, minLevel, startDate , endDate);
+                this.filter(select, query, namespace, flowId, triggerId, minLevel, startDate , endDate);
 
                 return this.jdbcRepository.fetchPage(context, select, pageable);
             });
@@ -65,6 +67,7 @@ private <T extends Record> SelectConditionStep<T> filter(
         @Nullable String query,
         @Nullable String namespace,
         @Nullable String flowId,
+        @Nullable String triggerId,
         @Nullable Level minLevel,
         @Nullable ZonedDateTime startDate,
         @Nullable ZonedDateTime endDate
@@ -77,6 +80,10 @@ private <T extends Record> SelectConditionStep<T> filter(
             select = select.and(field("flow_id").eq(flowId));
         }
 
+        if (triggerId != null) {
+            select = select.and(field("trigger_id").eq(triggerId));
+        }
+
         if (minLevel != null) {
             select = select.and(minLevel(minLevel));
         }
@@ -96,6 +103,7 @@ private <T extends Record> SelectConditionStep<T> filter(
         return select;
     }
 
+    @Override
     public List<LogStatistics> statistics(
         @Nullable String query,
         @Nullable String tenantId,
@@ -130,7 +138,7 @@ public List<LogStatistics> statistics(
                     .from(this.jdbcRepository.getTable())
                     .where(this.defaultFilter(tenantId));
 
-                this.filter(select, query, namespace, flowId, minLevel, startDate, endDate);
+                this.filter(select, query, namespace, flowId, null, minLevel, startDate, endDate);
 
                 List<Field<?>> groupFields = new ArrayList<>(fields);
                 groupFields.addAll(dateFields);

diff --git a/webserver/src/main/java/io/kestra/webserver/controllers/api/LogController.java b/webserver/src/main/java/io/kestra/webserver/controllers/api/LogController.java
@@ -58,14 +58,15 @@ public PagedResults<LogEntry> find(
         @Parameter(description = "The sort of current page") @Nullable @QueryValue List<String> sort,
         @Parameter(description = "A namespace filter prefix") @Nullable @QueryValue String namespace,
         @Parameter(description = "A flow id filter") @Nullable @QueryValue String flowId,
+        @Parameter(description = "A trigger id filter") @Nullable @QueryValue String triggerId,
         @Parameter(description = "The min log level filter") @Nullable @QueryValue Level minLevel,
         @Parameter(description = "The start datetime") @Nullable @Format("yyyy-MM-dd'T'HH:mm[:ss][.SSS][XXX]") @QueryValue ZonedDateTime startDate,
         @Parameter(description = "The end datetime") @Nullable @Format("yyyy-MM-dd'T'HH:mm[:ss][.SSS][XXX]") @QueryValue ZonedDateTime endDate
     ) {
         validateTimeline(startDate, endDate);
 
         return PagedResults.of(
-            logRepository.find(PageableUtils.from(page, size, sort), query, tenantService.resolveTenant(), namespace, flowId, minLevel, startDate, endDate)
+            logRepository.find(PageableUtils.from(page, size, sort), query, tenantService.resolveTenant(), namespace, flowId, triggerId, minLevel, startDate, endDate)
         );
     }