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

send prefix when auto-completing tags

Browse Source
This commit is contained in:
Dan Cech
2017-12-27 13:48:55 -05:00
parent d8f2a20775
commit ff759b0ef7
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/graphite/partials/query.editor.html
View File

@@ -45,11 +45,11 @@
</div>
<div ng-if="ctrl.queryModel.seriesByTagUsed" ng-repeat="segment in ctrl.addTagSegments" role="menuitem" class="gf-form">
<metric-segment segment="segment" get-options="ctrl.getTagsAsSegments()" on-change="ctrl.addNewTag(segment)" />
<metric-segment segment="segment" get-options="ctrl.getTagsAsSegments($query)" on-change="ctrl.addNewTag(segment)" />
</div>
<div ng-if="!ctrl.queryModel.seriesByTagUsed" ng-repeat="segment in ctrl.segments" role="menuitem" class="gf-form">
<metric-segment segment="segment" get-options="ctrl.getAltSegments($index)" on-change="ctrl.segmentValueChanged(segment, $index)" />
<metric-segment segment="segment" get-options="ctrl.getAltSegments($index, $query)" on-change="ctrl.segmentValueChanged(segment, $index)" />
</div>
<div ng-if="ctrl.paused" class="gf-form">

14
public/app/plugins/datasource/graphite/query_ctrl.ts
View File

@@ -105,7 +105,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
});
}
getAltSegments(index) {
getAltSegments(index, prefix) {
var query = index === 0 ? '*' : this.queryModel.getSegmentPathUpTo(index) + '.*';
var options = {
range: this.panelCtrl.range,
@@ -122,7 +122,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
});
});
if (altSegments.length === 0) {
if (index > 0 && altSegments.length === 0) {
return altSegments;
}
@@ -159,7 +159,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
if (this.supportsTags && index === 0) {
this.removeTaggedEntry(altSegments);
return this.addAltTagSegments(index, altSegments);
return this.addAltTagSegments(prefix, altSegments);
} else {
return altSegments;
}
@@ -169,8 +169,8 @@ export class GraphiteQueryCtrl extends QueryCtrl {
});
}
addAltTagSegments(index, altSegments) {
return this.getTagsAsSegments().then(tagSegments => {
addAltTagSegments(prefix, altSegments) {
return this.getTagsAsSegments(prefix).then(tagSegments => {
tagSegments = _.map(tagSegments, segment => {
segment.value = TAG_PREFIX + segment.value;
return segment;
@@ -315,9 +315,9 @@ export class GraphiteQueryCtrl extends QueryCtrl {
});
}
getTagsAsSegments() {
getTagsAsSegments(tagPrefix) {
let tagExpressions = this.queryModel.renderTagExpressions();
return this.datasource.getTagsAutoComplete(tagExpressions).then(values => {
return this.datasource.getTagsAutoComplete(tagExpressions, tagPrefix).then(values => {
return _.map(values, val => {
return this.uiSegmentSrv.newSegment({
value: val.text,