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

Stackdriver: Move data to target

Browse Source
This commit is contained in:
Erik Sundell
2018-09-09 22:53:35 +02:00
committed by Daniel Lee
parent 1fe70f8290
commit f09f5b28d7
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/stackdriver/partials/query.editor.html
View File

@@ -2,15 +2,15 @@
<div class="gf-form-inline">
<div class="gf-form">
<span class="gf-form-label width-9">Project</span>
<input class="gf-form-input" disabled type="text" ng-model='ctrl.project.name' get-options="ctrl.getProjects()" css-class="min-width-12"
<input class="gf-form-input" disabled type="text" ng-model='ctrl.target.project.name' get-options="ctrl.getProjects()" css-class="min-width-12"
/>
</div>
</div>
<div class="gf-form-inline">
<div class="gf-form">
<span class="gf-form-label width-9">Metric Type</span>
<gf-form-dropdown model="ctrl.metricType" get-options="ctrl.getMetricTypes($query)" class="gf-form-input" disabled type="text"
allow-custom="true" lookup-text="true" css-class="min-width-12"></gf-form-dropdown>
<gf-form-dropdown model="ctrl.target.metricType" get-options="ctrl.getMetricTypes($query)" class="gf-form-input" disabled
type="text" allow-custom="true" lookup-text="true" css-class="min-width-12" on-change="ctrl.refresh()"></gf-form-dropdown>
</div>
</div>
</query-editor-row>

30
public/app/plugins/datasource/stackdriver/query_ctrl.ts
View File

@@ -4,21 +4,25 @@ import appEvents from 'app/core/app_events';
export class StackdriverQueryCtrl extends QueryCtrl {
static templateUrl = 'partials/query.editor.html';
project: {
id: string;
name: string;
target: {
project: {
id: string;
name: string;
};
metricType: string;
};
metricType: string;
defaultDropdownValue = 'select';
/** @ngInject */
constructor($scope, $injector) {
super($scope, $injector);
this.project = {
id: 'default',
name: 'loading project...',
this.target = {
project: {
id: 'default',
name: 'loading project...',
},
metricType: this.defaultDropdownValue,
};
this.metricType = this.defaultDropdownValue;
this.getCurrentProject().then(this.getMetricTypes.bind(this));
}
@@ -27,7 +31,7 @@ export class StackdriverQueryCtrl extends QueryCtrl {
try {
const projects = await this.datasource.getProjects();
if (projects && projects.length > 0) {
this.project = this.project = projects[0];
this.target.project = this.target.project = projects[0];
} else {
throw new Error('No projects found');
}
@@ -52,10 +56,10 @@ export class StackdriverQueryCtrl extends QueryCtrl {
async getMetricTypes() {
//projects/raintank-production/metricDescriptors/agent.googleapis.com/agent/api_request_count
if (this.project.id !== 'default') {
const metricTypes = await this.datasource.getMetricTypes(this.project.id);
if (this.metricType === this.defaultDropdownValue && metricTypes.length > 0) {
this.$scope.$apply(() => (this.metricType = metricTypes[0].name));
if (this.target.project.id !== 'default') {
const metricTypes = await this.datasource.getMetricTypes(this.target.project.id);
if (this.target.metricType === this.defaultDropdownValue && metricTypes.length > 0) {
this.$scope.$apply(() => (this.target.metricType = metricTypes[0].name));
}
return metricTypes.map(mt => ({ value: mt.id, text: mt.id }));
} else {