Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin

This commit is contained in:
Erik Sundell
2018-09-26 11:17:52 +02:00
4 changed files with 9 additions and 6 deletions

View File

@@ -55,7 +55,7 @@
<div class="gf-form-inline">
<div class="gf-form">
<span class="gf-form-label query-keyword width-9">Alias By</span>
<input type="text" class="gf-form-input width-30" ng-model="ctrl.target.aliasBy" />
<input type="text" class="gf-form-input width-30" ng-model="ctrl.target.aliasBy" ng-change="ctrl.refresh()" ng-model-options="{ debounce: 500 }" />
</div>
<div class="gf-form gf-form--grow">
<div class="gf-form-label gf-form-label--grow"></div>
@@ -109,4 +109,4 @@
<div class="gf-form" ng-show="ctrl.lastQueryError">
<pre class="gf-form-pre alert alert-error">{{ctrl.lastQueryError}}</pre>
</div>
</query-editor-row>
</query-editor-row>

View File

@@ -427,5 +427,8 @@ function createTarget(existingFilters?: string[]) {
},
filters: existingFilters || [],
aliasBy: '',
metricService: '',
metricKind: '',
valueType: '',
};
}