iguazio.dashboard-controls 1.2.1 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "1.2.1",
+    "version": "1.2.3",
     "main": "dist/js/iguazio.dashboard-controls.js",
     "description": "Collection of resources (such as CSS styles, fonts and images) and AngularJs 1.x components and services to share among different Iguazio repos.",
     "repository": {

package/src/i18n/en/functions.json

@@ -169,6 +169,7 @@
     "LOGGER_DESTINATION": "Logger destination",
     "LOGGER_LEVEL": "Logger level",
     "LOGGING": "Logging",
+    "LOGS_LINES_LIMITATION": "Note: Only the last 10,000 rows are displayed. <br> To download up to 100,000 rows, click on the 'Download' button.",
     "MAX": "Max",
     "MAX_REPLICAS": "Maximum number of replicas (default: {{default}})",
     "MAX_WORKERS": "Max Workers",

package/src/igz_controls/services/control-panel-logs-data.service.js

@@ -53,7 +53,7 @@
                 if (queryParams.timeFrame) {
                     searchFrom = 'now-' + queryParams.timeFrame;
                 } else {
-                    searchFrom = lodash.get(queryParams, 'customTimeFrame.from', '1970-01-01T00:00:00Z');
+                    searchFrom = lodash.get(queryParams, 'customTimeFrame.from');
                     searchTo = lodash.get(queryParams, 'customTimeFrame.to', 'now');
                 }
             }
@@ -114,10 +114,6 @@
                 });
             }
 
-            if (queryParams.trackTotalHits) {
-                config.track_total_hits = true;
-            }
-
             return ElasticsearchService.search(config)
                 .then(function (response) {
                     // Saved log entry can be found in `_source` property
@@ -147,44 +143,47 @@
 
         /**
          * Collects all the logs using chunks, and saved them as an array of strings.
-         * @returns {Promise.<Array.<Object>>} a promise resolving to an array of logs.
+         * @param {Object} queryParams - additional parameters
+         * @param {string} queryParams.query - search query text
+         * @param {string} queryParams.timeFrame - selected time period to show results for
+         * @param {string} [queryParams.lastEntryTimestamp] - time stamp of the last item in a list, used with auto
+         * @returns {Promise.<Array>} a promise resolving to an array of logs.
          */
-        function collectLogs(query) {
+        function collectLogs(queryParams) {
             var keepAlive = '5m';
             var size = 10000;
             var downloadLogsData = [];
-            var createPitConfig = {
-                index: 'filebeat*',
-                keepAlive: keepAlive
-            };
+            var MAX_DOWNLOAD_LOGS = 100000;
 
-            return ElasticSearchDataService.createPit(createPitConfig).then(function (pitId) {
-                return getNextPitLogs(pitId, null);
+            return ElasticSearchDataService.createPit(keepAlive).then(function (pitId) {
+                return getNextChunk(pitId, null);
             });
 
-            function getNextPitLogs(pitId, searchAfter) {
-                return ElasticSearchDataService.getNextPitLogs(size, query, keepAlive, pitId, searchAfter).then(function (response) {
-                    var hits = response.hits.hits;
+            function getNextChunk(pit, searchAfter) {
+                return getNextPitLogs(size, queryParams, keepAlive, pit, searchAfter)
+                    .then(function (response) {
+                        var hits = response.hits.hits;
 
-                    if (hits.length > 0) {
-                        var lastHit = lodash.last(hits);
+                        if (hits.length > 0 && downloadLogsData.length < MAX_DOWNLOAD_LOGS - size) {
+                            var lastHit = lodash.last(hits);
 
-                        downloadLogsData = downloadLogsData.concat(prepareLogs(hits));
+                            downloadLogsData = downloadLogsData.concat(prepareLogs(hits));
 
-                        return getNextPitLogs(response.pit_id, lastHit.sort)
-                    } else {
-                        return downloadLogsData;
-                    }
-                }).catch(function (error) {
-                    throw error;
-                });
+                            return getNextChunk(response.pit_id, lastHit.sort);
+                        } else {
+                            return downloadLogsData;
+                        }
+                    }).catch(function (error) {
+                        throw error;
+                    });
             }
 
             function prepareLogs(logs) {
                 return logs.map(function (logData) {
                     var log = lodash.get(logData, '_source', {});
+                    var level = log.level ? '  (' + log.level + ')  ' : '';
 
-                    return log['@timestamp'] + '  ' + log.name + '  (' + log.level + ')  ' +
+                    return log['@timestamp'] + '  ' + log.name + level +
                         lodash.get(log, 'message', '') + '  ' + JSON.stringify(lodash.get(log, 'more', {}));
                 });
             }
@@ -238,8 +237,8 @@
                 'nuclio-tutorial-normal-user-model-monitoring-controller-6c4gfcv'
             ];
 
-            logs.total_pages = 30000 / perPage;
-            logs.total_logs_count = 30000;
+            logs.total_pages = 10000 / perPage;
+            logs.total_logs_count = 10000;
 
             if (withReplicas) {
                 logs.replicas = replicas;
@@ -249,5 +248,71 @@
 
             return $q.when(logs);
         }
+
+        /**
+         * Gets next part of the logs using Pit Id and search after parameters
+         * @param {number} size - size of the logs to be requested
+         * @param {Object} queryParams - additional parameters
+         * @param {string} queryParams.query - search query text
+         * @param {string} queryParams.timeFrame - selected time period to show results for
+         * @param {string} [queryParams.lastEntryTimestamp] - time stamp of the last item in a list, used with auto
+         * @param {boolean} keepAlive - determines how long the PIT ID should be alive
+         * @param {string} pitId - PIT ID that is needed to get next chunk of logs
+         * @param {Array} searchAfter - An array of identifiers that points to the last provided log
+         * @returns {Promise.<Object>} Elasticsearch logs data.
+         */
+        function getNextPitLogs(size, queryParams, keepAlive, pitId, searchAfter) {
+            var searchFrom = '';
+            var searchTo = 'now';
+
+            if (queryParams.timeFrame) {
+                searchFrom = 'now-' + queryParams.timeFrame;
+            } else {
+                searchFrom = lodash.get(queryParams, 'customTimeFrame.from');
+                searchTo = lodash.get(queryParams, 'customTimeFrame.to', 'now');
+            }
+
+            var config = {
+                size: size,
+                body: {
+                    pit: {
+                        id: pitId,
+                        keep_alive: keepAlive
+                    },
+                    query: {
+                        bool: {
+                            must: [
+                                {
+                                    range: {
+                                        '@timestamp': {
+                                            gte: searchFrom,
+                                            lte: searchTo
+                                        }
+                                    }
+                                },
+                                {
+                                    query_string: {
+                                        query: queryParams.query,
+                                        analyze_wildcard: true,
+                                        default_field: '*'
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    sort: [
+                        {
+                            '@timestamp': 'desc'
+                        }
+                    ]
+                }
+            };
+
+            if (searchAfter) {
+                config.body.search_after = searchAfter;
+            }
+
+            return ElasticsearchService.search(config);
+        }
     }
 }());

package/src/nuclio/functions/version/version-execution-log/version-execution-log.component.js

@@ -28,11 +28,10 @@ such restriction.
             controller: NclVersionExecutionLogController
         });
 
-    function NclVersionExecutionLogController(lodash, $interval, i18next, $i18next, $rootScope, moment, ConfigService,
-                                              ControlPanelLogsDataService, ExportService, LoginService,PaginationService) {
+    function NclVersionExecutionLogController(lodash, $interval, i18next, $i18next, $rootScope, moment, ControlPanelLogsDataService,
+                                              ConfigService, ExportService, LoginService, PaginationService) {
         var ctrl = this;
         var lng = i18next.language;
-        var MAX_DOWNLOAD_LOGS = 2000000;
 
         var refreshInterval = null;
         var initialTimeRange = {
@@ -52,7 +51,7 @@ such restriction.
             }
         };
 
-        ctrl.downloadButtonIsHidden = true;
+        ctrl.downloadButtonIsDisabled = false;
         ctrl.isSplashShowed = {
             value: false
         };
@@ -192,12 +191,6 @@ such restriction.
 
             ctrl.page.size = ctrl.perPageValues[0].id;
 
-            ControlPanelLogsDataService.logsPaginated(0, 100, { query: generateDefaultQuery(), trackTotalHits: true })
-                .then(function (logs) {
-                    if (logs.length > 0) {
-                        ctrl.downloadButtonIsHidden = logs.total_logs_count >= MAX_DOWNLOAD_LOGS;
-                    }
-                });
             applyFilters();
         }
 
@@ -228,10 +221,14 @@ such restriction.
         function downloadLogFiles() {
             stopAutoUpdate();
 
-            return ControlPanelLogsDataService.collectLogs(generateDefaultQuery())
+            ctrl.downloadButtonIsDisabled = true;
+            return ControlPanelLogsDataService.collectLogs(queryParams())
                 .then(function (response) {
                     ExportService.exportLogs(response, ctrl.version.metadata.name);
+                }).finally(function () {
                     startAutoUpdate();
+
+                    ctrl.downloadButtonIsDisabled = false;
                 });
         }
 
@@ -420,25 +417,12 @@ such restriction.
             ctrl.filterQuery = lodash.join(queries, ' AND ');
         }
 
-        /**
-         * Generates query string without additional filters
-         */
-        function generateDefaultQuery() {
-            var queries = ['system-id:"' + ConfigService.systemId + '"', '_exists_:nuclio'];
-
-            if (!lodash.isEmpty(ctrl.version.metadata.name)) {
-                queries.push('name:' + ctrl.version.metadata.name);
-            }
-            return lodash.join(queries, ' AND ');
-        }
-
         /**
          * Generates query params for ordinary request, for example, when page was changed
          * @returns {Object}
          */
         function queryParams() {
             return {
-                trackTotalHits: true,
                 query: ctrl.filterQuery,
                 timeFrame: ctrl.datePreset,
                 customTimeFrame: ctrl.timeRange

package/src/nuclio/functions/version/version-execution-log/version-execution-log.less

@@ -1,7 +1,7 @@
 .ncl-version-execution-log {
   .control-panel-log-color-set();
 
-  min-width: 1200px;
+  min-width: 1250px;
   padding: 24px 25px 22px 41px;
 
   .ncl-version-execution-log-wrapper {
@@ -34,6 +34,10 @@
       transition: @igz-basic-transition;
       height: 100%;
 
+      .limitation-message {
+        line-height: 20px;
+      }
+
       .logs-container {
         padding-bottom: 50px;
       }

package/src/nuclio/functions/version/version-execution-log/version-execution-log.tpl.html

@@ -110,6 +110,9 @@
             <igz-info-page-actions-bar>
                 <div class="igz-action-panel">
                     <div class="actions-list">
+                        <div class="actions-bar-left">
+                            <span class="limitation-message" data-ng-i18next="[html]functions:LOGS_LINES_LIMITATION"></span>
+                        </div>
                         <div class="actions-bar-right">
                             <div class="actions-bar-left actions-buttons-block actions-dropdown-block">
                                 <igz-default-dropdown data-values-array="$ctrl.refreshRate.options"
@@ -126,10 +129,10 @@
                                         data-refresh="$ctrl.searchWithParams($ctrl.page.number, $ctrl.page.size)">
                                 </igz-action-item-refresh>
                             </div>
-                            <div class="actions-bar-left" data-ng-hide="$ctrl.downloadButtonIsHidden">
+                            <div class="actions-bar-left">
                                 <div class="igz-action-item"
                                      data-ng-click="$ctrl.downloadLogFiles()"
-                                     data-ng-class="{'inactive': $ctrl.logsAreDownloading}"
+                                     data-ng-class="{'inactive': $ctrl.logsAreDownloading || $ctrl.downloadButtonIsDisabled}"
                                      data-uib-tooltip="{{ 'common:DOWNLOAD' | i18next }}"
                                      data-tooltip-placement="bottom"
                                      data-tooltip-popup-delay="300"