Skip to content

N
nexpie-grafana-theme
Commit 32275cb0 by Torkel Ödegaard
Options

Merge pull request #1760 from masaori335/kairosdb-cleanup 

Cleanup KairosDB Plugin
parents ff353197 88bf0cdb
Showing with 35 additions and 54 deletions
public/app/plugins/datasource/kairosdb/queryCtrl.js
...@@ -94,7 +94,7 @@ function (angular, _) { ...@@ -94,7 +94,7 @@ function (angular, _) {
$scope.validateFilterTag(); $scope.validateFilterTag();
if (!$scope.target.errors.tags) { if (!$scope.target.errors.tags) {
if(!_.has($scope.target.tags,$scope.target.currentTagKey)) { if (!_.has($scope.target.tags,$scope.target.currentTagKey)) {
$scope.target.tags[$scope.target.currentTagKey] = []; $scope.target.tags[$scope.target.currentTagKey] = [];
} }
$scope.target.tags[$scope.target.currentTagKey].push($scope.target.currentTagValue); $scope.target.tags[$scope.target.currentTagKey].push($scope.target.currentTagValue);
...@@ -108,7 +108,7 @@ function (angular, _) { ...@@ -108,7 +108,7 @@ function (angular, _) {
$scope.removeFilterTag = function(key) { $scope.removeFilterTag = function(key) {
delete $scope.target.tags[key]; delete $scope.target.tags[key];
if(_.size($scope.target.tags)===0) { if (_.size($scope.target.tags) === 0) {
$scope.target.tags = null; $scope.target.tags = null;
} }
$scope.targetBlur(); $scope.targetBlur();
...@@ -116,7 +116,7 @@ function (angular, _) { ...@@ -116,7 +116,7 @@ function (angular, _) {
$scope.validateFilterTag = function() { $scope.validateFilterTag = function() {
$scope.target.errors.tags = null; $scope.target.errors.tags = null;
if(!$scope.target.currentTagKey || !$scope.target.currentTagValue) { if (!$scope.target.currentTagKey || !$scope.target.currentTagValue) {
$scope.target.errors.tags = "You must specify a tag name and value."; $scope.target.errors.tags = "You must specify a tag name and value.";
} }
}; };
...@@ -136,7 +136,7 @@ function (angular, _) { ...@@ -136,7 +136,7 @@ function (angular, _) {
$scope.validateGroupBy(); $scope.validateGroupBy();
// nb: if error is found, means that user clicked on cross : cancels input // nb: if error is found, means that user clicked on cross : cancels input
if (_.isEmpty($scope.target.errors.groupBy)) { if (_.isEmpty($scope.target.errors.groupBy)) {
if($scope.isTagGroupBy) { if ($scope.isTagGroupBy) {
if (!$scope.target.groupByTags) { if (!$scope.target.groupByTags) {
$scope.target.groupByTags = []; $scope.target.groupByTags = [];
} }
...@@ -154,8 +154,8 @@ function (angular, _) { ...@@ -154,8 +154,8 @@ function (angular, _) {
var groupBy = { var groupBy = {
name: $scope.target.currentGroupByType name: $scope.target.currentGroupByType
}; };
if($scope.isValueGroupBy) {groupBy.range_size = $scope.target.groupBy.valueRange;} if ($scope.isValueGroupBy) {groupBy.range_size = $scope.target.groupBy.valueRange;}
else if($scope.isTimeGroupBy) { else if ($scope.isTimeGroupBy) {
groupBy.range_size = $scope.target.groupBy.timeInterval; groupBy.range_size = $scope.target.groupBy.timeInterval;
groupBy.group_count = $scope.target.groupBy.groupCount; groupBy.group_count = $scope.target.groupBy.groupCount;
} }
...@@ -171,7 +171,7 @@ function (angular, _) { ...@@ -171,7 +171,7 @@ function (angular, _) {
$scope.removeGroupByTag = function(index) { $scope.removeGroupByTag = function(index) {
$scope.target.groupByTags.splice(index, 1); $scope.target.groupByTags.splice(index, 1);
if(_.size($scope.target.groupByTags)===0) { if (_.size($scope.target.groupByTags) === 0) {
$scope.target.groupByTags = null; $scope.target.groupByTags = null;
} }
$scope.targetBlur(); $scope.targetBlur();
...@@ -179,16 +179,16 @@ function (angular, _) { ...@@ -179,16 +179,16 @@ function (angular, _) {
$scope.removeNonTagGroupBy = function(index) { $scope.removeNonTagGroupBy = function(index) {
$scope.target.nonTagGroupBys.splice(index, 1); $scope.target.nonTagGroupBys.splice(index, 1);
if(_.size($scope.target.nonTagGroupBys)===0) { if (_.size($scope.target.nonTagGroupBys) === 0) {
$scope.target.nonTagGroupBys = null; $scope.target.nonTagGroupBys = null;
} }
$scope.targetBlur(); $scope.targetBlur();
}; };
$scope.changeGroupByInput = function() { $scope.changeGroupByInput = function() {
$scope.isTagGroupBy = $scope.target.currentGroupByType==='tag'; $scope.isTagGroupBy = $scope.target.currentGroupByType === 'tag';
$scope.isValueGroupBy = $scope.target.currentGroupByType==='value'; $scope.isValueGroupBy = $scope.target.currentGroupByType === 'value';
$scope.isTimeGroupBy = $scope.target.currentGroupByType==='time'; $scope.isTimeGroupBy = $scope.target.currentGroupByType === 'time';
$scope.validateGroupBy(); $scope.validateGroupBy();
}; };
...@@ -196,32 +196,32 @@ function (angular, _) { ...@@ -196,32 +196,32 @@ function (angular, _) {
delete $scope.target.errors.groupBy; delete $scope.target.errors.groupBy;
var errors = {}; var errors = {};
$scope.isGroupByValid = true; $scope.isGroupByValid = true;
if($scope.isTagGroupBy) { if ($scope.isTagGroupBy) {
if(!$scope.target.groupBy.tagKey) { if (!$scope.target.groupBy.tagKey) {
$scope.isGroupByValid = false; $scope.isGroupByValid = false;
errors.tagKey = 'You must supply a tag name'; errors.tagKey = 'You must supply a tag name';
} }
} }
if($scope.isValueGroupBy) { if ($scope.isValueGroupBy) {
if(!$scope.target.groupBy.valueRange || !isInt($scope.target.groupBy.valueRange)) { if (!$scope.target.groupBy.valueRange || !isInt($scope.target.groupBy.valueRange)) {
errors.valueRange = "Range must be an integer"; errors.valueRange = "Range must be an integer";
$scope.isGroupByValid = false; $scope.isGroupByValid = false;
} }
} }
if($scope.isTimeGroupBy) { if ($scope.isTimeGroupBy) {
try { try {
$scope.datasource.convertToKairosInterval($scope.target.groupBy.timeInterval); $scope.datasource.convertToKairosInterval($scope.target.groupBy.timeInterval);
} catch(err) { } catch (err) {
errors.timeInterval = err.message; errors.timeInterval = err.message;
$scope.isGroupByValid = false; $scope.isGroupByValid = false;
} }
if(!$scope.target.groupBy.groupCount || !isInt($scope.target.groupBy.groupCount)) { if (!$scope.target.groupBy.groupCount || !isInt($scope.target.groupBy.groupCount)) {
errors.groupCount = "Group count must be an integer"; errors.groupCount = "Group count must be an integer";
$scope.isGroupByValid = false; $scope.isGroupByValid = false;
} }
} }
if(!_.isEmpty(errors)) { if (!_.isEmpty(errors)) {
$scope.target.errors.groupBy = errors; $scope.target.errors.groupBy = errors;
} }
}; };
...@@ -245,17 +245,17 @@ function (angular, _) { ...@@ -245,17 +245,17 @@ function (angular, _) {
$scope.validateHorizontalAggregator(); $scope.validateHorizontalAggregator();
// nb: if error is found, means that user clicked on cross : cancels input // nb: if error is found, means that user clicked on cross : cancels input
if(_.isEmpty($scope.target.errors.horAggregator)) { if (_.isEmpty($scope.target.errors.horAggregator)) {
if (!$scope.target.horizontalAggregators) { if (!$scope.target.horizontalAggregators) {
$scope.target.horizontalAggregators = []; $scope.target.horizontalAggregators = [];
} }
var aggregator = { var aggregator = {
name:$scope.target.currentHorizontalAggregatorName name:$scope.target.currentHorizontalAggregatorName
}; };
if($scope.hasSamplingRate) {aggregator.sampling_rate = $scope.target.horAggregator.samplingRate;} if ($scope.hasSamplingRate) {aggregator.sampling_rate = $scope.target.horAggregator.samplingRate;}
if($scope.hasUnit) {aggregator.unit = $scope.target.horAggregator.unit;} if ($scope.hasUnit) {aggregator.unit = $scope.target.horAggregator.unit;}
if($scope.hasFactor) {aggregator.factor = $scope.target.horAggregator.factor;} if ($scope.hasFactor) {aggregator.factor = $scope.target.horAggregator.factor;}
if($scope.hasPercentile) {aggregator.percentile = $scope.target.horAggregator.percentile;} if ($scope.hasPercentile) {aggregator.percentile = $scope.target.horAggregator.percentile;}
$scope.target.horizontalAggregators.push(aggregator); $scope.target.horizontalAggregators.push(aggregator);
$scope.targetBlur(); $scope.targetBlur();
} }
...@@ -270,7 +270,7 @@ function (angular, _) { ...@@ -270,7 +270,7 @@ function (angular, _) {
$scope.removeHorizontalAggregator = function(index) { $scope.removeHorizontalAggregator = function(index) {
$scope.target.horizontalAggregators.splice(index, 1); $scope.target.horizontalAggregators.splice(index, 1);
if(_.size($scope.target.horizontalAggregators)===0) { if (_.size($scope.target.horizontalAggregators) === 0) {
$scope.target.horizontalAggregators = null; $scope.target.horizontalAggregators = null;
} }
...@@ -282,7 +282,7 @@ function (angular, _) { ...@@ -282,7 +282,7 @@ function (angular, _) {
$scope.target.currentHorizontalAggregatorName); $scope.target.currentHorizontalAggregatorName);
$scope.hasUnit = _.contains(['sampler','rate'], $scope.target.currentHorizontalAggregatorName); $scope.hasUnit = _.contains(['sampler','rate'], $scope.target.currentHorizontalAggregatorName);
$scope.hasFactor = _.contains(['div','scale'], $scope.target.currentHorizontalAggregatorName); $scope.hasFactor = _.contains(['div','scale'], $scope.target.currentHorizontalAggregatorName);
$scope.hasPercentile = 'percentile'===$scope.target.currentHorizontalAggregatorName; $scope.hasPercentile = 'percentile' === $scope.target.currentHorizontalAggregatorName;
$scope.validateHorizontalAggregator(); $scope.validateHorizontalAggregator();
}; };
...@@ -290,26 +290,26 @@ function (angular, _) { ...@@ -290,26 +290,26 @@ function (angular, _) {
delete $scope.target.errors.horAggregator; delete $scope.target.errors.horAggregator;
var errors = {}; var errors = {};
$scope.isAggregatorValid = true; $scope.isAggregatorValid = true;
if($scope.hasSamplingRate) { if ($scope.hasSamplingRate) {
try { try {
$scope.datasource.convertToKairosInterval($scope.target.horAggregator.samplingRate); $scope.datasource.convertToKairosInterval($scope.target.horAggregator.samplingRate);
} catch(err) { } catch (err) {
errors.samplingRate = err.message; errors.samplingRate = err.message;
$scope.isAggregatorValid = false; $scope.isAggregatorValid = false;
} }
} }
if($scope.hasFactor) { if ($scope.hasFactor) {
if(!$scope.target.horAggregator.factor) { if (!$scope.target.horAggregator.factor) {
errors.factor = 'You must supply a numeric value for this aggregator'; errors.factor = 'You must supply a numeric value for this aggregator';
$scope.isAggregatorValid = false; $scope.isAggregatorValid = false;
} }
else if(parseInt($scope.target.horAggregator.factor)===0 && $scope.target.currentHorizontalAggregatorName==='div') { else if (parseInt($scope.target.horAggregator.factor) === 0 && $scope.target.currentHorizontalAggregatorName === 'div') {
errors.factor = 'Cannot divide by 0'; errors.factor = 'Cannot divide by 0';
$scope.isAggregatorValid = false; $scope.isAggregatorValid = false;
} }
} }
if($scope.hasPercentile) { if ($scope.hasPercentile) {
if(!$scope.target.horAggregator.percentile || if (!$scope.target.horAggregator.percentile ||
$scope.target.horAggregator.percentile<=0 || $scope.target.horAggregator.percentile<=0 ||
$scope.target.horAggregator.percentile>1) { $scope.target.horAggregator.percentile>1) {
errors.percentile = 'Percentile must be between 0 and 1'; errors.percentile = 'Percentile must be between 0 and 1';
...@@ -317,7 +317,7 @@ function (angular, _) { ...@@ -317,7 +317,7 @@ function (angular, _) {
} }
} }
if(!_.isEmpty(errors)) { if (!_.isEmpty(errors)) {
$scope.target.errors.horAggregator = errors; $scope.target.errors.horAggregator = errors;
} }
}; };
...@@ -327,25 +327,6 @@ function (angular, _) { ...@@ -327,25 +327,6 @@ function (angular, _) {
}; };
// Validation // Validation
function MetricListToObject(MetricList) {
var result = {};
var Metric;
var MetricArray = [];
var MetricCnt = 0;
for (var i =0;i < MetricList.length; i++) {
Metric = MetricList[i];
MetricArray = Metric.split('.');
if(!result.hasOwnProperty(MetricArray[0])) {
result[MetricArray[0]] = {};
}
if(!result[MetricArray[0]].hasOwnProperty(MetricArray[1])) {
result[MetricArray[0]][MetricArray[1]] = [];
}
result[MetricArray[0]][MetricArray[1]].push(MetricArray[2]);
}
return result;
}
function validateTarget(target) { function validateTarget(target) {
var errs = {}; var errs = {};
...@@ -357,7 +338,7 @@ function (angular, _) { ...@@ -357,7 +338,7 @@ function (angular, _) {
if (target.sampling) { if (target.sampling) {
$scope.datasource.convertToKairosInterval(target.sampling); $scope.datasource.convertToKairosInterval(target.sampling);
} }
} catch(err) { } catch (err) {
errs.sampling = err.message; errs.sampling = err.message;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment