From 7b27cad1baac8a6346ad13419fb1a0df81c21ab4 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 22 Apr 2016 10:23:00 -0600
Subject: [PATCH] Dont specify AWS credential chain, use default
closes #1078
---
CHANGELOG.md | 1 +
plugins/inputs/cloudwatch/cloudwatch.go | 13 ++-----------
plugins/outputs/cloudwatch/cloudwatch.go | 9 ---------
plugins/outputs/kinesis/kinesis.go | 9 ---------
4 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e45895f..c49d2b72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ based on _prefix_ in addition to globs. This means that a filter like
- [#1058](https://github.com/influxdata/telegraf/issues/1058): Fix possible leaky TCP connections in influxdb output.
- [#1044](https://github.com/influxdata/telegraf/pull/1044): Fix SNMP OID possible collisions. Thanks @relip
- [#1022](https://github.com/influxdata/telegraf/issues/1022): Dont error deb/rpm install on systemd errors.
+- [#1078](https://github.com/influxdata/telegraf/issues/1078): Use default AWS credential chain.
## v0.12.1 [2016-04-14]
diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go
index e3fa74ba..8e638418 100644
--- a/plugins/inputs/cloudwatch/cloudwatch.go
+++ b/plugins/inputs/cloudwatch/cloudwatch.go
@@ -6,9 +6,6 @@ import (
"time"
"github.com/aws/aws-sdk-go/aws"
- "github.com/aws/aws-sdk-go/aws/credentials"
- "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
- "github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/cloudwatch"
@@ -62,7 +59,7 @@ func (c *CloudWatch) SampleConfig() string {
## Collection Delay (required - must account for metrics availability via CloudWatch API)
delay = '1m'
- ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid
+ ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid
## gaps or overlap in pulled data
interval = '1m'
@@ -74,7 +71,7 @@ func (c *CloudWatch) SampleConfig() string {
## Refreshes Namespace available metrics every 1h
#[[inputs.cloudwatch.metrics]]
# names = ['Latency', 'RequestCount']
- #
+ #
# ## Dimension filters for Metric (optional)
# [[inputs.cloudwatch.metrics.dimensions]]
# name = 'LoadBalancerName'
@@ -154,12 +151,6 @@ func init() {
func (c *CloudWatch) initializeCloudWatch() error {
config := &aws.Config{
Region: aws.String(c.Region),
- Credentials: credentials.NewChainCredentials(
- []credentials.Provider{
- &ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(session.New())},
- &credentials.EnvProvider{},
- &credentials.SharedCredentialsProvider{},
- }),
}
c.client = cloudwatch.New(session.New(config))
diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go
index 42d98b5b..75b2addf 100644
--- a/plugins/outputs/cloudwatch/cloudwatch.go
+++ b/plugins/outputs/cloudwatch/cloudwatch.go
@@ -8,9 +8,6 @@ import (
"time"
"github.com/aws/aws-sdk-go/aws"
- "github.com/aws/aws-sdk-go/aws/credentials"
- "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
- "github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/cloudwatch"
@@ -43,12 +40,6 @@ func (c *CloudWatch) Description() string {
func (c *CloudWatch) Connect() error {
Config := &aws.Config{
Region: aws.String(c.Region),
- Credentials: credentials.NewChainCredentials(
- []credentials.Provider{
- &ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(session.New())},
- &credentials.EnvProvider{},
- &credentials.SharedCredentialsProvider{},
- }),
}
svc := cloudwatch.New(session.New(Config))
diff --git a/plugins/outputs/kinesis/kinesis.go b/plugins/outputs/kinesis/kinesis.go
index 01906a7f..a4b5e6a7 100644
--- a/plugins/outputs/kinesis/kinesis.go
+++ b/plugins/outputs/kinesis/kinesis.go
@@ -8,9 +8,6 @@ import (
"time"
"github.com/aws/aws-sdk-go/aws"
- "github.com/aws/aws-sdk-go/aws/credentials"
- "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
- "github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/kinesis"
@@ -67,12 +64,6 @@ func (k *KinesisOutput) Connect() error {
}
Config := &aws.Config{
Region: aws.String(k.Region),
- Credentials: credentials.NewChainCredentials(
- []credentials.Provider{
- &ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(session.New())},
- &credentials.EnvProvider{},
- &credentials.SharedCredentialsProvider{},
- }),
}
svc := kinesis.New(session.New(Config))
--
GitLab