iguazio.dashboard-controls 1.2.13 → 1.2.14

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "1.2.13",
+    "version": "1.2.14",
     "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/igz_controls/services/control-panel-logs-data.service.js

@@ -6,7 +6,6 @@
 
     function ControlPanelLogsDataService($q, lodash, ElasticsearchService) {
         return {
-            collectLogs: collectLogs,
             entriesPaginated: search,
             logsPaginated: logsWidthReplicas
         };
@@ -150,58 +149,6 @@
                 });
         }
 
-        /**
-         * 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
-         * @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 createSearch(size, keepAlive, queryParams).then(function (response) {
-                var hits = response.hits.hits;
-
-                if (hits.length > 0) {
-                    downloadLogsData = downloadLogsData.concat(prepareLogs(hits));
-
-                    return getNextChunk(response._scroll_id);
-                }
-            });
-
-            function getNextChunk(scroll) {
-                return getNextScrollLogs(keepAlive, scroll)
-                    .then(function (response) {
-                        var hits = response.hits.hits;
-
-                        if (hits.length > 0 && downloadLogsData.length < MAX_DOWNLOAD_LOGS - size) {
-                            downloadLogsData = downloadLogsData.concat(prepareLogs(hits));
-
-                            return getNextChunk(response._scroll_id);
-                        } 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 + ')  ' : '';
-                    var name = lodash.get(log, 'kubernetes.pod.name', lodash.get(log, 'name', ''));
-
-                    return log['@timestamp'] + '  ' + name + 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.

package/src/igz_controls/services/execution-logs-data.service.js

@@ -0,0 +1,200 @@
+(function () {
+    'use strict';
+
+    angular.module('iguazio.dashboard-controls')
+        .factory('ExecutionLogsDataService', ExecutionLogsDataService);
+
+    function ExecutionLogsDataService($rootScope, $i18next, $q, i18next, lodash, NuclioRestangular) {
+        var lng = i18next.language;
+
+        return {
+            collectLogs: collectLogs,
+            logsPaginated: logsPaginated,
+            getReplicasList: getReplicasList
+        };
+
+        //
+        // Public methods
+        //
+
+        /**
+         * Collects all the logs using chunks, and saved them as an array of strings.
+         * @param {Object} queryParams - additional parameters
+         * @returns {Promise.<Array>} a promise resolving to an array of logs.
+         */
+        function collectLogs(queryParams) {
+            var size = 10000;
+            var downloadLogsData = [];
+            var MAX_DOWNLOAD_LOGS = 100000;
+
+            return getLogsList(0, size, queryParams).then(function (response) {
+                var hits = response.hits.hits;
+
+                if (hits.length > 0) {
+                    downloadLogsData = downloadLogsData.concat(prepareLogs(hits));
+
+                    return getNextChunk(lodash.get(lodash.last(hits), 'sort'));
+                }
+            });
+
+            function getNextChunk(searchAfter) {
+                return getLogsList(0, size, Object.assign(queryParams, {searchAfter}))
+                    .then(function (response) {
+                        var hits = response.hits.hits;
+
+                        if (hits.length > 0 && downloadLogsData.length < MAX_DOWNLOAD_LOGS - size) {
+                            downloadLogsData = downloadLogsData.concat(prepareLogs(hits));
+
+                            return getNextChunk(lodash.get(lodash.last(response.hits.hits), 'sort'));
+                        } else {
+                            if (hits.length > 0) {
+                                downloadLogsData = downloadLogsData.concat(prepareLogs(hits));
+                            }
+
+                            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 + ')  ' : '';
+                    var name = lodash.get(log, 'kubernetes.pod.name', lodash.get(log, 'name', ''));
+
+                    return log['@timestamp'] + '  ' + name + level +
+                        lodash.get(log, 'message', '') + '  ' + JSON.stringify(lodash.get(log, 'more', {}));
+                });
+            }
+        }
+
+        /**
+         * Get latest log entries (used for pagination)
+         * @param {number} page - current page
+         * @param {number} perPage - max items count on a page
+         * @param {Object} queryParams - additional parameters
+         *     update
+         * @returns {Promise} array of log entries
+         */
+        function logsPaginated(page, perPage, queryParams) {
+            return getLogsList(page, perPage, queryParams).then(function (response) {
+                // Saved log entry can be found in `_source` property
+                // For now all additional data from Elasticsearch is not used, so only entries are returned
+                var logs = lodash.map(response.hits.hits, '_source')
+
+                logs.total_logs_count = lodash.get(response, 'hits.total.value', 0);
+                logs.total_pages = Math.ceil(lodash.get(response, 'hits.total.value', 0) / perPage);
+
+                return logs;
+            })
+                .catch(function (error) {
+                    return $q.reject(error);
+                });
+        }
+
+        /**
+         * Provides filtered replicas list
+         * @param {string} projectId - project name
+         * @param {string} funcName - function name
+         * @param {Object} queryParams - additional parameters
+         *     update
+         * @returns {Promise} array of log entries
+         */
+        function getReplicasList(projectId, funcName, queryParams) {
+            var headers = {
+                'Cache-Control': 'no-cache',
+                'Content-Type': 'application/json',
+                'x-nuclio-project-name': projectId
+            };
+            var requestParams = Object.assign(queryParams, {includeOffline: true});
+
+            if (queryParams.timeFilter) {
+                queryParams.timeFilter = {
+                    since: queryParams.timeFilter.from,
+                    until: queryParams.timeFilter.to,
+                    sort: queryParams.timeFilter.sort
+                }
+            }
+
+            return NuclioRestangular.one('functions', funcName)
+                .one('replicas')
+                .get(requestParams, headers)
+                .then(function (response) {
+                    return response.replicas.names.concat(response.offlineReplicas.names);
+                })
+                .catch(function (error) {
+                    var errorMessages = {
+                        '400': $i18next.t('common:ERROR_MSG.PAGINATION.400', { lng: lng }),
+                        '403': $i18next.t('common:ERROR_MSG.PAGINATION.403', { lng: lng }),
+                        '500': $i18next.t('common:ERROR_MSG.ERROR_ON_SERVER_SIDE', { lng: lng }),
+                        'default': $i18next.t('common:ERROR_MSG.UNKNOWN_ERROR', { lng: lng })
+                    };
+
+                    $rootScope.$broadcast('splash-screen_show-error', {
+                        alertText: lodash.get(errorMessages, String(error.status), errorMessages.default) +
+                            ' ' + $i18next.t('common:ERROR_MSG.TRY_REFRESHING_THE_PAGE', { lng: lng })
+                    });
+
+                    return $q.reject(error);
+                });
+        }
+
+        //
+        // Private methods
+        //
+
+        /**
+         * Gets the list of logs based on parameters
+         * @param {number} page - current page
+         * @param {number} perPage - max items count on a page
+         * @param {Object} queryParams - additional parameters
+         *     update
+         * @returns {Promise} array of log entries
+         */
+        function getLogsList(page, perPage, queryParams) {
+            var headers = {
+                'Cache-Control': 'no-cache',
+                'Content-Type': 'application/json',
+                'x-nuclio-project-name': queryParams.projectName
+            };
+
+            var sizeParams = {}
+
+            if (queryParams.searchAfter) {
+                queryParams.searchAfter[1] = '"' + queryParams.searchAfter[1] + '"';
+
+                sizeParams = {
+                    size: perPage,
+                    searchAfter: queryParams.searchAfter
+                }
+            } else {
+                sizeParams = {
+                    size: perPage,
+                    from: page * perPage,
+                }
+            }
+
+            var filters = lodash.omitBy(Object.assign(sizeParams, queryParams.filters), function (value) {
+                return lodash.isObject(value) || lodash.isString(value) ? lodash.isEmpty(value) : false;
+            });
+
+            if (filters.timeFilter) {
+                filters.timeFilter = {
+                    since: filters.timeFilter.from,
+                    until: filters.timeFilter.to,
+                    sort: filters.timeFilter.sort
+                }
+            }
+
+            return NuclioRestangular.one('functions', queryParams.functionName)
+                .one('proxy-logs')
+                .get(filters, headers)
+                .catch(function (error) {
+                    return $q.reject(error);
+                });
+        }
+
+    }
+}());

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

