add filter time and word name in get logs

core/api-server/api/graphql/resolvers.js

@@ -80,8 +80,8 @@ class GraphqlResolvers {
     }
 
     async queryLogs(query) {
-        const { taskId, podName, source, nodeKind, logMode, pageNum, sort, limit } = query;
-        const logs = await logsQueries.getLogs({ taskId, podName, source, nodeKind, logMode, pageNum, sort, limit });
+        const { taskId, podName, source, nodeKind, logMode, pageNum, sort, limit, searchWord, taskTime } = query;
+        const logs = await logsQueries.getLogs({ taskId, podName, source, nodeKind, logMode, pageNum, sort, limit, searchWord, taskTime });
         return logs;
     }
 

core/api-server/api/graphql/schemas/log-schema.js

@@ -10,7 +10,7 @@ type LogsMainType { logs: [Logs ],podStatus: String }
 
 extend type Query {
 
-    logsByQuery(podName: String!,taskId:String,source:String,nodeKind:String,logMode:String): LogsMainType
+    logsByQuery(podName: String!,taskId:String,source:String,nodeKind:String,logMode:String,searchWord:String, taskTime:String): LogsMainType
 }
 
 `;

core/api-server/api/task-logs/es.js

@@ -36,7 +36,7 @@ class EsLogs {
         return search;
     }
 
-    async getLogs({ taskId, nodeKind, podName, logMode, sort, limit, skip }) {
+    async getLogs({ taskId, nodeKind, podName, logMode, sort, limit, skip, searchWord, taskTime }) {
         const query = [];
         if (taskId) {
             query.push(`meta.internal.taskId: "${taskId}"`);
@@ -56,6 +56,9 @@ class EsLogs {
                 query.push(searchComponent);
             }
         }
+        if (searchWord) {
+            query.push(`${searchWord}*`);
+        }
 
         const queryString = query.join(' AND ');
 
@@ -78,6 +81,21 @@ class EsLogs {
                 }
             }
         };
+
+        // add range date
+        if (taskTime) {
+            body.query.bool.must.push({
+                range: {
+                    '@timestamp': {
+                        gte: taskTime,
+                        lt: 'now/d'
+                    }
+
+                }
+
+            });
+        }
+
         const logs = await this._client.search({
             index: this._index,
             type: this._type,

core/api-server/api/task-logs/logs.js

@@ -1,4 +1,3 @@
-const orderBy = require('lodash.orderby');
 const log = require('@hkube/logger').GetLogFromContainer();
 const { logModes, podStatus } = require('@hkube/consts');
 const elasticSearch = require('./es');
@@ -53,7 +52,10 @@ class Logs {
         logMode = logModes.ALGORITHM,
         pageNum = 0,
         sort = sortOrder.desc,
-        limit = LOGS_LIMIT }) {
+        limit = LOGS_LIMIT,
+        searchWord,
+        taskTime
+    }) {
         let logs = [];
         const logsData = {};
         try {
@@ -96,9 +98,11 @@ class Logs {
                     skip,
                     ageNum: pageNumber,
                     limit: sizeLimit,
+                    searchWord,
+                    taskTime
                 });
                 logs = logs.map(this._format);
-                logs = orderBy(logs, l => l.timestamp, sortOrder.asc);
+
                 logsData.logs = logs;
             }
         }