Differential D4267 Diff 10470 www/grafana2/files/patch-src_github.com_grafana_grafana_pkg_api_cloudwatch_cloudwatch.go
Changeset View
Changeset View
Standalone View
Standalone View
www/grafana2/files/patch-src_github.com_grafana_grafana_pkg_api_cloudwatch_cloudwatch.go
- This file was added.
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- src/github.com/grafana/grafana/pkg/api/cloudwatch/cloudwatch.go.orig 2015-10-28 08:31:57 UTC | |||||
+++ src/github.com/grafana/grafana/pkg/api/cloudwatch/cloudwatch.go | |||||
@@ -7,6 +7,7 @@ import ( | |||||
"time" | |||||
"github.com/aws/aws-sdk-go/aws" | |||||
+ "github.com/aws/aws-sdk-go/aws/session" | |||||
"github.com/aws/aws-sdk-go/service/cloudwatch" | |||||
"github.com/aws/aws-sdk-go/service/ec2" | |||||
"github.com/grafana/grafana/pkg/middleware" | |||||
@@ -35,7 +36,8 @@ func init() { | |||||
} | |||||
func handleGetMetricStatistics(req *cwRequest, c *middleware.Context) { | |||||
- svc := cloudwatch.New(&aws.Config{Region: aws.String(req.Region)}) | |||||
+ sess := session.New(&aws.Config{Region: aws.String(req.Region)}) | |||||
+ svc := cloudwatch.New(sess) | |||||
reqParam := &struct { | |||||
Parameters struct { | |||||
@@ -70,7 +72,8 @@ func handleGetMetricStatistics(req *cwRe | |||||
} | |||||
func handleListMetrics(req *cwRequest, c *middleware.Context) { | |||||
- svc := cloudwatch.New(&aws.Config{Region: aws.String(req.Region)}) | |||||
+ sess := session.New(&aws.Config{Region: aws.String(req.Region)}) | |||||
+ svc := cloudwatch.New(sess) | |||||
reqParam := &struct { | |||||
Parameters struct { | |||||
Namespace string `json:"namespace"` | |||||
@@ -97,7 +100,8 @@ func handleListMetrics(req *cwRequest, c | |||||
} | |||||
func handleDescribeInstances(req *cwRequest, c *middleware.Context) { | |||||
- svc := ec2.New(&aws.Config{Region: aws.String(req.Region)}) | |||||
+ sess := session.New(&aws.Config{Region: aws.String(req.Region)}) | |||||
+ svc := ec2.New(sess) | |||||
reqParam := &struct { | |||||
Parameters struct { |