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 space before and after binary operators

Browse Source
This commit is contained in:
Masaori Koshiba
2015-04-12 20:41:09 +09:00
parent ddb4b928a0
commit a2b751976e
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ function (angular, _, kbn) {
var reqBody = {
metrics: queries
};
reqBody.cache_time=0;
reqBody.cache_time = 0;
convertToKairosTime(start,reqBody,'start');
convertToKairosTime(end,reqBody,'end');
var options = {
@@ -120,10 +120,10 @@ function (angular, _, kbn) {
if (!results.data) {
return [];
}
if (type==="key") {
if (type === "key") {
return _.keys(results.data.queries[0].results[0].tags);
}
else if (type==="value" && _.has(results.data.queries[0].results[0].tags,keyValue)) {
else if (type === "value" && _.has(results.data.queries[0].results[0].tags,keyValue)) {
return results.data.queries[0].results[0].tags[keyValue];
}
return [];
@@ -159,19 +159,19 @@ function (angular, _, kbn) {
var target = plotParams[index].alias;
var details = " ( ";
_.each(result.group_by,function(element) {
if (element.name==="tag") {
if (element.name === "tag") {
_.each(element.group,function(value, key) {
details+= key+"="+value+" ";
details += key + "=" + value + " ";
});
}
else if (element.name==="value") {
details+= 'value_group='+element.group.group_number+" ";
else if (element.name === "value") {
details += 'value_group=' + element.group.group_number + " ";
}
else if (element.name==="time") {
details+= 'time_group='+element.group.group_number+" ";
else if (element.name === "time") {
details += 'time_group=' + element.group.group_number + " ";
}
});
details+= ") ";
details += ") ";
if (details !== " ( ) ") {
target += details;
}
@@ -204,7 +204,7 @@ function (angular, _, kbn) {
};
query.aggregators = [];
if (target.downsampling!=='(NONE)') {
if (target.downsampling !== '(NONE)') {
query.aggregators.push({
name: target.downsampling,
align_sampling: true,
@@ -223,13 +223,13 @@ function (angular, _, kbn) {
returnedAggregator.align_start_time =true;
}
if (chosenAggregator.unit) {
returnedAggregator.unit = chosenAggregator.unit+'s';
returnedAggregator.unit = chosenAggregator.unit + 's';
}
if (chosenAggregator.factor && chosenAggregator.name==='div') {
if (chosenAggregator.factor && chosenAggregator.name === 'div') {
returnedAggregator.divisor = chosenAggregator.factor;
}
else if (chosenAggregator.factor && chosenAggregator.name==='scale') {
returnedAggregator.factor = chosenAggregator.factor;
else if (chosenAggregator.factor && chosenAggregator.name === 'scale') {
returnedAggregator.factor = chosenAggregator.factor;
}
if (chosenAggregator.percentile) {
returnedAggregator.percentile = chosenAggregator.percentile;
@@ -249,10 +249,10 @@ function (angular, _, kbn) {
query.group_by = [];
if (target.groupByTags) {query.group_by.push({name: "tag", tags: angular.copy(target.groupByTags)});}
if (target.nonTagGroupBys) {
_.each(target.nonTagGroupBys,function(rawGroupBy) {
_.each(target.nonTagGroupBys, function(rawGroupBy) {
var formattedGroupBy = angular.copy(rawGroupBy);
if (formattedGroupBy.name==='time') {
formattedGroupBy.range_size=KairosDBDatasource.prototype.convertToKairosInterval(formattedGroupBy.range_size);
if (formattedGroupBy.name === 'time') {
formattedGroupBy.range_size = KairosDBDatasource.prototype.convertToKairosInterval(formattedGroupBy.range_size);
}
query.group_by.push(formattedGroupBy);
});
@@ -278,9 +278,9 @@ function (angular, _, kbn) {
var value = matches[1];
var unit = matches[2];
if (value%1!==0) {
if (unit==='ms') {throw new Error('Invalid interval value, cannot be smaller than the millisecond');}
value = Math.round(kbn.intervals_in_seconds[unit]*value*1000);
if (value%1 !== 0) {
if (unit === 'ms') {throw new Error('Invalid interval value, cannot be smaller than the millisecond');}
value = Math.round(kbn.intervals_in_seconds[unit] * value * 1000);
unit = 'ms';
}
@@ -413,7 +413,7 @@ function (angular, _, kbn) {
prvDelta = Math.abs((datapoints[i][0] - datapoints[i - 1][0]) / datapoints[i - 1][0]);
nxtDelta = Math.abs((datapoints[i][0] - datapoints[i + 1][0]) / datapoints[i + 1][0]);
if (prvDelta >= limit && nxtDelta >= limit) {
datapoints[i][0] = (datapoints[i-1][0] + datapoints[i+1][0]) / 2;
datapoints[i][0] = (datapoints[i - 1][0] + datapoints[i + 1][0]) / 2;
}
}

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

@@ -108,7 +108,7 @@ function (angular, _) {
$scope.removeFilterTag = function(key) {
delete $scope.target.tags[key];
if (_.size($scope.target.tags)===0) {
if (_.size($scope.target.tags) === 0) {
$scope.target.tags = null;
}
$scope.targetBlur();
@@ -171,7 +171,7 @@ function (angular, _) {
$scope.removeGroupByTag = function(index) {
$scope.target.groupByTags.splice(index, 1);
if (_.size($scope.target.groupByTags)===0) {
if (_.size($scope.target.groupByTags) === 0) {
$scope.target.groupByTags = null;
}
$scope.targetBlur();
@@ -179,16 +179,16 @@ function (angular, _) {
$scope.removeNonTagGroupBy = function(index) {
$scope.target.nonTagGroupBys.splice(index, 1);
if (_.size($scope.target.nonTagGroupBys)===0) {
if (_.size($scope.target.nonTagGroupBys) === 0) {
$scope.target.nonTagGroupBys = null;
}
$scope.targetBlur();
};
$scope.changeGroupByInput = function() {
$scope.isTagGroupBy = $scope.target.currentGroupByType==='tag';
$scope.isValueGroupBy = $scope.target.currentGroupByType==='value';
$scope.isTimeGroupBy = $scope.target.currentGroupByType==='time';
$scope.isTagGroupBy = $scope.target.currentGroupByType === 'tag';
$scope.isValueGroupBy = $scope.target.currentGroupByType === 'value';
$scope.isTimeGroupBy = $scope.target.currentGroupByType === 'time';
$scope.validateGroupBy();
};
@@ -270,7 +270,7 @@ function (angular, _) {
$scope.removeHorizontalAggregator = function(index) {
$scope.target.horizontalAggregators.splice(index, 1);
if (_.size($scope.target.horizontalAggregators)===0) {
if (_.size($scope.target.horizontalAggregators) === 0) {
$scope.target.horizontalAggregators = null;
}
@@ -282,7 +282,7 @@ function (angular, _) {
$scope.target.currentHorizontalAggregatorName);
$scope.hasUnit = _.contains(['sampler','rate'], $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();
};
@@ -303,7 +303,7 @@ function (angular, _) {
errors.factor = 'You must supply a numeric value for this aggregator';
$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';
$scope.isAggregatorValid = false;
}