Merge pull request #2789 from mtanda/aws_default_region

config: set default region for EC2 SD
This commit is contained in:
Fabian Reinartz 2017-06-12 16:15:53 +02:00 committed by GitHub
commit 9ba61df45a

View file

@ -23,6 +23,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )
@ -1134,7 +1136,16 @@ func (c *EC2SDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
return err return err
} }
if c.Region == "" { if c.Region == "" {
return fmt.Errorf("EC2 SD configuration requires a region") sess, err := session.NewSession()
if err != nil {
return err
}
metadata := ec2metadata.New(sess)
region, err := metadata.Region()
if err != nil {
return fmt.Errorf("EC2 SD configuration requires a region")
}
c.Region = region
} }
return nil return nil
} }