@@ -28,16 +28,12 @@ such restriction.
             controller: NclVersionExecutionLogController
         });
 
-    function NclVersionExecutionLogController(lodash, $interval, i18next, $i18next, $rootScope, moment, ControlPanelLogsDataService,
-                                              ConfigService, ExportService, LoginService, PaginationService) {
+    function NclVersionExecutionLogController(lodash, moment, $interval, i18next, $i18next, $rootScope, ExecutionLogsDataService,
+                                              ExportService, LoginService, PaginationService) {
         var ctrl = this;
         var lng = i18next.language;
 
         var refreshInterval = null;
-        var initialTimeRange = {
-            from: null,
-            to: null
-        };
         var initialDatePreset = '7d';
         var initialReplicas = [];
         var defaultFilter = {
@@ -50,12 +46,12 @@ such restriction.
                 error: false
             }
         };
+        var projectName = '';
 
         ctrl.downloadButtonIsDisabled = false;
         ctrl.isSplashShowed = {
             value: false
         };
-        ctrl.lastEntryTimestamp = null;
         ctrl.logs = {};
         ctrl.replicasList = [];
         ctrl.filter = {};
@@ -69,7 +65,11 @@ such restriction.
         };
         ctrl.datePreset = initialDatePreset;
         ctrl.logsAreDownloading = false;
