public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3234 from utkarshcmu/opentsdb-ui

Browse Source 
Made opentsdb query editor consistent and tags are editable now
This commit is contained in:
Torkel Ödegaard
2015-11-16 06:29:02 +01:00
parent 93851a9a0f 8a184e9d30
commit 305f8d6982
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/opentsdb/partials/query.editor.html
+20 -17
View File
@@ -37,7 +37,7 @@
</ul>
<ul class="tight-form-list" role="menu">
<li class="tight-form-item" style="width: 86px">
<li class="tight-form-item query-keyword" style="width: 100px">
Metric
</li>
<li>
@@ -49,7 +49,7 @@
<i class="fa fa-warning"></i>
</a>
</li>
<li class="tight-form-item">
<li class="tight-form-item query-keyword">
Aggregator
</li>
<li>
@@ -62,7 +62,7 @@
</a>
</li>
<li class="tight-form-item">
<li class="tight-form-item query-keyword">
Alias:
<tip>Use patterns like $tag_tagname to replace part of the alias for a tag value</tip>
</li>
@@ -81,7 +81,7 @@
<div class="tight-form">
<ul class="tight-form-list" role="menu">
<li class="tight-form-item tight-form-align" style="width: 86px">
<li class="tight-form-item tight-form-align query-keyword" style="width: 100px">
Down sample
</li>
@@ -93,7 +93,7 @@
placeholder="interval (empty = auto)"></input>
</li>
<li class="tight-form-item">
<li class="tight-form-item query-keyword">
Aggregator
</li>
@@ -104,8 +104,8 @@
</select>
</li>
<li class="tight-form-item">
<editor-checkbox text="Disable downsampling" model="target.disableDownsampling" change="targetBlur()"></editor-checkbox>
<li class="tight-form-item query-keyword">
Disable downsampling <editor-checkbox text="" model="target.disableDownsampling" change="targetBlur()"></editor-checkbox>
</li>
</ul>
@@ -114,17 +114,20 @@
<div class="tight-form">
<ul class="tight-form-list" role="menu">
<li class="tight-form-item tight-form-align" style="width: 86px">
<li class="tight-form-item tight-form-align query-keyword" style="width: 100px">
Tags
</li>
<li ng-repeat="(key, value) in target.tags track by $index" class="tight-form-item">
{{key}}&nbsp;=&nbsp;{{value}}
<a ng-click="removeTag(key)">
{{key}}&nbsp;=&nbsp;{{value}}
<a ng-click="editTag(key, value)">
<i class="fa fa-pencil"></i>
</a>
<a ng-click="removeTag(key)">
<i class="fa fa-remove"></i>
</a>
</li>
<li class="tight-form-item" ng-hide="addTagMode">
<li class="tight-form-item query-keyword" ng-hide="addTagMode">
<a ng-click="addTag()">
<i class="fa fa-plus"></i>
</a>
@@ -154,15 +157,15 @@
<div class="tight-form">
<ul class="tight-form-list" role="menu">
<li class="tight-form-item tight-form-align" style="width: 86px">
<editor-checkbox text="Rate" model="target.shouldComputeRate" change="targetBlur()"></editor-checkbox>
<li class="tight-form-item tight-form-align query-keyword" style="width: 100px">
Rate <editor-checkbox text="" model="target.shouldComputeRate" change="targetBlur()"></editor-checkbox>
</li>
<li class="tight-form-item" ng-hide="!target.shouldComputeRate">
<editor-checkbox text="Counter" model="target.isCounter" change="targetBlur()"></editor-checkbox>
<li class="tight-form-item query-keyword" ng-hide="!target.shouldComputeRate">
Counter <editor-checkbox text="" model="target.isCounter" change="targetBlur()"></editor-checkbox>
</li>
<li class="tight-form-item" ng-hide="!target.isCounter || !target.shouldComputeRate">
<li class="tight-form-item query-keyword" ng-hide="!target.isCounter || !target.shouldComputeRate">
Counter Max:
</li>
@@ -172,7 +175,7 @@
placeholder="max value" ng-model-onblur
ng-blur="targetBlur()"></input>
</li>
<li class="tight-form-item" ng-hide="!target.isCounter || !target.shouldComputeRate">
<li class="tight-form-item query-keyword" ng-hide="!target.isCounter || !target.shouldComputeRate">
Reset Value:
</li>
<li ng-hide="!target.isCounter || !target.shouldComputeRate">
public/app/plugins/datasource/opentsdb/queryCtrl.js
+7
View File
@@ -86,6 +86,13 @@ function (angular, _, kbn) {
$scope.targetBlur();
};
$scope.editTag = function(key, value) {
$scope.removeTag(key);
$scope.target.currentTagKey = key;
$scope.target.currentTagValue = value;
$scope.addTag();
};
function validateTarget(target) {
var errs = {};