chore: move go.d/ibm.d shared pkgs out of go.d (#21132)
Ilya Mashchenko committed
Oct 10, 2025 at 17:12 UTC
2ee834161374d706e6bfff551ed3045d9095d1ba
371 files changed
+735
-736
src/go/cmd/godplugin/main.go
+5
-6
@@ -9,16 +9,15 @@ import (
9
"os/user"
10
"strings"
11
12
+ "go.uber.org/automaxprocs/maxprocs"
13
+ "golang.org/x/net/http/httpproxy"
14
+
15
"github.com/netdata/netdata/go/plugins/logger"
16
"github.com/netdata/netdata/go/plugins/pkg/buildinfo"
17
+ "github.com/netdata/netdata/go/plugins/pkg/cli"
18
"github.com/netdata/netdata/go/plugins/pkg/executable"
19
+ "github.com/netdata/netdata/go/plugins/pkg/pluginconfig"
20
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/cli"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/pluginconfig"
18
-
19
- "go.uber.org/automaxprocs/maxprocs"
20
- "golang.org/x/net/http/httpproxy"
21
-
21
_ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector"
22
)
23
src/go/cmd/ibmdplugin/main.go
+5
-6
@@ -14,16 +14,15 @@ import (
14
"strings"
15
"time"
16
17
+ "go.uber.org/automaxprocs/maxprocs"
18
+ "golang.org/x/net/http/httpproxy"
19
+
20
"github.com/netdata/netdata/go/plugins/logger"
21
"github.com/netdata/netdata/go/plugins/pkg/buildinfo"
22
+ "github.com/netdata/netdata/go/plugins/pkg/cli"
23
"github.com/netdata/netdata/go/plugins/pkg/executable"
24
+ "github.com/netdata/netdata/go/plugins/pkg/pluginconfig"
25
"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"
26
-
26
// Register IBM ecosystem collectors
27
_ "github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/as400" // Requires CGO
28
_ "github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/db2" // Requires CGO
src/go/pkg/cli/cli.go
renamed
src/go/pkg/confopt/autobool.go
renamed
+1
-1
@@ -1,4 +1,4 @@
1
-package framework
1
+package confopt
2
3
import (
4
"encoding/json"
src/go/pkg/confopt/autobool_test.go
renamed
+1
-1
@@ -1,4 +1,4 @@
1
-package framework
1
+package confopt
2
3
import (
4
"encoding/json"
src/go/pkg/confopt/duration.go
renamed
src/go/pkg/confopt/duration_test.go
renamed
src/go/pkg/hostinfo/hostinfo.go
renamed
src/go/pkg/hostinfo/hostinfo_common.go
renamed
src/go/pkg/hostinfo/hostinfo_linux.go
renamed
src/go/pkg/pluginconfig/pluginconfig.go
renamed
+1
-1
@@ -16,9 +16,9 @@ import (
16
"sync"
17
18
"github.com/netdata/netdata/go/plugins/pkg/buildinfo"
19
+ "github.com/netdata/netdata/go/plugins/pkg/cli"
20
"github.com/netdata/netdata/go/plugins/pkg/executable"
21
"github.com/netdata/netdata/go/plugins/pkg/multipath"
21
- "github.com/netdata/netdata/go/plugins/plugin/go.d/cli"
22
)
23
24
var (
src/go/pkg/pluginconfig/pluginconfig_test.go
renamed
+1
-1
@@ -8,7 +8,7 @@ import (
8
"github.com/stretchr/testify/assert"
9
"github.com/stretchr/testify/require"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/cli"
11
+ "github.com/netdata/netdata/go/plugins/pkg/cli"
12
)
13
14
// helpers
src/go/pkg/prometheus/client.go
renamed
+2
-2
@@ -13,8 +13,8 @@ import (
13
"os"
14
"path/filepath"
15
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus/selector"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus/selector"
17
+ "github.com/netdata/netdata/go/plugins/pkg/web"
18
)
19
20
type (
src/go/pkg/prometheus/client_test.go
renamed
+3
-3
@@ -11,11 +11,11 @@ import (
11
"strings"
12
"testing"
13
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus/selector"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
-
14
"github.com/stretchr/testify/assert"
15
"github.com/stretchr/testify/require"
16
+
17
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus/selector"
18
+ "github.com/netdata/netdata/go/plugins/pkg/web"
19
)
20
21
var (
src/go/pkg/prometheus/metric_family.go
renamed
src/go/pkg/prometheus/metric_family_test.go
renamed
src/go/pkg/prometheus/metric_series.go
renamed
src/go/pkg/prometheus/metric_series_test.go
renamed
src/go/pkg/prometheus/parse.go
renamed
+2
-2
@@ -8,11 +8,11 @@ import (
8
"strconv"
9
"strings"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus/selector"
12
-
11
"github.com/prometheus/common/model"
12
"github.com/prometheus/prometheus/model/labels"
13
"github.com/prometheus/prometheus/model/textparse"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus/selector"
16
)
17
18
const (
src/go/pkg/prometheus/parse_test.go
renamed
+2
-2
@@ -7,12 +7,12 @@ import (
7
"os"
8
"testing"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus/selector"
11
-
10
"github.com/prometheus/common/model"
11
"github.com/prometheus/prometheus/model/labels"
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus/selector"
16
)
17
18
var (
src/go/pkg/prometheus/selector/README.md
renamed
src/go/pkg/prometheus/selector/expr.go
renamed
src/go/pkg/prometheus/selector/expr_test.go
renamed
src/go/pkg/prometheus/selector/logical.go
renamed
src/go/pkg/prometheus/selector/logical_test.go
renamed
src/go/pkg/prometheus/selector/parse.go
renamed
src/go/pkg/prometheus/selector/parse_test.go
renamed
src/go/pkg/prometheus/selector/selector.go
renamed
src/go/pkg/prometheus/selector/selector_test.go
renamed
src/go/pkg/prometheus/testdata/counter-meta.txt
renamed
src/go/pkg/prometheus/testdata/counter-no-meta.txt
renamed
src/go/pkg/prometheus/testdata/gauge-meta.txt
renamed
src/go/pkg/prometheus/testdata/gauge-no-meta.txt
renamed
src/go/pkg/prometheus/testdata/histogram-meta.txt
renamed
src/go/pkg/prometheus/testdata/histogram-no-meta.txt
renamed
src/go/pkg/prometheus/testdata/multiline-help.txt
renamed
src/go/pkg/prometheus/testdata/summary-meta.txt
renamed
src/go/pkg/prometheus/testdata/summary-no-meta.txt
renamed
src/go/pkg/prometheus/testdata/testdata.nometa.txt
renamed
src/go/pkg/prometheus/testdata/testdata.txt
renamed
src/go/pkg/stm/stm.go
renamed
src/go/pkg/stm/stm_test.go
renamed
+3
-3
@@ -5,10 +5,10 @@ package stm_test
5
import (
6
"testing"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
10
-
8
"github.com/stretchr/testify/assert"
9
+
10
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
11
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
12
)
13
14
func TestToMap_empty(t *testing.T) {
src/go/pkg/tlscfg/config.go
renamed
src/go/pkg/tlscfg/config_test.go
renamed
src/go/pkg/web/client.go
renamed
src/go/pkg/web/client_config.go
renamed
+2
-2
@@ -13,8 +13,8 @@ import (
13
14
"golang.org/x/net/http2"
15
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
17
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
18
)
19
20
// ErrRedirectAttempted indicates that a redirect occurred.
src/go/pkg/web/client_config_test.go
renamed
+3
-3
@@ -14,11 +14,11 @@ import (
14
15
"golang.org/x/net/http2"
16
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
18
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
19
-
17
"github.com/stretchr/testify/assert"
18
"github.com/stretchr/testify/require"
19
+
20
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
21
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
22
)
23
24
func TestNewHTTPClient(t *testing.T) {
src/go/pkg/web/config.go
renamed
src/go/pkg/web/doc.go
renamed
src/go/pkg/web/doc_test.go
renamed
src/go/pkg/web/request_config.go
renamed
+1
-1
@@ -13,7 +13,7 @@ import (
13
14
"github.com/netdata/netdata/go/plugins/pkg/buildinfo"
15
"github.com/netdata/netdata/go/plugins/pkg/executable"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/hostinfo"
16
+ "github.com/netdata/netdata/go/plugins/pkg/hostinfo"
17
)
18
19
// RequestConfig is the configuration of the HTTP request.
src/go/pkg/web/request_config_test.go
renamed
src/go/plugin/go.d/agent/discovery/sd/discoverer/dockersd/docker.go
+1
-1
@@ -12,8 +12,8 @@ import (
12
"time"
13
14
"github.com/netdata/netdata/go/plugins/logger"
15
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/dockerhost"
18
19
typesContainer "github.com/docker/docker/api/types/container"
src/go/plugin/go.d/agent/discovery/sd/discoverer/netlistensd/netlisteners.go
+3
-3
@@ -16,11 +16,11 @@ import (
16
"strings"
17
"time"
18
19
+ "github.com/gohugoio/hashstructure"
20
+
21
"github.com/netdata/netdata/go/plugins/logger"
22
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
23
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
21
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
22
-
23
- "github.com/gohugoio/hashstructure"
24
)
25
26
var (
src/go/plugin/go.d/agent/discovery/sd/discoverer/snmpsd/config.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
8
"github.com/gosnmp/gosnmp"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
10
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/iprange"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/snmputils"
13
)
src/go/plugin/go.d/agent/discovery/sd/pipeline/pipeline.go
+1
-1
@@ -10,13 +10,13 @@ import (
10
"time"
11
12
"github.com/netdata/netdata/go/plugins/logger"
13
+ "github.com/netdata/netdata/go/plugins/pkg/hostinfo"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/dockersd"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/k8ssd"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/netlistensd"
18
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/snmpsd"
19
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
19
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/hostinfo"
20
)
21
22
func New(cfg Config) (*Pipeline, error) {
src/go/plugin/go.d/agent/setup.go
+4
-4
@@ -7,12 +7,12 @@ import (
7
"os"
8
"strings"
9
10
+ hostinfo2 "github.com/netdata/netdata/go/plugins/pkg/hostinfo"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/dummy"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/file"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/hostinfo"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/vnodes"
18
@@ -58,7 +58,7 @@ func (a *Agent) loadEnabledModules(cfg config) module.Registry {
58
}
59
if all {
60
// Known issue: go.d/logind high CPU usage on Alma Linux8 (https://github.com/netdata/netdata/issues/15930)
61
- if !cfg.isExplicitlyEnabled(name) && (creator.Disabled || name == "logind" && hostinfo.SystemdVersion == 239) {
61
+ if !cfg.isExplicitlyEnabled(name) && (creator.Disabled || name == "logind" && hostinfo2.SystemdVersion == 239) {
62
a.Infof("'%s' module disabled by default, should be explicitly enabled in the config", name)
63
continue
64
}
@@ -91,7 +91,7 @@ func (a *Agent) buildDiscoveryConf(enabled module.Registry) discovery.Config {
91
var readPaths, dummyPaths []string
92
93
if len(a.CollectorsConfDir) == 0 {
94
- if hostinfo.IsInsideK8sCluster() {
94
+ if hostinfo2.IsInsideK8sCluster() {
95
return discovery.Config{Registry: reg}
96
}
97
a.Info("modules conf dir not provided, will use default config for all enabled modules")
@@ -109,7 +109,7 @@ func (a *Agent) buildDiscoveryConf(enabled module.Registry) discovery.Config {
109
a.Debugf("looking for '%s' in %v", cfgName, a.CollectorsConfDir)
110
111
path, err := a.CollectorsConfDir.Find(cfgName)
112
- if hostinfo.IsInsideK8sCluster() {
112
+ if hostinfo2.IsInsideK8sCluster() {
113
if err != nil {
114
a.Infof("not found '%s', won't use default (reading stock configs is disabled in k8s)", cfgName)
115
continue
src/go/plugin/go.d/collector/activemq/apiclient.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"fmt"
8
"net/http"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
type topics struct {
src/go/plugin/go.d/collector/activemq/collector.go
+2
-2
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/pkg/matcher"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/activemq/collector_test.go
+3
-3
@@ -9,11 +9,11 @@ import (
9
"os"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
17
)
18
19
var (
src/go/plugin/go.d/collector/adaptecraid/collector.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
"fmt"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/ap/collector.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
"fmt"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/apache/collect.go
+2
-2
@@ -9,8 +9,8 @@ import (
9
"strconv"
10
"strings"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
12
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
13
+ "github.com/netdata/netdata/go/plugins/pkg/web"
14
)
15
16
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/apache/collector.go
+2
-2
@@ -11,9 +11,9 @@ import (
11
"sync"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/apache/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/apache/init.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"net/http"
8
"strings"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/apcupsd/collector.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
"errors"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
)
14
15
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/beanstalk/collect.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"slices"
9
"time"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
11
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
12
)
13
14
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/beanstalk/collector.go
+1
-1
@@ -10,9 +10,9 @@ import (
10
"time"
11
12
"github.com/netdata/netdata/go/plugins/logger"
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/pkg/matcher"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/bind/collector.go
+2
-2
@@ -10,10 +10,10 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/pkg/matcher"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/bind/json_client.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"fmt"
7
"net/http"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
type serverStats = jsonServerStats
src/go/plugin/go.d/collector/bind/xml3_client.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"fmt"
7
"net/http"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
type xml3Stats struct {
src/go/plugin/go.d/collector/boinc/collector.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/logger"
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/cassandra/collect.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"errors"
7
"strings"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
10
)
11
12
const (
src/go/plugin/go.d/collector/cassandra/collector.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/cassandra/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/cassandra/init.go
+2
-2
@@ -5,8 +5,8 @@ package cassandra
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/ceph/auth.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
"net/http"
11
"net/url"
12
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
13
+ "github.com/netdata/netdata/go/plugins/pkg/web"
14
)
15
16
type (
src/go/plugin/go.d/collector/ceph/collect.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"net/http"
10
"slices"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
)
14
15
const precision = 1000
src/go/plugin/go.d/collector/ceph/collect_health.go
+1
-1
@@ -5,7 +5,7 @@ package ceph
5
import (
6
"strings"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/web"
9
)
10
11
func (c *Collector) collectHealth(mx map[string]int64) error {
src/go/plugin/go.d/collector/ceph/collect_osd.go
+1
-1
@@ -5,7 +5,7 @@ package ceph
5
import (
6
"fmt"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/web"
9
)
10
11
func (c *Collector) collectOsds(mx map[string]int64) error {
src/go/plugin/go.d/collector/ceph/collect_pools.go
+1
-1
@@ -5,7 +5,7 @@ package ceph
5
import (
6
"fmt"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/web"
9
)
10
11
func (c *Collector) collectPools(mx map[string]int64) error {
src/go/plugin/go.d/collector/ceph/collector.go
+3
-3
@@ -11,10 +11,10 @@ import (
11
"sync"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
18
)
19
20
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/ceph/collector_test.go
+1
-1
@@ -15,8 +15,8 @@ import (
15
16
"github.com/stretchr/testify/assert"
17
18
+ "github.com/netdata/netdata/go/plugins/pkg/web"
19
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
19
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
20
21
"github.com/stretchr/testify/require"
22
)
src/go/plugin/go.d/collector/chrony/collector.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
"sync"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/clickhouse/collect.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
"net/url"
11
"slices"
12
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
13
+ "github.com/netdata/netdata/go/plugins/pkg/web"
14
)
15
16
const precision = 1000
src/go/plugin/go.d/collector/clickhouse/collect_system_async_metrics.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"errors"
7
"strconv"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
const querySystemAsyncMetrics = `
src/go/plugin/go.d/collector/clickhouse/collect_system_disks.go
+1
-1
@@ -5,7 +5,7 @@ package clickhouse
5
import (
6
"strconv"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/web"
9
)
10
11
const querySystemDisks = `
src/go/plugin/go.d/collector/clickhouse/collect_system_events.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"errors"
7
"strconv"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
const querySystemEvents = `
src/go/plugin/go.d/collector/clickhouse/collect_system_metrics.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"errors"
7
"strconv"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
const querySystemMetrics = `
src/go/plugin/go.d/collector/clickhouse/collect_system_parts.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"fmt"
7
"strconv"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
const querySystemParts = `
src/go/plugin/go.d/collector/clickhouse/collect_system_processes.go
+1
-1
@@ -5,7 +5,7 @@ package clickhouse
5
import (
6
"strconv"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/web"
9
)
10
11
const queryLongestQueryTime = `
src/go/plugin/go.d/collector/clickhouse/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/clickhouse/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/clickhouse/init.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"errors"
7
"net/http"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/cockroachdb/collect.go
+2
-2
@@ -5,8 +5,8 @@ package cockroachdb
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
10
)
11
12
func validCockroachDBMetrics(scraped prometheus.Series) bool {
src/go/plugin/go.d/collector/cockroachdb/collector.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/cockroachdb/init.go
+2
-2
@@ -5,8 +5,8 @@ package cockroachdb
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/consul/collect.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"net/http"
8
"slices"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
const (
src/go/plugin/go.d/collector/consul/collect_metrics.go
+2
-2
@@ -4,12 +4,12 @@ package consul
4
5
import (
6
"fmt"
7
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
7
"math"
8
"strconv"
9
"strings"
10
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
11
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
12
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
13
)
14
15
func (c *Collector) collectMetricsPrometheus(mx map[string]int64) error {
src/go/plugin/go.d/collector/consul/collector.go
+5
-5
@@ -11,12 +11,12 @@ import (
11
"sync"
12
"time"
13
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
18
-
14
"github.com/blang/semver/v4"
15
+
16
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
17
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
18
+ "github.com/netdata/netdata/go/plugins/pkg/web"
19
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
20
)
21
22
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/consul/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/consul/init.go
+2
-2
@@ -7,8 +7,8 @@ import (
7
"net/http"
8
"net/url"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
11
+ "github.com/netdata/netdata/go/plugins/pkg/web"
12
)
13
14
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/coredns/collect.go
+2
-2
@@ -7,8 +7,8 @@ import (
7
"fmt"
8
"strings"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
10
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
11
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
12
13
"github.com/blang/semver/v4"
14
)
src/go/plugin/go.d/collector/coredns/collector.go
+5
-5
@@ -9,13 +9,13 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/blang/semver/v4"
13
+
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/pkg/matcher"
16
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
17
+ "github.com/netdata/netdata/go/plugins/pkg/web"
18
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
-
18
- "github.com/blang/semver/v4"
19
)
20
21
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/coredns/init.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
"errors"
7
8
"github.com/netdata/netdata/go/plugins/pkg/matcher"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/couchbase/collect.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"fmt"
7
"net/url"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
)
12
13
const (
src/go/plugin/go.d/collector/couchbase/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/couchbase/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/couchbase/init.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"errors"
7
"net/http"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
)
12
13
func (c *Collector) initCharts() (*Charts, error) {
src/go/plugin/go.d/collector/couchdb/collect.go
+2
-2
@@ -13,8 +13,8 @@ import (
13
"strings"
14
"sync"
15
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
17
+ "github.com/netdata/netdata/go/plugins/pkg/web"
18
)
19
20
const (
src/go/plugin/go.d/collector/couchdb/collector.go
+2
-2
@@ -11,9 +11,9 @@ import (
11
"strings"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/couchdb/collector_test.go
+4
-4
@@ -9,12 +9,12 @@ import (
9
"os"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/couchdb/init.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"errors"
7
"net/http"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
)
12
13
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/dmcache/collector.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
"fmt"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/dnsdist/collect.go
+2
-2
@@ -5,8 +5,8 @@ package dnsdist
5
import (
6
"net/url"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
const (
src/go/plugin/go.d/collector/dnsdist/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/dnsdist/collector_test.go
+4
-4
@@ -9,12 +9,12 @@ import (
9
"os"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/dnsdist/init.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"errors"
7
"net/http"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
)
12
13
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/dnsmasq/collector.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
-
12
"github.com/miekg/dns"
13
+
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/dnsquery/collector.go
+3
-3
@@ -8,10 +8,10 @@ import (
8
"fmt"
9
"time"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
-
11
"github.com/miekg/dns"
12
+
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/dnsquery/collector_test.go
+3
-3
@@ -9,12 +9,12 @@ import (
9
"testing"
10
"time"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
-
12
"github.com/miekg/dns"
13
"github.com/stretchr/testify/assert"
14
"github.com/stretchr/testify/require"
15
+
16
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/docker/collector.go
+1
-1
@@ -8,9 +8,9 @@ import (
8
"errors"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/pkg/matcher"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/dockerhost"
15
16
"github.com/docker/docker/api/types"
src/go/plugin/go.d/collector/docker_engine/collect.go
+2
-2
@@ -5,8 +5,8 @@ package docker_engine
5
import (
6
"fmt"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
10
)
11
12
func isDockerEngineMetrics(pms prometheus.Series) bool {
src/go/plugin/go.d/collector/docker_engine/collector.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/docker_engine/collector_test.go
+4
-4
@@ -9,12 +9,12 @@ import (
9
"os"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/docker_engine/init.go
+2
-2
@@ -5,8 +5,8 @@ package docker_engine
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/dockerhub/apiclient.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"net/url"
9
"path"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
+ "github.com/netdata/netdata/go/plugins/pkg/web"
12
)
13
14
type repository struct {
src/go/plugin/go.d/collector/dockerhub/collector.go
+2
-2
@@ -9,9 +9,9 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/web"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/dockerhub/init.go
+1
-1
@@ -5,7 +5,7 @@ package dockerhub
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/web"
9
)
10
11
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/dovecot/collector.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
"errors"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
)
14
15
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/elasticsearch/collect.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"strings"
11
"sync"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
const (
src/go/plugin/go.d/collector/elasticsearch/collector.go
+2
-2
@@ -11,9 +11,9 @@ import (
11
"sync"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/elasticsearch/collector_test.go
+4
-4
@@ -9,12 +9,12 @@ import (
9
"os"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/elasticsearch/init.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"errors"
7
"net/http"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/envoy/collect.go
+2
-2
@@ -6,9 +6,9 @@ import (
6
"strconv"
7
"strings"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
10
-
9
"github.com/prometheus/prometheus/model/labels"
10
+
11
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
12
)
13
14
// Server stats: https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/statistics#
src/go/plugin/go.d/collector/envoy/collector.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/envoy/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/envoy/init.go
+2
-2
@@ -5,8 +5,8 @@ package envoy
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/ethtool/collector.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/exim/collector.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/fail2ban/collector.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
"fmt"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/filecheck/collector.go
+1
-1
@@ -8,9 +8,9 @@ import (
8
"fmt"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/pkg/matcher"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/fluentd/apiclient.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"net/url"
9
"path"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
+ "github.com/netdata/netdata/go/plugins/pkg/web"
12
)
13
14
const pluginsPath = "/api/plugins.json"
src/go/plugin/go.d/collector/fluentd/collector.go
+2
-2
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/pkg/matcher"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/fluentd/init.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"errors"
7
8
"github.com/netdata/netdata/go/plugins/pkg/matcher"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/freeradius/collect.go
+1
-1
@@ -3,7 +3,7 @@
3
package freeradius
4
5
import (
6
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
6
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
7
)
8
9
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/freeradius/collector.go
+1
-1
@@ -9,9 +9,9 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/collector/freeradius/api"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/gearman/collector.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
"errors"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
)
14
15
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/geth/collect.go
+2
-2
@@ -3,8 +3,8 @@
3
package geth
4
5
import (
6
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
7
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
6
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
7
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
8
)
9
10
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/geth/collector.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/geth/init.go
+2
-2
@@ -3,8 +3,8 @@ package geth
3
import (
4
"errors"
5
6
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
7
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
6
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
7
+ "github.com/netdata/netdata/go/plugins/pkg/web"
8
)
9
10
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/haproxy/collect.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"errors"
7
"strings"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
11
)
12
13
const (
src/go/plugin/go.d/collector/haproxy/collector.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/haproxy/collector_test.go
+4
-4
@@ -9,12 +9,12 @@ import (
9
"os"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/haproxy/init.go
+3
-3
@@ -5,9 +5,9 @@ package haproxy
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus/selector"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus/selector"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/hddtemp/collector.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/hdfs/collect.go
+2
-2
@@ -8,8 +8,8 @@ import (
8
"fmt"
9
"strings"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
)
14
15
const (
src/go/plugin/go.d/collector/hdfs/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/hpssa/collector.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/httpcheck/collect.go
+2
-2
@@ -14,8 +14,8 @@ import (
14
"time"
15
16
"github.com/netdata/netdata/go/plugins/logger"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
18
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
18
+ "github.com/netdata/netdata/go/plugins/pkg/web"
19
)
20
21
type reqErrCode int
src/go/plugin/go.d/collector/httpcheck/collector.go
+2
-2
@@ -11,9 +11,9 @@ import (
11
"regexp"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/httpcheck/collector_test.go
+4
-4
@@ -10,12 +10,12 @@ import (
10
"testing"
11
"time"
12
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
-
13
"github.com/stretchr/testify/assert"
14
"github.com/stretchr/testify/require"
15
+
16
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
17
+ "github.com/netdata/netdata/go/plugins/pkg/web"
18
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
19
)
20
21
var (
src/go/plugin/go.d/collector/httpcheck/init.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"regexp"
10
11
"github.com/netdata/netdata/go/plugins/pkg/matcher"
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
)
15
16
type headerMatch struct {
src/go/plugin/go.d/collector/icecast/collect.go
+1
-1
@@ -5,7 +5,7 @@ package icecast
5
import (
6
"fmt"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/web"
9
)
10
11
const (
src/go/plugin/go.d/collector/icecast/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/icecast/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/ipfs/collect.go
+1
-1
@@ -5,7 +5,7 @@ package ipfs
5
import (
6
"fmt"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/web"
9
)
10
11
type (
src/go/plugin/go.d/collector/ipfs/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/ipfs/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/k8s_kubelet/collect.go
+2
-2
@@ -6,10 +6,10 @@ import (
6
"math"
7
"strings"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
10
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
mtx "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
13
)
14
15
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/k8s_kubelet/collector.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/k8s_kubelet/init.go
+2
-2
@@ -5,8 +5,8 @@ package k8s_kubelet
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/k8s_kubeproxy/collect.go
+2
-2
@@ -6,10 +6,10 @@ import (
6
"math"
7
"strings"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
10
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
mtx "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
13
)
14
15
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/k8s_kubeproxy/collector.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/k8s_kubeproxy/init.go
+2
-2
@@ -5,8 +5,8 @@ package k8s_kubeproxy
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/k8s_state/cluster_meta.go
+2
-2
@@ -9,9 +9,9 @@ import (
9
"net/http"
10
"time"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
13
-
12
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
13
+
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
)
16
17
func (c *Collector) getKubeClusterID() string {
src/go/plugin/go.d/collector/lighttpd/collect.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
"fmt"
7
"io"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/lighttpd/collector.go
+2
-2
@@ -11,9 +11,9 @@ import (
11
"strings"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/logind/collector.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
"errors"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/logstash/collect.go
+2
-2
@@ -5,8 +5,8 @@ package logstash
5
import (
6
"fmt"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
const urlPathNodeStatsAPI = "/_node/stats"
src/go/plugin/go.d/collector/logstash/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/logstash/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/lvm/collector.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
"fmt"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/maxscale/collect.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"strings"
10
"unicode"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
)
14
15
const (
src/go/plugin/go.d/collector/maxscale/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/maxscale/collector_test.go
+1
-1
@@ -12,8 +12,8 @@ import (
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
15
+ web "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
var (
src/go/plugin/go.d/collector/megacli/collector.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
"fmt"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/memcached/collector.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
"errors"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
)
14
15
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/mongodb/collect_serverstatus.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"fmt"
7
"reflect"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
11
)
12
13
// collectServerStatus creates the map[string]int64 for the available dims.
src/go/plugin/go.d/collector/mongodb/collector.go
+1
-1
@@ -10,9 +10,9 @@ import (
10
"sync"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/pkg/matcher"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/monit/collect.go
+2
-2
@@ -8,9 +8,9 @@ import (
8
"fmt"
9
"net/url"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
12
-
11
"golang.org/x/net/html/charset"
12
+
13
+ "github.com/netdata/netdata/go/plugins/pkg/web"
14
)
15
16
var (
src/go/plugin/go.d/collector/monit/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/monit/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/mysql/collector.go
+1
-1
@@ -15,8 +15,8 @@ import (
15
"github.com/blang/semver/v4"
16
"github.com/go-sql-driver/mysql"
17
18
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
19
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
19
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
20
)
21
22
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/nats/collect.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"strings"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
)
15
16
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/nats/collector.go
+2
-2
@@ -11,9 +11,9 @@ import (
11
"sync"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/nats/collector_test.go
+1
-1
@@ -12,8 +12,8 @@ import (
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
var (
src/go/plugin/go.d/collector/nats/restapi.go
+1
-1
@@ -5,7 +5,7 @@ package nats
5
import (
6
"time"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/web"
9
)
10
11
// https://docs.nats.io/running-a-nats-service/nats_admin/monitoring
src/go/plugin/go.d/collector/nginx/collect.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
"fmt"
7
"io"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/nginx/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/nginxplus/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/nginxplus/collector_test.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
"os"
11
"testing"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/web"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
16
"github.com/stretchr/testify/assert"
17
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/nginxplus/nginx_http_api_query.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"net/http"
9
"sync"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
+ "github.com/netdata/netdata/go/plugins/pkg/web"
12
)
13
14
const (
src/go/plugin/go.d/collector/nginxunit/collect.go
+2
-2
@@ -8,8 +8,8 @@ import (
8
"fmt"
9
"net/http"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
)
14
15
const (
src/go/plugin/go.d/collector/nginxunit/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/nginxunit/collector_test.go
+1
-1
@@ -12,8 +12,8 @@ import (
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
var (
src/go/plugin/go.d/collector/nginxvts/collect.go
+2
-2
@@ -3,8 +3,8 @@
3
package nginxvts
4
5
import (
6
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
7
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
6
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
7
+ "github.com/netdata/netdata/go/plugins/pkg/web"
8
)
9
10
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/nginxvts/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/nginxvts/collector_test.go
+4
-4
@@ -9,12 +9,12 @@ import (
9
"os"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/nginxvts/init.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"errors"
7
"net/http"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
)
12
13
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/nsd/collector.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
"fmt"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/ntpd/collector.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/iprange"
15
)
16
src/go/plugin/go.d/collector/nvidia_smi/collector.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"runtime"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/nvme/collector.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
"fmt"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/openldap/client.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
8
"github.com/go-ldap/ldap/v3"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
10
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
11
)
12
13
type ldapConn interface {
src/go/plugin/go.d/collector/openldap/collector.go
+2
-2
@@ -8,9 +8,9 @@ import (
8
"errors"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/openvpn/collector.go
+1
-1
@@ -7,10 +7,10 @@ import (
7
_ "embed"
8
"time"
9
10
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
11
"github.com/netdata/netdata/go/plugins/pkg/matcher"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/collector/openvpn/client"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
15
)
16
src/go/plugin/go.d/collector/oracledb/collector.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
"fmt"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/pgbouncer/collector.go
+3
-3
@@ -10,11 +10,11 @@ import (
10
"fmt"
11
"time"
12
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
-
13
"github.com/blang/semver/v4"
14
_ "github.com/jackc/pgx/v4/stdlib"
15
+
16
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/phpdaemon/collect.go
+2
-2
@@ -5,8 +5,8 @@ package phpdaemon
5
import (
6
"fmt"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
// https://github.com/kakserpom/phpdaemon/blob/master/PHPDaemon/Core/Daemon.php
src/go/plugin/go.d/collector/phpdaemon/collector.go
+2
-2
@@ -11,9 +11,9 @@ import (
11
"sync"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/phpfpm/client.go
+1
-1
@@ -12,7 +12,7 @@ import (
12
"time"
13
14
"github.com/netdata/netdata/go/plugins/logger"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
17
fcgiclient "github.com/kanocz/fcgi_client"
18
)
src/go/plugin/go.d/collector/phpfpm/collect.go
+1
-1
@@ -5,7 +5,7 @@ package phpfpm
5
import (
6
"math"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
)
10
11
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/phpfpm/collector.go
+2
-2
@@ -9,9 +9,9 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/web"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/phpfpm/init.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"fmt"
8
"os"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) initClient() (client, error) {
src/go/plugin/go.d/collector/pihole/auth.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"fmt"
8
"net/http"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) checkAuthSession() error {
src/go/plugin/go.d/collector/pihole/collect.go
+2
-2
@@ -7,8 +7,8 @@ import (
7
"fmt"
8
"time"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
11
+ "github.com/netdata/netdata/go/plugins/pkg/web"
12
)
13
14
const (
src/go/plugin/go.d/collector/pihole/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/pihole/collector_test.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
"os"
12
"testing"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
17
"github.com/stretchr/testify/assert"
18
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/pika/collector.go
+4
-4
@@ -9,12 +9,12 @@ import (
9
"fmt"
10
"time"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
15
-
12
"github.com/blang/semver/v4"
13
"github.com/redis/go-redis/v9"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
16
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/pika/collector_test.go
+3
-3
@@ -8,12 +8,12 @@ import (
8
"os"
9
"testing"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
13
-
11
"github.com/redis/go-redis/v9"
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
17
)
18
19
var (
src/go/plugin/go.d/collector/pika/init.go
+3
-3
@@ -5,10 +5,10 @@ package pika
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
10
-
8
"github.com/redis/go-redis/v9"
9
+
10
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
11
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
)
13
14
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/ping/collector.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
"time"
11
12
"github.com/netdata/netdata/go/plugins/logger"
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/ping/prober.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"time"
8
9
"github.com/netdata/netdata/go/plugins/logger"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
10
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
11
12
probing "github.com/prometheus-community/pro-bing"
13
)
src/go/plugin/go.d/collector/portcheck/collector.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
"net"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/postfix/collector.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/postgres/collector.go
+1
-1
@@ -11,9 +11,9 @@ import (
11
"sync"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/pkg/matcher"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
18
19
"github.com/jackc/pgx/v5/stdlib"
src/go/plugin/go.d/collector/powerdns/collect.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"errors"
7
"strconv"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
const (
src/go/plugin/go.d/collector/powerdns/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/powerdns/collector_test.go
+4
-4
@@ -9,12 +9,12 @@ import (
9
"os"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/powerdns/init.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"errors"
7
"net/http"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
)
12
13
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/powerdns_recursor/collect.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"errors"
7
"strconv"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
const (
src/go/plugin/go.d/collector/powerdns_recursor/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/powerdns_recursor/collector_test.go
+4
-4
@@ -9,12 +9,12 @@ import (
9
"os"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/powerdns_recursor/init.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"errors"
7
"net/http"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
)
12
13
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/prometheus/charts.go
+3
-3
@@ -6,10 +6,10 @@ import (
6
"fmt"
7
"strings"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
11
-
9
"github.com/prometheus/prometheus/model/labels"
10
+
11
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
12
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
)
14
15
const (
src/go/plugin/go.d/collector/prometheus/collect.go
+2
-2
@@ -8,10 +8,10 @@ import (
8
"strconv"
9
"strings"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
12
-
11
"github.com/prometheus/common/model"
12
"github.com/prometheus/prometheus/model/labels"
13
+
14
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
15
)
16
17
const (
src/go/plugin/go.d/collector/prometheus/collector.go
+4
-4
@@ -9,12 +9,12 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/pkg/matcher"
14
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
15
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus/selector"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus/selector"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
18
)
19
20
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/prometheus/collector_test.go
+4
-4
@@ -10,12 +10,12 @@ import (
10
"os"
11
"testing"
12
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus/selector"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
-
13
"github.com/stretchr/testify/assert"
14
"github.com/stretchr/testify/require"
15
+
16
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus/selector"
17
+ "github.com/netdata/netdata/go/plugins/pkg/web"
18
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
19
)
20
21
var (
src/go/plugin/go.d/collector/prometheus/init.go
+2
-2
@@ -7,8 +7,8 @@ import (
7
"fmt"
8
9
"github.com/netdata/netdata/go/plugins/pkg/matcher"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
11
+ "github.com/netdata/netdata/go/plugins/pkg/web"
12
)
13
14
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/proxysql/collector.go
+3
-3
@@ -10,10 +10,10 @@ import (
10
"sync"
11
"time"
12
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
-
13
_ "github.com/go-sql-driver/mysql"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
16
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/pulsar/charts.go
+1
-2
@@ -6,8 +6,7 @@ import (
6
"fmt"
7
"strings"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
10
-
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
11
)
12
src/go/plugin/go.d/collector/pulsar/collect.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
"errors"
7
"strings"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
10
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
11
)
12
13
func isValidPulsarMetrics(pms prometheus.Series) bool {
src/go/plugin/go.d/collector/pulsar/collector.go
+3
-3
@@ -10,11 +10,11 @@ import (
10
"sync"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/pkg/matcher"
15
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
18
)
19
20
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/pulsar/collector_test.go
+5
-5
@@ -10,13 +10,13 @@ import (
10
"strings"
11
"testing"
12
13
- "github.com/netdata/netdata/go/plugins/pkg/matcher"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
-
13
"github.com/stretchr/testify/assert"
14
"github.com/stretchr/testify/require"
15
+
16
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
17
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
18
+ "github.com/netdata/netdata/go/plugins/pkg/web"
19
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
20
)
21
22
var (
src/go/plugin/go.d/collector/pulsar/init.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
"errors"
7
8
"github.com/netdata/netdata/go/plugins/pkg/matcher"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/puppet/collect.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
"fmt"
7
"net/url"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
var (
src/go/plugin/go.d/collector/puppet/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/puppet/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/rabbitmq/collect.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"slices"
10
"strings"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
)
14
15
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/rabbitmq/collect_nodes.go
+1
-2
@@ -5,9 +5,8 @@ package rabbitmq
5
import (
6
"fmt"
7
8
+ "github.com/netdata/netdata/go/plugins/pkg/web"
9
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
9
-
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
)
11
12
func (c *Collector) collectNodes(mx map[string]int64) error {
src/go/plugin/go.d/collector/rabbitmq/collect_overview.go
+2
-2
@@ -5,8 +5,8 @@ package rabbitmq
5
import (
6
"fmt"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) collectOverview(mx map[string]int64) error {
src/go/plugin/go.d/collector/rabbitmq/collect_queues.go
+2
-2
@@ -5,9 +5,9 @@ package rabbitmq
5
import (
6
"fmt"
7
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
)
12
13
func (c *Collector) collectQueues(mx map[string]int64) error {
src/go/plugin/go.d/collector/rabbitmq/collect_vhosts.go
+2
-2
@@ -5,9 +5,9 @@ package rabbitmq
5
import (
6
"fmt"
7
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
)
12
13
func (c *Collector) collectVhosts(mx map[string]int64) error {
src/go/plugin/go.d/collector/rabbitmq/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/rabbitmq/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/redis/collector.go
+5
-5
@@ -10,13 +10,13 @@ import (
10
"sync"
11
"time"
12
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
17
-
13
"github.com/blang/semver/v4"
14
"github.com/redis/go-redis/v9"
15
+
16
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
17
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
18
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
19
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix"
20
)
21
22
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/redis/collector_test.go
+3
-3
@@ -9,12 +9,12 @@ import (
9
"strings"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
-
12
"github.com/redis/go-redis/v9"
13
"github.com/stretchr/testify/assert"
14
"github.com/stretchr/testify/require"
15
+
16
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/redis/init.go
+3
-3
@@ -5,10 +5,10 @@ package redis
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
10
-
8
"github.com/redis/go-redis/v9"
9
+
10
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
11
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
)
13
14
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/rethinkdb/collect.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"errors"
8
"fmt"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
10
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
11
)
12
13
type (
src/go/plugin/go.d/collector/rethinkdb/collector.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
"errors"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
)
14
15
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/riakkv/collect.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
"errors"
7
"net/http"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/riakkv/collector.go
+2
-2
@@ -11,9 +11,9 @@ import (
11
"sync"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/riakkv/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/rspamd/collect.go
+2
-2
@@ -5,8 +5,8 @@ package rspamd
5
import (
6
"fmt"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
type rspamdStats struct {
src/go/plugin/go.d/collector/rspamd/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/rspamd/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/samba/collector.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
"sync"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/scaleio/client/client.go
+1
-1
@@ -13,7 +13,7 @@ import (
13
"strings"
14
"sync"
15
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
)
18
19
/*
src/go/plugin/go.d/collector/scaleio/client/client_test.go
+2
-2
@@ -6,10 +6,10 @@ import (
6
"net/http/httptest"
7
"testing"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
-
9
"github.com/stretchr/testify/assert"
10
"github.com/stretchr/testify/require"
11
+
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
)
14
15
func TestNew(t *testing.T) {
src/go/plugin/go.d/collector/scaleio/collect.go
+1
-1
@@ -5,8 +5,8 @@ package scaleio
5
import (
6
"time"
7
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
"github.com/netdata/netdata/go/plugins/plugin/go.d/collector/scaleio/client"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
10
)
11
12
const discoveryEvery = 5
src/go/plugin/go.d/collector/scaleio/collector.go
+2
-2
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/web"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/collector/scaleio/client"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/smartctl/collector.go
+1
-1
@@ -9,9 +9,9 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/pkg/matcher"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/smartctl/collector_test.go
+3
-3
@@ -9,12 +9,12 @@ import (
9
"testing"
10
"time"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
"github.com/tidwall/gjson"
15
+
16
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/snmp/collector.go
+1
-1
@@ -11,12 +11,12 @@ import (
11
"github.com/gosnmp/gosnmp"
12
13
"github.com/netdata/netdata/go/plugins/logger"
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/vnodes"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/collector/ping"
18
"github.com/netdata/netdata/go/plugins/plugin/go.d/collector/snmp/ddsnmp"
19
"github.com/netdata/netdata/go/plugins/plugin/go.d/collector/snmp/ddsnmp/ddsnmpcollector"
19
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
20
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/snmputils"
21
)
22
src/go/plugin/go.d/collector/snmp/ddsnmp/load.go
+1
-1
@@ -18,8 +18,8 @@ import (
18
"github.com/netdata/netdata/go/plugins/logger"
19
"github.com/netdata/netdata/go/plugins/pkg/executable"
20
"github.com/netdata/netdata/go/plugins/pkg/multipath"
21
+ "github.com/netdata/netdata/go/plugins/pkg/pluginconfig"
22
"github.com/netdata/netdata/go/plugins/plugin/go.d/collector/snmp/ddsnmp/ddprofiledefinition"
22
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/pluginconfig"
23
)
24
25
var log = logger.New().With("component", "snmp/ddsnmp")
src/go/plugin/go.d/collector/spigotmc/collector.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
"errors"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
)
14
15
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/squid/collect.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"strconv"
10
"strings"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
)
14
15
const (
src/go/plugin/go.d/collector/squid/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/squid/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/squidlog/collect.go
+2
-3
@@ -8,10 +8,9 @@ import (
8
"strconv"
9
"strings"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/logs"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
13
-
11
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/logs"
14
)
15
16
func (c *Collector) logPanicStackIfAny() {
src/go/plugin/go.d/collector/storcli/collector.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
"fmt"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/supervisord/collector.go
+2
-2
@@ -9,9 +9,9 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/web"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/supervisord/init.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"fmt"
8
"net/url"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) verifyConfig() error {
src/go/plugin/go.d/collector/systemdunits/collector.go
+3
-3
@@ -11,11 +11,11 @@ import (
11
"fmt"
12
"time"
13
14
+ "github.com/coreos/go-systemd/v22/dbus"
15
+
16
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
17
"github.com/netdata/netdata/go/plugins/pkg/matcher"
18
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
17
-
18
- "github.com/coreos/go-systemd/v22/dbus"
19
)
20
21
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/tengine/collect.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
"fmt"
7
"io"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/tengine/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/tomcat/collect.go
+2
-2
@@ -7,8 +7,8 @@ import (
7
"net/url"
8
"strings"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
11
+ "github.com/netdata/netdata/go/plugins/pkg/web"
12
)
13
14
var (
src/go/plugin/go.d/collector/tomcat/collector.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/tomcat/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/tomcat/init.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"fmt"
7
"net/http"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/tor/collector.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
"errors"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
)
14
15
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/traefik/collect.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"errors"
7
"strings"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
11
)
12
13
const (
src/go/plugin/go.d/collector/traefik/collector.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/traefik/collector_test.go
+4
-4
@@ -9,12 +9,12 @@ import (
9
"os"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
)
19
20
var (
src/go/plugin/go.d/collector/traefik/init.go
+3
-3
@@ -5,9 +5,9 @@ package traefik
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus/selector"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus/selector"
10
+ "github.com/netdata/netdata/go/plugins/pkg/web"
11
)
12
13
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/typesense/collect.go
+2
-2
@@ -8,8 +8,8 @@ import (
8
"net/http"
9
"strings"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
)
14
15
const (
src/go/plugin/go.d/collector/typesense/collector.go
+2
-2
@@ -11,9 +11,9 @@ import (
11
"sync"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/typesense/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/unbound/collector.go
+2
-2
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/unbound/collector_test.go
+4
-4
@@ -12,12 +12,12 @@ import (
12
"strings"
13
"testing"
14
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
18
-
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
17
+
18
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
19
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
20
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
21
)
22
23
var (
src/go/plugin/go.d/collector/unbound/init.go
+1
-1
@@ -7,9 +7,9 @@ import (
7
"errors"
8
"net"
9
10
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/collector/unbound/config"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
13
)
14
15
func (c *Collector) initConfig() (enabled bool) {
src/go/plugin/go.d/collector/upsd/collector.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
"errors"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
)
14
15
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/uwsgi/collector.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
"errors"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
)
14
15
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/varnish/collector.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/vcsa/client/client.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"net/http"
9
"sync"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
11
+ "github.com/netdata/netdata/go/plugins/pkg/web"
12
)
13
14
// Session: https://vmware.github.io/vsphere-automation-sdk-rest/vsphere/index.html#SVC_com.vmware.cis.session
src/go/plugin/go.d/collector/vcsa/collector.go
+2
-2
@@ -9,9 +9,9 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/web"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/vcsa/init.go
+1
-1
@@ -5,8 +5,8 @@ package vcsa
5
import (
6
"errors"
7
8
+ "github.com/netdata/netdata/go/plugins/pkg/web"
9
"github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vcsa/client"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/vernemq/collect.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"github.com/prometheus/common/model"
10
"github.com/prometheus/prometheus/model/labels"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
12
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
13
)
14
15
func (c *Collector) collect() (map[string]int64, error) {
src/go/plugin/go.d/collector/vernemq/collector.go
+3
-3
@@ -9,10 +9,10 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/vernemq/collector_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"os"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/collector/vernemq/init.go
+2
-2
@@ -5,8 +5,8 @@ package vernemq
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/web"
10
)
11
12
func (c *Collector) validateConfig() error {
src/go/plugin/go.d/collector/vsphere/client/client.go
+2
-2
@@ -8,8 +8,6 @@ import (
8
"net/url"
9
"time"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
12
-
11
"github.com/vmware/govmomi"
12
"github.com/vmware/govmomi/performance"
13
"github.com/vmware/govmomi/session"
@@ -18,6 +16,8 @@ import (
16
"github.com/vmware/govmomi/vim25/mo"
17
"github.com/vmware/govmomi/vim25/soap"
18
"github.com/vmware/govmomi/vim25/types"
19
+
20
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
21
)
22
23
const (
src/go/plugin/go.d/collector/vsphere/client/client_test.go
+2
-2
@@ -8,13 +8,13 @@ import (
8
"testing"
9
"time"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
12
-
11
"github.com/stretchr/testify/assert"
12
"github.com/stretchr/testify/require"
13
"github.com/vmware/govmomi/simulator"
14
"github.com/vmware/govmomi/vim25/mo"
15
"github.com/vmware/govmomi/vim25/types"
16
+
17
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
18
)
19
20
func TestNew(t *testing.T) {
src/go/plugin/go.d/collector/vsphere/collector.go
+4
-4
@@ -9,13 +9,13 @@ import (
9
"sync"
10
"time"
11
12
+ "github.com/vmware/govmomi/performance"
13
+
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/match"
18
rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
-
18
- "github.com/vmware/govmomi/performance"
19
)
20
21
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/vsphere/collector_test.go
+6
-6
@@ -9,16 +9,16 @@ import (
9
"testing"
10
"time"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/discover"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/match"
15
- rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
17
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
"github.com/vmware/govmomi/performance"
15
"github.com/vmware/govmomi/simulator"
16
+
17
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
18
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
19
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/discover"
20
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/match"
21
+ rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources"
22
)
23
24
var (
src/go/plugin/go.d/collector/vsphere/discover/discover_test.go
+4
-4
@@ -8,13 +8,13 @@ import (
8
"testing"
9
"time"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/client"
12
- rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
-
11
"github.com/stretchr/testify/assert"
12
"github.com/stretchr/testify/require"
13
"github.com/vmware/govmomi/simulator"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/client"
17
+ rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources"
18
)
19
20
func TestDiscoverer_Discover(t *testing.T) {
src/go/plugin/go.d/collector/vsphere/scrape/scrape_test.go
+5
-5
@@ -8,14 +8,14 @@ import (
8
"testing"
9
"time"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/client"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/discover"
13
- rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
15
-
11
"github.com/stretchr/testify/assert"
12
"github.com/stretchr/testify/require"
13
"github.com/vmware/govmomi/simulator"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/client"
17
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/discover"
18
+ rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources"
19
)
20
21
func TestNew(t *testing.T) {
src/go/plugin/go.d/collector/weblog/collect.go
+2
-3
@@ -10,10 +10,9 @@ import (
10
"strconv"
11
"strings"
12
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/logs"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
15
-
13
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/logs"
16
)
17
18
func (c *Collector) logPanicStackIfAny() {
src/go/plugin/go.d/collector/whoisquery/collector.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/x509check/collector.go
+4
-4
@@ -9,11 +9,11 @@ import (
9
"fmt"
10
"time"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
15
-
12
cfssllog "github.com/cloudflare/cfssl/log"
13
+
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/x509check/collector_test.go
+3
-3
@@ -9,11 +9,11 @@ import (
9
"os"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
14
-
12
"github.com/stretchr/testify/assert"
13
"github.com/stretchr/testify/require"
14
+
15
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
17
)
18
19
var (
src/go/plugin/go.d/collector/x509check/provider.go
+1
-1
@@ -13,7 +13,7 @@ import (
13
"os"
14
"time"
15
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
16
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
17
)
18
19
type provider interface {
src/go/plugin/go.d/collector/yugabytedb/collect.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"fmt"
7
"strings"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
10
)
11
12
const (
src/go/plugin/go.d/collector/yugabytedb/collector.go
+3
-3
@@ -10,10 +10,10 @@ import (
10
"net/http"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
15
+ "github.com/netdata/netdata/go/plugins/pkg/web"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
)
18
19
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/yugabytedb/collector_test.go
+1
-1
@@ -13,8 +13,8 @@ import (
13
"github.com/stretchr/testify/assert"
14
"github.com/stretchr/testify/require"
15
16
+ "github.com/netdata/netdata/go/plugins/pkg/web"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
18
)
19
20
var (
src/go/plugin/go.d/collector/yugabytedb/init.go
+2
-2
@@ -5,8 +5,8 @@ package yugabytedb
5
import (
6
"net/http"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus/selector"
8
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
9
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus/selector"
10
)
11
12
const (
src/go/plugin/go.d/collector/zfspool/collector.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
"fmt"
12
"time"
13
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
16
)
17
18
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/zookeeper/collector.go
+2
-2
@@ -9,9 +9,9 @@ import (
9
"fmt"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/collector/zookeeper/init.go
+1
-1
@@ -7,8 +7,8 @@ import (
7
"errors"
8
"fmt"
9
10
+ "github.com/netdata/netdata/go/plugins/pkg/tlscfg"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
12
)
13
14
func (c *Collector) verifyConfig() error {
src/go/plugin/go.d/examples/simple/main.go
+1
-1
@@ -14,10 +14,10 @@ import (
14
"github.com/jessevdk/go-flags"
15
16
"github.com/netdata/netdata/go/plugins/logger"
17
+ "github.com/netdata/netdata/go/plugins/pkg/cli"
18
"github.com/netdata/netdata/go/plugins/pkg/multipath"
19
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent"
20
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
20
- "github.com/netdata/netdata/go/plugins/plugin/go.d/cli"
21
)
22
23
var version = "v0.0.1-example"
src/go/plugin/go.d/pkg/metrix/counter.go
+1
-1
@@ -5,7 +5,7 @@ package metrix
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
)
10
11
type (
src/go/plugin/go.d/pkg/metrix/gauge.go
+1
-1
@@ -5,7 +5,7 @@ package metrix
5
import (
6
"time"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
)
10
11
type (
src/go/plugin/go.d/pkg/metrix/histogram.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"fmt"
7
"sort"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
9
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
10
)
11
12
type (
src/go/plugin/go.d/pkg/metrix/metrics.go
+3
-1
@@ -2,7 +2,9 @@
2
3
package metrix
4
5
-import "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
5
+import (
6
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
7
+)
8
9
// Observer is an interface that wraps the Observe method, which is used by
10
// Histogram and Summary to add observations.
src/go/plugin/go.d/pkg/metrix/summary.go
+1
-1
@@ -5,7 +5,7 @@ package metrix
5
import (
6
"math"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
)
10
11
type (
src/go/plugin/go.d/pkg/metrix/unique_counter.go
+2
-2
@@ -3,9 +3,9 @@
3
package metrix
4
5
import (
6
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
7
-
6
"github.com/axiomhq/hyperloglog"
7
+
8
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
9
)
10
11
type (
src/go/plugin/go.d/pkg/snmputils/overrides.go
+1
-1
@@ -15,7 +15,7 @@ import (
15
"gopkg.in/yaml.v2"
16
17
"github.com/netdata/netdata/go/plugins/pkg/executable"
18
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/pluginconfig"
18
+ "github.com/netdata/netdata/go/plugins/pkg/pluginconfig"
19
)
20
21
var (
src/go/plugin/ibm.d/docgen/config_parser.go
+20
-20
@@ -17,7 +17,7 @@ import (
17
"time"
18
"unicode"
19
20
- "github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
20
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
21
)
22
23
// parseConfigFromGoFile parses a Go config file to extract configuration fields
@@ -64,14 +64,14 @@ func (g *DocGenerator) parseConfigFromGoFile() ([]ConfigField, map[string]interf
64
field := &fields[i]
65
if field.GoType == "framework.AutoBool" {
66
field.Type = "string"
67
- field.Enum = toStringSlice(framework.AutoBoolEnum)
67
+ field.Enum = toStringSlice(confopt.AutoBoolEnum)
68
}
69
70
if defaultValue, exists := defaults[field.Name]; exists {
71
field.Default = normalizeDefaultValue(*field, defaultValue)
72
field.Required = false
73
} else if field.GoType == "framework.AutoBool" {
74
- field.Default = framework.AutoBoolAuto.String()
74
+ field.Default = confopt.AutoBoolAuto.String()
75
field.Required = false
76
} else if field.Pointer {
77
field.Default = "<auto>"
@@ -508,7 +508,7 @@ func assignDefaultUIGroup(field *ConfigField) {
508
}
509
}
510
511
-func toStringSlice(values []framework.AutoBool) []string {
511
+func toStringSlice(values []confopt.AutoBool) []string {
512
result := make([]string, 0, len(values))
513
for _, v := range values {
514
result = append(result, v.String())
@@ -525,34 +525,34 @@ func normalizeDefaultValue(field ConfigField, value interface{}) interface{} {
525
return normalizeAutoBoolLiteral(v)
526
case bool:
527
if v {
528
- return framework.AutoBoolEnabled.String()
528
+ return confopt.AutoBoolEnabled.String()
529
}
530
- return framework.AutoBoolDisabled.String()
530
+ return confopt.AutoBoolDisabled.String()
531
case nil:
532
- return framework.AutoBoolAuto.String()
532
+ return confopt.AutoBoolAuto.String()
533
default:
534
- return framework.AutoBoolAuto.String()
534
+ return confopt.AutoBoolAuto.String()
535
}
536
}
537
538
func normalizeAutoBoolLiteral(value string) string {
539
lower := strings.ToLower(strings.TrimSpace(value))
540
switch lower {
541
- case "", framework.AutoBoolAuto.String():
542
- return framework.AutoBoolAuto.String()
543
- case framework.AutoBoolEnabled.String():
544
- return framework.AutoBoolEnabled.String()
545
- case framework.AutoBoolDisabled.String():
546
- return framework.AutoBoolDisabled.String()
541
+ case "", confopt.AutoBoolAuto.String():
542
+ return confopt.AutoBoolAuto.String()
543
+ case confopt.AutoBoolEnabled.String():
544
+ return confopt.AutoBoolEnabled.String()
545
+ case confopt.AutoBoolDisabled.String():
546
+ return confopt.AutoBoolDisabled.String()
547
}
548
549
if strings.HasSuffix(lower, "autoboolenabled") {
550
- return framework.AutoBoolEnabled.String()
550
+ return confopt.AutoBoolEnabled.String()
551
}
552
if strings.HasSuffix(lower, "autobooldisabled") {
553
- return framework.AutoBoolDisabled.String()
553
+ return confopt.AutoBoolDisabled.String()
554
}
555
- return framework.AutoBoolAuto.String()
555
+ return confopt.AutoBoolAuto.String()
556
}
557
558
// parseDefaultsFromInitFile parses init.go to find the defaultConfig() function
@@ -714,11 +714,11 @@ func (g *DocGenerator) extractValue(expr ast.Expr) interface{} {
714
if ident.Name == "framework" {
715
switch v.Sel.Name {
716
case "AutoBoolAuto":
717
- return framework.AutoBoolAuto.String()
717
+ return confopt.AutoBoolAuto.String()
718
case "AutoBoolEnabled":
719
- return framework.AutoBoolEnabled.String()
719
+ return confopt.AutoBoolEnabled.String()
720
case "AutoBoolDisabled":
721
- return framework.AutoBoolDisabled.String()
721
+ return confopt.AutoBoolDisabled.String()
722
}
723
}
724
}
src/go/plugin/ibm.d/modules/as400/collector.go
+1
-1
@@ -13,7 +13,7 @@ import (
13
"sync"
14
15
"github.com/netdata/netdata/go/plugins/pkg/matcher"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
16
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
17
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
18
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/as400/contexts"
19
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/pkg/dbdriver"
src/go/plugin/ibm.d/modules/as400/config.go
+9
-9
@@ -1,7 +1,7 @@
1
package as400
2
3
import (
4
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
4
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
5
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
6
)
7
@@ -52,28 +52,28 @@ type Config struct {
52
ResetStatistics bool `yaml:"reset_statistics,omitempty" json:"reset_statistics" ui:"group:Advanced"`
53
54
// CollectDiskMetrics toggles collection of disk unit statistics.
55
- CollectDiskMetrics framework.AutoBool `yaml:"collect_disk_metrics,omitempty" json:"collect_disk_metrics" ui:"group:Disks"`
55
+ CollectDiskMetrics confopt.AutoBool `yaml:"collect_disk_metrics,omitempty" json:"collect_disk_metrics" ui:"group:Disks"`
56
57
// CollectSubsystemMetrics toggles collection of subsystem activity metrics.
58
- CollectSubsystemMetrics framework.AutoBool `yaml:"collect_subsystem_metrics,omitempty" json:"collect_subsystem_metrics" ui:"group:Subsystems"`
58
+ CollectSubsystemMetrics confopt.AutoBool `yaml:"collect_subsystem_metrics,omitempty" json:"collect_subsystem_metrics" ui:"group:Subsystems"`
59
60
// CollectJobQueueMetrics toggles collection of job queue backlog metrics.
61
- CollectJobQueueMetrics framework.AutoBool `yaml:"collect_job_queue_metrics,omitempty" json:"collect_job_queue_metrics" ui:"group:Job Queues"`
61
+ CollectJobQueueMetrics confopt.AutoBool `yaml:"collect_job_queue_metrics,omitempty" json:"collect_job_queue_metrics" ui:"group:Job Queues"`
62
63
// CollectActiveJobs toggles collection of detailed per-job metrics.
64
- CollectActiveJobs framework.AutoBool `yaml:"collect_active_jobs,omitempty" json:"collect_active_jobs" ui:"group:Active Jobs"`
64
+ CollectActiveJobs confopt.AutoBool `yaml:"collect_active_jobs,omitempty" json:"collect_active_jobs" ui:"group:Active Jobs"`
65
66
// CollectHTTPServerMetrics toggles collection of IBM HTTP Server statistics.
67
- CollectHTTPServerMetrics framework.AutoBool `yaml:"collect_http_server_metrics,omitempty" json:"collect_http_server_metrics" ui:"group:Other Metrics"`
67
+ CollectHTTPServerMetrics confopt.AutoBool `yaml:"collect_http_server_metrics,omitempty" json:"collect_http_server_metrics" ui:"group:Other Metrics"`
68
69
// CollectMessageQueueMetrics toggles collection of IBM i message queue metrics.
70
- CollectMessageQueueMetrics framework.AutoBool `yaml:"collect_message_queue_metrics,omitempty" json:"collect_message_queue_metrics" ui:"group:Message Queues"`
70
+ CollectMessageQueueMetrics confopt.AutoBool `yaml:"collect_message_queue_metrics,omitempty" json:"collect_message_queue_metrics" ui:"group:Message Queues"`
71
72
// CollectOutputQueueMetrics toggles collection of IBM i output queue metrics.
73
- CollectOutputQueueMetrics framework.AutoBool `yaml:"collect_output_queue_metrics,omitempty" json:"collect_output_queue_metrics" ui:"group:Output Queues"`
73
+ CollectOutputQueueMetrics confopt.AutoBool `yaml:"collect_output_queue_metrics,omitempty" json:"collect_output_queue_metrics" ui:"group:Output Queues"`
74
75
// CollectPlanCacheMetrics toggles collection of plan cache analysis metrics.
76
- CollectPlanCacheMetrics framework.AutoBool `yaml:"collect_plan_cache_metrics,omitempty" json:"collect_plan_cache_metrics" ui:"group:Other Metrics"`
76
+ CollectPlanCacheMetrics confopt.AutoBool `yaml:"collect_plan_cache_metrics,omitempty" json:"collect_plan_cache_metrics" ui:"group:Other Metrics"`
77
78
// MaxDisks caps how many disk units may be charted.
79
MaxDisks int `yaml:"max_disks,omitempty" json:"max_disks" ui:"group:Disks"`
src/go/plugin/ibm.d/modules/as400/groups.go
+6
-6
@@ -8,7 +8,7 @@ package as400
8
import (
9
"context"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
)
13
14
type collectionGroup interface {
@@ -148,7 +148,7 @@ func (g *messageQueueGroup) Collect(ctx context.Context) error {
148
if err := g.c.collectMessageQueues(ctx); err != nil {
149
if isSQLFeatureError(err) {
150
g.c.Warningf("message queue metrics not available on this IBM i version: %v", err)
151
- g.c.CollectMessageQueueMetrics = framework.AutoBoolDisabled
151
+ g.c.CollectMessageQueueMetrics = confopt.AutoBoolDisabled
152
return nil
153
}
154
if isSQLTemporaryError(err) {
@@ -176,7 +176,7 @@ func (g *outputQueueGroup) Collect(ctx context.Context) error {
176
if err := g.c.collectOutputQueues(ctx); err != nil {
177
if isSQLFeatureError(err) {
178
g.c.Warningf("output queue metrics not available on this IBM i version: %v", err)
179
- g.c.CollectOutputQueueMetrics = framework.AutoBoolDisabled
179
+ g.c.CollectOutputQueueMetrics = confopt.AutoBoolDisabled
180
return nil
181
}
182
if isSQLTemporaryError(err) {
@@ -230,7 +230,7 @@ func (g *activeJobGroup) Collect(ctx context.Context) error {
230
if err := g.c.collectActiveJobs(ctx); err != nil {
231
if isSQLFeatureError(err) {
232
g.c.Warningf("active job metrics not available on this IBM i version: %v", err)
233
- g.c.CollectActiveJobs = framework.AutoBoolDisabled
233
+ g.c.CollectActiveJobs = confopt.AutoBoolDisabled
234
return nil
235
}
236
g.c.Errorf("failed to collect active jobs: %v", err)
@@ -294,7 +294,7 @@ func (g *httpServerGroup) Collect(ctx context.Context) error {
294
if err := g.c.collectHTTPServerInfo(ctx); err != nil {
295
if isSQLFeatureError(err) {
296
g.c.Warningf("HTTP server metrics not available on this IBM i version: %v", err)
297
- g.c.CollectHTTPServerMetrics = framework.AutoBoolDisabled
297
+ g.c.CollectHTTPServerMetrics = confopt.AutoBoolDisabled
298
return nil
299
}
300
if isSQLTemporaryError(err) {
@@ -322,7 +322,7 @@ func (g *planCacheGroup) Collect(ctx context.Context) error {
322
if err := g.c.collectPlanCache(ctx); err != nil {
323
if isSQLFeatureError(err) {
324
g.c.Warningf("plan cache analysis not available or requires additional authority: %v", err)
325
- g.c.CollectPlanCacheMetrics = framework.AutoBoolDisabled
325
+ g.c.CollectPlanCacheMetrics = confopt.AutoBoolDisabled
326
return nil
327
}
328
if isSQLTemporaryError(err) {
src/go/plugin/ibm.d/modules/as400/init.go
+9
-9
@@ -10,8 +10,8 @@ import (
10
"fmt"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/pkg/matcher"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
16
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/as400/contexts"
17
as400proto "github.com/netdata/netdata/go/plugins/plugin/ibm.d/protocols/as400"
@@ -38,14 +38,14 @@ func defaultConfig() Config {
38
UseSSL: false,
39
ResetStatistics: false,
40
41
- CollectDiskMetrics: framework.AutoBoolAuto,
42
- CollectSubsystemMetrics: framework.AutoBoolAuto,
43
- CollectJobQueueMetrics: framework.AutoBoolAuto,
44
- CollectActiveJobs: framework.AutoBoolAuto,
45
- CollectHTTPServerMetrics: framework.AutoBoolAuto,
46
- CollectMessageQueueMetrics: framework.AutoBoolAuto,
47
- CollectOutputQueueMetrics: framework.AutoBoolAuto,
48
- CollectPlanCacheMetrics: framework.AutoBoolAuto,
41
+ CollectDiskMetrics: confopt.AutoBoolAuto,
42
+ CollectSubsystemMetrics: confopt.AutoBoolAuto,
43
+ CollectJobQueueMetrics: confopt.AutoBoolAuto,
44
+ CollectActiveJobs: confopt.AutoBoolAuto,
45
+ CollectHTTPServerMetrics: confopt.AutoBoolAuto,
46
+ CollectMessageQueueMetrics: confopt.AutoBoolAuto,
47
+ CollectOutputQueueMetrics: confopt.AutoBoolAuto,
48
+ CollectPlanCacheMetrics: confopt.AutoBoolAuto,
49
50
MaxDisks: 100,
51
MaxSubsystems: 100,
src/go/plugin/ibm.d/modules/db2/collect.go
+1
-1
@@ -13,7 +13,7 @@ import (
13
"strings"
14
"time"
15
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
16
+ "github.com/netdata/netdata/go/plugins/pkg/stm"
17
)
18
19
const Precision = 1000 // Precision multiplier for floating-point values
src/go/plugin/ibm.d/modules/db2/config.go
+8
-8
@@ -1,7 +1,7 @@
1
package db2
2
3
import (
4
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
4
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
5
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
6
)
7
@@ -25,25 +25,25 @@ type Config struct {
25
MaxDbLifeTime confopt.Duration `yaml:"max_db_life_time,omitempty" json:"max_db_life_time" ui:"group:Advanced"`
26
27
// CollectDatabaseMetrics toggles high-level database status metrics.
28
- CollectDatabaseMetrics framework.AutoBool `yaml:"collect_database_metrics,omitempty" json:"collect_database_metrics" ui:"group:Databases"`
28
+ CollectDatabaseMetrics confopt.AutoBool `yaml:"collect_database_metrics,omitempty" json:"collect_database_metrics" ui:"group:Databases"`
29
30
// CollectBufferpoolMetrics toggles buffer pool efficiency metrics.
31
- CollectBufferpoolMetrics framework.AutoBool `yaml:"collect_bufferpool_metrics,omitempty" json:"collect_bufferpool_metrics" ui:"group:Buffer Pools"`
31
+ CollectBufferpoolMetrics confopt.AutoBool `yaml:"collect_bufferpool_metrics,omitempty" json:"collect_bufferpool_metrics" ui:"group:Buffer Pools"`
32
33
// CollectTablespaceMetrics toggles tablespace capacity metrics.
34
- CollectTablespaceMetrics framework.AutoBool `yaml:"collect_tablespace_metrics,omitempty" json:"collect_tablespace_metrics" ui:"group:Tablespaces"`
34
+ CollectTablespaceMetrics confopt.AutoBool `yaml:"collect_tablespace_metrics,omitempty" json:"collect_tablespace_metrics" ui:"group:Tablespaces"`
35
36
// CollectConnectionMetrics toggles per-connection activity metrics.
37
- CollectConnectionMetrics framework.AutoBool `yaml:"collect_connection_metrics,omitempty" json:"collect_connection_metrics" ui:"group:Connections Monitoring"`
37
+ CollectConnectionMetrics confopt.AutoBool `yaml:"collect_connection_metrics,omitempty" json:"collect_connection_metrics" ui:"group:Connections Monitoring"`
38
39
// CollectLockMetrics toggles lock contention metrics.
40
- CollectLockMetrics framework.AutoBool `yaml:"collect_lock_metrics,omitempty" json:"collect_lock_metrics" ui:"group:Other Metrics"`
40
+ CollectLockMetrics confopt.AutoBool `yaml:"collect_lock_metrics,omitempty" json:"collect_lock_metrics" ui:"group:Other Metrics"`
41
42
// CollectTableMetrics toggles table-level size and row metrics.
43
- CollectTableMetrics framework.AutoBool `yaml:"collect_table_metrics,omitempty" json:"collect_table_metrics" ui:"group:Tables"`
43
+ CollectTableMetrics confopt.AutoBool `yaml:"collect_table_metrics,omitempty" json:"collect_table_metrics" ui:"group:Tables"`
44
45
// CollectIndexMetrics toggles index usage metrics.
46
- CollectIndexMetrics framework.AutoBool `yaml:"collect_index_metrics,omitempty" json:"collect_index_metrics" ui:"group:Indexes"`
46
+ CollectIndexMetrics confopt.AutoBool `yaml:"collect_index_metrics,omitempty" json:"collect_index_metrics" ui:"group:Indexes"`
47
48
// MaxDatabases caps the number of databases charted.
49
MaxDatabases int `yaml:"max_databases,omitempty" json:"max_databases" ui:"group:Databases"`
src/go/plugin/ibm.d/modules/db2/helpers.go
+8
-8
@@ -11,7 +11,7 @@ import (
11
"strings"
12
"time"
13
14
- "github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
14
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
15
)
16
17
func safeDSN(dsn string) string {
@@ -203,43 +203,43 @@ func (c *Collector) parseDB2Version() {
203
func (c *Collector) setConfigurationDefaults() {
204
if c.CollectDatabaseMetrics.IsAuto() {
205
defaultValue := c.edition == "LUW" || c.edition == "Cloud"
206
- c.CollectDatabaseMetrics = framework.AutoBoolFromBool(defaultValue)
206
+ c.CollectDatabaseMetrics = confopt.AutoBoolFromBool(defaultValue)
207
c.Debugf("CollectDatabaseMetrics not configured, defaulting to %v (edition: %s)", defaultValue, c.edition)
208
}
209
210
if c.CollectBufferpoolMetrics.IsAuto() {
211
defaultValue := c.edition != "i"
212
- c.CollectBufferpoolMetrics = framework.AutoBoolFromBool(defaultValue)
212
+ c.CollectBufferpoolMetrics = confopt.AutoBoolFromBool(defaultValue)
213
c.Debugf("CollectBufferpoolMetrics not configured, defaulting to %v (edition: %s)", defaultValue, c.edition)
214
}
215
216
if c.CollectTablespaceMetrics.IsAuto() {
217
defaultValue := true
218
- c.CollectTablespaceMetrics = framework.AutoBoolFromBool(defaultValue)
218
+ c.CollectTablespaceMetrics = confopt.AutoBoolFromBool(defaultValue)
219
c.Debugf("CollectTablespaceMetrics not configured, defaulting to %v", defaultValue)
220
}
221
222
if c.CollectConnectionMetrics.IsAuto() {
223
defaultValue := c.edition == "LUW" || (c.edition == "Cloud" && !c.isDisabled("connection_instances"))
224
- c.CollectConnectionMetrics = framework.AutoBoolFromBool(defaultValue)
224
+ c.CollectConnectionMetrics = confopt.AutoBoolFromBool(defaultValue)
225
c.Debugf("CollectConnectionMetrics not configured, defaulting to %v (edition: %s)", defaultValue, c.edition)
226
}
227
228
if c.CollectLockMetrics.IsAuto() {
229
defaultValue := true
230
- c.CollectLockMetrics = framework.AutoBoolFromBool(defaultValue)
230
+ c.CollectLockMetrics = confopt.AutoBoolFromBool(defaultValue)
231
c.Debugf("CollectLockMetrics not configured, defaulting to %v", defaultValue)
232
}
233
234
if c.CollectTableMetrics.IsAuto() {
235
defaultValue := false
236
- c.CollectTableMetrics = framework.AutoBoolFromBool(defaultValue)
236
+ c.CollectTableMetrics = confopt.AutoBoolFromBool(defaultValue)
237
c.Debugf("CollectTableMetrics not configured, defaulting to %v", defaultValue)
238
}
239
240
if c.CollectIndexMetrics.IsAuto() {
241
defaultValue := false
242
- c.CollectIndexMetrics = framework.AutoBoolFromBool(defaultValue)
242
+ c.CollectIndexMetrics = confopt.AutoBoolFromBool(defaultValue)
243
c.Debugf("CollectIndexMetrics not configured, defaulting to %v", defaultValue)
244
}
245
src/go/plugin/ibm.d/modules/db2/init.go
+8
-8
@@ -10,8 +10,8 @@ import (
10
"fmt"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
14
"github.com/netdata/netdata/go/plugins/pkg/matcher"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
15
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
16
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/db2/contexts"
17
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/pkg/dbdriver"
@@ -29,13 +29,13 @@ func defaultConfig() Config {
29
MaxDbConns: 1,
30
MaxDbLifeTime: confopt.Duration(10 * time.Minute),
31
32
- CollectDatabaseMetrics: framework.AutoBoolAuto,
33
- CollectBufferpoolMetrics: framework.AutoBoolAuto,
34
- CollectTablespaceMetrics: framework.AutoBoolAuto,
35
- CollectConnectionMetrics: framework.AutoBoolAuto,
36
- CollectLockMetrics: framework.AutoBoolAuto,
37
- CollectTableMetrics: framework.AutoBoolAuto,
38
- CollectIndexMetrics: framework.AutoBoolAuto,
32
+ CollectDatabaseMetrics: confopt.AutoBoolAuto,
33
+ CollectBufferpoolMetrics: confopt.AutoBoolAuto,
34
+ CollectTablespaceMetrics: confopt.AutoBoolAuto,
35
+ CollectConnectionMetrics: confopt.AutoBoolAuto,
36
+ CollectLockMetrics: confopt.AutoBoolAuto,
37
+ CollectTableMetrics: confopt.AutoBoolAuto,
38
+ CollectIndexMetrics: confopt.AutoBoolAuto,
39
40
CollectMemoryMetrics: true,
41
CollectWaitMetrics: true,
src/go/plugin/ibm.d/modules/websphere/jmx/collector_test.go
+15
-15
@@ -7,7 +7,7 @@ import (
7
"context"
8
"testing"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
10
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
11
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/websphere/common"
12
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/websphere/jmx/contexts"
13
jmxproto "github.com/netdata/netdata/go/plugins/plugin/ibm.d/protocols/websphere/jmx"
@@ -139,7 +139,7 @@ func TestCollectorCollectOnceExportsJVMMetrics(t *testing.T) {
139
}
140
141
collector := newTestCollector(t, client)
142
- collector.Config.CollectThreadPoolMetrics = framework.AutoBoolDisabled
142
+ collector.Config.CollectThreadPoolMetrics = confopt.AutoBoolDisabled
143
144
metrics := collector.Collect(context.Background())
145
@@ -221,7 +221,7 @@ func TestCollectorCollectsJDBCPools(t *testing.T) {
221
}
222
223
collector := newTestCollector(t, client)
224
- collector.Config.CollectThreadPoolMetrics = framework.AutoBoolDisabled
224
+ collector.Config.CollectThreadPoolMetrics = confopt.AutoBoolDisabled
225
226
metrics := collector.Collect(context.Background())
227
@@ -261,8 +261,8 @@ func TestCollectorCollectsJMSDestinations(t *testing.T) {
261
}
262
263
collector := newTestCollector(t, client)
264
- collector.Config.CollectThreadPoolMetrics = framework.AutoBoolDisabled
265
- collector.Config.CollectJDBCMetrics = framework.AutoBoolDisabled
264
+ collector.Config.CollectThreadPoolMetrics = confopt.AutoBoolDisabled
265
+ collector.Config.CollectJDBCMetrics = confopt.AutoBoolDisabled
266
267
metrics := collector.Collect(context.Background())
268
@@ -302,12 +302,12 @@ func TestCollectorCollectsApplications(t *testing.T) {
302
}
303
304
collector := newTestCollector(t, client)
305
- collector.Config.CollectThreadPoolMetrics = framework.AutoBoolDisabled
306
- collector.Config.CollectJDBCMetrics = framework.AutoBoolDisabled
307
- collector.Config.CollectJMSMetrics = framework.AutoBoolDisabled
308
- collector.Config.CollectWebAppMetrics = framework.AutoBoolEnabled
309
- collector.Config.CollectSessionMetrics = framework.AutoBoolEnabled
310
- collector.Config.CollectTransactionMetrics = framework.AutoBoolEnabled
305
+ collector.Config.CollectThreadPoolMetrics = confopt.AutoBoolDisabled
306
+ collector.Config.CollectJDBCMetrics = confopt.AutoBoolDisabled
307
+ collector.Config.CollectJMSMetrics = confopt.AutoBoolDisabled
308
+ collector.Config.CollectWebAppMetrics = confopt.AutoBoolEnabled
309
+ collector.Config.CollectSessionMetrics = confopt.AutoBoolEnabled
310
+ collector.Config.CollectTransactionMetrics = confopt.AutoBoolEnabled
311
312
metrics := collector.Collect(context.Background())
313
@@ -349,10 +349,10 @@ func TestCollectorCollectsJCAPools(t *testing.T) {
349
}
350
351
collector := newTestCollector(t, client)
352
- collector.Config.CollectThreadPoolMetrics = framework.AutoBoolDisabled
353
- collector.Config.CollectJDBCMetrics = framework.AutoBoolDisabled
354
- collector.Config.CollectJMSMetrics = framework.AutoBoolDisabled
355
- collector.Config.CollectWebAppMetrics = framework.AutoBoolDisabled
352
+ collector.Config.CollectThreadPoolMetrics = confopt.AutoBoolDisabled
353
+ collector.Config.CollectJDBCMetrics = confopt.AutoBoolDisabled
354
+ collector.Config.CollectJMSMetrics = confopt.AutoBoolDisabled
355
+ collector.Config.CollectWebAppMetrics = confopt.AutoBoolDisabled
356
357
metrics := collector.Collect(context.Background())
358
src/go/plugin/ibm.d/modules/websphere/jmx/config.go
+13
-13
@@ -3,7 +3,7 @@ package jmx
3
import (
4
"time"
5
6
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
6
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
7
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
8
)
9
@@ -40,18 +40,18 @@ type Config struct {
40
CustomLabels map[string]string `yaml:"custom_labels,omitempty" json:"custom_labels" ui:"group:Identity"`
41
42
// Metric toggles
43
- CollectJVMMetrics framework.AutoBool `yaml:"collect_jvm_metrics" json:"collect_jvm_metrics" ui:"group:Other Metrics"`
44
- CollectThreadPoolMetrics framework.AutoBool `yaml:"collect_threadpool_metrics" json:"collect_threadpool_metrics" ui:"group:Thread Pools"`
45
- CollectJDBCMetrics framework.AutoBool `yaml:"collect_jdbc_metrics" json:"collect_jdbc_metrics" ui:"group:JDBC"`
46
- CollectJCAMetrics framework.AutoBool `yaml:"collect_jca_metrics" json:"collect_jca_metrics" ui:"group:JCA"`
47
- CollectJMSMetrics framework.AutoBool `yaml:"collect_jms_metrics" json:"collect_jms_metrics" ui:"group:JMS"`
48
- CollectWebAppMetrics framework.AutoBool `yaml:"collect_webapp_metrics" json:"collect_webapp_metrics" ui:"group:Applications"`
49
- CollectSessionMetrics framework.AutoBool `yaml:"collect_session_metrics" json:"collect_session_metrics" ui:"group:Other Metrics"`
50
- CollectTransactionMetrics framework.AutoBool `yaml:"collect_transaction_metrics" json:"collect_transaction_metrics" ui:"group:Other Metrics"`
51
- CollectClusterMetrics framework.AutoBool `yaml:"collect_cluster_metrics" json:"collect_cluster_metrics" ui:"group:Other Metrics"`
52
- CollectServletMetrics framework.AutoBool `yaml:"collect_servlet_metrics" json:"collect_servlet_metrics" ui:"group:Servlets"`
53
- CollectEJBMetrics framework.AutoBool `yaml:"collect_ejb_metrics" json:"collect_ejb_metrics" ui:"group:EJBs"`
54
- CollectJDBCAdvanced framework.AutoBool `yaml:"collect_jdbc_advanced" json:"collect_jdbc_advanced" ui:"group:JDBC"`
43
+ CollectJVMMetrics confopt.AutoBool `yaml:"collect_jvm_metrics" json:"collect_jvm_metrics" ui:"group:Other Metrics"`
44
+ CollectThreadPoolMetrics confopt.AutoBool `yaml:"collect_threadpool_metrics" json:"collect_threadpool_metrics" ui:"group:Thread Pools"`
45
+ CollectJDBCMetrics confopt.AutoBool `yaml:"collect_jdbc_metrics" json:"collect_jdbc_metrics" ui:"group:JDBC"`
46
+ CollectJCAMetrics confopt.AutoBool `yaml:"collect_jca_metrics" json:"collect_jca_metrics" ui:"group:JCA"`
47
+ CollectJMSMetrics confopt.AutoBool `yaml:"collect_jms_metrics" json:"collect_jms_metrics" ui:"group:JMS"`
48
+ CollectWebAppMetrics confopt.AutoBool `yaml:"collect_webapp_metrics" json:"collect_webapp_metrics" ui:"group:Applications"`
49
+ CollectSessionMetrics confopt.AutoBool `yaml:"collect_session_metrics" json:"collect_session_metrics" ui:"group:Other Metrics"`
50
+ CollectTransactionMetrics confopt.AutoBool `yaml:"collect_transaction_metrics" json:"collect_transaction_metrics" ui:"group:Other Metrics"`
51
+ CollectClusterMetrics confopt.AutoBool `yaml:"collect_cluster_metrics" json:"collect_cluster_metrics" ui:"group:Other Metrics"`
52
+ CollectServletMetrics confopt.AutoBool `yaml:"collect_servlet_metrics" json:"collect_servlet_metrics" ui:"group:Servlets"`
53
+ CollectEJBMetrics confopt.AutoBool `yaml:"collect_ejb_metrics" json:"collect_ejb_metrics" ui:"group:EJBs"`
54
+ CollectJDBCAdvanced confopt.AutoBool `yaml:"collect_jdbc_advanced" json:"collect_jdbc_advanced" ui:"group:JDBC"`
55
56
// Cardinality guards
57
MaxThreadPools int `yaml:"max_threadpools,omitempty" json:"max_threadpools" ui:"group:Thread Pools"`
src/go/plugin/ibm.d/modules/websphere/jmx/init.go
+13
-13
@@ -8,8 +8,8 @@ import (
8
"fmt"
9
"time"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/pkg/matcher"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
14
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/websphere/common"
15
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/websphere/jmx/contexts"
@@ -41,18 +41,18 @@ func defaultConfig() Config {
41
ServerType: "",
42
CustomLabels: map[string]string{},
43
44
- CollectJVMMetrics: framework.AutoBoolEnabled,
45
- CollectThreadPoolMetrics: framework.AutoBoolEnabled,
46
- CollectJDBCMetrics: framework.AutoBoolEnabled,
47
- CollectJCAMetrics: framework.AutoBoolEnabled,
48
- CollectJMSMetrics: framework.AutoBoolEnabled,
49
- CollectWebAppMetrics: framework.AutoBoolEnabled,
50
- CollectSessionMetrics: framework.AutoBoolEnabled,
51
- CollectTransactionMetrics: framework.AutoBoolEnabled,
52
- CollectClusterMetrics: framework.AutoBoolEnabled,
53
- CollectServletMetrics: framework.AutoBoolEnabled,
54
- CollectEJBMetrics: framework.AutoBoolEnabled,
55
- CollectJDBCAdvanced: framework.AutoBoolDisabled,
44
+ CollectJVMMetrics: confopt.AutoBoolEnabled,
45
+ CollectThreadPoolMetrics: confopt.AutoBoolEnabled,
46
+ CollectJDBCMetrics: confopt.AutoBoolEnabled,
47
+ CollectJCAMetrics: confopt.AutoBoolEnabled,
48
+ CollectJMSMetrics: confopt.AutoBoolEnabled,
49
+ CollectWebAppMetrics: confopt.AutoBoolEnabled,
50
+ CollectSessionMetrics: confopt.AutoBoolEnabled,
51
+ CollectTransactionMetrics: confopt.AutoBoolEnabled,
52
+ CollectClusterMetrics: confopt.AutoBoolEnabled,
53
+ CollectServletMetrics: confopt.AutoBoolEnabled,
54
+ CollectEJBMetrics: confopt.AutoBoolEnabled,
55
+ CollectJDBCAdvanced: confopt.AutoBoolDisabled,
56
57
MaxThreadPools: 50,
58
MaxJDBCPools: 50,
src/go/plugin/ibm.d/modules/websphere/mp/collector.go
+1
-1
@@ -11,7 +11,7 @@ import (
11
"sync"
12
13
"github.com/netdata/netdata/go/plugins/pkg/matcher"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
14
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
15
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
16
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/websphere/common"
17
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/websphere/mp/contexts"
src/go/plugin/ibm.d/modules/websphere/mp/config.go
+4
-3
@@ -3,7 +3,8 @@ package mp
3
import (
4
"time"
5
6
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
6
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
7
+ "github.com/netdata/netdata/go/plugins/pkg/web"
8
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
9
)
10
@@ -28,9 +29,9 @@ type Config struct {
29
MetricsEndpoint string `yaml:"metrics_endpoint,omitempty" json:"metrics_endpoint" ui:"group:Connection"`
30
31
// CollectJVMMetrics toggles JVM/base scope metrics scraped from the MicroProfile endpoint.
31
- CollectJVMMetrics framework.AutoBool `yaml:"collect_jvm_metrics" json:"collect_jvm_metrics" ui:"group:Other Metrics"`
32
+ CollectJVMMetrics confopt.AutoBool `yaml:"collect_jvm_metrics" json:"collect_jvm_metrics" ui:"group:Other Metrics"`
33
// CollectRESTMetrics toggles per-endpoint REST/JAX-RS metrics (may introduce cardinality).
33
- CollectRESTMetrics framework.AutoBool `yaml:"collect_rest_metrics" json:"collect_rest_metrics" ui:"group:REST Endpoints"`
34
+ CollectRESTMetrics confopt.AutoBool `yaml:"collect_rest_metrics" json:"collect_rest_metrics" ui:"group:REST Endpoints"`
35
36
// MaxRESTEndpoints limits how many REST endpoints are exported when REST metrics are enabled (0 disables the limit).
37
MaxRESTEndpoints int `yaml:"max_rest_endpoints,omitempty" json:"max_rest_endpoints" ui:"group:REST Endpoints"`
src/go/plugin/ibm.d/modules/websphere/mp/init.go
+4
-4
@@ -8,9 +8,9 @@ import (
8
"fmt"
9
"strings"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
12
"github.com/netdata/netdata/go/plugins/pkg/matcher"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
13
+ "github.com/netdata/netdata/go/plugins/pkg/web"
14
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
15
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/websphere/common"
16
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/websphere/mp/contexts"
@@ -28,8 +28,8 @@ func defaultConfig() Config {
28
NodeName: "",
29
ServerName: "",
30
MetricsEndpoint: "/metrics",
31
- CollectJVMMetrics: framework.AutoBoolEnabled,
32
- CollectRESTMetrics: framework.AutoBoolEnabled,
31
+ CollectJVMMetrics: confopt.AutoBoolEnabled,
32
+ CollectRESTMetrics: confopt.AutoBoolEnabled,
33
MaxRESTEndpoints: 50,
34
CollectRESTMatching: "",
35
HTTPConfig: web.HTTPConfig{
src/go/plugin/ibm.d/modules/websphere/pmi/collector_coverage_test.go
+12
-12
@@ -9,8 +9,8 @@ import (
9
"path/filepath"
10
"testing"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/pkg/matcher"
13
- "github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
14
pmiproto "github.com/netdata/netdata/go/plugins/plugin/ibm.d/protocols/websphere/pmi"
15
)
16
@@ -25,17 +25,17 @@ func TestPMICollectorCoverageActivatedSamples(t *testing.T) {
25
snapshot := loadPMISnapshot(t, sample)
26
27
agg := newAggregator(Config{
28
- CollectJVMMetrics: framework.AutoBoolEnabled,
29
- CollectThreadPoolMetrics: framework.AutoBoolEnabled,
30
- CollectJDBCMetrics: framework.AutoBoolEnabled,
31
- CollectJCAMetrics: framework.AutoBoolEnabled,
32
- CollectJMSMetrics: framework.AutoBoolEnabled,
33
- CollectWebAppMetrics: framework.AutoBoolEnabled,
34
- CollectSessionMetrics: framework.AutoBoolEnabled,
35
- CollectTransactionMetrics: framework.AutoBoolEnabled,
36
- CollectServletMetrics: framework.AutoBoolEnabled,
37
- CollectEJBMetrics: framework.AutoBoolEnabled,
38
- CollectJDBCAdvanced: framework.AutoBoolEnabled,
28
+ CollectJVMMetrics: confopt.AutoBoolEnabled,
29
+ CollectThreadPoolMetrics: confopt.AutoBoolEnabled,
30
+ CollectJDBCMetrics: confopt.AutoBoolEnabled,
31
+ CollectJCAMetrics: confopt.AutoBoolEnabled,
32
+ CollectJMSMetrics: confopt.AutoBoolEnabled,
33
+ CollectWebAppMetrics: confopt.AutoBoolEnabled,
34
+ CollectSessionMetrics: confopt.AutoBoolEnabled,
35
+ CollectTransactionMetrics: confopt.AutoBoolEnabled,
36
+ CollectServletMetrics: confopt.AutoBoolEnabled,
37
+ CollectEJBMetrics: confopt.AutoBoolEnabled,
38
+ CollectJDBCAdvanced: confopt.AutoBoolEnabled,
39
MaxThreadPools: 0,
40
MaxJDBCPools: 0,
41
MaxJCAPools: 0,
src/go/plugin/ibm.d/modules/websphere/pmi/config.go
+14
-13
@@ -1,7 +1,8 @@
1
package pmi
2
3
import (
4
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
4
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
5
+ "github.com/netdata/netdata/go/plugins/pkg/web"
6
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
7
)
8
@@ -40,40 +41,40 @@ type Config struct {
41
CustomLabels map[string]string `yaml:"custom_labels,omitempty" json:"custom_labels" ui:"group:Identity"`
42
43
// CollectJVMMetrics toggles JVM runtime metrics; defaults to enabled when unset.
43
- CollectJVMMetrics framework.AutoBool `yaml:"collect_jvm_metrics,omitempty" json:"collect_jvm_metrics" ui:"group:Other Metrics"`
44
+ CollectJVMMetrics confopt.AutoBool `yaml:"collect_jvm_metrics,omitempty" json:"collect_jvm_metrics" ui:"group:Other Metrics"`
45
46
// CollectThreadPoolMetrics toggles thread-pool metrics; defaults to enabled when unset.
46
- CollectThreadPoolMetrics framework.AutoBool `yaml:"collect_threadpool_metrics,omitempty" json:"collect_threadpool_metrics" ui:"group:Thread Pools"`
47
+ CollectThreadPoolMetrics confopt.AutoBool `yaml:"collect_threadpool_metrics,omitempty" json:"collect_threadpool_metrics" ui:"group:Thread Pools"`
48
49
// CollectJDBCMetrics toggles JDBC connection-pool metrics; defaults to enabled when unset.
49
- CollectJDBCMetrics framework.AutoBool `yaml:"collect_jdbc_metrics,omitempty" json:"collect_jdbc_metrics" ui:"group:JDBC"`
50
+ CollectJDBCMetrics confopt.AutoBool `yaml:"collect_jdbc_metrics,omitempty" json:"collect_jdbc_metrics" ui:"group:JDBC"`
51
52
// CollectJCAMetrics toggles JCA resource-adapter metrics; defaults to enabled when unset.
52
- CollectJCAMetrics framework.AutoBool `yaml:"collect_jca_metrics,omitempty" json:"collect_jca_metrics" ui:"group:JCA"`
53
+ CollectJCAMetrics confopt.AutoBool `yaml:"collect_jca_metrics,omitempty" json:"collect_jca_metrics" ui:"group:JCA"`
54
55
// CollectJMSMetrics toggles JMS destination metrics; defaults to enabled when unset.
55
- CollectJMSMetrics framework.AutoBool `yaml:"collect_jms_metrics,omitempty" json:"collect_jms_metrics" ui:"group:JMS"`
56
+ CollectJMSMetrics confopt.AutoBool `yaml:"collect_jms_metrics,omitempty" json:"collect_jms_metrics" ui:"group:JMS"`
57
58
// CollectWebAppMetrics toggles Web application metrics (includes servlet/session data); defaults to enabled when unset.
58
- CollectWebAppMetrics framework.AutoBool `yaml:"collect_webapp_metrics,omitempty" json:"collect_webapp_metrics" ui:"group:Applications"`
59
+ CollectWebAppMetrics confopt.AutoBool `yaml:"collect_webapp_metrics,omitempty" json:"collect_webapp_metrics" ui:"group:Applications"`
60
61
// CollectSessionMetrics toggles HTTP session manager metrics; defaults to enabled when unset.
61
- CollectSessionMetrics framework.AutoBool `yaml:"collect_session_metrics,omitempty" json:"collect_session_metrics" ui:"group:Other Metrics"`
62
+ CollectSessionMetrics confopt.AutoBool `yaml:"collect_session_metrics,omitempty" json:"collect_session_metrics" ui:"group:Other Metrics"`
63
64
// CollectTransactionMetrics toggles transaction manager metrics; defaults to enabled when unset.
64
- CollectTransactionMetrics framework.AutoBool `yaml:"collect_transaction_metrics,omitempty" json:"collect_transaction_metrics" ui:"group:Other Metrics"`
65
+ CollectTransactionMetrics confopt.AutoBool `yaml:"collect_transaction_metrics,omitempty" json:"collect_transaction_metrics" ui:"group:Other Metrics"`
66
67
// CollectClusterMetrics toggles cluster-level health metrics; defaults to enabled when unset.
67
- CollectClusterMetrics framework.AutoBool `yaml:"collect_cluster_metrics,omitempty" json:"collect_cluster_metrics" ui:"group:Other Metrics"`
68
+ CollectClusterMetrics confopt.AutoBool `yaml:"collect_cluster_metrics,omitempty" json:"collect_cluster_metrics" ui:"group:Other Metrics"`
69
70
// CollectServletMetrics enables servlet response-time metrics; defaults to enabled when unset (may add high-cardinality charts).
70
- CollectServletMetrics framework.AutoBool `yaml:"collect_servlet_metrics,omitempty" json:"collect_servlet_metrics" ui:"group:Servlets"`
71
+ CollectServletMetrics confopt.AutoBool `yaml:"collect_servlet_metrics,omitempty" json:"collect_servlet_metrics" ui:"group:Servlets"`
72
73
// CollectEJBMetrics enables Enterprise Java Bean workload metrics; defaults to enabled when unset.
73
- CollectEJBMetrics framework.AutoBool `yaml:"collect_ejb_metrics,omitempty" json:"collect_ejb_metrics" ui:"group:EJBs"`
74
+ CollectEJBMetrics confopt.AutoBool `yaml:"collect_ejb_metrics,omitempty" json:"collect_ejb_metrics" ui:"group:EJBs"`
75
76
// CollectJDBCAdvanced enables additional JDBC latency/timing statistics; defaults to disabled when unset.
76
- CollectJDBCAdvanced framework.AutoBool `yaml:"collect_jdbc_advanced,omitempty" json:"collect_jdbc_advanced" ui:"group:JDBC"`
77
+ CollectJDBCAdvanced confopt.AutoBool `yaml:"collect_jdbc_advanced,omitempty" json:"collect_jdbc_advanced" ui:"group:JDBC"`
78
79
// MaxThreadPools caps the number of thread pools charted per server (0 disables the limit).
80
MaxThreadPools int `yaml:"max_threadpools,omitempty" json:"max_threadpools" ui:"group:Thread Pools"`
src/go/plugin/ibm.d/modules/websphere/pmi/init.go
+14
-14
@@ -9,9 +9,9 @@ import (
9
"strings"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
13
"github.com/netdata/netdata/go/plugins/pkg/matcher"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
+ "github.com/netdata/netdata/go/plugins/pkg/web"
15
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/framework"
16
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/websphere/common"
17
"github.com/netdata/netdata/go/plugins/plugin/ibm.d/modules/websphere/pmi/contexts"
@@ -38,18 +38,18 @@ func defaultConfig() Config {
38
NodeName: "",
39
ServerType: "",
40
CustomLabels: map[string]string{},
41
- CollectJVMMetrics: framework.AutoBoolAuto,
42
- CollectThreadPoolMetrics: framework.AutoBoolAuto,
43
- CollectJDBCMetrics: framework.AutoBoolAuto,
44
- CollectJCAMetrics: framework.AutoBoolAuto,
45
- CollectJMSMetrics: framework.AutoBoolAuto,
46
- CollectWebAppMetrics: framework.AutoBoolAuto,
47
- CollectSessionMetrics: framework.AutoBoolAuto,
48
- CollectTransactionMetrics: framework.AutoBoolAuto,
49
- CollectClusterMetrics: framework.AutoBoolAuto,
50
- CollectServletMetrics: framework.AutoBoolAuto,
51
- CollectEJBMetrics: framework.AutoBoolAuto,
52
- CollectJDBCAdvanced: framework.AutoBoolAuto,
41
+ CollectJVMMetrics: confopt.AutoBoolAuto,
42
+ CollectThreadPoolMetrics: confopt.AutoBoolAuto,
43
+ CollectJDBCMetrics: confopt.AutoBoolAuto,
44
+ CollectJCAMetrics: confopt.AutoBoolAuto,
45
+ CollectJMSMetrics: confopt.AutoBoolAuto,
46
+ CollectWebAppMetrics: confopt.AutoBoolAuto,
47
+ CollectSessionMetrics: confopt.AutoBoolAuto,
48
+ CollectTransactionMetrics: confopt.AutoBoolAuto,
49
+ CollectClusterMetrics: confopt.AutoBoolAuto,
50
+ CollectServletMetrics: confopt.AutoBoolAuto,
51
+ CollectEJBMetrics: confopt.AutoBoolAuto,
52
+ CollectJDBCAdvanced: confopt.AutoBoolAuto,
53
MaxThreadPools: 50,
54
MaxJDBCPools: 50,
55
MaxJCAPools: 50,
src/go/plugin/ibm.d/protocols/openmetrics/client.go
+4
-4
@@ -14,10 +14,10 @@ import (
14
"strings"
15
"time"
16
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
18
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
19
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus/selector"
20
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
18
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
19
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus/selector"
20
+ "github.com/netdata/netdata/go/plugins/pkg/web"
21
)
22
23
const defaultAcceptHeader = "text/plain;version=0.0.4;q=1,*/*;q=0.1"
src/go/plugin/ibm.d/protocols/openmetrics/client_test.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"strings"
10
"testing"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
12
+ "github.com/netdata/netdata/go/plugins/pkg/web"
13
)
14
15
type roundTripFunc func(*http.Request) (*http.Response, error)
src/go/plugin/ibm.d/protocols/openmetrics/parser.go
+3
-2
@@ -4,10 +4,11 @@ import (
4
"fmt"
5
"io"
6
7
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus/selector"
7
promLabels "github.com/prometheus/prometheus/model/labels"
8
"github.com/prometheus/prometheus/model/textparse"
9
+
10
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus"
11
+ "github.com/netdata/netdata/go/plugins/pkg/prometheus/selector"
12
)
13
14
type seriesParser struct {
src/go/plugin/ibm.d/protocols/websphere/pmi/client.go
+2
-2
@@ -14,8 +14,8 @@ import (
14
"strings"
15
"time"
16
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
18
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
17
+ "github.com/netdata/netdata/go/plugins/pkg/confopt"
18
+ "github.com/netdata/netdata/go/plugins/pkg/web"
19
)
20
21
// Config captures the options required to communicate with the PerfServlet endpoint.