Commit d8be2f1e by Carl Bergquist Committed by GitHub

Merge pull request #5389 from grafana/revert-5383-issue-4747

Revert "issue #4747 - add date and time units to singlestat panel."
parents 8efa94e4 b6f9d9fe
define([ define([
'jquery', 'jquery',
'lodash', 'lodash',
'moment'
], ],
function($, _, moment) { function($, _) {
'use strict'; 'use strict';
var kbn = {}; var kbn = {};
...@@ -581,20 +580,6 @@ function($, _, moment) { ...@@ -581,20 +580,6 @@ function($, _, moment) {
} }
}; };
// 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 ///// ///// FORMAT MENU /////
kbn.getUnitFormats = function() { kbn.getUnitFormats = function() {
...@@ -634,13 +619,6 @@ function($, _, moment) { ...@@ -634,13 +619,6 @@ function($, _, moment) {
] ]
}, },
{ {
text: 'date and time',
submenu: [
{text: 'date (ms)', value: 'datems'},
{text: 'date (s)', value: 'dates' }
]
},
{
text: 'data', text: 'data',
submenu: [ submenu: [
{text: 'bits', value: 'bits' }, {text: 'bits', value: 'bits' },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment