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

Grafana supports ms resolution for Opentsdb

Browse Source
This commit is contained in:
utkarshcmu
2016-03-02 02:14:58 -08:00
parent 7e12460303
commit 48f5a61564
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/app/plugins/datasource/opentsdb/datasource.js
View File

@@ -16,6 +16,7 @@ function (angular, _, dateMath) {
this.basicAuth = instanceSettings.basicAuth;
instanceSettings.jsonData = instanceSettings.jsonData || {};
this.tsdbVersion = instanceSettings.jsonData.tsdbVersion || 1;
this.tsdbResolution = instanceSettings.jsonData.tsdbResolution || 1;
this.supportMetrics = true;
this.tagKeys = {};
@@ -62,16 +63,21 @@ function (angular, _, dateMath) {
this._saveTagKeys(metricData);
return transformMetricData(metricData, groupByTags, options.targets[index], options);
return transformMetricData(metricData, groupByTags, options.targets[index], options, this.tsdbResolution);
}.bind(this));
return { data: result };
}.bind(this));
};
this.performTimeSeriesQuery = function(queries, start, end) {
var msResolution = false;
if (this.tsdbResolution === 2) {
msResolution = true;
}
var reqBody = {
start: start,
queries: queries
queries: queries,
msResolution: msResolution
};
// Relative queries (e.g. last hour) don't include an end time
@@ -246,14 +252,18 @@ function (angular, _, dateMath) {
return filterTypesPromise;
};
function transformMetricData(md, groupByTags, target, options) {
function transformMetricData(md, groupByTags, target, options, tsdbResolution) {
var metricLabel = createMetricLabel(md, target, groupByTags, options);
var dps = [];
// TSDB returns datapoints has a hash of ts => value.
// Can't use _.pairs(invert()) because it stringifies keys/values
_.each(md.dps, function (v, k) {
dps.push([v, k * 1000]);
if (tsdbResolution === 2) {
dps.push([v, k * 1]);
} else {
dps.push([v, k * 1000]);
}
});
return { target: metricLabel, datapoints: dps };