IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added millisecond detection in series

Browse Source
This commit is contained in:
utkarshcmu 2016-03-01 00:20:34 -08:00
parent 2db62a211a
commit 77f6449db9
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/core/time_series2.ts
View File

@ -168,4 +168,14 @@ export default class TimeSeries {
formatValue(value) { formatValue(value) {
return this.valueFormater(value, this.decimals, this.scaledDecimals); return this.valueFormater(value, this.decimals, this.scaledDecimals);
} }
isMsResolutionNeeded() {
for (var j = 0; j<this.datapoints.length; j++) {
var timestamp = this.datapoints[j][1].toString();
if (timestamp.length === 13 && parseInt(timestamp.substring(10,13)) !== 0) {
return true;
}
}
return false;
}
} }

12
public/app/plugins/panel/graph/graph_tooltip.js
View File

@ -109,7 +109,13 @@ function ($) {
var plot = elem.data().plot; var plot = elem.data().plot;
var plotData = plot.getData(); var plotData = plot.getData();
var seriesList = getSeriesFn(); var seriesList = getSeriesFn();
var group, value, absoluteTime, relativeTime, hoverInfo, i, series, seriesHtml; var group, value, absoluteTime, relativeTime, hoverInfo, i, series, seriesHtml, tooltipFormat;
if (panel.tooltip.msResolution) {
tooltipFormat = 'YYYY-MM-DD HH:mm:ss.SSS';
} else {
tooltipFormat = 'YYYY-MM-DD HH:mm:ss';
}
if (dashboard.sharedCrosshair) { if (dashboard.sharedCrosshair) {
ctrl.publishAppEvent('setCrosshair', { pos: pos, scope: scope }); ctrl.publishAppEvent('setCrosshair', { pos: pos, scope: scope });
@ -127,7 +133,7 @@ function ($) {
seriesHtml = ''; seriesHtml = '';
relativeTime = dashboard.getRelativeTime(seriesHoverInfo.time); relativeTime = dashboard.getRelativeTime(seriesHoverInfo.time);
absoluteTime = dashboard.formatDate(seriesHoverInfo.time); absoluteTime = dashboard.formatDate(seriesHoverInfo.time, tooltipFormat);
for (i = 0; i < seriesHoverInfo.length; i++) { for (i = 0; i < seriesHoverInfo.length; i++) {
hoverInfo = seriesHoverInfo[i]; hoverInfo = seriesHoverInfo[i];
@ -164,7 +170,7 @@ function ($) {
value = series.formatValue(value); value = series.formatValue(value);
relativeTime = dashboard.getRelativeTime(item.datapoint[0]); relativeTime = dashboard.getRelativeTime(item.datapoint[0]);
absoluteTime = dashboard.formatDate(item.datapoint[0]); absoluteTime = dashboard.formatDate(item.datapoint[0], tooltipFormat);
group += '<div class="graph-tooltip-value">' + value + '</div>'; group += '<div class="graph-tooltip-value">' + value + '</div>';

3
public/app/plugins/panel/graph/module.ts
View File

@ -69,6 +69,7 @@ var panelDefaults = {
tooltip : { tooltip : {
value_type: 'cumulative', value_type: 'cumulative',
shared: true, shared: true,
msResolution: false,
}, },
// time overrides // time overrides
timeFrom: null, timeFrom: null,
@ -200,6 +201,8 @@ class GraphCtrl extends MetricsPanelCtrl {
} }
this.datapointsCount += datapoints.length; this.datapointsCount += datapoints.length;
this.panel.tooltip.msResolution = this.panel.tooltip.msResolution || series.isMsResolutionNeeded();
} }
return series; return series;