Merge branch 'master' of github.com:grafana/grafana

public/app/plugins/datasource/cloudwatch/partials/config.html

@@ -15,14 +15,14 @@
   </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 ID </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="btn btn-secondary gf-form-btn" 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" class="gf-form-input max-width-18" ng-hide="ctrl.accessKeyExist" ng-model='ctrl.current.secureJsonData.accessKey'></input>
     <input type="text" 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 access 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-secondary gf-form-btn" 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" class="gf-form-input max-width-18" ng-hide="ctrl.secretKeyExist" ng-model='ctrl.current.secureJsonData.secretKey'></input>
     <input type="text" class="gf-form-input max-width-18" ng-hide="ctrl.secretKeyExist" ng-model='ctrl.current.secureJsonData.secretKey'></input>