+
+
No datapoints No datapoints returned from metric query
-
+
+
+
+
Datapoints outside time range
Can be caused by timezone mismatch between browser and graphite server
diff --git a/public/app/plugins/panel/pluginlist/plugin.json b/public/app/plugins/panel/pluginlist/plugin.json
index be6ae9a5985..72f5ea06d25 100644
--- a/public/app/plugins/panel/pluginlist/plugin.json
+++ b/public/app/plugins/panel/pluginlist/plugin.json
@@ -7,7 +7,7 @@
"author": {
"name": "Grafana Project",
"url": "http://grafana.org"
-},
+ },
"logos": {
"small": "img/icn-dashlist-panel.svg",
"large": "img/icn-dashlist-panel.svg"
diff --git a/public/test/core/time_series_specs.js b/public/test/core/time_series_specs.js
index 034e872e2f1..2b325cf6d46 100644
--- a/public/test/core/time_series_specs.js
+++ b/public/test/core/time_series_specs.js
@@ -56,6 +56,38 @@ define([
});
});
+ describe('When checking if ms resolution is needed', function() {
+ describe('msResolution with second resolution timestamps', function() {
+ beforeEach(function() {
+ series = new TimeSeries({datapoints: [[45, 1234567890], [60, 1234567899]]});
+ });
+
+ it('should set hasMsResolution to false', function() {
+ expect(series.hasMsResolution).to.be(false);
+ });
+ });
+
+ describe('msResolution with millisecond resolution timestamps', function() {
+ beforeEach(function() {
+ series = new TimeSeries({datapoints: [[55, 1236547890001], [90, 1234456709000]]});
+ });
+
+ it('should show millisecond resolution tooltip', function() {
+ expect(series.hasMsResolution).to.be(true);
+ });
+ });
+
+ describe('msResolution with millisecond resolution timestamps but with trailing zeroes', function() {
+ beforeEach(function() {
+ series = new TimeSeries({datapoints: [[45, 1234567890000], [60, 1234567899000]]});
+ });
+
+ it('should not show millisecond resolution tooltip', function() {
+ expect(series.hasMsResolution).to.be(false);
+ });
+ });
+ });
+
describe('can detect if series contains ms precision', function() {
var fakedata;
diff --git a/public/test/core/utils/kbn_specs.js b/public/test/core/utils/kbn_specs.js
index 959b176b06c..95bef57ef1a 100644
--- a/public/test/core/utils/kbn_specs.js
+++ b/public/test/core/utils/kbn_specs.js
@@ -132,62 +132,64 @@ define([
describe('calculateInterval', function() {
it('1h 100 resultion', function() {
var range = { from: dateMath.parse('now-1h'), to: dateMath.parse('now') };
- var str = kbn.calculateInterval(range, 100, null);
- expect(str).to.be('30s');
+ var res = kbn.calculateInterval(range, 100, null);
+ expect(res.interval).to.be('30s');
});
it('10m 1600 resolution', function() {
var range = { from: dateMath.parse('now-10m'), to: dateMath.parse('now') };
- var str = kbn.calculateInterval(range, 1600, null);
- expect(str).to.be('500ms');
+ var res = kbn.calculateInterval(range, 1600, null);
+ expect(res.interval).to.be('500ms');
+ expect(res.intervalMs).to.be(500);
});
it('fixed user interval', function() {
var range = { from: dateMath.parse('now-10m'), to: dateMath.parse('now') };
- var str = kbn.calculateInterval(range, 1600, '10s');
- expect(str).to.be('10s');
+ var res = kbn.calculateInterval(range, 1600, '10s');
+ expect(res.interval).to.be('10s');
+ expect(res.intervalMs).to.be(10000);
});
it('short time range and user low limit', function() {
var range = { from: dateMath.parse('now-10m'), to: dateMath.parse('now') };
- var str = kbn.calculateInterval(range, 1600, '>10s');
- expect(str).to.be('10s');
+ var res = kbn.calculateInterval(range, 1600, '>10s');
+ expect(res.interval).to.be('10s');
});
it('large time range and user low limit', function() {
- var range = { from: dateMath.parse('now-14d'), to: dateMath.parse('now') };
- var str = kbn.calculateInterval(range, 1000, '>10s');
- expect(str).to.be('20m');
+ var range = {from: dateMath.parse('now-14d'), to: dateMath.parse('now')};
+ var res = kbn.calculateInterval(range, 1000, '>10s');
+ expect(res.interval).to.be('20m');
});
-
+
it('10s 900 resolution and user low limit in ms', function() {
var range = { from: dateMath.parse('now-10s'), to: dateMath.parse('now') };
- var str = kbn.calculateInterval(range, 900, '>15ms');
- expect(str).to.be('15ms');
+ var res = kbn.calculateInterval(range, 900, '>15ms');
+ expect(res.interval).to.be('15ms');
});
});
describe('hex', function() {
- it('positive integer', function() {
- var str = kbn.valueFormats.hex(100, 0);
- expect(str).to.be('64');
- });
- it('negative integer', function() {
- var str = kbn.valueFormats.hex(-100, 0);
- expect(str).to.be('-64');
- });
- it('null', function() {
- var str = kbn.valueFormats.hex(null, 0);
- expect(str).to.be('');
- });
- it('positive float', function() {
- var str = kbn.valueFormats.hex(50.52, 1);
- expect(str).to.be('32.8');
- });
- it('negative float', function() {
- var str = kbn.valueFormats.hex(-50.333, 2);
- expect(str).to.be('-32.547AE147AE14');
- });
+ it('positive integer', function() {
+ var str = kbn.valueFormats.hex(100, 0);
+ expect(str).to.be('64');
+ });
+ it('negative integer', function() {
+ var str = kbn.valueFormats.hex(-100, 0);
+ expect(str).to.be('-64');
+ });
+ it('null', function() {
+ var str = kbn.valueFormats.hex(null, 0);
+ expect(str).to.be('');
+ });
+ it('positive float', function() {
+ var str = kbn.valueFormats.hex(50.52, 1);
+ expect(str).to.be('32.8');
+ });
+ it('negative float', function() {
+ var str = kbn.valueFormats.hex(-50.333, 2);
+ expect(str).to.be('-32.547AE147AE14');
+ });
});
describe('hex 0x', function() {