iguazio.dashboard-controls 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "1.2.0",
+    "version": "1.2.2",
     "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": "Only the latest 10000 lines are displayed. <br> To access the full log history, download the complete log file.",
     "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

@@ -4,8 +4,9 @@
     angular.module('iguazio.dashboard-controls')
         .factory('ControlPanelLogsDataService', ControlPanelLogsDataService);
 
-    function ControlPanelLogsDataService($q, lodash, ElasticsearchService) {
+    function ControlPanelLogsDataService($q, lodash, ElasticsearchService, ElasticSearchDataService) {
         return {
+            collectLogs: collectLogs,
             entriesPaginated: search,
             logsPaginated: logsWidthReplicas
         };
@@ -52,8 +53,8 @@
                 if (queryParams.timeFrame) {
                     searchFrom = 'now-' + queryParams.timeFrame;
                 } else {
-                    searchFrom = queryParams.customTimeFrame.from
-                    searchTo =  lodash.get(queryParams, 'customTimeFrame.to', 'now')
+                    searchFrom = lodash.get(queryParams, 'customTimeFrame.from');
+                    searchTo = lodash.get(queryParams, 'customTimeFrame.to', 'now');
                 }
             }
 
@@ -140,6 +141,53 @@
                 });
         }
 
+        /**
+         * Collects all the logs using chunks, and saved them as an array of strings.
+         * @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(queryParams) {
+            var keepAlive = '5m';
+            var size = 10000;
+            var downloadLogsData = [];
+            var MAX_DOWNLOAD_LOGS = 100000;
+
+            return ElasticSearchDataService.createPit(keepAlive).then(function (pitId) {
+                return getNextChunk(pitId, null);
+            });
+
+            function getNextChunk(pit, searchAfter) {
+                return getNextPitLogs(size, queryParams, keepAlive, pit, searchAfter)
+                    .then(function (response) {
+                        var hits = response.hits.hits;
+
+                        if (hits.length > 0 && downloadLogsData.length < MAX_DOWNLOAD_LOGS - size) {
+                            var lastHit = lodash.last(hits);
+
+                            downloadLogsData = downloadLogsData.concat(prepareLogs(hits));
+
+                            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', {});
+
+                    return log['@timestamp'] + '  ' + log.name + '  (' + log.level + ')  ' +
+                        lodash.get(log, 'message', '') + '  ' + JSON.stringify(lodash.get(log, 'more', {}));
+                });
+            }
+        }
+
         /**
          * Mocks the real search function without the need for a running Elasticsearch service, for development
          * purposes.
@@ -188,16 +236,82 @@
                 '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;
             }
 
-            console.info(queryParams);
+            // console.info(queryParams);
 
             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,11 @@ 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 refreshInterval = null;
         var initialTimeRange = {
             from: null,
@@ -51,6 +51,7 @@ such restriction.
             }
         };
 
+        ctrl.downloadButtonIsDisabled = false;
         ctrl.isSplashShowed = {
             value: false
         };
@@ -67,6 +68,7 @@ such restriction.
             }
         };
         ctrl.datePreset = initialDatePreset;
+        ctrl.logsAreDownloading = false;
         ctrl.timeRange = initialTimeRange;
         ctrl.searchStates = {};
         ctrl.selectedReplicas = [];
@@ -164,7 +166,7 @@ such restriction.
         ctrl.$onDestroy = onDestroy;
 
         ctrl.applyFilters = applyFilters;
-        // ctrl.downloadLogFiles = downloadLogFiles;
+        ctrl.downloadLogFiles = downloadLogFiles;
         ctrl.onCheckboxChange = onCheckboxChange;
         ctrl.onRefreshRateChange = onRefreshRateChange;
         ctrl.onTimeRangeChange = onTimeRangeChange;
@@ -213,18 +215,22 @@ such restriction.
             searchWithParams(0, ctrl.page.size);
         }
 
-        // /**
-        //  * Downloads log to the file
-        //  */
-        // function downloadLogFiles() {
-        //     ExportService.exportLogs(prepareLogs(), ctrl.version.metadata.name);
-        //
-        //     function prepareLogs() {
-        //         return ctrl.logs.map(function (log) {
-        //             return log['@timestamp'] + '  ' + log.name + '  (' + log.level + ')  ' + log.message + '  ' + log.more;
-        //         });
-        //     }
-        // }
+        /**
+         * Downloads log to the file
+         */
+        function downloadLogFiles() {
+            stopAutoUpdate();
+
+            ctrl.downloadButtonIsDisabled = true;
+            return ControlPanelLogsDataService.collectLogs(queryParams())
+                .then(function (response) {
+                    ExportService.exportLogs(response, ctrl.version.metadata.name);
+                }).finally(function () {
+                    startAutoUpdate();
+
+                    ctrl.downloadButtonIsDisabled = false;
+                });
+        }
 
         /**
          * Triggered when search text was changed
@@ -277,7 +283,7 @@ such restriction.
         function refreshLogs() {
             startAutoUpdate();
 
-            ControlPanelLogsDataService.logsPaginated(ctrl.page.number, ctrl.page.size, queryParams(), true)
+            ControlPanelLogsDataService.logsPaginated(ctrl.page.number, ctrl.page.size, queryParams())
                 .then(function (logs) {
                     if (logs.length > 0) {
                         ctrl.logs = lodash.cloneDeep(logs);
@@ -330,13 +336,12 @@ such restriction.
                 return;
             }
 
-            ControlPanelLogsDataService.logsPaginated(ctrl.page.number, ctrl.page.size, queryParamsAutoUpdate(), true)
+            ControlPanelLogsDataService.logsPaginated(ctrl.page.number, ctrl.page.size, queryParamsAutoUpdate())
                 .then(function (logs) {
                     if (logs.length > 0) {
                         ctrl.logs = lodash.cloneDeep(logs);
                         ctrl.page.total = logs['total_pages'];
 
-                        // set lastItemTimeStamp and start autoupdate
                         onChangePageCallback();
                     }
                 });

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,16 +129,17 @@
                                         data-refresh="$ctrl.searchWithParams($ctrl.page.number, $ctrl.page.size)">
                                 </igz-action-item-refresh>
                             </div>
-<!--                            <div class="actions-bar-left">-->
-<!--                                <div class="igz-action-item"-->
-<!--                                     data-ng-click="$ctrl.downloadLogFiles()"-->
-<!--                                     data-uib-tooltip="{{ 'common:DOWNLOAD' | i18next }}"-->
-<!--                                     data-tooltip-placement="bottom"-->
-<!--                                     data-tooltip-popup-delay="300"-->
-<!--                                     data-tooltip-append-to-body="true">-->
-<!--                                    <div class="action-icon igz-icon-download"></div>-->
-<!--                                </div>-->
-<!--                            </div>-->
+                            <div class="actions-bar-left">
+                                <div class="igz-action-item"
+                                     data-ng-click="$ctrl.downloadLogFiles()"
+                                     data-ng-class="{'inactive': $ctrl.logsAreDownloading || $ctrl.downloadButtonIsDisabled}"
+                                     data-uib-tooltip="{{ 'common:DOWNLOAD' | i18next }}"
+                                     data-tooltip-placement="bottom"
+                                     data-tooltip-popup-delay="300"
+                                     data-tooltip-append-to-body="true">
+                                    <div class="action-icon igz-icon-download"></div>
+                                </div>
+                            </div>
                             <igz-actions-panes data-filters-toggle-method="$ctrl.toggleFilters()"
                                                data-show-filter-icon="true"
                                                data-filters-counter="$ctrl.activeFilters"