Clearing LGTM alerts and warnings (#8923)

.lgtm.yml

@@ -0,0 +1,2 @@
+queries:
+  - exclude: go/disabled-certificate-check

README.md

@@ -1,4 +1,4 @@
-# Telegraf [![Circle CI](https://circleci.com/gh/influxdata/telegraf.svg?style=svg)](https://circleci.com/gh/influxdata/telegraf) [![Docker pulls](https://img.shields.io/docker/pulls/library/telegraf.svg)](https://hub.docker.com/_/telegraf/)
+# Telegraf [![Circle CI](https://circleci.com/gh/influxdata/telegraf.svg?style=svg)](https://circleci.com/gh/influxdata/telegraf) [![Docker pulls](https://img.shields.io/docker/pulls/library/telegraf.svg)](https://hub.docker.com/_/telegraf/) [![Total alerts](https://img.shields.io/lgtm/alerts/g/influxdata/telegraf.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/influxdata/telegraf/alerts/)
 [![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://www.influxdata.com/slack)
 
 Telegraf is an agent for collecting, processing, aggregating, and writing metrics.

plugins/inputs/github/github.go

@@ -146,22 +146,22 @@ func (g *GitHub) Gather(acc telegraf.Accumulator) error {
 			fields := getFields(repositoryInfo)
 
 			for _, field := range g.AdditionalFields {
-				addFields := make(map[string]interface{})
 				switch field {
 				case "pull-requests":
 					// Pull request properties
-					addFields, err = g.getPullRequestFields(ctx, owner, repository)
+					addFields, err := g.getPullRequestFields(ctx, owner, repository)
 					if err != nil {
 						acc.AddError(err)
 						continue
 					}
+
+					for k, v := range addFields {
+						fields[k] = v
+					}
 				default:
 					acc.AddError(fmt.Errorf("unknown additional field %q", field))
 					continue
 				}
-				for k, v := range addFields {
-					fields[k] = v
-				}
 			}
 
 			acc.AddFields("github_repository", fields, tags, now)

plugins/inputs/jolokia2/client.go

@@ -119,8 +119,8 @@ func NewClient(url string, config *ClientConfig) (*Client, error) {
 }
 
 func (c *Client) read(requests []ReadRequest) ([]ReadResponse, error) {
-	jrequests := makeJolokiaRequests(requests, c.config.ProxyConfig)
+	jRequests := makeJolokiaRequests(requests, c.config.ProxyConfig)
-	requestBody, err := json.Marshal(jrequests)
+	requestBody, err := json.Marshal(jRequests)
 	if err != nil {
 		return nil, err
 	}
@@ -132,7 +132,8 @@ func (c *Client) read(requests []ReadRequest) ([]ReadResponse, error) {
 
 	req, err := http.NewRequest("POST", requestURL, bytes.NewBuffer(requestBody))
 	if err != nil {
-		return nil, fmt.Errorf("unable to create new request '%s': %s", requestURL, err)
+		//err is not contained in returned error - it may contain sensitive data (password) which should not be logged
+		return nil, fmt.Errorf("unable to create new request for: '%s'", c.URL)
 	}
 
 	req.Header.Add("Content-type", "application/json")
@@ -144,7 +145,7 @@ func (c *Client) read(requests []ReadRequest) ([]ReadResponse, error) {
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("Response from url \"%s\" has status code %d (%s), expected %d (%s)",
+		return nil, fmt.Errorf("response from url \"%s\" has status code %d (%s), expected %d (%s)",
 			c.URL, resp.StatusCode, http.StatusText(resp.StatusCode), http.StatusOK, http.StatusText(http.StatusOK))
 	}
 
@@ -153,12 +154,12 @@ func (c *Client) read(requests []ReadRequest) ([]ReadResponse, error) {
 		return nil, err
 	}
 
-	var jresponses []jolokiaResponse
+	var jResponses []jolokiaResponse
-	if err = json.Unmarshal([]byte(responseBody), &jresponses); err != nil {
+	if err = json.Unmarshal(responseBody, &jResponses); err != nil {
-		return nil, fmt.Errorf("Error decoding JSON response: %s: %s", err, responseBody)
+		return nil, fmt.Errorf("decoding JSON response: %s: %s", err, responseBody)
 	}
 
-	return makeReadResponses(jresponses), nil
+	return makeReadResponses(jResponses), nil
 }
 
 func makeJolokiaRequests(rrequests []ReadRequest, proxyConfig *ProxyConfig) []jolokiaRequest {

plugins/inputs/riemann_listener/riemann_listener.go

@@ -170,8 +170,7 @@ func (rsl *riemannListener) read(conn net.Conn) {
 
 	for {
 		if rsl.ReadTimeout != nil && rsl.ReadTimeout.Duration > 0 {
-
+			conn.SetDeadline(time.Now().Add(rsl.ReadTimeout.Duration))
-			err = conn.SetDeadline(time.Now().Add(rsl.ReadTimeout.Duration))
 		}
 
 		messagePb := &riemangoProto.Msg{}

plugins/outputs/http/http.go

@@ -218,6 +218,9 @@ func (h *HTTP) write(reqBody []byte) error {
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 		return fmt.Errorf("when writing to [%s] received status code: %d", h.URL, resp.StatusCode)
 	}
+	if err != nil {
+		return fmt.Errorf("when writing to [%s] received error: %v", h.URL, err)
+	}
 
 	return nil
 }

plugins/outputs/yandex_cloud_monitoring/yandex_cloud_monitoring.go

@@ -156,7 +156,6 @@ func (a *YandexCloudMonitoring) Write(metrics []telegraf.Metric) error {
 	if err != nil {
 		return err
 	}
-	body = append(body, jsonBytes...)
 	body = append(jsonBytes, '\n')
 	return a.send(body)
 }

plugins/parsers/prometheus/parser.go

@@ -76,8 +76,7 @@ func (p *Parser) Parse(buf []byte) ([]telegraf.Metric, error) {
 			} else {
 				// standard metric
 				// reading fields
-				fields := make(map[string]interface{})
+				fields := getNameAndValue(m, metricName)
-				fields = getNameAndValue(m, metricName)
 				// converting to telegraf metric
 				if len(fields) > 0 {
 					t := getTimestamp(m, now)