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: Fixed error message from google resource manager

Browse Source
This commit is contained in:
Erik Sundell
2018-09-06 10:30:13 +02:00
committed by Daniel Lee
parent 55824dc4d8
commit f6c18cf788
2 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
public/app/plugins/datasource/stackdriver/config_ctrl.ts
View File

@@ -6,11 +6,12 @@ export class StackdriverConfigCtrl {
validationErrors: string[] = []; validationErrors: string[] = [];
inputDataValid: boolean; inputDataValid: boolean;
defaultProject: string; defaultProject: string;
projectsError: string;
projects: string[]; projects: string[];
loadingProjects: boolean; loadingProjects: boolean;
/** @ngInject */ /** @ngInject */
constructor($scope, datasourceSrv) { constructor(private $scope, datasourceSrv) {
this.datasourceSrv = datasourceSrv; this.datasourceSrv = datasourceSrv;
this.current.jsonData = this.current.jsonData || {}; this.current.jsonData = this.current.jsonData || {};
this.current.secureJsonData = this.current.secureJsonData || {}; this.current.secureJsonData = this.current.secureJsonData || {};
@@ -70,16 +71,39 @@ export class StackdriverConfigCtrl {
this.validationErrors = []; this.validationErrors = [];
this.inputDataValid = false; this.inputDataValid = false;
this.jsonText = ''; this.jsonText = '';
this.loadingProjects = false;
this.projectsError = '';
} }
async displayProjects() { async displayProjects() {
if (this.projects.length === 0) { if (this.projects.length === 0) {
try {
this.loadingProjects = true; this.loadingProjects = true;
const ds = await this.datasourceSrv.loadDatasource(this.current.name); const ds = await this.datasourceSrv.loadDatasource(this.current.name);
try { const response = await ds.doRequest(`/cloudresourcemanager/v1/projects`);
this.projects = await ds.doRequest(`/cloudresourcemanager/v1/projects`); this.$scope.$apply(() => {
this.projects = response.data.projects.map(p => ({ id: p.projectId, name: p.name }));
});
console.log(this.projects);
} catch (error) { } catch (error) {
console.log(error); let message = 'Projects cannot be fetched: ';
message += error.statusText ? error.statusText + ': ' : '';
if (error && error.data && error.data.error && error.data.error.message) {
if (error.data.error.code === 403) {
message += `
A list of projects could not be fetched from the Google Cloud Resource Manager API.
You might need to enable it first:
https://console.developers.google.com/apis/library/cloudresourcemanager.googleapis.com`;
} else {
message += error.data.error.code + '. ' + error.data.error.message;
}
} else {
message += 'Cannot connect to Stackdriver API';
}
this.$scope.$apply(() => {
this.loadingProjects = false;
this.projectsError = message;
});
} }
} }
} }

27
public/app/plugins/datasource/stackdriver/partials/config.html
View File

@@ -11,16 +11,6 @@
<div class="gf-form" ng-if="!ctrl.inputDataValid"> <div class="gf-form" ng-if="!ctrl.inputDataValid">
<textarea rows="10" data-share-panel-url="" class="gf-form-input" ng-model="ctrl.jsonText" ng-paste="ctrl.onPasteJwt($event)"></textarea> <textarea rows="10" data-share-panel-url="" class="gf-form-input" ng-model="ctrl.jsonText" ng-paste="ctrl.onPasteJwt($event)"></textarea>
</div> </div>
<div class="gf-form" ng-if="ctrl.inputDataValid">
<span class="gf-form-label width-7">Default Projects</span>
<div class="gf-form-select-wrapper max-width-23">
<select class="gf-form-input" ng-model="ctrl.defaultProject" ng-options="p.id as p.name for p in ctrl.projects" ng-change="ctrl.userChangedDefaultProject()"></select>
</div>
<div ng-if="ctrl.loadingProjects">
<i class="fa fa-spinner fa-spin"></i>
<em>Fetching history list&hellip;</em>
</div>
</div>
<div ng-repeat="valError in ctrl.validationErrors" class="text-error p-l-1"> <div ng-repeat="valError in ctrl.validationErrors" class="text-error p-l-1">
<i class="fa fa-warning"></i> <i class="fa fa-warning"></i>
{{valError}} {{valError}}
@@ -33,4 +23,21 @@
<br /> <br />
<a class="btn btn-secondary gf-form-btn" href="#" ng-click="ctrl.resetValidationMessages()">Reset form</a> <a class="btn btn-secondary gf-form-btn" href="#" ng-click="ctrl.resetValidationMessages()">Reset form</a>
</div> </div>
<br />
<div class="gf-form-group" ng-if="ctrl.inputDataValid">
<div class="gf-form" ng-if="ctrl.inputDataValid">
<span class="gf-form-label width-10">Default Project</span>
<div class="gf-form-select-wrapper max-width-23">
<select class="gf-form-input" ng-model="ctrl.defaultProject" ng-options="p.id as p.name for p in ctrl.projects" ng-change="ctrl.userChangedDefaultProject()"></select>
</div>
<div ng-if="ctrl.loadingProjects">
<i class="fa fa-spinner fa-spin"></i>
<em>Fetching projects...&hellip;</em>
</div>
</div>
<div ng-if="ctrl.projectsError" class="text-error p-l-1">
<i class="fa fa-warning"></i>
{{ctrl.projectsError}}
</div>
</div>
</div> </div>