dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for configuring an AWS endpoint_url (#4485)

This commit is contained in:
Daniel Nelson 2018-07-31 15:07:21 -07:00 committed by Greg
parent 228efe9a1d
commit 93ed28e745
5 changed files with 84 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
internal/config/aws/credentials.go
View File

@ -9,13 +9,14 @@ import (
) )
type CredentialConfig struct { type CredentialConfig struct {
Region string Region string
AccessKey string AccessKey string
SecretKey string SecretKey string
RoleARN string RoleARN string
Profile string Profile string
Filename string Filename string
Token string Token string
EndpointURL string
} }
func (c *CredentialConfig) Credentials() client.ConfigProvider { func (c *CredentialConfig) Credentials() client.ConfigProvider {
@ -28,7 +29,8 @@ func (c *CredentialConfig) Credentials() client.ConfigProvider {
func (c *CredentialConfig) rootCredentials() client.ConfigProvider { func (c *CredentialConfig) rootCredentials() client.ConfigProvider {
config := &aws.Config{ config := &aws.Config{
Region: aws.String(c.Region), Region: aws.String(c.Region),
Endpoint: &c.EndpointURL,
} }
if c.AccessKey != "" || c.SecretKey != "" { if c.AccessKey != "" || c.SecretKey != "" {
config.Credentials = credentials.NewStaticCredentials(c.AccessKey, c.SecretKey, c.Token) config.Credentials = credentials.NewStaticCredentials(c.AccessKey, c.SecretKey, c.Token)
@ -42,7 +44,8 @@ func (c *CredentialConfig) rootCredentials() client.ConfigProvider {
func (c *CredentialConfig) assumeCredentials() client.ConfigProvider { func (c *CredentialConfig) assumeCredentials() client.ConfigProvider {
rootCredentials := c.rootCredentials() rootCredentials := c.rootCredentials()
config := &aws.Config{ config := &aws.Config{
Region: aws.String(c.Region), Region: aws.String(c.Region),
Endpoint: &c.EndpointURL,
} }
config.Credentials = stscreds.NewCredentials(rootCredentials, c.RoleARN) config.Credentials = stscreds.NewCredentials(rootCredentials, c.RoleARN)
return session.New(config) return session.New(config)

6
plugins/inputs/cloudwatch/README.md
View File

@ -35,6 +35,12 @@ API endpoint. In the following order the plugin will attempt to authenticate.
#profile = "" #profile = ""
#shared_credential_file = "" #shared_credential_file = ""
## Endpoint to make request against, the correct endpoint is automatically
## determined and this option should only be set if you wish to override the
## default.
## ex: endpoint_url = "http://localhost:8000"
# endpoint_url = ""
# The minimum period for Cloudwatch metrics is 1 minute (60s). However not all # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
# metrics are made available to the 1 minute period. Some are collected at # metrics are made available to the 1 minute period. Some are collected at
# 3 minute, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring. # 3 minute, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.

36
plugins/inputs/cloudwatch/cloudwatch.go
View File

@ -19,13 +19,14 @@ import (
type ( type (
CloudWatch struct { CloudWatch struct {
Region string `toml:"region"` Region string `toml:"region"`
AccessKey string `toml:"access_key"` AccessKey string `toml:"access_key"`
SecretKey string `toml:"secret_key"` SecretKey string `toml:"secret_key"`
RoleARN string `toml:"role_arn"` RoleARN string `toml:"role_arn"`
Profile string `toml:"profile"` Profile string `toml:"profile"`
Filename string `toml:"shared_credential_file"` Filename string `toml:"shared_credential_file"`
Token string `toml:"token"` Token string `toml:"token"`
EndpointURL string `toml:"endpoint_url"`
Period internal.Duration `toml:"period"` Period internal.Duration `toml:"period"`
Delay internal.Duration `toml:"delay"` Delay internal.Duration `toml:"delay"`
@ -79,6 +80,12 @@ func (c *CloudWatch) SampleConfig() string {
#profile = "" #profile = ""
#shared_credential_file = "" #shared_credential_file = ""
## Endpoint to make request against, the correct endpoint is automatically
## determined and this option should only be set if you wish to override the
## default.
## ex: endpoint_url = "http://localhost:8000"
# endpoint_url = ""
# The minimum period for Cloudwatch metrics is 1 minute (60s). However not all # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
# metrics are made available to the 1 minute period. Some are collected at # metrics are made available to the 1 minute period. Some are collected at
# 3 minute, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring. # 3 minute, 5 minute, or larger intervals. See https://aws.amazon.com/cloudwatch/faqs/#monitoring.
@ -224,13 +231,14 @@ func init() {
*/ */
func (c *CloudWatch) initializeCloudWatch() error { func (c *CloudWatch) initializeCloudWatch() error {
credentialConfig := &internalaws.CredentialConfig{ credentialConfig := &internalaws.CredentialConfig{
Region: c.Region, Region: c.Region,
AccessKey: c.AccessKey, AccessKey: c.AccessKey,
SecretKey: c.SecretKey, SecretKey: c.SecretKey,
RoleARN: c.RoleARN, RoleARN: c.RoleARN,
Profile: c.Profile, Profile: c.Profile,
Filename: c.Filename, Filename: c.Filename,
Token: c.Token, Token: c.Token,
EndpointURL: c.EndpointURL,
} }
configProvider := credentialConfig.Credentials() configProvider := credentialConfig.Credentials()

36
plugins/outputs/cloudwatch/cloudwatch.go
View File

@ -17,13 +17,14 @@ import (
) )
type CloudWatch struct { type CloudWatch struct {
Region string `toml:"region"` Region string `toml:"region"`
AccessKey string `toml:"access_key"` AccessKey string `toml:"access_key"`
SecretKey string `toml:"secret_key"` SecretKey string `toml:"secret_key"`
RoleARN string `toml:"role_arn"` RoleARN string `toml:"role_arn"`
Profile string `toml:"profile"` Profile string `toml:"profile"`
Filename string `toml:"shared_credential_file"` Filename string `toml:"shared_credential_file"`
Token string `toml:"token"` Token string `toml:"token"`
EndpointURL string `toml:"endpoint_url"`
Namespace string `toml:"namespace"` // CloudWatch Metrics Namespace Namespace string `toml:"namespace"` // CloudWatch Metrics Namespace
svc *cloudwatch.CloudWatch svc *cloudwatch.CloudWatch
@ -48,6 +49,12 @@ var sampleConfig = `
#profile = "" #profile = ""
#shared_credential_file = "" #shared_credential_file = ""
## Endpoint to make request against, the correct endpoint is automatically
## determined and this option should only be set if you wish to override the
## default.
## ex: endpoint_url = "http://localhost:8000"
# endpoint_url = ""
## Namespace for the CloudWatch MetricDatums ## Namespace for the CloudWatch MetricDatums
namespace = "InfluxData/Telegraf" namespace = "InfluxData/Telegraf"
` `
@ -62,13 +69,14 @@ func (c *CloudWatch) Description() string {
func (c *CloudWatch) Connect() error { func (c *CloudWatch) Connect() error {
credentialConfig := &internalaws.CredentialConfig{ credentialConfig := &internalaws.CredentialConfig{
Region: c.Region, Region: c.Region,
AccessKey: c.AccessKey, AccessKey: c.AccessKey,
SecretKey: c.SecretKey, SecretKey: c.SecretKey,
RoleARN: c.RoleARN, RoleARN: c.RoleARN,
Profile: c.Profile, Profile: c.Profile,
Filename: c.Filename, Filename: c.Filename,
Token: c.Token, Token: c.Token,
EndpointURL: c.EndpointURL,
} }
configProvider := credentialConfig.Credentials() configProvider := credentialConfig.Credentials()

36
plugins/outputs/kinesis/kinesis.go
View File

@ -17,13 +17,14 @@ import (
type ( type (
KinesisOutput struct { KinesisOutput struct {
Region string `toml:"region"` Region string `toml:"region"`
AccessKey string `toml:"access_key"` AccessKey string `toml:"access_key"`
SecretKey string `toml:"secret_key"` SecretKey string `toml:"secret_key"`
RoleARN string `toml:"role_arn"` RoleARN string `toml:"role_arn"`
Profile string `toml:"profile"` Profile string `toml:"profile"`
Filename string `toml:"shared_credential_file"` Filename string `toml:"shared_credential_file"`
Token string `toml:"token"` Token string `toml:"token"`
EndpointURL string `toml:"endpoint_url"`
StreamName string `toml:"streamname"` StreamName string `toml:"streamname"`
PartitionKey string `toml:"partitionkey"` PartitionKey string `toml:"partitionkey"`
@ -60,6 +61,12 @@ var sampleConfig = `
#profile = "" #profile = ""
#shared_credential_file = "" #shared_credential_file = ""
## Endpoint to make request against, the correct endpoint is automatically
## determined and this option should only be set if you wish to override the
## default.
## ex: endpoint_url = "http://localhost:8000"
# endpoint_url = ""
## Kinesis StreamName must exist prior to starting telegraf. ## Kinesis StreamName must exist prior to starting telegraf.
streamname = "StreamName" streamname = "StreamName"
## DEPRECATED: PartitionKey as used for sharding data. ## DEPRECATED: PartitionKey as used for sharding data.
@ -126,13 +133,14 @@ func (k *KinesisOutput) Connect() error {
} }
credentialConfig := &internalaws.CredentialConfig{ credentialConfig := &internalaws.CredentialConfig{
Region: k.Region, Region: k.Region,
AccessKey: k.AccessKey, AccessKey: k.AccessKey,
SecretKey: k.SecretKey, SecretKey: k.SecretKey,
RoleARN: k.RoleARN, RoleARN: k.RoleARN,
Profile: k.Profile, Profile: k.Profile,
Filename: k.Filename, Filename: k.Filename,
Token: k.Token, Token: k.Token,
EndpointURL: k.EndpointURL,
} }
configProvider := credentialConfig.Credentials() configProvider := credentialConfig.Credentials()
svc := kinesis.New(configProvider) svc := kinesis.New(configProvider)