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

fix(cloudwatch): fixed broken cloudwatch edit page, #6697

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-12-14 20:38:35 +01:00
parent ca6a667555
commit c3920bfba1
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/plugins/ds_edit_ctrl.ts
View File

@ -13,7 +13,8 @@ var defaults = {
type: 'graphite', type: 'graphite',
url: '', url: '',
access: 'proxy', access: 'proxy',
jsonData: {} jsonData: {},
encryptedFields: []
}; };
var datasourceCreated = false; var datasourceCreated = false;

1
public/app/plugins/datasource/cloudwatch/config_ctrl.ts
View File

@ -12,6 +12,7 @@ export class CloudWatchConfigCtrl {
/** @ngInject */ /** @ngInject */
constructor($scope) { constructor($scope) {
debugger;
this.current.jsonData.timeField = this.current.jsonData.timeField || '@timestamp'; this.current.jsonData.timeField = this.current.jsonData.timeField || '@timestamp';
this.current.jsonData.authType = this.current.jsonData.authType || 'credentials'; this.current.jsonData.authType = this.current.jsonData.authType || 'credentials';

18
public/app/plugins/datasource/cloudwatch/partials/config.html
View File

@ -13,24 +13,21 @@
Credentials profile name, as specified in ~/.aws/credentials, leave blank for default Credentials profile name, as specified in ~/.aws/credentials, leave blank for default
</info-popover> </info-popover>
</div> </div>
<div class="gf-form" ng-show='ctrl.current.jsonData.authType == "keys"'> <div class="gf-form" ng-show='ctrl.current.jsonData.authType == "keys"'>
<label class="gf-form-label width-13">Access key </label> <label class="gf-form-label width-13">Access key </label>
<label class="gf-form-label width-13" ng-show="ctrl.accessKeyExist">Configured</label> <label class="gf-form-label width-13" ng-show="ctrl.accessKeyExist">Configured</label>
<a class="gf-form-button btn btn-danger btn-small" type="submit" ng-click="ctrl.resetAccessKey()" ng-show="ctrl.accessKeyExist">Reset</a> <a class="btn btn-secondary gf-form-btn" type="submit" ng-click="ctrl.resetAccessKey()" ng-show="ctrl.accessKeyExist">Reset</a>
<input type="text" <input type="text" class="gf-form-input max-width-18" ng-hide="ctrl.accessKeyExist" ng-model='ctrl.current.secureJsonData.accessKey'></input>
class="gf-form-input max-width-18"
ng-hide="ctrl.accessKeyExist"
ng-model='ctrl.current.secureJsonData.accessKey'></input>
</div> </div>
<div class="gf-form" ng-show='ctrl.current.jsonData.authType == "keys"'> <div class="gf-form" ng-show='ctrl.current.jsonData.authType == "keys"'>
<label class="gf-form-label width-13">Secret key</label> <label class="gf-form-label width-13">Secret key</label>
<label class="gf-form-label width-13" ng-show="ctrl.secretKeyExist">Configured</label> <label class="gf-form-label width-13" ng-show="ctrl.secretKeyExist">Configured</label>
<a class="btn btn-danger gf-form-button btn-small" type="submit" ng-click="ctrl.resetSecretKey()" ng-show="ctrl.secretKeyExist">Reset</a> <a class="btn btn-secondary gf-form-btn" type="submit" ng-click="ctrl.resetSecretKey()" ng-show="ctrl.secretKeyExist">Reset</a>
<input type="text" <input type="text" class="gf-form-input max-width-18" ng-hide="ctrl.secretKeyExist" ng-model='ctrl.current.secureJsonData.secretKey'></input>
class="gf-form-input max-width-18"
ng-hide="ctrl.secretKeyExist"
ng-model='ctrl.current.secureJsonData.secretKey'></input>
</div> </div>
<div class="gf-form" ng-show='ctrl.current.jsonData.authType == "arn"'> <div class="gf-form" ng-show='ctrl.current.jsonData.authType == "arn"'>
<label class="gf-form-label width-13">Assume Role ARN</label> <label class="gf-form-label width-13">Assume Role ARN</label>
<input type="text" class="gf-form-input max-width-18" ng-model='ctrl.current.jsonData.assumeRoleArn' placeholder="arn:aws:iam:*"></input> <input type="text" class="gf-form-input max-width-18" ng-model='ctrl.current.jsonData.assumeRoleArn' placeholder="arn:aws:iam:*"></input>
@ -38,6 +35,7 @@
ARN of Assume Role ARN of Assume Role
</info-popover> </info-popover>
</div> </div>
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label width-13">Default Region</label> <label class="gf-form-label width-13">Default Region</label>
<div class="gf-form-select-wrapper max-width-18 gf-form-select-wrapper--has-help-icon"> <div class="gf-form-select-wrapper max-width-18 gf-form-select-wrapper--has-help-icon">