go.d move packages (#18580)
Ilya Mashchenko committed
Sep 18, 2024 at 19:55 UTC
f2e442ba8af973caf8987297de64a37118501e0a
83 files changed
+66
-64
src/go/cmd/godplugin/main.go
+1
-1
@@ -15,9 +15,9 @@ import (
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/executable"
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/cli"
20
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/multipath"
21
22
"github.com/jessevdk/go-flags"
23
"golang.org/x/net/http/httpproxy"
src/go/pkg/matcher/README.md
renamed
src/go/pkg/matcher/cache.go
renamed
src/go/pkg/matcher/cache_test.go
renamed
src/go/pkg/matcher/doc.go
renamed
src/go/pkg/matcher/doc_test.go
renamed
+3
-1
@@ -2,7 +2,9 @@
2
3
package matcher_test
4
5
-import "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
5
+import (
6
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
7
+)
8
9
func ExampleNew_string_format() {
10
// create a string matcher, which perform full text match
src/go/pkg/matcher/expr.go
renamed
src/go/pkg/matcher/expr_test.go
renamed
src/go/pkg/matcher/glob.go
renamed
+1
-1
@@ -14,7 +14,7 @@ type globMatcher string
14
15
var (
16
errBadGlobPattern = errors.New("bad glob pattern")
17
- erGlobPattern = regexp.MustCompile(`(?s)^(?:[*?]|\[\^?([^\\-\]]|\\.|.-.)+\]|\\.|[^\*\?\\\[])*$`)
17
+ erGlobPattern = regexp.MustCompile(`(?s)^(?:[*?]|\[\^?([^\\-\]]|\\.|.-.)+]|\\.|[^*?\\\[])*$`)
18
)
19
20
// NewGlobMatcher create a new matcher with glob format
src/go/pkg/matcher/glob_test.go
renamed
src/go/pkg/matcher/logical.go
renamed
src/go/pkg/matcher/logical_test.go
renamed
src/go/pkg/matcher/matcher.go
renamed
src/go/pkg/matcher/matcher_test.go
renamed
src/go/pkg/matcher/regexp.go
renamed
src/go/pkg/matcher/regexp_test.go
renamed
src/go/pkg/matcher/simple_patterns.go
renamed
src/go/pkg/matcher/simple_patterns_test.go
renamed
src/go/pkg/matcher/string.go
renamed
src/go/pkg/matcher/string_test.go
renamed
src/go/pkg/multipath/multipath.go
renamed
src/go/pkg/multipath/multipath_test.go
renamed
src/go/pkg/multipath/testdata/data1/test-empty.conf
renamed
src/go/pkg/multipath/testdata/data1/test.conf
renamed
src/go/pkg/multipath/testdata/data2/test-empty.conf
renamed
src/go/pkg/multipath/testdata/data2/test.conf
renamed
src/go/pkg/netdataapi/api.go
renamed
src/go/pkg/netdataapi/api_test.go
renamed
src/go/pkg/safewriter/writer.go
renamed
src/go/pkg/ticker/ticker.go
renamed
src/go/pkg/ticker/ticket_test.go
renamed
src/go/plugin/go.d/agent/agent.go
+3
-3
@@ -13,6 +13,9 @@ import (
13
"time"
14
15
"github.com/netdata/netdata/go/plugins/logger"
16
+ "github.com/netdata/netdata/go/plugins/pkg/multipath"
17
+ "github.com/netdata/netdata/go/plugins/pkg/netdataapi"
18
+ "github.com/netdata/netdata/go/plugins/pkg/safewriter"
19
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
20
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery"
21
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/filelock"
@@ -20,9 +23,6 @@ import (
23
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/functions"
24
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/jobmgr"
25
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
23
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/netdataapi"
24
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/safewriter"
25
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/multipath"
26
27
"github.com/mattn/go-isatty"
28
)
src/go/plugin/go.d/agent/agent_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"testing"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/safewriter"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/safewriter"
14
15
"github.com/stretchr/testify/assert"
16
)
src/go/plugin/go.d/agent/discovery/sd/conffile.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"os"
8
9
"github.com/netdata/netdata/go/plugins/logger"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/multipath"
10
+ "github.com/netdata/netdata/go/plugins/pkg/multipath"
11
)
12
13
type confFile struct {
src/go/plugin/go.d/agent/discovery/sd/pipeline/funcmap.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"strconv"
8
"text/template"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
10
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
11
12
"github.com/Masterminds/sprig/v3"
13
"github.com/bmatcuk/doublestar/v4"
src/go/plugin/go.d/agent/discovery/sd/sd.go
+1
-1
@@ -9,9 +9,9 @@ import (
9
"sync"
10
11
"github.com/netdata/netdata/go/plugins/logger"
12
+ "github.com/netdata/netdata/go/plugins/pkg/multipath"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/pipeline"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/multipath"
15
16
"gopkg.in/yaml.v2"
17
)
src/go/plugin/go.d/agent/functions/manager.go
+2
-2
@@ -13,8 +13,8 @@ import (
13
"time"
14
15
"github.com/netdata/netdata/go/plugins/logger"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/netdataapi"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/safewriter"
16
+ "github.com/netdata/netdata/go/plugins/pkg/netdataapi"
17
+ "github.com/netdata/netdata/go/plugins/pkg/safewriter"
18
)
19
20
func NewManager() *Manager {
src/go/plugin/go.d/agent/jobmgr/manager.go
+3
-3
@@ -12,12 +12,12 @@ import (
12
"time"
13
14
"github.com/netdata/netdata/go/plugins/logger"
15
+ "github.com/netdata/netdata/go/plugins/pkg/netdataapi"
16
+ "github.com/netdata/netdata/go/plugins/pkg/safewriter"
17
+ "github.com/netdata/netdata/go/plugins/pkg/ticker"
18
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
19
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/functions"
20
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
18
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/netdataapi"
19
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/safewriter"
20
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/ticker"
21
22
"github.com/mattn/go-isatty"
23
"gopkg.in/yaml.v2"
src/go/plugin/go.d/agent/jobmgr/sim_test.go
+2
-2
@@ -10,10 +10,10 @@ import (
10
"testing"
11
"time"
12
13
+ "github.com/netdata/netdata/go/plugins/pkg/netdataapi"
14
+ "github.com/netdata/netdata/go/plugins/pkg/safewriter"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
16
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/netdataapi"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/safewriter"
17
18
"github.com/stretchr/testify/assert"
19
"github.com/stretchr/testify/require"
src/go/plugin/go.d/agent/module/job.go
+1
-1
@@ -16,7 +16,7 @@ import (
16
"time"
17
18
"github.com/netdata/netdata/go/plugins/logger"
19
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/netdataapi"
19
+ "github.com/netdata/netdata/go/plugins/pkg/netdataapi"
20
)
21
22
var obsoleteLock = &sync.Mutex{}
src/go/plugin/go.d/examples/simple/main.go
+3
-3
@@ -10,13 +10,13 @@ import (
10
"os"
11
"path"
12
13
+ "github.com/jessevdk/go-flags"
14
+
15
"github.com/netdata/netdata/go/plugins/logger"
16
+ "github.com/netdata/netdata/go/plugins/pkg/multipath"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent"
18
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
19
"github.com/netdata/netdata/go/plugins/plugin/go.d/cli"
17
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/multipath"
18
-
19
- "github.com/jessevdk/go-flags"
20
)
21
22
var version = "v0.0.1-example"
src/go/plugin/go.d/modules/activemq/activemq.go
+1
-1
@@ -7,9 +7,9 @@ import (
7
"errors"
8
"time"
9
10
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
)
15
src/go/plugin/go.d/modules/activemq/init.go
+1
-1
@@ -5,7 +5,7 @@ package activemq
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
8
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
9
)
10
11
func (a *ActiveMQ) validateConfig() error {
src/go/plugin/go.d/modules/beanstalk/beanstalk.go
+1
-1
@@ -9,9 +9,9 @@ import (
9
"time"
10
11
"github.com/netdata/netdata/go/plugins/logger"
12
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
15
)
16
17
//go:embed "config_schema.json"
src/go/plugin/go.d/modules/beanstalk/init.go
+1
-1
@@ -5,7 +5,7 @@ package beanstalk
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
8
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
9
)
10
11
func (b *Beanstalk) validateConfig() error {
src/go/plugin/go.d/modules/bind/bind.go
+1
-1
@@ -8,9 +8,9 @@ import (
8
"net/http"
9
"time"
10
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/pkg/confopt"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
)
16
src/go/plugin/go.d/modules/bind/init.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"net/http"
9
"strings"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
11
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
12
)
13
14
func (b *Bind) validateConfig() error {
src/go/plugin/go.d/modules/coredns/coredns.go
+1
-1
@@ -7,9 +7,9 @@ import (
7
"errors"
8
"time"
9
10
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
15
src/go/plugin/go.d/modules/coredns/init.go
+1
-1
@@ -5,7 +5,7 @@ package coredns
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
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"
11
)
src/go/plugin/go.d/modules/filecheck/filecheck.go
+1
-1
@@ -6,9 +6,9 @@ import (
6
_ "embed"
7
"time"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
12
)
13
14
//go:embed "config_schema.json"
src/go/plugin/go.d/modules/filecheck/init.go
+1
-1
@@ -5,7 +5,7 @@ package filecheck
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
8
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
9
)
10
11
func (f *Filecheck) validateConfig() error {
src/go/plugin/go.d/modules/fluentd/fluentd.go
+1
-1
@@ -7,9 +7,9 @@ import (
7
"errors"
8
"time"
9
10
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
)
15
src/go/plugin/go.d/modules/fluentd/init.go
+1
-1
@@ -5,7 +5,7 @@ package fluentd
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
8
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
9
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
10
)
11
src/go/plugin/go.d/modules/httpcheck/init.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
"net/http"
9
"regexp"
10
11
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
14
)
15
src/go/plugin/go.d/modules/mongodb/mongodb.go
+1
-1
@@ -8,9 +8,9 @@ import (
8
"sync"
9
"time"
10
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/pkg/confopt"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
14
)
15
16
//go:embed "config_schema.json"
src/go/plugin/go.d/modules/mongodb/mongodb_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"testing"
10
"time"
11
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/matcher"
14
15
"github.com/stretchr/testify/assert"
16
"github.com/stretchr/testify/require"
src/go/plugin/go.d/modules/openvpn/init.go
+1
-1
@@ -3,8 +3,8 @@
3
package openvpn
4
5
import (
6
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
7
"github.com/netdata/netdata/go/plugins/plugin/go.d/modules/openvpn/client"
7
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
8
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
9
)
10
src/go/plugin/go.d/modules/openvpn/openvpn.go
+1
-1
@@ -6,10 +6,10 @@ import (
6
_ "embed"
7
"time"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/modules/openvpn/client"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
14
)
15
src/go/plugin/go.d/modules/openvpn/openvpn_test.go
+1
-1
@@ -6,9 +6,9 @@ import (
6
"os"
7
"testing"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/modules/openvpn/client"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
13
14
"github.com/stretchr/testify/assert"
src/go/plugin/go.d/modules/openvpn_status_log/init.go
+1
-1
@@ -5,7 +5,7 @@ package openvpn_status_log
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
8
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
9
)
10
11
func (o *OpenVPNStatusLog) validateConfig() error {
src/go/plugin/go.d/modules/openvpn_status_log/openvpn.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
_ "embed"
7
"errors"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
11
)
12
13
//go:embed "config_schema.json"
src/go/plugin/go.d/modules/openvpn_status_log/openvpn_test.go
+1
-1
@@ -7,8 +7,8 @@ import (
7
"strings"
8
"testing"
9
10
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
12
13
"github.com/stretchr/testify/assert"
14
"github.com/stretchr/testify/require"
src/go/plugin/go.d/modules/postgres/init.go
+1
-1
@@ -5,7 +5,7 @@ package postgres
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
8
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
9
)
10
11
func (p *Postgres) validateConfig() error {
src/go/plugin/go.d/modules/postgres/postgres.go
+1
-1
@@ -9,9 +9,9 @@ import (
9
"sync"
10
"time"
11
12
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrics"
16
17
"github.com/jackc/pgx/v5/stdlib"
src/go/plugin/go.d/modules/postgres/postgres_test.go
+1
-1
@@ -12,8 +12,8 @@ import (
12
"strings"
13
"testing"
14
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/matcher"
17
18
"github.com/DATA-DOG/go-sqlmock"
19
"github.com/stretchr/testify/assert"
src/go/plugin/go.d/modules/prometheus/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/matcher"
10
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
13
)
src/go/plugin/go.d/modules/prometheus/prometheus.go
+1
-1
@@ -7,9 +7,9 @@ import (
7
"errors"
8
"time"
9
10
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
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"
src/go/plugin/go.d/modules/pulsar/init.go
+1
-1
@@ -5,7 +5,7 @@ package pulsar
5
import (
6
"errors"
7
8
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
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"
11
)
src/go/plugin/go.d/modules/pulsar/pulsar.go
+1
-1
@@ -8,9 +8,9 @@ import (
8
"sync"
9
"time"
10
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/pkg/confopt"
13
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
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
)
src/go/plugin/go.d/modules/pulsar/pulsar_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"strings"
10
"testing"
11
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/matcher"
14
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
15
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
16
src/go/plugin/go.d/modules/smartctl/init.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"path/filepath"
9
10
"github.com/netdata/netdata/go/plugins/pkg/executable"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
11
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
12
)
13
14
func (s *Smartctl) validateConfig() error {
src/go/plugin/go.d/modules/smartctl/smartctl.go
+1
-1
@@ -7,9 +7,9 @@ import (
7
"errors"
8
"time"
9
10
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
12
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
13
14
"github.com/tidwall/gjson"
15
)
src/go/plugin/go.d/modules/snmp/init.go
+2
-2
@@ -8,10 +8,10 @@ import (
8
"strings"
9
"time"
10
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
12
-
11
"github.com/google/uuid"
12
"github.com/gosnmp/gosnmp"
13
+
14
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
15
)
16
17
func (s *SNMP) validateConfig() error {
src/go/plugin/go.d/modules/snmp/snmp.go
+1
-1
@@ -6,9 +6,9 @@ import (
6
_ "embed"
7
"errors"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/vnodes"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
12
13
"github.com/gosnmp/gosnmp"
14
)
src/go/plugin/go.d/modules/systemdunits/init.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"errors"
10
"strings"
11
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
12
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
13
)
14
15
func (s *SystemdUnits) validateConfig() error {
src/go/plugin/go.d/modules/systemdunits/systemdunits.go
+1
-1
@@ -10,9 +10,9 @@ import (
10
"errors"
11
"time"
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/confopt"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
16
17
"github.com/coreos/go-systemd/v22/dbus"
18
)
src/go/plugin/go.d/modules/vsphere/match/match.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"fmt"
7
"strings"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
10
rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
11
)
12
13
type HostMatcher interface {
src/go/plugin/go.d/modules/vsphere/match/match_test.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"strings"
7
"testing"
8
9
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
10
"github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
11
12
"github.com/stretchr/testify/assert"
13
)
src/go/plugin/go.d/modules/weblog/init.go
+1
-1
@@ -7,8 +7,8 @@ import (
7
"fmt"
8
"strings"
9
10
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
11
"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/logs"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
12
)
13
14
type pattern struct {
src/go/plugin/go.d/pkg/README.md
+1
-1
@@ -13,7 +13,7 @@ learn_rel_path: "Developers/External plugins/go.d.plugin/Helper Packages"
13
- if you parse an application log files, then [`log`](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/pkg/logs) is
14
handy.
15
- if you need filtering
16
- check [`matcher`](/src/go/plugin/go.d/pkg/matcher).
16
+ check [`matcher`](/src/go/pkg/matcher).
17
- if you collect metrics from an HTTP endpoint use [`web`](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/pkg/web).
18
- if you collect metrics from a prometheus endpoint,
19
then [`prometheus`](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/pkg/prometheus)
src/go/plugin/go.d/pkg/prometheus/selector/parse.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"regexp"
8
"strings"
9
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
10
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
11
)
12
13
var (
src/go/plugin/go.d/pkg/prometheus/selector/parse_test.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"fmt"
7
"testing"
8
9
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
9
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
10
11
"github.com/prometheus/prometheus/model/labels"
12
"github.com/stretchr/testify/assert"
src/go/plugin/go.d/pkg/prometheus/selector/selector.go
+1
-1
@@ -3,7 +3,7 @@
3
package selector
4
5
import (
6
- "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
6
+ "github.com/netdata/netdata/go/plugins/pkg/matcher"
7
8
"github.com/prometheus/prometheus/model/labels"
9
)