-        ctrl.timeRange = initialTimeRange;
+        ctrl.timeRange = {
+            from: null,
+            to: null,
+            sort: 'desc'
+        };
         ctrl.searchStates = {};
         ctrl.selectedReplicas = [];
         ctrl.isFiltersShowed = {
@@ -187,11 +187,27 @@ such restriction.
             defaultFilter.name = ctrl.version.metadata.name;
             ctrl.filter = lodash.cloneDeep(defaultFilter);
 
-            PaginationService.addPagination(ctrl, 'logs', 'ControlPanelLogsDataService', onChangePageCallback, true);
+            projectName = lodash.get(ctrl.version, ['metadata', 'labels', 'nuclio.io/project-name']);
 
-            ctrl.page.size = ctrl.perPageValues[0].id;
+            PaginationService.addPagination(ctrl, 'logs', 'ExecutionLogsDataService', onChangePageCallback, true);
 
-            applyFilters();
+            ctrl.timeRange = getInitialTimeRange();
+
+            ctrl.isSplashShowed.value = true;
+            ExecutionLogsDataService.getReplicasList(projectName, ctrl.version.metadata.name, {timeFilter: ctrl.timeRange}).then(function (replicas) {
+                ctrl.replicasList = replicas.map(function (replica) {
+                    return {
+                        label: replica,
+                        id: replica,
+                        value: replica,
+                        checked: true
+                    }
+                });
+                ctrl.selectedReplicas = angular.copy(replicas);
+                initialReplicas = replicas;
+
+                applyFilters();
+            });
         }
 
         /**
@@ -211,7 +227,6 @@ such restriction.
         function applyFilters() {
             stopAutoUpdate();
             calcActiveFilters();
-            generateFilterQuery();
             searchWithParams(0, ctrl.page.size);
         }
 
@@ -222,7 +237,8 @@ such restriction.
             stopAutoUpdate();
 
             ctrl.downloadButtonIsDisabled = true;
-            return ControlPanelLogsDataService.collectLogs(queryParams())
+
+            return ExecutionLogsDataService.collectLogs(queryParams())
                 .then(function (response) {
                     ExportService.exportLogs(response, ctrl.version.metadata.name);
                 }).finally(function () {
@@ -273,8 +289,7 @@ such restriction.
             ctrl.timeRange = lodash.mapValues(dateTimeRange, function (range) {
                 return new Date(range).toISOString();
             });
-
-            ctrl.lastEntryTimestamp = null;
+            ctrl.timeRange.sort = 'desc';
         }
 
         /**
@@ -283,11 +298,30 @@ such restriction.
         function refreshLogs() {
             startAutoUpdate();
 
-            ControlPanelLogsDataService.logsPaginated(ctrl.page.number, ctrl.page.size, queryParams())
-                .then(function (logs) {
-                    if (logs.length > 0) {
-                        ctrl.logs = lodash.cloneDeep(logs);
-                    }
+            ctrl.isSplashShowed.value = true
+
+            ExecutionLogsDataService.getReplicasList(projectName, ctrl.version.metadata.name, {timeFilter: ctrl.timeRange})
+                .then(function (replicas) {
+                    ctrl.replicasList = replicas.map(function (replica) {
+                        return {
+                            label: replica,
+                            id: replica,
+                            value: replica,
+                            checked: true
+                        }
+                    });
+
+                    initialReplicas = replicas;
+
+                    return ExecutionLogsDataService.logsPaginated(ctrl.page.number, ctrl.page.size, queryParams())
+                        .then(function (logs) {
+                            if (logs.length > 0) {
+                                ctrl.logs = lodash.cloneDeep(logs);
+                            }
+                        });
+                })
+                .finally(function () {
+                    ctrl.isSplashShowed.value = false;
                 });
         }
 
@@ -296,7 +330,7 @@ such restriction.
          */
         function resetFilters() {
             ctrl.applyIsDisabled = false;
-            ctrl.timeRange = initialTimeRange;
+            ctrl.timeRange = getInitialTimeRange();
             ctrl.datePreset = initialDatePreset;
             ctrl.selectedReplicas = initialReplicas;
 
@@ -336,7 +370,7 @@ such restriction.
                 return;
             }
 
