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

fill null in Prometheus

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2016-01-05 01:22:37 +09:00
parent a87b5f757d
commit afa539368f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/plugins/datasource/prometheus/datasource.js
View File

@ -91,7 +91,7 @@ function (angular, _, moment, dateMath) {
delete self.lastErrors.query; delete self.lastErrors.query;
_.each(response.data.data.result, function(metricData) { _.each(response.data.data.result, function(metricData) {
result.push(transformMetricData(metricData, options.targets[index])); result.push(transformMetricData(metricData, options.targets[index], start, end));
}); });
}); });
@ -207,14 +207,14 @@ function (angular, _, moment, dateMath) {
return Math.ceil(sec * intervalFactor); return Math.ceil(sec * intervalFactor);
}; };
function transformMetricData(md, options) { function transformMetricData(md, options, start, end) {
var dps = [], var dps = [],
metricLabel = null; metricLabel = null;
metricLabel = createMetricLabel(md.metric, options); metricLabel = createMetricLabel(md.metric, options);
var stepMs = parseInt(options.step) * 1000; var stepMs = parseInt(options.step) * 1000;
var lastTimestamp = null; var baseTimestamp = start * 1000;
_.each(md.values, function(value) { _.each(md.values, function(value) {
var dp_value = parseFloat(value[1]); var dp_value = parseFloat(value[1]);
if (_.isNaN(dp_value)) { if (_.isNaN(dp_value)) {
@ -222,13 +222,18 @@ function (angular, _, moment, dateMath) {
} }
var timestamp = value[0] * 1000; var timestamp = value[0] * 1000;
if (lastTimestamp && (timestamp - lastTimestamp) > stepMs) { for (var t = baseTimestamp; t < timestamp; t += stepMs) {
dps.push([null, lastTimestamp + stepMs]); dps.push([null, t]);
} }
lastTimestamp = timestamp; baseTimestamp = timestamp + stepMs;
dps.push([dp_value, timestamp]); dps.push([dp_value, timestamp]);
}); });
var endTimestamp = end * 1000;
for (var t = baseTimestamp; t < endTimestamp; t += stepMs) {
dps.push([null, t]);
}
return { target: metricLabel, datapoints: dps }; return { target: metricLabel, datapoints: dps };
} }