Merge pull request #2079 from prometheus/superq/fix_conntrack_error

SuperQ · web-flow · commit 9bd826501acf · 2021-07-15T14:27:23.000+02:00
Fix conntrack collector log noise
diff --git a/collector/conntrack_linux.go b/collector/conntrack_linux.go
@@ -129,7 +129,7 @@ func (c *conntrackCollector) Update(ch chan<- prometheus.Metric) error {
 
 	conntrackStats, err := getConntrackStatistics()
 	if err != nil {
-		return err
+		return c.handleErr(err)
 	}
 
 	ch <- prometheus.MustNewConstMetric(

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ func (c *conntrackCollector) Update(ch chan<- prometheus.Metric) error {`
`129`	`129`
`130`	`130`	`conntrackStats, err := getConntrackStatistics()`
`131`	`131`	`if err != nil {`
`132`		`- return err`
	`132`	`+ return c.handleErr(err)`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`ch <- prometheus.MustNewConstMetric(`