Skip to content
Open
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions public/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,8 @@ app.controller('logtrail', function ($scope, kbnUrl, $route, $routeParams,
//formats event based on logtrail.json config
function formatEvent(event) {
// displayTimestamp based on configured timezone and format
var displayTimestamp = moment(event.timestamp);
var displayTimestamp = moment(event.timestamp, selectedIndexConfig.moment_format);
if (selectedIndexConfig.display_timestamp_format != null) {
displayTimestamp = moment(event.timestamp);
if (selectedIndexConfig.display_timezone !== 'local') {
displayTimestamp = displayTimestamp.tz(selectedIndexConfig.display_timezone);
}
Expand Down Expand Up @@ -580,4 +579,4 @@ uiModules.get('app/logtrail').directive('compileTemplate', function ($compile, $
});
}
};
});
});