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

Add prometheus datasource

Browse Source
This commit is contained in:
Jimmi Dyson 2015-09-28 13:32:53 +01:00
parent 866ea7f942
commit 6e66b8a0fa
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,18 @@
define([ define([
'angular', 'angular',
'lodash', 'lodash',
'kbn',
'moment', 'moment',
'app/core/utils/datemath', 'app/core/utils/datemath',
'./directives', './directives',
'./queryCtrl', './queryCtrl',
], ],
function (angular, _, kbn, dateMath) { function (angular, _, moment, dateMath) {
'use strict'; 'use strict';
var module = angular.module('grafana.services'); var module = angular.module('grafana.services');
var durationSplitRegexp = /(\d+)(ms|s|m|h|d|w|M|y)/;
module.factory('PrometheusDatasource', function($q, backendSrv, templateSrv) { module.factory('PrometheusDatasource', function($q, backendSrv, templateSrv) {
function PrometheusDatasource(datasource) { function PrometheusDatasource(datasource) {
@ -183,13 +184,14 @@ function (angular, _, kbn, dateMath) {
}; };
PrometheusDatasource.prototype.calculateInterval = function(interval, intervalFactor) { PrometheusDatasource.prototype.calculateInterval = function(interval, intervalFactor) {
var sec = kbn.interval_to_seconds(interval); var m = interval.match(durationSplitRegexp);
var dur = moment.duration(parseInt(m[1]), m[2]);
var sec = dur.asSeconds();
if (sec < 1) { if (sec < 1) {
sec = 1; sec = 1;
} }
return sec * intervalFactor; return Math.floor(sec * intervalFactor) + 's';
}; };
function transformMetricData(md, options) { function transformMetricData(md, options) {

2
public/app/plugins/datasource/prometheus/queryCtrl.js
View File

@ -117,7 +117,7 @@ function (angular, _, kbn, dateMath) {
$scope.calculateInterval = function() { $scope.calculateInterval = function() {
var interval = $scope.target.interval || $scope.interval; var interval = $scope.target.interval || $scope.interval;
var calculatedInterval = $scope.datasource.calculateInterval(interval, $scope.target.intervalFactor); var calculatedInterval = $scope.datasource.calculateInterval(interval, $scope.target.intervalFactor);
$scope.target.calculatedInterval = kbn.secondsToHms(calculatedInterval); $scope.target.calculatedInterval = calculatedInterval;
}; };
// TODO: validate target // TODO: validate target

2
public/test/specs/prometheus-datasource-specs.js
View File

@ -21,7 +21,7 @@ define([
var results; var results;
var urlExpected = '/api/v1/query_range?query=' + var urlExpected = '/api/v1/query_range?query=' +
encodeURIComponent('test{job="testjob"}') + encodeURIComponent('test{job="testjob"}') +
'&start=1443438675&end=1443460275&step=60'; '&start=1443438675&end=1443460275&step=60s';
var query = { var query = {
range: { from: moment(1443438674760), to: moment(1443460274760) }, range: { from: moment(1443438674760), to: moment(1443460274760) },
targets: [{ expr: 'test{job="testjob"}' }], targets: [{ expr: 'test{job="testjob"}' }],