IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-28 18:01:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

KairosDB data source plugin is messy, needs a lot of clean up & refactoring, please help

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-03-29 20:30:42 +02:00
parent 15188c4a88
commit 795cee13c8
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/kairosdb/datasource.js
View File

@ -217,7 +217,7 @@ function (angular, _, kbn) {
if(chosenAggregator.sampling_rate) {
returnedAggregator.sampling = KairosDBDatasource.prototype.convertToKairosInterval(chosenAggregator.sampling_rate);
returnedAggregator.align_sampling = true;
returnedAggregator.align_start_time=true;
returnedAggregator.align_start_time =true;
}
if(chosenAggregator.unit) {
returnedAggregator.unit = chosenAggregator.unit+'s';

26
public/app/plugins/datasource/kairosdb/queryCtrl.js
View File

@ -53,30 +53,26 @@ function (angular, _) {
_.move($scope.panel.targets, fromIndex, toIndex);
};
//////////////////////////////
// SUGGESTION QUERIES
//////////////////////////////
// Fetch metric list
$scope.updateMetricList = function() {
$scope.metricListLoading = true;
metricList = [];
$scope.datasource.performMetricSuggestQuery().then(function(series) {
metricList = series;
$scope.metric.list = series;
if ($scope.target.metric)
if ($scope.target.metric) {
$scope.metric.value = $scope.target.metric;
else
}
else {
$scope.metric.value = "";
}
$scope.metricListLoading = false;
return metricList;
});
};
$scope.suggestTagKeys = function(query, callback) {
$scope.updateTimeRange();
callback($scope.datasource
.performTagSuggestQuery($scope.target.metric,$scope.rangeUnparsed, 'key',''));
callback($scope.datasource.performTagSuggestQuery($scope.target.metric, $scope.rangeUnparsed, 'key',''));
};
$scope.suggestTagValues = function(query, callback) {
@ -84,10 +80,7 @@ function (angular, _) {
.performTagSuggestQuery($scope.target.metric,$scope.rangeUnparsed, 'value',$scope.target.currentTagKey));
};
//////////////////////////////
// FILTER by TAG
//////////////////////////////
// Filter metric by tag
$scope.addFilterTag = function() {
if (!$scope.addFilterTagMode) {
$scope.addFilterTagMode = true;
@ -333,10 +326,7 @@ function (angular, _) {
alert(message);
};
//////////////////////////////
// VALIDATION
//////////////////////////////
// Validation
function MetricListToObject(MetricList) {
var result = {};
var Metric;