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

Redact datadog API key in log output (#3420)

This commit is contained in:
Bob Shannon 2017-11-06 20:41:14 -05:00 committed by Daniel Nelson
parent e5a265c8c7
commit fdf12ce6b4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/outputs/datadog/datadog.go
View File

@ -8,6 +8,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"sort" "sort"
"strings"
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/internal"
@ -100,6 +101,7 @@ func (d *Datadog) Write(metrics []telegraf.Metric) error {
} }
} }
redactedApiKey := "****************"
ts.Series = make([]*Metric, metricCounter) ts.Series = make([]*Metric, metricCounter)
copy(ts.Series, tempSeries[0:]) copy(ts.Series, tempSeries[0:])
tsBytes, err := json.Marshal(ts) tsBytes, err := json.Marshal(ts)
@ -108,13 +110,13 @@ func (d *Datadog) Write(metrics []telegraf.Metric) error {
} }
req, err := http.NewRequest("POST", d.authenticatedUrl(), bytes.NewBuffer(tsBytes)) req, err := http.NewRequest("POST", d.authenticatedUrl(), bytes.NewBuffer(tsBytes))
if err != nil { if err != nil {
return fmt.Errorf("unable to create http.Request, %s\n", err.Error()) return fmt.Errorf("unable to create http.Request, %s\n", strings.Replace(err.Error(), d.Apikey, redactedApiKey, -1))
} }
req.Header.Add("Content-Type", "application/json") req.Header.Add("Content-Type", "application/json")
resp, err := d.client.Do(req) resp, err := d.client.Do(req)
if err != nil { if err != nil {
return fmt.Errorf("error POSTing metrics, %s\n", err.Error()) return fmt.Errorf("error POSTing metrics, %s\n", strings.Replace(err.Error(), d.Apikey, redactedApiKey, -1))
} }
defer resp.Body.Close() defer resp.Body.Close()