IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-09 23:53:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5383 from alexanderzobnin/issue-4747

Browse Source 
issue #4747 - add date and time units to singlestat panel.
This commit is contained in:
Carl Bergquist 2016-06-20 10:57:08 +02:00 committed by GitHub
commit b94527f661
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
public/app/core/utils/kbn.js
View File

@ -1,8 +1,9 @@
define([
'jquery',
'lodash',
'moment'
],
function($, _) {
function($, _, moment) {
'use strict';
var kbn = {};
@ -580,6 +581,20 @@ function($, _) {
}
};
// Date and time
kbn.toDateTime = function(size, timeScale) {
var datetime = moment(size * timeScale);
return datetime.format('YYYY-MM-DD hh:mm:ss');
};
kbn.valueFormats.datems = function(size) {
return kbn.toDateTime(size, 1000);
};
kbn.valueFormats.dates = function(size) {
return kbn.toDateTime(size, 1);
};
///// FORMAT MENU /////
kbn.getUnitFormats = function() {
@ -618,6 +633,13 @@ function($, _) {
{text: 'days (d)', value: 'd' },
]
},
{
text: 'date and time',
submenu: [
{text: 'date (ms)', value: 'datems'},
{text: 'date (s)', value: 'dates' }
]
},
{
text: 'data',
submenu: [