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

Merge pull request #2847 from jimmidyson/prometheus-datasource

Browse Source 
Add Prometheus datasource
This commit is contained in:
Torkel Ödegaard 2015-09-29 18:23:12 +02:00
commit 2f55c18d56
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
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) {
@ -129,8 +130,16 @@ function (angular, _, kbn, dateMath) {
PrometheusDatasource.prototype.metricFindQuery = function(query) { PrometheusDatasource.prototype.metricFindQuery = function(query) {
var url; var url;
var metricsQuery = query.match(/^[a-zA-Z_:*][a-zA-Z0-9_:*]*/); var interpolated;
var labelValuesQuery = query.match(/^label_values\((.+)\)/); try {
interpolated = templateSrv.replace(query);
}
catch (err) {
return $q.reject(err);
}
var metricsQuery = interpolated.match(/^[a-zA-Z_:*][a-zA-Z0-9_:*]*/);
var labelValuesQuery = interpolated.match(/^label_values\((.+)\)/);
if (labelValuesQuery) { if (labelValuesQuery) {
// return label values // return label values
@ -162,11 +171,12 @@ function (angular, _, kbn, dateMath) {
}); });
} else { } else {
// if query contains full metric name, return metric name and label list // if query contains full metric name, return metric name and label list
url = '/api/v1/query?query=' + encodeURIComponent(query); url = '/api/v1/query?query=' + encodeURIComponent(interpolated) +
'&time=' + (moment().valueOf() / 1000);
return this._request('GET', url) return this._request('GET', url)
.then(function(result) { .then(function(result) {
return _.map(result.data.result, function(metricData) { return _.map(result.data.data.result, function(metricData) {
return { return {
text: getOriginalMetricName(metricData.metric), text: getOriginalMetricName(metricData.metric),
expandable: true expandable: true
@ -183,13 +193,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"}' }],