fix(go.d): prefer env-provided dirs over build-time defaults (#21345)

ilyam8 · web-flow · commit a7cd2fe51888 · 2025-11-24T13:36:32.000+02:00
diff --git a/src/go/pkg/pluginconfig/pluginconfig.go b/src/go/pkg/pluginconfig/pluginconfig.go
@@ -19,6 +19,8 @@ import (
 	"github.com/netdata/netdata/go/plugins/pkg/cli"
 	"github.com/netdata/netdata/go/plugins/pkg/executable"
 	"github.com/netdata/netdata/go/plugins/pkg/multipath"
+
+	"github.com/mattn/go-isatty"
 )
 
 var (
@@ -130,11 +132,11 @@ func (d *directories) initUserRoots(opts *cli.Option, env envData, execDir strin
 		roots = append(roots, p)
 	}
 
-	// 2) NETDATA_USER_CONFIG_DIR
-	if buildinfo.UserConfigDir != "" {
-		roots = append(roots, safePathClean(buildinfo.UserConfigDir))
-	} else if dir := safePathClean(env.userDir); dir != "" {
+	// 2) NETDATA_USER_CONFIG_DIR (env has priority over buildinfo)
+	if dir := safePathClean(env.userDir); dir != "" {
 		roots = append(roots, dir)
+	} else if buildinfo.UserConfigDir != "" {
+		roots = append(roots, safePathClean(buildinfo.UserConfigDir))
 	}
 
 	if len(roots) != 0 {
@@ -164,14 +166,15 @@ func (d *directories) initUserRoots(opts *cli.Option, env envData, execDir strin
 
 // Build step 2: initialize single "stock" root: env, common locations, build-relative fallback.
 func (d *directories) initStockRoot(env envData, execDir string) {
-	if buildinfo.StockConfigDir != "" {
-		d.stockConfigDir = safePathClean(buildinfo.StockConfigDir)
-		return
-	}
+	// env.stockDir has priority
 	if stock := safePathClean(env.stockDir); stock != "" {
 		d.stockConfigDir = stock
 		return
 	}
+	if buildinfo.StockConfigDir != "" {
+		d.stockConfigDir = safePathClean(buildinfo.StockConfigDir)
+		return
+	}
 
 	relDir := safePathClean(filepath.Join(execDir, "..", "..", "..", "..", "usr", "lib", "netdata", "conf.d"))
 	if isDirExists(relDir) {
@@ -254,19 +257,28 @@ func (d *directories) validate() error {
 	return nil
 }
 
+var isTerm = isatty.IsTerminal(os.Stderr.Fd()) || isatty.IsTerminal(os.Stdout.Fd())
+
 func readEnvFromOS(execDir string) envData {
 	e := envData{
 		cygwinBase: os.Getenv("NETDATA_CYGWIN_BASE_PATH"),
 		userDir:    os.Getenv("NETDATA_USER_CONFIG_DIR"),
 		stockDir:   os.Getenv("NETDATA_STOCK_CONFIG_DIR"),
-		varLibDir:  os.Getenv("NETDATA_LIB_DIR"),
 		watchPath:  os.Getenv("NETDATA_PLUGINS_GOD_WATCH_PATH"),
+		varLibDir:  os.Getenv("NETDATA_LIB_DIR"),
 		logLevel:   os.Getenv("NETDATA_LOG_LEVEL"),
 	}
 	e.userDir = handleDirOnWin(e.cygwinBase, safePathClean(e.userDir), execDir)
 	e.stockDir = handleDirOnWin(e.cygwinBase, safePathClean(e.stockDir), execDir)
 	e.varLibDir = handleDirOnWin(e.cygwinBase, safePathClean(e.varLibDir), execDir)
 	e.watchPath = handleDirOnWin(e.cygwinBase, safePathClean(e.watchPath), execDir)
+
+	if isTerm {
+		e.userDir = ""
+		e.stockDir = ""
+		e.watchPath = ""
+	}
+
 	return e
 }
 
