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 pull request #10110 from bwhaley/master

Browse Source 
Fixes bug in cloudwatch regarding credentials
This commit is contained in:
Carl Bergquist 2017-12-12 10:16:53 +01:00 committed by GitHub
commit ea2f65b4c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/tsdb/cloudwatch/credentials.go
View File

@ -11,6 +11,7 @@ import (
"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/credentials/endpointcreds" "github.com/aws/aws-sdk-go/aws/credentials/endpointcreds"
"github.com/aws/aws-sdk-go/aws/defaults"
"github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/cloudwatch" "github.com/aws/aws-sdk-go/service/cloudwatch"
@ -128,10 +129,10 @@ func remoteCredProvider(sess *session.Session) credentials.Provider {
func ecsCredProvider(sess *session.Session, uri string) credentials.Provider { func ecsCredProvider(sess *session.Session, uri string) credentials.Provider {
const host = `169.254.170.2` const host = `169.254.170.2`
c := ec2metadata.New(sess) d := defaults.Get()
return endpointcreds.NewProviderClient( return endpointcreds.NewProviderClient(
c.Client.Config, *d.Config,
c.Client.Handlers, d.Handlers,
fmt.Sprintf("http://%s%s", host, uri), fmt.Sprintf("http://%s%s", host, uri),
func(p *endpointcreds.Provider) { p.ExpiryWindow = 5 * time.Minute }) func(p *endpointcreds.Provider) { p.ExpiryWindow = 5 * time.Minute })
} }