chore(go.d.plugin): renames (netdata#19081)

webfutureiorepo · Nov 25, 2024 · 1488c3e · 1488c3e
1 parent f3ac2fe
commit 1488c3e
Show file tree

Hide file tree

Showing 2,229 changed files with 174 additions and 174 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,7 +19,7 @@ Makefile.in
 *.old
 *.log
 !src/collectors/log2journal/tests.d/*.log
-!src/go/collectors/**/*.log
+!src/go/**/*.log
 *.pyc
 
 netdata.spec

diff --git a/src/go/cmd/godplugin/main.go b/src/go/cmd/godplugin/main.go
@@ -23,7 +23,7 @@ import (
 	"go.uber.org/automaxprocs/maxprocs"
 	"golang.org/x/net/http/httpproxy"
 
-	_ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules"
+	_ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector"
 )
 
 var (

diff --git a/...go/plugin/go.d/modules/activemq/README.md → .../plugin/go.d/collector/activemq/README.md b/...go/plugin/go.d/modules/activemq/README.md → .../plugin/go.d/collector/activemq/README.md
diff --git a/.../plugin/go.d/modules/activemq/activemq.go → ...lugin/go.d/collector/activemq/activemq.go b/.../plugin/go.d/modules/activemq/activemq.go → ...lugin/go.d/collector/activemq/activemq.go
diff --git a/...in/go.d/modules/activemq/activemq_test.go → .../go.d/collector/activemq/activemq_test.go b/...in/go.d/modules/activemq/activemq_test.go → .../go.d/collector/activemq/activemq_test.go
diff --git a/...plugin/go.d/modules/activemq/apiclient.go → ...ugin/go.d/collector/activemq/apiclient.go b/...plugin/go.d/modules/activemq/apiclient.go → ...ugin/go.d/collector/activemq/apiclient.go
diff --git a/...go/plugin/go.d/modules/activemq/charts.go → .../plugin/go.d/collector/activemq/charts.go b/...go/plugin/go.d/modules/activemq/charts.go → .../plugin/go.d/collector/activemq/charts.go
diff --git a/...o/plugin/go.d/modules/activemq/collect.go → ...plugin/go.d/collector/activemq/collect.go b/...o/plugin/go.d/modules/activemq/collect.go → ...plugin/go.d/collector/activemq/collect.go
diff --git a/.../go.d/modules/activemq/config_schema.json → ...o.d/collector/activemq/config_schema.json b/.../go.d/modules/activemq/config_schema.json → ...o.d/collector/activemq/config_schema.json
diff --git a/src/go/plugin/go.d/modules/activemq/init.go → ...go/plugin/go.d/collector/activemq/init.go b/src/go/plugin/go.d/modules/activemq/init.go → ...go/plugin/go.d/collector/activemq/init.go
diff --git a/...modules/activemq/integrations/activemq.md → ...llector/activemq/integrations/activemq.md b/...modules/activemq/integrations/activemq.md → ...llector/activemq/integrations/activemq.md
diff --git a/...lugin/go.d/modules/activemq/metadata.yaml → ...gin/go.d/collector/activemq/metadata.yaml b/...lugin/go.d/modules/activemq/metadata.yaml → ...gin/go.d/collector/activemq/metadata.yaml
diff --git a/...o.d/modules/activemq/testdata/config.json → ...d/collector/activemq/testdata/config.json b/...o.d/modules/activemq/testdata/config.json → ...d/collector/activemq/testdata/config.json
diff --git a/...o.d/modules/activemq/testdata/config.yaml → ...d/collector/activemq/testdata/config.yaml b/...o.d/modules/activemq/testdata/config.yaml → ...d/collector/activemq/testdata/config.yaml
diff --git a/...plugin/go.d/modules/adaptecraid/README.md → ...ugin/go.d/collector/adaptecraid/README.md b/...plugin/go.d/modules/adaptecraid/README.md → ...ugin/go.d/collector/adaptecraid/README.md
diff --git a/...lugin/go.d/modules/adaptecraid/adaptec.go → ...gin/go.d/collector/adaptecraid/adaptec.go b/...lugin/go.d/modules/adaptecraid/adaptec.go → ...gin/go.d/collector/adaptecraid/adaptec.go
diff --git a/.../go.d/modules/adaptecraid/adaptec_test.go → ...o.d/collector/adaptecraid/adaptec_test.go b/.../go.d/modules/adaptecraid/adaptec_test.go → ...o.d/collector/adaptecraid/adaptec_test.go
diff --git a/...plugin/go.d/modules/adaptecraid/charts.go → ...ugin/go.d/collector/adaptecraid/charts.go b/...plugin/go.d/modules/adaptecraid/charts.go → ...ugin/go.d/collector/adaptecraid/charts.go
diff --git a/...lugin/go.d/modules/adaptecraid/collect.go → ...gin/go.d/collector/adaptecraid/collect.go b/...lugin/go.d/modules/adaptecraid/collect.go → ...gin/go.d/collector/adaptecraid/collect.go
diff --git a/...in/go.d/modules/adaptecraid/collect_ld.go → .../go.d/collector/adaptecraid/collect_ld.go b/...in/go.d/modules/adaptecraid/collect_ld.go → .../go.d/collector/adaptecraid/collect_ld.go
diff --git a/...in/go.d/modules/adaptecraid/collect_pd.go → .../go.d/collector/adaptecraid/collect_pd.go b/...in/go.d/modules/adaptecraid/collect_pd.go → .../go.d/collector/adaptecraid/collect_pd.go
diff --git a/....d/modules/adaptecraid/config_schema.json → .../collector/adaptecraid/config_schema.json b/....d/modules/adaptecraid/config_schema.json → .../collector/adaptecraid/config_schema.json
diff --git a/...go/plugin/go.d/modules/adaptecraid/doc.go → .../plugin/go.d/collector/adaptecraid/doc.go b/...go/plugin/go.d/modules/adaptecraid/doc.go → .../plugin/go.d/collector/adaptecraid/doc.go
diff --git a/...o/plugin/go.d/modules/adaptecraid/exec.go → ...plugin/go.d/collector/adaptecraid/exec.go b/...o/plugin/go.d/modules/adaptecraid/exec.go → ...plugin/go.d/collector/adaptecraid/exec.go
diff --git a/...o/plugin/go.d/modules/adaptecraid/init.go → ...plugin/go.d/collector/adaptecraid/init.go b/...o/plugin/go.d/modules/adaptecraid/init.go → ...plugin/go.d/collector/adaptecraid/init.go
diff --git a/.../adaptecraid/integrations/adaptec_raid.md → .../adaptecraid/integrations/adaptec_raid.md b/.../adaptecraid/integrations/adaptec_raid.md → .../adaptecraid/integrations/adaptec_raid.md
diff --git a/...in/go.d/modules/adaptecraid/metadata.yaml → .../go.d/collector/adaptecraid/metadata.yaml b/...in/go.d/modules/adaptecraid/metadata.yaml → .../go.d/collector/adaptecraid/metadata.yaml
diff --git a/.../modules/adaptecraid/testdata/config.json → ...ollector/adaptecraid/testdata/config.json b/.../modules/adaptecraid/testdata/config.json → ...ollector/adaptecraid/testdata/config.json
diff --git a/.../modules/adaptecraid/testdata/config.yaml → ...ollector/adaptecraid/testdata/config.yaml b/.../modules/adaptecraid/testdata/config.yaml → ...ollector/adaptecraid/testdata/config.yaml
diff --git a/...tecraid/testdata/getconfig-ld-current.txt → ...tecraid/testdata/getconfig-ld-current.txt b/...tecraid/testdata/getconfig-ld-current.txt → ...tecraid/testdata/getconfig-ld-current.txt
diff --git a/...adaptecraid/testdata/getconfig-ld-old.txt → ...adaptecraid/testdata/getconfig-ld-old.txt b/...adaptecraid/testdata/getconfig-ld-old.txt → ...adaptecraid/testdata/getconfig-ld-old.txt
diff --git a/...tecraid/testdata/getconfig-pd-current.txt → ...tecraid/testdata/getconfig-pd-current.txt b/...tecraid/testdata/getconfig-pd-current.txt → ...tecraid/testdata/getconfig-pd-current.txt
diff --git a/...adaptecraid/testdata/getconfig-pd-old.txt → ...adaptecraid/testdata/getconfig-pd-old.txt b/...adaptecraid/testdata/getconfig-pd-old.txt → ...adaptecraid/testdata/getconfig-pd-old.txt
diff --git a/src/go/plugin/go.d/modules/ap/README.md → src/go/plugin/go.d/collector/ap/README.md b/src/go/plugin/go.d/modules/ap/README.md → src/go/plugin/go.d/collector/ap/README.md
diff --git a/src/go/plugin/go.d/modules/ap/ap.go → src/go/plugin/go.d/collector/ap/ap.go b/src/go/plugin/go.d/modules/ap/ap.go → src/go/plugin/go.d/collector/ap/ap.go
diff --git a/src/go/plugin/go.d/modules/ap/ap_test.go → src/go/plugin/go.d/collector/ap/ap_test.go b/src/go/plugin/go.d/modules/ap/ap_test.go → src/go/plugin/go.d/collector/ap/ap_test.go
diff --git a/src/go/plugin/go.d/modules/ap/charts.go → src/go/plugin/go.d/collector/ap/charts.go b/src/go/plugin/go.d/modules/ap/charts.go → src/go/plugin/go.d/collector/ap/charts.go
diff --git a/src/go/plugin/go.d/modules/ap/collect.go → src/go/plugin/go.d/collector/ap/collect.go b/src/go/plugin/go.d/modules/ap/collect.go → src/go/plugin/go.d/collector/ap/collect.go
diff --git a/...plugin/go.d/modules/ap/config_schema.json → ...ugin/go.d/collector/ap/config_schema.json b/...plugin/go.d/modules/ap/config_schema.json → ...ugin/go.d/collector/ap/config_schema.json
diff --git a/src/go/plugin/go.d/modules/ap/doc.go → src/go/plugin/go.d/collector/ap/doc.go b/src/go/plugin/go.d/modules/ap/doc.go → src/go/plugin/go.d/collector/ap/doc.go
diff --git a/src/go/plugin/go.d/modules/ap/exec.go → src/go/plugin/go.d/collector/ap/exec.go b/src/go/plugin/go.d/modules/ap/exec.go → src/go/plugin/go.d/collector/ap/exec.go
diff --git a/src/go/plugin/go.d/modules/ap/init.go → src/go/plugin/go.d/collector/ap/init.go b/src/go/plugin/go.d/modules/ap/init.go → src/go/plugin/go.d/collector/ap/init.go
diff --git a/.../modules/ap/integrations/access_points.md → ...ollector/ap/integrations/access_points.md b/.../modules/ap/integrations/access_points.md → ...ollector/ap/integrations/access_points.md
diff --git a/src/go/plugin/go.d/modules/ap/metadata.yaml → ...go/plugin/go.d/collector/ap/metadata.yaml b/src/go/plugin/go.d/modules/ap/metadata.yaml → ...go/plugin/go.d/collector/ap/metadata.yaml
diff --git a/...ugin/go.d/modules/ap/testdata/config.json → ...in/go.d/collector/ap/testdata/config.json b/...ugin/go.d/modules/ap/testdata/config.json → ...in/go.d/collector/ap/testdata/config.json
diff --git a/...ugin/go.d/modules/ap/testdata/config.yaml → ...in/go.d/collector/ap/testdata/config.yaml b/...ugin/go.d/modules/ap/testdata/config.yaml → ...in/go.d/collector/ap/testdata/config.yaml
diff --git a/...in/go.d/modules/ap/testdata/iw_dev_ap.txt → .../go.d/collector/ap/testdata/iw_dev_ap.txt b/...in/go.d/modules/ap/testdata/iw_dev_ap.txt → .../go.d/collector/ap/testdata/iw_dev_ap.txt
diff --git a/....d/modules/ap/testdata/iw_dev_managed.txt → .../collector/ap/testdata/iw_dev_managed.txt b/....d/modules/ap/testdata/iw_dev_managed.txt → .../collector/ap/testdata/iw_dev_managed.txt
diff --git a/...go.d/modules/ap/testdata/station_dump.txt → ....d/collector/ap/testdata/station_dump.txt b/...go.d/modules/ap/testdata/station_dump.txt → ....d/collector/ap/testdata/station_dump.txt
diff --git a/src/go/plugin/go.d/modules/apache/README.md → ...go/plugin/go.d/collector/apache/README.md b/src/go/plugin/go.d/modules/apache/README.md → ...go/plugin/go.d/collector/apache/README.md
diff --git a/src/go/plugin/go.d/modules/apache/apache.go → ...go/plugin/go.d/collector/apache/apache.go b/src/go/plugin/go.d/modules/apache/apache.go → ...go/plugin/go.d/collector/apache/apache.go
diff --git a/...plugin/go.d/modules/apache/apache_test.go → ...ugin/go.d/collector/apache/apache_test.go b/...plugin/go.d/modules/apache/apache_test.go → ...ugin/go.d/collector/apache/apache_test.go
diff --git a/src/go/plugin/go.d/modules/apache/charts.go → ...go/plugin/go.d/collector/apache/charts.go b/src/go/plugin/go.d/modules/apache/charts.go → ...go/plugin/go.d/collector/apache/charts.go
diff --git a/src/go/plugin/go.d/modules/apache/collect.go → ...o/plugin/go.d/collector/apache/collect.go b/src/go/plugin/go.d/modules/apache/collect.go → ...o/plugin/go.d/collector/apache/collect.go
diff --git a/...in/go.d/modules/apache/config_schema.json → .../go.d/collector/apache/config_schema.json b/...in/go.d/modules/apache/config_schema.json → .../go.d/collector/apache/config_schema.json
diff --git a/src/go/plugin/go.d/modules/apache/init.go → src/go/plugin/go.d/collector/apache/init.go b/src/go/plugin/go.d/modules/apache/init.go → src/go/plugin/go.d/collector/apache/init.go
diff --git a/...o.d/modules/apache/integrations/apache.md → ...d/collector/apache/integrations/apache.md b/...o.d/modules/apache/integrations/apache.md → ...d/collector/apache/integrations/apache.md
diff --git a/...go.d/modules/apache/integrations/httpd.md → ....d/collector/apache/integrations/httpd.md b/...go.d/modules/apache/integrations/httpd.md → ....d/collector/apache/integrations/httpd.md
diff --git a/.../plugin/go.d/modules/apache/metadata.yaml → ...lugin/go.d/collector/apache/metadata.yaml b/.../plugin/go.d/modules/apache/metadata.yaml → ...lugin/go.d/collector/apache/metadata.yaml
diff --git a/src/go/plugin/go.d/modules/apache/metrics.go → ...o/plugin/go.d/collector/apache/metrics.go b/src/go/plugin/go.d/modules/apache/metrics.go → ...o/plugin/go.d/collector/apache/metrics.go
diff --git a/.../go.d/modules/apache/testdata/config.json → ...o.d/collector/apache/testdata/config.json b/.../go.d/modules/apache/testdata/config.json → ...o.d/collector/apache/testdata/config.json
diff --git a/.../go.d/modules/apache/testdata/config.yaml → ...o.d/collector/apache/testdata/config.yaml b/.../go.d/modules/apache/testdata/config.yaml → ...o.d/collector/apache/testdata/config.yaml
diff --git a/...he/testdata/extended-status-mpm-event.txt → ...he/testdata/extended-status-mpm-event.txt b/...he/testdata/extended-status-mpm-event.txt → ...he/testdata/extended-status-mpm-event.txt
diff --git a/.../testdata/extended-status-mpm-prefork.txt → .../testdata/extended-status-mpm-prefork.txt b/.../testdata/extended-status-mpm-prefork.txt → .../testdata/extended-status-mpm-prefork.txt
diff --git a/...dules/apache/testdata/lighttpd-status.txt → ...ector/apache/testdata/lighttpd-status.txt b/...dules/apache/testdata/lighttpd-status.txt → ...ector/apache/testdata/lighttpd-status.txt
diff --git a/...ache/testdata/simple-status-mpm-event.txt → ...ache/testdata/simple-status-mpm-event.txt b/...ache/testdata/simple-status-mpm-event.txt → ...ache/testdata/simple-status-mpm-event.txt
diff --git a/src/go/plugin/go.d/modules/apcupsd/README.md → ...o/plugin/go.d/collector/apcupsd/README.md b/src/go/plugin/go.d/modules/apcupsd/README.md → ...o/plugin/go.d/collector/apcupsd/README.md
diff --git a/...go/plugin/go.d/modules/apcupsd/apcupsd.go → .../plugin/go.d/collector/apcupsd/apcupsd.go b/...go/plugin/go.d/modules/apcupsd/apcupsd.go → .../plugin/go.d/collector/apcupsd/apcupsd.go
diff --git a/...ugin/go.d/modules/apcupsd/apcupsd_test.go → ...in/go.d/collector/apcupsd/apcupsd_test.go b/...ugin/go.d/modules/apcupsd/apcupsd_test.go → ...in/go.d/collector/apcupsd/apcupsd_test.go
diff --git a/src/go/plugin/go.d/modules/apcupsd/charts.go → ...o/plugin/go.d/collector/apcupsd/charts.go b/src/go/plugin/go.d/modules/apcupsd/charts.go → ...o/plugin/go.d/collector/apcupsd/charts.go
diff --git a/src/go/plugin/go.d/modules/apcupsd/client.go → ...o/plugin/go.d/collector/apcupsd/client.go b/src/go/plugin/go.d/modules/apcupsd/client.go → ...o/plugin/go.d/collector/apcupsd/client.go
diff --git a/...go/plugin/go.d/modules/apcupsd/collect.go → .../plugin/go.d/collector/apcupsd/collect.go b/...go/plugin/go.d/modules/apcupsd/collect.go → .../plugin/go.d/collector/apcupsd/collect.go
diff --git a/...n/go.d/modules/apcupsd/config_schema.json → ...go.d/collector/apcupsd/config_schema.json b/...n/go.d/modules/apcupsd/config_schema.json → ...go.d/collector/apcupsd/config_schema.json
diff --git a/...d/modules/apcupsd/integrations/apc_ups.md → ...collector/apcupsd/integrations/apc_ups.md b/...d/modules/apcupsd/integrations/apc_ups.md → ...collector/apcupsd/integrations/apc_ups.md
diff --git a/...plugin/go.d/modules/apcupsd/metadata.yaml → ...ugin/go.d/collector/apcupsd/metadata.yaml b/...plugin/go.d/modules/apcupsd/metadata.yaml → ...ugin/go.d/collector/apcupsd/metadata.yaml
diff --git a/src/go/plugin/go.d/modules/apcupsd/status.go → ...o/plugin/go.d/collector/apcupsd/status.go b/src/go/plugin/go.d/modules/apcupsd/status.go → ...o/plugin/go.d/collector/apcupsd/status.go
diff --git a/...go.d/modules/apcupsd/testdata/config.json → ....d/collector/apcupsd/testdata/config.json b/...go.d/modules/apcupsd/testdata/config.json → ....d/collector/apcupsd/testdata/config.json
diff --git a/...go.d/modules/apcupsd/testdata/config.yaml → ....d/collector/apcupsd/testdata/config.yaml b/...go.d/modules/apcupsd/testdata/config.yaml → ....d/collector/apcupsd/testdata/config.yaml
diff --git a/.../go.d/modules/apcupsd/testdata/status.txt → ...o.d/collector/apcupsd/testdata/status.txt b/.../go.d/modules/apcupsd/testdata/status.txt → ...o.d/collector/apcupsd/testdata/status.txt
diff --git a/...ules/apcupsd/testdata/status_commlost.txt → ...ctor/apcupsd/testdata/status_commlost.txt b/...ules/apcupsd/testdata/status_commlost.txt → ...ctor/apcupsd/testdata/status_commlost.txt
diff --git a/...o/plugin/go.d/modules/beanstalk/README.md → ...plugin/go.d/collector/beanstalk/README.md b/...o/plugin/go.d/modules/beanstalk/README.md → ...plugin/go.d/collector/beanstalk/README.md
diff --git a/...lugin/go.d/modules/beanstalk/beanstalk.go → ...gin/go.d/collector/beanstalk/beanstalk.go b/...lugin/go.d/modules/beanstalk/beanstalk.go → ...gin/go.d/collector/beanstalk/beanstalk.go
diff --git a/.../go.d/modules/beanstalk/beanstalk_test.go → ...o.d/collector/beanstalk/beanstalk_test.go b/.../go.d/modules/beanstalk/beanstalk_test.go → ...o.d/collector/beanstalk/beanstalk_test.go
diff --git a/...o/plugin/go.d/modules/beanstalk/charts.go → ...plugin/go.d/collector/beanstalk/charts.go b/...o/plugin/go.d/modules/beanstalk/charts.go → ...plugin/go.d/collector/beanstalk/charts.go
diff --git a/...o/plugin/go.d/modules/beanstalk/client.go → ...plugin/go.d/collector/beanstalk/client.go b/...o/plugin/go.d/modules/beanstalk/client.go → ...plugin/go.d/collector/beanstalk/client.go
diff --git a/.../plugin/go.d/modules/beanstalk/collect.go → ...lugin/go.d/collector/beanstalk/collect.go b/.../plugin/go.d/modules/beanstalk/collect.go → ...lugin/go.d/collector/beanstalk/collect.go
diff --git a/...go.d/modules/beanstalk/config_schema.json → ....d/collector/beanstalk/config_schema.json b/...go.d/modules/beanstalk/config_schema.json → ....d/collector/beanstalk/config_schema.json
diff --git a/src/go/plugin/go.d/modules/beanstalk/init.go → ...o/plugin/go.d/collector/beanstalk/init.go b/src/go/plugin/go.d/modules/beanstalk/init.go → ...o/plugin/go.d/collector/beanstalk/init.go
diff --git a/...dules/beanstalk/integrations/beanstalk.md → ...ector/beanstalk/integrations/beanstalk.md b/...dules/beanstalk/integrations/beanstalk.md → ...ector/beanstalk/integrations/beanstalk.md
diff --git a/...ugin/go.d/modules/beanstalk/metadata.yaml → ...in/go.d/collector/beanstalk/metadata.yaml b/...ugin/go.d/modules/beanstalk/metadata.yaml → ...in/go.d/collector/beanstalk/metadata.yaml
diff --git a/....d/modules/beanstalk/testdata/config.json → .../collector/beanstalk/testdata/config.json b/....d/modules/beanstalk/testdata/config.json → .../collector/beanstalk/testdata/config.json
diff --git a/....d/modules/beanstalk/testdata/config.yaml → .../collector/beanstalk/testdata/config.yaml b/....d/modules/beanstalk/testdata/config.yaml → .../collector/beanstalk/testdata/config.yaml
diff --git a/...modules/beanstalk/testdata/list-tubes.txt → ...llector/beanstalk/testdata/list-tubes.txt b/...modules/beanstalk/testdata/list-tubes.txt → ...llector/beanstalk/testdata/list-tubes.txt
diff --git a/...beanstalk/testdata/stats-tube-default.txt → ...beanstalk/testdata/stats-tube-default.txt b/...beanstalk/testdata/stats-tube-default.txt → ...beanstalk/testdata/stats-tube-default.txt
diff --git a/...go.d/modules/beanstalk/testdata/stats.txt → ....d/collector/beanstalk/testdata/stats.txt b/...go.d/modules/beanstalk/testdata/stats.txt → ....d/collector/beanstalk/testdata/stats.txt
diff --git a/src/go/plugin/go.d/modules/bind/README.md → src/go/plugin/go.d/collector/bind/README.md b/src/go/plugin/go.d/modules/bind/README.md → src/go/plugin/go.d/collector/bind/README.md
diff --git a/src/go/plugin/go.d/modules/bind/bind.go → src/go/plugin/go.d/collector/bind/bind.go b/src/go/plugin/go.d/modules/bind/bind.go → src/go/plugin/go.d/collector/bind/bind.go
diff --git a/src/go/plugin/go.d/modules/bind/bind_test.go → ...o/plugin/go.d/collector/bind/bind_test.go b/src/go/plugin/go.d/modules/bind/bind_test.go → ...o/plugin/go.d/collector/bind/bind_test.go
diff --git a/src/go/plugin/go.d/modules/bind/charts.go → src/go/plugin/go.d/collector/bind/charts.go b/src/go/plugin/go.d/modules/bind/charts.go → src/go/plugin/go.d/collector/bind/charts.go
diff --git a/src/go/plugin/go.d/modules/bind/collect.go → src/go/plugin/go.d/collector/bind/collect.go b/src/go/plugin/go.d/modules/bind/collect.go → src/go/plugin/go.d/collector/bind/collect.go
diff --git a/...ugin/go.d/modules/bind/config_schema.json → ...in/go.d/collector/bind/config_schema.json b/...ugin/go.d/modules/bind/config_schema.json → ...in/go.d/collector/bind/config_schema.json
diff --git a/src/go/plugin/go.d/modules/bind/init.go → src/go/plugin/go.d/collector/bind/init.go b/src/go/plugin/go.d/modules/bind/init.go → src/go/plugin/go.d/collector/bind/init.go
diff --git a/...o/plugin/go.d/modules/bind/json_client.go → ...plugin/go.d/collector/bind/json_client.go b/...o/plugin/go.d/modules/bind/json_client.go → ...plugin/go.d/collector/bind/json_client.go
diff --git a/...in/go.d/modules/bind/testdata/config.json → .../go.d/collector/bind/testdata/config.json b/...in/go.d/modules/bind/testdata/config.json → .../go.d/collector/bind/testdata/config.json
diff --git a/...in/go.d/modules/bind/testdata/config.yaml → .../go.d/collector/bind/testdata/config.yaml b/...in/go.d/modules/bind/testdata/config.yaml → .../go.d/collector/bind/testdata/config.yaml
diff --git a/...d/modules/bind/testdata/query-server.json → ...collector/bind/testdata/query-server.json b/...d/modules/bind/testdata/query-server.json → ...collector/bind/testdata/query-server.json
diff --git a/....d/modules/bind/testdata/query-server.xml → .../collector/bind/testdata/query-server.xml b/....d/modules/bind/testdata/query-server.xml → .../collector/bind/testdata/query-server.xml
diff --git a/...o/plugin/go.d/modules/bind/xml3_client.go → ...plugin/go.d/collector/bind/xml3_client.go b/...o/plugin/go.d/modules/bind/xml3_client.go → ...plugin/go.d/collector/bind/xml3_client.go
diff --git a/src/go/plugin/go.d/modules/boinc/README.md → src/go/plugin/go.d/collector/boinc/README.md b/src/go/plugin/go.d/modules/boinc/README.md → src/go/plugin/go.d/collector/boinc/README.md
diff --git a/src/go/plugin/go.d/modules/boinc/boinc.go → src/go/plugin/go.d/collector/boinc/boinc.go b/src/go/plugin/go.d/modules/boinc/boinc.go → src/go/plugin/go.d/collector/boinc/boinc.go
diff --git a/...o/plugin/go.d/modules/boinc/boinc_test.go → ...plugin/go.d/collector/boinc/boinc_test.go b/...o/plugin/go.d/modules/boinc/boinc_test.go → ...plugin/go.d/collector/boinc/boinc_test.go
diff --git a/src/go/plugin/go.d/modules/boinc/charts.go → src/go/plugin/go.d/collector/boinc/charts.go b/src/go/plugin/go.d/modules/boinc/charts.go → src/go/plugin/go.d/collector/boinc/charts.go
diff --git a/src/go/plugin/go.d/modules/boinc/client.go → src/go/plugin/go.d/collector/boinc/client.go b/src/go/plugin/go.d/modules/boinc/client.go → src/go/plugin/go.d/collector/boinc/client.go
diff --git a/...plugin/go.d/modules/boinc/client_proto.go → ...ugin/go.d/collector/boinc/client_proto.go b/...plugin/go.d/modules/boinc/client_proto.go → ...ugin/go.d/collector/boinc/client_proto.go
diff --git a/src/go/plugin/go.d/modules/boinc/collect.go → ...go/plugin/go.d/collector/boinc/collect.go b/src/go/plugin/go.d/modules/boinc/collect.go → ...go/plugin/go.d/collector/boinc/collect.go
diff --git a/...gin/go.d/modules/boinc/config_schema.json → ...n/go.d/collector/boinc/config_schema.json b/...gin/go.d/modules/boinc/config_schema.json → ...n/go.d/collector/boinc/config_schema.json
diff --git a/.../go.d/modules/boinc/integrations/boinc.md → ...o.d/collector/boinc/integrations/boinc.md b/.../go.d/modules/boinc/integrations/boinc.md → ...o.d/collector/boinc/integrations/boinc.md
diff --git a/...o/plugin/go.d/modules/boinc/metadata.yaml → ...plugin/go.d/collector/boinc/metadata.yaml b/...o/plugin/go.d/modules/boinc/metadata.yaml → ...plugin/go.d/collector/boinc/metadata.yaml
diff --git a/...n/go.d/modules/boinc/testdata/config.json → ...go.d/collector/boinc/testdata/config.json b/...n/go.d/modules/boinc/testdata/config.json → ...go.d/collector/boinc/testdata/config.json
diff --git a/...n/go.d/modules/boinc/testdata/config.yaml → ...go.d/collector/boinc/testdata/config.yaml b/...n/go.d/modules/boinc/testdata/config.yaml → ...go.d/collector/boinc/testdata/config.yaml
diff --git a/....d/modules/boinc/testdata/get_results.xml → .../collector/boinc/testdata/get_results.xml b/....d/modules/boinc/testdata/get_results.xml → .../collector/boinc/testdata/get_results.xml
diff --git a/...s/boinc/testdata/get_results_no_tasks.xml → ...r/boinc/testdata/get_results_no_tasks.xml b/...s/boinc/testdata/get_results_no_tasks.xml → ...r/boinc/testdata/get_results_no_tasks.xml
diff --git a/...o/plugin/go.d/modules/cassandra/README.md → ...plugin/go.d/collector/cassandra/README.md b/...o/plugin/go.d/modules/cassandra/README.md → ...plugin/go.d/collector/cassandra/README.md
diff --git a/...lugin/go.d/modules/cassandra/cassandra.go → ...gin/go.d/collector/cassandra/cassandra.go b/...lugin/go.d/modules/cassandra/cassandra.go → ...gin/go.d/collector/cassandra/cassandra.go
diff --git a/.../go.d/modules/cassandra/cassandra_test.go → ...o.d/collector/cassandra/cassandra_test.go b/.../go.d/modules/cassandra/cassandra_test.go → ...o.d/collector/cassandra/cassandra_test.go
diff --git a/...o/plugin/go.d/modules/cassandra/charts.go → ...plugin/go.d/collector/cassandra/charts.go b/...o/plugin/go.d/modules/cassandra/charts.go → ...plugin/go.d/collector/cassandra/charts.go
diff --git a/.../plugin/go.d/modules/cassandra/collect.go → ...lugin/go.d/collector/cassandra/collect.go b/.../plugin/go.d/modules/cassandra/collect.go → ...lugin/go.d/collector/cassandra/collect.go
diff --git a/...go.d/modules/cassandra/config_schema.json → ....d/collector/cassandra/config_schema.json b/...go.d/modules/cassandra/config_schema.json → ....d/collector/cassandra/config_schema.json
diff --git a/src/go/plugin/go.d/modules/cassandra/init.go → ...o/plugin/go.d/collector/cassandra/init.go b/src/go/plugin/go.d/modules/cassandra/init.go → ...o/plugin/go.d/collector/cassandra/init.go
diff --git a/...dules/cassandra/integrations/cassandra.md → ...ector/cassandra/integrations/cassandra.md b/...dules/cassandra/integrations/cassandra.md → ...ector/cassandra/integrations/cassandra.md
diff --git a/.../go.d/modules/cassandra/jmx_exporter.yaml → ...o.d/collector/cassandra/jmx_exporter.yaml b/.../go.d/modules/cassandra/jmx_exporter.yaml → ...o.d/collector/cassandra/jmx_exporter.yaml
diff --git a/...ugin/go.d/modules/cassandra/metadata.yaml → ...in/go.d/collector/cassandra/metadata.yaml b/...ugin/go.d/modules/cassandra/metadata.yaml → ...in/go.d/collector/cassandra/metadata.yaml
diff --git a/.../plugin/go.d/modules/cassandra/metrics.go → ...lugin/go.d/collector/cassandra/metrics.go b/.../plugin/go.d/modules/cassandra/metrics.go → ...lugin/go.d/collector/cassandra/metrics.go
diff --git a/....d/modules/cassandra/testdata/config.json → .../collector/cassandra/testdata/config.json b/....d/modules/cassandra/testdata/config.json → .../collector/cassandra/testdata/config.json
diff --git a/....d/modules/cassandra/testdata/config.yaml → .../collector/cassandra/testdata/config.yaml b/....d/modules/cassandra/testdata/config.yaml → .../collector/cassandra/testdata/config.yaml
diff --git a/....d/modules/cassandra/testdata/metrics.txt → .../collector/cassandra/testdata/metrics.txt b/....d/modules/cassandra/testdata/metrics.txt → .../collector/cassandra/testdata/metrics.txt
diff --git a/src/go/plugin/go.d/modules/ceph/README.md → src/go/plugin/go.d/collector/ceph/README.md b/src/go/plugin/go.d/modules/ceph/README.md → src/go/plugin/go.d/collector/ceph/README.md
diff --git a/src/go/plugin/go.d/modules/ceph/api.go → src/go/plugin/go.d/collector/ceph/api.go b/src/go/plugin/go.d/modules/ceph/api.go → src/go/plugin/go.d/collector/ceph/api.go
diff --git a/src/go/plugin/go.d/modules/ceph/auth.go → src/go/plugin/go.d/collector/ceph/auth.go b/src/go/plugin/go.d/modules/ceph/auth.go → src/go/plugin/go.d/collector/ceph/auth.go
diff --git a/src/go/plugin/go.d/modules/ceph/ceph.go → src/go/plugin/go.d/collector/ceph/ceph.go b/src/go/plugin/go.d/modules/ceph/ceph.go → src/go/plugin/go.d/collector/ceph/ceph.go
diff --git a/src/go/plugin/go.d/modules/ceph/ceph_test.go → ...o/plugin/go.d/collector/ceph/ceph_test.go b/src/go/plugin/go.d/modules/ceph/ceph_test.go → ...o/plugin/go.d/collector/ceph/ceph_test.go
diff --git a/src/go/plugin/go.d/modules/ceph/charts.go → src/go/plugin/go.d/collector/ceph/charts.go b/src/go/plugin/go.d/modules/ceph/charts.go → src/go/plugin/go.d/collector/ceph/charts.go
diff --git a/src/go/plugin/go.d/modules/ceph/collect.go → src/go/plugin/go.d/collector/ceph/collect.go b/src/go/plugin/go.d/modules/ceph/collect.go → src/go/plugin/go.d/collector/ceph/collect.go
diff --git a/...lugin/go.d/modules/ceph/collect_health.go → ...gin/go.d/collector/ceph/collect_health.go b/...lugin/go.d/modules/ceph/collect_health.go → ...gin/go.d/collector/ceph/collect_health.go
diff --git a/...o/plugin/go.d/modules/ceph/collect_osd.go → ...plugin/go.d/collector/ceph/collect_osd.go b/...o/plugin/go.d/modules/ceph/collect_osd.go → ...plugin/go.d/collector/ceph/collect_osd.go
diff --git a/...plugin/go.d/modules/ceph/collect_pools.go → ...ugin/go.d/collector/ceph/collect_pools.go b/...plugin/go.d/modules/ceph/collect_pools.go → ...ugin/go.d/collector/ceph/collect_pools.go
diff --git a/...ugin/go.d/modules/ceph/config_schema.json → ...in/go.d/collector/ceph/config_schema.json b/...ugin/go.d/modules/ceph/config_schema.json → ...in/go.d/collector/ceph/config_schema.json
diff --git a/src/go/plugin/go.d/modules/ceph/init.go → src/go/plugin/go.d/collector/ceph/init.go b/src/go/plugin/go.d/modules/ceph/init.go → src/go/plugin/go.d/collector/ceph/init.go
diff --git a/...in/go.d/modules/ceph/integrations/ceph.md → .../go.d/collector/ceph/integrations/ceph.md b/...in/go.d/modules/ceph/integrations/ceph.md → .../go.d/collector/ceph/integrations/ceph.md
diff --git a/...go/plugin/go.d/modules/ceph/metadata.yaml → .../plugin/go.d/collector/ceph/metadata.yaml b/...go/plugin/go.d/modules/ceph/metadata.yaml → .../plugin/go.d/collector/ceph/metadata.yaml
diff --git a/...in/go.d/modules/ceph/testdata/config.json → .../go.d/collector/ceph/testdata/config.json b/...in/go.d/modules/ceph/testdata/config.json → .../go.d/collector/ceph/testdata/config.json
diff --git a/...in/go.d/modules/ceph/testdata/config.yaml → .../go.d/collector/ceph/testdata/config.yaml b/...in/go.d/modules/ceph/testdata/config.yaml → .../go.d/collector/ceph/testdata/config.yaml
diff --git a/...testdata/v16.2.15/api_health_minimal.json → ...testdata/v16.2.15/api_health_minimal.json b/...testdata/v16.2.15/api_health_minimal.json → ...testdata/v16.2.15/api_health_minimal.json
diff --git a/...s/ceph/testdata/v16.2.15/api_monitor.json → ...r/ceph/testdata/v16.2.15/api_monitor.json b/...s/ceph/testdata/v16.2.15/api_monitor.json → ...r/ceph/testdata/v16.2.15/api_monitor.json
diff --git a/...dules/ceph/testdata/v16.2.15/api_osd.json → ...ector/ceph/testdata/v16.2.15/api_osd.json b/...dules/ceph/testdata/v16.2.15/api_osd.json → ...ector/ceph/testdata/v16.2.15/api_osd.json
diff --git a/...eph/testdata/v16.2.15/api_pool_stats.json → ...eph/testdata/v16.2.15/api_pool_stats.json b/...eph/testdata/v16.2.15/api_pool_stats.json → ...eph/testdata/v16.2.15/api_pool_stats.json
diff --git a/src/go/plugin/go.d/modules/chrony/README.md → ...go/plugin/go.d/collector/chrony/README.md b/src/go/plugin/go.d/modules/chrony/README.md → ...go/plugin/go.d/collector/chrony/README.md
diff --git a/src/go/plugin/go.d/modules/chrony/charts.go → ...go/plugin/go.d/collector/chrony/charts.go b/src/go/plugin/go.d/modules/chrony/charts.go → ...go/plugin/go.d/collector/chrony/charts.go
diff --git a/src/go/plugin/go.d/modules/chrony/chrony.go → ...go/plugin/go.d/collector/chrony/chrony.go b/src/go/plugin/go.d/modules/chrony/chrony.go → ...go/plugin/go.d/collector/chrony/chrony.go
diff --git a/...plugin/go.d/modules/chrony/chrony_test.go → ...ugin/go.d/collector/chrony/chrony_test.go b/...plugin/go.d/modules/chrony/chrony_test.go → ...ugin/go.d/collector/chrony/chrony_test.go
diff --git a/src/go/plugin/go.d/modules/chrony/client.go → ...go/plugin/go.d/collector/chrony/client.go b/src/go/plugin/go.d/modules/chrony/client.go → ...go/plugin/go.d/collector/chrony/client.go
diff --git a/src/go/plugin/go.d/modules/chrony/collect.go → ...o/plugin/go.d/collector/chrony/collect.go b/src/go/plugin/go.d/modules/chrony/collect.go → ...o/plugin/go.d/collector/chrony/collect.go
diff --git a/...in/go.d/modules/chrony/config_schema.json → .../go.d/collector/chrony/config_schema.json b/...in/go.d/modules/chrony/config_schema.json → .../go.d/collector/chrony/config_schema.json
diff --git a/src/go/plugin/go.d/modules/chrony/exec.go → src/go/plugin/go.d/collector/chrony/exec.go b/src/go/plugin/go.d/modules/chrony/exec.go → src/go/plugin/go.d/collector/chrony/exec.go
diff --git a/src/go/plugin/go.d/modules/chrony/init.go → src/go/plugin/go.d/collector/chrony/init.go b/src/go/plugin/go.d/modules/chrony/init.go → src/go/plugin/go.d/collector/chrony/init.go
diff --git a/...o.d/modules/chrony/integrations/chrony.md → ...d/collector/chrony/integrations/chrony.md b/...o.d/modules/chrony/integrations/chrony.md → ...d/collector/chrony/integrations/chrony.md
diff --git a/.../plugin/go.d/modules/chrony/metadata.yaml → ...lugin/go.d/collector/chrony/metadata.yaml b/.../plugin/go.d/modules/chrony/metadata.yaml → ...lugin/go.d/collector/chrony/metadata.yaml
diff --git a/.../go.d/modules/chrony/testdata/config.json → ...o.d/collector/chrony/testdata/config.json b/.../go.d/modules/chrony/testdata/config.json → ...o.d/collector/chrony/testdata/config.json
diff --git a/.../go.d/modules/chrony/testdata/config.yaml → ...o.d/collector/chrony/testdata/config.yaml b/.../go.d/modules/chrony/testdata/config.yaml → ...o.d/collector/chrony/testdata/config.yaml
diff --git a/.../plugin/go.d/modules/clickhouse/README.md → ...lugin/go.d/collector/clickhouse/README.md b/.../plugin/go.d/modules/clickhouse/README.md → ...lugin/go.d/collector/clickhouse/README.md
diff --git a/.../plugin/go.d/modules/clickhouse/charts.go → ...lugin/go.d/collector/clickhouse/charts.go b/.../plugin/go.d/modules/clickhouse/charts.go → ...lugin/go.d/collector/clickhouse/charts.go
diff --git a/...gin/go.d/modules/clickhouse/clickhouse.go → ...n/go.d/collector/clickhouse/clickhouse.go b/...gin/go.d/modules/clickhouse/clickhouse.go → ...n/go.d/collector/clickhouse/clickhouse.go
diff --git a/...o.d/modules/clickhouse/clickhouse_test.go → ...d/collector/clickhouse/clickhouse_test.go b/...o.d/modules/clickhouse/clickhouse_test.go → ...d/collector/clickhouse/clickhouse_test.go
diff --git a/...plugin/go.d/modules/clickhouse/collect.go → ...ugin/go.d/collector/clickhouse/collect.go b/...plugin/go.d/modules/clickhouse/collect.go → ...ugin/go.d/collector/clickhouse/collect.go
diff --git a/...lickhouse/collect_system_async_metrics.go → ...lickhouse/collect_system_async_metrics.go b/...lickhouse/collect_system_async_metrics.go → ...lickhouse/collect_system_async_metrics.go
diff --git a/...odules/clickhouse/collect_system_disks.go → ...lector/clickhouse/collect_system_disks.go b/...odules/clickhouse/collect_system_disks.go → ...lector/clickhouse/collect_system_disks.go
diff --git a/...dules/clickhouse/collect_system_events.go → ...ector/clickhouse/collect_system_events.go b/...dules/clickhouse/collect_system_events.go → ...ector/clickhouse/collect_system_events.go
diff --git a/...ules/clickhouse/collect_system_metrics.go → ...ctor/clickhouse/collect_system_metrics.go b/...ules/clickhouse/collect_system_metrics.go → ...ctor/clickhouse/collect_system_metrics.go
diff --git a/...odules/clickhouse/collect_system_parts.go → ...lector/clickhouse/collect_system_parts.go b/...odules/clickhouse/collect_system_parts.go → ...lector/clickhouse/collect_system_parts.go
diff --git a/...es/clickhouse/collect_system_processes.go → ...or/clickhouse/collect_system_processes.go b/...es/clickhouse/collect_system_processes.go → ...or/clickhouse/collect_system_processes.go
diff --git a/...o.d/modules/clickhouse/config_schema.json → ...d/collector/clickhouse/config_schema.json b/...o.d/modules/clickhouse/config_schema.json → ...d/collector/clickhouse/config_schema.json
diff --git a/...go/plugin/go.d/modules/clickhouse/init.go → .../plugin/go.d/collector/clickhouse/init.go b/...go/plugin/go.d/modules/clickhouse/init.go → .../plugin/go.d/collector/clickhouse/init.go
diff --git a/...les/clickhouse/integrations/clickhouse.md → ...tor/clickhouse/integrations/clickhouse.md b/...les/clickhouse/integrations/clickhouse.md → ...tor/clickhouse/integrations/clickhouse.md
diff --git a/...gin/go.d/modules/clickhouse/metadata.yaml → ...n/go.d/collector/clickhouse/metadata.yaml b/...gin/go.d/modules/clickhouse/metadata.yaml → ...n/go.d/collector/clickhouse/metadata.yaml
diff --git a/...d/modules/clickhouse/testdata/config.json → ...collector/clickhouse/testdata/config.json b/...d/modules/clickhouse/testdata/config.json → ...collector/clickhouse/testdata/config.json
diff --git a/...d/modules/clickhouse/testdata/config.yaml → ...collector/clickhouse/testdata/config.yaml b/...d/modules/clickhouse/testdata/config.yaml → ...collector/clickhouse/testdata/config.yaml
diff --git a/...ouse/testdata/resp_longest_query_time.csv → ...ouse/testdata/resp_longest_query_time.csv b/...ouse/testdata/resp_longest_query_time.csv → ...ouse/testdata/resp_longest_query_time.csv
diff --git a/...se/testdata/resp_system_async_metrics.csv → ...se/testdata/resp_system_async_metrics.csv b/...se/testdata/resp_system_async_metrics.csv → ...se/testdata/resp_system_async_metrics.csv
diff --git a/...clickhouse/testdata/resp_system_disks.csv → ...clickhouse/testdata/resp_system_disks.csv b/...clickhouse/testdata/resp_system_disks.csv → ...clickhouse/testdata/resp_system_disks.csv
diff --git a/...lickhouse/testdata/resp_system_events.csv → ...lickhouse/testdata/resp_system_events.csv b/...lickhouse/testdata/resp_system_events.csv → ...lickhouse/testdata/resp_system_events.csv
diff --git a/...ickhouse/testdata/resp_system_metrics.csv → ...ickhouse/testdata/resp_system_metrics.csv b/...ickhouse/testdata/resp_system_metrics.csv → ...ickhouse/testdata/resp_system_metrics.csv
diff --git a/...clickhouse/testdata/resp_system_parts.csv → ...clickhouse/testdata/resp_system_parts.csv b/...clickhouse/testdata/resp_system_parts.csv → ...clickhouse/testdata/resp_system_parts.csv
diff --git a/...plugin/go.d/modules/cockroachdb/README.md → ...ugin/go.d/collector/cockroachdb/README.md b/...plugin/go.d/modules/cockroachdb/README.md → ...ugin/go.d/collector/cockroachdb/README.md
diff --git a/...plugin/go.d/modules/cockroachdb/charts.go → ...ugin/go.d/collector/cockroachdb/charts.go b/...plugin/go.d/modules/cockroachdb/charts.go → ...ugin/go.d/collector/cockroachdb/charts.go
diff --git a/...n/go.d/modules/cockroachdb/cockroachdb.go → ...go.d/collector/cockroachdb/cockroachdb.go b/...n/go.d/modules/cockroachdb/cockroachdb.go → ...go.d/collector/cockroachdb/cockroachdb.go
diff --git a/...d/modules/cockroachdb/cockroachdb_test.go → ...collector/cockroachdb/cockroachdb_test.go b/...d/modules/cockroachdb/cockroachdb_test.go → ...collector/cockroachdb/cockroachdb_test.go
diff --git a/...lugin/go.d/modules/cockroachdb/collect.go → ...gin/go.d/collector/cockroachdb/collect.go b/...lugin/go.d/modules/cockroachdb/collect.go → ...gin/go.d/collector/cockroachdb/collect.go
diff --git a/....d/modules/cockroachdb/config_schema.json → .../collector/cockroachdb/config_schema.json b/....d/modules/cockroachdb/config_schema.json → .../collector/cockroachdb/config_schema.json
diff --git a/...o/plugin/go.d/modules/cockroachdb/init.go → ...plugin/go.d/collector/cockroachdb/init.go b/...o/plugin/go.d/modules/cockroachdb/init.go → ...plugin/go.d/collector/cockroachdb/init.go
diff --git a/...s/cockroachdb/integrations/cockroachdb.md → ...r/cockroachdb/integrations/cockroachdb.md b/...s/cockroachdb/integrations/cockroachdb.md → ...r/cockroachdb/integrations/cockroachdb.md
diff --git a/...in/go.d/modules/cockroachdb/metadata.yaml → .../go.d/collector/cockroachdb/metadata.yaml b/...in/go.d/modules/cockroachdb/metadata.yaml → .../go.d/collector/cockroachdb/metadata.yaml
diff --git a/...lugin/go.d/modules/cockroachdb/metrics.go → ...gin/go.d/collector/cockroachdb/metrics.go b/...lugin/go.d/modules/cockroachdb/metrics.go → ...gin/go.d/collector/cockroachdb/metrics.go
diff --git a/.../modules/cockroachdb/testdata/config.json → ...ollector/cockroachdb/testdata/config.json b/.../modules/cockroachdb/testdata/config.json → ...ollector/cockroachdb/testdata/config.json
diff --git a/.../modules/cockroachdb/testdata/config.yaml → ...ollector/cockroachdb/testdata/config.yaml b/.../modules/cockroachdb/testdata/config.yaml → ...ollector/cockroachdb/testdata/config.yaml
diff --git a/.../modules/cockroachdb/testdata/metrics.txt → ...ollector/cockroachdb/testdata/metrics.txt b/.../modules/cockroachdb/testdata/metrics.txt → ...ollector/cockroachdb/testdata/metrics.txt
diff --git a/.../cockroachdb/testdata/non_cockroachdb.txt → .../cockroachdb/testdata/non_cockroachdb.txt b/.../cockroachdb/testdata/non_cockroachdb.txt → .../cockroachdb/testdata/non_cockroachdb.txt
diff --git a/src/go/plugin/go.d/modules/consul/README.md → ...go/plugin/go.d/collector/consul/README.md b/src/go/plugin/go.d/modules/consul/README.md → ...go/plugin/go.d/collector/consul/README.md
diff --git a/src/go/plugin/go.d/modules/consul/charts.go → ...go/plugin/go.d/collector/consul/charts.go b/src/go/plugin/go.d/modules/consul/charts.go → ...go/plugin/go.d/collector/consul/charts.go
diff --git a/src/go/plugin/go.d/modules/consul/collect.go → ...o/plugin/go.d/collector/consul/collect.go b/src/go/plugin/go.d/modules/consul/collect.go → ...o/plugin/go.d/collector/consul/collect.go
diff --git a/.../go.d/modules/consul/collect_autopilot.go → ...o.d/collector/consul/collect_autopilot.go b/.../go.d/modules/consul/collect_autopilot.go → ...o.d/collector/consul/collect_autopilot.go
diff --git a/...gin/go.d/modules/consul/collect_checks.go → ...n/go.d/collector/consul/collect_checks.go b/...gin/go.d/modules/consul/collect_checks.go → ...n/go.d/collector/consul/collect_checks.go
diff --git a/...gin/go.d/modules/consul/collect_config.go → ...n/go.d/collector/consul/collect_config.go b/...gin/go.d/modules/consul/collect_config.go → ...n/go.d/collector/consul/collect_config.go
diff --git a/...in/go.d/modules/consul/collect_metrics.go → .../go.d/collector/consul/collect_metrics.go b/...in/go.d/modules/consul/collect_metrics.go → .../go.d/collector/consul/collect_metrics.go
diff --git a/...in/go.d/modules/consul/collect_net_rtt.go → .../go.d/collector/consul/collect_net_rtt.go b/...in/go.d/modules/consul/collect_net_rtt.go → .../go.d/collector/consul/collect_net_rtt.go
diff --git a/...in/go.d/modules/consul/config_schema.json → .../go.d/collector/consul/config_schema.json b/...in/go.d/modules/consul/config_schema.json → .../go.d/collector/consul/config_schema.json
diff --git a/src/go/plugin/go.d/modules/consul/consul.go → ...go/plugin/go.d/collector/consul/consul.go b/src/go/plugin/go.d/modules/consul/consul.go → ...go/plugin/go.d/collector/consul/consul.go
diff --git a/...plugin/go.d/modules/consul/consul_test.go → ...ugin/go.d/collector/consul/consul_test.go b/...plugin/go.d/modules/consul/consul_test.go → ...ugin/go.d/collector/consul/consul_test.go
diff --git a/src/go/plugin/go.d/modules/consul/init.go → src/go/plugin/go.d/collector/consul/init.go b/src/go/plugin/go.d/modules/consul/init.go → src/go/plugin/go.d/collector/consul/init.go
diff --git a/...o.d/modules/consul/integrations/consul.md → ...d/collector/consul/integrations/consul.md b/...o.d/modules/consul/integrations/consul.md → ...d/collector/consul/integrations/consul.md
diff --git a/.../plugin/go.d/modules/consul/metadata.yaml → ...lugin/go.d/collector/consul/metadata.yaml b/.../plugin/go.d/modules/consul/metadata.yaml → ...lugin/go.d/collector/consul/metadata.yaml
diff --git a/.../go.d/modules/consul/testdata/config.json → ...o.d/collector/consul/testdata/config.json b/.../go.d/modules/consul/testdata/config.json → ...o.d/collector/consul/testdata/config.json
diff --git a/.../go.d/modules/consul/testdata/config.yaml → ...o.d/collector/consul/testdata/config.yaml b/.../go.d/modules/consul/testdata/config.yaml → ...o.d/collector/consul/testdata/config.yaml
diff --git a/...tdata/v1.13.2/client_v1-agent-metrics.txt → ...tdata/v1.13.2/client_v1-agent-metrics.txt b/...tdata/v1.13.2/client_v1-agent-metrics.txt → ...tdata/v1.13.2/client_v1-agent-metrics.txt
diff --git a/...estdata/v1.13.2/client_v1-agent-self.json → ...estdata/v1.13.2/client_v1-agent-self.json b/...estdata/v1.13.2/client_v1-agent-self.json → ...estdata/v1.13.2/client_v1-agent-self.json
diff --git a/...tdata/v1.13.2/server_v1-agent-metrics.txt → ...tdata/v1.13.2/server_v1-agent-metrics.txt b/...tdata/v1.13.2/server_v1-agent-metrics.txt → ...tdata/v1.13.2/server_v1-agent-metrics.txt
diff --git a/...server_v1-agent-metrics_with_hostname.txt → ...server_v1-agent-metrics_with_hostname.txt b/...server_v1-agent-metrics_with_hostname.txt → ...server_v1-agent-metrics_with_hostname.txt
diff --git a/...estdata/v1.13.2/server_v1-agent-self.json → ...estdata/v1.13.2/server_v1-agent-self.json b/...estdata/v1.13.2/server_v1-agent-self.json → ...estdata/v1.13.2/server_v1-agent-self.json
diff --git a/...2/server_v1-agent-self_cloud-managed.json → ...2/server_v1-agent-self_cloud-managed.json b/...2/server_v1-agent-self_cloud-managed.json → ...2/server_v1-agent-self_cloud-managed.json
diff --git a/...2/server_v1-agent-self_disabled_prom.json → ...2/server_v1-agent-self_disabled_prom.json b/...2/server_v1-agent-self_disabled_prom.json → ...2/server_v1-agent-self_disabled_prom.json
diff --git a/...2/server_v1-agent-self_with_hostname.json → ...2/server_v1-agent-self_with_hostname.json b/...2/server_v1-agent-self_with_hostname.json → ...2/server_v1-agent-self_with_hostname.json
diff --git a/...a/v1.13.2/server_v1-coordinate-nodes.json → ...a/v1.13.2/server_v1-coordinate-nodes.json b/...a/v1.13.2/server_v1-coordinate-nodes.json → ...a/v1.13.2/server_v1-coordinate-nodes.json
diff --git a/.../server_v1-operator-autopilot-health.json → .../server_v1-operator-autopilot-health.json b/.../server_v1-operator-autopilot-health.json → .../server_v1-operator-autopilot-health.json
diff --git a/...sul/testdata/v1.13.2/v1-agent-checks.json → ...sul/testdata/v1.13.2/v1-agent-checks.json b/...sul/testdata/v1.13.2/v1-agent-checks.json → ...sul/testdata/v1.13.2/v1-agent-checks.json
diff --git a/...v1.14.3-cloud/server_v1-agent-metrics.txt → ...v1.14.3-cloud/server_v1-agent-metrics.txt b/...v1.14.3-cloud/server_v1-agent-metrics.txt → ...v1.14.3-cloud/server_v1-agent-metrics.txt
diff --git a/...a/v1.14.3-cloud/server_v1-agent-self.json → ...a/v1.14.3-cloud/server_v1-agent-self.json b/...a/v1.14.3-cloud/server_v1-agent-self.json → ...a/v1.14.3-cloud/server_v1-agent-self.json
diff --git a/...4.3-cloud/server_v1-coordinate-nodes.json → ...4.3-cloud/server_v1-coordinate-nodes.json b/...4.3-cloud/server_v1-coordinate-nodes.json → ...4.3-cloud/server_v1-coordinate-nodes.json
diff --git a/...stdata/v1.14.3-cloud/v1-agent-checks.json → ...stdata/v1.14.3-cloud/v1-agent-checks.json b/...stdata/v1.14.3-cloud/v1-agent-checks.json → ...stdata/v1.14.3-cloud/v1-agent-checks.json
diff --git a/src/go/plugin/go.d/modules/coredns/README.md → ...o/plugin/go.d/collector/coredns/README.md b/src/go/plugin/go.d/modules/coredns/README.md → ...o/plugin/go.d/collector/coredns/README.md
diff --git a/src/go/plugin/go.d/modules/coredns/charts.go → ...o/plugin/go.d/collector/coredns/charts.go b/src/go/plugin/go.d/modules/coredns/charts.go → ...o/plugin/go.d/collector/coredns/charts.go
diff --git a/...go/plugin/go.d/modules/coredns/collect.go → .../plugin/go.d/collector/coredns/collect.go b/...go/plugin/go.d/modules/coredns/collect.go → .../plugin/go.d/collector/coredns/collect.go
diff --git a/...n/go.d/modules/coredns/config_schema.json → ...go.d/collector/coredns/config_schema.json b/...n/go.d/modules/coredns/config_schema.json → ...go.d/collector/coredns/config_schema.json
diff --git a/...go/plugin/go.d/modules/coredns/coredns.go → .../plugin/go.d/collector/coredns/coredns.go b/...go/plugin/go.d/modules/coredns/coredns.go → .../plugin/go.d/collector/coredns/coredns.go
diff --git a/...ugin/go.d/modules/coredns/coredns_test.go → ...in/go.d/collector/coredns/coredns_test.go b/...ugin/go.d/modules/coredns/coredns_test.go → ...in/go.d/collector/coredns/coredns_test.go
diff --git a/src/go/plugin/go.d/modules/coredns/init.go → src/go/plugin/go.d/collector/coredns/init.go b/src/go/plugin/go.d/modules/coredns/init.go → src/go/plugin/go.d/collector/coredns/init.go
diff --git a/...d/modules/coredns/integrations/coredns.md → ...collector/coredns/integrations/coredns.md b/...d/modules/coredns/integrations/coredns.md → ...collector/coredns/integrations/coredns.md
diff --git a/...plugin/go.d/modules/coredns/metadata.yaml → ...ugin/go.d/collector/coredns/metadata.yaml b/...plugin/go.d/modules/coredns/metadata.yaml → ...ugin/go.d/collector/coredns/metadata.yaml
diff --git a/...go/plugin/go.d/modules/coredns/metrics.go → .../plugin/go.d/collector/coredns/metrics.go b/...go/plugin/go.d/modules/coredns/metrics.go → .../plugin/go.d/collector/coredns/metrics.go
diff --git a/...go.d/modules/coredns/testdata/config.json → ....d/collector/coredns/testdata/config.json b/...go.d/modules/coredns/testdata/config.json → ....d/collector/coredns/testdata/config.json
diff --git a/...go.d/modules/coredns/testdata/config.yaml → ....d/collector/coredns/testdata/config.yaml b/...go.d/modules/coredns/testdata/config.yaml → ....d/collector/coredns/testdata/config.yaml
diff --git a/...s/coredns/testdata/no_version/no_load.txt → ...r/coredns/testdata/no_version/no_load.txt b/...s/coredns/testdata/no_version/no_load.txt → ...r/coredns/testdata/no_version/no_load.txt
diff --git a/...s/coredns/testdata/version169/no_load.txt → ...r/coredns/testdata/version169/no_load.txt b/...s/coredns/testdata/version169/no_load.txt → ...r/coredns/testdata/version169/no_load.txt
diff --git a/...coredns/testdata/version169/some_load.txt → ...coredns/testdata/version169/some_load.txt b/...coredns/testdata/version169/some_load.txt → ...coredns/testdata/version169/some_load.txt
diff --git a/...s/coredns/testdata/version170/no_load.txt → ...r/coredns/testdata/version170/no_load.txt b/...s/coredns/testdata/version170/no_load.txt → ...r/coredns/testdata/version170/no_load.txt
diff --git a/...coredns/testdata/version170/some_load.txt → ...coredns/testdata/version170/some_load.txt b/...coredns/testdata/version170/some_load.txt → ...coredns/testdata/version170/some_load.txt
diff --git a/...o/plugin/go.d/modules/couchbase/README.md → ...plugin/go.d/collector/couchbase/README.md b/...o/plugin/go.d/modules/couchbase/README.md → ...plugin/go.d/collector/couchbase/README.md
diff --git a/...o/plugin/go.d/modules/couchbase/charts.go → ...plugin/go.d/collector/couchbase/charts.go b/...o/plugin/go.d/modules/couchbase/charts.go → ...plugin/go.d/collector/couchbase/charts.go
diff --git a/.../plugin/go.d/modules/couchbase/collect.go → ...lugin/go.d/collector/couchbase/collect.go b/.../plugin/go.d/modules/couchbase/collect.go → ...lugin/go.d/collector/couchbase/collect.go
diff --git a/...go.d/modules/couchbase/config_schema.json → ....d/collector/couchbase/config_schema.json b/...go.d/modules/couchbase/config_schema.json → ....d/collector/couchbase/config_schema.json
diff --git a/...lugin/go.d/modules/couchbase/couchbase.go → ...gin/go.d/collector/couchbase/couchbase.go b/...lugin/go.d/modules/couchbase/couchbase.go → ...gin/go.d/collector/couchbase/couchbase.go
diff --git a/.../go.d/modules/couchbase/couchbase_test.go → ...o.d/collector/couchbase/couchbase_test.go b/.../go.d/modules/couchbase/couchbase_test.go → ...o.d/collector/couchbase/couchbase_test.go
diff --git a/src/go/plugin/go.d/modules/couchbase/init.go → ...o/plugin/go.d/collector/couchbase/init.go b/src/go/plugin/go.d/modules/couchbase/init.go → ...o/plugin/go.d/collector/couchbase/init.go
diff --git a/...dules/couchbase/integrations/couchbase.md → ...ector/couchbase/integrations/couchbase.md b/...dules/couchbase/integrations/couchbase.md → ...ector/couchbase/integrations/couchbase.md
diff --git a/...ugin/go.d/modules/couchbase/metadata.yaml → ...in/go.d/collector/couchbase/metadata.yaml b/...ugin/go.d/modules/couchbase/metadata.yaml → ...in/go.d/collector/couchbase/metadata.yaml
diff --git a/.../plugin/go.d/modules/couchbase/metrics.go → ...lugin/go.d/collector/couchbase/metrics.go b/.../plugin/go.d/modules/couchbase/metrics.go → ...lugin/go.d/collector/couchbase/metrics.go
diff --git a/...e/testdata/6.6.0/buckets_basic_stats.json → ...e/testdata/6.6.0/buckets_basic_stats.json b/...e/testdata/6.6.0/buckets_basic_stats.json → ...e/testdata/6.6.0/buckets_basic_stats.json
diff --git a/....d/modules/couchbase/testdata/config.json → .../collector/couchbase/testdata/config.json b/....d/modules/couchbase/testdata/config.json → .../collector/couchbase/testdata/config.json
diff --git a/....d/modules/couchbase/testdata/config.yaml → .../collector/couchbase/testdata/config.yaml b/....d/modules/couchbase/testdata/config.yaml → .../collector/couchbase/testdata/config.yaml
diff --git a/src/go/plugin/go.d/modules/couchdb/README.md → ...o/plugin/go.d/collector/couchdb/README.md b/src/go/plugin/go.d/modules/couchdb/README.md → ...o/plugin/go.d/collector/couchdb/README.md
diff --git a/src/go/plugin/go.d/modules/couchdb/charts.go → ...o/plugin/go.d/collector/couchdb/charts.go b/src/go/plugin/go.d/modules/couchdb/charts.go → ...o/plugin/go.d/collector/couchdb/charts.go
diff --git a/...go/plugin/go.d/modules/couchdb/collect.go → .../plugin/go.d/collector/couchdb/collect.go b/...go/plugin/go.d/modules/couchdb/collect.go → .../plugin/go.d/collector/couchdb/collect.go
diff --git a/...n/go.d/modules/couchdb/config_schema.json → ...go.d/collector/couchdb/config_schema.json b/...n/go.d/modules/couchdb/config_schema.json → ...go.d/collector/couchdb/config_schema.json
diff --git a/...go/plugin/go.d/modules/couchdb/couchdb.go → .../plugin/go.d/collector/couchdb/couchdb.go b/...go/plugin/go.d/modules/couchdb/couchdb.go → .../plugin/go.d/collector/couchdb/couchdb.go
diff --git a/...ugin/go.d/modules/couchdb/couchdb_test.go → ...in/go.d/collector/couchdb/couchdb_test.go b/...ugin/go.d/modules/couchdb/couchdb_test.go → ...in/go.d/collector/couchdb/couchdb_test.go
diff --git a/src/go/plugin/go.d/modules/couchdb/init.go → src/go/plugin/go.d/collector/couchdb/init.go b/src/go/plugin/go.d/modules/couchdb/init.go → src/go/plugin/go.d/collector/couchdb/init.go
diff --git a/...d/modules/couchdb/integrations/couchdb.md → ...collector/couchdb/integrations/couchdb.md b/...d/modules/couchdb/integrations/couchdb.md → ...collector/couchdb/integrations/couchdb.md
diff --git a/...plugin/go.d/modules/couchdb/metadata.yaml → ...ugin/go.d/collector/couchdb/metadata.yaml b/...plugin/go.d/modules/couchdb/metadata.yaml → ...ugin/go.d/collector/couchdb/metadata.yaml
diff --git a/...go/plugin/go.d/modules/couchdb/metrics.go → .../plugin/go.d/collector/couchdb/metrics.go b/...go/plugin/go.d/modules/couchdb/metrics.go → .../plugin/go.d/collector/couchdb/metrics.go
diff --git a/...go.d/modules/couchdb/testdata/config.json → ....d/collector/couchdb/testdata/config.json b/...go.d/modules/couchdb/testdata/config.json → ....d/collector/couchdb/testdata/config.json
diff --git a/...go.d/modules/couchdb/testdata/config.yaml → ....d/collector/couchdb/testdata/config.yaml b/...go.d/modules/couchdb/testdata/config.yaml → ....d/collector/couchdb/testdata/config.yaml
diff --git a/...couchdb/testdata/v3.1.1/active_tasks.json → ...couchdb/testdata/v3.1.1/active_tasks.json b/...couchdb/testdata/v3.1.1/active_tasks.json → ...couchdb/testdata/v3.1.1/active_tasks.json
diff --git a/...les/couchdb/testdata/v3.1.1/dbs_info.json → ...tor/couchdb/testdata/v3.1.1/dbs_info.json b/...les/couchdb/testdata/v3.1.1/dbs_info.json → ...tor/couchdb/testdata/v3.1.1/dbs_info.json
diff --git a/...s/couchdb/testdata/v3.1.1/node_stats.json → ...r/couchdb/testdata/v3.1.1/node_stats.json b/...s/couchdb/testdata/v3.1.1/node_stats.json → ...r/couchdb/testdata/v3.1.1/node_stats.json
diff --git a/.../couchdb/testdata/v3.1.1/node_system.json → .../couchdb/testdata/v3.1.1/node_system.json b/.../couchdb/testdata/v3.1.1/node_system.json → .../couchdb/testdata/v3.1.1/node_system.json
diff --git a/...modules/couchdb/testdata/v3.1.1/root.json → ...llector/couchdb/testdata/v3.1.1/root.json b/...modules/couchdb/testdata/v3.1.1/root.json → ...llector/couchdb/testdata/v3.1.1/root.json
diff --git a/src/go/plugin/go.d/modules/dmcache/README.md → ...o/plugin/go.d/collector/dmcache/README.md b/src/go/plugin/go.d/modules/dmcache/README.md → ...o/plugin/go.d/collector/dmcache/README.md
diff --git a/src/go/plugin/go.d/modules/dmcache/charts.go → ...o/plugin/go.d/collector/dmcache/charts.go b/src/go/plugin/go.d/modules/dmcache/charts.go → ...o/plugin/go.d/collector/dmcache/charts.go
diff --git a/...go/plugin/go.d/modules/dmcache/collect.go → .../plugin/go.d/collector/dmcache/collect.go b/...go/plugin/go.d/modules/dmcache/collect.go → .../plugin/go.d/collector/dmcache/collect.go
diff --git a/...n/go.d/modules/dmcache/config_schema.json → ...go.d/collector/dmcache/config_schema.json b/...n/go.d/modules/dmcache/config_schema.json → ...go.d/collector/dmcache/config_schema.json
diff --git a/...go/plugin/go.d/modules/dmcache/dmcache.go → .../plugin/go.d/collector/dmcache/dmcache.go b/...go/plugin/go.d/modules/dmcache/dmcache.go → .../plugin/go.d/collector/dmcache/dmcache.go
diff --git a/...ugin/go.d/modules/dmcache/dmcache_test.go → ...in/go.d/collector/dmcache/dmcache_test.go b/...ugin/go.d/modules/dmcache/dmcache_test.go → ...in/go.d/collector/dmcache/dmcache_test.go
diff --git a/src/go/plugin/go.d/modules/dmcache/doc.go → src/go/plugin/go.d/collector/dmcache/doc.go b/src/go/plugin/go.d/modules/dmcache/doc.go → src/go/plugin/go.d/collector/dmcache/doc.go
diff --git a/src/go/plugin/go.d/modules/dmcache/exec.go → src/go/plugin/go.d/collector/dmcache/exec.go b/src/go/plugin/go.d/modules/dmcache/exec.go → src/go/plugin/go.d/collector/dmcache/exec.go
diff --git a/src/go/plugin/go.d/modules/dmcache/init.go → src/go/plugin/go.d/collector/dmcache/init.go b/src/go/plugin/go.d/modules/dmcache/init.go → src/go/plugin/go.d/collector/dmcache/init.go
diff --git a/...s/dmcache/integrations/dmcache_devices.md → ...r/dmcache/integrations/dmcache_devices.md b/...s/dmcache/integrations/dmcache_devices.md → ...r/dmcache/integrations/dmcache_devices.md
diff --git a/...plugin/go.d/modules/dmcache/metadata.yaml → ...ugin/go.d/collector/dmcache/metadata.yaml b/...plugin/go.d/modules/dmcache/metadata.yaml → ...ugin/go.d/collector/dmcache/metadata.yaml
diff --git a/...go.d/modules/dmcache/testdata/config.json → ....d/collector/dmcache/testdata/config.json b/...go.d/modules/dmcache/testdata/config.json → ....d/collector/dmcache/testdata/config.json
diff --git a/...go.d/modules/dmcache/testdata/config.yaml → ....d/collector/dmcache/testdata/config.yaml b/...go.d/modules/dmcache/testdata/config.yaml → ....d/collector/dmcache/testdata/config.yaml
diff --git a/src/go/plugin/go.d/modules/dnsdist/README.md → ...o/plugin/go.d/collector/dnsdist/README.md b/src/go/plugin/go.d/modules/dnsdist/README.md → ...o/plugin/go.d/collector/dnsdist/README.md
diff --git a/src/go/plugin/go.d/modules/dnsdist/charts.go → ...o/plugin/go.d/collector/dnsdist/charts.go b/src/go/plugin/go.d/modules/dnsdist/charts.go → ...o/plugin/go.d/collector/dnsdist/charts.go
diff --git a/...go/plugin/go.d/modules/dnsdist/collect.go → .../plugin/go.d/collector/dnsdist/collect.go b/...go/plugin/go.d/modules/dnsdist/collect.go → .../plugin/go.d/collector/dnsdist/collect.go