iguazio.dashboard-controls 1.2.3 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "1.2.3",
+    "version": "1.2.5",
     "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/components/log-table-row/log-table-row.component.js

@@ -31,6 +31,7 @@ such restriction.
 
         ctrl.getLogLevel = getLogLevel;
         ctrl.getLogName = getLogName;
+        ctrl.getLogTrimmedName = getLogTrimmedName;
 
         //
         // Public methods
@@ -45,13 +46,19 @@ such restriction.
         }
 
         /**
-         * Get log name display value
-         * @returns {string} the log name display value
+         * Get log full name
+         * @returns {string} the log name
          */
         function getLogName() {
-            var name = lodash.get(ctrl.entryItem, 'name', '');
+            return lodash.get(ctrl.entryItem, 'kubernetes.pod.name', lodash.get(ctrl.entryItem, 'name', ''));
+        }
 
-            return lodash.padEnd(name.substring(0, 15), 15);
+        /**
+         * Get log trimmed name display value
+         * @returns {string} the log name display value
+         */
+        function getLogTrimmedName() {
+            return lodash.padEnd(getLogName().substring(0, 25), 25);
         }
     }
 }());

package/src/igz_controls/components/log-table-row/log-table-row.tpl.html

@@ -3,10 +3,10 @@
     <div class="log-entry">
         <span class="log-entry-time">{{$ctrl.entryItem['@timestamp'] | date : 'yy-MM-dd HH:mm:ss.sss' }}</span>
         <span class="log-entry-name"
-              data-uib-tooltip="{{$ctrl.entryItem.name}}"
+              data-uib-tooltip="{{$ctrl.getLogName()}}"
               data-tooltip-placement="top"
               data-tooltip-popup-delay="200"
-              data-tooltip-append-to-body="true">&nbsp;{{$ctrl.getLogName()}}</span>
+              data-tooltip-append-to-body="true">&nbsp;{{$ctrl.getLogTrimmedName()}}</span>
         <span class="log-entry-level-{{$ctrl.entryItem.level.toLowerCase()}}"
               data-ng-if="$ctrl.entryItem.level">&nbsp;({{$ctrl.getLogLevel()}})</span>
         <span class="log-entry-message">&nbsp;{{$ctrl.entryItem.message}}</span>

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

@@ -4,7 +4,7 @@
     angular.module('iguazio.dashboard-controls')
         .factory('ControlPanelLogsDataService', ControlPanelLogsDataService);
 
-    function ControlPanelLogsDataService($q, lodash, ElasticsearchService, ElasticSearchDataService) {
+    function ControlPanelLogsDataService($q, lodash, ElasticsearchService) {
         return {
             collectLogs: collectLogs,
             entriesPaginated: search,
@@ -146,7 +146,6 @@
          * @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) {
@@ -155,21 +154,25 @@
             var downloadLogsData = [];
             var MAX_DOWNLOAD_LOGS = 100000;
 
-            return ElasticSearchDataService.createPit(keepAlive).then(function (pitId) {
-                return getNextChunk(pitId, null);
+            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(pit, searchAfter) {
-                return getNextPitLogs(size, queryParams, keepAlive, pit, searchAfter)
+            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) {
-                            var lastHit = lodash.last(hits);
-
                             downloadLogsData = downloadLogsData.concat(prepareLogs(hits));
 
-                            return getNextChunk(response.pit_id, lastHit.sort);
+                            return getNextChunk(response._scroll_id);
                         } else {
                             return downloadLogsData;
                         }
@@ -182,8 +185,9 @@
                 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'] + '  ' + log.name + level +
+                    return log['@timestamp'] + '  ' + name + level +
                         lodash.get(log, 'message', '') + '  ' + JSON.stringify(lodash.get(log, 'more', {}));
                 });
             }
@@ -250,18 +254,15 @@
         }
 
         /**
-         * Gets next part of the logs using Pit Id and search after parameters
-         * @param {number} size - size of the logs to be requested
+         * Makes a request to elasticsearch to create search id
+         * @param {boolean} size - logs size
+         * @param {string} keepAlive - sets lifetime for scroll id
          * @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.
+         * @returns {Object}
          */
-        function getNextPitLogs(size, queryParams, keepAlive, pitId, searchAfter) {
+        function createSearch(size, keepAlive, queryParams) {
             var searchFrom = '';
             var searchTo = 'now';
 
@@ -274,11 +275,8 @@
 
             var config = {
                 size: size,
+                scroll: keepAlive,
                 body: {
-                    pit: {
-                        id: pitId,
-                        keep_alive: keepAlive
-                    },
                     query: {
                         bool: {
                             must: [
@@ -308,11 +306,22 @@
                 }
             };
 
-            if (searchAfter) {
-                config.body.search_after = searchAfter;
-            }
-
             return ElasticsearchService.search(config);
         }
+
+        /**
+         * Gets next part of the logs using scroll id parameter
+         * @param {boolean} keepAlive - determines how long the scroll id should be alive
+         * @param {string} scrollId - scroll id that is needed to get next chunk of logs
+         * @returns {Promise.<Object>} Elasticsearch logs data.
+         */
+        function getNextScrollLogs(keepAlive, scrollId) {
+            return ElasticsearchService.scroll({
+                body: {
+                    scroll: keepAlive,
+                    scroll_id: scrollId
+                }
+            });
+        }
     }
 }());

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

@@ -391,7 +391,8 @@ such restriction.
          */
         function generateFilterQuery() {
             var levels = lodash.chain(ctrl.filter.level).pickBy().keys().join(' OR ').value();
-            var queries = ['system-id:"' + ConfigService.systemId + '"', '_exists_:nuclio'];
+            var projectName = lodash.get(ctrl.version, ['metadata', 'labels', 'nuclio.io/project-name']);
+            var queries = ['system-id:"' + ConfigService.systemId + '"', '_exists_:nuclio', 'nuclio.project_name.keyword:' + projectName];
 
             if (!lodash.isEmpty(ctrl.version.metadata.name)) {
                 queries.push('name:' + ctrl.version.metadata.name);

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

@@ -8,7 +8,7 @@
     height: 95%;
 
     .info-page-filters {
-      z-index: 990;
+      z-index: 1000;
 
       .multiple-checkboxes-option {
         margin: 10px 0;