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

Fix panic in elasticsearch input if cannot determine master (#2954) 

(cherry picked from commit a7595c918a)
This commit is contained in:
Bob Shannon 2017-06-26 18:23:53 -04:00 committed by Daniel Nelson
parent da640a8af7
commit 2e6f7055cb
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/inputs/elasticsearch/elasticsearch.go
View File

@ -169,7 +169,10 @@ func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
if e.ClusterStats { if e.ClusterStats {
// get cat/master information here so NodeStats can determine // get cat/master information here so NodeStats can determine
// whether this node is the Master // whether this node is the Master
e.setCatMaster(s + "/_cat/master") if err := e.setCatMaster(s + "/_cat/master"); err != nil {
acc.AddError(fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@")))
return
}
} }
// Always gather node states // Always gather node states
@ -353,7 +356,7 @@ func (e *Elasticsearch) setCatMaster(url string) error {
// NOTE: we are not going to read/discard r.Body under the assumption we'd prefer // NOTE: we are not going to read/discard r.Body under the assumption we'd prefer
// to let the underlying transport close the connection and re-establish a new one for // to let the underlying transport close the connection and re-establish a new one for
// future calls. // future calls.
return fmt.Errorf("status-code %d, expected %d", r.StatusCode, http.StatusOK) return fmt.Errorf("elasticsearch: Unable to retrieve master node information. API responded with status-code %d, expected %d", r.StatusCode, http.StatusOK)
} }
response, err := ioutil.ReadAll(r.Body) response, err := ioutil.ReadAll(r.Body)