Merge pull request grafana#3703 from mtanda/cloudwatch_seoul

torkelo · torkelo · commit 144c703c7b4e · 2016-01-12T10:51:34.000+01:00
(cloudwatch) add seoul region
diff --git a/pkg/api/cloudwatch/metrics.go b/pkg/api/cloudwatch/metrics.go
@@ -91,7 +91,7 @@ func init() {
 // Please update the region list in public/app/plugins/datasource/cloudwatch/partials/config.html
 func handleGetRegions(req *cwRequest, c *middleware.Context) {
 	regions := []string{
-		"ap-northeast-1", "ap-southeast-1", "ap-southeast-2", "cn-north-1",
+		"ap-northeast-1", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "cn-north-1",
 		"eu-central-1", "eu-west-1", "sa-east-1", "us-east-1", "us-west-1", "us-west-2",
 	}
 
diff --git a/public/app/plugins/datasource/cloudwatch/partials/config.html b/public/app/plugins/datasource/cloudwatch/partials/config.html
@@ -24,8 +24,7 @@ <h5>CloudWatch details</h5>
           Please update the region list in pkg/api/cloudwatch/metric.go
 				-->
         <li>
-          <select class="tight-form-input input-large last" ng-model="current.jsonData.defaultRegion" ng-options="region for region in ['us-east-1', 'us-west-2', 'us-west-1', 'eu-west-1',
-          'eu-central-1', 'ap-southeast-1'  ,'ap-southeast-2' ,'ap-northeast-1' ,'sa-east-1'  ,'cn-north-1']"></select>
+          <select class="tight-form-input input-large last" ng-model="current.jsonData.defaultRegion" ng-options="region for region in ['ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2', 'cn-north-1', 'eu-central-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2']"></select>
 				</li>
 			</ul>
 			<div class="clearfix"></div>

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func init() {`
`91`	`91`	`// Please update the region list in public/app/plugins/datasource/cloudwatch/partials/config.html`
`92`	`92`	`func handleGetRegions(req cwRequest, c middleware.Context) {`
`93`	`93`	`regions := []string{`
`94`		`- "ap-northeast-1", "ap-southeast-1", "ap-southeast-2", "cn-north-1",`
	`94`	`+ "ap-northeast-1", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "cn-north-1",`
`95`	`95`	`"eu-central-1", "eu-west-1", "sa-east-1", "us-east-1", "us-west-1", "us-west-2",`
`96`	`96`	`}`
`97`	`97`