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

pkg/api/cloudwatch: fix api client construction against aws-sdk-go v0.10.2

Browse Source
This commit is contained in:
Nick Owens 2015-11-07 18:17:05 -08:00
parent 56e2082205
commit b0cb6d6d4c
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/api/cloudwatch/cloudwatch.go
View File

@ -9,6 +9,7 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds" "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/cloudwatch" "github.com/aws/aws-sdk-go/service/cloudwatch"
"github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2"
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"
@ -45,10 +46,13 @@ func handleGetMetricStatistics(req *cwRequest, c *middleware.Context) {
&credentials.SharedCredentialsProvider{Filename: "", Profile: req.DataSource.Database}, &credentials.SharedCredentialsProvider{Filename: "", Profile: req.DataSource.Database},
&ec2rolecreds.EC2RoleProvider{ExpiryWindow: 5 * time.Minute}, &ec2rolecreds.EC2RoleProvider{ExpiryWindow: 5 * time.Minute},
}) })
svc := cloudwatch.New(&aws.Config{
cfg := &aws.Config{
Region: aws.String(req.Region), Region: aws.String(req.Region),
Credentials: creds, Credentials: creds,
}) }
svc := cloudwatch.New(session.New(cfg), cfg)
reqParam := &struct { reqParam := &struct {
Parameters struct { Parameters struct {
@ -89,10 +93,13 @@ func handleListMetrics(req *cwRequest, c *middleware.Context) {
&credentials.SharedCredentialsProvider{Filename: "", Profile: req.DataSource.Database}, &credentials.SharedCredentialsProvider{Filename: "", Profile: req.DataSource.Database},
&ec2rolecreds.EC2RoleProvider{ExpiryWindow: 5 * time.Minute}, &ec2rolecreds.EC2RoleProvider{ExpiryWindow: 5 * time.Minute},
}) })
svc := cloudwatch.New(&aws.Config{
cfg := &aws.Config{
Region: aws.String(req.Region), Region: aws.String(req.Region),
Credentials: creds, Credentials: creds,
}) }
svc := cloudwatch.New(session.New(cfg), cfg)
reqParam := &struct { reqParam := &struct {
Parameters struct { Parameters struct {
@ -119,7 +126,11 @@ func handleListMetrics(req *cwRequest, c *middleware.Context) {
} }
func handleDescribeInstances(req *cwRequest, c *middleware.Context) { func handleDescribeInstances(req *cwRequest, c *middleware.Context) {
svc := ec2.New(&aws.Config{Region: aws.String(req.Region)}) cfg := &aws.Config{
Region: aws.String(req.Region),
}
svc := ec2.New(session.New(cfg), cfg)
reqParam := &struct { reqParam := &struct {
Parameters struct { Parameters struct {