-            ControlPanelLogsDataService.logsPaginated(ctrl.page.number, ctrl.page.size, queryParamsAutoUpdate())
+            ExecutionLogsDataService.logsPaginated(ctrl.page.number, ctrl.page.size, queryParams())
                 .then(function (logs) {
                     if (logs.length > 0) {
                         ctrl.logs = lodash.cloneDeep(logs);
@@ -365,79 +399,27 @@ such restriction.
          * Updates latest timestamp when new data received and generates replicas list
          */
         function onChangePageCallback() {
-            if (ctrl.logs.length > 0) {
-                ctrl.lastEntryTimestamp = ctrl.logs[0].time;
-
-                if (ctrl.logs.replicas) {
-                    ctrl.replicasList = ctrl.logs.replicas.map(function (replica) {
-                        return {
-                            label: replica,
-                            id: replica,
-                            value: replica,
-                            checked: true
-                        }
-                    });
-                    ctrl.selectedReplicas = angular.copy(ctrl.logs.replicas);
-                    initialReplicas = ctrl.logs.replicas;
-                }
-            }
-
             startAutoUpdate();
         }
 
-        /**
-         * Generates query string from all filters
-         */
-        function generateFilterQuery() {
-            var levels = lodash.chain(ctrl.filter.level).pickBy().keys().join(' OR ').value();
-            var projectName = lodash.get(ctrl.version, ['metadata', 'labels', 'nuclio.io/project-name']);
-            var projectFilter = '(nuclio.project_name.keyword:' + projectName + ' OR nuclio.project_name:' + projectName + ')';
-            var queries = ['system-id:"' + ConfigService.systemId + '"', '_exists_:nuclio', projectFilter];
-
-            if (ctrl.selectedReplicas.length && ctrl.selectedReplicas.length !== initialReplicas.length) {
-                var replicas = ctrl.selectedReplicas.join(' OR ');
-
-                queries.push('kubernetes.pod.name:(' + replicas + ')');
-            }
-
-            if (!lodash.isEmpty(ctrl.filter.message)) {
-                // Escape reserved characters: + - = && || > < ! ( ) { } [ ] ^ " ~ * ? : \ /
-                var escapedMessage = ctrl.filter.message.replace(/[+\-=&|!(){}[\]^"~*?:\\/]/g, '\\$&')
-                    .replace(/<|>/g, '');
-                queries.push('(message:' + escapedMessage + ' OR more:' + escapedMessage + ')');
-            }
-
-            if (!lodash.isEmpty(levels)) {
-                queries.push('level:(' + levels + ')');
-            }
-
-            ctrl.filterQuery = lodash.join(queries, ' AND ');
-            ctrl.filterName = ctrl.version.metadata.name;
-        }
-
         /**
          * Generates query params for ordinary request, for example, when page was changed
          * @returns {Object}
          */
         function queryParams() {
             return {
-                query: ctrl.filterQuery,
-                filterName: ctrl.filterName,
-                timeFrame: ctrl.datePreset,
-                customTimeFrame: ctrl.timeRange
+                functionName: ctrl.version.metadata.name,
+                projectName,
+                filters: {
+                    substring: ctrl.filter.message.replace(/[+\-=&|!(){}[\]^"~*?:\\/]/g, '\\$&')
+                        .replace(/<|>/g, ''),
+                    logLevels: lodash.chain(ctrl.filter.level).pickBy().keys().value(),
+                    replicaNames: ctrl.selectedReplicas,
+                    timeFilter: ctrl.timeRange
+                }
             };
         }
 
-        /**
-         * Generates query params for auto update request
-         * @returns {Object}
-         */
-        function queryParamsAutoUpdate() {
-            return lodash.defaults(queryParams(), {
-                lastEntryTimestamp: ctrl.lastEntryTimestamp
-            });
-        }
-
         /**
          * Starts auto update process
          * @param {bool} [force] - used for making first update immediately after refreshInterval is created
@@ -466,5 +448,17 @@ such restriction.
                 refreshInterval = null;
             }
         }
+
+        /**
+         * Provides initial time range
+         */
+        function getInitialTimeRange() {
+            var weekDate = ctrl.customDatePresets['7d'].getRange();
+
+            return {
+                from: weekDate.from.toISOString(),
+                sort: 'desc'
+            };
+        }
     }
 }());

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

@@ -28,8 +28,7 @@
                                       data-type="control"
                                       data-rule-type="message"
                                       data-search-states="$ctrl.searchStates"
-                                      data-search-callback="$ctrl.onQueryChanged(searchQuery, ruleType)"
-                                      data-on-search-submit="$ctrl.applyFilters()">
+                                      data-search-callback="$ctrl.onQueryChanged(searchQuery, ruleType)">
                     </igz-search-input>
                 </div>
 
@@ -125,8 +124,7 @@
                             <div class="actions-bar-left">
                                 <igz-action-item-refresh
                                         data-is-disabled="$ctrl.isFunctionDeploying()"
-
-                                        data-refresh="$ctrl.searchWithParams($ctrl.page.number, $ctrl.page.size)">
+                                        data-refresh="$ctrl.refreshLogs()">
                                 </igz-action-item-refresh>
                             </div>
                             <div class="actions-bar-left">

package/src/nuclio/functions/version/version.component.js

@@ -35,13 +35,12 @@ such restriction.
             controller: NclVersionController
         });
 
-    function NclVersionController($i18next, $interval, $injector, $rootScope, $scope, $state, $stateParams, $transitions, $timeout,
+    function NclVersionController($i18next, $interval, $rootScope, $scope, $state, $stateParams, $transitions, $timeout,
                                   i18next, lodash, ngDialog, ConfigService, DialogsService, ExportService,
                                   FunctionsService, GeneralDataService, NuclioHeaderService,
                                   VersionHelperService) {
         var ctrl = this;
         var deregisterFunction = null;
-        var servicesService = null;
         var interval = null;
         var lng = i18next.language;
 
@@ -228,10 +227,6 @@ such restriction.
                 }
             });
 
-            if ($injector.has('ServicesService')) {
-                servicesService = $injector.get('ServicesService')
-            }
-
             setImageNamePrefixTemplate();
             setIngressHost();
             initLogTabs();
@@ -687,18 +682,11 @@ such restriction.
          * Checks if the "Execution log" tab should be shown
          */
         function initLogTabs() {
-            if (lodash.get(ConfigService, 'url.elasticsearch.path', '') && servicesService) {
-                servicesService.getServices().then(function (result) {
-                    var services = result.services;
-                    var logForwarderService = lodash.find(services, ['spec.name', 'log-forwarder']);
-
-                    if (servicesService.isEnabled(logForwarderService)) {
-                        ctrl.navigationTabsConfig.push({
-                            tabName: $i18next.t('functions:EXECUTION_LOG', { lng: lng }),
-                            id: 'execution-log',
-                            uiRoute: 'app.project.function.edit.execution-log'
-                        });
-                    }
+            if (lodash.get(ConfigService, 'nuclio.defaultProxyLogsSource', '') === 'elasticsearch') {
+                ctrl.navigationTabsConfig.push({
+                    tabName: $i18next.t('functions:EXECUTION_LOG', { lng: lng }),
+                    id: 'execution-log',
+                    uiRoute: 'app.project.function.edit.execution-log'
                 });
             }
         }