@cryptotaxi247 / netdata-1 / commits / eb839e2b3

chore: go.d/ibm.d various fixes (#21128)

Ilya Mashchenko committed Oct 10, 2025 at 14:02 UTC eb839e2b3ddedcfe3f92dcb47402a22fb8d0fb5c
11 files changed +152 -358
src/go/cmd/godplugin/main.go
+1 -14
@@ -8,7 +8,6 @@ import (
8 "os"
9 "os/user"
10 "strings"
11 - "time"
11
12 "github.com/netdata/netdata/go/plugins/logger"
13 "github.com/netdata/netdata/go/plugins/pkg/buildinfo"
@@ -36,7 +35,7 @@ func main() {
35 opts := parseCLI()
36
37 if opts.Version {
39 - fmt.Printf("go.d.plugin, version: %s\n", buildinfo.Version)
38 + fmt.Printf("%s.plugin, version: %s\n", executable.Name, buildinfo.Version)
39 return
40 }
41
@@ -49,17 +48,6 @@ func main() {
48 logger.Level.Set(slog.LevelDebug)
49 }
50
52 - // Parse dump duration if provided
53 - var dumpMode time.Duration
54 - if opts.DumpMode != "" {
55 - var err error
56 - dumpMode, err = time.ParseDuration(opts.DumpMode)
57 - if err != nil {
58 - fmt.Fprintf(os.Stderr, "error: invalid dump duration '%s': %v\n", opts.DumpMode, err)
59 - os.Exit(1)
60 - }
61 - }
62 -
51 a := agent.New(agent.Config{
52 Name: executable.Name,
53 PluginConfigDir: pluginconfig.ConfigDir(),
@@ -70,7 +58,6 @@ func main() {
58 RunModule: opts.Module,
59 RunJob: opts.Job,
60 MinUpdateEvery: opts.UpdateEvery,
73 - DumpMode: dumpMode,
61 DumpSummary: opts.DumpSummary,
62 })
63
src/go/cmd/ibmdplugin/config.go deleted
-171
@@ -1,171 +0,0 @@
1 -// SPDX-License-Identifier: GPL-3.0-or-later
2 -
3 -package main
4 -
5 -import (
6 - "errors"
7 - "io/fs"
8 - "os"
9 - "path/filepath"
10 - "strings"
11 -
12 - "github.com/netdata/netdata/go/plugins/pkg/executable"
13 - "github.com/netdata/netdata/go/plugins/pkg/multipath"
14 - "github.com/netdata/netdata/go/plugins/plugin/go.d/cli"
15 -)
16 -
17 -type envConfig struct {
18 - cygwinBase string
19 - userDir string
20 - stockDir string
21 - varLibDir string
22 - watchPath string
23 - logLevel string
24 -}
25 -
26 -func newEnvConfig() *envConfig {
27 - cfg := &envConfig{
28 - cygwinBase: os.Getenv("NETDATA_CYGWIN_BASE_PATH"),
29 - userDir: os.Getenv("NETDATA_USER_CONFIG_DIR"),
30 - stockDir: os.Getenv("NETDATA_STOCK_CONFIG_DIR"),
31 - varLibDir: os.Getenv("NETDATA_LIB_DIR"),
32 - watchPath: os.Getenv("NETDATA_PLUGINS_IBM_D_WATCH_PATH"),
33 - logLevel: os.Getenv("NETDATA_LOG_LEVEL"),
34 - }
35 -
36 - cfg.userDir = cfg.handleDirOnWin(cfg.userDir)
37 - cfg.stockDir = cfg.handleDirOnWin(cfg.stockDir)
38 - cfg.varLibDir = cfg.handleDirOnWin(cfg.varLibDir)
39 - cfg.watchPath = cfg.handleDirOnWin(cfg.watchPath)
40 -
41 - return cfg
42 -}
43 -
44 -func (c *envConfig) handleDirOnWin(path string) string {
45 - base := c.cygwinBase
46 -
47 - // TODO: temp workaround for debug mode
48 - if base == "" && strings.HasPrefix(executable.Directory, "C:\\msys64") {
49 - base = "C:\\msys64"
50 - }
51 -
52 - if base == "" || !strings.HasPrefix(path, "/") {
53 - return path
54 - }
55 -
56 - return filepath.Join(base, path)
57 -}
58 -
59 -type config struct {
60 - name string
61 - pluginDir multipath.MultiPath
62 - collectorsDir multipath.MultiPath
63 - collectorsWatchPath []string
64 - serviceDiscoveryDir multipath.MultiPath
65 - varLibDir string
66 -}
67 -
68 -func newConfig(opts *cli.Option, env *envConfig) *config {
69 - cfg := &config{
70 - name: "ibm.d",
71 - }
72 -
73 - cfg.pluginDir = cfg.initPluginDir(opts, env)
74 - cfg.collectorsDir = cfg.initCollectorsDir(opts)
75 - cfg.collectorsWatchPath = cfg.initCollectorsWatchPaths(opts, env)
76 - cfg.serviceDiscoveryDir = cfg.initServiceDiscoveryConfigDir()
77 - cfg.varLibDir = env.varLibDir
78 -
79 - return cfg
80 -}
81 -
82 -func (c *config) initPluginDir(opts *cli.Option, env *envConfig) multipath.MultiPath {
83 - if len(opts.ConfDir) > 0 {
84 - return opts.ConfDir
85 - }
86 -
87 - if env.userDir != "" || env.stockDir != "" {
88 - return multipath.New(env.userDir, env.stockDir)
89 - }
90 -
91 - dirs := []string{
92 - filepath.Join(executable.Directory, "/../../../../etc/netdata"),
93 - }
94 -
95 - // Find the first existing standard directory
96 - standardDirs := []string{
97 - env.handleDirOnWin("/etc/netdata"),
98 - env.handleDirOnWin("/opt/netdata/etc/netdata"),
99 - }
100 - for _, dir := range standardDirs {
101 - if isDirExists(dir) {
102 - dirs = append(dirs, dir)
103 - break
104 - }
105 - }
106 -
107 - dirs = append(dirs, filepath.Join(executable.Directory, "/../../../../usr/lib/netdata/conf.d"))
108 -
109 - // Find the first existing lib directory
110 - libDirs := []string{
111 - env.handleDirOnWin("/usr/lib/netdata/conf.d"),
112 - env.handleDirOnWin("/opt/netdata/usr/lib/netdata/conf.d"),
113 - }
114 - for _, dir := range libDirs {
115 - if isDirExists(dir) {
116 - dirs = append(dirs, dir)
117 - break
118 - }
119 - }
120 -
121 - return multipath.New(dirs...)
122 -}
123 -
124 -func (c *config) initCollectorsDir(opts *cli.Option) multipath.MultiPath {
125 - if len(opts.ConfDir) > 0 {
126 - return opts.ConfDir
127 - }
128 -
129 - c.mustPluginDir()
130 -
131 - var mpath multipath.MultiPath
132 -
133 - for _, dir := range c.pluginDir {
134 - mpath = append(mpath, filepath.Join(dir, c.name))
135 - }
136 -
137 - return multipath.New(mpath...)
138 -}
139 -
140 -func (c *config) initServiceDiscoveryConfigDir() multipath.MultiPath {
141 - c.mustPluginDir()
142 -
143 - var mpath multipath.MultiPath
144 -
145 - for _, v := range c.pluginDir {
146 - mpath = append(mpath, filepath.Join(v, c.name, "sd"))
147 - }
148 -
149 - return mpath
150 -}
151 -
152 -func (c *config) initCollectorsWatchPaths(opts *cli.Option, env *envConfig) []string {
153 - if env.watchPath == "" {
154 - return opts.WatchPath
155 - }
156 - return append(opts.WatchPath, env.watchPath)
157 -}
158 -
159 -func (c *config) mustPluginDir() {
160 - if len(c.pluginDir) == 0 {
161 - panic("plugin config init: plugin dir is empty")
162 - }
163 -}
164 -
165 -func isDirExists(dir string) bool {
166 - fi, err := os.Stat(dir)
167 - if err != nil {
168 - return !errors.Is(err, fs.ErrNotExist)
169 - }
170 - return fi.Mode().IsDir()
171 -}
src/go/cmd/ibmdplugin/main.go
+24 -23
@@ -16,8 +16,10 @@ import (
16
17 "github.com/netdata/netdata/go/plugins/logger"
18 "github.com/netdata/netdata/go/plugins/pkg/buildinfo"
19 + "github.com/netdata/netdata/go/plugins/pkg/executable"
20 "github.com/netdata/netdata/go/plugins/plugin/go.d/agent"
21 "github.com/netdata/netdata/go/plugins/plugin/go.d/cli"
22 + "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/pluginconfig"
23
24 "go.uber.org/automaxprocs/maxprocs"
25 "golang.org/x/net/http/httpproxy"
@@ -46,7 +48,7 @@ func main() {
48 opts := parseCLI()
49
50 if opts.Version {
49 - fmt.Printf("ibm.d.plugin, version: %s\n", buildinfo.Version)
51 + fmt.Printf("%s.plugin, version: %s\n", executable.Name, buildinfo.Version)
52 return
53 }
54
@@ -54,21 +56,20 @@ func main() {
56 opts.DumpMode = "10m"
57 }
58
57 - env := newEnvConfig()
58 - cfg := newConfig(opts, env)
59 + pluginconfig.MustInit(opts)
60
61 dumpDataDir := ""
62 if opts.DumpDataDir != "" {
63 var err error
63 - dumpDataDir, err = prepareDumpDataDir(opts.DumpDataDir, cfg.varLibDir)
64 + dumpDataDir, err = prepareDumpDataDir(opts.DumpDataDir, pluginconfig.VarLibDir())
65 if err != nil {
65 - fmt.Fprintf(os.Stderr, "error preparing dump-data directory: %v\n", err)
66 + logger.Errorf("error preparing dump-data directory: %v", err)
67 os.Exit(1)
68 }
69 }
70
70 - if env.logLevel != "" {
71 - logger.Level.SetByName(env.logLevel)
71 + if lvl := pluginconfig.EnvLogLevel(); lvl != "" {
72 + logger.Level.SetByName(lvl)
73 }
74 if opts.Debug {
75 logger.Level.Set(slog.LevelDebug)
@@ -80,29 +81,26 @@ func main() {
81 var err error
82 dumpMode, err = time.ParseDuration(opts.DumpMode)
83 if err != nil {
83 - fmt.Fprintf(os.Stderr, "error: invalid dump duration '%s': %v\n", opts.DumpMode, err)
84 + logger.Errorf("error: invalid dump duration '%s': %v", opts.DumpMode, err)
85 os.Exit(1)
86 }
87 }
88
89 a := agent.New(agent.Config{
89 - Name: cfg.name,
90 - PluginConfigDir: cfg.pluginDir,
91 - CollectorsConfigDir: cfg.collectorsDir,
92 - ServiceDiscoveryConfigDir: cfg.serviceDiscoveryDir,
93 - CollectorsConfigWatchPath: cfg.collectorsWatchPath,
94 - VarLibDir: cfg.varLibDir,
95 - RunModule: opts.Module,
96 - RunJob: opts.Job,
97 - MinUpdateEvery: opts.UpdateEvery,
98 - DumpMode: dumpMode,
99 - DumpSummary: opts.DumpSummary,
100 - DumpDataDir: dumpDataDir,
101 - DynamicConfigPrefix: "ibm.d:collector:",
102 - DisableServiceDiscovery: true,
90 + Name: executable.Name,
91 + PluginConfigDir: pluginconfig.ConfigDir(),
92 + CollectorsConfigDir: pluginconfig.CollectorsDir(),
93 + VarLibDir: pluginconfig.VarLibDir(),
94 + RunModule: opts.Module,
95 + RunJob: opts.Job,
96 + MinUpdateEvery: opts.UpdateEvery,
97 + DumpMode: dumpMode,
98 + DumpSummary: opts.DumpSummary,
99 + DumpDataDir: dumpDataDir,
100 + DisableServiceDiscovery: true,
101 })
102
105 - a.Debugf("plugin: name=%s, version=%s", a.Name, buildinfo.Version)
103 + a.Debugf("plugin: name=%s, %s", a.Name, buildinfo.Info())
104 if u, err := user.Current(); err == nil {
105 a.Debugf("current user: name=%s, uid=%s", u.Username, u.Uid)
106 }
@@ -110,6 +108,9 @@ func main() {
108 proxyCfg := httpproxy.FromEnvironment()
109 a.Infof("env HTTP_PROXY '%s', HTTPS_PROXY '%s'", proxyCfg.HTTPProxy, proxyCfg.HTTPSProxy)
110
111 + a.Infof("directories → config: %s | collectors: %s | sd: %s | varlib: %s",
112 + a.ConfigDir, a.CollectorsConfDir, a.ServiceDiscoveryConfigDir, a.VarLibDir)
113 +
114 a.Run()
115 }
116
src/go/cmd/ibmdplugin/stub.go
+3 -2
@@ -3,11 +3,12 @@
3 package main
4
5 import (
6 - "fmt"
6 "os"
7 +
8 + "github.com/netdata/netdata/go/plugins/logger"
9 )
10
11 func main() {
11 - fmt.Fprintf(os.Stderr, "ibm.d.plugin: this binary was built without IBM MQ support (requires CGO and ibm_mq build tag)\n")
12 + logger.Errorf("ibm.d.plugin: this binary was built without IBM MQ support (requires CGO and ibm_mq build tag)")
13 os.Exit(1)
14 }
src/go/plugin/go.d/agent/agent.go
+3 -12
@@ -45,10 +45,9 @@ type Config struct {
45
46 DisableServiceDiscovery bool
47
48 - DumpMode time.Duration
49 - DumpSummary bool
50 - DumpDataDir string
51 - DynamicConfigPrefix string
48 + DumpMode time.Duration
49 + DumpSummary bool
50 + DumpDataDir string
51 }
52
53 // Agent represents orchestrator.
@@ -85,16 +84,10 @@ type Agent struct {
84
85 dumpDataDir string
86 dumpOnce sync.Once
88 -
89 - DynamicConfigPrefix string
87 }
88
89 // New creates a new Agent.
90 func New(cfg Config) *Agent {
94 - if cfg.DynamicConfigPrefix == "" {
95 - cfg.DynamicConfigPrefix = jobmgr.DefaultDyncfgCollectorPrefix
96 - }
97 -
91 a := &Agent{
92 Logger: logger.New().With(
93 slog.String("component", "agent"),
@@ -114,7 +107,6 @@ func New(cfg Config) *Agent {
107 quitCh: make(chan struct{}, 1),
108 dumpMode: cfg.DumpMode,
109 dumpSummary: cfg.DumpSummary,
117 - DynamicConfigPrefix: cfg.DynamicConfigPrefix,
110 DisableServiceDiscovery: cfg.DisableServiceDiscovery,
111 }
112
@@ -257,7 +249,6 @@ func (a *Agent) run(ctx context.Context) {
249 fnMgr := functions.NewManager()
250
251 jobMgr := jobmgr.New()
260 - jobMgr.SetDyncfgCollectorPrefix(a.DynamicConfigPrefix)
252 jobMgr.PluginName = a.Name
253 jobMgr.Out = a.Out
254 jobMgr.VarLibDir = a.VarLibDir
src/go/plugin/go.d/agent/jobmgr/dyncfg.go
+1 -1
@@ -59,7 +59,7 @@ func (m *Manager) dyncfgConfig(fn functions.Function) {
59 switch id := fn.Args[0]; true {
60 case strings.HasPrefix(id, m.dyncfgCollectorPrefixValue()):
61 m.dyncfgCollectorExec(fn)
62 - case strings.HasPrefix(id, dyncfgVnodeID):
62 + case strings.HasPrefix(id, m.dyncfgVnodePrefixValue()):
63 m.dyncfgVnodeExec(fn)
64 default:
65 m.dyncfgRespf(fn, 503, "unknown function '%s' (%s).", fn.Name, id)
src/go/plugin/go.d/agent/jobmgr/dyncfg_collector.go
+6 -8
@@ -17,6 +17,7 @@ import (
17 "gopkg.in/yaml.v2"
18
19 "github.com/netdata/netdata/go/plugins/logger"
20 + "github.com/netdata/netdata/go/plugins/pkg/executable"
21 "github.com/netdata/netdata/go/plugins/pkg/netdataapi"
22 "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
23 "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/functions"
@@ -24,15 +25,12 @@ import (
25 )
26
27 const (
27 - DefaultDyncfgCollectorPrefix = "go.d:collector:"
28 - dyncfgCollectorPath = "/collectors/jobs"
28 + dyncfgCollectorPrefixf = "%s:collector:"
29 + dyncfgCollectorPath = "/collectors/%s/jobs"
30 )
31
32 func (m *Manager) dyncfgCollectorPrefixValue() string {
32 - if strings.TrimSpace(m.dyncfgCollectorPrefix) == "" {
33 - return DefaultDyncfgCollectorPrefix
34 - }
35 - return m.dyncfgCollectorPrefix
33 + return fmt.Sprintf(dyncfgCollectorPrefixf, executable.Name)
34 }
35
36 func (m *Manager) dyncfgModID(name string) string {
@@ -59,7 +57,7 @@ func (m *Manager) dyncfgCollectorModuleCreate(name string) {
57 ID: m.dyncfgModID(name),
58 Status: dyncfgAccepted.String(),
59 ConfigType: "template",
62 - Path: dyncfgCollectorPath,
60 + Path: fmt.Sprintf(dyncfgCollectorPath, executable.Name),
61 SourceType: "internal",
62 Source: "internal",
63 SupportedCommands: dyncfgModCmds(),
@@ -71,7 +69,7 @@ func (m *Manager) dyncfgCollectorJobCreate(cfg confgroup.Config, status dyncfgSt
69 ID: m.dyncfgJobID(cfg),
70 Status: status.String(),
71 ConfigType: "job",
74 - Path: dyncfgCollectorPath,
72 + Path: fmt.Sprintf(dyncfgCollectorPath, executable.Name),
73 SourceType: cfg.SourceType(),
74 Source: cfg.Source(),
75 SupportedCommands: dyncfgJobCmds(cfg),
src/go/plugin/go.d/agent/jobmgr/dyncfg_vnode.go
+14 -9
@@ -11,6 +11,7 @@ import (
11 "github.com/google/uuid"
12 "gopkg.in/yaml.v2"
13
14 + "github.com/netdata/netdata/go/plugins/pkg/executable"
15 "github.com/netdata/netdata/go/plugins/pkg/netdataapi"
16 "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
17 "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/functions"
@@ -19,16 +20,20 @@ import (
20 )
21
22 const (
22 - dyncfgVnodeID = "go.d:vnode"
23 - dyncfgVnodePath = "/collectors/vnodes"
23 + dyncfgVnodeIDf = "%s:vnode"
24 + dyncfgVnodePath = "/collectors/%s/vnodes"
25 )
26
27 +func (m *Manager) dyncfgVnodePrefixValue() string {
28 + return fmt.Sprintf(dyncfgVnodeIDf, executable.Name)
29 +}
30 +
31 func (m *Manager) dyncfgVnodeModuleCreate() {
32 m.api.CONFIGCREATE(netdataapi.ConfigOpts{
28 - ID: dyncfgVnodeID,
33 + ID: m.dyncfgVnodePrefixValue(),
34 Status: dyncfgAccepted.String(),
35 ConfigType: "template",
31 - Path: dyncfgVnodePath,
36 + Path: fmt.Sprintf(dyncfgVnodePath, executable.Name),
37 SourceType: "internal",
38 Source: "internal",
39 SupportedCommands: "add schema userconfig test",
@@ -41,10 +46,10 @@ func (m *Manager) dyncfgVnodeJobCreate(cfg *vnodes.VirtualNode, status dyncfgSta
46 cmds += " remove"
47 }
48 m.api.CONFIGCREATE(netdataapi.ConfigOpts{
44 - ID: fmt.Sprintf("%s:%s", dyncfgVnodeID, cfg.Name),
49 + ID: fmt.Sprintf("%s:%s", m.dyncfgVnodePrefixValue(), cfg.Name),
50 Status: status.String(),
51 ConfigType: "job",
47 - Path: dyncfgVnodePath,
52 + Path: fmt.Sprintf(dyncfgVnodePath, executable.Name),
53 SourceType: cfg.SourceType,
54 Source: cfg.Source,
55 SupportedCommands: cmds,
@@ -92,7 +97,7 @@ func (m *Manager) dyncfgVnodeSeqExec(fn functions.Function) {
97
98 func (m *Manager) dyncfgVnodeGet(fn functions.Function) {
99 id := fn.Args[0]
95 - name := strings.TrimPrefix(id, dyncfgVnodeID+":")
100 + name := strings.TrimPrefix(id, m.dyncfgVnodePrefixValue()+":")
101
102 cfg, ok := m.Vnodes[name]
103 if !ok {
@@ -166,7 +171,7 @@ func (m *Manager) dyncfgVnodeAdd(fn functions.Function) {
171
172 func (m *Manager) dyncfgVnodeRemove(fn functions.Function) {
173 id := fn.Args[0]
169 - name := strings.TrimPrefix(id, dyncfgVnodeID+":")
174 + name := strings.TrimPrefix(id, m.dyncfgVnodePrefixValue()+":")
175
176 vnode, ok := m.Vnodes[name]
177 if !ok {
@@ -230,7 +235,7 @@ func (m *Manager) dyncfgVnodeTest(fn functions.Function) {
235
236 func (m *Manager) dyncfgVnodeUpdate(fn functions.Function) {
237 id := fn.Args[0]
233 - name := strings.TrimPrefix(id, dyncfgVnodeID+":")
238 + name := strings.TrimPrefix(id, m.dyncfgVnodePrefixValue()+":")
239
240 orig, ok := m.Vnodes[name]
241 if !ok {
src/go/plugin/go.d/agent/jobmgr/manager.go
+1 -13
@@ -52,8 +52,6 @@ func New() *Manager {
52 dyncfgCh: make(chan functions.Function),
53 }
54
55 - mgr.SetDyncfgCollectorPrefix(DefaultDyncfgCollectorPrefix)
56 -
55 return mgr
56 }
57
@@ -90,16 +88,6 @@ type Manager struct {
88 dyncfgCh chan functions.Function
89
90 waitCfgOnOff string // block processing of discovered configs until "enable"/"disable" is received from Netdata
93 -
94 - dyncfgCollectorPrefix string
95 -}
96 -
97 -func (m *Manager) SetDyncfgCollectorPrefix(prefix string) {
98 - if strings.TrimSpace(prefix) == "" {
99 - m.dyncfgCollectorPrefix = DefaultDyncfgCollectorPrefix
100 - return
101 - }
102 - m.dyncfgCollectorPrefix = prefix
91 }
92
93 func (m *Manager) Run(ctx context.Context, in chan []*confgroup.Group) {
@@ -183,7 +171,7 @@ func (m *Manager) run() {
171 switch id := fn.Args[0]; true {
172 case strings.HasPrefix(id, m.dyncfgCollectorPrefixValue()):
173 m.dyncfgCollectorSeqExec(fn)
186 - case strings.HasPrefix(id, dyncfgVnodeID):
174 + case strings.HasPrefix(id, m.dyncfgVnodePrefixValue()):
175 m.dyncfgVnodeSeqExec(fn)
176 default:
177 m.dyncfgRespf(fn, 503, "unknown function '%s' (%s).", fn.Name, id)
src/go/plugin/go.d/agent/jobmgr/manager_test.go
+97 -97
@@ -34,15 +34,15 @@ func TestManager_Run(t *testing.T) {
34 wantExposed: nil,
35 wantRunning: nil,
36 wantDyncfg: `
37 -CONFIG go.d:collector:success:name create accepted job /collectors/jobs stock 'type=stock,module=success,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
37 +CONFIG test:collector:success:name create accepted job /collectors/test/jobs stock 'type=stock,module=success,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
38
39 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
40 {"status":200,"message":""}
41 FUNCTION_RESULT_END
42
43 -CONFIG go.d:collector:success:name status running
43 +CONFIG test:collector:success:name status running
44
45 -CONFIG go.d:collector:success:name delete
45 +CONFIG test:collector:success:name delete
46 `,
47 }
48 },
@@ -66,13 +66,13 @@ CONFIG go.d:collector:success:name delete
66 wantExposed: nil,
67 wantRunning: nil,
68 wantDyncfg: `
69 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs stock 'type=stock,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
69 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs stock 'type=stock,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
70
71 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
72 {"status":200,"message":"Job enable failed: mock failed init."}
73 FUNCTION_RESULT_END
74
75 -CONFIG go.d:collector:fail:name delete
75 +CONFIG test:collector:fail:name delete
76 `,
77 }
78 },
@@ -96,13 +96,13 @@ CONFIG go.d:collector:fail:name delete
96 wantExposed: nil,
97 wantRunning: nil,
98 wantDyncfg: `
99 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs stock 'type=stock,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
99 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs stock 'type=stock,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
100
101 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
102 {"status":200,"message":"Job enable failed: mock failed init."}
103 FUNCTION_RESULT_END
104
105 -CONFIG go.d:collector:fail:name delete
105 +CONFIG test:collector:fail:name delete
106 `,
107 }
108 },
@@ -126,15 +126,15 @@ CONFIG go.d:collector:fail:name delete
126 wantExposed: nil,
127 wantRunning: nil,
128 wantDyncfg: `
129 -CONFIG go.d:collector:success:name create accepted job /collectors/jobs user 'type=user,module=success,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
129 +CONFIG test:collector:success:name create accepted job /collectors/test/jobs user 'type=user,module=success,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
130
131 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
132 {"status":200,"message":""}
133 FUNCTION_RESULT_END
134
135 -CONFIG go.d:collector:success:name status running
135 +CONFIG test:collector:success:name status running
136
137 -CONFIG go.d:collector:success:name delete
137 +CONFIG test:collector:success:name delete
138 `,
139 }
140 },
@@ -158,15 +158,15 @@ CONFIG go.d:collector:success:name delete
158 wantExposed: nil,
159 wantRunning: nil,
160 wantDyncfg: `
161 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs user 'type=user,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
161 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs user 'type=user,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
162
163 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
164 {"status":200,"message":"Job enable failed: mock failed init."}
165 FUNCTION_RESULT_END
166
167 -CONFIG go.d:collector:fail:name status failed
167 +CONFIG test:collector:fail:name status failed
168
169 -CONFIG go.d:collector:fail:name delete
169 +CONFIG test:collector:fail:name delete
170 `,
171 }
172 },
@@ -190,15 +190,15 @@ CONFIG go.d:collector:fail:name delete
190 wantExposed: nil,
191 wantRunning: nil,
192 wantDyncfg: `
193 -CONFIG go.d:collector:success:name create accepted job /collectors/jobs discovered 'type=discovered,module=success,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
193 +CONFIG test:collector:success:name create accepted job /collectors/test/jobs discovered 'type=discovered,module=success,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
194
195 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
196 {"status":200,"message":""}
197 FUNCTION_RESULT_END
198
199 -CONFIG go.d:collector:success:name status running
199 +CONFIG test:collector:success:name status running
200
201 -CONFIG go.d:collector:success:name delete
201 +CONFIG test:collector:success:name delete
202 `,
203 }
204 },
@@ -222,15 +222,15 @@ CONFIG go.d:collector:success:name delete
222 wantExposed: nil,
223 wantRunning: nil,
224 wantDyncfg: `
225 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs discovered 'type=discovered,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
225 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs discovered 'type=discovered,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
226
227 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
228 {"status":200,"message":"Job enable failed: mock failed init."}
229 FUNCTION_RESULT_END
230
231 -CONFIG go.d:collector:fail:name status failed
231 +CONFIG test:collector:fail:name status failed
232
233 -CONFIG go.d:collector:fail:name delete
233 +CONFIG test:collector:fail:name delete
234 `,
235 }
236 },
@@ -277,29 +277,29 @@ CONFIG go.d:collector:fail:name delete
277 },
278 wantRunning: nil,
279 wantDyncfg: `
280 -CONFIG go.d:collector:fail:stock create accepted job /collectors/jobs stock 'type=stock,module=fail,job=stock' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
280 +CONFIG test:collector:fail:stock create accepted job /collectors/test/jobs stock 'type=stock,module=fail,job=stock' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
281
282 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
283 {"status":200,"message":"Job enable failed: mock failed init."}
284 FUNCTION_RESULT_END
285
286 -CONFIG go.d:collector:fail:stock delete
286 +CONFIG test:collector:fail:stock delete
287
288 -CONFIG go.d:collector:fail:discovered create accepted job /collectors/jobs discovered 'type=discovered,module=fail,job=discovered' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
288 +CONFIG test:collector:fail:discovered create accepted job /collectors/test/jobs discovered 'type=discovered,module=fail,job=discovered' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
289
290 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
291 {"status":200,"message":"Job enable failed: mock failed init."}
292 FUNCTION_RESULT_END
293
294 -CONFIG go.d:collector:fail:discovered status failed
294 +CONFIG test:collector:fail:discovered status failed
295
296 -CONFIG go.d:collector:fail:user create accepted job /collectors/jobs user 'type=user,module=fail,job=user' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
296 +CONFIG test:collector:fail:user create accepted job /collectors/test/jobs user 'type=user,module=fail,job=user' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
297
298 FUNCTION_RESULT_BEGIN 3-enable 200 application/json
299 {"status":200,"message":"Job enable failed: mock failed init."}
300 FUNCTION_RESULT_END
301
302 -CONFIG go.d:collector:fail:user status failed
302 +CONFIG test:collector:fail:user status failed
303 `,
304 }
305 },
@@ -345,29 +345,29 @@ CONFIG go.d:collector:fail:user status failed
345 },
346 wantRunning: nil,
347 wantDyncfg: `
348 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs stock 'type=stock,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
348 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs stock 'type=stock,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
349
350 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
351 {"status":200,"message":"Job enable failed: mock failed init."}
352 FUNCTION_RESULT_END
353
354 -CONFIG go.d:collector:fail:name delete
354 +CONFIG test:collector:fail:name delete
355
356 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs discovered 'type=discovered,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
356 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs discovered 'type=discovered,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
357
358 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
359 {"status":200,"message":"Job enable failed: mock failed init."}
360 FUNCTION_RESULT_END
361
362 -CONFIG go.d:collector:fail:name status failed
362 +CONFIG test:collector:fail:name status failed
363
364 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs user 'type=user,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
364 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs user 'type=user,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
365
366 FUNCTION_RESULT_BEGIN 3-enable 200 application/json
367 {"status":200,"message":"Job enable failed: mock failed init."}
368 FUNCTION_RESULT_END
369
370 -CONFIG go.d:collector:fail:name status failed
370 +CONFIG test:collector:fail:name status failed
371 `,
372 }
373 },
@@ -407,31 +407,31 @@ CONFIG go.d:collector:fail:name status failed
407 wantExposed: nil,
408 wantRunning: nil,
409 wantDyncfg: `
410 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs stock 'type=stock,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
410 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs stock 'type=stock,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
411
412 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
413 {"status":200,"message":"Job enable failed: mock failed init."}
414 FUNCTION_RESULT_END
415
416 -CONFIG go.d:collector:fail:name delete
416 +CONFIG test:collector:fail:name delete
417
418 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs discovered 'type=discovered,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
418 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs discovered 'type=discovered,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
419
420 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
421 {"status":200,"message":"Job enable failed: mock failed init."}
422 FUNCTION_RESULT_END
423
424 -CONFIG go.d:collector:fail:name status failed
424 +CONFIG test:collector:fail:name status failed
425
426 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs user 'type=user,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
426 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs user 'type=user,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
427
428 FUNCTION_RESULT_BEGIN 3-enable 200 application/json
429 {"status":200,"message":"Job enable failed: mock failed init."}
430 FUNCTION_RESULT_END
431
432 -CONFIG go.d:collector:fail:name status failed
432 +CONFIG test:collector:fail:name status failed
433
434 -CONFIG go.d:collector:fail:name delete
434 +CONFIG test:collector:fail:name delete
435 `,
436 }
437 },
@@ -468,13 +468,13 @@ CONFIG go.d:collector:fail:name delete
468 },
469 wantRunning: nil,
470 wantDyncfg: `
471 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs user 'type=user,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
471 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs user 'type=user,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
472
473 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
474 {"status":200,"message":"Job enable failed: mock failed init."}
475 FUNCTION_RESULT_END
476
477 -CONFIG go.d:collector:fail:name status failed
477 +CONFIG test:collector:fail:name status failed
478 `,
479 }
480 },
@@ -505,15 +505,15 @@ CONFIG go.d:collector:fail:name status failed
505 wantExposed: nil,
506 wantRunning: nil,
507 wantDyncfg: `
508 -CONFIG go.d:collector:fail:name create accepted job /collectors/jobs user 'type=user,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
508 +CONFIG test:collector:fail:name create accepted job /collectors/test/jobs user 'type=user,module=fail,job=name' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
509
510 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
511 {"status":200,"message":"Job enable failed: mock failed init."}
512 FUNCTION_RESULT_END
513
514 -CONFIG go.d:collector:fail:name status failed
514 +CONFIG test:collector:fail:name status failed
515
516 -CONFIG go.d:collector:fail:name delete
516 +CONFIG test:collector:fail:name delete
517 `,
518 }
519 },
@@ -590,7 +590,7 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
590 {"status":202,"message":""}
591 FUNCTION_RESULT_END
592
593 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
593 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
594
595 FUNCTION_RESULT_BEGIN 2-get 200 application/json
596 {"option_str":"1","option_int":1}
@@ -704,7 +704,7 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
704 {"status":202,"message":""}
705 FUNCTION_RESULT_END
706
707 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
707 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
708 `,
709 }
710 },
@@ -736,7 +736,7 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
736 {"status":202,"message":""}
737 FUNCTION_RESULT_END
738
739 -CONFIG go.d:collector:fail:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
739 +CONFIG test:collector:fail:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
740 `,
741 }
742 },
@@ -774,13 +774,13 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
774 {"status":202,"message":""}
775 FUNCTION_RESULT_END
776
777 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
777 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
778
779 FUNCTION_RESULT_BEGIN 2-add 202 application/json
780 {"status":202,"message":""}
781 FUNCTION_RESULT_END
782
783 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
783 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
784 `,
785 }
786 },
@@ -854,13 +854,13 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
854 {"status":202,"message":""}
855 FUNCTION_RESULT_END
856
857 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
857 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
858
859 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
860 {"status":200,"message":""}
861 FUNCTION_RESULT_END
862
863 -CONFIG go.d:collector:success:test status running
863 +CONFIG test:collector:success:test status running
864 `,
865 }
866 },
@@ -900,19 +900,19 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
900 {"status":202,"message":""}
901 FUNCTION_RESULT_END
902
903 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
903 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
904
905 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
906 {"status":200,"message":""}
907 FUNCTION_RESULT_END
908
909 -CONFIG go.d:collector:success:test status running
909 +CONFIG test:collector:success:test status running
910
911 FUNCTION_RESULT_BEGIN 3-enable 200 application/json
912 {"status":200,"message":""}
913 FUNCTION_RESULT_END
914
915 -CONFIG go.d:collector:success:test status running
915 +CONFIG test:collector:success:test status running
916 `,
917 }
918 },
@@ -948,13 +948,13 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
948 {"status":202,"message":""}
949 FUNCTION_RESULT_END
950
951 -CONFIG go.d:collector:fail:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
951 +CONFIG test:collector:fail:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
952
953 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
954 {"status":200,"message":"Job enable failed: mock failed init."}
955 FUNCTION_RESULT_END
956
957 -CONFIG go.d:collector:fail:test status failed
957 +CONFIG test:collector:fail:test status failed
958 `,
959 }
960 },
@@ -994,19 +994,19 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
994 {"status":202,"message":""}
995 FUNCTION_RESULT_END
996
997 -CONFIG go.d:collector:fail:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
997 +CONFIG test:collector:fail:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
998
999 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
1000 {"status":200,"message":"Job enable failed: mock failed init."}
1001 FUNCTION_RESULT_END
1002
1003 -CONFIG go.d:collector:fail:test status failed
1003 +CONFIG test:collector:fail:test status failed
1004
1005 FUNCTION_RESULT_BEGIN 3-enable 200 application/json
1006 {"status":200,"message":"Job enable failed: mock failed init."}
1007 FUNCTION_RESULT_END
1008
1009 -CONFIG go.d:collector:fail:test status failed
1009 +CONFIG test:collector:fail:test status failed
1010 `,
1011 }
1012 },
@@ -1080,13 +1080,13 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1080 {"status":202,"message":""}
1081 FUNCTION_RESULT_END
1082
1083 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1083 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1084
1085 FUNCTION_RESULT_BEGIN 2-disable 200 application/json
1086 {"status":200,"message":""}
1087 FUNCTION_RESULT_END
1088
1089 -CONFIG go.d:collector:success:test status disabled
1089 +CONFIG test:collector:success:test status disabled
1090 `,
1091 }
1092 },
@@ -1126,19 +1126,19 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1126 {"status":202,"message":""}
1127 FUNCTION_RESULT_END
1128
1129 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1129 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1130
1131 FUNCTION_RESULT_BEGIN 2-disable 200 application/json
1132 {"status":200,"message":""}
1133 FUNCTION_RESULT_END
1134
1135 -CONFIG go.d:collector:success:test status disabled
1135 +CONFIG test:collector:success:test status disabled
1136
1137 FUNCTION_RESULT_BEGIN 3-disable 200 application/json
1138 {"status":200,"message":""}
1139 FUNCTION_RESULT_END
1140
1141 -CONFIG go.d:collector:success:test status disabled
1141 +CONFIG test:collector:success:test status disabled
1142 `,
1143 }
1144 },
@@ -1174,13 +1174,13 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1174 {"status":202,"message":""}
1175 FUNCTION_RESULT_END
1176
1177 -CONFIG go.d:collector:fail:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1177 +CONFIG test:collector:fail:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1178
1179 FUNCTION_RESULT_BEGIN 2-disable 200 application/json
1180 {"status":200,"message":""}
1181 FUNCTION_RESULT_END
1182
1183 -CONFIG go.d:collector:fail:test status disabled
1183 +CONFIG test:collector:fail:test status disabled
1184 `,
1185 }
1186 },
@@ -1220,19 +1220,19 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1220 {"status":202,"message":""}
1221 FUNCTION_RESULT_END
1222
1223 -CONFIG go.d:collector:fail:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1223 +CONFIG test:collector:fail:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1224
1225 FUNCTION_RESULT_BEGIN 2-disable 200 application/json
1226 {"status":200,"message":""}
1227 FUNCTION_RESULT_END
1228
1229 -CONFIG go.d:collector:fail:test status disabled
1229 +CONFIG test:collector:fail:test status disabled
1230
1231 FUNCTION_RESULT_BEGIN 3-disable 200 application/json
1232 {"status":200,"message":""}
1233 FUNCTION_RESULT_END
1234
1235 -CONFIG go.d:collector:fail:test status disabled
1235 +CONFIG test:collector:fail:test status disabled
1236 `,
1237 }
1238 },
@@ -1306,13 +1306,13 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1306 {"status":202,"message":""}
1307 FUNCTION_RESULT_END
1308
1309 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1309 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1310
1311 FUNCTION_RESULT_BEGIN 2-restart 405 application/json
1312 {"status":405,"message":"Restarting data collection job is not allowed in 'accepted' state."}
1313 FUNCTION_RESULT_END
1314
1315 -CONFIG go.d:collector:success:test status accepted
1315 +CONFIG test:collector:success:test status accepted
1316 `,
1317 }
1318 },
@@ -1352,19 +1352,19 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1352 {"status":202,"message":""}
1353 FUNCTION_RESULT_END
1354
1355 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1355 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1356
1357 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
1358 {"status":200,"message":""}
1359 FUNCTION_RESULT_END
1360
1361 -CONFIG go.d:collector:success:test status running
1361 +CONFIG test:collector:success:test status running
1362
1363 FUNCTION_RESULT_BEGIN 3-restart 200 application/json
1364 {"status":200,"message":""}
1365 FUNCTION_RESULT_END
1366
1367 -CONFIG go.d:collector:success:test status running
1367 +CONFIG test:collector:success:test status running
1368 `,
1369 }
1370 },
@@ -1404,19 +1404,19 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1404 {"status":202,"message":""}
1405 FUNCTION_RESULT_END
1406
1407 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1407 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1408
1409 FUNCTION_RESULT_BEGIN 2-disable 200 application/json
1410 {"status":200,"message":""}
1411 FUNCTION_RESULT_END
1412
1413 -CONFIG go.d:collector:success:test status disabled
1413 +CONFIG test:collector:success:test status disabled
1414
1415 FUNCTION_RESULT_BEGIN 3-restart 405 application/json
1416 {"status":405,"message":"Restarting data collection job is not allowed in 'disabled' state."}
1417 FUNCTION_RESULT_END
1418
1419 -CONFIG go.d:collector:success:test status disabled
1419 +CONFIG test:collector:success:test status disabled
1420 `,
1421 }
1422 },
@@ -1460,25 +1460,25 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1460 {"status":202,"message":""}
1461 FUNCTION_RESULT_END
1462
1463 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1463 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1464
1465 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
1466 {"status":200,"message":""}
1467 FUNCTION_RESULT_END
1468
1469 -CONFIG go.d:collector:success:test status running
1469 +CONFIG test:collector:success:test status running
1470
1471 FUNCTION_RESULT_BEGIN 3-restart 200 application/json
1472 {"status":200,"message":""}
1473 FUNCTION_RESULT_END
1474
1475 -CONFIG go.d:collector:success:test status running
1475 +CONFIG test:collector:success:test status running
1476
1477 FUNCTION_RESULT_BEGIN 4-restart 200 application/json
1478 {"status":200,"message":""}
1479 FUNCTION_RESULT_END
1480
1481 -CONFIG go.d:collector:success:test status running
1481 +CONFIG test:collector:success:test status running
1482 `,
1483 }
1484 },
@@ -1577,29 +1577,29 @@ FUNCTION_RESULT_END
1577 },
1578 wantRunning: []string{stockCfg.FullName(), userCfg.FullName(), discCfg.FullName()},
1579 wantDyncfg: `
1580 -CONFIG go.d:collector:success:stock create accepted job /collectors/jobs stock 'type=stock,module=success,job=stock' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
1580 +CONFIG test:collector:success:stock create accepted job /collectors/test/jobs stock 'type=stock,module=success,job=stock' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
1581
1582 FUNCTION_RESULT_BEGIN 1-enable 200 application/json
1583 {"status":200,"message":""}
1584 FUNCTION_RESULT_END
1585
1586 -CONFIG go.d:collector:success:stock status running
1586 +CONFIG test:collector:success:stock status running
1587
1588 -CONFIG go.d:collector:success:user create accepted job /collectors/jobs user 'type=user,module=success,job=user' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
1588 +CONFIG test:collector:success:user create accepted job /collectors/test/jobs user 'type=user,module=success,job=user' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
1589
1590 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
1591 {"status":200,"message":""}
1592 FUNCTION_RESULT_END
1593
1594 -CONFIG go.d:collector:success:user status running
1594 +CONFIG test:collector:success:user status running
1595
1596 -CONFIG go.d:collector:success:discovered create accepted job /collectors/jobs discovered 'type=discovered,module=success,job=discovered' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
1596 +CONFIG test:collector:success:discovered create accepted job /collectors/test/jobs discovered 'type=discovered,module=success,job=discovered' 'schema get enable disable update restart test userconfig' 0x0000 0x0000
1597
1598 FUNCTION_RESULT_BEGIN 3-enable 200 application/json
1599 {"status":200,"message":""}
1600 FUNCTION_RESULT_END
1601
1602 -CONFIG go.d:collector:success:discovered status running
1602 +CONFIG test:collector:success:discovered status running
1603
1604 FUNCTION_RESULT_BEGIN 1-remove 405 application/json
1605 {"status":405,"message":"Removing jobs of type 'stock' is not supported. Only 'dyncfg' jobs can be removed."}
@@ -1643,13 +1643,13 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1643 {"status":202,"message":""}
1644 FUNCTION_RESULT_END
1645
1646 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1646 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1647
1648 FUNCTION_RESULT_BEGIN 2-remove 200 application/json
1649 {"status":200,"message":""}
1650 FUNCTION_RESULT_END
1651
1652 -CONFIG go.d:collector:success:test delete
1652 +CONFIG test:collector:success:test delete
1653 `,
1654 }
1655 },
@@ -1685,19 +1685,19 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1685 {"status":202,"message":""}
1686 FUNCTION_RESULT_END
1687
1688 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1688 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1689
1690 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
1691 {"status":200,"message":""}
1692 FUNCTION_RESULT_END
1693
1694 -CONFIG go.d:collector:success:test status running
1694 +CONFIG test:collector:success:test status running
1695
1696 FUNCTION_RESULT_BEGIN 3-remove 200 application/json
1697 {"status":200,"message":""}
1698 FUNCTION_RESULT_END
1699
1700 -CONFIG go.d:collector:success:test delete
1700 +CONFIG test:collector:success:test delete
1701 `,
1702 }
1703 },
@@ -1783,19 +1783,19 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1783 {"status":202,"message":""}
1784 FUNCTION_RESULT_END
1785
1786 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1786 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1787
1788 FUNCTION_RESULT_BEGIN 2-enable 200 application/json
1789 {"status":200,"message":""}
1790 FUNCTION_RESULT_END
1791
1792 -CONFIG go.d:collector:success:test status running
1792 +CONFIG test:collector:success:test status running
1793
1794 FUNCTION_RESULT_BEGIN 3-update 200 application/json
1795 {"status":200,"message":""}
1796 FUNCTION_RESULT_END
1797
1798 -CONFIG go.d:collector:success:test status running
1798 +CONFIG test:collector:success:test status running
1799 `,
1800 }
1801 },
@@ -1842,19 +1842,19 @@ FUNCTION_RESULT_BEGIN 1-add 202 application/json
1842 {"status":202,"message":""}
1843 FUNCTION_RESULT_END
1844
1845 -CONFIG go.d:collector:success:test create accepted job /collectors/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1845 +CONFIG test:collector:success:test create accepted job /collectors/test/jobs dyncfg 'type=dyncfg' 'schema get enable disable update restart test userconfig remove' 0x0000 0x0000
1846
1847 FUNCTION_RESULT_BEGIN 2-disable 200 application/json
1848 {"status":200,"message":""}
1849 FUNCTION_RESULT_END
1850
1851 -CONFIG go.d:collector:success:test status disabled
1851 +CONFIG test:collector:success:test status disabled
1852
1853 FUNCTION_RESULT_BEGIN 3-update 200 application/json
1854 {"status":200,"message":""}
1855 FUNCTION_RESULT_END
1856
1857 -CONFIG go.d:collector:success:test status disabled
1857 +CONFIG test:collector:success:test status disabled
1858 `,
1859 }
1860 },
src/go/plugin/go.d/agent/vnodes/config_schema.json
+2 -8
@@ -20,18 +20,12 @@
20 "type": [
21 "object",
22 "null"
23 - ],
24 - "additionalProperties": {
25 - "type": "string"
26 - }
23 + ]
24 }
25 },
26 "required": [
27 "guid"
31 - ],
32 - "patternProperties": {
33 - "^name$": {}
34 - }
28 + ]
29 },
30 "uiSchema": {
31 "uiOptions": {