go.d remove vnode disable (#18446)
Ilya Mashchenko committed
Aug 30, 2024 at 12:39 UTC
cb28ac869777ef05f599925786c99bf25e5ef482
3 files changed
+10
-20
src/go/plugin/go.d/agent/agent.go
+1
-4
@@ -22,7 +22,6 @@ import (
22
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
23
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/netdataapi"
24
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/safewriter"
25
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/vnodes"
25
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/multipath"
26
27
"github.com/mattn/go-isatty"
@@ -187,9 +186,7 @@ func (a *Agent) run(ctx context.Context) {
186
jobMgr.ConfigDefaults = discCfg.Registry
187
jobMgr.FnReg = fnMgr
188
190
- if reg := a.setupVnodeRegistry(); reg == nil || reg.Len() == 0 {
191
- vnodes.Disabled = true
192
- } else {
189
+ if reg := a.setupVnodeRegistry(); reg != nil && reg.Len() > 0 {
190
jobMgr.Vnodes = reg
191
}
192
src/go/plugin/go.d/agent/module/job.go
+9
-14
@@ -17,7 +17,6 @@ import (
17
18
"github.com/netdata/netdata/go/plugins/logger"
19
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/netdataapi"
20
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/vnodes"
20
)
21
22
var obsoleteLock = &sync.Mutex{}
@@ -299,13 +298,11 @@ func (j *Job) Cleanup() {
298
return
299
}
300
302
- if !vnodes.Disabled {
303
- if !j.vnodeCreated && j.vnodeGUID != "" {
304
- _ = j.api.HOSTINFO(j.vnodeGUID, j.vnodeHostname, j.vnodeLabels)
305
- j.vnodeCreated = true
306
- }
307
- _ = j.api.HOST(j.vnodeGUID)
301
+ if !j.vnodeCreated && j.vnodeGUID != "" {
302
+ _ = j.api.HOSTINFO(j.vnodeGUID, j.vnodeHostname, j.vnodeLabels)
303
+ j.vnodeCreated = true
304
}
305
+ _ = j.api.HOST(j.vnodeGUID)
306
307
if j.runChart.created {
308
j.runChart.MarkRemove()
@@ -397,15 +394,13 @@ func (j *Job) collect() (result map[string]int64) {
394
}
395
396
func (j *Job) processMetrics(metrics map[string]int64, startTime time.Time, sinceLastRun int) bool {
400
- if !vnodes.Disabled {
401
- if !j.vnodeCreated && j.vnodeGUID != "" {
402
- _ = j.api.HOSTINFO(j.vnodeGUID, j.vnodeHostname, j.vnodeLabels)
403
- j.vnodeCreated = true
404
- }
405
-
406
- _ = j.api.HOST(j.vnodeGUID)
397
+ if !j.vnodeCreated && j.vnodeGUID != "" {
398
+ _ = j.api.HOSTINFO(j.vnodeGUID, j.vnodeHostname, j.vnodeLabels)
399
+ j.vnodeCreated = true
400
}
401
402
+ _ = j.api.HOST(j.vnodeGUID)
403
+
404
if !ndInternalMonitoringDisabled && !j.runChart.created {
405
j.runChart.ID = fmt.Sprintf("execution_time_of_%s", j.FullName())
406
j.createChart(j.runChart)
src/go/plugin/go.d/agent/vnodes/vnodes.go
-2
@@ -14,8 +14,6 @@ import (
14
"gopkg.in/yaml.v2"
15
)
16
17
-var Disabled = false // TODO: remove after Netdata v1.39.0. Fix for "from source" stable-channel installations.
18
-
17
func New(confDir string) *Vnodes {
18
vn := &Vnodes{
19
Logger: logger.New().With(