chore(go.d.plugin): remove duplicate logging in init/check (#18955)
Ilya Mashchenko committed
Nov 6, 2024 at 17:06 UTC
8f0401ac3b4acb2dece6cbf319507fd4b79c810f
116 files changed
+310
-548
src/go/plugin/go.d/modules/activemq/activemq.go
+5
-9
@@ -5,6 +5,7 @@ package activemq
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/pkg/matcher"
@@ -75,28 +76,24 @@ func (a *ActiveMQ) Configuration() any {
76
77
func (a *ActiveMQ) Init() error {
78
if err := a.validateConfig(); err != nil {
78
- a.Errorf("config validation: %v", err)
79
- return err
79
+ return fmt.Errorf("config validation: %v", err)
80
}
81
82
qf, err := a.initQueuesFiler()
83
if err != nil {
84
- a.Error(err)
85
- return err
84
+ return fmt.Errorf("init queues filer: %v", err)
85
}
86
a.queuesFilter = qf
87
88
tf, err := a.initTopicsFilter()
89
if err != nil {
91
- a.Error(err)
92
- return err
90
+ return fmt.Errorf("init topics filter: %v", err)
91
}
92
a.topicsFilter = tf
93
94
client, err := web.NewHTTPClient(a.ClientConfig)
95
if err != nil {
98
- a.Error(err)
99
- return err
96
+ return fmt.Errorf("create http client: %v", err)
97
}
98
99
a.apiClient = newAPIClient(client, a.RequestConfig, a.Webadmin)
@@ -107,7 +104,6 @@ func (a *ActiveMQ) Init() error {
104
func (a *ActiveMQ) Check() error {
105
mx, err := a.collect()
106
if err != nil {
110
- a.Error(err)
107
return err
108
}
109
if len(mx) == 0 {
src/go/plugin/go.d/modules/adaptecraid/adaptec.go
+2
-3
@@ -7,6 +7,7 @@ package adaptecraid
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -68,8 +69,7 @@ func (a *AdaptecRaid) Configuration() any {
69
func (a *AdaptecRaid) Init() error {
70
arcconfExec, err := a.initArcconfCliExec()
71
if err != nil {
71
- a.Errorf("arcconf exec initialization: %v", err)
72
- return err
72
+ return fmt.Errorf("arcconf exec initialization: %v", err)
73
}
74
a.exec = arcconfExec
75
@@ -79,7 +79,6 @@ func (a *AdaptecRaid) Init() error {
79
func (a *AdaptecRaid) Check() error {
80
mx, err := a.collect()
81
if err != nil {
82
- a.Error(err)
82
return err
83
}
84
src/go/plugin/go.d/modules/ap/ap.go
+3
-5
@@ -7,6 +7,7 @@ package ap
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -67,14 +68,12 @@ func (a *AP) Configuration() any {
68
69
func (a *AP) Init() error {
70
if err := a.validateConfig(); err != nil {
70
- a.Errorf("config validation: %s", err)
71
- return err
71
+ return fmt.Errorf("config validation: %s", err)
72
}
73
74
iw, err := a.initIwExec()
75
if err != nil {
76
- a.Errorf("iw dev exec initialization: %v", err)
77
- return err
76
+ return fmt.Errorf("iw exec initialization: %v", err)
77
}
78
a.exec = iw
79
@@ -84,7 +83,6 @@ func (a *AP) Init() error {
83
func (a *AP) Check() error {
84
mx, err := a.collect()
85
if err != nil {
87
- a.Error(err)
86
return err
87
}
88
src/go/plugin/go.d/modules/apache/apache.go
+3
-5
@@ -5,6 +5,7 @@ package apache
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"sync"
11
"time"
@@ -64,14 +65,12 @@ func (a *Apache) Configuration() any {
65
66
func (a *Apache) Init() error {
67
if err := a.validateConfig(); err != nil {
67
- a.Errorf("config validation: %v", err)
68
- return err
68
+ return fmt.Errorf("config validation: %v", err)
69
}
70
71
httpClient, err := a.initHTTPClient()
72
if err != nil {
73
- a.Errorf("init HTTP client: %v", err)
74
- return err
73
+ return fmt.Errorf("init HTTP client: %v", err)
74
}
75
a.httpClient = httpClient
76
@@ -84,7 +83,6 @@ func (a *Apache) Init() error {
83
func (a *Apache) Check() error {
84
mx, err := a.collect()
85
if err != nil {
87
- a.Error(err)
86
return err
87
}
88
if len(mx) == 0 {
src/go/plugin/go.d/modules/apcupsd/apcupsd.go
+1
-3
@@ -55,8 +55,7 @@ func (a *Apcupsd) Configuration() any {
55
56
func (a *Apcupsd) Init() error {
57
if a.Address == "" {
58
- a.Error("config: 'address' not set")
59
- return errors.New("address not set")
58
+ return errors.New("config: 'address' not set")
59
}
60
61
return nil
@@ -65,7 +64,6 @@ func (a *Apcupsd) Init() error {
64
func (a *Apcupsd) Check() error {
65
mx, err := a.collect()
66
if err != nil {
68
- a.Error(err)
67
return err
68
}
69
if len(mx) == 0 {
src/go/plugin/go.d/modules/beanstalk/beanstalk.go
-1
@@ -85,7 +85,6 @@ func (b *Beanstalk) Init() error {
85
func (b *Beanstalk) Check() error {
86
mx, err := b.collect()
87
if err != nil {
88
- b.Error(err)
88
return err
89
}
90
src/go/plugin/go.d/modules/bind/bind.go
+5
-9
@@ -5,6 +5,7 @@ package bind
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -71,14 +72,12 @@ func (b *Bind) Configuration() any {
72
73
func (b *Bind) Init() error {
74
if err := b.validateConfig(); err != nil {
74
- b.Errorf("config verification: %v", err)
75
- return err
75
+ return fmt.Errorf("config verification: %v", err)
76
}
77
78
pvm, err := b.initPermitViewMatcher()
79
if err != nil {
80
- b.Error(err)
81
- return err
80
+ return fmt.Errorf("init permit view matcher: %v", err)
81
}
82
if pvm != nil {
83
b.permitView = pvm
@@ -86,15 +85,13 @@ func (b *Bind) Init() error {
85
86
httpClient, err := web.NewHTTPClient(b.ClientConfig)
87
if err != nil {
89
- b.Errorf("creating http client : %v", err)
90
- return err
88
+ return fmt.Errorf("creating http client : %v", err)
89
}
90
b.httpClient = httpClient
91
92
bindClient, err := b.initBindApiClient(httpClient)
93
if err != nil {
96
- b.Error(err)
97
- return err
94
+ return fmt.Errorf("init bind api client: %v", err)
95
}
96
b.bindAPIClient = bindClient
97
@@ -104,7 +101,6 @@ func (b *Bind) Init() error {
101
func (b *Bind) Check() error {
102
mx, err := b.collect()
103
if err != nil {
107
- b.Error(err)
104
return err
105
}
106
if len(mx) == 0 {
src/go/plugin/go.d/modules/boinc/boinc.go
+1
-3
@@ -57,8 +57,7 @@ func (b *Boinc) Configuration() any {
57
58
func (b *Boinc) Init() error {
59
if b.Address == "" {
60
- b.Error("config: 'address' not set")
61
- return errors.New("address not set")
60
+ return errors.New("config: 'address' not set")
61
}
62
63
return nil
@@ -67,7 +66,6 @@ func (b *Boinc) Init() error {
66
func (b *Boinc) Check() error {
67
mx, err := b.collect()
68
if err != nil {
70
- b.Error(err)
69
return err
70
}
71
src/go/plugin/go.d/modules/cassandra/cassandra.go
+3
-5
@@ -5,6 +5,7 @@ package cassandra
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -69,14 +70,12 @@ func (c *Cassandra) Configuration() any {
70
71
func (c *Cassandra) Init() error {
72
if err := c.validateConfig(); err != nil {
72
- c.Errorf("error on validating config: %v", err)
73
- return err
73
+ return fmt.Errorf("error on validating config: %v", err)
74
}
75
76
prom, err := c.initPrometheusClient()
77
if err != nil {
78
- c.Errorf("error on init prometheus client: %v", err)
79
- return err
78
+ return fmt.Errorf("error on init prometheus client: %v", err)
79
}
80
c.prom = prom
81
@@ -86,7 +85,6 @@ func (c *Cassandra) Init() error {
85
func (c *Cassandra) Check() error {
86
mx, err := c.collect()
87
if err != nil {
89
- c.Error(err)
88
return err
89
}
90
if len(mx) == 0 {
src/go/plugin/go.d/modules/ceph/ceph.go
+1
-2
@@ -84,7 +84,7 @@ func (c *Ceph) Init() error {
84
85
httpClient, err := web.NewHTTPClient(c.ClientConfig)
86
if err != nil {
87
- return err
87
+ return fmt.Errorf("create http client: %v", err)
88
}
89
c.httpClient = httpClient
90
@@ -94,7 +94,6 @@ func (c *Ceph) Init() error {
94
func (c *Ceph) Check() error {
95
mx, err := c.collect()
96
if err != nil {
97
- c.Error(err)
97
return err
98
}
99
src/go/plugin/go.d/modules/chrony/chrony.go
+2
-3
@@ -5,6 +5,7 @@ package chrony
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"sync"
10
"time"
11
@@ -60,8 +61,7 @@ func (c *Chrony) Configuration() any {
61
62
func (c *Chrony) Init() error {
63
if err := c.validateConfig(); err != nil {
63
- c.Errorf("config validation: %v", err)
64
- return err
64
+ return fmt.Errorf("config validation: %v", err)
65
}
66
67
var err error
@@ -75,7 +75,6 @@ func (c *Chrony) Init() error {
75
func (c *Chrony) Check() error {
76
mx, err := c.collect()
77
if err != nil {
78
- c.Error(err)
78
return err
79
}
80
if len(mx) == 0 {
src/go/plugin/go.d/modules/clickhouse/clickhouse.go
+3
-5
@@ -5,6 +5,7 @@ package clickhouse
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -69,14 +70,12 @@ func (c *ClickHouse) Configuration() any {
70
71
func (c *ClickHouse) Init() error {
72
if err := c.validateConfig(); err != nil {
72
- c.Errorf("config validation: %v", err)
73
- return err
73
+ return fmt.Errorf("config validation: %v", err)
74
}
75
76
httpClient, err := c.initHTTPClient()
77
if err != nil {
78
- c.Errorf("init HTTP client: %v", err)
79
- return err
78
+ return fmt.Errorf("init HTTP client: %v", err)
79
}
80
c.httpClient = httpClient
81
@@ -89,7 +88,6 @@ func (c *ClickHouse) Init() error {
88
func (c *ClickHouse) Check() error {
89
mx, err := c.collect()
90
if err != nil {
92
- c.Error(err)
91
return err
92
}
93
src/go/plugin/go.d/modules/cockroachdb/cockroachdb.go
+3
-5
@@ -5,6 +5,7 @@ package cockroachdb
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -67,14 +68,12 @@ func (c *CockroachDB) Configuration() any {
68
69
func (c *CockroachDB) Init() error {
70
if err := c.validateConfig(); err != nil {
70
- c.Errorf("error on validating config: %v", err)
71
- return err
71
+ return fmt.Errorf("error on validating config: %v", err)
72
}
73
74
prom, err := c.initPrometheusClient()
75
if err != nil {
76
- c.Error(err)
77
- return err
76
+ return fmt.Errorf("error on initializing prometheus client: %v", err)
77
}
78
c.prom = prom
79
@@ -89,7 +88,6 @@ func (c *CockroachDB) Init() error {
88
func (c *CockroachDB) Check() error {
89
mx, err := c.collect()
90
if err != nil {
92
- c.Error(err)
91
return err
92
}
93
if len(mx) == 0 {
src/go/plugin/go.d/modules/consul/consul.go
+4
-7
@@ -5,6 +5,7 @@ package consul
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"sync"
11
"time"
@@ -80,21 +81,18 @@ func (c *Consul) Configuration() any {
81
82
func (c *Consul) Init() error {
83
if err := c.validateConfig(); err != nil {
83
- c.Errorf("config validation: %v", err)
84
- return err
84
+ return fmt.Errorf("config validation: %v", err)
85
}
86
87
httpClient, err := c.initHTTPClient()
88
if err != nil {
89
- c.Errorf("init HTTP client: %v", err)
90
- return err
89
+ return fmt.Errorf("init HTTP client: %v", err)
90
}
91
c.httpClient = httpClient
92
93
prom, err := c.initPrometheusClient(httpClient)
94
if err != nil {
96
- c.Errorf("init Prometheus client: %v", err)
97
- return err
95
+ return fmt.Errorf("init Prometheus client: %v", err)
96
}
97
c.prom = prom
98
@@ -104,7 +102,6 @@ func (c *Consul) Init() error {
102
func (c *Consul) Check() error {
103
mx, err := c.collect()
104
if err != nil {
107
- c.Error(err)
105
return err
106
}
107
if len(mx) == 0 {
src/go/plugin/go.d/modules/coredns/coredns.go
+5
-9
@@ -5,6 +5,7 @@ package coredns
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/pkg/matcher"
@@ -75,14 +76,12 @@ func (cd *CoreDNS) Configuration() any {
76
77
func (cd *CoreDNS) Init() error {
78
if err := cd.validateConfig(); err != nil {
78
- cd.Errorf("config validation: %v", err)
79
- return err
79
+ return fmt.Errorf("config validation: %v", err)
80
}
81
82
sm, err := cd.initPerServerMatcher()
83
if err != nil {
84
- cd.Error(err)
85
- return err
84
+ return fmt.Errorf("init per_server_stats: %v", err)
85
}
86
if sm != nil {
87
cd.perServerMatcher = sm
@@ -90,8 +89,7 @@ func (cd *CoreDNS) Init() error {
89
90
zm, err := cd.initPerZoneMatcher()
91
if err != nil {
93
- cd.Error(err)
94
- return err
92
+ return fmt.Errorf("init per_zone_stats: %v", err)
93
}
94
if zm != nil {
95
cd.perZoneMatcher = zm
@@ -99,8 +97,7 @@ func (cd *CoreDNS) Init() error {
97
98
prom, err := cd.initPrometheusClient()
99
if err != nil {
102
- cd.Error(err)
103
- return err
100
+ return fmt.Errorf("init prometheus client: %v", err)
101
}
102
cd.prom = prom
103
@@ -110,7 +107,6 @@ func (cd *CoreDNS) Init() error {
107
func (cd *CoreDNS) Check() error {
108
mx, err := cd.collect()
109
if err != nil {
113
- cd.Error(err)
110
return err
111
}
112
if len(mx) == 0 {
src/go/plugin/go.d/modules/couchbase/couchbase.go
+4
-7
@@ -5,6 +5,7 @@ package couchbase
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -65,21 +66,18 @@ func (cb *Couchbase) Configuration() any {
66
func (cb *Couchbase) Init() error {
67
err := cb.validateConfig()
68
if err != nil {
68
- cb.Errorf("check configuration: %v", err)
69
- return err
69
+ return fmt.Errorf("check configuration: %v", err)
70
}
71
72
httpClient, err := cb.initHTTPClient()
73
if err != nil {
74
- cb.Errorf("init HTTP client: %v", err)
75
- return err
74
+ return fmt.Errorf("init HTTP client: %v", err)
75
}
76
cb.httpClient = httpClient
77
78
charts, err := cb.initCharts()
79
if err != nil {
81
- cb.Errorf("init charts: %v", err)
82
- return err
80
+ return fmt.Errorf("init charts: %v", err)
81
}
82
cb.charts = charts
83
@@ -89,7 +87,6 @@ func (cb *Couchbase) Init() error {
87
func (cb *Couchbase) Check() error {
88
mx, err := cb.collect()
89
if err != nil {
92
- cb.Error(err)
90
return err
91
}
92
if len(mx) == 0 {
src/go/plugin/go.d/modules/couchdb/couchdb.go
+4
-8
@@ -5,6 +5,7 @@ package couchdb
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"strings"
11
"time"
@@ -69,23 +70,20 @@ func (cdb *CouchDB) Configuration() any {
70
func (cdb *CouchDB) Init() error {
71
err := cdb.validateConfig()
72
if err != nil {
72
- cdb.Errorf("check configuration: %v", err)
73
- return err
73
+ return fmt.Errorf("check configuration: %v", err)
74
}
75
76
cdb.databases = strings.Fields(cdb.Config.Databases)
77
78
httpClient, err := cdb.initHTTPClient()
79
if err != nil {
80
- cdb.Errorf("init HTTP client: %v", err)
81
- return err
80
+ return fmt.Errorf("init HTTP client: %v", err)
81
}
82
cdb.httpClient = httpClient
83
84
charts, err := cdb.initCharts()
85
if err != nil {
87
- cdb.Errorf("init charts: %v", err)
88
- return err
86
+ return fmt.Errorf("init charts: %v", err)
87
}
88
cdb.charts = charts
89
@@ -94,13 +92,11 @@ func (cdb *CouchDB) Init() error {
92
93
func (cdb *CouchDB) Check() error {
94
if err := cdb.pingCouchDB(); err != nil {
97
- cdb.Error(err)
95
return err
96
}
97
98
mx, err := cdb.collect()
99
if err != nil {
103
- cdb.Error(err)
100
return err
101
}
102
src/go/plugin/go.d/modules/dmcache/dmcache.go
+2
-3
@@ -7,6 +7,7 @@ package dmcache
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -65,8 +66,7 @@ func (c *DmCache) Configuration() any {
66
func (c *DmCache) Init() error {
67
dmsetup, err := c.initDmsetupCLI()
68
if err != nil {
68
- c.Errorf("dmsetup exec initialization: %v", err)
69
- return err
69
+ return fmt.Errorf("dmsetup exec initialization: %v", err)
70
}
71
c.exec = dmsetup
72
@@ -76,7 +76,6 @@ func (c *DmCache) Init() error {
76
func (c *DmCache) Check() error {
77
mx, err := c.collect()
78
if err != nil {
79
- c.Error(err)
79
return err
80
}
81
src/go/plugin/go.d/modules/dnsdist/dnsdist.go
+4
-7
@@ -5,6 +5,7 @@ package dnsdist
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -63,21 +64,18 @@ func (d *DNSdist) Configuration() any {
64
func (d *DNSdist) Init() error {
65
err := d.validateConfig()
66
if err != nil {
66
- d.Errorf("config validation: %v", err)
67
- return err
67
+ return fmt.Errorf("config validation: %v", err)
68
}
69
70
client, err := d.initHTTPClient()
71
if err != nil {
72
- d.Errorf("init HTTP client: %v", err)
73
- return err
72
+ return fmt.Errorf("init HTTP client: %v", err)
73
}
74
d.httpClient = client
75
76
cs, err := d.initCharts()
77
if err != nil {
79
- d.Errorf("init charts: %v", err)
80
- return err
78
+ return fmt.Errorf("init charts: %v", err)
79
}
80
d.charts = cs
81
@@ -87,7 +85,6 @@ func (d *DNSdist) Init() error {
85
func (d *DNSdist) Check() error {
86
mx, err := d.collect()
87
if err != nil {
90
- d.Error(err)
88
return err
89
}
90
if len(mx) == 0 {
src/go/plugin/go.d/modules/dnsmasq/dnsmasq.go
+4
-7
@@ -5,6 +5,7 @@ package dnsmasq
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -70,21 +71,18 @@ func (d *Dnsmasq) Configuration() any {
71
func (d *Dnsmasq) Init() error {
72
err := d.validateConfig()
73
if err != nil {
73
- d.Errorf("config validation: %v", err)
74
- return err
74
+ return fmt.Errorf("config validation: %v", err)
75
}
76
77
client, err := d.initDNSClient()
78
if err != nil {
79
- d.Errorf("init DNS client: %v", err)
80
- return err
79
+ return fmt.Errorf("init DNS client: %v", err)
80
}
81
d.dnsClient = client
82
83
charts, err := d.initCharts()
84
if err != nil {
86
- d.Errorf("init charts: %v", err)
87
- return err
85
+ return fmt.Errorf("init charts: %v", err)
86
}
87
d.charts = charts
88
@@ -94,7 +92,6 @@ func (d *Dnsmasq) Init() error {
92
func (d *Dnsmasq) Check() error {
93
mx, err := d.collect()
94
if err != nil {
97
- d.Error(err)
95
return err
96
}
97
if len(mx) == 0 {
src/go/plugin/go.d/modules/dnsmasq_dhcp/dhcp.go
+3
-5
@@ -7,6 +7,7 @@ package dnsmasq_dhcp
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"net"
12
"time"
13
@@ -69,12 +70,10 @@ func (d *DnsmasqDHCP) Configuration() any {
70
71
func (d *DnsmasqDHCP) Init() error {
72
if err := d.validateConfig(); err != nil {
72
- d.Errorf("config validation: %v", err)
73
- return err
73
+ return fmt.Errorf("config validation: %v", err)
74
}
75
if err := d.checkLeasesPath(); err != nil {
76
- d.Errorf("leases path check: %v", err)
77
- return err
76
+ return fmt.Errorf("leases path check: %v", err)
77
}
78
79
return nil
@@ -83,7 +82,6 @@ func (d *DnsmasqDHCP) Init() error {
82
func (d *DnsmasqDHCP) Check() error {
83
mx, err := d.collect()
84
if err != nil {
86
- d.Error(err)
85
return err
86
}
87
if len(mx) == 0 {
src/go/plugin/go.d/modules/dnsquery/dnsquery.go
+4
-6
@@ -4,6 +4,7 @@ package dnsquery
4
5
import (
6
_ "embed"
7
+ "fmt"
8
"time"
9
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -77,21 +78,18 @@ func (d *DNSQuery) Configuration() any {
78
79
func (d *DNSQuery) Init() error {
80
if err := d.verifyConfig(); err != nil {
80
- d.Errorf("config validation: %v", err)
81
- return err
81
+ return fmt.Errorf("config validation: %v", err)
82
}
83
84
rt, err := d.initRecordTypes()
85
if err != nil {
86
- d.Errorf("init record type: %v", err)
87
- return err
86
+ return fmt.Errorf("init record type: %v", err)
87
}
88
d.recordTypes = rt
89
90
charts, err := d.initCharts()
91
if err != nil {
93
- d.Errorf("init charts: %v", err)
94
- return err
92
+ return fmt.Errorf("init charts: %v", err)
93
}
94
d.charts = charts
95
src/go/plugin/go.d/modules/docker/docker.go
-1
@@ -90,7 +90,6 @@ func (d *Docker) Init() error {
90
func (d *Docker) Check() error {
91
mx, err := d.collect()
92
if err != nil {
93
- d.Error(err)
93
return err
94
}
95
if len(mx) == 0 {
src/go/plugin/go.d/modules/docker_engine/docker_engine.go
+3
-5
@@ -5,6 +5,7 @@ package docker_engine
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -60,14 +61,12 @@ func (de *DockerEngine) Configuration() any {
61
62
func (de *DockerEngine) Init() error {
63
if err := de.validateConfig(); err != nil {
63
- de.Errorf("config validation: %v", err)
64
- return err
64
+ return fmt.Errorf("config validation: %v", err)
65
}
66
67
prom, err := de.initPrometheusClient()
68
if err != nil {
69
- de.Error(err)
70
- return err
69
+ return fmt.Errorf("init prometheus client: %v", err)
70
}
71
de.prom = prom
72
@@ -77,7 +76,6 @@ func (de *DockerEngine) Init() error {
76
func (de *DockerEngine) Check() error {
77
mx, err := de.collect()
78
if err != nil {
80
- de.Error(err)
79
return err
80
}
81
if len(mx) == 0 {
src/go/plugin/go.d/modules/dockerhub/dockerhub.go
+3
-5
@@ -5,6 +5,7 @@ package dockerhub
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -60,14 +61,12 @@ func (dh *DockerHub) Configuration() any {
61
62
func (dh *DockerHub) Init() error {
63
if err := dh.validateConfig(); err != nil {
63
- dh.Errorf("config validation: %v", err)
64
- return err
64
+ return fmt.Errorf("config validation: %v", err)
65
}
66
67
client, err := dh.initApiClient()
68
if err != nil {
69
- dh.Error(err)
70
- return err
69
+ return fmt.Errorf("init api client: %v", err)
70
}
71
dh.client = client
72
@@ -77,7 +76,6 @@ func (dh *DockerHub) Init() error {
76
func (dh *DockerHub) Check() error {
77
mx, err := dh.collect()
78
if err != nil {
80
- dh.Error(err)
79
return err
80
}
81
if len(mx) == 0 {
src/go/plugin/go.d/modules/dovecot/dovecot.go
+1
-3
@@ -55,8 +55,7 @@ func (d *Dovecot) Configuration() any {
55
56
func (d *Dovecot) Init() error {
57
if d.Address == "" {
58
- d.Error("config: 'address' not set")
59
- return errors.New("address not set")
58
+ return errors.New("config: 'address' not set")
59
}
60
61
return nil
@@ -65,7 +64,6 @@ func (d *Dovecot) Init() error {
64
func (d *Dovecot) Check() error {
65
mx, err := d.collect()
66
if err != nil {
68
- d.Error(err)
67
return err
68
}
69
src/go/plugin/go.d/modules/elasticsearch/elasticsearch.go
+3
-5
@@ -5,6 +5,7 @@ package elasticsearch
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"sync"
11
"time"
@@ -87,14 +88,12 @@ func (es *Elasticsearch) Configuration() any {
88
func (es *Elasticsearch) Init() error {
89
err := es.validateConfig()
90
if err != nil {
90
- es.Errorf("check configuration: %v", err)
91
- return err
91
+ return fmt.Errorf("check configuration: %v", err)
92
}
93
94
httpClient, err := es.initHTTPClient()
95
if err != nil {
96
- es.Errorf("init HTTP client: %v", err)
97
- return err
96
+ return fmt.Errorf("init HTTP client: %v", err)
97
}
98
es.httpClient = httpClient
99
@@ -104,7 +103,6 @@ func (es *Elasticsearch) Init() error {
103
func (es *Elasticsearch) Check() error {
104
mx, err := es.collect()
105
if err != nil {
107
- es.Error(err)
106
return err
107
}
108
if len(mx) == 0 {
src/go/plugin/go.d/modules/envoy/envoy.go
+3
-5
@@ -5,6 +5,7 @@ package envoy
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -75,14 +76,12 @@ func (e *Envoy) Configuration() any {
76
77
func (e *Envoy) Init() error {
78
if err := e.validateConfig(); err != nil {
78
- e.Errorf("config validation: %v", err)
79
- return err
79
+ return fmt.Errorf("config validation: %v", err)
80
}
81
82
prom, err := e.initPrometheusClient()
83
if err != nil {
84
- e.Errorf("init Prometheus client: %v", err)
85
- return err
84
+ return fmt.Errorf("init Prometheus client: %v", err)
85
}
86
e.prom = prom
87
@@ -92,7 +91,6 @@ func (e *Envoy) Init() error {
91
func (e *Envoy) Check() error {
92
mx, err := e.collect()
93
if err != nil {
95
- e.Error(err)
94
return err
95
}
96
if len(mx) == 0 {
src/go/plugin/go.d/modules/exim/exim.go
+2
-3
@@ -5,6 +5,7 @@ package exim
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -55,8 +56,7 @@ func (e *Exim) Configuration() any {
56
func (e *Exim) Init() error {
57
exim, err := e.initEximExec()
58
if err != nil {
58
- e.Errorf("exim exec initialization: %v", err)
59
- return err
59
+ return fmt.Errorf("exim exec initialization: %v", err)
60
}
61
e.exec = exim
62
@@ -66,7 +66,6 @@ func (e *Exim) Init() error {
66
func (e *Exim) Check() error {
67
mx, err := e.collect()
68
if err != nil {
69
- e.Error(err)
69
return err
70
}
71
src/go/plugin/go.d/modules/fail2ban/fail2ban.go
+2
-3
@@ -7,6 +7,7 @@ package fail2ban
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -72,8 +73,7 @@ func (f *Fail2Ban) Configuration() any {
73
func (f *Fail2Ban) Init() error {
74
f2bClientExec, err := f.initFail2banClientCliExec()
75
if err != nil {
75
- f.Errorf("fail2ban-client exec initialization: %v", err)
76
- return err
76
+ return fmt.Errorf("fail2ban-client exec initialization: %v", err)
77
}
78
f.exec = f2bClientExec
79
@@ -83,7 +83,6 @@ func (f *Fail2Ban) Init() error {
83
func (f *Fail2Ban) Check() error {
84
mx, err := f.collect()
85
if err != nil {
86
- f.Error(err)
86
return err
87
}
88
src/go/plugin/go.d/modules/filecheck/filecheck.go
+4
-6
@@ -4,6 +4,7 @@ package filecheck
4
5
import (
6
_ "embed"
7
+ "fmt"
8
"time"
9
10
"github.com/netdata/netdata/go/plugins/pkg/matcher"
@@ -80,21 +81,18 @@ func (f *Filecheck) Configuration() any {
81
func (f *Filecheck) Init() error {
82
err := f.validateConfig()
83
if err != nil {
83
- f.Errorf("config validation: %v", err)
84
- return err
84
+ return fmt.Errorf("config validation: %v", err)
85
}
86
87
ff, err := f.initFilesFilter()
88
if err != nil {
89
- f.Errorf("files filter initialization: %v", err)
90
- return err
89
+ return fmt.Errorf("files filter initialization: %v", err)
90
}
91
f.filesFilter = ff
92
93
df, err := f.initDirsFilter()
94
if err != nil {
96
- f.Errorf("dirs filter initialization: %v", err)
97
- return err
95
+ return fmt.Errorf("dirs filter initialization: %v", err)
96
}
97
f.dirsFilter = df
98
src/go/plugin/go.d/modules/fluentd/fluentd.go
+4
-7
@@ -5,6 +5,7 @@ package fluentd
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/pkg/matcher"
@@ -64,21 +65,18 @@ func (f *Fluentd) Configuration() any {
65
66
func (f *Fluentd) Init() error {
67
if err := f.validateConfig(); err != nil {
67
- f.Error(err)
68
- return err
68
+ return fmt.Errorf("invalid config: %v", err)
69
}
70
71
pm, err := f.initPermitPluginMatcher()
72
if err != nil {
73
- f.Error(err)
74
- return err
73
+ return fmt.Errorf("init permit_plugin_id: %v", err)
74
}
75
f.permitPlugin = pm
76
77
client, err := f.initApiClient()
78
if err != nil {
80
- f.Error(err)
81
- return err
79
+ return fmt.Errorf("init api client: %v", err)
80
}
81
f.apiClient = client
82
@@ -91,7 +89,6 @@ func (f *Fluentd) Init() error {
89
func (f *Fluentd) Check() error {
90
mx, err := f.collect()
91
if err != nil {
94
- f.Error(err)
92
return err
93
}
94
if len(mx) == 0 {
src/go/plugin/go.d/modules/freeradius/freeradius.go
+2
-3
@@ -5,6 +5,7 @@ package freeradius
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -60,8 +61,7 @@ func (f *FreeRADIUS) Configuration() any {
61
62
func (f *FreeRADIUS) Init() error {
63
if err := f.validateConfig(); err != nil {
63
- f.Errorf("config validation: %v", err)
64
- return err
64
+ return fmt.Errorf("config validation: %v", err)
65
}
66
67
f.client = api.New(api.Config{
@@ -77,7 +77,6 @@ func (f *FreeRADIUS) Init() error {
77
func (f *FreeRADIUS) Check() error {
78
mx, err := f.collect()
79
if err != nil {
80
- f.Error(err)
80
return err
81
}
82
if len(mx) == 0 {
src/go/plugin/go.d/modules/gearman/gearman.go
+1
-3
@@ -60,8 +60,7 @@ func (g *Gearman) Configuration() any {
60
61
func (g *Gearman) Init() error {
62
if g.Address == "" {
63
- g.Error("config: 'address' not set")
64
- return errors.New("address not set")
63
+ return errors.New("config: 'address' not set")
64
}
65
66
return nil
@@ -70,7 +69,6 @@ func (g *Gearman) Init() error {
69
func (g *Gearman) Check() error {
70
mx, err := g.collect()
71
if err != nil {
73
- g.Error(err)
72
return err
73
}
74
src/go/plugin/go.d/modules/geth/geth.go
+3
-5
@@ -5,6 +5,7 @@ package geth
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -60,14 +61,12 @@ func (g *Geth) Configuration() any {
61
62
func (g *Geth) Init() error {
63
if err := g.validateConfig(); err != nil {
63
- g.Errorf("error on validating config: %g", err)
64
- return err
64
+ return fmt.Errorf("error on validating config: %g", err)
65
}
66
67
prom, err := g.initPrometheusClient()
68
if err != nil {
69
- g.Error(err)
70
- return err
69
+ return fmt.Errorf("error on initializing prometheus client: %g", err)
70
}
71
g.prom = prom
72
@@ -77,7 +76,6 @@ func (g *Geth) Init() error {
76
func (g *Geth) Check() error {
77
mx, err := g.collect()
78
if err != nil {
80
- g.Error(err)
79
return err
80
}
81
if len(mx) == 0 {
src/go/plugin/go.d/modules/haproxy/haproxy.go
+3
-5
@@ -5,6 +5,7 @@ package haproxy
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -66,14 +67,12 @@ func (h *Haproxy) Configuration() any {
67
68
func (h *Haproxy) Init() error {
69
if err := h.validateConfig(); err != nil {
69
- h.Errorf("config validation: %v", err)
70
- return err
70
+ return fmt.Errorf("config validation: %v", err)
71
}
72
73
prom, err := h.initPrometheusClient()
74
if err != nil {
75
- h.Errorf("prometheus client initialization: %v", err)
76
- return err
75
+ return fmt.Errorf("prometheus client initialization: %v", err)
76
}
77
h.prom = prom
78
@@ -83,7 +82,6 @@ func (h *Haproxy) Init() error {
82
func (h *Haproxy) Check() error {
83
mx, err := h.collect()
84
if err != nil {
86
- h.Error(err)
85
return err
86
}
87
if len(mx) == 0 {
src/go/plugin/go.d/modules/hddtemp/hddtemp.go
+2
-3
@@ -5,6 +5,7 @@ package hddtemp
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -58,8 +59,7 @@ func (h *HddTemp) Configuration() any {
59
60
func (h *HddTemp) Init() error {
61
if h.Address == "" {
61
- h.Error("config: 'address' not set")
62
- return errors.New("address not set")
62
+ return fmt.Errorf("config: 'address' not set")
63
}
64
65
h.conn = newHddTempConn(h.Config)
@@ -70,7 +70,6 @@ func (h *HddTemp) Init() error {
70
func (h *HddTemp) Check() error {
71
mx, err := h.collect()
72
if err != nil {
73
- h.Error(err)
73
return err
74
}
75
if len(mx) == 0 {
src/go/plugin/go.d/modules/hpssa/hpssa.go
+4
-5
@@ -5,6 +5,7 @@ package hpssa
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -67,12 +68,11 @@ func (h *Hpssa) Configuration() any {
68
}
69
70
func (h *Hpssa) Init() error {
70
- ssacliExec, err := h.initSsacliExec()
71
+ ssacli, err := h.initSsacliExec()
72
if err != nil {
72
- h.Errorf("ssacli exec initialization: %v", err)
73
- return err
73
+ return fmt.Errorf("ssacli exec initialization: %v", err)
74
}
75
- h.exec = ssacliExec
75
+ h.exec = ssacli
76
77
return nil
78
}
@@ -80,7 +80,6 @@ func (h *Hpssa) Init() error {
80
func (h *Hpssa) Check() error {
81
mx, err := h.collect()
82
if err != nil {
83
- h.Error(err)
83
return err
84
}
85
src/go/plugin/go.d/modules/httpcheck/httpcheck.go
+5
-9
@@ -5,6 +5,7 @@ package httpcheck
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"regexp"
11
"time"
@@ -81,30 +82,26 @@ func (hc *HTTPCheck) Configuration() any {
82
83
func (hc *HTTPCheck) Init() error {
84
if err := hc.validateConfig(); err != nil {
84
- hc.Errorf("config validation: %v", err)
85
- return err
85
+ return fmt.Errorf("config validation: %v", err)
86
}
87
88
hc.charts = hc.initCharts()
89
90
httpClient, err := hc.initHTTPClient()
91
if err != nil {
92
- hc.Errorf("init HTTP client: %v", err)
93
- return err
92
+ return fmt.Errorf("init HTTP client: %v", err)
93
}
94
hc.httpClient = httpClient
95
96
re, err := hc.initResponseMatchRegexp()
97
if err != nil {
99
- hc.Errorf("init response match regexp: %v", err)
100
- return err
98
+ return fmt.Errorf("init response match regexp: %v", err)
99
}
100
hc.reResponse = re
101
102
hm, err := hc.initHeaderMatch()
103
if err != nil {
106
- hc.Errorf("init header match: %v", err)
107
- return err
104
+ return fmt.Errorf("init header match: %v", err)
105
}
106
hc.headerMatch = hm
107
@@ -125,7 +122,6 @@ func (hc *HTTPCheck) Init() error {
122
func (hc *HTTPCheck) Check() error {
123
mx, err := hc.collect()
124
if err != nil {
128
- hc.Error(err)
125
return err
126
}
127
if len(mx) == 0 {
src/go/plugin/go.d/modules/icecast/icecast.go
+2
-4
@@ -5,6 +5,7 @@ package icecast
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -64,14 +65,12 @@ func (ic *Icecast) Configuration() any {
65
66
func (ic *Icecast) Init() error {
67
if ic.URL == "" {
67
- ic.Error("URL not set")
68
return errors.New("url not set")
69
}
70
71
client, err := web.NewHTTPClient(ic.ClientConfig)
72
if err != nil {
73
- ic.Error(err)
74
- return err
73
+ return fmt.Errorf("creating http client: %w", err)
74
}
75
ic.httpClient = client
76
@@ -84,7 +83,6 @@ func (ic *Icecast) Init() error {
83
func (ic *Icecast) Check() error {
84
mx, err := ic.collect()
85
if err != nil {
87
- ic.Error(err)
86
return err
87
}
88
src/go/plugin/go.d/modules/intelgpu/intelgpu.go
+2
-4
@@ -5,7 +5,7 @@ package intelgpu
5
import (
6
_ "embed"
7
"errors"
8
-
8
+ "fmt"
9
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
)
11
@@ -58,8 +58,7 @@ func (ig *IntelGPU) Configuration() any {
58
func (ig *IntelGPU) Init() error {
59
topExec, err := ig.initIntelGPUTopExec()
60
if err != nil {
61
- ig.Error(err)
62
- return err
61
+ return fmt.Errorf("init intelgpu top exec: %v", err)
62
}
63
64
ig.exec = topExec
@@ -70,7 +69,6 @@ func (ig *IntelGPU) Init() error {
69
func (ig *IntelGPU) Check() error {
70
mx, err := ig.collect()
71
if err != nil {
73
- ig.Error(err)
72
return err
73
}
74
src/go/plugin/go.d/modules/ipfs/ipfs.go
+2
-4
@@ -5,6 +5,7 @@ package ipfs
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -65,14 +66,12 @@ func (ip *IPFS) Configuration() any {
66
67
func (ip *IPFS) Init() error {
68
if ip.URL == "" {
68
- ip.Error("URL not set")
69
return errors.New("url not set")
70
}
71
72
client, err := web.NewHTTPClient(ip.ClientConfig)
73
if err != nil {
74
- ip.Error(err)
75
- return err
74
+ return fmt.Errorf("http client init: %w", err)
75
}
76
ip.httpClient = client
77
@@ -94,7 +93,6 @@ func (ip *IPFS) Init() error {
93
func (ip *IPFS) Check() error {
94
mx, err := ip.collect()
95
if err != nil {
97
- ip.Error(err)
96
return err
97
}
98
src/go/plugin/go.d/modules/isc_dhcpd/isc_dhcpd.go
+4
-7
@@ -7,6 +7,7 @@ package isc_dhcpd
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -67,21 +68,18 @@ func (d *DHCPd) Configuration() any {
68
func (d *DHCPd) Init() error {
69
err := d.validateConfig()
70
if err != nil {
70
- d.Errorf("config validation: %v", err)
71
- return err
71
+ return fmt.Errorf("config validation: %v", err)
72
}
73
74
pools, err := d.initPools()
75
if err != nil {
76
- d.Errorf("ip pools init: %v", err)
77
- return err
76
+ return fmt.Errorf("ip pools init: %v", err)
77
}
78
d.pools = pools
79
80
charts, err := d.initCharts(pools)
81
if err != nil {
83
- d.Errorf("charts init: %v", err)
84
- return err
82
+ return fmt.Errorf("charts init: %v", err)
83
}
84
d.charts = charts
85
@@ -94,7 +92,6 @@ func (d *DHCPd) Init() error {
92
func (d *DHCPd) Check() error {
93
mx, err := d.collect()
94
if err != nil {
97
- d.Error(err)
95
return err
96
}
97
if len(mx) == 0 {
src/go/plugin/go.d/modules/k8s_kubelet/kubelet.go
+3
-5
@@ -5,6 +5,7 @@ package k8s_kubelet
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -71,14 +72,12 @@ func (k *Kubelet) Configuration() any {
72
73
func (k *Kubelet) Init() error {
74
if err := k.validateConfig(); err != nil {
74
- k.Errorf("config validation: %v", err)
75
- return err
75
+ return fmt.Errorf("config validation: %v", err)
76
}
77
78
prom, err := k.initPrometheusClient()
79
if err != nil {
80
- k.Error(err)
81
- return err
80
+ return fmt.Errorf("init prometheus client: %v", err)
81
}
82
k.prom = prom
83
@@ -92,7 +91,6 @@ func (k *Kubelet) Init() error {
91
func (k *Kubelet) Check() error {
92
mx, err := k.collect()
93
if err != nil {
95
- k.Error(err)
94
return err
95
}
96
if len(mx) == 0 {
src/go/plugin/go.d/modules/k8s_kubeproxy/kubeproxy.go
+3
-5
@@ -5,6 +5,7 @@ package k8s_kubeproxy
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -64,14 +65,12 @@ func (kp *KubeProxy) Configuration() any {
65
66
func (kp *KubeProxy) Init() error {
67
if err := kp.validateConfig(); err != nil {
67
- kp.Errorf("config validation: %v", err)
68
- return err
68
+ return fmt.Errorf("config validation: %v", err)
69
}
70
71
prom, err := kp.initPrometheusClient()
72
if err != nil {
73
- kp.Error(err)
74
- return err
73
+ return fmt.Errorf("init prometheus client: %v", err)
74
}
75
kp.prom = prom
76
@@ -81,7 +80,6 @@ func (kp *KubeProxy) Init() error {
80
func (kp *KubeProxy) Check() error {
81
mx, err := kp.collect()
82
if err != nil {
84
- kp.Error(err)
83
return err
84
}
85
if len(mx) == 0 {
src/go/plugin/go.d/modules/k8s_state/kube_state.go
+2
-6
@@ -80,8 +80,7 @@ func (ks *KubeState) Configuration() any {
80
func (ks *KubeState) Init() error {
81
client, err := ks.initClient()
82
if err != nil {
83
- ks.Errorf("client initialization: %v", err)
84
- return err
83
+ return fmt.Errorf("init k8s client: %v", err)
84
}
85
ks.client = client
86
@@ -94,15 +93,12 @@ func (ks *KubeState) Init() error {
93
94
func (ks *KubeState) Check() error {
95
if ks.client == nil || ks.discoverer == nil {
97
- ks.Error("not initialized job")
96
return errors.New("not initialized")
97
}
98
99
ver, err := ks.client.Discovery().ServerVersion()
100
if err != nil {
103
- err := fmt.Errorf("failed to connect to K8s API server: %v", err)
104
- ks.Error(err)
105
- return err
101
+ return fmt.Errorf("failed to connect to K8s API server: %v", err)
102
}
103
104
ks.Infof("successfully connected to the Kubernetes API server '%s'", ver)
src/go/plugin/go.d/modules/litespeed/litespeed.go
-1
@@ -64,7 +64,6 @@ func (l *Litespeed) Init() error {
64
func (l *Litespeed) Check() error {
65
mx, err := l.collect()
66
if err != nil {
67
- l.Error(err)
67
return err
68
}
69
src/go/plugin/go.d/modules/logind/logind.go
-1
@@ -65,7 +65,6 @@ func (l *Logind) Init() error {
65
func (l *Logind) Check() error {
66
mx, err := l.collect()
67
if err != nil {
68
- l.Error(err)
68
return err
69
}
70
if len(mx) == 0 {
src/go/plugin/go.d/modules/logstash/logstash.go
+3
-5
@@ -5,6 +5,7 @@ package logstash
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -63,14 +64,12 @@ func (l *Logstash) Configuration() any {
64
65
func (l *Logstash) Init() error {
66
if l.URL == "" {
66
- l.Error("config validation: 'url' cannot be empty")
67
- return errors.New("url not set")
67
+ return errors.New("config: 'url' cannot be empty")
68
}
69
70
httpClient, err := web.NewHTTPClient(l.ClientConfig)
71
if err != nil {
72
- l.Errorf("init HTTP client: %v", err)
73
- return err
72
+ return fmt.Errorf("init HTTP client: %v", err)
73
}
74
l.httpClient = httpClient
75
@@ -83,7 +82,6 @@ func (l *Logstash) Init() error {
82
func (l *Logstash) Check() error {
83
mx, err := l.collect()
84
if err != nil {
86
- l.Error(err)
85
return err
86
}
87
if len(mx) == 0 {
src/go/plugin/go.d/modules/lvm/exec.go
+4
@@ -13,6 +13,10 @@ import (
13
"github.com/netdata/netdata/go/plugins/logger"
14
)
15
16
+type lvmCLI interface {
17
+ lvsReportJson() ([]byte, error)
18
+}
19
+
20
func newLVMCLIExec(ndsudoPath string, timeout time.Duration, log *logger.Logger) *lvmCLIExec {
21
return &lvmCLIExec{
22
Logger: log,
src/go/plugin/go.d/modules/lvm/lvm.go
+9
-15
@@ -7,6 +7,7 @@ package lvm
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -42,21 +43,16 @@ type Config struct {
43
Timeout confopt.Duration `yaml:"timeout,omitempty" json:"timeout"`
44
}
45
45
-type (
46
- LVM struct {
47
- module.Base
48
- Config `yaml:",inline" json:""`
46
+type LVM struct {
47
+ module.Base
48
+ Config `yaml:",inline" json:""`
49
50
- charts *module.Charts
50
+ charts *module.Charts
51
52
- exec lvmCLI
52
+ exec lvmCLI
53
54
- lvmThinPools map[string]bool
55
- }
56
- lvmCLI interface {
57
- lvsReportJson() ([]byte, error)
58
- }
59
-)
54
+ lvmThinPools map[string]bool
55
+}
56
57
func (l *LVM) Configuration() any {
58
return l.Config
@@ -65,8 +61,7 @@ func (l *LVM) Configuration() any {
61
func (l *LVM) Init() error {
62
lvmExec, err := l.initLVMCLIExec()
63
if err != nil {
68
- l.Errorf("lvm exec initialization: %v", err)
69
- return err
64
+ return fmt.Errorf("init lvm exec: %v", err)
65
}
66
l.exec = lvmExec
67
@@ -76,7 +71,6 @@ func (l *LVM) Init() error {
71
func (l *LVM) Check() error {
72
mx, err := l.collect()
73
if err != nil {
79
- l.Error(err)
74
return err
75
}
76
src/go/plugin/go.d/modules/megacli/megacli.go
+2
-3
@@ -7,6 +7,7 @@ package megacli
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -70,8 +71,7 @@ func (m *MegaCli) Configuration() any {
71
func (m *MegaCli) Init() error {
72
lvmExec, err := m.initMegaCliExec()
73
if err != nil {
73
- m.Errorf("megacli exec initialization: %v", err)
74
- return err
74
+ return fmt.Errorf("init megacli exec: %v", err)
75
}
76
m.exec = lvmExec
77
@@ -81,7 +81,6 @@ func (m *MegaCli) Init() error {
81
func (m *MegaCli) Check() error {
82
mx, err := m.collect()
83
if err != nil {
84
- m.Error(err)
84
return err
85
}
86
src/go/plugin/go.d/modules/memcached/memcached.go
+1
-3
@@ -62,8 +62,7 @@ func (m *Memcached) Configuration() any {
62
63
func (m *Memcached) Init() error {
64
if m.Address == "" {
65
- m.Error("config: 'address' not set")
66
- return errors.New("address not set")
65
+ return errors.New("config: 'address' not set")
66
}
67
68
return nil
@@ -72,7 +71,6 @@ func (m *Memcached) Init() error {
71
func (m *Memcached) Check() error {
72
mx, err := m.collect()
73
if err != nil {
75
- m.Error(err)
74
return err
75
}
76
src/go/plugin/go.d/modules/mongodb/mongodb.go
+3
-5
@@ -5,6 +5,7 @@ package mongo
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"sync"
10
"time"
11
@@ -76,13 +77,11 @@ func (m *Mongo) Configuration() any {
77
78
func (m *Mongo) Init() error {
79
if err := m.verifyConfig(); err != nil {
79
- m.Errorf("config validation: %v", err)
80
- return err
80
+ return fmt.Errorf("config validation: %v", err)
81
}
82
83
if err := m.initDatabaseSelector(); err != nil {
84
- m.Errorf("init database selector: %v", err)
85
- return err
84
+ return fmt.Errorf("init database selector: %v", err)
85
}
86
87
return nil
@@ -91,7 +90,6 @@ func (m *Mongo) Init() error {
90
func (m *Mongo) Check() error {
91
mx, err := m.collect()
92
if err != nil {
94
- m.Error(err)
93
return err
94
}
95
if len(mx) == 0 {
src/go/plugin/go.d/modules/monit/monit.go
+3
-5
@@ -5,6 +5,7 @@ package monit
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -65,14 +66,12 @@ func (m *Monit) Configuration() any {
66
67
func (m *Monit) Init() error {
68
if m.URL == "" {
68
- m.Error("config: monit url is required but not set")
69
- return errors.New("config: missing URL")
69
+ return fmt.Errorf("config: monit url is required but not set")
70
}
71
72
httpClient, err := web.NewHTTPClient(m.ClientConfig)
73
if err != nil {
74
- m.Errorf("init HTTP client: %v", err)
75
- return err
74
+ return fmt.Errorf("init HTTP client: %v", err)
75
}
76
m.httpClient = httpClient
77
@@ -85,7 +84,6 @@ func (m *Monit) Init() error {
84
func (m *Monit) Check() error {
85
mx, err := m.collect()
86
if err != nil {
88
- m.Error(err)
87
return err
88
}
89
if len(mx) == 0 {
src/go/plugin/go.d/modules/mysql/mysql.go
+4
-7
@@ -6,6 +6,7 @@ import (
6
"database/sql"
7
_ "embed"
8
"errors"
9
+ "fmt"
10
"strings"
11
"sync"
12
"time"
@@ -105,24 +106,21 @@ func (m *MySQL) Init() error {
106
if m.MyCNF != "" {
107
dsn, err := dsnFromFile(m.MyCNF)
108
if err != nil {
108
- m.Error(err)
109
return err
110
}
111
m.DSN = dsn
112
}
113
114
if m.DSN == "" {
115
- m.Error("dsn not set")
116
- return errors.New("dsn not set")
115
+ return errors.New("config: dsn not set")
116
}
117
118
cfg, err := mysql.ParseDSN(m.DSN)
119
if err != nil {
121
- m.Errorf("error on parsing DSN: %v", err)
122
- return err
120
+ return fmt.Errorf("error on parsing DSN: %v", err)
121
}
122
125
- cfg.Passwd = strings.Repeat("*", len(cfg.Passwd))
123
+ cfg.Passwd = strings.Repeat("x", len(cfg.Passwd))
124
m.safeDSN = cfg.FormatDSN()
125
126
m.Debugf("using DSN [%s]", m.DSN)
@@ -133,7 +131,6 @@ func (m *MySQL) Init() error {
131
func (m *MySQL) Check() error {
132
mx, err := m.collect()
133
if err != nil {
136
- m.Error(err)
134
return err
135
}
136
if len(mx) == 0 {
src/go/plugin/go.d/modules/nginx/nginx.go
-1
@@ -79,7 +79,6 @@ func (n *Nginx) Init() error {
79
func (n *Nginx) Check() error {
80
mx, err := n.collect()
81
if err != nil {
82
- n.Error(err)
82
return err
83
}
84
src/go/plugin/go.d/modules/nginxplus/nginxplus.go
+3
-5
@@ -5,6 +5,7 @@ package nginxplus
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -80,14 +81,12 @@ func (n *NginxPlus) Configuration() any {
81
82
func (n *NginxPlus) Init() error {
83
if n.URL == "" {
83
- n.Error("config validation: 'url' can not be empty'")
84
- return errors.New("url not set")
84
+ return errors.New("config: 'url' can not be empty'")
85
}
86
87
client, err := web.NewHTTPClient(n.ClientConfig)
88
if err != nil {
89
- n.Errorf("init HTTP client: %v", err)
90
- return err
89
+ return fmt.Errorf("init HTTP client: %v", err)
90
}
91
n.httpClient = client
92
@@ -97,7 +96,6 @@ func (n *NginxPlus) Init() error {
96
func (n *NginxPlus) Check() error {
97
mx, err := n.collect()
98
if err != nil {
100
- n.Error(err)
99
return err
100
}
101
if len(mx) == 0 {
src/go/plugin/go.d/modules/nginxunit/nginxunit.go
-1
@@ -79,7 +79,6 @@ func (n *NginxUnit) Init() error {
79
func (n *NginxUnit) Check() error {
80
mx, err := n.collect()
81
if err != nil {
82
- n.Error(err)
82
return err
83
}
84
src/go/plugin/go.d/modules/nginxvts/nginxvts.go
+4
-6
@@ -5,6 +5,7 @@ package nginxvts
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -70,20 +71,18 @@ func (vts *NginxVTS) Cleanup() {
71
func (vts *NginxVTS) Init() error {
72
err := vts.validateConfig()
73
if err != nil {
73
- vts.Errorf("check configuration: %v", err)
74
- return err
74
+ return fmt.Errorf("config: %v", err)
75
}
76
77
httpClient, err := vts.initHTTPClient()
78
if err != nil {
79
- vts.Errorf("init HTTP client: %v", err)
79
+ return fmt.Errorf("init HTTP client: %v", err)
80
}
81
vts.httpClient = httpClient
82
83
charts, err := vts.initCharts()
84
if err != nil {
85
- vts.Errorf("init charts: %v", err)
86
- return err
85
+ return fmt.Errorf("init charts: %v", err)
86
}
87
vts.charts = charts
88
@@ -93,7 +92,6 @@ func (vts *NginxVTS) Init() error {
92
func (vts *NginxVTS) Check() error {
93
mx, err := vts.collect()
94
if err != nil {
96
- vts.Error(err)
95
return err
96
}
97
if len(mx) == 0 {
src/go/plugin/go.d/modules/nsd/nsd.go
+2
-3
@@ -7,6 +7,7 @@ package nsd
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -57,8 +58,7 @@ func (n *Nsd) Configuration() any {
58
func (n *Nsd) Init() error {
59
nsdControl, err := n.initNsdControlExec()
60
if err != nil {
60
- n.Errorf("nsd-control exec initialization: %v", err)
61
- return err
61
+ return fmt.Errorf("nsd-control exec initialization: %v", err)
62
}
63
n.exec = nsdControl
64
@@ -68,7 +68,6 @@ func (n *Nsd) Init() error {
68
func (n *Nsd) Check() error {
69
mx, err := n.collect()
70
if err != nil {
71
- n.Error(err)
71
return err
72
}
73
src/go/plugin/go.d/modules/ntpd/ntpd.go
+1
-4
@@ -75,14 +75,12 @@ func (n *NTPd) Configuration() any {
75
76
func (n *NTPd) Init() error {
77
if n.Address == "" {
78
- n.Error("config validation: 'address' can not be empty")
79
- return errors.New("address not set")
78
+ return errors.New("config: 'address' can not be empty")
79
}
80
81
txt := "0.0.0.0 127.0.0.0/8"
82
r, err := iprange.ParseRanges(txt)
83
if err != nil {
85
- n.Errorf("error on parsing ip range '%s': %v", txt, err)
84
return fmt.Errorf("error on parsing ip range '%s': %v", txt, err)
85
}
86
@@ -94,7 +92,6 @@ func (n *NTPd) Init() error {
92
func (n *NTPd) Check() error {
93
mx, err := n.collect()
94
if err != nil {
97
- n.Error(err)
95
return err
96
}
97
if len(mx) == 0 {
src/go/plugin/go.d/modules/nvidia_smi/nvidia_smi.go
-2
@@ -67,7 +67,6 @@ func (nv *NvidiaSmi) Init() error {
67
if nv.exec == nil {
68
smi, err := nv.initNvidiaSmiExec()
69
if err != nil {
70
- nv.Error(err)
70
return err
71
}
72
nv.exec = smi
@@ -79,7 +78,6 @@ func (nv *NvidiaSmi) Init() error {
78
func (nv *NvidiaSmi) Check() error {
79
mx, err := nv.collect()
80
if err != nil {
82
- nv.Error(err)
81
return err
82
}
83
if len(mx) == 0 {
src/go/plugin/go.d/modules/nvme/nvme.go
+2
-3
@@ -7,6 +7,7 @@ package nvme
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -72,8 +73,7 @@ func (n *NVMe) Configuration() any {
73
func (n *NVMe) Init() error {
74
nvmeExec, err := n.initNVMeCLIExec()
75
if err != nil {
75
- n.Errorf("init nvme-cli exec: %v", err)
76
- return err
76
+ return fmt.Errorf("init nvme-cli exec: %v", err)
77
}
78
n.exec = nvmeExec
79
@@ -83,7 +83,6 @@ func (n *NVMe) Init() error {
83
func (n *NVMe) Check() error {
84
mx, err := n.collect()
85
if err != nil {
86
- n.Error(err)
86
return err
87
}
88
if len(mx) == 0 {
src/go/plugin/go.d/modules/openldap/openldap.go
-1
@@ -77,7 +77,6 @@ func (l *OpenLDAP) Init() error {
77
func (l *OpenLDAP) Check() error {
78
mx, err := l.collect()
79
if err != nil {
80
- l.Error(err)
80
return err
81
}
82
src/go/plugin/go.d/modules/openvpn/openvpn.go
-4
@@ -69,13 +69,11 @@ func (o *OpenVPN) Configuration() any {
69
70
func (o *OpenVPN) Init() error {
71
if err := o.validateConfig(); err != nil {
72
- o.Error(err)
72
return err
73
}
74
75
m, err := o.initPerUserMatcher()
76
if err != nil {
78
- o.Error(err)
77
return err
78
}
79
o.perUserMatcher = m
@@ -89,14 +87,12 @@ func (o *OpenVPN) Init() error {
87
88
func (o *OpenVPN) Check() error {
89
if err := o.client.Connect(); err != nil {
92
- o.Error(err)
90
return err
91
}
92
defer func() { _ = o.client.Disconnect() }()
93
94
ver, err := o.client.Version()
95
if err != nil {
99
- o.Error(err)
96
o.Cleanup()
97
return err
98
}
src/go/plugin/go.d/modules/openvpn_status_log/openvpn.go
+3
-5
@@ -5,6 +5,7 @@ package openvpn_status_log
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
10
"github.com/netdata/netdata/go/plugins/pkg/matcher"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -53,14 +54,12 @@ func (o *OpenVPNStatusLog) Configuration() any {
54
55
func (o *OpenVPNStatusLog) Init() error {
56
if err := o.validateConfig(); err != nil {
56
- o.Errorf("error on validating config: %v", err)
57
- return err
57
+ return fmt.Errorf("error on validating config: %v", err)
58
}
59
60
m, err := o.initPerUserStatsMatcher()
61
if err != nil {
62
- o.Errorf("error on creating 'per_user_stats' matcher: %v", err)
63
- return err
62
+ return fmt.Errorf("error on creating 'per_user_stats' matcher: %v", err)
63
}
64
if m != nil {
65
o.perUserMatcher = m
@@ -72,7 +71,6 @@ func (o *OpenVPNStatusLog) Init() error {
71
func (o *OpenVPNStatusLog) Check() error {
72
mx, err := o.collect()
73
if err != nil {
75
- o.Error(err)
74
return err
75
}
76
if len(mx) == 0 {
src/go/plugin/go.d/modules/pgbouncer/pgbouncer.go
+2
-3
@@ -6,6 +6,7 @@ import (
6
"database/sql"
7
_ "embed"
8
"errors"
9
+ "fmt"
10
"time"
11
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -69,8 +70,7 @@ func (p *PgBouncer) Configuration() any {
70
func (p *PgBouncer) Init() error {
71
err := p.validateConfig()
72
if err != nil {
72
- p.Errorf("config validation: %v", err)
73
- return err
73
+ return fmt.Errorf("config validation: %v", err)
74
}
75
76
return nil
@@ -79,7 +79,6 @@ func (p *PgBouncer) Init() error {
79
func (p *PgBouncer) Check() error {
80
mx, err := p.collect()
81
if err != nil {
82
- p.Error(err)
82
return err
83
}
84
if len(mx) == 0 {
src/go/plugin/go.d/modules/phpfpm/phpfpm.go
+2
-3
@@ -5,6 +5,7 @@ package phpfpm
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -61,8 +62,7 @@ func (p *Phpfpm) Configuration() any {
62
func (p *Phpfpm) Init() error {
63
c, err := p.initClient()
64
if err != nil {
64
- p.Errorf("init client: %v", err)
65
- return err
65
+ return fmt.Errorf("init client: %v", err)
66
}
67
p.client = c
68
@@ -72,7 +72,6 @@ func (p *Phpfpm) Init() error {
72
func (p *Phpfpm) Check() error {
73
mx, err := p.collect()
74
if err != nil {
75
- p.Error(err)
75
return err
76
}
77
if len(mx) == 0 {
src/go/plugin/go.d/modules/pihole/pihole.go
+3
-5
@@ -5,6 +5,7 @@ package pihole
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"sync"
11
"time"
@@ -73,14 +74,12 @@ func (p *Pihole) Configuration() any {
74
75
func (p *Pihole) Init() error {
76
if err := p.validateConfig(); err != nil {
76
- p.Errorf("config validation: %v", err)
77
- return err
77
+ return fmt.Errorf("config validation: %v", err)
78
}
79
80
httpClient, err := p.initHTTPClient()
81
if err != nil {
82
- p.Errorf("init http client: %v", err)
83
- return err
82
+ return fmt.Errorf("init http client: %v", err)
83
}
84
p.httpClient = httpClient
85
@@ -97,7 +96,6 @@ func (p *Pihole) Init() error {
96
func (p *Pihole) Check() error {
97
mx, err := p.collect()
98
if err != nil {
100
- p.Error(err)
99
return err
100
}
101
if len(mx) == 0 {
src/go/plugin/go.d/modules/pika/pika.go
+4
-7
@@ -6,6 +6,7 @@ import (
6
"context"
7
_ "embed"
8
"errors"
9
+ "fmt"
10
"time"
11
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -73,21 +74,18 @@ func (p *Pika) Configuration() any {
74
func (p *Pika) Init() error {
75
err := p.validateConfig()
76
if err != nil {
76
- p.Errorf("config validation: %v", err)
77
- return err
77
+ return fmt.Errorf("config validation: %v", err)
78
}
79
80
pdb, err := p.initRedisClient()
81
if err != nil {
82
- p.Errorf("init redis client: %v", err)
83
- return err
82
+ return fmt.Errorf("init redis client: %v", err)
83
}
84
p.pdb = pdb
85
86
charts, err := p.initCharts()
87
if err != nil {
89
- p.Errorf("init charts: %v", err)
90
- return err
88
+ return fmt.Errorf("init charts: %v", err)
89
}
90
p.charts = charts
91
@@ -97,7 +95,6 @@ func (p *Pika) Init() error {
95
func (p *Pika) Check() error {
96
mx, err := p.collect()
97
if err != nil {
100
- p.Error(err)
98
return err
99
}
100
if len(mx) == 0 {
src/go/plugin/go.d/modules/ping/ping.go
+3
-4
@@ -5,6 +5,7 @@ package ping
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/logger"
@@ -77,14 +78,12 @@ func (p *Ping) Configuration() any {
78
func (p *Ping) Init() error {
79
err := p.validateConfig()
80
if err != nil {
80
- p.Errorf("config validation: %v", err)
81
- return err
81
+ return fmt.Errorf("config validation: %v", err)
82
}
83
84
pr, err := p.initProber()
85
if err != nil {
86
- p.Errorf("init prober: %v", err)
87
- return err
86
+ return fmt.Errorf("init prober: %v", err)
87
}
88
p.prober = pr
89
src/go/plugin/go.d/modules/portcheck/portcheck.go
+2
-2
@@ -5,6 +5,7 @@ package portcheck
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net"
10
"time"
11
@@ -74,8 +75,7 @@ func (pc *PortCheck) Configuration() any {
75
76
func (pc *PortCheck) Init() error {
77
if err := pc.validateConfig(); err != nil {
77
- pc.Errorf("config validation: %v", err)
78
- return err
78
+ return fmt.Errorf("config validation: %v", err)
79
}
80
81
pc.tcpPorts, pc.udpPorts = pc.initPorts()
src/go/plugin/go.d/modules/postfix/postfix.go
+3
-5
@@ -5,6 +5,7 @@ package postfix
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -61,14 +62,12 @@ func (p *Postfix) Configuration() any {
62
63
func (p *Postfix) Init() error {
64
if err := p.validateConfig(); err != nil {
64
- p.Errorf("config validation: %s", err)
65
- return err
65
+ return fmt.Errorf("config validation: %s", err)
66
}
67
68
pq, err := p.initPostqueueExec()
69
if err != nil {
70
- p.Errorf("postqueue exec initialization: %v", err)
71
- return err
70
+ return fmt.Errorf("postqueue exec initialization: %v", err)
71
}
72
p.exec = pq
73
@@ -78,7 +77,6 @@ func (p *Postfix) Init() error {
77
func (p *Postfix) Check() error {
78
mx, err := p.collect()
79
if err != nil {
81
- p.Error(err)
80
return err
81
}
82
src/go/plugin/go.d/modules/postgres/postgres.go
+3
-5
@@ -6,6 +6,7 @@ import (
6
"database/sql"
7
_ "embed"
8
"errors"
9
+ "fmt"
10
"sync"
11
"time"
12
@@ -105,14 +106,12 @@ func (p *Postgres) Configuration() any {
106
func (p *Postgres) Init() error {
107
err := p.validateConfig()
108
if err != nil {
108
- p.Errorf("config validation: %v", err)
109
- return err
109
+ return fmt.Errorf("config validation: %v", err)
110
}
111
112
sr, err := p.initDBSelector()
113
if err != nil {
114
- p.Errorf("config validation: %v", err)
115
- return err
114
+ return fmt.Errorf("config validation: %v", err)
115
}
116
p.dbSr = sr
117
@@ -125,7 +124,6 @@ func (p *Postgres) Init() error {
124
func (p *Postgres) Check() error {
125
mx, err := p.collect()
126
if err != nil {
128
- p.Error(err)
127
return err
128
}
129
if len(mx) == 0 {
src/go/plugin/go.d/modules/powerdns/authoritativens.go
+4
-7
@@ -5,6 +5,7 @@ package powerdns
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -60,21 +61,18 @@ func (ns *AuthoritativeNS) Configuration() any {
61
func (ns *AuthoritativeNS) Init() error {
62
err := ns.validateConfig()
63
if err != nil {
63
- ns.Errorf("config validation: %v", err)
64
- return err
64
+ return fmt.Errorf("config validation: %v", err)
65
}
66
67
client, err := ns.initHTTPClient()
68
if err != nil {
69
- ns.Errorf("init HTTP client: %v", err)
70
- return err
69
+ return fmt.Errorf("init HTTP client: %v", err)
70
}
71
ns.httpClient = client
72
73
cs, err := ns.initCharts()
74
if err != nil {
76
- ns.Errorf("init charts: %v", err)
77
- return err
75
+ return fmt.Errorf("init charts: %v", err)
76
}
77
ns.charts = cs
78
@@ -84,7 +82,6 @@ func (ns *AuthoritativeNS) Init() error {
82
func (ns *AuthoritativeNS) Check() error {
83
mx, err := ns.collect()
84
if err != nil {
87
- ns.Error(err)
85
return err
86
}
87
if len(mx) == 0 {
src/go/plugin/go.d/modules/powerdns_recursor/recursor.go
+4
-7
@@ -5,6 +5,7 @@ package powerdns_recursor
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -60,21 +61,18 @@ func (r *Recursor) Configuration() any {
61
func (r *Recursor) Init() error {
62
err := r.validateConfig()
63
if err != nil {
63
- r.Errorf("config validation: %v", err)
64
- return err
64
+ return fmt.Errorf("config validation: %v", err)
65
}
66
67
client, err := r.initHTTPClient()
68
if err != nil {
69
- r.Errorf("init HTTP client: %v", err)
70
- return err
69
+ return fmt.Errorf("init HTTP client: %v", err)
70
}
71
r.httpClient = client
72
73
cs, err := r.initCharts()
74
if err != nil {
76
- r.Errorf("init charts: %v", err)
77
- return err
75
+ return fmt.Errorf("init charts: %v", err)
76
}
77
r.charts = cs
78
@@ -84,7 +82,6 @@ func (r *Recursor) Init() error {
82
func (r *Recursor) Check() error {
83
mx, err := r.collect()
84
if err != nil {
87
- r.Error(err)
85
return err
86
}
87
if len(mx) == 0 {
src/go/plugin/go.d/modules/prometheus/prometheus.go
+5
-9
@@ -5,6 +5,7 @@ package prometheus
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/pkg/matcher"
@@ -83,28 +84,24 @@ func (p *Prometheus) Configuration() any {
84
85
func (p *Prometheus) Init() error {
86
if err := p.validateConfig(); err != nil {
86
- p.Errorf("validating config: %v", err)
87
- return err
87
+ return fmt.Errorf("validating config: %v", err)
88
}
89
90
prom, err := p.initPrometheusClient()
91
if err != nil {
92
- p.Errorf("init prometheus client: %v", err)
93
- return err
92
+ return fmt.Errorf("init prometheus client: %v", err)
93
}
94
p.prom = prom
95
96
m, err := p.initFallbackTypeMatcher(p.FallbackType.Counter)
97
if err != nil {
99
- p.Errorf("init counter fallback type matcher: %v", err)
100
- return err
98
+ return fmt.Errorf("init counter fallback type matcher: %v", err)
99
}
100
p.fallbackType.counter = m
101
102
m, err = p.initFallbackTypeMatcher(p.FallbackType.Gauge)
103
if err != nil {
106
- p.Errorf("init counter fallback type matcher: %v", err)
107
- return err
104
+ return fmt.Errorf("init counter fallback type matcher: %v", err)
105
}
106
p.fallbackType.gauge = m
107
@@ -114,7 +111,6 @@ func (p *Prometheus) Init() error {
111
func (p *Prometheus) Check() error {
112
mx, err := p.collect()
113
if err != nil {
117
- p.Error(err)
114
return err
115
}
116
if len(mx) == 0 {
src/go/plugin/go.d/modules/proxysql/proxysql.go
-2
@@ -67,7 +67,6 @@ func (p *ProxySQL) Configuration() any {
67
68
func (p *ProxySQL) Init() error {
69
if p.DSN == "" {
70
- p.Error("dsn not set")
70
return errors.New("dsn not set")
71
}
72
@@ -79,7 +78,6 @@ func (p *ProxySQL) Init() error {
78
func (p *ProxySQL) Check() error {
79
mx, err := p.collect()
80
if err != nil {
82
- p.Error(err)
81
return err
82
}
83
if len(mx) == 0 {
src/go/plugin/go.d/modules/pulsar/pulsar.go
+4
-7
@@ -5,6 +5,7 @@ package pulsar
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"sync"
10
"time"
11
@@ -82,21 +83,18 @@ func (p *Pulsar) Configuration() any {
83
84
func (p *Pulsar) Init() error {
85
if err := p.validateConfig(); err != nil {
85
- p.Errorf("config validation: %v", err)
86
- return err
86
+ return fmt.Errorf("config validation: %v", err)
87
}
88
89
prom, err := p.initPrometheusClient()
90
if err != nil {
91
- p.Error(err)
92
- return err
91
+ return fmt.Errorf("init prometheus client: %v", err)
92
}
93
p.prom = prom
94
95
m, err := p.initTopicFilerMatcher()
96
if err != nil {
98
- p.Error(err)
99
- return err
97
+ return fmt.Errorf("init topic filer: %v", err)
98
}
99
p.topicFilter = m
100
@@ -106,7 +104,6 @@ func (p *Pulsar) Init() error {
104
func (p *Pulsar) Check() error {
105
mx, err := p.collect()
106
if err != nil {
109
- p.Error(err)
107
return err
108
}
109
if len(mx) == 0 {
src/go/plugin/go.d/modules/puppet/puppet.go
+2
-4
@@ -5,6 +5,7 @@ package puppet
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -60,14 +61,12 @@ func (p *Puppet) Configuration() any {
61
62
func (p *Puppet) Init() error {
63
if p.URL == "" {
63
- p.Error("URL not set")
64
return errors.New("url not set")
65
}
66
67
client, err := web.NewHTTPClient(p.ClientConfig)
68
if err != nil {
69
- p.Error(err)
70
- return err
69
+ return fmt.Errorf("create http client: %v", err)
70
}
71
p.httpClient = client
72
@@ -80,7 +79,6 @@ func (p *Puppet) Init() error {
79
func (p *Puppet) Check() error {
80
mx, err := p.collect()
81
if err != nil {
83
- p.Error(err)
82
return err
83
}
84
src/go/plugin/go.d/modules/rabbitmq/rabbitmq.go
+3
-5
@@ -5,6 +5,7 @@ package rabbitmq
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -75,14 +76,12 @@ func (r *RabbitMQ) Configuration() any {
76
77
func (r *RabbitMQ) Init() error {
78
if r.URL == "" {
78
- r.Error("'url' can not be empty")
79
- return errors.New("url not set")
79
+ return errors.New("config: url not set")
80
}
81
82
client, err := web.NewHTTPClient(r.ClientConfig)
83
if err != nil {
84
- r.Errorf("init HTTP client: %v", err)
85
- return err
84
+ return fmt.Errorf("init HTTP client: %v", err)
85
}
86
r.httpClient = client
87
@@ -95,7 +94,6 @@ func (r *RabbitMQ) Init() error {
94
func (r *RabbitMQ) Check() error {
95
mx, err := r.collect()
96
if err != nil {
98
- r.Error(err)
97
return err
98
}
99
if len(mx) == 0 {
src/go/plugin/go.d/modules/redis/redis.go
+4
-7
@@ -6,6 +6,7 @@ import (
6
"context"
7
_ "embed"
8
"errors"
9
+ "fmt"
10
"sync"
11
"time"
12
@@ -86,21 +87,18 @@ func (r *Redis) Configuration() any {
87
func (r *Redis) Init() error {
88
err := r.validateConfig()
89
if err != nil {
89
- r.Errorf("config validation: %v", err)
90
- return err
90
+ return fmt.Errorf("config validation: %v", err)
91
}
92
93
rdb, err := r.initRedisClient()
94
if err != nil {
95
- r.Errorf("init redis client: %v", err)
96
- return err
95
+ return fmt.Errorf("init redis client: %v", err)
96
}
97
r.rdb = rdb
98
99
charts, err := r.initCharts()
100
if err != nil {
102
- r.Errorf("init charts: %v", err)
103
- return err
101
+ return fmt.Errorf("init charts: %v", err)
102
}
103
r.charts = charts
104
@@ -110,7 +108,6 @@ func (r *Redis) Init() error {
108
func (r *Redis) Check() error {
109
mx, err := r.collect()
110
if err != nil {
113
- r.Error(err)
111
return err
112
}
113
if len(mx) == 0 {
src/go/plugin/go.d/modules/rethinkdb/rethinkdb.go
+1
-3
@@ -63,8 +63,7 @@ func (r *Rethinkdb) Configuration() any {
63
64
func (r *Rethinkdb) Init() error {
65
if r.Address == "" {
66
- r.Error("address is not set")
67
- return errors.New("address is not set")
66
+ return errors.New("config: address is not set")
67
}
68
return nil
69
}
@@ -72,7 +71,6 @@ func (r *Rethinkdb) Init() error {
71
func (r *Rethinkdb) Check() error {
72
mx, err := r.collect()
73
if err != nil {
75
- r.Error(err)
74
return err
75
}
76
if len(mx) == 0 {
src/go/plugin/go.d/modules/riakkv/riakkv.go
+3
-5
@@ -5,6 +5,7 @@ package riakkv
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"sync"
11
"time"
@@ -70,14 +71,12 @@ func (r *RiakKv) Configuration() any {
71
72
func (r *RiakKv) Init() error {
73
if r.URL == "" {
73
- r.Errorf("url required but not set")
74
- return errors.New("url not set")
74
+ return errors.New("config: url not set")
75
}
76
77
httpClient, err := web.NewHTTPClient(r.ClientConfig)
78
if err != nil {
79
- r.Errorf("init HTTP client: %v", err)
80
- return err
79
+ return fmt.Errorf("init HTTP client: %v", err)
80
}
81
r.httpClient = httpClient
82
@@ -90,7 +89,6 @@ func (r *RiakKv) Init() error {
89
func (r *RiakKv) Check() error {
90
mx, err := r.collect()
91
if err != nil {
93
- r.Error(err)
92
return err
93
}
94
if len(mx) == 0 {
src/go/plugin/go.d/modules/rspamd/rspamd.go
+3
-5
@@ -5,6 +5,7 @@ package rspamd
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -60,14 +61,12 @@ func (r *Rspamd) Configuration() any {
61
62
func (r *Rspamd) Init() error {
63
if r.URL == "" {
63
- r.Error("URL not set")
64
- return errors.New("url not set")
64
+ return errors.New("config: url not set")
65
}
66
67
client, err := web.NewHTTPClient(r.ClientConfig)
68
if err != nil {
69
- r.Error(err)
70
- return err
69
+ return fmt.Errorf("create http client: %v", err)
70
}
71
r.httpClient = client
72
@@ -80,7 +79,6 @@ func (r *Rspamd) Init() error {
79
func (r *Rspamd) Check() error {
80
mx, err := r.collect()
81
if err != nil {
83
- r.Error(err)
82
return err
83
}
84
src/go/plugin/go.d/modules/samba/samba.go
+2
-3
@@ -5,6 +5,7 @@ package samba
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"sync"
10
"time"
11
@@ -58,8 +59,7 @@ func (s *Samba) Configuration() any {
59
func (s *Samba) Init() error {
60
smbStatus, err := s.initSmbStatusBinary()
61
if err != nil {
61
- s.Errorf("smbstatus exec initialization: %v", err)
62
- return err
62
+ return fmt.Errorf("smbstatus exec initialization: %v", err)
63
}
64
s.exec = smbStatus
65
@@ -69,7 +69,6 @@ func (s *Samba) Init() error {
69
func (s *Samba) Check() error {
70
mx, err := s.collect()
71
if err != nil {
72
- s.Error(err)
72
return err
73
}
74
src/go/plugin/go.d/modules/scaleio/scaleio.go
+3
-6
@@ -5,6 +5,7 @@ package scaleio
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -72,14 +73,12 @@ func (s *ScaleIO) Configuration() any {
73
74
func (s *ScaleIO) Init() error {
75
if s.Username == "" || s.Password == "" {
75
- s.Error("username and password aren't set")
76
- return errors.New("username and password aren't set")
76
+ return errors.New("config: username and password aren't set")
77
}
78
79
c, err := client.New(s.ClientConfig, s.RequestConfig)
80
if err != nil {
81
- s.Errorf("error on creating ScaleIO client: %v", err)
82
- return err
81
+ return fmt.Errorf("error on creating ScaleIO client: %v", err)
82
}
83
s.client = c
84
@@ -91,12 +90,10 @@ func (s *ScaleIO) Init() error {
90
91
func (s *ScaleIO) Check() error {
92
if err := s.client.Login(); err != nil {
94
- s.Error(err)
93
return err
94
}
95
mx, err := s.collect()
96
if err != nil {
99
- s.Error(err)
97
return err
98
}
99
if len(mx) == 0 {
src/go/plugin/go.d/modules/sensors/sensors.go
-1
@@ -76,7 +76,6 @@ func (s *Sensors) Init() error {
76
func (s *Sensors) Check() error {
77
mx, err := s.collect()
78
if err != nil {
79
- s.Error(err)
79
return err
80
}
81
src/go/plugin/go.d/modules/smartctl/smartctl.go
+4
-7
@@ -7,6 +7,7 @@ package smartctl
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/pkg/matcher"
@@ -95,21 +96,18 @@ func (s *Smartctl) Configuration() any {
96
97
func (s *Smartctl) Init() error {
98
if err := s.validateConfig(); err != nil {
98
- s.Errorf("config validation error: %s", err)
99
- return err
99
+ return fmt.Errorf("config validation: %s", err)
100
}
101
102
sr, err := s.initDeviceSelector()
103
if err != nil {
104
- s.Errorf("device selector initialization: %v", err)
105
- return err
104
+ return fmt.Errorf("device selector initialization: %v", err)
105
}
106
s.deviceSr = sr
107
108
smartctlExec, err := s.initSmartctlCli()
109
if err != nil {
111
- s.Errorf("smartctl exec initialization: %v", err)
112
- return err
110
+ return fmt.Errorf("smartctl exec initialization: %v", err)
111
}
112
s.exec = smartctlExec
113
@@ -119,7 +117,6 @@ func (s *Smartctl) Init() error {
117
func (s *Smartctl) Check() error {
118
mx, err := s.collect()
119
if err != nil {
122
- s.Error(err)
120
return err
121
}
122
src/go/plugin/go.d/modules/snmp/snmp.go
+6
-11
@@ -5,6 +5,7 @@ package snmp
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
10
"github.com/netdata/netdata/go/plugins/pkg/matcher"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -85,35 +86,30 @@ func (s *SNMP) Configuration() any {
86
func (s *SNMP) Init() error {
87
err := s.validateConfig()
88
if err != nil {
88
- s.Errorf("config validation failed: %v", err)
89
- return err
89
+ return fmt.Errorf("config validation failed: %v", err)
90
}
91
92
snmpClient, err := s.initSNMPClient()
93
if err != nil {
94
- s.Errorf("failed to initialize SNMP client: %v", err)
95
- return err
94
+ return fmt.Errorf("failed to initialize SNMP client: %v", err)
95
}
96
97
err = snmpClient.Connect()
98
if err != nil {
100
- s.Errorf("SNMP client connection failed: %v", err)
101
- return err
99
+ return fmt.Errorf("SNMP client connection failed: %v", err)
100
}
101
s.snmpClient = snmpClient
102
103
byName, byType, err := s.initNetIfaceFilters()
104
if err != nil {
107
- s.Errorf("failed to initialize network interface filters: %v", err)
108
- return err
105
+ return fmt.Errorf("failed to initialize network interface filters: %v", err)
106
}
107
s.netIfaceFilterByName = byName
108
s.netIfaceFilterByType = byType
109
110
charts, err := newUserInputCharts(s.ChartsInput)
111
if err != nil {
115
- s.Errorf("failed to create user charts: %v", err)
116
- return err
112
+ return fmt.Errorf("failed to create user charts: %v", err)
113
}
114
s.charts = charts
115
@@ -125,7 +121,6 @@ func (s *SNMP) Init() error {
121
func (s *SNMP) Check() error {
122
mx, err := s.collect()
123
if err != nil {
128
- s.Error(err)
124
return err
125
}
126
src/go/plugin/go.d/modules/squid/squid.go
+3
-5
@@ -5,6 +5,7 @@ package squid
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -60,14 +61,12 @@ func (s *Squid) Configuration() any {
61
62
func (s *Squid) Init() error {
63
if s.URL == "" {
63
- s.Error("URL not set")
64
- return errors.New("url not set")
64
+ return errors.New("config: url not set")
65
}
66
67
client, err := web.NewHTTPClient(s.ClientConfig)
68
if err != nil {
69
- s.Error(err)
70
- return err
69
+ return fmt.Errorf("init http client: %w", err)
70
}
71
s.httpClient = client
72
@@ -80,7 +79,6 @@ func (s *Squid) Init() error {
79
func (s *Squid) Check() error {
80
mx, err := s.collect()
81
if err != nil {
83
- s.Error(err)
82
return err
83
}
84
src/go/plugin/go.d/modules/squidlog/squidlog.go
+4
-6
@@ -4,6 +4,7 @@ package squidlog
4
5
import (
6
_ "embed"
7
+ "fmt"
8
9
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/logs"
@@ -72,18 +73,15 @@ func (s *SquidLog) Init() error {
73
func (s *SquidLog) Check() error {
74
// Note: these inits are here to make auto-detection retry working
75
if err := s.createLogReader(); err != nil {
75
- s.Warning("check failed: ", err)
76
- return err
76
+ return fmt.Errorf("failed to create log reader: %v", err)
77
}
78
79
if err := s.createParser(); err != nil {
80
- s.Warning("check failed: ", err)
81
- return err
80
+ return fmt.Errorf("failed to create log parser: %v", err)
81
}
82
83
if err := s.createCharts(s.line); err != nil {
85
- s.Warning("check failed: ", err)
86
- return err
84
+ return fmt.Errorf("failed to create log charts: %v", err)
85
}
86
87
return nil
src/go/plugin/go.d/modules/storcli/storcli.go
+2
-3
@@ -7,6 +7,7 @@ package storcli
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -70,8 +71,7 @@ func (s *StorCli) Configuration() any {
71
func (s *StorCli) Init() error {
72
storExec, err := s.initStorCliExec()
73
if err != nil {
73
- s.Errorf("storcli exec initialization: %v", err)
74
- return err
74
+ return fmt.Errorf("storcli exec initialization: %v", err)
75
}
76
s.exec = storExec
77
@@ -81,7 +81,6 @@ func (s *StorCli) Init() error {
81
func (s *StorCli) Check() error {
82
mx, err := s.collect()
83
if err != nil {
84
- s.Error(err)
84
return err
85
}
86
src/go/plugin/go.d/modules/supervisord/supervisord.go
+3
-5
@@ -5,6 +5,7 @@ package supervisord
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -67,14 +68,12 @@ func (s *Supervisord) Configuration() any {
68
func (s *Supervisord) Init() error {
69
err := s.verifyConfig()
70
if err != nil {
70
- s.Errorf("verify config: %v", err)
71
- return err
71
+ return fmt.Errorf("verify config: %v", err)
72
}
73
74
client, err := s.initSupervisorClient()
75
if err != nil {
76
- s.Errorf("init supervisord client: %v", err)
77
- return err
76
+ return fmt.Errorf("init supervisord client: %v", err)
77
}
78
s.client = client
79
@@ -84,7 +83,6 @@ func (s *Supervisord) Init() error {
83
func (s *Supervisord) Check() error {
84
mx, err := s.collect()
85
if err != nil {
87
- s.Error(err)
86
return err
87
}
88
if len(mx) == 0 {
src/go/plugin/go.d/modules/systemdunits/systemdunits.go
+3
-5
@@ -7,6 +7,7 @@ package systemdunits
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/pkg/matcher"
@@ -84,14 +85,12 @@ func (s *SystemdUnits) Configuration() any {
85
86
func (s *SystemdUnits) Init() error {
87
if err := s.validateConfig(); err != nil {
87
- s.Errorf("config validation: %v", err)
88
- return err
88
+ return fmt.Errorf("config validation: %v", err)
89
}
90
91
sr, err := s.initUnitSelector()
92
if err != nil {
93
- s.Errorf("init unit selector: %v", err)
94
- return err
93
+ return fmt.Errorf("init unit selector: %v", err)
94
}
95
s.unitSr = sr
96
@@ -106,7 +105,6 @@ func (s *SystemdUnits) Init() error {
105
func (s *SystemdUnits) Check() error {
106
mx, err := s.collect()
107
if err != nil {
109
- s.Error(err)
108
return err
109
}
110
src/go/plugin/go.d/modules/tengine/tengine.go
+3
-5
@@ -5,6 +5,7 @@ package tengine
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -60,14 +61,12 @@ func (t *Tengine) Configuration() any {
61
62
func (t *Tengine) Init() error {
63
if t.URL == "" {
63
- t.Error("url not set")
64
- return errors.New("url not set")
64
+ return errors.New("config: url not set")
65
}
66
67
httpClient, err := web.NewHTTPClient(t.ClientConfig)
68
if err != nil {
69
- t.Errorf("error on creating http client : %v", err)
70
- return err
69
+ return fmt.Errorf("error on creating http client : %v", err)
70
}
71
t.httpClient = httpClient
72
@@ -80,7 +79,6 @@ func (t *Tengine) Init() error {
79
func (t *Tengine) Check() error {
80
mx, err := t.collect()
81
if err != nil {
83
- t.Error(err)
82
return err
83
}
84
src/go/plugin/go.d/modules/testrandom/testrandom.go
+3
-4
@@ -4,6 +4,7 @@ package testrandom
4
5
import (
6
_ "embed"
7
+ "fmt"
8
"math/rand"
9
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -74,14 +75,12 @@ func (tr *TestRandom) Configuration() any {
75
func (tr *TestRandom) Init() error {
76
err := tr.validateConfig()
77
if err != nil {
77
- tr.Errorf("config validation: %v", err)
78
- return err
78
+ return fmt.Errorf("config validation: %v", err)
79
}
80
81
charts, err := tr.initCharts()
82
if err != nil {
83
- tr.Errorf("charts init: %v", err)
84
- return err
83
+ return fmt.Errorf("charts init: %v", err)
84
}
85
tr.charts = charts
86
return nil
src/go/plugin/go.d/modules/tomcat/tomcat.go
+3
-5
@@ -5,6 +5,7 @@ package tomcat
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"net/http"
10
"time"
11
@@ -65,14 +66,12 @@ func (t *Tomcat) Configuration() any {
66
67
func (t *Tomcat) Init() error {
68
if err := t.validateConfig(); err != nil {
68
- t.Errorf("config validation: %v", err)
69
- return err
69
+ return fmt.Errorf("config validation: %v", err)
70
}
71
72
httpClient, err := t.initHTTPClient()
73
if err != nil {
74
- t.Errorf("init HTTP client: %v", err)
75
- return err
74
+ return fmt.Errorf("init HTTP client: %v", err)
75
}
76
77
t.httpClient = httpClient
@@ -86,7 +85,6 @@ func (t *Tomcat) Init() error {
85
func (t *Tomcat) Check() error {
86
mx, err := t.collect()
87
if err != nil {
89
- t.Error(err)
88
return err
89
}
90
src/go/plugin/go.d/modules/tor/tor.go
+1
-3
@@ -56,8 +56,7 @@ func (t *Tor) Configuration() any {
56
57
func (t *Tor) Init() error {
58
if t.Address == "" {
59
- t.Error("config: 'address' not set")
60
- return errors.New("address not set")
59
+ return errors.New("config: address not set")
60
}
61
62
return nil
@@ -66,7 +65,6 @@ func (t *Tor) Init() error {
65
func (t *Tor) Check() error {
66
mx, err := t.collect()
67
if err != nil {
69
- t.Error(err)
68
return err
69
}
70
src/go/plugin/go.d/modules/traefik/traefik.go
+3
-5
@@ -5,6 +5,7 @@ package traefik
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -85,14 +86,12 @@ func (t *Traefik) Configuration() any {
86
87
func (t *Traefik) Init() error {
88
if err := t.validateConfig(); err != nil {
88
- t.Errorf("config validation: %v", err)
89
- return err
89
+ return fmt.Errorf("config validation: %v", err)
90
}
91
92
prom, err := t.initPrometheusClient()
93
if err != nil {
94
- t.Errorf("prometheus client initialization: %v", err)
95
- return err
94
+ return fmt.Errorf("prometheus client initialization: %v", err)
95
}
96
t.prom = prom
97
@@ -102,7 +101,6 @@ func (t *Traefik) Init() error {
101
func (t *Traefik) Check() error {
102
mx, err := t.collect()
103
if err != nil {
105
- t.Error(err)
104
return err
105
}
106
if len(mx) == 0 {
src/go/plugin/go.d/modules/typesense/typesense.go
+2
-4
@@ -67,13 +67,12 @@ func (ts *Typesense) Configuration() any {
67
68
func (ts *Typesense) Init() error {
69
if ts.URL == "" {
70
- ts.Error("typesense URL not configured")
71
- return errors.New("typesense URL not configured")
70
+ return errors.New("configL: url not configured")
71
}
72
73
httpClient, err := web.NewHTTPClient(ts.ClientConfig)
74
if err != nil {
76
- return fmt.Errorf("initialize http client: %w", err)
75
+ return fmt.Errorf("init http client: %w", err)
76
}
77
78
ts.httpClient = httpClient
@@ -90,7 +89,6 @@ func (ts *Typesense) Init() error {
89
func (ts *Typesense) Check() error {
90
mx, err := ts.collect()
91
if err != nil {
93
- ts.Error(err)
92
return err
93
}
94
if len(mx) == 0 {
src/go/plugin/go.d/modules/unbound/unbound.go
+2
-3
@@ -5,6 +5,7 @@ package unbound
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -77,8 +78,7 @@ func (u *Unbound) Init() error {
78
}
79
80
if err := u.initClient(); err != nil {
80
- u.Errorf("creating client: %v", err)
81
- return err
81
+ return fmt.Errorf("creating client: %v", err)
82
}
83
84
u.charts = charts(u.Cumulative)
@@ -94,7 +94,6 @@ func (u *Unbound) Init() error {
94
func (u *Unbound) Check() error {
95
mx, err := u.collect()
96
if err != nil {
97
- u.Error(err)
97
return err
98
}
99
if len(mx) == 0 {
src/go/plugin/go.d/modules/upsd/upsd.go
+1
-3
@@ -69,8 +69,7 @@ func (u *Upsd) Configuration() any {
69
70
func (u *Upsd) Init() error {
71
if u.Address == "" {
72
- u.Error("config: 'address' not set")
73
- return errors.New("address not set")
72
+ return errors.New("config: 'address' not set")
73
}
74
75
return nil
@@ -79,7 +78,6 @@ func (u *Upsd) Init() error {
78
func (u *Upsd) Check() error {
79
mx, err := u.collect()
80
if err != nil {
82
- u.Error(err)
81
return err
82
}
83
if len(mx) == 0 {
src/go/plugin/go.d/modules/uwsgi/uwsgi.go
+1
-3
@@ -56,8 +56,7 @@ func (u *Uwsgi) Configuration() any {
56
57
func (u *Uwsgi) Init() error {
58
if u.Address == "" {
59
- u.Error("config: 'address' not set")
60
- return errors.New("address not set")
59
+ return errors.New("config: 'address' not set")
60
}
61
62
u.conn = newUwsgiConn(u.Config)
@@ -68,7 +67,6 @@ func (u *Uwsgi) Init() error {
67
func (u *Uwsgi) Check() error {
68
mx, err := u.collect()
69
if err != nil {
71
- u.Error(err)
70
return err
71
}
72
src/go/plugin/go.d/modules/varnish/varnish.go
+2
-3
@@ -5,6 +5,7 @@ package varnish
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -64,8 +65,7 @@ func (v *Varnish) Configuration() any {
65
func (v *Varnish) Init() error {
66
vs, err := v.initVarnishstatBinary()
67
if err != nil {
67
- v.Errorf("varnishstat exec initialization: %v", err)
68
- return err
68
+ return fmt.Errorf("init varnishstat exec: %v", err)
69
}
70
v.exec = vs
71
@@ -75,7 +75,6 @@ func (v *Varnish) Init() error {
75
func (v *Varnish) Check() error {
76
mx, err := v.collect()
77
if err != nil {
78
- v.Error(err)
78
return err
79
}
80
src/go/plugin/go.d/modules/vcsa/vcsa.go
+3
-6
@@ -5,6 +5,7 @@ package vcsa
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -75,14 +76,12 @@ func (vc *VCSA) Configuration() any {
76
77
func (vc *VCSA) Init() error {
78
if err := vc.validateConfig(); err != nil {
78
- vc.Error(err)
79
- return err
79
+ return fmt.Errorf("invalid config: %v", err)
80
}
81
82
c, err := vc.initHealthClient()
83
if err != nil {
84
- vc.Errorf("error on creating health client : %vc", err)
85
- return err
84
+ return fmt.Errorf("error on creating health client : %vc", err)
85
}
86
vc.client = c
87
@@ -95,13 +94,11 @@ func (vc *VCSA) Init() error {
94
func (vc *VCSA) Check() error {
95
err := vc.client.Login()
96
if err != nil {
98
- vc.Error(err)
97
return err
98
}
99
100
mx, err := vc.collect()
101
if err != nil {
104
- vc.Error(err)
102
return err
103
}
104
src/go/plugin/go.d/modules/vsphere/vsphere.go
+5
-8
@@ -4,6 +4,7 @@ package vsphere
4
5
import (
6
_ "embed"
7
+ "fmt"
8
"sync"
9
"time"
10
@@ -90,26 +91,22 @@ func (vs *VSphere) Configuration() any {
91
92
func (vs *VSphere) Init() error {
93
if err := vs.validateConfig(); err != nil {
93
- vs.Errorf("error on validating config: %v", err)
94
- return err
94
+ return fmt.Errorf("error on validating config: %v", err)
95
}
96
97
vsClient, err := vs.initClient()
98
if err != nil {
99
- vs.Errorf("error on creating vsphere client: %v", err)
100
- return err
99
+ return fmt.Errorf("error on creating vsphere client: %v", err)
100
}
101
102
if err := vs.initDiscoverer(vsClient); err != nil {
104
- vs.Errorf("error on creating vsphere discoverer: %v", err)
105
- return err
103
+ return fmt.Errorf("error on creating vsphere discoverer: %v", err)
104
}
105
106
vs.initScraper(vsClient)
107
108
if err := vs.discoverOnce(); err != nil {
111
- vs.Errorf("error on discovering: %v", err)
112
- return err
109
+ return fmt.Errorf("error on discovering: %v", err)
110
}
111
112
vs.goDiscovery()
src/go/plugin/go.d/modules/w1sensor/w1sensor.go
+1
-3
@@ -57,8 +57,7 @@ func (w *W1sensor) Configuration() any {
57
58
func (w *W1sensor) Init() error {
59
if w.SensorsPath == "" {
60
- w.Errorf("sensors_path required but not set")
61
- return errors.New("no sensors path specified")
60
+ return errors.New("config: no sensors path specified")
61
}
62
63
return nil
@@ -67,7 +66,6 @@ func (w *W1sensor) Init() error {
66
func (w *W1sensor) Check() error {
67
mx, err := w.collect()
68
if err != nil {
70
- w.Error(err)
69
return err
70
}
71
src/go/plugin/go.d/modules/weblog/weblog.go
+7
-12
@@ -4,6 +4,7 @@ package weblog
4
5
import (
6
_ "embed"
7
+ "fmt"
8
9
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/logs"
@@ -101,18 +102,15 @@ func (w *WebLog) Configuration() any {
102
103
func (w *WebLog) Init() error {
104
if err := w.createURLPatterns(); err != nil {
104
- w.Errorf("init failed: %v", err)
105
- return err
105
+ return fmt.Errorf("init failed: %v", err)
106
}
107
108
if err := w.createCustomFields(); err != nil {
109
- w.Errorf("init failed: %v", err)
110
- return err
109
+ return fmt.Errorf("init failed: %v", err)
110
}
111
112
if err := w.createCustomTimeFields(); err != nil {
114
- w.Errorf("init failed: %v", err)
115
- return err
113
+ return fmt.Errorf("init failed: %v", err)
114
}
115
116
if err := w.createCustomNumericFields(); err != nil {
@@ -128,18 +126,15 @@ func (w *WebLog) Init() error {
126
func (w *WebLog) Check() error {
127
// Note: these inits are here to make auto-detection retry working
128
if err := w.createLogReader(); err != nil {
131
- w.Warning("check failed: ", err)
132
- return err
129
+ return fmt.Errorf("failed to create log reader: %v", err)
130
}
131
132
if err := w.createParser(); err != nil {
136
- w.Warning("check failed: ", err)
137
- return err
133
+ return fmt.Errorf("failed to create parser: %v", err)
134
}
135
136
if err := w.createCharts(w.line); err != nil {
141
- w.Warning("check failed: ", err)
142
- return err
137
+ return fmt.Errorf("failed to create charts: %v", err)
138
}
139
140
return nil
src/go/plugin/go.d/modules/whoisquery/whoisquery.go
+3
-5
@@ -5,6 +5,7 @@ package whoisquery
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -58,14 +59,12 @@ func (w *WhoisQuery) Configuration() any {
59
60
func (w *WhoisQuery) Init() error {
61
if err := w.validateConfig(); err != nil {
61
- w.Errorf("config validation: %v", err)
62
- return err
62
+ return fmt.Errorf("config validation: %v", err)
63
}
64
65
prov, err := w.initProvider()
66
if err != nil {
67
- w.Errorf("init whois provider: %v", err)
68
- return err
67
+ return fmt.Errorf("init whois provider: %v", err)
68
}
69
w.prov = prov
70
@@ -77,7 +76,6 @@ func (w *WhoisQuery) Init() error {
76
func (w *WhoisQuery) Check() error {
77
mx, err := w.collect()
78
if err != nil {
80
- w.Error(err)
79
return err
80
}
81
if len(mx) == 0 {
src/go/plugin/go.d/modules/windows/windows.go
+3
-5
@@ -5,6 +5,7 @@ package windows
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -123,14 +124,12 @@ func (w *Windows) Configuration() any {
124
125
func (w *Windows) Init() error {
126
if err := w.validateConfig(); err != nil {
126
- w.Errorf("config validation: %v", err)
127
- return err
127
+ return fmt.Errorf("config validation: %v", err)
128
}
129
130
prom, err := w.initPrometheusClient()
131
if err != nil {
132
- w.Errorf("init prometheus clients: %v", err)
133
- return err
132
+ return fmt.Errorf("init prometheus clients: %v", err)
133
}
134
w.prom = prom
135
@@ -140,7 +139,6 @@ func (w *Windows) Init() error {
139
func (w *Windows) Check() error {
140
mx, err := w.collect()
141
if err != nil {
143
- w.Error(err)
142
return err
143
}
144
if len(mx) == 0 {
src/go/plugin/go.d/modules/wireguard/wireguard.go
-1
@@ -70,7 +70,6 @@ func (w *WireGuard) Init() error {
70
func (w *WireGuard) Check() error {
71
mx, err := w.collect()
72
if err != nil {
73
- w.Error(err)
73
return err
74
}
75
if len(mx) == 0 {
src/go/plugin/go.d/modules/x509check/x509check.go
+3
-5
@@ -5,6 +5,7 @@ package x509check
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -64,14 +65,12 @@ func (x *X509Check) Configuration() any {
65
66
func (x *X509Check) Init() error {
67
if err := x.validateConfig(); err != nil {
67
- x.Errorf("config validation: %v", err)
68
- return err
68
+ return fmt.Errorf("config validation: %v", err)
69
}
70
71
prov, err := x.initProvider()
72
if err != nil {
73
- x.Errorf("certificate provider init: %v", err)
74
- return err
73
+ return fmt.Errorf("certificate provider init: %v", err)
74
}
75
x.prov = prov
76
@@ -83,7 +82,6 @@ func (x *X509Check) Init() error {
82
func (x *X509Check) Check() error {
83
mx, err := x.collect()
84
if err != nil {
86
- x.Error(err)
85
return err
86
}
87
if len(mx) == 0 {
src/go/plugin/go.d/modules/zfspool/zfspool.go
+3
-5
@@ -7,6 +7,7 @@ package zfspool
7
import (
8
_ "embed"
9
"errors"
10
+ "fmt"
11
"time"
12
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -69,14 +70,12 @@ func (z *ZFSPool) Configuration() any {
70
71
func (z *ZFSPool) Init() error {
72
if err := z.validateConfig(); err != nil {
72
- z.Errorf("config validation: %s", err)
73
- return err
73
+ return fmt.Errorf("config validation: %s", err)
74
}
75
76
zpoolExec, err := z.initZPoolCLIExec()
77
if err != nil {
78
- z.Errorf("zpool exec initialization: %v", err)
79
- return err
78
+ return fmt.Errorf("zpool exec initialization: %v", err)
79
}
80
z.exec = zpoolExec
81
@@ -86,7 +85,6 @@ func (z *ZFSPool) Init() error {
85
func (z *ZFSPool) Check() error {
86
mx, err := z.collect()
87
if err != nil {
89
- z.Error(err)
88
return err
89
}
90
src/go/plugin/go.d/modules/zookeeper/zookeeper.go
+3
-5
@@ -5,6 +5,7 @@ package zookeeper
5
import (
6
_ "embed"
7
"errors"
8
+ "fmt"
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -58,14 +59,12 @@ func (z *Zookeeper) Configuration() any {
59
60
func (z *Zookeeper) Init() error {
61
if err := z.verifyConfig(); err != nil {
61
- z.Error(err)
62
- return err
62
+ return fmt.Errorf("invalid config: %v", err)
63
}
64
65
f, err := z.initZookeeperFetcher()
66
if err != nil {
67
- z.Error(err)
68
- return err
67
+ return fmt.Errorf("init zookeeper fetcher: %v", err)
68
}
69
z.fetcher = f
70
@@ -75,7 +74,6 @@ func (z *Zookeeper) Init() error {
74
func (z *Zookeeper) Check() error {
75
mx, err := z.collect()
76
if err != nil {
78
- z.Error(err)
77
return err
78
}
79
if len(mx) == 0 {