Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.5.3 utc #184

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

5.5.3 utc #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df5a277
Testing with ES 5.5.2 was okay (i presume 5.5.3 will work too)
derandreasberger Sep 20, 2017
4f9b7c5
Align formatting as much as it makes sense
derandreasberger Sep 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions logtrail.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"es_index_time_offset_in_seconds": 0,
"display_timezone": "local",
"display_timestamp_format": "MMM DD HH:mm:ss",
"display_timestamp_force_sort": false,
"utc_based_timestamp": false,
"max_buckets": 500,
"default_time_range_in_days" : 0,
"max_hosts": 100,
Expand Down
225 changes: 142 additions & 83 deletions public/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,113 +189,167 @@ app.controller('logtrail', function ($scope, kbnUrl, $route, $routeParams,

function updateEventView(events,actions,order) {

updateViewInProgress = true;
$scope.showNoEventsMessage = false;
if(events && events.length > 1) {

// Add parsed timestamp to all events
for (var i = events.length - 1; i >= 0; i--) {
formatEvent(events[i]);
}
updateViewInProgress = true;
$scope.showNoEventsMessage = false;

if (actions.indexOf('reverse') !== -1) {
events.reverse();
}
if (actions.indexOf('overwrite') !== -1) {
$scope.firstEventReached = false;
$scope.events = [];
eventIds.clear();
angular.forEach(events, function (event) {
$scope.events.push(event);
eventIds.add(event.id);
});
$timeout(function () {
//If scrollbar not visible
if (angular.element($document).height() <= angular.element($window).height()) {
$scope.firstEventReached = true;
}
});
}
if (actions.indexOf('append') !== -1) {
//If events are order desc, the reverse the list
if (order === 'desc') {
// Add parsed timestamp to all events
for (var i = events.length - 1; i >= 0; i--) {
formatEvent(events[i]);
}

if (actions.indexOf('reverse') !== -1) {
events.reverse();
}
removeDuplicates(events);
angular.forEach(events, function (event) {
$scope.events.push(event);
eventIds.add(event.id);
});
}
var firstEventId = null;
if (actions.indexOf('prepend') !== -1) {
removeDuplicates(events);
if (events.length > 0) {
//Need to move scrollbar to old event location,
//so note down its id of before model update
firstEventId = $scope.events[0].id;
if (actions.indexOf('overwrite') !== -1) {
$scope.firstEventReached = false;
$scope.events = [];
eventIds.clear();
angular.forEach(events, function (event) {
$scope.events.unshift(event);
$scope.events.push(event);
eventIds.add(event.id);
});
} else {
$scope.firstEventReached = true;
$timeout(function () {
//If scrollbar not visible
if (angular.element($document).height() <= angular.element($window).height()) {
$scope.firstEventReached = true;
}
});
}
}
if (actions.indexOf('append') !== -1) {
//If events are order desc, the reverse the list
if (order === 'desc') {
events.reverse();
}
removeDuplicates(events);

if (actions.indexOf('scrollToTop') !== -1) {
$timeout(function () {
window.scrollTo(0,5);
});
} else if (actions.indexOf('scrollToView') !== -1) {
// Live tail status logic with forced sort
if (selected_index_config.display_timestamp_force_sort && events.length > 0 && $scope.liveTailStatus === 'Live') {

// Only append events if the newest date from incoming events is newer than the oldest of the current events)
if (localeDateStringCompareAsc(events[events.length - 1], $scope.events[0]) > 0) {

angular.forEach(events, function (event) {
$scope.events.push(event);
eventIds.add(event.id);
});

//TODO: how to deal with dates formatted in ways that can be sorted by alphabetical order ?
$scope.events.sort(localeDateStringCompareAsc);

}

} else if(events.length > 0) {

angular.forEach(events, function (event) {
$scope.events.push(event);
eventIds.add(event.id);
});

if (firstEventId !== null) {
//Make sure the old top event in is still in view
$timeout(function () {
var firstEventElement = document.getElementById(firstEventId);
if (firstEventElement !== null) {
var topPos = firstEventElement.offsetTop;
firstEventElement.scrollIntoView();
}
});
}
} else {
//Bring scroll to bottom
$timeout(function () {
window.scrollTo(0,$(document).height());
});
}
var firstEventId = null;
if (actions.indexOf('prepend') !== -1) {
removeDuplicates(events);
if (events.length > 0) {
//Need to move scrollbar to old event location,
//so note down its id of before model update
firstEventId = $scope.events[0].id;
angular.forEach(events, function (event) {
$scope.events.unshift(event);
eventIds.add(event.id);
});
} else {
$scope.firstEventReached = true;
}
}

if ($scope.events.length > 0) {
lastEventTime = Date.create($scope.events[$scope.events.length - 1].timestamp).getTime();
} else {
lastEventTime = null;
}
trimEvents(order);

trimEvents();
if (actions.indexOf('scrollToTop') !== -1) {
$timeout(function () {
window.scrollTo(0,5);
});
} else if (actions.indexOf('scrollToView') !== -1) {

if (firstEventId !== null) {
//Make sure the old top event in is still in view
$timeout(function () {
var firstEventElement = document.getElementById(firstEventId);
if (firstEventElement !== null) {
var topPos = firstEventElement.offsetTop;
firstEventElement.scrollIntoView();
}
});
}
} else {
//Bring scroll to bottom
$timeout(function () {
window.scrollTo(0,$(document).height());
});
}

$timeout(function () {
updateViewInProgress = false;
});
if ($scope.events.length > 0) {

if ($scope.events != null && $scope.events.length === 0) {
$scope.showNoEventsMessage = true;
if ($scope.pickedDateTime != null) {
var timestamp = Date.create($scope.pickedDateTime).getTime();
$scope.noEventErrorStartTime = moment(timestamp).format('MMMM Do YYYY, h:mm:ss a');
if (selected_index_config.utc_based_timestamp) {
lastEventTime = moment.utc($scope.events[$scope.events.length - 1].timestamp);
} else {
lastEventTime = Date.create($scope.events[$scope.events.length - 1].timestamp);
}
} else {
if (selected_index_config.default_time_range_in_days !== 0) {
$scope.noEventErrorStartTime = moment().subtract(
selected_index_config.default_time_range_in_days,'days').startOf('day').format('MMMM Do YYYY, h:mm:ss a');
lastEventTime = null;
}

$timeout(function () {
updateViewInProgress = false;
});

if ($scope.events != null && $scope.events.length === 0) {
$scope.showNoEventsMessage = true;
if ($scope.pickedDateTime != null) {
var timestamp = Date.create($scope.pickedDateTime).getTime();
$scope.noEventErrorStartTime = moment(timestamp).format('MMMM Do YYYY, h:mm:ss a');
} else {
if (selected_index_config.default_time_range_in_days !== 0) {
$scope.noEventErrorStartTime = moment().subtract(
selected_index_config.default_time_range_in_days,'days').startOf('day').format('MMMM Do YYYY, h:mm:ss a');
}
}
}
}
};

/**
* Checks if 'display_timestamp'-field exists, in case it exists it returns a comparator-value based on localCompare-function.
*
* localCompare-function:
* A Number, indicating whether the reference string comes before, after or is the same as the compareString in sort order. Returns one of three values:
* -1 if the reference string is sorted before the compareString
* 0 if the two strings are equal
* 1 if the reference string is sorted after the compareString
*
* @param reference string
* @param compare string
* @return {number}
*/
function localeDateStringCompareAsc(a, b) {
if(a !== undefined && a.display_timestamp !== undefined && b !== undefined) {
return a.display_timestamp.localeCompare(b.display_timestamp);
} else {
return -1;
}
}

function trimEvents() {
var eventCount = $scope.events.length;
if (eventCount > selected_index_config.max_events_to_keep_in_viewer) {
var noOfItemsToDelete = eventCount - selected_index_config.max_events_to_keep_in_viewer;
$scope.events.splice(0, noOfItemsToDelete);
if (order === 'desc') {
$scope.events.splice(0,noOfItemsToDelete);
} else { //remove from bottom
$scope.events.splice(-noOfItemsToDelete);
}
var count = noOfItemsToDelete;
try {
eventIds.forEach(function (eventId) {
Expand Down Expand Up @@ -334,7 +388,12 @@ app.controller('logtrail', function ($scope, kbnUrl, $route, $routeParams,
$location.path('/').search({q: searchText, h: host, t:time, i:selected_index_config.es.default_index});

if ($scope.pickedDateTime != null) {
var timestamp = Date.create($scope.pickedDateTime).getTime();
var timestamp = null;
if (selected_index_config.utc_based_timestamp) {
timestamp = Date.create($scope.pickedDateTime.getUTCDate()).getTime();
} else {
timestamp = Date.create($scope.pickedDateTime).getTime();
}
doSearch('gt','asc', ['overwrite','scrollToTop'],timestamp);
} else {
doSearch(null,'desc', ['overwrite','reverse'],null);
Expand Down Expand Up @@ -574,4 +633,4 @@ uiModules.get('app/logtrail').directive('clickOutside', function ($document) {
});
}
};
});
});