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

Merge branch 'support_aws_profiles' of https://github.com/peekeri/grafana into peekeri-support_aws_profiles

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-10-29 11:14:04 +01:00
parent 4729bea1a2 23599814a3
commit 135ba68ff5
3 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/plugins/datasource/cloudwatch/datasource.js
View File

@@ -18,6 +18,7 @@ function (angular, _) {
this.supportMetrics = true;
this.proxyUrl = datasource.url;
this.defaultRegion = datasource.jsonData.defaultRegion;
this.profile = datasource.jsonData.profile;
}
CloudWatchDatasource.prototype.query = function(options) {
@@ -73,6 +74,7 @@ function (angular, _) {
CloudWatchDatasource.prototype.performTimeSeriesQuery = function(query, start, end) {
return this.awsRequest({
region: query.region,
profile: this.profile,
action: 'GetMetricStatistics',
parameters: {
namespace: query.namespace,
@@ -115,6 +117,7 @@ function (angular, _) {
CloudWatchDatasource.prototype.getDimensionValues = function(region, namespace, metricName, dimensions) {
var request = {
region: templateSrv.replace(region),
profile: this.profile,
action: 'ListMetrics',
parameters: {
namespace: templateSrv.replace(namespace),

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

@@ -12,6 +12,17 @@
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 160px">
AWS Profile
</li>
<li>
<input type="text" class="tight-form-input input-xlarge" ng-model='current.jsonData.profile' placeholder="default" required></input>
</li>
</ul>
<div class="clearfix"></div>
</div>
<!-- <div class="tight&#45;form" ng&#45;show="current.jsonData.access === 'direct'"> -->
<!-- <ul class="tight&#45;form&#45;list"> -->