From 1488c3ed6efa087d9ee9a3c4287f8a8eacc0df83 Mon Sep 17 00:00:00 2001 From: Ilya Mashchenko Date: Mon, 25 Nov 2024 20:27:32 +0200 Subject: [PATCH] chore(go.d.plugin): renames (#19081) --- .gitignore | 2 +- src/go/cmd/godplugin/main.go | 2 +- .../{modules => collector}/activemq/README.md | 0 .../activemq/activemq.go | 0 .../activemq/activemq_test.go | 0 .../activemq/apiclient.go | 0 .../{modules => collector}/activemq/charts.go | 0 .../activemq/collect.go | 0 .../activemq/config_schema.json | 0 .../{modules => collector}/activemq/init.go | 0 .../activemq/integrations/activemq.md | 0 .../activemq/metadata.yaml | 0 .../activemq/testdata/config.json | 0 .../activemq/testdata/config.yaml | 0 .../adaptecraid/README.md | 0 .../adaptecraid/adaptec.go | 0 .../adaptecraid/adaptec_test.go | 0 .../adaptecraid/charts.go | 0 .../adaptecraid/collect.go | 0 .../adaptecraid/collect_ld.go | 0 .../adaptecraid/collect_pd.go | 0 .../adaptecraid/config_schema.json | 0 .../{modules => collector}/adaptecraid/doc.go | 0 .../adaptecraid/exec.go | 0 .../adaptecraid/init.go | 0 .../adaptecraid/integrations/adaptec_raid.md | 0 .../adaptecraid/metadata.yaml | 0 .../adaptecraid/testdata/config.json | 0 .../adaptecraid/testdata/config.yaml | 0 .../testdata/getconfig-ld-current.txt | 0 .../adaptecraid/testdata/getconfig-ld-old.txt | 0 .../testdata/getconfig-pd-current.txt | 0 .../adaptecraid/testdata/getconfig-pd-old.txt | 0 .../go.d/{modules => collector}/ap/README.md | 0 .../go.d/{modules => collector}/ap/ap.go | 0 .../go.d/{modules => collector}/ap/ap_test.go | 0 .../go.d/{modules => collector}/ap/charts.go | 0 .../go.d/{modules => collector}/ap/collect.go | 0 .../ap/config_schema.json | 0 .../go.d/{modules => collector}/ap/doc.go | 0 .../go.d/{modules => collector}/ap/exec.go | 0 .../go.d/{modules => collector}/ap/init.go | 0 .../ap/integrations/access_points.md | 0 .../{modules => collector}/ap/metadata.yaml | 0 .../ap/testdata/config.json | 0 .../ap/testdata/config.yaml | 0 .../ap/testdata/iw_dev_ap.txt | 0 .../ap/testdata/iw_dev_managed.txt | 0 .../ap/testdata/station_dump.txt | 0 .../{modules => collector}/apache/README.md | 0 .../{modules => collector}/apache/apache.go | 0 .../apache/apache_test.go | 0 .../{modules => collector}/apache/charts.go | 0 .../{modules => collector}/apache/collect.go | 0 .../apache/config_schema.json | 0 .../{modules => collector}/apache/init.go | 0 .../apache/integrations/apache.md | 0 .../apache/integrations/httpd.md | 0 .../apache/metadata.yaml | 0 .../{modules => collector}/apache/metrics.go | 0 .../apache/testdata/config.json | 0 .../apache/testdata/config.yaml | 0 .../testdata/extended-status-mpm-event.txt | 0 .../testdata/extended-status-mpm-prefork.txt | 0 .../apache/testdata/lighttpd-status.txt | 0 .../testdata/simple-status-mpm-event.txt | 0 .../{modules => collector}/apcupsd/README.md | 0 .../{modules => collector}/apcupsd/apcupsd.go | 0 .../apcupsd/apcupsd_test.go | 0 .../{modules => collector}/apcupsd/charts.go | 0 .../{modules => collector}/apcupsd/client.go | 0 .../{modules => collector}/apcupsd/collect.go | 0 .../apcupsd/config_schema.json | 0 .../apcupsd/integrations/apc_ups.md | 0 .../apcupsd/metadata.yaml | 0 .../{modules => collector}/apcupsd/status.go | 0 .../apcupsd/testdata/config.json | 0 .../apcupsd/testdata/config.yaml | 0 .../apcupsd/testdata/status.txt | 0 .../apcupsd/testdata/status_commlost.txt | 0 .../beanstalk/README.md | 0 .../beanstalk/beanstalk.go | 0 .../beanstalk/beanstalk_test.go | 0 .../beanstalk/charts.go | 0 .../beanstalk/client.go | 0 .../beanstalk/collect.go | 0 .../beanstalk/config_schema.json | 0 .../{modules => collector}/beanstalk/init.go | 0 .../beanstalk/integrations/beanstalk.md | 0 .../beanstalk/metadata.yaml | 0 .../beanstalk/testdata/config.json | 0 .../beanstalk/testdata/config.yaml | 0 .../beanstalk/testdata/list-tubes.txt | 0 .../beanstalk/testdata/stats-tube-default.txt | 0 .../beanstalk/testdata/stats.txt | 0 .../{modules => collector}/bind/README.md | 0 .../go.d/{modules => collector}/bind/bind.go | 0 .../{modules => collector}/bind/bind_test.go | 0 .../{modules => collector}/bind/charts.go | 0 .../{modules => collector}/bind/collect.go | 0 .../bind/config_schema.json | 0 .../go.d/{modules => collector}/bind/init.go | 0 .../bind/json_client.go | 0 .../bind/testdata/config.json | 0 .../bind/testdata/config.yaml | 0 .../bind/testdata/query-server.json | 0 .../bind/testdata/query-server.xml | 0 .../bind/xml3_client.go | 0 .../{modules => collector}/boinc/README.md | 0 .../{modules => collector}/boinc/boinc.go | 0 .../boinc/boinc_test.go | 0 .../{modules => collector}/boinc/charts.go | 0 .../{modules => collector}/boinc/client.go | 0 .../boinc/client_proto.go | 0 .../{modules => collector}/boinc/collect.go | 0 .../boinc/config_schema.json | 0 .../boinc/integrations/boinc.md | 0 .../boinc/metadata.yaml | 0 .../boinc/testdata/config.json | 0 .../boinc/testdata/config.yaml | 0 .../boinc/testdata/get_results.xml | 0 .../boinc/testdata/get_results_no_tasks.xml | 0 .../cassandra/README.md | 0 .../cassandra/cassandra.go | 0 .../cassandra/cassandra_test.go | 0 .../cassandra/charts.go | 0 .../cassandra/collect.go | 0 .../cassandra/config_schema.json | 0 .../{modules => collector}/cassandra/init.go | 0 .../cassandra/integrations/cassandra.md | 0 .../cassandra/jmx_exporter.yaml | 0 .../cassandra/metadata.yaml | 0 .../cassandra/metrics.go | 0 .../cassandra/testdata/config.json | 0 .../cassandra/testdata/config.yaml | 0 .../cassandra/testdata/metrics.txt | 0 .../{modules => collector}/ceph/README.md | 0 .../go.d/{modules => collector}/ceph/api.go | 0 .../go.d/{modules => collector}/ceph/auth.go | 0 .../go.d/{modules => collector}/ceph/ceph.go | 0 .../{modules => collector}/ceph/ceph_test.go | 0 .../{modules => collector}/ceph/charts.go | 0 .../{modules => collector}/ceph/collect.go | 0 .../ceph/collect_health.go | 0 .../ceph/collect_osd.go | 0 .../ceph/collect_pools.go | 0 .../ceph/config_schema.json | 0 .../go.d/{modules => collector}/ceph/init.go | 0 .../ceph/integrations/ceph.md | 0 .../{modules => collector}/ceph/metadata.yaml | 0 .../ceph/testdata/config.json | 0 .../ceph/testdata/config.yaml | 0 .../testdata/v16.2.15/api_health_minimal.json | 0 .../ceph/testdata/v16.2.15/api_monitor.json | 0 .../ceph/testdata/v16.2.15/api_osd.json | 0 .../testdata/v16.2.15/api_pool_stats.json | 0 .../{modules => collector}/chrony/README.md | 0 .../{modules => collector}/chrony/charts.go | 0 .../{modules => collector}/chrony/chrony.go | 0 .../chrony/chrony_test.go | 0 .../{modules => collector}/chrony/client.go | 0 .../{modules => collector}/chrony/collect.go | 0 .../chrony/config_schema.json | 0 .../{modules => collector}/chrony/exec.go | 0 .../{modules => collector}/chrony/init.go | 0 .../chrony/integrations/chrony.md | 0 .../chrony/metadata.yaml | 0 .../chrony/testdata/config.json | 0 .../chrony/testdata/config.yaml | 0 .../clickhouse/README.md | 0 .../clickhouse/charts.go | 0 .../clickhouse/clickhouse.go | 0 .../clickhouse/clickhouse_test.go | 0 .../clickhouse/collect.go | 0 .../collect_system_async_metrics.go | 0 .../clickhouse/collect_system_disks.go | 0 .../clickhouse/collect_system_events.go | 0 .../clickhouse/collect_system_metrics.go | 0 .../clickhouse/collect_system_parts.go | 0 .../clickhouse/collect_system_processes.go | 0 .../clickhouse/config_schema.json | 0 .../{modules => collector}/clickhouse/init.go | 0 .../clickhouse/integrations/clickhouse.md | 0 .../clickhouse/metadata.yaml | 0 .../clickhouse/testdata/config.json | 0 .../clickhouse/testdata/config.yaml | 0 .../testdata/resp_longest_query_time.csv | 0 .../testdata/resp_system_async_metrics.csv | 0 .../clickhouse/testdata/resp_system_disks.csv | 0 .../testdata/resp_system_events.csv | 0 .../testdata/resp_system_metrics.csv | 0 .../clickhouse/testdata/resp_system_parts.csv | 0 .../cockroachdb/README.md | 0 .../cockroachdb/charts.go | 0 .../cockroachdb/cockroachdb.go | 0 .../cockroachdb/cockroachdb_test.go | 0 .../cockroachdb/collect.go | 0 .../cockroachdb/config_schema.json | 0 .../cockroachdb/init.go | 0 .../cockroachdb/integrations/cockroachdb.md | 0 .../cockroachdb/metadata.yaml | 0 .../cockroachdb/metrics.go | 0 .../cockroachdb/testdata/config.json | 0 .../cockroachdb/testdata/config.yaml | 0 .../cockroachdb/testdata/metrics.txt | 0 .../cockroachdb/testdata/non_cockroachdb.txt | 0 .../{modules => collector}/consul/README.md | 0 .../{modules => collector}/consul/charts.go | 0 .../{modules => collector}/consul/collect.go | 0 .../consul/collect_autopilot.go | 0 .../consul/collect_checks.go | 0 .../consul/collect_config.go | 0 .../consul/collect_metrics.go | 0 .../consul/collect_net_rtt.go | 0 .../consul/config_schema.json | 0 .../{modules => collector}/consul/consul.go | 0 .../consul/consul_test.go | 0 .../{modules => collector}/consul/init.go | 0 .../consul/integrations/consul.md | 0 .../consul/metadata.yaml | 0 .../consul/testdata/config.json | 0 .../consul/testdata/config.yaml | 0 .../v1.13.2/client_v1-agent-metrics.txt | 0 .../v1.13.2/client_v1-agent-self.json | 0 .../v1.13.2/server_v1-agent-metrics.txt | 0 .../server_v1-agent-metrics_with_hostname.txt | 0 .../v1.13.2/server_v1-agent-self.json | 0 .../server_v1-agent-self_cloud-managed.json | 0 .../server_v1-agent-self_disabled_prom.json | 0 .../server_v1-agent-self_with_hostname.json | 0 .../v1.13.2/server_v1-coordinate-nodes.json | 0 .../server_v1-operator-autopilot-health.json | 0 .../testdata/v1.13.2/v1-agent-checks.json | 0 .../v1.14.3-cloud/server_v1-agent-metrics.txt | 0 .../v1.14.3-cloud/server_v1-agent-self.json | 0 .../server_v1-coordinate-nodes.json | 0 .../v1.14.3-cloud/v1-agent-checks.json | 0 .../{modules => collector}/coredns/README.md | 0 .../{modules => collector}/coredns/charts.go | 0 .../{modules => collector}/coredns/collect.go | 0 .../coredns/config_schema.json | 0 .../{modules => collector}/coredns/coredns.go | 0 .../coredns/coredns_test.go | 0 .../{modules => collector}/coredns/init.go | 0 .../coredns/integrations/coredns.md | 0 .../coredns/metadata.yaml | 0 .../{modules => collector}/coredns/metrics.go | 0 .../coredns/testdata/config.json | 0 .../coredns/testdata/config.yaml | 0 .../coredns/testdata/no_version/no_load.txt | 0 .../coredns/testdata/version169/no_load.txt | 0 .../coredns/testdata/version169/some_load.txt | 0 .../coredns/testdata/version170/no_load.txt | 0 .../coredns/testdata/version170/some_load.txt | 0 .../couchbase/README.md | 0 .../couchbase/charts.go | 0 .../couchbase/collect.go | 0 .../couchbase/config_schema.json | 0 .../couchbase/couchbase.go | 0 .../couchbase/couchbase_test.go | 0 .../{modules => collector}/couchbase/init.go | 0 .../couchbase/integrations/couchbase.md | 0 .../couchbase/metadata.yaml | 0 .../couchbase/metrics.go | 0 .../testdata/6.6.0/buckets_basic_stats.json | 0 .../couchbase/testdata/config.json | 0 .../couchbase/testdata/config.yaml | 0 .../{modules => collector}/couchdb/README.md | 0 .../{modules => collector}/couchdb/charts.go | 0 .../{modules => collector}/couchdb/collect.go | 0 .../couchdb/config_schema.json | 0 .../{modules => collector}/couchdb/couchdb.go | 0 .../couchdb/couchdb_test.go | 0 .../{modules => collector}/couchdb/init.go | 0 .../couchdb/integrations/couchdb.md | 0 .../couchdb/metadata.yaml | 0 .../{modules => collector}/couchdb/metrics.go | 0 .../couchdb/testdata/config.json | 0 .../couchdb/testdata/config.yaml | 0 .../couchdb/testdata/v3.1.1/active_tasks.json | 0 .../couchdb/testdata/v3.1.1/dbs_info.json | 0 .../couchdb/testdata/v3.1.1/node_stats.json | 0 .../couchdb/testdata/v3.1.1/node_system.json | 0 .../couchdb/testdata/v3.1.1/root.json | 0 .../{modules => collector}/dmcache/README.md | 0 .../{modules => collector}/dmcache/charts.go | 0 .../{modules => collector}/dmcache/collect.go | 0 .../dmcache/config_schema.json | 0 .../{modules => collector}/dmcache/dmcache.go | 0 .../dmcache/dmcache_test.go | 0 .../{modules => collector}/dmcache/doc.go | 0 .../{modules => collector}/dmcache/exec.go | 0 .../{modules => collector}/dmcache/init.go | 0 .../dmcache/integrations/dmcache_devices.md | 0 .../dmcache/metadata.yaml | 0 .../dmcache/testdata/config.json | 0 .../dmcache/testdata/config.yaml | 0 .../{modules => collector}/dnsdist/README.md | 0 .../{modules => collector}/dnsdist/charts.go | 0 .../{modules => collector}/dnsdist/collect.go | 0 .../dnsdist/config_schema.json | 0 .../{modules => collector}/dnsdist/dnsdist.go | 0 .../dnsdist/dnsdist_test.go | 0 .../{modules => collector}/dnsdist/init.go | 0 .../dnsdist/integrations/dnsdist.md | 0 .../dnsdist/metadata.yaml | 0 .../{modules => collector}/dnsdist/metrics.go | 0 .../dnsdist/testdata/config.json | 0 .../dnsdist/testdata/config.yaml | 0 .../dnsdist/testdata/v1.5.1/jsonstat.json | 0 .../{modules => collector}/dnsmasq/README.md | 0 .../{modules => collector}/dnsmasq/charts.go | 0 .../{modules => collector}/dnsmasq/collect.go | 0 .../dnsmasq/config_schema.json | 0 .../{modules => collector}/dnsmasq/dnsmasq.go | 0 .../dnsmasq/dnsmasq_test.go | 0 .../{modules => collector}/dnsmasq/init.go | 0 .../dnsmasq/integrations/dnsmasq.md | 0 .../dnsmasq/metadata.yaml | 0 .../dnsmasq/testdata/config.json | 0 .../dnsmasq/testdata/config.yaml | 0 .../dnsmasq_dhcp/README.md | 0 .../dnsmasq_dhcp/charts.go | 0 .../dnsmasq_dhcp/collect.go | 0 .../dnsmasq_dhcp/config_schema.json | 0 .../dnsmasq_dhcp/dhcp.go | 0 .../dnsmasq_dhcp/dhcp_test.go | 0 .../dnsmasq_dhcp/doc.go | 0 .../dnsmasq_dhcp/init.go | 0 .../dnsmasq_dhcp/integrations/dnsmasq_dhcp.md | 0 .../dnsmasq_dhcp/metadata.yaml | 0 .../dnsmasq_dhcp/parse_configuration.go | 0 .../dnsmasq_dhcp/testdata/config.json | 0 .../dnsmasq_dhcp/testdata/config.yaml | 0 .../dnsmasq_dhcp/testdata/dnsmasq.conf | 0 .../testdata/dnsmasq.d/.dnsmasq.conf | 0 .../testdata/dnsmasq.d/dnsmasqv4.any | 0 .../testdata/dnsmasq.d/dnsmasqv6.any | 0 .../testdata/dnsmasq.d2/dnsmasqv4.any | 0 .../testdata/dnsmasq.d2/dnsmasqv6.any | 0 .../testdata/dnsmasq.d2/~dnsmasq.conf | 0 .../testdata/dnsmasq.d3/dnsmasq.bak | 0 .../testdata/dnsmasq.d3/dnsmasqv4.any | 0 .../testdata/dnsmasq.d3/dnsmasqv6.any | 0 .../testdata/dnsmasq.d4/dnsmasq.other | 0 .../testdata/dnsmasq.d4/dnsmasqv4.conf | 0 .../testdata/dnsmasq.d4/dnsmasqv6.conf | 0 .../dnsmasq_dhcp/testdata/dnsmasq.leases | 0 .../dnsmasq_dhcp/testdata/dnsmasq2.conf | 0 .../dnsmasq_dhcp/testdata/dnsmasq3.conf | 0 .../{modules => collector}/dnsquery/README.md | 0 .../{modules => collector}/dnsquery/charts.go | 0 .../dnsquery/collect.go | 0 .../dnsquery/config_schema.json | 0 .../dnsquery/dnsquery.go | 0 .../dnsquery/dnsquery_test.go | 0 .../{modules => collector}/dnsquery/init.go | 0 .../dnsquery/integrations/dns_query.md | 0 .../dnsquery/metadata.yaml | 0 .../dnsquery/testdata/config.json | 0 .../dnsquery/testdata/config.yaml | 0 .../{modules => collector}/docker/README.md | 0 .../{modules => collector}/docker/charts.go | 0 .../{modules => collector}/docker/collect.go | 0 .../docker/config_schema.json | 0 .../{modules => collector}/docker/docker.go | 0 .../docker/docker_test.go | 0 .../docker/integrations/docker.md | 0 .../docker/metadata.yaml | 0 .../docker/testdata/config.json | 0 .../docker/testdata/config.yaml | 0 .../docker_engine/README.md | 0 .../docker_engine/charts.go | 0 .../docker_engine/collect.go | 0 .../docker_engine/config_schema.json | 0 .../docker_engine/docker_engine.go | 0 .../docker_engine/docker_engine_test.go | 0 .../docker_engine/init.go | 0 .../integrations/docker_engine.md | 0 .../docker_engine/metadata.yaml | 0 .../docker_engine/metrics.go | 0 .../docker_engine/testdata/config.json | 0 .../docker_engine/testdata/config.yaml | 0 .../testdata/non-docker-engine.txt | 0 .../docker_engine/testdata/v17.05.0-ce.txt | 0 .../testdata/v18.09.3-ce-swarm.txt | 0 .../docker_engine/testdata/v18.09.3-ce.txt | 0 .../dockerhub/README.md | 0 .../dockerhub/apiclient.go | 0 .../dockerhub/charts.go | 0 .../dockerhub/collect.go | 0 .../dockerhub/config_schema.json | 0 .../dockerhub/dockerhub.go | 0 .../dockerhub/dockerhub_test.go | 0 .../{modules => collector}/dockerhub/init.go | 0 .../integrations/docker_hub_repository.md | 0 .../dockerhub/metadata.yaml | 0 .../dockerhub/testdata/config.json | 0 .../dockerhub/testdata/config.yaml | 0 .../dockerhub/testdata/repo1.txt | 0 .../dockerhub/testdata/repo2.txt | 0 .../dockerhub/testdata/repo3.txt | 0 .../{modules => collector}/dovecot/README.md | 0 .../{modules => collector}/dovecot/charts.go | 0 .../{modules => collector}/dovecot/client.go | 0 .../{modules => collector}/dovecot/collect.go | 0 .../dovecot/config_schema.json | 0 .../{modules => collector}/dovecot/dovecot.go | 0 .../dovecot/dovecot_test.go | 0 .../dovecot/integrations/dovecot.md | 0 .../dovecot/metadata.yaml | 0 .../dovecot/testdata/config.json | 0 .../dovecot/testdata/config.yaml | 0 .../dovecot/testdata/export_global.txt | 0 .../elasticsearch/README.md | 0 .../elasticsearch/charts.go | 0 .../elasticsearch/collect.go | 0 .../elasticsearch/config_schema.json | 0 .../elasticsearch/elasticsearch.go | 0 .../elasticsearch/elasticsearch_test.go | 0 .../elasticsearch/init.go | 0 .../integrations/elasticsearch.md | 0 .../elasticsearch/integrations/opensearch.md | 0 .../elasticsearch/metadata.yaml | 0 .../elasticsearch/metrics.go | 0 .../elasticsearch/testdata/config.json | 0 .../elasticsearch/testdata/config.yaml | 0 .../testdata/v8.4.2/cat_indices_stats.json | 0 .../testdata/v8.4.2/cluster_health.json | 0 .../testdata/v8.4.2/cluster_stats.json | 0 .../elasticsearch/testdata/v8.4.2/info.json | 0 .../testdata/v8.4.2/nodes_local_stats.json | 0 .../testdata/v8.4.2/nodes_stats.json | 0 .../{modules => collector}/envoy/README.md | 0 .../{modules => collector}/envoy/charts.go | 0 .../{modules => collector}/envoy/collect.go | 0 .../envoy/config_schema.json | 0 .../{modules => collector}/envoy/envoy.go | 0 .../envoy/envoy_test.go | 0 .../go.d/{modules => collector}/envoy/init.go | 0 .../envoy/integrations/envoy.md | 0 .../envoy/metadata.yaml | 0 .../envoy/testdata/config.json | 0 .../envoy/testdata/config.yaml | 0 .../envoy/testdata/consul-dataplane.txt | 0 .../envoy/testdata/envoy.txt | 0 .../{modules => collector}/exim/README.md | 0 .../{modules => collector}/exim/charts.go | 0 .../{modules => collector}/exim/collect.go | 0 .../exim/config_schema.json | 0 .../go.d/{modules => collector}/exim/exec.go | 0 .../go.d/{modules => collector}/exim/exim.go | 0 .../{modules => collector}/exim/exim_test.go | 0 .../go.d/{modules => collector}/exim/init.go | 0 .../exim/integrations/exim.md | 0 .../{modules => collector}/exim/metadata.yaml | 0 .../exim/testdata/config.json | 0 .../exim/testdata/config.yaml | 0 .../{modules => collector}/fail2ban/README.md | 0 .../{modules => collector}/fail2ban/charts.go | 0 .../fail2ban/collect.go | 0 .../fail2ban/config_schema.json | 0 .../{modules => collector}/fail2ban/doc.go | 0 .../{modules => collector}/fail2ban/exec.go | 0 .../fail2ban/fail2ban.go | 0 .../fail2ban/fail2ban_test.go | 0 .../{modules => collector}/fail2ban/init.go | 0 .../fail2ban/integrations/fail2ban.md | 0 .../fail2ban/metadata.yaml | 0 .../fail2ban/testdata/config.json | 0 .../fail2ban/testdata/config.yaml | 0 .../testdata/fail2ban-jail-status.txt | 0 .../fail2ban/testdata/fail2ban-status.txt | 0 .../filecheck/README.md | 0 .../{modules => collector}/filecheck/cache.go | 0 .../filecheck/charts.go | 0 .../filecheck/collect.go | 0 .../filecheck/collect_dirs.go | 0 .../filecheck/collect_files.go | 0 .../filecheck/config_schema.json | 0 .../filecheck/discover.go | 0 .../filecheck/filecheck.go | 0 .../filecheck/filecheck_test.go | 0 .../{modules => collector}/filecheck/init.go | 0 .../integrations/files_and_directories.md | 0 .../filecheck/metadata.yaml | 0 .../filecheck/testdata/config.json | 0 .../filecheck/testdata/config.yaml | 0 .../filecheck/testdata/dir/empty_file.log | 0 .../filecheck/testdata/dir/file.log | 0 .../testdata/dir/subdir/empty_file.log | 0 .../filecheck/testdata/empty_file.log | 0 .../filecheck/testdata/file.log | 0 .../{modules => collector}/fluentd/README.md | 0 .../fluentd/apiclient.go | 0 .../{modules => collector}/fluentd/charts.go | 0 .../{modules => collector}/fluentd/collect.go | 0 .../fluentd/config_schema.json | 0 .../{modules => collector}/fluentd/fluentd.go | 0 .../fluentd/fluentd_test.go | 0 .../{modules => collector}/fluentd/init.go | 0 .../fluentd/integrations/fluentd.md | 0 .../fluentd/metadata.yaml | 0 .../fluentd/testdata/config.json | 0 .../fluentd/testdata/config.yaml | 0 .../fluentd/testdata/plugins.json | 0 .../freeradius/README.md | 0 .../freeradius/api/client.go | 0 .../freeradius/api/client_test.go | 0 .../freeradius/api/dictionary.go | 0 .../freeradius/charts.go | 0 .../freeradius/collect.go | 0 .../freeradius/config_schema.json | 0 .../freeradius/freeradius.go | 2 +- .../freeradius/freeradius_test.go | 2 +- .../{modules => collector}/freeradius/init.go | 0 .../freeradius/integrations/freeradius.md | 0 .../freeradius/metadata.yaml | 0 .../freeradius/testdata/config.json | 0 .../freeradius/testdata/config.yaml | 0 .../{modules => collector}/gearman/README.md | 0 .../{modules => collector}/gearman/charts.go | 0 .../{modules => collector}/gearman/client.go | 0 .../{modules => collector}/gearman/collect.go | 0 .../gearman/config_schema.json | 0 .../{modules => collector}/gearman/gearman.go | 0 .../gearman/gearman_test.go | 0 .../gearman/integrations/gearman.md | 0 .../gearman/metadata.yaml | 0 .../gearman/testdata/config.json | 0 .../gearman/testdata/config.yaml | 0 .../gearman/testdata/priority-status.txt | 0 .../gearman/testdata/status.txt | 0 .../{modules => collector}/geth/README.md | 0 .../{modules => collector}/geth/charts.go | 0 .../{modules => collector}/geth/collect.go | 0 .../geth/config_schema.json | 0 .../go.d/{modules => collector}/geth/geth.go | 0 .../{modules => collector}/geth/geth_test.go | 0 .../go.d/{modules => collector}/geth/init.go | 0 .../geth/integrations/go-ethereum.md | 0 .../{modules => collector}/geth/metadata.yaml | 0 .../{modules => collector}/geth/metrics.go | 0 .../geth/testdata/config.json | 0 .../geth/testdata/config.yaml | 0 .../geth/testdata/metrics_geth.txt | 0 .../{modules => collector}/haproxy/README.md | 0 .../{modules => collector}/haproxy/charts.go | 0 .../{modules => collector}/haproxy/collect.go | 0 .../haproxy/config_schema.json | 0 .../{modules => collector}/haproxy/haproxy.go | 0 .../haproxy/haproxy_test.go | 0 .../{modules => collector}/haproxy/init.go | 0 .../haproxy/integrations/haproxy.md | 0 .../haproxy/metadata.yaml | 0 .../haproxy/testdata/config.json | 0 .../haproxy/testdata/config.yaml | 0 .../haproxy/testdata/v2.3.10/metrics.txt | 0 .../{modules => collector}/hddtemp/README.md | 0 .../{modules => collector}/hddtemp/charts.go | 0 .../{modules => collector}/hddtemp/client.go | 0 .../{modules => collector}/hddtemp/collect.go | 0 .../hddtemp/config_schema.json | 0 .../{modules => collector}/hddtemp/hddtemp.go | 0 .../hddtemp/hddtemp_test.go | 0 .../hddtemp/integrations/hdd_temperature.md | 0 .../hddtemp/metadata.yaml | 0 .../hddtemp/testdata/config.json | 0 .../hddtemp/testdata/config.yaml | 0 .../hddtemp/testdata/hddtemp-all-ok.txt | 0 .../hddtemp/testdata/hddtemp-all-sleep.txt | 0 .../{modules => collector}/hdfs/README.md | 0 .../{modules => collector}/hdfs/charts.go | 0 .../{modules => collector}/hdfs/collect.go | 0 .../hdfs/config_schema.json | 0 .../go.d/{modules => collector}/hdfs/hdfs.go | 0 .../{modules => collector}/hdfs/hdfs_test.go | 0 .../hadoop_distributed_file_system_hdfs.md | 0 .../{modules => collector}/hdfs/metadata.yaml | 0 .../{modules => collector}/hdfs/metrics.go | 0 .../{modules => collector}/hdfs/raw_data.go | 0 .../hdfs/testdata/config.json | 0 .../hdfs/testdata/config.yaml | 0 .../hdfs/testdata/datanode.json | 0 .../hdfs/testdata/namenode.json | 0 .../hdfs/testdata/unknownnode.json | 0 .../{modules => collector}/hpssa/README.md | 0 .../{modules => collector}/hpssa/charts.go | 0 .../{modules => collector}/hpssa/collect.go | 0 .../hpssa/config_schema.json | 0 .../go.d/{modules => collector}/hpssa/exec.go | 0 .../{modules => collector}/hpssa/hpssa.go | 0 .../hpssa/hpssa_test.go | 0 .../go.d/{modules => collector}/hpssa/init.go | 0 .../hpssa/integrations/hpe_smart_arrays.md | 0 .../hpssa/metadata.yaml | 0 .../{modules => collector}/hpssa/parse.go | 0 .../hpssa/testdata/config.json | 0 .../hpssa/testdata/config.yaml | 0 .../hpssa/testdata/ssacli-P212_P410i.txt | 0 .../hpssa/testdata/ssacli-P400ar.txt | 0 .../testdata/ssacli-P400i-unassigned.txt | 0 .../httpcheck/README.md | 0 .../httpcheck/charts.go | 0 .../httpcheck/collect.go | 0 .../httpcheck/config_schema.json | 0 .../httpcheck/cookiejar.go | 0 .../httpcheck/httpcheck.go | 0 .../httpcheck/httpcheck_test.go | 0 .../{modules => collector}/httpcheck/init.go | 0 .../httpcheck/integrations/http_endpoints.md | 0 .../httpcheck/metadata.yaml | 0 .../httpcheck/metrics.go | 0 .../httpcheck/testdata/config.json | 0 .../httpcheck/testdata/config.yaml | 0 .../httpcheck/testdata/cookie.txt | 0 .../{modules => collector}/icecast/README.md | 0 .../{modules => collector}/icecast/charts.go | 0 .../{modules => collector}/icecast/collect.go | 0 .../icecast/config_schema.json | 0 .../{modules => collector}/icecast/icecast.go | 0 .../icecast/icecast_test.go | 0 .../icecast/integrations/icecast.md | 0 .../icecast/metadata.yaml | 0 .../icecast/server_stats.go | 0 .../icecast/testdata/config.json | 0 .../icecast/testdata/config.yaml | 0 .../icecast/testdata/stats_multi_source.json | 0 .../icecast/testdata/stats_no_sources.json | 0 .../icecast/testdata/stats_single_source.json | 0 src/go/plugin/go.d/collector/init.go | 128 ++++++++++++++++++ .../{modules => collector}/intelgpu/README.md | 0 .../{modules => collector}/intelgpu/charts.go | 0 .../intelgpu/collect.go | 0 .../intelgpu/config_schema.json | 0 .../{modules => collector}/intelgpu/exec.go | 0 .../{modules => collector}/intelgpu/init.go | 0 .../intelgpu/integrations/intel_gpu.md | 0 .../intelgpu/intelgpu.go | 0 .../intelgpu/intelgpu_test.go | 0 .../intelgpu/metadata.yaml | 0 .../intelgpu/testdata/config.json | 0 .../intelgpu/testdata/config.yaml | 0 .../intelgpu/testdata/igt.json | 0 .../{modules => collector}/ipfs/README.md | 0 .../{modules => collector}/ipfs/charts.go | 0 .../{modules => collector}/ipfs/collect.go | 0 .../ipfs/config_schema.json | 0 .../ipfs/integrations/ipfs.md | 0 .../go.d/{modules => collector}/ipfs/ipfs.go | 0 .../{modules => collector}/ipfs/ipfs_test.go | 0 .../{modules => collector}/ipfs/metadata.yaml | 0 .../ipfs/testdata/api_v0_pin_ls.json | 0 .../ipfs/testdata/api_v0_stats_bw.json | 0 .../ipfs/testdata/api_v0_stats_repo.json | 0 .../ipfs/testdata/api_v0_swarm_peers.json | 0 .../ipfs/testdata/config.json | 0 .../ipfs/testdata/config.yaml | 0 .../isc_dhcpd/README.md | 0 .../isc_dhcpd/charts.go | 0 .../isc_dhcpd/collect.go | 0 .../isc_dhcpd/config_schema.json | 0 .../{modules => collector}/isc_dhcpd/doc.go | 0 .../{modules => collector}/isc_dhcpd/init.go | 0 .../isc_dhcpd/integrations/isc_dhcp.md | 0 .../isc_dhcpd/isc_dhcpd.go | 0 .../isc_dhcpd/isc_dhcpd_test.go | 0 .../isc_dhcpd/metadata.yaml | 0 .../{modules => collector}/isc_dhcpd/parse.go | 0 .../isc_dhcpd/testdata/config.json | 0 .../isc_dhcpd/testdata/config.yaml | 0 .../isc_dhcpd/testdata/dhcpd.leases_empty | 0 .../isc_dhcpd/testdata/dhcpd.leases_ipv4 | 0 .../testdata/dhcpd.leases_ipv4_backup | 0 .../testdata/dhcpd.leases_ipv4_inactive | 0 .../isc_dhcpd/testdata/dhcpd.leases_ipv6 | 0 .../k8s_kubelet/README.md | 0 .../k8s_kubelet/charts.go | 0 .../k8s_kubelet/collect.go | 0 .../k8s_kubelet/config_schema.json | 0 .../k8s_kubelet/init.go | 0 .../k8s_kubelet/integrations/kubelet.md | 0 .../k8s_kubelet/kubelet.go | 0 .../k8s_kubelet/kubelet_test.go | 0 .../k8s_kubelet/metadata.yaml | 0 .../k8s_kubelet/metrics.go | 0 .../k8s_kubelet/testdata/config.json | 0 .../k8s_kubelet/testdata/config.yaml | 0 .../k8s_kubelet/testdata/metrics.txt | 0 .../k8s_kubelet/testdata/token.txt | 0 .../k8s_kubeproxy/README.md | 0 .../k8s_kubeproxy/charts.go | 0 .../k8s_kubeproxy/collect.go | 0 .../k8s_kubeproxy/config_schema.json | 0 .../k8s_kubeproxy/init.go | 0 .../k8s_kubeproxy/integrations/kubeproxy.md | 0 .../k8s_kubeproxy/kubeproxy.go | 0 .../k8s_kubeproxy/kubeproxy_test.go | 0 .../k8s_kubeproxy/metadata.yaml | 0 .../k8s_kubeproxy/metrics.go | 0 .../k8s_kubeproxy/testdata/config.json | 0 .../k8s_kubeproxy/testdata/config.yaml | 0 .../k8s_kubeproxy/testdata/metrics.txt | 0 .../k8s_state/README.md | 0 .../k8s_state/charts.go | 0 .../k8s_state/client.go | 0 .../k8s_state/cluster_meta.go | 0 .../k8s_state/collect.go | 0 .../k8s_state/config_schema.json | 0 .../k8s_state/discover_kubernetes.go | 0 .../k8s_state/discover_node.go | 0 .../k8s_state/discover_pod.go | 0 .../{modules => collector}/k8s_state/init.go | 0 .../integrations/kubernetes_cluster_state.md | 0 .../k8s_state/kube_state.go | 0 .../k8s_state/kube_state_test.go | 0 .../k8s_state/metadata.yaml | 0 .../k8s_state/resource.go | 0 .../{modules => collector}/k8s_state/state.go | 0 .../k8s_state/testdata/config.json | 0 .../k8s_state/testdata/config.yaml | 0 .../k8s_state/update_node_state.go | 0 .../k8s_state/update_pod_state.go | 0 .../k8s_state/update_state.go | 0 .../{modules => collector}/lighttpd/README.md | 0 .../{modules => collector}/lighttpd/charts.go | 0 .../lighttpd/collect.go | 0 .../lighttpd/config_schema.json | 0 .../lighttpd/integrations/lighttpd.md | 0 .../lighttpd/lighttpd.go | 0 .../lighttpd/lighttpd_test.go | 0 .../lighttpd/metadata.yaml | 0 .../{modules => collector}/lighttpd/status.go | 0 .../lighttpd/testdata/apache-status.txt | 0 .../lighttpd/testdata/config.json | 0 .../lighttpd/testdata/config.yaml | 0 .../lighttpd/testdata/status.txt | 0 .../litespeed/README.md | 0 .../litespeed/charts.go | 0 .../litespeed/collect.go | 0 .../litespeed/config_schema.json | 0 .../{modules => collector}/litespeed/doc.go | 0 .../litespeed/integrations/litespeed.md | 0 .../litespeed/litespeed.go | 0 .../litespeed/litespeed_test.go | 0 .../litespeed/metadata.yaml | 0 .../litespeed/testdata/.rtreport | 0 .../litespeed/testdata/.rtreport.2 | 0 .../litespeed/testdata/config.json | 0 .../litespeed/testdata/config.yaml | 0 .../{modules => collector}/logind/README.md | 0 .../{modules => collector}/logind/charts.go | 0 .../{modules => collector}/logind/collect.go | 0 .../logind/config_schema.json | 0 .../logind/connection.go | 0 .../go.d/{modules => collector}/logind/doc.go | 0 .../integrations/systemd-logind_users.md | 0 .../{modules => collector}/logind/logind.go | 0 .../logind/logind_test.go | 0 .../logind/metadata.yaml | 0 .../logind/testdata/config.json | 0 .../logind/testdata/config.yaml | 0 .../{modules => collector}/logstash/README.md | 0 .../{modules => collector}/logstash/charts.go | 0 .../logstash/collect.go | 0 .../logstash/config_schema.json | 0 .../logstash/integrations/logstash.md | 0 .../logstash/logstash.go | 0 .../logstash/logstash_test.go | 0 .../logstash/metadata.yaml | 0 .../logstash/node_stats.go | 0 .../logstash/testdata/config.json | 0 .../logstash/testdata/config.yaml | 0 .../logstash/testdata/stats.json | 0 .../go.d/{modules => collector}/lvm/README.md | 0 .../go.d/{modules => collector}/lvm/charts.go | 0 .../{modules => collector}/lvm/collect.go | 0 .../lvm/config_schema.json | 0 .../go.d/{modules => collector}/lvm/doc.go | 0 .../go.d/{modules => collector}/lvm/exec.go | 0 .../go.d/{modules => collector}/lvm/init.go | 0 .../lvm/integrations/lvm_logical_volumes.md | 0 .../go.d/{modules => collector}/lvm/lvm.go | 0 .../{modules => collector}/lvm/lvm_test.go | 0 .../{modules => collector}/lvm/metadata.yaml | 0 .../lvm/testdata/config.json | 0 .../lvm/testdata/config.yaml | 0 .../lvm/testdata/lvs-report-no-thin.json | 0 .../lvm/testdata/lvs-report.json | 0 .../{modules => collector}/maxscale/README.md | 0 .../{modules => collector}/maxscale/charts.go | 0 .../maxscale/collect.go | 0 .../maxscale/config_schema.json | 0 .../maxscale/integrations/maxscale.md | 0 .../maxscale/maxscale.go | 0 .../maxscale/maxscale_test.go | 0 .../maxscale/metadata.yaml | 0 .../maxscale/restapi.go | 0 .../maxscale/testdata/config.json | 0 .../maxscale/testdata/config.yaml | 0 .../maxscale/testdata/v24.02.3/maxscale.json | 0 .../testdata/v24.02.3/maxscale_threads.json | 0 .../maxscale/testdata/v24.02.3/servers.json | 0 .../{modules => collector}/megacli/README.md | 0 .../{modules => collector}/megacli/charts.go | 0 .../{modules => collector}/megacli/collect.go | 0 .../megacli/collect_bbu.go | 0 .../megacli/collect_phys_drives.go | 0 .../megacli/config_schema.json | 0 .../{modules => collector}/megacli/doc.go | 0 .../{modules => collector}/megacli/exec.go | 0 .../{modules => collector}/megacli/init.go | 0 .../megacli/integrations/megacli_megaraid.md | 0 .../{modules => collector}/megacli/megacli.go | 0 .../megacli/megacli_test.go | 0 .../megacli/metadata.yaml | 0 .../megacli/testdata/config.json | 0 .../megacli/testdata/config.yaml | 0 .../megacli/testdata/mega-bbu-info-old.txt | 0 .../megacli/testdata/mega-bbu-info-recent.txt | 0 .../testdata/mega-phys-drives-info.txt | 0 .../memcached/README.md | 0 .../memcached/charts.go | 0 .../memcached/client.go | 0 .../memcached/collect.go | 0 .../memcached/config_schema.json | 0 .../memcached/integrations/memcached.md | 0 .../memcached/memcached.go | 0 .../memcached/memcached_test.go | 0 .../memcached/metadata.yaml | 0 .../memcached/testdata/config.json | 0 .../memcached/testdata/config.yaml | 0 .../memcached/testdata/stats.txt | 0 .../{modules => collector}/mongodb/README.md | 0 .../{modules => collector}/mongodb/charts.go | 0 .../{modules => collector}/mongodb/client.go | 0 .../{modules => collector}/mongodb/collect.go | 0 .../mongodb/collect_dbstats.go | 0 .../mongodb/collect_replsetgetstatus.go | 0 .../mongodb/collect_serverstatus.go | 0 .../mongodb/collect_sharding.go | 0 .../mongodb/config_schema.json | 0 .../mongodb/documents.go | 0 .../{modules => collector}/mongodb/init.go | 0 .../mongodb/integrations/mongodb.md | 0 .../mongodb/metadata.yaml | 0 .../{modules => collector}/mongodb/mongodb.go | 0 .../mongodb/mongodb_test.go | 0 .../mongodb/testdata/config.json | 0 .../mongodb/testdata/config.yaml | 0 .../mongodb/testdata/v6.0.3/dbStats.json | 0 .../testdata/v6.0.3/mongod-serverStatus.json | 0 .../testdata/v6.0.3/mongos-serverStatus.json | 0 .../testdata/v6.0.3/replSetGetStatus.json | 0 .../{modules => collector}/monit/README.md | 0 .../{modules => collector}/monit/charts.go | 0 .../{modules => collector}/monit/collect.go | 0 .../monit/config_schema.json | 0 .../monit/integrations/monit.md | 0 .../monit/metadata.yaml | 0 .../{modules => collector}/monit/monit.go | 0 .../monit/monit_test.go | 0 .../{modules => collector}/monit/status.go | 0 .../monit/testdata/config.json | 0 .../monit/testdata/config.yaml | 0 .../monit/testdata/v5.33.0/status.xml | 0 .../{modules => collector}/mysql/README.md | 0 .../{modules => collector}/mysql/charts.go | 0 .../{modules => collector}/mysql/collect.go | 0 .../mysql/collect_global_status.go | 0 .../mysql/collect_global_vars.go | 0 .../mysql/collect_process_list.go | 0 .../mysql/collect_slave_status.go | 0 .../mysql/collect_user_statistics.go | 0 .../mysql/collect_version.go | 0 .../mysql/config_schema.json | 0 .../mysql/disable_logging.go | 0 .../mysql/integrations/mariadb.md | 0 .../mysql/integrations/mysql.md | 0 .../mysql/integrations/percona_mysql.md | 0 .../mysql/metadata.yaml | 0 .../{modules => collector}/mysql/mycnf.go | 0 .../mysql/mycnf_test.go | 0 .../{modules => collector}/mysql/mysql.go | 0 .../mysql/mysql_test.go | 0 .../mysql/testdata/config.json | 0 .../mysql/testdata/config.yaml | 0 .../v10.8.4-galera-cluster/global_status.txt | 0 .../global_variables.txt | 0 .../v10.8.4-galera-cluster/process_list.txt | 0 .../user_statistics.txt | 0 .../v10.8.4-galera-cluster/version.txt | 0 .../all_slaves_status_multi_source.txt | 0 .../all_slaves_status_single_source.txt | 0 .../mariadb/v10.8.4/global_status.txt | 0 .../mariadb/v10.8.4/global_variables.txt | 0 .../testdata/mariadb/v10.8.4/process_list.txt | 0 .../mariadb/v10.8.4/user_statistics.txt | 0 .../testdata/mariadb/v10.8.4/version.txt | 0 .../mariadb/v5.5.64/global_status.txt | 0 .../mariadb/v5.5.64/global_variables.txt | 0 .../testdata/mariadb/v5.5.64/process_list.txt | 0 .../testdata/mariadb/v5.5.64/version.txt | 0 .../testdata/mysql/v8.0.30/global_status.txt | 0 .../mysql/v8.0.30/global_variables.txt | 0 .../testdata/mysql/v8.0.30/process_list.txt | 0 .../v8.0.30/replica_status_multi_source.txt | 0 .../mysql/testdata/mysql/v8.0.30/version.txt | 0 .../percona/v8.0.29/global_status.txt | 0 .../percona/v8.0.29/global_variables.txt | 0 .../testdata/percona/v8.0.29/process_list.txt | 0 .../percona/v8.0.29/user_statistics.txt | 0 .../testdata/percona/v8.0.29/version.txt | 0 .../mysql/testdata/session_variables.txt | 0 .../{modules => collector}/nginx/README.md | 0 .../{modules => collector}/nginx/charts.go | 0 .../{modules => collector}/nginx/collect.go | 0 .../nginx/config_schema.json | 0 .../nginx/integrations/nginx.md | 0 .../nginx/metadata.yaml | 0 .../{modules => collector}/nginx/nginx.go | 0 .../nginx/nginx_test.go | 0 .../{modules => collector}/nginx/status.go | 0 .../nginx/testdata/config.json | 0 .../nginx/testdata/config.yaml | 0 .../nginx/testdata/status.txt | 0 .../nginx/testdata/tengine-status.txt | 0 .../nginxplus/README.md | 0 .../{modules => collector}/nginxplus/cache.go | 0 .../nginxplus/charts.go | 0 .../nginxplus/collect.go | 0 .../nginxplus/config_schema.json | 0 .../nginxplus/integrations/nginx_plus.md | 0 .../nginxplus/metadata.yaml | 0 .../nginxplus/nginx_http_api.go | 0 .../nginxplus/nginx_http_api_query.go | 0 .../nginxplus/nginxplus.go | 0 .../nginxplus/nginxplus_test.go | 0 .../nginxplus/testdata/404.json | 0 .../testdata/api-8/api_versions.json | 0 .../nginxplus/testdata/api-8/connections.json | 0 .../testdata/api-8/endpoints_http.json | 0 .../testdata/api-8/endpoints_root.json | 0 .../testdata/api-8/endpoints_stream.json | 0 .../nginxplus/testdata/api-8/http_caches.json | 0 .../testdata/api-8/http_location_zones.json | 0 .../testdata/api-8/http_requests.json | 0 .../testdata/api-8/http_server_zones.json | 0 .../testdata/api-8/http_upstreams.json | 0 .../nginxplus/testdata/api-8/nginx.json | 0 .../nginxplus/testdata/api-8/resolvers.json | 0 .../nginxplus/testdata/api-8/ssl.json | 0 .../testdata/api-8/stream_server_zones.json | 0 .../testdata/api-8/stream_upstreams.json | 0 .../nginxplus/testdata/config.json | 0 .../nginxplus/testdata/config.yaml | 0 .../nginxunit/README.md | 0 .../nginxunit/charts.go | 0 .../nginxunit/collect.go | 0 .../nginxunit/config_schema.json | 0 .../nginxunit/integrations/nginx_unit.md | 0 .../nginxunit/metadata.yaml | 0 .../nginxunit/nginxunit.go | 0 .../nginxunit/nginxunit_test.go | 0 .../nginxunit/testdata/config.json | 0 .../nginxunit/testdata/config.yaml | 0 .../nginxunit/testdata/v1.29.1/status.json | 0 .../{modules => collector}/nginxvts/README.md | 0 .../{modules => collector}/nginxvts/charts.go | 0 .../nginxvts/collect.go | 0 .../nginxvts/config_schema.json | 0 .../{modules => collector}/nginxvts/init.go | 0 .../nginxvts/integrations/nginx_vts.md | 0 .../nginxvts/metadata.yaml | 0 .../nginxvts/metrics.go | 0 .../nginxvts/nginxvts.go | 0 .../nginxvts/nginxvts_test.go | 0 .../nginxvts/testdata/config.json | 0 .../nginxvts/testdata/config.yaml | 0 .../nginxvts/testdata/vts-v0.1.18.json | 0 .../go.d/{modules => collector}/nsd/README.md | 0 .../go.d/{modules => collector}/nsd/charts.go | 0 .../{modules => collector}/nsd/collect.go | 0 .../nsd/config_schema.json | 0 .../go.d/{modules => collector}/nsd/doc.go | 0 .../go.d/{modules => collector}/nsd/exec.go | 0 .../go.d/{modules => collector}/nsd/init.go | 0 .../nsd/integrations/nsd.md | 0 .../{modules => collector}/nsd/metadata.yaml | 0 .../go.d/{modules => collector}/nsd/nsd.go | 0 .../{modules => collector}/nsd/nsd_test.go | 0 .../nsd/stats_counters.go | 0 .../nsd/testdata/config.json | 0 .../nsd/testdata/config.yaml | 0 .../nsd/testdata/stats.txt | 0 .../{modules => collector}/ntpd/README.md | 0 .../{modules => collector}/ntpd/charts.go | 0 .../{modules => collector}/ntpd/client.go | 0 .../{modules => collector}/ntpd/collect.go | 0 .../ntpd/config_schema.json | 0 .../ntpd/integrations/ntpd.md | 0 .../{modules => collector}/ntpd/metadata.yaml | 0 .../go.d/{modules => collector}/ntpd/ntpd.go | 0 .../{modules => collector}/ntpd/ntpd_test.go | 0 .../ntpd/testdata/config.json | 0 .../ntpd/testdata/config.yaml | 0 .../nvidia_smi/README.md | 0 .../nvidia_smi/charts.go | 0 .../nvidia_smi/collect.go | 0 .../nvidia_smi/config_schema.json | 0 .../{modules => collector}/nvidia_smi/exec.go | 0 .../nvidia_smi/gpu_info.go | 0 .../{modules => collector}/nvidia_smi/init.go | 0 .../nvidia_smi/integrations/nvidia_gpu.md | 0 .../nvidia_smi/metadata.yaml | 0 .../nvidia_smi/nvidia_smi.go | 0 .../nvidia_smi/nvidia_smi_test.go | 0 .../nvidia_smi/testdata/a100-sxm4-mig.xml | 0 .../nvidia_smi/testdata/config.json | 0 .../nvidia_smi/testdata/config.yaml | 0 .../nvidia_smi/testdata/rtx-2080-win.xml | 0 .../nvidia_smi/testdata/rtx-3060.xml | 0 .../testdata/rtx-4090-driver-535.xml | 0 .../nvidia_smi/testdata/tesla-p100.xml | 0 .../{modules => collector}/nvme/README.md | 0 .../{modules => collector}/nvme/charts.go | 0 .../{modules => collector}/nvme/collect.go | 0 .../nvme/config_schema.json | 0 .../go.d/{modules => collector}/nvme/doc.go | 0 .../go.d/{modules => collector}/nvme/exec.go | 0 .../go.d/{modules => collector}/nvme/init.go | 0 .../nvme/integrations/nvme_devices.md | 0 .../{modules => collector}/nvme/metadata.yaml | 0 .../go.d/{modules => collector}/nvme/nvme.go | 0 .../{modules => collector}/nvme/nvme_test.go | 0 .../nvme/testdata/config.json | 0 .../nvme/testdata/config.yaml | 0 .../nvme/testdata/nvme-list-empty.json | 0 .../nvme/testdata/nvme-list.json | 0 .../nvme/testdata/nvme-smart-log-float.json | 0 .../nvme/testdata/nvme-smart-log-string.json | 0 .../nvme/testdata/nvme-smart-log.json | 0 .../{modules => collector}/openldap/README.md | 0 .../{modules => collector}/openldap/charts.go | 0 .../{modules => collector}/openldap/client.go | 0 .../openldap/collect.go | 0 .../openldap/collect_mon_counters.go | 0 .../openldap/collect_operations.go | 0 .../openldap/config_schema.json | 0 .../openldap/integrations/openldap.md | 0 .../openldap/metadata.yaml | 0 .../openldap/openldap.go | 0 .../openldap/openldap_test.go | 0 .../openldap/testdata/config.json | 0 .../openldap/testdata/config.yaml | 0 .../{modules => collector}/openvpn/README.md | 0 .../{modules => collector}/openvpn/charts.go | 0 .../openvpn/client/client.go | 0 .../openvpn/client/client_test.go | 0 .../openvpn/client/commands.go | 0 .../openvpn/client/testdata/load-stats.txt | 0 .../openvpn/client/testdata/status3.txt | 0 .../openvpn/client/testdata/version.txt | 0 .../openvpn/client/types.go | 0 .../{modules => collector}/openvpn/collect.go | 0 .../openvpn/config_schema.json | 0 .../{modules => collector}/openvpn/init.go | 2 +- .../openvpn/integrations/openvpn.md | 0 .../openvpn/metadata.yaml | 0 .../{modules => collector}/openvpn/openvpn.go | 2 +- .../openvpn/openvpn_test.go | 2 +- .../openvpn/testdata/config.json | 0 .../openvpn/testdata/config.yaml | 0 .../openvpn_status_log/README.md | 0 .../openvpn_status_log/charts.go | 0 .../openvpn_status_log/collect.go | 0 .../openvpn_status_log/config_schema.json | 0 .../openvpn_status_log/init.go | 0 .../integrations/openvpn_status_log.md | 0 .../openvpn_status_log/metadata.yaml | 0 .../openvpn_status_log/openvpn.go | 0 .../openvpn_status_log/openvpn_test.go | 0 .../openvpn_status_log/parser.go | 0 .../openvpn_status_log/testdata/config.json | 0 .../openvpn_status_log/testdata/config.yaml | 0 .../openvpn_status_log/testdata/empty.txt | 0 .../testdata/v2.5.1/static-key.txt | 0 .../testdata/v2.5.1/version1-no-clients.txt | 0 .../testdata/v2.5.1/version1.txt | 0 .../testdata/v2.5.1/version2-no-clients.txt | 0 .../testdata/v2.5.1/version2.txt | 0 .../testdata/v2.5.1/version3-no-clients.txt | 0 .../testdata/v2.5.1/version3.txt | 0 .../{modules => collector}/oracledb/README.md | 0 .../{modules => collector}/oracledb/charts.go | 0 .../oracledb/collect.go | 0 .../oracledb/collect_sysmetric.go | 0 .../oracledb/collect_sysstat.go | 0 .../oracledb/collect_tablespace.go | 0 .../oracledb/collect_wait_class.go | 0 .../oracledb/config_schema.json | 0 .../{modules => collector}/oracledb/init.go | 0 .../oracledb/integrations/oracle_db.md | 0 .../oracledb/metadata.yaml | 0 .../oracledb/oracledb.go | 0 .../oracledb/oracledb_test.go | 0 .../oracledb/testdata/config.json | 0 .../oracledb/testdata/config.yaml | 0 .../testdata/v21.3.0-xe/sysmetric.txt | 0 .../oracledb/testdata/v21.3.0-xe/sysstat.txt | 0 .../testdata/v21.3.0-xe/tablespace.txt | 0 .../testdata/v21.3.0-xe/wait_class.txt | 0 .../pgbouncer/README.md | 0 .../pgbouncer/charts.go | 0 .../pgbouncer/collect.go | 0 .../pgbouncer/config_schema.json | 0 .../{modules => collector}/pgbouncer/init.go | 0 .../pgbouncer/integrations/pgbouncer.md | 0 .../pgbouncer/metadata.yaml | 0 .../pgbouncer/metrics.go | 0 .../pgbouncer/pgbouncer.go | 0 .../pgbouncer/pgbouncer_test.go | 0 .../pgbouncer/testdata/config.json | 0 .../pgbouncer/testdata/config.yaml | 0 .../pgbouncer/testdata/v1.17.0/config.txt | 0 .../pgbouncer/testdata/v1.17.0/databases.txt | 0 .../pgbouncer/testdata/v1.17.0/pools.txt | 0 .../pgbouncer/testdata/v1.17.0/stats.txt | 0 .../pgbouncer/testdata/v1.17.0/version.txt | 0 .../pgbouncer/testdata/v1.7.0/version.txt | 0 .../phpdaemon/README.md | 0 .../phpdaemon/charts.go | 0 .../phpdaemon/collect.go | 0 .../phpdaemon/config_schema.json | 0 .../phpdaemon/integrations/phpdaemon.md | 0 .../phpdaemon/metadata.yaml | 0 .../phpdaemon/phpdaemon.go | 0 .../phpdaemon/phpdaemon_test.go | 0 .../phpdaemon/testdata/config.json | 0 .../phpdaemon/testdata/config.yaml | 0 .../phpdaemon/testdata/fullstatus.json | 0 .../{modules => collector}/phpfpm/README.md | 0 .../{modules => collector}/phpfpm/charts.go | 0 .../{modules => collector}/phpfpm/client.go | 0 .../{modules => collector}/phpfpm/collect.go | 0 .../phpfpm/config_schema.json | 0 .../{modules => collector}/phpfpm/decode.go | 0 .../{modules => collector}/phpfpm/init.go | 0 .../phpfpm/integrations/php-fpm.md | 0 .../phpfpm/metadata.yaml | 0 .../{modules => collector}/phpfpm/phpfpm.go | 0 .../phpfpm/phpfpm_test.go | 0 .../phpfpm/testdata/config.json | 0 .../phpfpm/testdata/config.yaml | 0 .../phpfpm/testdata/status-full-no-idle.json | 0 .../phpfpm/testdata/status-full.json | 0 .../phpfpm/testdata/status-full.txt | 0 .../phpfpm/testdata/status.json | 0 .../phpfpm/testdata/status.txt | 0 .../{modules => collector}/pihole/README.md | 0 .../{modules => collector}/pihole/charts.go | 0 .../{modules => collector}/pihole/collect.go | 0 .../pihole/config_schema.json | 0 .../{modules => collector}/pihole/init.go | 0 .../pihole/integrations/pi-hole.md | 0 .../pihole/metadata.yaml | 0 .../{modules => collector}/pihole/metrics.go | 0 .../{modules => collector}/pihole/pihole.go | 0 .../pihole/pihole_test.go | 0 .../pihole/testdata/config.json | 0 .../pihole/testdata/config.yaml | 0 .../testdata/getForwardDestinations.json | 0 .../pihole/testdata/getQueryTypes.json | 0 .../pihole/testdata/setupVars.conf | 0 .../pihole/testdata/summaryRaw.json | 0 .../{modules => collector}/pika/README.md | 0 .../{modules => collector}/pika/charts.go | 0 .../{modules => collector}/pika/collect.go | 0 .../pika/collect_info.go | 0 .../pika/config_schema.json | 0 .../go.d/{modules => collector}/pika/init.go | 0 .../pika/integrations/pika.md | 0 .../{modules => collector}/pika/metadata.yaml | 0 .../go.d/{modules => collector}/pika/pika.go | 0 .../{modules => collector}/pika/pika_test.go | 0 .../pika/testdata/config.json | 0 .../pika/testdata/config.yaml | 0 .../pika/testdata/redis/info_all.txt | 0 .../pika/testdata/v3.4.0/info_all.txt | 0 .../{modules => collector}/ping/README.md | 0 .../{modules => collector}/ping/charts.go | 0 .../{modules => collector}/ping/collect.go | 0 .../ping/config_schema.json | 0 .../go.d/{modules => collector}/ping/init.go | 0 .../ping/integrations/ping.md | 0 .../{modules => collector}/ping/metadata.yaml | 0 .../go.d/{modules => collector}/ping/ping.go | 0 .../{modules => collector}/ping/ping_test.go | 0 .../{modules => collector}/ping/prober.go | 0 .../ping/testdata/config.json | 0 .../ping/testdata/config.yaml | 0 .../portcheck/README.md | 0 .../portcheck/charts.go | 0 .../portcheck/check_tcp_port.go | 0 .../portcheck/check_udp_port.go | 0 .../portcheck/collect.go | 0 .../portcheck/config_schema.json | 0 .../{modules => collector}/portcheck/init.go | 0 .../integrations/tcp-udp_endpoints.md | 0 .../portcheck/metadata.yaml | 0 .../portcheck/portcheck.go | 0 .../portcheck/portcheck_test.go | 0 .../portcheck/testdata/config.json | 0 .../portcheck/testdata/config.yaml | 0 .../{modules => collector}/postfix/README.md | 0 .../{modules => collector}/postfix/charts.go | 0 .../{modules => collector}/postfix/collect.go | 0 .../postfix/config_schema.json | 0 .../{modules => collector}/postfix/exec.go | 0 .../{modules => collector}/postfix/init.go | 0 .../postfix/integrations/postfix.md | 0 .../postfix/metadata.yaml | 0 .../{modules => collector}/postfix/postfix.go | 0 .../postfix/postfix_test.go | 0 .../postfix/testdata/config.json | 0 .../postfix/testdata/config.yaml | 0 .../postfix/testdata/postqueue.txt | 0 .../{modules => collector}/postgres/README.md | 0 .../{modules => collector}/postgres/charts.go | 0 .../postgres/collect.go | 0 .../postgres/collect_metrics.go | 0 .../postgres/config_schema.json | 0 .../postgres/do_query.go | 0 .../postgres/do_query_bloat.go | 0 .../postgres/do_query_columns.go | 0 .../postgres/do_query_databases.go | 0 .../postgres/do_query_global.go | 0 .../postgres/do_query_indexes.go | 0 .../postgres/do_query_misc.go | 0 .../postgres/do_query_replication.go | 0 .../postgres/do_query_tables.go | 0 .../{modules => collector}/postgres/init.go | 0 .../postgres/integrations/postgresql.md | 0 .../postgres/metadata.yaml | 0 .../postgres/metrics.go | 0 .../postgres/postgres.go | 0 .../postgres/postgres_test.go | 0 .../postgres/queries.go | 0 .../postgres/testdata/config.json | 0 .../postgres/testdata/config.yaml | 0 .../testdata/v14.4/autovacuum_workers.txt | 0 .../postgres/testdata/v14.4/bloat_tables.txt | 0 .../testdata/v14.4/catalog_relations.txt | 0 .../postgres/testdata/v14.4/checkpoints.txt | 0 .../testdata/v14.4/database_conflicts.txt | 0 .../testdata/v14.4/database_locks.txt | 0 .../postgres/testdata/v14.4/database_size.txt | 0 .../testdata/v14.4/database_stats.txt | 0 .../testdata/v14.4/is_super_user-false.txt | 0 .../testdata/v14.4/is_super_user-true.txt | 0 .../testdata/v14.4/pg_is_in_recovery-true.txt | 0 .../v14.4/queryable_database_list.txt | 0 .../testdata/v14.4/replication_slot_files.txt | 0 .../replication_standby_app_wal_delta.txt | 0 .../v14.4/replication_standby_app_wal_lag.txt | 0 .../v14.4/server_connections_state.txt | 0 .../v14.4/server_current_connections.txt | 0 .../testdata/v14.4/server_version_num.txt | 0 .../v14.4/settings_max_connections.txt | 0 .../v14.4/settings_max_locks_held.txt | 0 .../v14.4/stat_user_indexes_db_postgres.txt | 0 .../v14.4/stat_user_tables_db_postgres.txt | 0 .../v14.4/statio_user_tables_db_postgres.txt | 0 .../testdata/v14.4/table_columns_stats.txt | 0 .../testdata/v14.4/txid_wraparound.txt | 0 .../postgres/testdata/v14.4/uptime.txt | 0 .../testdata/v14.4/wal_archive_files.txt | 0 .../postgres/testdata/v14.4/wal_files.txt | 0 .../postgres/testdata/v14.4/wal_writes.txt | 0 .../v14.4/xact_query_running_time.txt | 0 .../{modules => collector}/powerdns/README.md | 0 .../powerdns/authoritativens.go | 0 .../powerdns/authoritativens_test.go | 0 .../{modules => collector}/powerdns/charts.go | 0 .../powerdns/collect.go | 0 .../powerdns/config_schema.json | 0 .../{modules => collector}/powerdns/init.go | 0 .../powerdns_authoritative_server.md | 0 .../powerdns/metadata.yaml | 0 .../powerdns/metrics.go | 0 .../powerdns/testdata/config.json | 0 .../powerdns/testdata/config.yaml | 0 .../testdata/recursor/statistics.json | 0 .../powerdns/testdata/v4.3.0/statistics.json | 0 .../powerdns_recursor/README.md | 0 .../powerdns_recursor/charts.go | 0 .../powerdns_recursor/collect.go | 0 .../powerdns_recursor/config_schema.json | 0 .../powerdns_recursor/init.go | 0 .../integrations/powerdns_recursor.md | 0 .../powerdns_recursor/metadata.yaml | 0 .../powerdns_recursor/metrics.go | 0 .../powerdns_recursor/recursor.go | 0 .../powerdns_recursor/recursor_test.go | 0 .../testdata/authoritative/statistics.json | 0 .../powerdns_recursor/testdata/config.json | 0 .../powerdns_recursor/testdata/config.yaml | 0 .../testdata/v4.3.1/statistics.json | 0 .../prometheus/README.md | 0 .../prometheus/cache.go | 0 .../prometheus/charts.go | 0 .../prometheus/collect.go | 0 .../prometheus/config_schema.json | 0 .../{modules => collector}/prometheus/init.go | 0 .../prometheus/integrations/4d_server.md | 0 .../prometheus/integrations/8430ft_modem.md | 0 .../integrations/a10_acos_network_devices.md | 0 .../airthings_waveplus_air_sensor.md | 0 .../integrations/akamai_edge_dns_traffic.md | 0 .../akamai_global_traffic_management.md | 0 .../integrations/akami_cloudmonitor.md | 0 .../integrations/alamos_fe2_server.md | 0 .../prometheus/integrations/alibaba_cloud.md | 0 .../prometheus/integrations/altaro_backup.md | 0 .../prometheus/integrations/amd_cpu_&_gpu.md | 0 .../andrews_&_arnold_line_status.md | 0 .../prometheus/integrations/apache_airflow.md | 0 .../prometheus/integrations/apache_flink.md | 0 .../prometheus/integrations/apicast.md | 0 .../integrations/apple_time_machine.md | 0 .../prometheus/integrations/arm_hwcpipe.md | 0 .../prometheus/integrations/aruba_devices.md | 0 .../prometheus/integrations/arvancloud_cdn.md | 0 .../prometheus/integrations/audisto.md | 0 .../prometheus/integrations/authlog.md | 0 .../integrations/aws_ec2_compute_instances.md | 0 .../integrations/aws_ec2_spot_instance.md | 0 .../prometheus/integrations/aws_ecs.md | 0 .../integrations/aws_health_events.md | 0 .../integrations/aws_instance_health.md | 0 .../prometheus/integrations/aws_quota.md | 0 .../prometheus/integrations/aws_rds.md | 0 .../prometheus/integrations/aws_s3_buckets.md | 0 .../prometheus/integrations/aws_sqs.md | 0 .../integrations/azure_ad_app_passwords.md | 0 .../integrations/azure_application.md | 0 .../integrations/azure_elastic_pool_sql.md | 0 .../integrations/azure_resources.md | 0 .../integrations/azure_service_bus.md | 0 .../prometheus/integrations/azure_sql.md | 0 .../prometheus/integrations/bigquery.md | 0 .../integrations/bird_routing_daemon.md | 0 .../prometheus/integrations/blackbox.md | 0 .../integrations/bobcat_miner_300.md | 0 .../prometheus/integrations/borg_backup.md | 0 .../prometheus/integrations/bosh.md | 0 .../integrations/bpftrace_variables.md | 0 .../prometheus/integrations/bungeecord.md | 0 .../prometheus/integrations/cadvisor.md | 0 .../prometheus/integrations/celery.md | 0 .../integrations/certificate_transparency.md | 0 .../integrations/checkpoint_device.md | 0 .../prometheus/integrations/chia.md | 0 .../christ_elektronik_clm5ip_power_panel.md | 0 .../prometheus/integrations/cilium_agent.md | 0 .../integrations/cilium_operator.md | 0 .../prometheus/integrations/cilium_proxy.md | 0 .../prometheus/integrations/cisco_aci.md | 0 .../integrations/citrix_netscaler.md | 0 .../prometheus/integrations/clamav_daemon.md | 0 .../integrations/clamscan_results.md | 0 .../prometheus/integrations/clash.md | 0 .../prometheus/integrations/cloud_foundry.md | 0 .../integrations/cloud_foundry_firehose.md | 0 .../integrations/cloudflare_pcap.md | 0 .../prometheus/integrations/cloudwatch.md | 0 .../integrations/clustercontrol_cmon.md | 0 .../prometheus/integrations/collectd.md | 0 .../prometheus/integrations/concourse.md | 0 .../prometheus/integrations/craftbeerpi.md | 0 .../prometheus/integrations/crowdsec.md | 0 .../integrations/crypto_exchanges.md | 0 .../prometheus/integrations/cryptowatch.md | 0 .../integrations/custom_exporter.md | 0 .../prometheus/integrations/cvmfs_clients.md | 0 .../prometheus/integrations/ddwrt_routers.md | 0 .../integrations/dell_emc_ecs_cluster.md | 0 .../integrations/dell_emc_isilon_cluster.md | 0 .../integrations/dell_emc_xtremio_cluster.md | 0 .../prometheus/integrations/dell_powermax.md | 0 .../integrations/dependency-track.md | 0 .../prometheus/integrations/digitalocean.md | 0 .../prometheus/integrations/discourse.md | 0 .../prometheus/integrations/dmarc.md | 0 .../prometheus/integrations/dnsbl.md | 0 .../dutch_electricity_smart_meter.md | 0 .../prometheus/integrations/dynatrace.md | 0 .../prometheus/integrations/eaton_ups.md | 0 .../integrations/elgato_key_light_devices..md | 0 .../energomera_smart_power_meters.md | 0 .../prometheus/integrations/eos.md | 0 .../prometheus/integrations/etcd.md | 0 .../integrations/excel_spreadsheet.md | 0 .../prometheus/integrations/fastd.md | 0 .../integrations/fortigate_firewall.md | 0 .../prometheus/integrations/freebsd_nfs.md | 0 .../integrations/freebsd_rctl-racct.md | 0 .../integrations/freifunk_network.md | 0 .../integrations/fritzbox_network_devices.md | 0 .../prometheus/integrations/frrouting.md | 0 .../prometheus/integrations/gcp_gce.md | 0 .../prometheus/integrations/gcp_quota.md | 0 .../generic_command_line_output.md | 0 .../generic_storage_enclosure_tool.md | 0 .../integrations/github_api_rate_limit.md | 0 .../integrations/github_repository.md | 0 .../prometheus/integrations/gitlab_runner.md | 0 .../prometheus/integrations/gobetween.md | 0 .../integrations/google_cloud_platform.md | 0 .../integrations/google_pagespeed.md | 0 .../integrations/google_stackdriver.md | 0 .../prometheus/integrations/gpsd.md | 0 .../prometheus/integrations/grafana.md | 0 .../prometheus/integrations/graylog_server.md | 0 .../prometheus/integrations/gtp.md | 0 .../prometheus/integrations/halon.md | 0 .../prometheus/integrations/hana.md | 0 .../integrations/hashicorp_vault_secrets.md | 0 .../integrations/hasura_graphql_server.md | 0 .../prometheus/integrations/hdsentinel.md | 0 .../prometheus/integrations/helium_hotspot.md | 0 .../integrations/helium_miner_validator.md | 0 .../prometheus/integrations/hhvm.md | 0 .../integrations/hitron_cgn_series_cpe.md | 0 .../integrations/hitron_coda_cable_modem.md | 0 .../prometheus/integrations/homebridge.md | 0 .../prometheus/integrations/homey.md | 0 .../prometheus/integrations/honeypot.md | 0 .../prometheus/integrations/hp_ilo.md | 0 .../prometheus/integrations/huawei_devices.md | 0 .../prometheus/integrations/hubble.md | 0 .../integrations/ibm_aix_systems_njmon.md | 0 .../ibm_cryptoexpress_cex_cards.md | 0 .../prometheus/integrations/ibm_mq.md | 0 .../prometheus/integrations/ibm_spectrum.md | 0 .../integrations/ibm_spectrum_virtualize.md | 0 .../ibm_z_hardware_management_console.md | 0 .../prometheus/integrations/influxdb.md | 0 .../prometheus/integrations/iota_full_node.md | 0 .../integrations/ipmi_by_soundcloud.md | 0 .../iqair_airvisual_air_quality_monitors.md | 0 .../integrations/jarvis_standing_desk.md | 0 .../prometheus/integrations/jenkins.md | 0 .../jetbrains_floating_license_server.md | 0 .../prometheus/integrations/jmx.md | 0 .../prometheus/integrations/jolokia.md | 0 .../prometheus/integrations/journald.md | 0 .../prometheus/integrations/kafka.md | 0 .../prometheus/integrations/kafka_connect.md | 0 .../integrations/kafka_consumer_lag.md | 0 .../integrations/kafka_zookeeper.md | 0 .../prometheus/integrations/kannel.md | 0 .../prometheus/integrations/keepalived.md | 0 .../kubernetes_cluster_cloud_cost.md | 0 .../integrations/lagerist_disk_latency.md | 0 .../prometheus/integrations/ldap.md | 0 .../prometheus/integrations/linode.md | 0 .../prometheus/integrations/loki.md | 0 .../integrations/lustre_metadata.md | 0 .../integrations/lynis_audit_reports.md | 0 .../prometheus/integrations/machbase.md | 0 .../prometheus/integrations/maildir.md | 0 .../prometheus/integrations/meilisearch.md | 0 .../integrations/memcached_community.md | 0 .../integrations/meraki_dashboard.md | 0 .../prometheus/integrations/mesos.md | 0 .../integrations/mikrotik_devices.md | 0 .../integrations/mikrotik_routeros_devices.md | 0 .../prometheus/integrations/minecraft.md | 0 .../integrations/modbus_protocol.md | 0 .../prometheus/integrations/mogilefs.md | 0 .../integrations/monnit_sensors_mqtt.md | 0 .../prometheus/integrations/mosquitto.md | 0 .../integrations/mp707_usb_thermometer.md | 0 .../prometheus/integrations/mqtt_blackbox.md | 0 .../prometheus/integrations/mtail.md | 0 .../prometheus/integrations/naemon.md | 0 .../prometheus/integrations/nagios.md | 0 .../nature_remo_e_lite_devices.md | 0 .../integrations/netapp_ontap_api.md | 0 .../integrations/netapp_solidfire.md | 0 .../integrations/netatmo_sensors.md | 0 .../prometheus/integrations/netflow.md | 0 .../prometheus/integrations/netmeter.md | 0 .../prometheus/integrations/new_relic.md | 0 .../integrations/nextcloud_servers.md | 0 .../prometheus/integrations/nextdns.md | 0 .../prometheus/integrations/nftables.md | 0 .../prometheus/integrations/nrpe_daemon.md | 0 .../prometheus/integrations/nsx-t.md | 0 .../prometheus/integrations/nvml.md | 0 .../prometheus/integrations/obs_studio.md | 0 .../prometheus/integrations/odbc.md | 0 .../prometheus/integrations/open_vswitch.md | 0 .../prometheus/integrations/openhab.md | 0 .../integrations/openldap_community.md | 0 .../prometheus/integrations/openrc.md | 0 .../prometheus/integrations/openrct2.md | 0 .../integrations/openroadm_devices.md | 0 .../prometheus/integrations/openstack.md | 0 .../prometheus/integrations/openvas.md | 0 .../prometheus/integrations/openweathermap.md | 0 .../integrations/oracle_db_community.md | 0 .../prometheus/integrations/otrs.md | 0 .../prometheus/integrations/patroni.md | 0 .../integrations/personal_weather_station.md | 0 .../prometheus/integrations/pgbackrest.md | 0 .../prometheus/integrations/pgpool-ii.md | 0 .../prometheus/integrations/philips_hue.md | 0 .../integrations/pimoroni_enviro+.md | 0 .../prometheus/integrations/pingdom.md | 0 .../prometheus/integrations/podman.md | 0 .../integrations/powerpal_devices.md | 0 .../prometheus/integrations/proftpd.md | 0 .../integrations/prometheus_endpoint.md | 0 .../prometheus/integrations/proxmox_ve.md | 0 .../integrations/radio_thermostat.md | 0 .../prometheus/integrations/radius.md | 0 .../prometheus/integrations/rancher.md | 0 .../prometheus/integrations/raritan_pdu.md | 0 .../prometheus/integrations/redis_queue.md | 0 .../prometheus/integrations/ripe_atlas.md | 0 .../prometheus/integrations/sabnzbd.md | 0 .../integrations/salicru_eqx_inverter.md | 0 .../prometheus/integrations/sense_energy.md | 0 .../prometheus/integrations/sentry.md | 0 .../prometheus/integrations/servertech.md | 0 .../prometheus/integrations/shell_command.md | 0 .../integrations/shelly_humidity_sensor.md | 0 .../prometheus/integrations/sia.md | 0 .../prometheus/integrations/siemens_s7_plc.md | 0 .../prometheus/integrations/site_24x7.md | 0 .../prometheus/integrations/slurm.md | 0 .../prometheus/integrations/sma_inverters.md | 0 .../integrations/smart_meters_sml.md | 0 .../integrations/smartrg_808ac_cable_modem.md | 0 .../integrations/softether_vpn_server.md | 0 .../integrations/solar_logging_stick.md | 0 .../integrations/solaredge_inverters.md | 0 .../solis_ginlong_5g_inverters.md | 0 .../prometheus/integrations/sonic_nos.md | 0 .../prometheus/integrations/spacelift.md | 0 .../prometheus/integrations/speedify_cli.md | 0 .../prometheus/integrations/sphinx.md | 0 .../integrations/sql_database_agnostic.md | 0 .../prometheus/integrations/ssh.md | 0 .../integrations/ssl_certificate.md | 0 .../integrations/starlink_spacex.md | 0 .../starwind_vsan_vsphere_edition.md | 0 .../prometheus/integrations/statuspage.md | 0 .../prometheus/integrations/steam.md | 0 .../prometheus/integrations/storidge.md | 0 .../prometheus/integrations/stream.md | 0 .../prometheus/integrations/strongswan.md | 0 .../integrations/sunspec_solar_energy.md | 0 .../prometheus/integrations/suricata.md | 0 .../integrations/synology_activebackup.md | 0 .../prometheus/integrations/sysload.md | 0 .../integrations/t-rex_nvidia_gpu_miner.md | 0 .../prometheus/integrations/tacacs.md | 0 .../tado_smart_heating_solution.md | 0 .../integrations/tankerkoenig_api.md | 0 .../integrations/tesla_powerwall.md | 0 .../prometheus/integrations/tesla_vehicle.md | 0 .../integrations/tesla_wall_connector.md | 0 .../prometheus/integrations/tp-link_p110.md | 0 .../prometheus/integrations/traceroute.md | 0 .../integrations/twincat_ads_web_service.md | 0 .../prometheus/integrations/twitch.md | 0 .../integrations/ubiquiti_ufiber_olt.md | 0 .../prometheus/integrations/uptimerobot.md | 0 .../prometheus/integrations/vault_pki.md | 0 .../prometheus/integrations/vertica.md | 0 .../prometheus/integrations/vscode.md | 0 .../prometheus/integrations/warp10.md | 0 .../integrations/xiaomi_mi_flora.md | 0 .../prometheus/integrations/xmpp_server.md | 0 .../integrations/yourls_url_shortener.md | 0 .../prometheus/integrations/zerto.md | 0 .../prometheus/integrations/zulip.md | 0 .../prometheus/integrations/zyxel_gs1200-8.md | 0 .../prometheus/metadata.yaml | 0 .../prometheus/prometheus.go | 0 .../prometheus/prometheus_test.go | 0 .../prometheus/testdata/config.json | 0 .../prometheus/testdata/config.yaml | 0 .../{modules => collector}/proxysql/README.md | 0 .../{modules => collector}/proxysql/cache.go | 0 .../{modules => collector}/proxysql/charts.go | 0 .../proxysql/collect.go | 0 .../proxysql/config_schema.json | 0 .../proxysql/integrations/proxysql.md | 0 .../proxysql/metadata.yaml | 0 .../proxysql/proxysql.go | 0 .../proxysql/proxysql_test.go | 0 .../proxysql/testdata/config.json | 0 .../proxysql/testdata/config.yaml | 0 .../testdata/v2.0.10/stats_memory_metrics.txt | 0 .../v2.0.10/stats_mysql_commands_counters.txt | 0 .../v2.0.10/stats_mysql_connection_pool .txt | 0 .../testdata/v2.0.10/stats_mysql_global.txt | 0 .../testdata/v2.0.10/stats_mysql_users.txt | 0 .../proxysql/testdata/v2.0.10/version.txt | 0 .../{modules => collector}/pulsar/README.md | 0 .../{modules => collector}/pulsar/cache.go | 0 .../{modules => collector}/pulsar/charts.go | 0 .../{modules => collector}/pulsar/collect.go | 0 .../pulsar/config_schema.json | 0 .../{modules => collector}/pulsar/init.go | 0 .../pulsar/integrations/apache_pulsar.md | 0 .../pulsar/metadata.yaml | 0 .../{modules => collector}/pulsar/metrics.go | 0 .../{modules => collector}/pulsar/pulsar.go | 0 .../pulsar/pulsar_test.go | 0 .../pulsar/testdata/config.json | 0 .../pulsar/testdata/config.yaml | 0 .../pulsar/testdata/non-pulsar.txt | 0 .../testdata/standalone-v2.5.0-namespaces.txt | 0 .../testdata/standalone-v2.5.0-topics-2.txt | 0 .../testdata/standalone-v2.5.0-topics.txt | 0 .../{modules => collector}/puppet/README.md | 0 .../{modules => collector}/puppet/charts.go | 0 .../{modules => collector}/puppet/collect.go | 0 .../puppet/config_schema.json | 0 .../puppet/integrations/puppet.md | 0 .../puppet/metadata.yaml | 0 .../{modules => collector}/puppet/puppet.go | 0 .../puppet/puppet_test.go | 0 .../{modules => collector}/puppet/response.go | 0 .../puppet/testdata/config.json | 0 .../puppet/testdata/config.yaml | 0 .../testdata/serviceStatusResponse.json | 0 .../{modules => collector}/rabbitmq/README.md | 0 .../{modules => collector}/rabbitmq/cache.go | 0 .../{modules => collector}/rabbitmq/charts.go | 0 .../rabbitmq/collect.go | 0 .../rabbitmq/collect_nodes.go | 0 .../rabbitmq/collect_overview.go | 0 .../rabbitmq/collect_queues.go | 0 .../rabbitmq/collect_vhosts.go | 0 .../rabbitmq/config_schema.json | 0 .../rabbitmq/integrations/rabbitmq.md | 0 .../rabbitmq/metadata.yaml | 0 .../rabbitmq/rabbitmq.go | 0 .../rabbitmq/rabbitmq_test.go | 0 .../rabbitmq/restapi.go | 0 .../rabbitmq/testdata/config.json | 0 .../rabbitmq/testdata/config.yaml | 0 .../testdata/v4.0.3/cluster/definitions.json | 0 .../testdata/v4.0.3/cluster/nodes.json | 0 .../testdata/v4.0.3/cluster/overview.json | 0 .../testdata/v4.0.3/cluster/queues.json | 0 .../testdata/v4.0.3/cluster/vhosts.json | 0 .../{modules => collector}/redis/README.md | 0 .../{modules => collector}/redis/charts.go | 0 .../{modules => collector}/redis/collect.go | 0 .../redis/collect_info.go | 0 .../redis/collect_ping_latency.go | 0 .../redis/config_schema.json | 0 .../go.d/{modules => collector}/redis/init.go | 0 .../redis/integrations/redis.md | 0 .../redis/metadata.yaml | 0 .../{modules => collector}/redis/redis.go | 0 .../redis/redis_test.go | 0 .../redis/testdata/config.json | 0 .../redis/testdata/config.yaml | 0 .../redis/testdata/pika/info_all.txt | 0 .../redis/testdata/v6.0.9/info_all.txt | 0 .../rethinkdb/README.md | 0 .../rethinkdb/charts.go | 0 .../rethinkdb/client.go | 0 .../rethinkdb/collect.go | 0 .../rethinkdb/config_schema.json | 0 .../rethinkdb/integrations/rethinkdb.md | 0 .../rethinkdb/metadata.yaml | 0 .../rethinkdb/rethinkdb.go | 0 .../rethinkdb/rethinkdb_test.go | 0 .../rethinkdb/testdata/config.json | 0 .../rethinkdb/testdata/config.yaml | 0 .../rethinkdb/testdata/v2.4.4/stats.txt | 0 .../{modules => collector}/riakkv/README.md | 0 .../{modules => collector}/riakkv/charts.go | 0 .../{modules => collector}/riakkv/collect.go | 0 .../riakkv/config_schema.json | 0 .../riakkv/integrations/riak_kv.md | 0 .../riakkv/metadata.yaml | 0 .../{modules => collector}/riakkv/riakkv.go | 0 .../riakkv/riakkv_test.go | 0 .../{modules => collector}/riakkv/stats.go | 0 .../riakkv/testdata/config.json | 0 .../riakkv/testdata/config.yaml | 0 .../riakkv/testdata/stats.json | 0 .../{modules => collector}/rspamd/README.md | 0 .../{modules => collector}/rspamd/charts.go | 0 .../{modules => collector}/rspamd/collect.go | 0 .../rspamd/config_schema.json | 0 .../rspamd/integrations/rspamd.md | 0 .../rspamd/metadata.yaml | 0 .../{modules => collector}/rspamd/rspamd.go | 0 .../rspamd/rspamd_test.go | 0 .../rspamd/testdata/config.json | 0 .../rspamd/testdata/config.yaml | 0 .../rspamd/testdata/v3.4-stat.json | 0 .../{modules => collector}/samba/README.md | 0 .../{modules => collector}/samba/charts.go | 0 .../{modules => collector}/samba/collect.go | 0 .../samba/config_schema.json | 0 .../go.d/{modules => collector}/samba/exec.go | 0 .../go.d/{modules => collector}/samba/init.go | 0 .../samba/integrations/samba.md | 0 .../samba/metadata.yaml | 0 .../{modules => collector}/samba/samba.go | 0 .../samba/samba_test.go | 0 .../samba/testdata/config.json | 0 .../samba/testdata/config.yaml | 0 .../samba/testdata/smbstatus-profile.txt | 0 .../{modules => collector}/scaleio/README.md | 0 .../{modules => collector}/scaleio/charts.go | 2 +- .../scaleio/client/client.go | 0 .../scaleio/client/client_test.go | 0 .../scaleio/client/server.go | 0 .../scaleio/client/types.go | 0 .../{modules => collector}/scaleio/collect.go | 2 +- .../scaleio/collect_sdc.go | 2 +- .../scaleio/collect_storage_pool.go | 2 +- .../scaleio/collect_system.go | 2 +- .../scaleio/config_schema.json | 0 .../scaleio/integrations/dell_emc_scaleio.md | 0 .../scaleio/metadata.yaml | 0 .../{modules => collector}/scaleio/metrics.go | 0 .../{modules => collector}/scaleio/queries.go | 2 +- .../{modules => collector}/scaleio/scaleio.go | 2 +- .../scaleio/scaleio_test.go | 2 +- .../scaleio/testdata/config.json | 0 .../scaleio/testdata/config.yaml | 0 .../scaleio/testdata/instances.json | 0 .../scaleio/testdata/selected_statistics.json | 0 .../{modules => collector}/sensors/README.md | 0 .../{modules => collector}/sensors/charts.go | 2 +- .../{modules => collector}/sensors/collect.go | 2 +- .../sensors/config_schema.json | 0 .../{modules => collector}/sensors/doc.go | 0 .../sensors/integrations/linux_sensors.md | 0 .../sensors/lmsensors/LICENSE.md | 0 .../sensors/lmsensors/README.md | 0 .../sensors/lmsensors/doc.go | 0 .../sensors/lmsensors/fs.go | 0 .../sensors/lmsensors/parse.go | 0 .../sensors/lmsensors/scanner.go | 0 .../sensors/lmsensors/scanner_test.go | 0 .../sensors/lmsensors/sensor.go | 0 .../sensors/metadata.yaml | 0 .../{modules => collector}/sensors/sensors.go | 2 +- .../sensors/sensors_test.go | 2 +- .../sensors/testdata/config.json | 0 .../sensors/testdata/config.yaml | 0 .../{modules => collector}/smartctl/README.md | 0 .../{modules => collector}/smartctl/charts.go | 0 .../smartctl/collect.go | 0 .../smartctl/config_schema.json | 0 .../{modules => collector}/smartctl/doc.go | 0 .../{modules => collector}/smartctl/exec.go | 0 .../{modules => collector}/smartctl/init.go | 0 .../smartctl/integrations/s.m.a.r.t..md | 0 .../smartctl/metadata.yaml | 0 .../{modules => collector}/smartctl/scan.go | 0 .../smartctl/smart_device.go | 0 .../smartctl/smartctl.go | 0 .../smartctl/smartctl_test.go | 0 .../smartctl/testdata/config.json | 0 .../smartctl/testdata/config.yaml | 0 .../testdata/type-nvme/device-nvme0.json | 0 .../testdata/type-nvme/device-nvme1.json | 0 .../smartctl/testdata/type-nvme/scan.json | 0 .../testdata/type-sat/device-hdd-sda.json | 0 .../testdata/type-sat/device-ssd-sdc.json | 0 .../smartctl/testdata/type-sat/scan.json | 0 .../testdata/type-scsi/device-sda.json | 0 .../smartctl/testdata/type-scsi/scan.json | 0 .../{modules => collector}/snmp/README.md | 0 .../{modules => collector}/snmp/charts.go | 0 .../{modules => collector}/snmp/collect.go | 0 .../snmp/collect_custom_oids.go | 0 .../snmp/collect_if_mib.go | 0 .../snmp/collect_sys_info.go | 2 +- .../{modules => collector}/snmp/config.go | 0 .../snmp/config_schema.json | 0 .../snmp/entnum/enterprise-numbers.txt | 0 .../snmp/entnum/lookup.go | 0 .../go.d/{modules => collector}/snmp/init.go | 0 .../snmp/integrations/snmp_devices.md | 0 .../{modules => collector}/snmp/metadata.yaml | 0 .../go.d/{modules => collector}/snmp/netif.go | 0 .../go.d/{modules => collector}/snmp/snmp.go | 0 .../{modules => collector}/snmp/snmp_test.go | 0 .../snmp/testdata/config.json | 0 .../snmp/testdata/config.yaml | 0 .../{modules => collector}/spigotmc/README.md | 0 .../{modules => collector}/spigotmc/charts.go | 0 .../{modules => collector}/spigotmc/client.go | 0 .../spigotmc/collect.go | 0 .../spigotmc/config_schema.json | 0 .../spigotmc/integrations/spigotmc.md | 0 .../spigotmc/metadata.yaml | 0 .../spigotmc/spigotmc.go | 0 .../spigotmc/spigotmc_test.go | 0 .../spigotmc/testdata/config.json | 0 .../spigotmc/testdata/config.yaml | 0 .../{modules => collector}/squid/README.md | 0 .../{modules => collector}/squid/charts.go | 0 .../{modules => collector}/squid/collect.go | 0 .../squid/config_schema.json | 0 .../squid/integrations/squid.md | 0 .../squid/metadata.yaml | 0 .../{modules => collector}/squid/squid.go | 0 .../squid/squid_test.go | 0 .../squid/testdata/config.json | 0 .../squid/testdata/config.yaml | 0 .../squid/testdata/counters.txt | 0 .../{modules => collector}/squidlog/README.md | 0 .../{modules => collector}/squidlog/charts.go | 0 .../squidlog/collect.go | 0 .../squidlog/config_schema.json | 0 .../{modules => collector}/squidlog/init.go | 0 .../squidlog/integrations/squid_log_files.md | 0 .../squidlog/logline.go | 0 .../squidlog/logline_test.go | 0 .../squidlog/metadata.yaml | 0 .../squidlog/metrics.go | 0 .../squidlog/squidlog.go | 0 .../squidlog/squidlog_test.go | 0 .../squidlog/testdata/access.log | 0 .../squidlog/testdata/config.json | 0 .../squidlog/testdata/config.yaml | 0 .../squidlog/testdata/unknown.log | 0 .../{modules => collector}/storcli/README.md | 0 .../{modules => collector}/storcli/charts.go | 0 .../{modules => collector}/storcli/collect.go | 0 .../storcli/collect_controllers.go | 0 .../storcli/collect_drives.go | 0 .../storcli/config_schema.json | 0 .../{modules => collector}/storcli/doc.go | 0 .../{modules => collector}/storcli/exec.go | 0 .../{modules => collector}/storcli/init.go | 0 .../storcli/integrations/storecli_raid.md | 0 .../storcli/metadata.yaml | 0 .../{modules => collector}/storcli/storcli.go | 0 .../storcli/storcli_test.go | 0 .../storcli/testdata/config.json | 0 .../storcli/testdata/config.yaml | 0 .../testdata/megaraid-controllers-info.json | 0 .../testdata/megaraid-drives-info.json | 0 .../testdata/mpt3sas-controllers-info.json | 0 .../supervisord/README.md | 0 .../supervisord/charts.go | 0 .../supervisord/client.go | 0 .../supervisord/collect.go | 0 .../supervisord/config_schema.json | 0 .../supervisord/init.go | 0 .../supervisord/integrations/supervisor.md | 0 .../supervisord/metadata.yaml | 0 .../supervisord/supervisord.go | 0 .../supervisord/supervisord_test.go | 0 .../supervisord/testdata/config.json | 0 .../supervisord/testdata/config.yaml | 0 .../systemdunits/README.md | 0 .../systemdunits/charts.go | 0 .../systemdunits/client.go | 0 .../systemdunits/collect.go | 0 .../systemdunits/collect_unit_files.go | 0 .../systemdunits/collect_units.go | 0 .../systemdunits/config_schema.json | 0 .../systemdunits/doc.go | 0 .../systemdunits/init.go | 0 .../integrations/systemd_units.md | 0 .../systemdunits/metadata.yaml | 0 .../systemdunits/systemdunits.go | 0 .../systemdunits/systemdunits_test.go | 0 .../systemdunits/testdata/config.json | 0 .../systemdunits/testdata/config.yaml | 0 .../{modules => collector}/tengine/README.md | 0 .../{modules => collector}/tengine/charts.go | 0 .../{modules => collector}/tengine/collect.go | 0 .../tengine/config_schema.json | 0 .../tengine/integrations/tengine.md | 0 .../tengine/metadata.yaml | 0 .../{modules => collector}/tengine/status.go | 0 .../{modules => collector}/tengine/tengine.go | 0 .../tengine/tengine_test.go | 0 .../tengine/testdata/config.json | 0 .../tengine/testdata/config.yaml | 0 .../tengine/testdata/status.txt | 0 .../testrandom/charts.go | 0 .../testrandom/collect.go | 0 .../testrandom/config_schema.json | 0 .../{modules => collector}/testrandom/init.go | 0 .../testrandom/testdata/config.json | 0 .../testrandom/testdata/config.yaml | 0 .../testrandom/testrandom.go | 0 .../testrandom/testrandom_test.go | 0 .../{modules => collector}/tomcat/README.md | 0 .../{modules => collector}/tomcat/charts.go | 0 .../{modules => collector}/tomcat/collect.go | 0 .../tomcat/config_schema.json | 0 .../{modules => collector}/tomcat/init.go | 0 .../tomcat/integrations/tomcat.md | 0 .../tomcat/metadata.yaml | 0 .../tomcat/status_response.go | 0 .../tomcat/testdata/config.json | 0 .../tomcat/testdata/config.yaml | 0 .../tomcat/testdata/server_status.xml | 0 .../{modules => collector}/tomcat/tomcat.go | 0 .../tomcat/tomcat_test.go | 0 .../go.d/{modules => collector}/tor/README.md | 0 .../go.d/{modules => collector}/tor/charts.go | 0 .../go.d/{modules => collector}/tor/client.go | 0 .../{modules => collector}/tor/collect.go | 0 .../tor/config_schema.json | 0 .../tor/integrations/tor.md | 0 .../{modules => collector}/tor/metadata.yaml | 0 .../tor/testdata/config.json | 0 .../tor/testdata/config.yaml | 0 .../go.d/{modules => collector}/tor/tor.go | 0 .../{modules => collector}/tor/tor_test.go | 0 .../{modules => collector}/traefik/README.md | 0 .../{modules => collector}/traefik/charts.go | 0 .../{modules => collector}/traefik/collect.go | 0 .../traefik/config_schema.json | 0 .../{modules => collector}/traefik/init.go | 0 .../traefik/integrations/traefik.md | 0 .../traefik/metadata.yaml | 0 .../traefik/testdata/config.json | 0 .../traefik/testdata/config.yaml | 0 .../traefik/testdata/v2.2.1/metrics.txt | 0 .../{modules => collector}/traefik/traefik.go | 0 .../traefik/traefik_test.go | 0 .../typesense/README.md | 0 .../typesense/charts.go | 0 .../typesense/collect.go | 0 .../typesense/config_schema.json | 0 .../{modules => collector}/typesense/init.go | 0 .../typesense/integrations/typesense.md | 0 .../typesense/metadata.yaml | 0 .../typesense/testdata/config.json | 0 .../typesense/testdata/config.yaml | 0 .../typesense/testdata/v27.0/health_nok.json | 0 .../typesense/testdata/v27.0/health_ok.json | 0 .../typesense/testdata/v27.0/stats.json | 0 .../typesense/typesense.go | 0 .../typesense/typesense_test.go | 0 .../{modules => collector}/unbound/README.md | 0 .../{modules => collector}/unbound/charts.go | 0 .../{modules => collector}/unbound/collect.go | 0 .../unbound/config/config.go | 0 .../unbound/config/config_test.go | 0 .../unbound/config/parse.go | 0 .../unbound/config/parse_test.go | 0 .../unbound/config/testdata/infinite_rec.conf | 0 .../testdata/non_existent_glob_include.conf | 0 .../config/testdata/non_existent_include.conf | 0 .../unbound/config/testdata/valid_glob.conf | 0 .../unbound/config/testdata/valid_glob2.conf | 0 .../unbound/config/testdata/valid_glob3.conf | 0 .../config/testdata/valid_include.conf | 0 .../config/testdata/valid_include2.conf | 0 .../config/testdata/valid_include3.conf | 0 .../testdata/valid_include_toplevel.conf | 0 .../testdata/valid_include_toplevel2.conf | 0 .../testdata/valid_include_toplevel3.conf | 0 .../unbound/config_schema.json | 0 .../{modules => collector}/unbound/init.go | 2 +- .../unbound/integrations/unbound.md | 0 .../unbound/metadata.yaml | 0 .../unbound/testdata/config.json | 0 .../unbound/testdata/config.yaml | 0 .../unbound/testdata/stats/common.txt | 0 .../unbound/testdata/stats/extended.txt | 0 .../stats/lifecycle/cumulative/extended1.txt | 0 .../stats/lifecycle/cumulative/extended2.txt | 0 .../stats/lifecycle/cumulative/extended3.txt | 0 .../stats/lifecycle/reset/extended1.txt | 0 .../stats/lifecycle/reset/extended2.txt | 0 .../stats/lifecycle/reset/extended3.txt | 0 .../unbound/testdata/unbound.conf | 0 .../unbound/testdata/unbound_disabled.conf | 0 .../unbound/testdata/unbound_empty.conf | 0 .../{modules => collector}/unbound/unbound.go | 0 .../unbound/unbound_test.go | 0 .../{modules => collector}/upsd/README.md | 0 .../{modules => collector}/upsd/charts.go | 0 .../{modules => collector}/upsd/client.go | 0 .../{modules => collector}/upsd/collect.go | 0 .../upsd/config_schema.json | 0 .../upsd/integrations/ups_nut.md | 0 .../{modules => collector}/upsd/metadata.yaml | 0 .../upsd/testdata/config.json | 0 .../upsd/testdata/config.yaml | 0 .../go.d/{modules => collector}/upsd/upsd.go | 0 .../{modules => collector}/upsd/upsd_test.go | 0 .../{modules => collector}/upsd/variables.go | 0 .../{modules => collector}/uwsgi/README.md | 0 .../{modules => collector}/uwsgi/charts.go | 0 .../{modules => collector}/uwsgi/client.go | 0 .../{modules => collector}/uwsgi/collect.go | 0 .../uwsgi/config_schema.json | 0 .../go.d/{modules => collector}/uwsgi/init.go | 0 .../uwsgi/integrations/uwsgi.md | 0 .../uwsgi/metadata.yaml | 0 .../uwsgi/testdata/config.json | 0 .../uwsgi/testdata/config.yaml | 0 .../uwsgi/testdata/stats.json | 0 .../uwsgi/testdata/stats_no_workers.json | 0 .../{modules => collector}/uwsgi/uwsgi.go | 0 .../uwsgi/uwsgi_test.go | 0 .../{modules => collector}/varnish/README.md | 0 .../{modules => collector}/varnish/charts.go | 0 .../{modules => collector}/varnish/collect.go | 0 .../varnish/config_schema.json | 0 .../{modules => collector}/varnish/exec.go | 0 .../{modules => collector}/varnish/init.go | 0 .../varnish/integrations/varnish.md | 0 .../varnish/metadata.yaml | 0 .../varnish/testdata/config.json | 0 .../varnish/testdata/config.yaml | 0 .../varnish/testdata/v7.1/varnishstat.txt | 0 .../{modules => collector}/varnish/varnish.go | 0 .../varnish/varnish_test.go | 0 .../{modules => collector}/vcsa/README.md | 0 .../{modules => collector}/vcsa/charts.go | 0 .../vcsa/client/client.go | 0 .../vcsa/client/client_test.go | 0 .../{modules => collector}/vcsa/collect.go | 0 .../vcsa/config_schema.json | 0 .../go.d/{modules => collector}/vcsa/init.go | 2 +- .../integrations/vcenter_server_appliance.md | 0 .../{modules => collector}/vcsa/metadata.yaml | 0 .../vcsa/testdata/config.json | 0 .../vcsa/testdata/config.yaml | 0 .../go.d/{modules => collector}/vcsa/vcsa.go | 0 .../{modules => collector}/vcsa/vcsa_test.go | 0 .../{modules => collector}/vernemq/README.md | 0 .../{modules => collector}/vernemq/charts.go | 0 .../{modules => collector}/vernemq/collect.go | 0 .../vernemq/config_schema.json | 0 .../{modules => collector}/vernemq/init.go | 0 .../vernemq/integrations/vernemq.md | 0 .../vernemq/metadata.yaml | 0 .../{modules => collector}/vernemq/metrics.go | 0 .../vernemq/testdata/config.json | 0 .../vernemq/testdata/config.yaml | 0 .../vernemq/testdata/v1.10.1/metrics.txt | 0 .../vernemq/testdata/v2.0.1/metrics.txt | 0 .../{modules => collector}/vernemq/vernemq.go | 0 .../vernemq/vernemq_test.go | 0 .../{modules => collector}/vsphere/README.md | 0 .../{modules => collector}/vsphere/charts.go | 2 +- .../vsphere/client/client.go | 0 .../vsphere/client/client_test.go | 0 .../vsphere/client/keepalive.go | 0 .../{modules => collector}/vsphere/collect.go | 2 +- .../vsphere/config_schema.json | 0 .../vsphere/discover.go | 0 .../vsphere/discover/build.go | 2 +- .../vsphere/discover/discover.go | 4 +- .../vsphere/discover/discover_test.go | 4 +- .../vsphere/discover/filter.go | 2 +- .../vsphere/discover/hierarchy.go | 2 +- .../vsphere/discover/metric_lists.go | 2 +- .../{modules => collector}/vsphere/init.go | 6 +- .../integrations/vmware_vcenter_server.md | 0 .../vsphere/match/match.go | 2 +- .../vsphere/match/match_test.go | 2 +- .../vsphere/metadata.yaml | 0 .../vsphere/metrics.txt | 0 .../vsphere/resources/resources.go | 0 .../vsphere/scrape/scrape.go | 2 +- .../vsphere/scrape/scrape_test.go | 6 +- .../vsphere/scrape/throttled_caller.go | 0 .../vsphere/scrape/throttled_caller_test.go | 0 .../{modules => collector}/vsphere/task.go | 0 .../vsphere/task_test.go | 0 .../vsphere/testdata/config.json | 0 .../vsphere/testdata/config.yaml | 0 .../{modules => collector}/vsphere/vsphere.go | 4 +- .../vsphere/vsphere_test.go | 6 +- .../{modules => collector}/w1sensor/README.md | 0 .../{modules => collector}/w1sensor/charts.go | 0 .../w1sensor/collect.go | 0 .../w1sensor/config_schema.json | 0 .../{modules => collector}/w1sensor/doc.go | 0 .../w1sensor/integrations/1-wire_sensors.md | 0 .../w1sensor/metadata.yaml | 0 .../w1sensor/testdata/config.json | 0 .../w1sensor/testdata/config.yaml | 0 .../testdata/devices/28-01204e9d2fa0/w1_slave | 0 .../testdata/devices/28-01204e9d2fa1/w1_slave | 0 .../testdata/devices/28-01204e9d2fa2/w1_slave | 0 .../testdata/devices/28-01204e9d2fa3/w1_slave | 0 .../w1sensor/w1sensor.go | 0 .../w1sensor/w1sensor_test.go | 0 .../{modules => collector}/weblog/README.md | 0 .../{modules => collector}/weblog/charts.go | 0 .../{modules => collector}/weblog/collect.go | 0 .../weblog/config_schema.json | 0 .../{modules => collector}/weblog/init.go | 0 .../integrations/web_server_log_files.md | 0 .../{modules => collector}/weblog/logline.go | 0 .../weblog/logline_test.go | 0 .../weblog/metadata.yaml | 0 .../{modules => collector}/weblog/metrics.go | 0 .../{modules => collector}/weblog/parser.go | 0 .../weblog/parser_test.go | 0 .../weblog/testdata/common.log | 0 .../weblog/testdata/config.json | 0 .../weblog/testdata/config.yaml | 0 .../weblog/testdata/custom.log | 0 .../weblog/testdata/custom_time_fields.log | 0 .../weblog/testdata/full.log | 0 .../weblog/testdata/u_ex221107.log | 0 .../{modules => collector}/weblog/weblog.go | 0 .../weblog/weblog_test.go | 0 .../whoisquery/README.md | 0 .../whoisquery/charts.go | 0 .../whoisquery/collect.go | 0 .../whoisquery/config_schema.json | 0 .../{modules => collector}/whoisquery/init.go | 0 .../integrations/domain_expiration_date.md | 0 .../whoisquery/metadata.yaml | 0 .../whoisquery/provider.go | 0 .../whoisquery/testdata/config.json | 0 .../whoisquery/testdata/config.yaml | 0 .../whoisquery/whoisquery.go | 0 .../whoisquery/whoisquery_test.go | 0 .../{modules => collector}/windows/README.md | 0 .../{modules => collector}/windows/charts.go | 0 .../{modules => collector}/windows/collect.go | 0 .../windows/collect_ad.go | 0 .../windows/collect_adcs.go | 0 .../windows/collect_adfs.go | 0 .../windows/collect_collector.go | 0 .../windows/collect_cpu.go | 0 .../windows/collect_exchange.go | 0 .../windows/collect_hyperv.go | 0 .../windows/collect_iis.go | 0 .../windows/collect_logical_disk.go | 0 .../windows/collect_logon.go | 0 .../windows/collect_memory.go | 0 .../windows/collect_mssql.go | 0 .../windows/collect_net.go | 0 .../windows/collect_netframework.go | 0 .../windows/collect_os.go | 0 .../windows/collect_process.go | 0 .../windows/collect_service.go | 0 .../windows/collect_system.go | 0 .../windows/collect_tcp.go | 0 .../windows/collect_thermalzone.go | 0 .../windows/config_schema.json | 0 .../{modules => collector}/windows/init.go | 0 .../windows/testdata/config.json | 0 .../windows/testdata/config.yaml | 0 .../windows/testdata/v0.20.0/metrics.txt | 0 .../{modules => collector}/windows/windows.go | 0 .../windows/windows_test.go | 0 .../wireguard/README.md | 0 .../wireguard/charts.go | 0 .../wireguard/collect.go | 0 .../wireguard/config_schema.json | 0 .../wireguard/integrations/wireguard.md | 0 .../wireguard/metadata.yaml | 0 .../wireguard/testdata/config.json | 0 .../wireguard/testdata/config.yaml | 0 .../wireguard/wireguard.go | 0 .../wireguard/wireguard_test.go | 0 .../x509check/README.md | 0 .../x509check/charts.go | 0 .../x509check/collect.go | 0 .../x509check/config_schema.json | 0 .../{modules => collector}/x509check/init.go | 0 .../integrations/x.509_certificate.md | 0 .../x509check/metadata.yaml | 0 .../x509check/provider.go | 0 .../x509check/testdata/config.json | 0 .../x509check/testdata/config.yaml | 0 .../x509check/x509check.go | 0 .../x509check/x509check_test.go | 0 .../{modules => collector}/zfspool/README.md | 0 .../{modules => collector}/zfspool/charts.go | 0 .../{modules => collector}/zfspool/collect.go | 0 .../zfspool/collect_zpool_list.go | 0 .../zfspool/collect_zpool_list_vdev.go | 0 .../zfspool/config_schema.json | 0 .../{modules => collector}/zfspool/doc.go | 0 .../{modules => collector}/zfspool/exec.go | 0 .../{modules => collector}/zfspool/init.go | 0 .../zfspool/integrations/zfs_pools.md | 0 .../zfspool/metadata.yaml | 0 .../zfspool/testdata/config.json | 0 .../zfspool/testdata/config.yaml | 0 .../testdata/zpool-list-vdev-logs-cache.txt | 0 .../zfspool/testdata/zpool-list-vdev.txt | 0 .../zfspool/testdata/zpool-list.txt | 0 .../{modules => collector}/zfspool/zfspool.go | 0 .../zfspool/zfspool_test.go | 0 .../zookeeper/README.md | 0 .../zookeeper/charts.go | 0 .../zookeeper/collect.go | 0 .../zookeeper/config_schema.json | 0 .../zookeeper/fetcher.go | 0 .../zookeeper/fetcher_test.go | 0 .../{modules => collector}/zookeeper/init.go | 0 .../zookeeper/integrations/zookeeper.md | 0 .../zookeeper/metadata.yaml | 0 .../zookeeper/testdata/config.json | 0 .../zookeeper/testdata/config.yaml | 0 .../zookeeper/testdata/mntr.txt | 0 .../testdata/mntr_notinwhitelist.txt | 0 .../zookeeper/zookeeper.go | 0 .../zookeeper/zookeeper_test.go | 0 src/go/plugin/go.d/modules/init.go | 128 ------------------ 2229 files changed, 174 insertions(+), 174 deletions(-) rename src/go/plugin/go.d/{modules => collector}/activemq/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/activemq/activemq.go (100%) rename src/go/plugin/go.d/{modules => collector}/activemq/activemq_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/activemq/apiclient.go (100%) rename src/go/plugin/go.d/{modules => collector}/activemq/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/activemq/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/activemq/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/activemq/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/activemq/integrations/activemq.md (100%) rename src/go/plugin/go.d/{modules => collector}/activemq/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/activemq/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/activemq/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/adaptec.go (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/adaptec_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/collect_ld.go (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/collect_pd.go (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/integrations/adaptec_raid.md (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/testdata/getconfig-ld-current.txt (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/testdata/getconfig-ld-old.txt (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/testdata/getconfig-pd-current.txt (100%) rename src/go/plugin/go.d/{modules => collector}/adaptecraid/testdata/getconfig-pd-old.txt (100%) rename src/go/plugin/go.d/{modules => collector}/ap/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/ap/ap.go (100%) rename src/go/plugin/go.d/{modules => collector}/ap/ap_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/ap/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/ap/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/ap/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/ap/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/ap/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/ap/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/ap/integrations/access_points.md (100%) rename src/go/plugin/go.d/{modules => collector}/ap/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/ap/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/ap/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/ap/testdata/iw_dev_ap.txt (100%) rename src/go/plugin/go.d/{modules => collector}/ap/testdata/iw_dev_managed.txt (100%) rename src/go/plugin/go.d/{modules => collector}/ap/testdata/station_dump.txt (100%) rename src/go/plugin/go.d/{modules => collector}/apache/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/apache/apache.go (100%) rename src/go/plugin/go.d/{modules => collector}/apache/apache_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/apache/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/apache/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/apache/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/apache/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/apache/integrations/apache.md (100%) rename src/go/plugin/go.d/{modules => collector}/apache/integrations/httpd.md (100%) rename src/go/plugin/go.d/{modules => collector}/apache/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/apache/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/apache/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/apache/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/apache/testdata/extended-status-mpm-event.txt (100%) rename src/go/plugin/go.d/{modules => collector}/apache/testdata/extended-status-mpm-prefork.txt (100%) rename src/go/plugin/go.d/{modules => collector}/apache/testdata/lighttpd-status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/apache/testdata/simple-status-mpm-event.txt (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/apcupsd.go (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/apcupsd_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/integrations/apc_ups.md (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/status.go (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/testdata/status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/apcupsd/testdata/status_commlost.txt (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/beanstalk.go (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/beanstalk_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/integrations/beanstalk.md (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/testdata/list-tubes.txt (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/testdata/stats-tube-default.txt (100%) rename src/go/plugin/go.d/{modules => collector}/beanstalk/testdata/stats.txt (100%) rename src/go/plugin/go.d/{modules => collector}/bind/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/bind/bind.go (100%) rename src/go/plugin/go.d/{modules => collector}/bind/bind_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/bind/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/bind/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/bind/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/bind/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/bind/json_client.go (100%) rename src/go/plugin/go.d/{modules => collector}/bind/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/bind/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/bind/testdata/query-server.json (100%) rename src/go/plugin/go.d/{modules => collector}/bind/testdata/query-server.xml (100%) rename src/go/plugin/go.d/{modules => collector}/bind/xml3_client.go (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/boinc.go (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/boinc_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/client_proto.go (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/integrations/boinc.md (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/testdata/get_results.xml (100%) rename src/go/plugin/go.d/{modules => collector}/boinc/testdata/get_results_no_tasks.xml (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/cassandra.go (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/cassandra_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/integrations/cassandra.md (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/jmx_exporter.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/cassandra/testdata/metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/api.go (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/auth.go (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/ceph.go (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/ceph_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/collect_health.go (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/collect_osd.go (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/collect_pools.go (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/integrations/ceph.md (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/testdata/v16.2.15/api_health_minimal.json (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/testdata/v16.2.15/api_monitor.json (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/testdata/v16.2.15/api_osd.json (100%) rename src/go/plugin/go.d/{modules => collector}/ceph/testdata/v16.2.15/api_pool_stats.json (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/chrony.go (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/chrony_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/integrations/chrony.md (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/chrony/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/clickhouse.go (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/clickhouse_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/collect_system_async_metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/collect_system_disks.go (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/collect_system_events.go (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/collect_system_metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/collect_system_parts.go (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/collect_system_processes.go (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/integrations/clickhouse.md (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/testdata/resp_longest_query_time.csv (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/testdata/resp_system_async_metrics.csv (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/testdata/resp_system_disks.csv (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/testdata/resp_system_events.csv (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/testdata/resp_system_metrics.csv (100%) rename src/go/plugin/go.d/{modules => collector}/clickhouse/testdata/resp_system_parts.csv (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/cockroachdb.go (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/cockroachdb_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/integrations/cockroachdb.md (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/testdata/metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/cockroachdb/testdata/non_cockroachdb.txt (100%) rename src/go/plugin/go.d/{modules => collector}/consul/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/consul/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/consul/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/consul/collect_autopilot.go (100%) rename src/go/plugin/go.d/{modules => collector}/consul/collect_checks.go (100%) rename src/go/plugin/go.d/{modules => collector}/consul/collect_config.go (100%) rename src/go/plugin/go.d/{modules => collector}/consul/collect_metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/consul/collect_net_rtt.go (100%) rename src/go/plugin/go.d/{modules => collector}/consul/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/consul.go (100%) rename src/go/plugin/go.d/{modules => collector}/consul/consul_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/consul/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/consul/integrations/consul.md (100%) rename src/go/plugin/go.d/{modules => collector}/consul/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.13.2/client_v1-agent-metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.13.2/client_v1-agent-self.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.13.2/server_v1-agent-metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.13.2/server_v1-agent-metrics_with_hostname.txt (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.13.2/server_v1-agent-self.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.13.2/server_v1-agent-self_cloud-managed.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.13.2/server_v1-agent-self_disabled_prom.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.13.2/server_v1-agent-self_with_hostname.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.13.2/server_v1-coordinate-nodes.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.13.2/server_v1-operator-autopilot-health.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.13.2/v1-agent-checks.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.14.3-cloud/server_v1-agent-metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.14.3-cloud/server_v1-agent-self.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.14.3-cloud/server_v1-coordinate-nodes.json (100%) rename src/go/plugin/go.d/{modules => collector}/consul/testdata/v1.14.3-cloud/v1-agent-checks.json (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/coredns.go (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/coredns_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/integrations/coredns.md (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/testdata/no_version/no_load.txt (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/testdata/version169/no_load.txt (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/testdata/version169/some_load.txt (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/testdata/version170/no_load.txt (100%) rename src/go/plugin/go.d/{modules => collector}/coredns/testdata/version170/some_load.txt (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/couchbase.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/couchbase_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/integrations/couchbase.md (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/testdata/6.6.0/buckets_basic_stats.json (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/couchbase/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/couchdb.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/couchdb_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/integrations/couchdb.md (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/testdata/v3.1.1/active_tasks.json (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/testdata/v3.1.1/dbs_info.json (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/testdata/v3.1.1/node_stats.json (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/testdata/v3.1.1/node_system.json (100%) rename src/go/plugin/go.d/{modules => collector}/couchdb/testdata/v3.1.1/root.json (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/dmcache.go (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/dmcache_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/integrations/dmcache_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/dmcache/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/dnsdist.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/dnsdist_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/integrations/dnsdist.md (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dnsdist/testdata/v1.5.1/jsonstat.json (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq/dnsmasq.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq/dnsmasq_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq/integrations/dnsmasq.md (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/dhcp.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/dhcp_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/integrations/dnsmasq_dhcp.md (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/parse_configuration.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.conf (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d/.dnsmasq.conf (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d/dnsmasqv4.any (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d/dnsmasqv6.any (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d2/dnsmasqv4.any (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d2/dnsmasqv6.any (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d2/~dnsmasq.conf (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasq.bak (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasqv4.any (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasqv6.any (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasq.other (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasqv4.conf (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasqv6.conf (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq.leases (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq2.conf (100%) rename src/go/plugin/go.d/{modules => collector}/dnsmasq_dhcp/testdata/dnsmasq3.conf (100%) rename src/go/plugin/go.d/{modules => collector}/dnsquery/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/dnsquery/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsquery/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsquery/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/dnsquery/dnsquery.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsquery/dnsquery_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsquery/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/dnsquery/integrations/dns_query.md (100%) rename src/go/plugin/go.d/{modules => collector}/dnsquery/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dnsquery/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/dnsquery/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/docker/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/docker/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/docker/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/docker/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/docker/docker.go (100%) rename src/go/plugin/go.d/{modules => collector}/docker/docker_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/docker/integrations/docker.md (100%) rename src/go/plugin/go.d/{modules => collector}/docker/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/docker/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/docker/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/docker_engine.go (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/docker_engine_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/integrations/docker_engine.md (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/testdata/non-docker-engine.txt (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/testdata/v17.05.0-ce.txt (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/testdata/v18.09.3-ce-swarm.txt (100%) rename src/go/plugin/go.d/{modules => collector}/docker_engine/testdata/v18.09.3-ce.txt (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/apiclient.go (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/dockerhub.go (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/dockerhub_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/integrations/docker_hub_repository.md (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/testdata/repo1.txt (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/testdata/repo2.txt (100%) rename src/go/plugin/go.d/{modules => collector}/dockerhub/testdata/repo3.txt (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/dovecot.go (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/dovecot_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/integrations/dovecot.md (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/dovecot/testdata/export_global.txt (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/elasticsearch.go (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/elasticsearch_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/integrations/elasticsearch.md (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/integrations/opensearch.md (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/testdata/v8.4.2/cat_indices_stats.json (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/testdata/v8.4.2/cluster_health.json (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/testdata/v8.4.2/cluster_stats.json (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/testdata/v8.4.2/info.json (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/testdata/v8.4.2/nodes_local_stats.json (100%) rename src/go/plugin/go.d/{modules => collector}/elasticsearch/testdata/v8.4.2/nodes_stats.json (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/envoy.go (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/envoy_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/integrations/envoy.md (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/testdata/consul-dataplane.txt (100%) rename src/go/plugin/go.d/{modules => collector}/envoy/testdata/envoy.txt (100%) rename src/go/plugin/go.d/{modules => collector}/exim/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/exim/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/exim/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/exim/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/exim/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/exim/exim.go (100%) rename src/go/plugin/go.d/{modules => collector}/exim/exim_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/exim/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/exim/integrations/exim.md (100%) rename src/go/plugin/go.d/{modules => collector}/exim/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/exim/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/exim/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/fail2ban.go (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/fail2ban_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/integrations/fail2ban.md (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/testdata/fail2ban-jail-status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/fail2ban/testdata/fail2ban-status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/cache.go (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/collect_dirs.go (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/collect_files.go (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/discover.go (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/filecheck.go (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/filecheck_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/integrations/files_and_directories.md (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/testdata/dir/empty_file.log (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/testdata/dir/file.log (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/testdata/dir/subdir/empty_file.log (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/testdata/empty_file.log (100%) rename src/go/plugin/go.d/{modules => collector}/filecheck/testdata/file.log (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/apiclient.go (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/fluentd.go (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/fluentd_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/integrations/fluentd.md (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/fluentd/testdata/plugins.json (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/api/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/api/client_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/api/dictionary.go (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/freeradius.go (96%) rename src/go/plugin/go.d/{modules => collector}/freeradius/freeradius_test.go (98%) rename src/go/plugin/go.d/{modules => collector}/freeradius/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/integrations/freeradius.md (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/freeradius/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/gearman.go (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/gearman_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/integrations/gearman.md (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/testdata/priority-status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/gearman/testdata/status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/geth/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/geth/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/geth/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/geth/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/geth/geth.go (100%) rename src/go/plugin/go.d/{modules => collector}/geth/geth_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/geth/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/geth/integrations/go-ethereum.md (100%) rename src/go/plugin/go.d/{modules => collector}/geth/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/geth/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/geth/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/geth/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/geth/testdata/metrics_geth.txt (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/haproxy.go (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/haproxy_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/integrations/haproxy.md (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/haproxy/testdata/v2.3.10/metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/hddtemp.go (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/hddtemp_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/integrations/hdd_temperature.md (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/testdata/hddtemp-all-ok.txt (100%) rename src/go/plugin/go.d/{modules => collector}/hddtemp/testdata/hddtemp-all-sleep.txt (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/hdfs.go (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/hdfs_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/integrations/hadoop_distributed_file_system_hdfs.md (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/raw_data.go (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/testdata/datanode.json (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/testdata/namenode.json (100%) rename src/go/plugin/go.d/{modules => collector}/hdfs/testdata/unknownnode.json (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/hpssa.go (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/hpssa_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/integrations/hpe_smart_arrays.md (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/parse.go (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/testdata/ssacli-P212_P410i.txt (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/testdata/ssacli-P400ar.txt (100%) rename src/go/plugin/go.d/{modules => collector}/hpssa/testdata/ssacli-P400i-unassigned.txt (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/cookiejar.go (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/httpcheck.go (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/httpcheck_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/integrations/http_endpoints.md (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/httpcheck/testdata/cookie.txt (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/icecast.go (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/icecast_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/integrations/icecast.md (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/server_stats.go (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/testdata/stats_multi_source.json (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/testdata/stats_no_sources.json (100%) rename src/go/plugin/go.d/{modules => collector}/icecast/testdata/stats_single_source.json (100%) create mode 100644 src/go/plugin/go.d/collector/init.go rename src/go/plugin/go.d/{modules => collector}/intelgpu/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/integrations/intel_gpu.md (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/intelgpu.go (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/intelgpu_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/intelgpu/testdata/igt.json (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/integrations/ipfs.md (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/ipfs.go (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/ipfs_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/testdata/api_v0_pin_ls.json (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/testdata/api_v0_stats_bw.json (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/testdata/api_v0_stats_repo.json (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/testdata/api_v0_swarm_peers.json (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/ipfs/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/integrations/isc_dhcp.md (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/isc_dhcpd.go (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/isc_dhcpd_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/parse.go (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/testdata/dhcpd.leases_empty (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/testdata/dhcpd.leases_ipv4 (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/testdata/dhcpd.leases_ipv4_backup (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/testdata/dhcpd.leases_ipv4_inactive (100%) rename src/go/plugin/go.d/{modules => collector}/isc_dhcpd/testdata/dhcpd.leases_ipv6 (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/integrations/kubelet.md (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/kubelet.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/kubelet_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/testdata/metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubelet/testdata/token.txt (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/integrations/kubeproxy.md (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/kubeproxy.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/kubeproxy_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_kubeproxy/testdata/metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/cluster_meta.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/discover_kubernetes.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/discover_node.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/discover_pod.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/integrations/kubernetes_cluster_state.md (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/kube_state.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/kube_state_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/resource.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/state.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/update_node_state.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/update_pod_state.go (100%) rename src/go/plugin/go.d/{modules => collector}/k8s_state/update_state.go (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/integrations/lighttpd.md (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/lighttpd.go (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/lighttpd_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/status.go (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/testdata/apache-status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/lighttpd/testdata/status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/integrations/litespeed.md (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/litespeed.go (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/litespeed_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/testdata/.rtreport (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/testdata/.rtreport.2 (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/litespeed/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/logind/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/logind/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/logind/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/logind/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/logind/connection.go (100%) rename src/go/plugin/go.d/{modules => collector}/logind/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/logind/integrations/systemd-logind_users.md (100%) rename src/go/plugin/go.d/{modules => collector}/logind/logind.go (100%) rename src/go/plugin/go.d/{modules => collector}/logind/logind_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/logind/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/logind/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/logind/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/integrations/logstash.md (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/logstash.go (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/logstash_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/node_stats.go (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/logstash/testdata/stats.json (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/integrations/lvm_logical_volumes.md (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/lvm.go (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/lvm_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/testdata/lvs-report-no-thin.json (100%) rename src/go/plugin/go.d/{modules => collector}/lvm/testdata/lvs-report.json (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/integrations/maxscale.md (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/maxscale.go (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/maxscale_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/restapi.go (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/testdata/v24.02.3/maxscale.json (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/testdata/v24.02.3/maxscale_threads.json (100%) rename src/go/plugin/go.d/{modules => collector}/maxscale/testdata/v24.02.3/servers.json (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/collect_bbu.go (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/collect_phys_drives.go (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/integrations/megacli_megaraid.md (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/megacli.go (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/megacli_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/testdata/mega-bbu-info-old.txt (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/testdata/mega-bbu-info-recent.txt (100%) rename src/go/plugin/go.d/{modules => collector}/megacli/testdata/mega-phys-drives-info.txt (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/integrations/memcached.md (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/memcached.go (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/memcached_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/memcached/testdata/stats.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/collect_dbstats.go (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/collect_replsetgetstatus.go (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/collect_serverstatus.go (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/collect_sharding.go (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/documents.go (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/integrations/mongodb.md (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/mongodb.go (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/mongodb_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/testdata/v6.0.3/dbStats.json (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/testdata/v6.0.3/mongod-serverStatus.json (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/testdata/v6.0.3/mongos-serverStatus.json (100%) rename src/go/plugin/go.d/{modules => collector}/mongodb/testdata/v6.0.3/replSetGetStatus.json (100%) rename src/go/plugin/go.d/{modules => collector}/monit/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/monit/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/monit/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/monit/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/monit/integrations/monit.md (100%) rename src/go/plugin/go.d/{modules => collector}/monit/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/monit/monit.go (100%) rename src/go/plugin/go.d/{modules => collector}/monit/monit_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/monit/status.go (100%) rename src/go/plugin/go.d/{modules => collector}/monit/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/monit/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/monit/testdata/v5.33.0/status.xml (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/collect_global_status.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/collect_global_vars.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/collect_process_list.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/collect_slave_status.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/collect_user_statistics.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/collect_version.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/disable_logging.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/integrations/mariadb.md (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/integrations/mysql.md (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/integrations/percona_mysql.md (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/mycnf.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/mycnf_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/mysql.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/mysql_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_variables.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4-galera-cluster/process_list.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4-galera-cluster/user_statistics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4-galera-cluster/version.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4/all_slaves_status_multi_source.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4/all_slaves_status_single_source.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4/global_status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4/global_variables.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4/process_list.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4/user_statistics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v10.8.4/version.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v5.5.64/global_status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v5.5.64/global_variables.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v5.5.64/process_list.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mariadb/v5.5.64/version.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mysql/v8.0.30/global_status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mysql/v8.0.30/global_variables.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mysql/v8.0.30/process_list.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mysql/v8.0.30/replica_status_multi_source.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/mysql/v8.0.30/version.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/percona/v8.0.29/global_status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/percona/v8.0.29/global_variables.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/percona/v8.0.29/process_list.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/percona/v8.0.29/user_statistics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/percona/v8.0.29/version.txt (100%) rename src/go/plugin/go.d/{modules => collector}/mysql/testdata/session_variables.txt (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/integrations/nginx.md (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/nginx.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/nginx_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/status.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/testdata/status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/nginx/testdata/tengine-status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/cache.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/integrations/nginx_plus.md (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/nginx_http_api.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/nginx_http_api_query.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/nginxplus.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/nginxplus_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/404.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/api_versions.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/connections.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/endpoints_http.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/endpoints_root.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/endpoints_stream.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/http_caches.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/http_location_zones.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/http_requests.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/http_server_zones.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/http_upstreams.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/nginx.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/resolvers.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/ssl.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/stream_server_zones.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/api-8/stream_upstreams.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxplus/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nginxunit/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/nginxunit/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxunit/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxunit/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxunit/integrations/nginx_unit.md (100%) rename src/go/plugin/go.d/{modules => collector}/nginxunit/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nginxunit/nginxunit.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxunit/nginxunit_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxunit/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxunit/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nginxunit/testdata/v1.29.1/status.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/integrations/nginx_vts.md (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/nginxvts.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/nginxvts_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nginxvts/testdata/vts-v0.1.18.json (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/integrations/nsd.md (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/nsd.go (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/nsd_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/stats_counters.go (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nsd/testdata/stats.txt (100%) rename src/go/plugin/go.d/{modules => collector}/ntpd/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/ntpd/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/ntpd/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/ntpd/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/ntpd/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/ntpd/integrations/ntpd.md (100%) rename src/go/plugin/go.d/{modules => collector}/ntpd/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/ntpd/ntpd.go (100%) rename src/go/plugin/go.d/{modules => collector}/ntpd/ntpd_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/ntpd/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/ntpd/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/gpu_info.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/integrations/nvidia_gpu.md (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/nvidia_smi.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/nvidia_smi_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/testdata/a100-sxm4-mig.xml (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/testdata/rtx-2080-win.xml (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/testdata/rtx-3060.xml (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/testdata/rtx-4090-driver-535.xml (100%) rename src/go/plugin/go.d/{modules => collector}/nvidia_smi/testdata/tesla-p100.xml (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/integrations/nvme_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/nvme.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/nvme_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/testdata/nvme-list-empty.json (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/testdata/nvme-list.json (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/testdata/nvme-smart-log-float.json (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/testdata/nvme-smart-log-string.json (100%) rename src/go/plugin/go.d/{modules => collector}/nvme/testdata/nvme-smart-log.json (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/collect_mon_counters.go (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/collect_operations.go (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/integrations/openldap.md (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/openldap.go (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/openldap_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/openldap/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/client/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/client/client_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/client/commands.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/client/testdata/load-stats.txt (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/client/testdata/status3.txt (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/client/testdata/version.txt (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/client/types.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/init.go (88%) rename src/go/plugin/go.d/{modules => collector}/openvpn/integrations/openvpn.md (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/openvpn.go (96%) rename src/go/plugin/go.d/{modules => collector}/openvpn/openvpn_test.go (98%) rename src/go/plugin/go.d/{modules => collector}/openvpn/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/integrations/openvpn_status_log.md (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/openvpn.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/openvpn_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/parser.go (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/testdata/empty.txt (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/testdata/v2.5.1/static-key.txt (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/testdata/v2.5.1/version1.txt (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/testdata/v2.5.1/version2.txt (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt (100%) rename src/go/plugin/go.d/{modules => collector}/openvpn_status_log/testdata/v2.5.1/version3.txt (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/collect_sysmetric.go (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/collect_sysstat.go (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/collect_tablespace.go (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/collect_wait_class.go (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/integrations/oracle_db.md (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/oracledb.go (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/oracledb_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/testdata/v21.3.0-xe/sysmetric.txt (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/testdata/v21.3.0-xe/sysstat.txt (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/testdata/v21.3.0-xe/tablespace.txt (100%) rename src/go/plugin/go.d/{modules => collector}/oracledb/testdata/v21.3.0-xe/wait_class.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/integrations/pgbouncer.md (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/pgbouncer.go (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/pgbouncer_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/testdata/v1.17.0/config.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/testdata/v1.17.0/databases.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/testdata/v1.17.0/pools.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/testdata/v1.17.0/stats.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/testdata/v1.17.0/version.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pgbouncer/testdata/v1.7.0/version.txt (100%) rename src/go/plugin/go.d/{modules => collector}/phpdaemon/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/phpdaemon/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/phpdaemon/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/phpdaemon/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/phpdaemon/integrations/phpdaemon.md (100%) rename src/go/plugin/go.d/{modules => collector}/phpdaemon/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/phpdaemon/phpdaemon.go (100%) rename src/go/plugin/go.d/{modules => collector}/phpdaemon/phpdaemon_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/phpdaemon/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/phpdaemon/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/phpdaemon/testdata/fullstatus.json (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/decode.go (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/integrations/php-fpm.md (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/phpfpm.go (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/phpfpm_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/testdata/status-full-no-idle.json (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/testdata/status-full.json (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/testdata/status-full.txt (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/testdata/status.json (100%) rename src/go/plugin/go.d/{modules => collector}/phpfpm/testdata/status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/integrations/pi-hole.md (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/pihole.go (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/pihole_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/testdata/getForwardDestinations.json (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/testdata/getQueryTypes.json (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/testdata/setupVars.conf (100%) rename src/go/plugin/go.d/{modules => collector}/pihole/testdata/summaryRaw.json (100%) rename src/go/plugin/go.d/{modules => collector}/pika/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/pika/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/pika/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/pika/collect_info.go (100%) rename src/go/plugin/go.d/{modules => collector}/pika/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/pika/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/pika/integrations/pika.md (100%) rename src/go/plugin/go.d/{modules => collector}/pika/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/pika/pika.go (100%) rename src/go/plugin/go.d/{modules => collector}/pika/pika_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/pika/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/pika/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/pika/testdata/redis/info_all.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pika/testdata/v3.4.0/info_all.txt (100%) rename src/go/plugin/go.d/{modules => collector}/ping/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/ping/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/ping/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/ping/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/ping/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/ping/integrations/ping.md (100%) rename src/go/plugin/go.d/{modules => collector}/ping/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/ping/ping.go (100%) rename src/go/plugin/go.d/{modules => collector}/ping/ping_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/ping/prober.go (100%) rename src/go/plugin/go.d/{modules => collector}/ping/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/ping/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/check_tcp_port.go (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/check_udp_port.go (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/integrations/tcp-udp_endpoints.md (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/portcheck.go (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/portcheck_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/portcheck/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/integrations/postfix.md (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/postfix.go (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/postfix_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/postfix/testdata/postqueue.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/collect_metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/do_query.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/do_query_bloat.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/do_query_columns.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/do_query_databases.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/do_query_global.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/do_query_indexes.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/do_query_misc.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/do_query_replication.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/do_query_tables.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/integrations/postgresql.md (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/postgres.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/postgres_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/queries.go (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/autovacuum_workers.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/bloat_tables.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/catalog_relations.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/checkpoints.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/database_conflicts.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/database_locks.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/database_size.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/database_stats.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/is_super_user-false.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/is_super_user-true.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/pg_is_in_recovery-true.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/queryable_database_list.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/replication_slot_files.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/replication_standby_app_wal_delta.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/replication_standby_app_wal_lag.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/server_connections_state.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/server_current_connections.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/server_version_num.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/settings_max_connections.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/settings_max_locks_held.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/stat_user_indexes_db_postgres.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/stat_user_tables_db_postgres.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/statio_user_tables_db_postgres.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/table_columns_stats.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/txid_wraparound.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/uptime.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/wal_archive_files.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/wal_files.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/wal_writes.txt (100%) rename src/go/plugin/go.d/{modules => collector}/postgres/testdata/v14.4/xact_query_running_time.txt (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/authoritativens.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/authoritativens_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/integrations/powerdns_authoritative_server.md (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/testdata/recursor/statistics.json (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns/testdata/v4.3.0/statistics.json (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/integrations/powerdns_recursor.md (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/recursor.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/recursor_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/testdata/authoritative/statistics.json (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/powerdns_recursor/testdata/v4.3.1/statistics.json (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/cache.go (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/4d_server.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/8430ft_modem.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/a10_acos_network_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/airthings_waveplus_air_sensor.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/akamai_edge_dns_traffic.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/akamai_global_traffic_management.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/akami_cloudmonitor.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/alamos_fe2_server.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/alibaba_cloud.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/altaro_backup.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/amd_cpu_&_gpu.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/andrews_&_arnold_line_status.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/apache_airflow.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/apache_flink.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/apicast.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/apple_time_machine.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/arm_hwcpipe.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/aruba_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/arvancloud_cdn.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/audisto.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/authlog.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/aws_ec2_compute_instances.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/aws_ec2_spot_instance.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/aws_ecs.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/aws_health_events.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/aws_instance_health.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/aws_quota.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/aws_rds.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/aws_s3_buckets.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/aws_sqs.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/azure_ad_app_passwords.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/azure_application.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/azure_elastic_pool_sql.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/azure_resources.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/azure_service_bus.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/azure_sql.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/bigquery.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/bird_routing_daemon.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/blackbox.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/bobcat_miner_300.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/borg_backup.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/bosh.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/bpftrace_variables.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/bungeecord.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/cadvisor.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/celery.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/certificate_transparency.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/checkpoint_device.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/chia.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/christ_elektronik_clm5ip_power_panel.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/cilium_agent.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/cilium_operator.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/cilium_proxy.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/cisco_aci.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/citrix_netscaler.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/clamav_daemon.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/clamscan_results.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/clash.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/cloud_foundry.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/cloud_foundry_firehose.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/cloudflare_pcap.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/cloudwatch.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/clustercontrol_cmon.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/collectd.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/concourse.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/craftbeerpi.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/crowdsec.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/crypto_exchanges.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/cryptowatch.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/custom_exporter.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/cvmfs_clients.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ddwrt_routers.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/dell_emc_ecs_cluster.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/dell_emc_isilon_cluster.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/dell_emc_xtremio_cluster.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/dell_powermax.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/dependency-track.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/digitalocean.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/discourse.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/dmarc.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/dnsbl.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/dutch_electricity_smart_meter.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/dynatrace.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/eaton_ups.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/elgato_key_light_devices..md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/energomera_smart_power_meters.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/eos.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/etcd.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/excel_spreadsheet.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/fastd.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/fortigate_firewall.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/freebsd_nfs.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/freebsd_rctl-racct.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/freifunk_network.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/fritzbox_network_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/frrouting.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/gcp_gce.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/gcp_quota.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/generic_command_line_output.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/generic_storage_enclosure_tool.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/github_api_rate_limit.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/github_repository.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/gitlab_runner.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/gobetween.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/google_cloud_platform.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/google_pagespeed.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/google_stackdriver.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/gpsd.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/grafana.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/graylog_server.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/gtp.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/halon.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/hana.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/hashicorp_vault_secrets.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/hasura_graphql_server.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/hdsentinel.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/helium_hotspot.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/helium_miner_validator.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/hhvm.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/hitron_cgn_series_cpe.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/hitron_coda_cable_modem.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/homebridge.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/homey.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/honeypot.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/hp_ilo.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/huawei_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/hubble.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ibm_aix_systems_njmon.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ibm_cryptoexpress_cex_cards.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ibm_mq.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ibm_spectrum.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ibm_spectrum_virtualize.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ibm_z_hardware_management_console.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/influxdb.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/iota_full_node.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ipmi_by_soundcloud.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/iqair_airvisual_air_quality_monitors.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/jarvis_standing_desk.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/jenkins.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/jetbrains_floating_license_server.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/jmx.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/jolokia.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/journald.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/kafka.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/kafka_connect.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/kafka_consumer_lag.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/kafka_zookeeper.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/kannel.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/keepalived.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/kubernetes_cluster_cloud_cost.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/lagerist_disk_latency.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ldap.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/linode.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/loki.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/lustre_metadata.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/lynis_audit_reports.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/machbase.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/maildir.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/meilisearch.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/memcached_community.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/meraki_dashboard.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/mesos.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/mikrotik_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/mikrotik_routeros_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/minecraft.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/modbus_protocol.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/mogilefs.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/monnit_sensors_mqtt.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/mosquitto.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/mp707_usb_thermometer.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/mqtt_blackbox.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/mtail.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/naemon.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/nagios.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/nature_remo_e_lite_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/netapp_ontap_api.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/netapp_solidfire.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/netatmo_sensors.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/netflow.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/netmeter.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/new_relic.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/nextcloud_servers.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/nextdns.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/nftables.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/nrpe_daemon.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/nsx-t.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/nvml.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/obs_studio.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/odbc.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/open_vswitch.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/openhab.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/openldap_community.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/openrc.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/openrct2.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/openroadm_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/openstack.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/openvas.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/openweathermap.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/oracle_db_community.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/otrs.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/patroni.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/personal_weather_station.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/pgbackrest.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/pgpool-ii.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/philips_hue.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/pimoroni_enviro+.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/pingdom.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/podman.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/powerpal_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/proftpd.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/prometheus_endpoint.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/proxmox_ve.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/radio_thermostat.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/radius.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/rancher.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/raritan_pdu.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/redis_queue.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ripe_atlas.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/sabnzbd.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/salicru_eqx_inverter.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/sense_energy.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/sentry.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/servertech.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/shell_command.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/shelly_humidity_sensor.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/sia.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/siemens_s7_plc.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/site_24x7.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/slurm.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/sma_inverters.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/smart_meters_sml.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/smartrg_808ac_cable_modem.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/softether_vpn_server.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/solar_logging_stick.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/solaredge_inverters.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/solis_ginlong_5g_inverters.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/sonic_nos.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/spacelift.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/speedify_cli.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/sphinx.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/sql_database_agnostic.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ssh.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ssl_certificate.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/starlink_spacex.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/starwind_vsan_vsphere_edition.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/statuspage.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/steam.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/storidge.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/stream.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/strongswan.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/sunspec_solar_energy.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/suricata.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/synology_activebackup.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/sysload.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/t-rex_nvidia_gpu_miner.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/tacacs.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/tado_smart_heating_solution.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/tankerkoenig_api.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/tesla_powerwall.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/tesla_vehicle.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/tesla_wall_connector.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/tp-link_p110.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/traceroute.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/twincat_ads_web_service.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/twitch.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/ubiquiti_ufiber_olt.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/uptimerobot.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/vault_pki.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/vertica.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/vscode.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/warp10.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/xiaomi_mi_flora.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/xmpp_server.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/yourls_url_shortener.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/zerto.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/zulip.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/integrations/zyxel_gs1200-8.md (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/prometheus.go (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/prometheus_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/prometheus/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/cache.go (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/integrations/proxysql.md (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/proxysql.go (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/proxysql_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/testdata/v2.0.10/stats_memory_metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/testdata/v2.0.10/stats_mysql_commands_counters.txt (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/testdata/v2.0.10/stats_mysql_connection_pool .txt (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/testdata/v2.0.10/stats_mysql_global.txt (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/testdata/v2.0.10/stats_mysql_users.txt (100%) rename src/go/plugin/go.d/{modules => collector}/proxysql/testdata/v2.0.10/version.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/cache.go (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/integrations/apache_pulsar.md (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/pulsar.go (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/pulsar_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/testdata/non-pulsar.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/testdata/standalone-v2.5.0-namespaces.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/testdata/standalone-v2.5.0-topics-2.txt (100%) rename src/go/plugin/go.d/{modules => collector}/pulsar/testdata/standalone-v2.5.0-topics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/integrations/puppet.md (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/puppet.go (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/puppet_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/response.go (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/puppet/testdata/serviceStatusResponse.json (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/cache.go (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/collect_nodes.go (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/collect_overview.go (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/collect_queues.go (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/collect_vhosts.go (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/integrations/rabbitmq.md (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/rabbitmq.go (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/rabbitmq_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/restapi.go (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/testdata/v4.0.3/cluster/definitions.json (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/testdata/v4.0.3/cluster/nodes.json (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/testdata/v4.0.3/cluster/overview.json (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/testdata/v4.0.3/cluster/queues.json (100%) rename src/go/plugin/go.d/{modules => collector}/rabbitmq/testdata/v4.0.3/cluster/vhosts.json (100%) rename src/go/plugin/go.d/{modules => collector}/redis/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/redis/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/redis/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/redis/collect_info.go (100%) rename src/go/plugin/go.d/{modules => collector}/redis/collect_ping_latency.go (100%) rename src/go/plugin/go.d/{modules => collector}/redis/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/redis/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/redis/integrations/redis.md (100%) rename src/go/plugin/go.d/{modules => collector}/redis/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/redis/redis.go (100%) rename src/go/plugin/go.d/{modules => collector}/redis/redis_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/redis/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/redis/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/redis/testdata/pika/info_all.txt (100%) rename src/go/plugin/go.d/{modules => collector}/redis/testdata/v6.0.9/info_all.txt (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/integrations/rethinkdb.md (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/rethinkdb.go (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/rethinkdb_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/rethinkdb/testdata/v2.4.4/stats.txt (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/integrations/riak_kv.md (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/riakkv.go (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/riakkv_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/stats.go (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/riakkv/testdata/stats.json (100%) rename src/go/plugin/go.d/{modules => collector}/rspamd/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/rspamd/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/rspamd/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/rspamd/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/rspamd/integrations/rspamd.md (100%) rename src/go/plugin/go.d/{modules => collector}/rspamd/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/rspamd/rspamd.go (100%) rename src/go/plugin/go.d/{modules => collector}/rspamd/rspamd_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/rspamd/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/rspamd/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/rspamd/testdata/v3.4-stat.json (100%) rename src/go/plugin/go.d/{modules => collector}/samba/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/samba/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/samba/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/samba/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/samba/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/samba/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/samba/integrations/samba.md (100%) rename src/go/plugin/go.d/{modules => collector}/samba/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/samba/samba.go (100%) rename src/go/plugin/go.d/{modules => collector}/samba/samba_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/samba/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/samba/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/samba/testdata/smbstatus-profile.txt (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/charts.go (99%) rename src/go/plugin/go.d/{modules => collector}/scaleio/client/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/client/client_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/client/server.go (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/client/types.go (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/collect.go (94%) rename src/go/plugin/go.d/{modules => collector}/scaleio/collect_sdc.go (90%) rename src/go/plugin/go.d/{modules => collector}/scaleio/collect_storage_pool.go (94%) rename src/go/plugin/go.d/{modules => collector}/scaleio/collect_system.go (98%) rename src/go/plugin/go.d/{modules => collector}/scaleio/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/integrations/dell_emc_scaleio.md (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/queries.go (96%) rename src/go/plugin/go.d/{modules => collector}/scaleio/scaleio.go (96%) rename src/go/plugin/go.d/{modules => collector}/scaleio/scaleio_test.go (99%) rename src/go/plugin/go.d/{modules => collector}/scaleio/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/testdata/instances.json (100%) rename src/go/plugin/go.d/{modules => collector}/scaleio/testdata/selected_statistics.json (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/charts.go (99%) rename src/go/plugin/go.d/{modules => collector}/sensors/collect.go (98%) rename src/go/plugin/go.d/{modules => collector}/sensors/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/integrations/linux_sensors.md (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/lmsensors/LICENSE.md (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/lmsensors/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/lmsensors/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/lmsensors/fs.go (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/lmsensors/parse.go (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/lmsensors/scanner.go (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/lmsensors/scanner_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/lmsensors/sensor.go (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/sensors.go (95%) rename src/go/plugin/go.d/{modules => collector}/sensors/sensors_test.go (99%) rename src/go/plugin/go.d/{modules => collector}/sensors/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/sensors/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/integrations/s.m.a.r.t..md (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/scan.go (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/smart_device.go (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/smartctl.go (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/smartctl_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/testdata/type-nvme/device-nvme0.json (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/testdata/type-nvme/device-nvme1.json (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/testdata/type-nvme/scan.json (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/testdata/type-sat/device-hdd-sda.json (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/testdata/type-sat/device-ssd-sdc.json (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/testdata/type-sat/scan.json (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/testdata/type-scsi/device-sda.json (100%) rename src/go/plugin/go.d/{modules => collector}/smartctl/testdata/type-scsi/scan.json (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/collect_custom_oids.go (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/collect_if_mib.go (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/collect_sys_info.go (96%) rename src/go/plugin/go.d/{modules => collector}/snmp/config.go (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/entnum/enterprise-numbers.txt (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/entnum/lookup.go (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/integrations/snmp_devices.md (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/netif.go (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/snmp.go (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/snmp_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/snmp/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/spigotmc/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/spigotmc/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/spigotmc/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/spigotmc/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/spigotmc/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/spigotmc/integrations/spigotmc.md (100%) rename src/go/plugin/go.d/{modules => collector}/spigotmc/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/spigotmc/spigotmc.go (100%) rename src/go/plugin/go.d/{modules => collector}/spigotmc/spigotmc_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/spigotmc/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/spigotmc/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/squid/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/squid/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/squid/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/squid/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/squid/integrations/squid.md (100%) rename src/go/plugin/go.d/{modules => collector}/squid/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/squid/squid.go (100%) rename src/go/plugin/go.d/{modules => collector}/squid/squid_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/squid/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/squid/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/squid/testdata/counters.txt (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/integrations/squid_log_files.md (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/logline.go (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/logline_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/squidlog.go (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/squidlog_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/testdata/access.log (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/squidlog/testdata/unknown.log (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/collect_controllers.go (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/collect_drives.go (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/integrations/storecli_raid.md (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/storcli.go (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/storcli_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/testdata/megaraid-controllers-info.json (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/testdata/megaraid-drives-info.json (100%) rename src/go/plugin/go.d/{modules => collector}/storcli/testdata/mpt3sas-controllers-info.json (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/integrations/supervisor.md (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/supervisord.go (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/supervisord_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/supervisord/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/collect_unit_files.go (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/collect_units.go (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/integrations/systemd_units.md (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/systemdunits.go (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/systemdunits_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/systemdunits/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/integrations/tengine.md (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/status.go (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/tengine.go (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/tengine_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/tengine/testdata/status.txt (100%) rename src/go/plugin/go.d/{modules => collector}/testrandom/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/testrandom/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/testrandom/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/testrandom/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/testrandom/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/testrandom/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/testrandom/testrandom.go (100%) rename src/go/plugin/go.d/{modules => collector}/testrandom/testrandom_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/integrations/tomcat.md (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/status_response.go (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/testdata/server_status.xml (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/tomcat.go (100%) rename src/go/plugin/go.d/{modules => collector}/tomcat/tomcat_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/tor/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/tor/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/tor/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/tor/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/tor/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/tor/integrations/tor.md (100%) rename src/go/plugin/go.d/{modules => collector}/tor/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/tor/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/tor/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/tor/tor.go (100%) rename src/go/plugin/go.d/{modules => collector}/tor/tor_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/integrations/traefik.md (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/testdata/v2.2.1/metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/traefik.go (100%) rename src/go/plugin/go.d/{modules => collector}/traefik/traefik_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/integrations/typesense.md (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/testdata/v27.0/health_nok.json (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/testdata/v27.0/health_ok.json (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/testdata/v27.0/stats.json (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/typesense.go (100%) rename src/go/plugin/go.d/{modules => collector}/typesense/typesense_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/config.go (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/config_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/parse.go (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/parse_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/infinite_rec.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/non_existent_glob_include.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/non_existent_include.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/valid_glob.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/valid_glob2.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/valid_glob3.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/valid_include.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/valid_include2.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/valid_include3.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/valid_include_toplevel.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/valid_include_toplevel2.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config/testdata/valid_include_toplevel3.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/init.go (97%) rename src/go/plugin/go.d/{modules => collector}/unbound/integrations/unbound.md (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/stats/common.txt (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/stats/extended.txt (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/stats/lifecycle/cumulative/extended1.txt (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/stats/lifecycle/cumulative/extended2.txt (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/stats/lifecycle/cumulative/extended3.txt (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/stats/lifecycle/reset/extended1.txt (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/stats/lifecycle/reset/extended2.txt (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/stats/lifecycle/reset/extended3.txt (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/unbound.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/unbound_disabled.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/testdata/unbound_empty.conf (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/unbound.go (100%) rename src/go/plugin/go.d/{modules => collector}/unbound/unbound_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/integrations/ups_nut.md (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/upsd.go (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/upsd_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/upsd/variables.go (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/integrations/uwsgi.md (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/testdata/stats.json (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/testdata/stats_no_workers.json (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/uwsgi.go (100%) rename src/go/plugin/go.d/{modules => collector}/uwsgi/uwsgi_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/integrations/varnish.md (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/testdata/v7.1/varnishstat.txt (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/varnish.go (100%) rename src/go/plugin/go.d/{modules => collector}/varnish/varnish_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/client/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/client/client_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/init.go (88%) rename src/go/plugin/go.d/{modules => collector}/vcsa/integrations/vcenter_server_appliance.md (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/vcsa.go (100%) rename src/go/plugin/go.d/{modules => collector}/vcsa/vcsa_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/integrations/vernemq.md (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/testdata/v1.10.1/metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/testdata/v2.0.1/metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/vernemq.go (100%) rename src/go/plugin/go.d/{modules => collector}/vernemq/vernemq_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/charts.go (99%) rename src/go/plugin/go.d/{modules => collector}/vsphere/client/client.go (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/client/client_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/client/keepalive.go (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/collect.go (97%) rename src/go/plugin/go.d/{modules => collector}/vsphere/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/discover.go (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/discover/build.go (98%) rename src/go/plugin/go.d/{modules => collector}/vsphere/discover/discover.go (95%) rename src/go/plugin/go.d/{modules => collector}/vsphere/discover/discover_test.go (96%) rename src/go/plugin/go.d/{modules => collector}/vsphere/discover/filter.go (93%) rename src/go/plugin/go.d/{modules => collector}/vsphere/discover/hierarchy.go (96%) rename src/go/plugin/go.d/{modules => collector}/vsphere/discover/metric_lists.go (97%) rename src/go/plugin/go.d/{modules => collector}/vsphere/init.go (83%) rename src/go/plugin/go.d/{modules => collector}/vsphere/integrations/vmware_vcenter_server.md (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/match/match.go (98%) rename src/go/plugin/go.d/{modules => collector}/vsphere/match/match_test.go (98%) rename src/go/plugin/go.d/{modules => collector}/vsphere/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/resources/resources.go (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/scrape/scrape.go (97%) rename src/go/plugin/go.d/{modules => collector}/vsphere/scrape/scrape_test.go (86%) rename src/go/plugin/go.d/{modules => collector}/vsphere/scrape/throttled_caller.go (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/scrape/throttled_caller_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/task.go (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/task_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/vsphere/vsphere.go (95%) rename src/go/plugin/go.d/{modules => collector}/vsphere/vsphere_test.go (98%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/integrations/1-wire_sensors.md (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/testdata/devices/28-01204e9d2fa0/w1_slave (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/testdata/devices/28-01204e9d2fa1/w1_slave (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/testdata/devices/28-01204e9d2fa2/w1_slave (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/testdata/devices/28-01204e9d2fa3/w1_slave (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/w1sensor.go (100%) rename src/go/plugin/go.d/{modules => collector}/w1sensor/w1sensor_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/integrations/web_server_log_files.md (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/logline.go (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/logline_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/metrics.go (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/parser.go (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/parser_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/testdata/common.log (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/testdata/custom.log (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/testdata/custom_time_fields.log (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/testdata/full.log (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/testdata/u_ex221107.log (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/weblog.go (100%) rename src/go/plugin/go.d/{modules => collector}/weblog/weblog_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/integrations/domain_expiration_date.md (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/provider.go (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/whoisquery.go (100%) rename src/go/plugin/go.d/{modules => collector}/whoisquery/whoisquery_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/windows/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_ad.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_adcs.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_adfs.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_collector.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_cpu.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_exchange.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_hyperv.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_iis.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_logical_disk.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_logon.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_memory.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_mssql.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_net.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_netframework.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_os.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_process.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_service.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_system.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_tcp.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/collect_thermalzone.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/windows/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/windows/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/windows/testdata/v0.20.0/metrics.txt (100%) rename src/go/plugin/go.d/{modules => collector}/windows/windows.go (100%) rename src/go/plugin/go.d/{modules => collector}/windows/windows_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/wireguard/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/wireguard/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/wireguard/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/wireguard/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/wireguard/integrations/wireguard.md (100%) rename src/go/plugin/go.d/{modules => collector}/wireguard/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/wireguard/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/wireguard/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/wireguard/wireguard.go (100%) rename src/go/plugin/go.d/{modules => collector}/wireguard/wireguard_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/integrations/x.509_certificate.md (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/provider.go (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/x509check.go (100%) rename src/go/plugin/go.d/{modules => collector}/x509check/x509check_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/collect_zpool_list.go (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/collect_zpool_list_vdev.go (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/doc.go (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/exec.go (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/integrations/zfs_pools.md (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/testdata/zpool-list-vdev-logs-cache.txt (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/testdata/zpool-list-vdev.txt (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/testdata/zpool-list.txt (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/zfspool.go (100%) rename src/go/plugin/go.d/{modules => collector}/zfspool/zfspool_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/README.md (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/charts.go (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/collect.go (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/config_schema.json (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/fetcher.go (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/fetcher_test.go (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/init.go (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/integrations/zookeeper.md (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/metadata.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/testdata/config.json (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/testdata/config.yaml (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/testdata/mntr.txt (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/testdata/mntr_notinwhitelist.txt (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/zookeeper.go (100%) rename src/go/plugin/go.d/{modules => collector}/zookeeper/zookeeper_test.go (100%) delete mode 100644 src/go/plugin/go.d/modules/init.go diff --git a/.gitignore b/.gitignore index d4b1c020c0972d..5d460ff33416a8 100644 --- 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 index 3736196302050e..4a80f43122362a 100644 --- 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/src/go/plugin/go.d/modules/activemq/README.md b/src/go/plugin/go.d/collector/activemq/README.md similarity index 100% rename from src/go/plugin/go.d/modules/activemq/README.md rename to src/go/plugin/go.d/collector/activemq/README.md diff --git a/src/go/plugin/go.d/modules/activemq/activemq.go b/src/go/plugin/go.d/collector/activemq/activemq.go similarity index 100% rename from src/go/plugin/go.d/modules/activemq/activemq.go rename to src/go/plugin/go.d/collector/activemq/activemq.go diff --git a/src/go/plugin/go.d/modules/activemq/activemq_test.go b/src/go/plugin/go.d/collector/activemq/activemq_test.go similarity index 100% rename from src/go/plugin/go.d/modules/activemq/activemq_test.go rename to src/go/plugin/go.d/collector/activemq/activemq_test.go diff --git a/src/go/plugin/go.d/modules/activemq/apiclient.go b/src/go/plugin/go.d/collector/activemq/apiclient.go similarity index 100% rename from src/go/plugin/go.d/modules/activemq/apiclient.go rename to src/go/plugin/go.d/collector/activemq/apiclient.go diff --git a/src/go/plugin/go.d/modules/activemq/charts.go b/src/go/plugin/go.d/collector/activemq/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/activemq/charts.go rename to src/go/plugin/go.d/collector/activemq/charts.go diff --git a/src/go/plugin/go.d/modules/activemq/collect.go b/src/go/plugin/go.d/collector/activemq/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/activemq/collect.go rename to src/go/plugin/go.d/collector/activemq/collect.go diff --git a/src/go/plugin/go.d/modules/activemq/config_schema.json b/src/go/plugin/go.d/collector/activemq/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/activemq/config_schema.json rename to src/go/plugin/go.d/collector/activemq/config_schema.json diff --git a/src/go/plugin/go.d/modules/activemq/init.go b/src/go/plugin/go.d/collector/activemq/init.go similarity index 100% rename from src/go/plugin/go.d/modules/activemq/init.go rename to src/go/plugin/go.d/collector/activemq/init.go diff --git a/src/go/plugin/go.d/modules/activemq/integrations/activemq.md b/src/go/plugin/go.d/collector/activemq/integrations/activemq.md similarity index 100% rename from src/go/plugin/go.d/modules/activemq/integrations/activemq.md rename to src/go/plugin/go.d/collector/activemq/integrations/activemq.md diff --git a/src/go/plugin/go.d/modules/activemq/metadata.yaml b/src/go/plugin/go.d/collector/activemq/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/activemq/metadata.yaml rename to src/go/plugin/go.d/collector/activemq/metadata.yaml diff --git a/src/go/plugin/go.d/modules/activemq/testdata/config.json b/src/go/plugin/go.d/collector/activemq/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/activemq/testdata/config.json rename to src/go/plugin/go.d/collector/activemq/testdata/config.json diff --git a/src/go/plugin/go.d/modules/activemq/testdata/config.yaml b/src/go/plugin/go.d/collector/activemq/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/activemq/testdata/config.yaml rename to src/go/plugin/go.d/collector/activemq/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/adaptecraid/README.md b/src/go/plugin/go.d/collector/adaptecraid/README.md similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/README.md rename to src/go/plugin/go.d/collector/adaptecraid/README.md diff --git a/src/go/plugin/go.d/modules/adaptecraid/adaptec.go b/src/go/plugin/go.d/collector/adaptecraid/adaptec.go similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/adaptec.go rename to src/go/plugin/go.d/collector/adaptecraid/adaptec.go diff --git a/src/go/plugin/go.d/modules/adaptecraid/adaptec_test.go b/src/go/plugin/go.d/collector/adaptecraid/adaptec_test.go similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/adaptec_test.go rename to src/go/plugin/go.d/collector/adaptecraid/adaptec_test.go diff --git a/src/go/plugin/go.d/modules/adaptecraid/charts.go b/src/go/plugin/go.d/collector/adaptecraid/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/charts.go rename to src/go/plugin/go.d/collector/adaptecraid/charts.go diff --git a/src/go/plugin/go.d/modules/adaptecraid/collect.go b/src/go/plugin/go.d/collector/adaptecraid/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/collect.go rename to src/go/plugin/go.d/collector/adaptecraid/collect.go diff --git a/src/go/plugin/go.d/modules/adaptecraid/collect_ld.go b/src/go/plugin/go.d/collector/adaptecraid/collect_ld.go similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/collect_ld.go rename to src/go/plugin/go.d/collector/adaptecraid/collect_ld.go diff --git a/src/go/plugin/go.d/modules/adaptecraid/collect_pd.go b/src/go/plugin/go.d/collector/adaptecraid/collect_pd.go similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/collect_pd.go rename to src/go/plugin/go.d/collector/adaptecraid/collect_pd.go diff --git a/src/go/plugin/go.d/modules/adaptecraid/config_schema.json b/src/go/plugin/go.d/collector/adaptecraid/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/config_schema.json rename to src/go/plugin/go.d/collector/adaptecraid/config_schema.json diff --git a/src/go/plugin/go.d/modules/adaptecraid/doc.go b/src/go/plugin/go.d/collector/adaptecraid/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/doc.go rename to src/go/plugin/go.d/collector/adaptecraid/doc.go diff --git a/src/go/plugin/go.d/modules/adaptecraid/exec.go b/src/go/plugin/go.d/collector/adaptecraid/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/exec.go rename to src/go/plugin/go.d/collector/adaptecraid/exec.go diff --git a/src/go/plugin/go.d/modules/adaptecraid/init.go b/src/go/plugin/go.d/collector/adaptecraid/init.go similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/init.go rename to src/go/plugin/go.d/collector/adaptecraid/init.go diff --git a/src/go/plugin/go.d/modules/adaptecraid/integrations/adaptec_raid.md b/src/go/plugin/go.d/collector/adaptecraid/integrations/adaptec_raid.md similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/integrations/adaptec_raid.md rename to src/go/plugin/go.d/collector/adaptecraid/integrations/adaptec_raid.md diff --git a/src/go/plugin/go.d/modules/adaptecraid/metadata.yaml b/src/go/plugin/go.d/collector/adaptecraid/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/metadata.yaml rename to src/go/plugin/go.d/collector/adaptecraid/metadata.yaml diff --git a/src/go/plugin/go.d/modules/adaptecraid/testdata/config.json b/src/go/plugin/go.d/collector/adaptecraid/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/testdata/config.json rename to src/go/plugin/go.d/collector/adaptecraid/testdata/config.json diff --git a/src/go/plugin/go.d/modules/adaptecraid/testdata/config.yaml b/src/go/plugin/go.d/collector/adaptecraid/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/testdata/config.yaml rename to src/go/plugin/go.d/collector/adaptecraid/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/adaptecraid/testdata/getconfig-ld-current.txt b/src/go/plugin/go.d/collector/adaptecraid/testdata/getconfig-ld-current.txt similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/testdata/getconfig-ld-current.txt rename to src/go/plugin/go.d/collector/adaptecraid/testdata/getconfig-ld-current.txt diff --git a/src/go/plugin/go.d/modules/adaptecraid/testdata/getconfig-ld-old.txt b/src/go/plugin/go.d/collector/adaptecraid/testdata/getconfig-ld-old.txt similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/testdata/getconfig-ld-old.txt rename to src/go/plugin/go.d/collector/adaptecraid/testdata/getconfig-ld-old.txt diff --git a/src/go/plugin/go.d/modules/adaptecraid/testdata/getconfig-pd-current.txt b/src/go/plugin/go.d/collector/adaptecraid/testdata/getconfig-pd-current.txt similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/testdata/getconfig-pd-current.txt rename to src/go/plugin/go.d/collector/adaptecraid/testdata/getconfig-pd-current.txt diff --git a/src/go/plugin/go.d/modules/adaptecraid/testdata/getconfig-pd-old.txt b/src/go/plugin/go.d/collector/adaptecraid/testdata/getconfig-pd-old.txt similarity index 100% rename from src/go/plugin/go.d/modules/adaptecraid/testdata/getconfig-pd-old.txt rename to src/go/plugin/go.d/collector/adaptecraid/testdata/getconfig-pd-old.txt diff --git a/src/go/plugin/go.d/modules/ap/README.md b/src/go/plugin/go.d/collector/ap/README.md similarity index 100% rename from src/go/plugin/go.d/modules/ap/README.md rename to src/go/plugin/go.d/collector/ap/README.md diff --git a/src/go/plugin/go.d/modules/ap/ap.go b/src/go/plugin/go.d/collector/ap/ap.go similarity index 100% rename from src/go/plugin/go.d/modules/ap/ap.go rename to src/go/plugin/go.d/collector/ap/ap.go diff --git a/src/go/plugin/go.d/modules/ap/ap_test.go b/src/go/plugin/go.d/collector/ap/ap_test.go similarity index 100% rename from src/go/plugin/go.d/modules/ap/ap_test.go rename to src/go/plugin/go.d/collector/ap/ap_test.go diff --git a/src/go/plugin/go.d/modules/ap/charts.go b/src/go/plugin/go.d/collector/ap/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/ap/charts.go rename to src/go/plugin/go.d/collector/ap/charts.go diff --git a/src/go/plugin/go.d/modules/ap/collect.go b/src/go/plugin/go.d/collector/ap/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/ap/collect.go rename to src/go/plugin/go.d/collector/ap/collect.go diff --git a/src/go/plugin/go.d/modules/ap/config_schema.json b/src/go/plugin/go.d/collector/ap/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/ap/config_schema.json rename to src/go/plugin/go.d/collector/ap/config_schema.json diff --git a/src/go/plugin/go.d/modules/ap/doc.go b/src/go/plugin/go.d/collector/ap/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/ap/doc.go rename to src/go/plugin/go.d/collector/ap/doc.go diff --git a/src/go/plugin/go.d/modules/ap/exec.go b/src/go/plugin/go.d/collector/ap/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/ap/exec.go rename to src/go/plugin/go.d/collector/ap/exec.go diff --git a/src/go/plugin/go.d/modules/ap/init.go b/src/go/plugin/go.d/collector/ap/init.go similarity index 100% rename from src/go/plugin/go.d/modules/ap/init.go rename to src/go/plugin/go.d/collector/ap/init.go diff --git a/src/go/plugin/go.d/modules/ap/integrations/access_points.md b/src/go/plugin/go.d/collector/ap/integrations/access_points.md similarity index 100% rename from src/go/plugin/go.d/modules/ap/integrations/access_points.md rename to src/go/plugin/go.d/collector/ap/integrations/access_points.md diff --git a/src/go/plugin/go.d/modules/ap/metadata.yaml b/src/go/plugin/go.d/collector/ap/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/ap/metadata.yaml rename to src/go/plugin/go.d/collector/ap/metadata.yaml diff --git a/src/go/plugin/go.d/modules/ap/testdata/config.json b/src/go/plugin/go.d/collector/ap/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/ap/testdata/config.json rename to src/go/plugin/go.d/collector/ap/testdata/config.json diff --git a/src/go/plugin/go.d/modules/ap/testdata/config.yaml b/src/go/plugin/go.d/collector/ap/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/ap/testdata/config.yaml rename to src/go/plugin/go.d/collector/ap/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/ap/testdata/iw_dev_ap.txt b/src/go/plugin/go.d/collector/ap/testdata/iw_dev_ap.txt similarity index 100% rename from src/go/plugin/go.d/modules/ap/testdata/iw_dev_ap.txt rename to src/go/plugin/go.d/collector/ap/testdata/iw_dev_ap.txt diff --git a/src/go/plugin/go.d/modules/ap/testdata/iw_dev_managed.txt b/src/go/plugin/go.d/collector/ap/testdata/iw_dev_managed.txt similarity index 100% rename from src/go/plugin/go.d/modules/ap/testdata/iw_dev_managed.txt rename to src/go/plugin/go.d/collector/ap/testdata/iw_dev_managed.txt diff --git a/src/go/plugin/go.d/modules/ap/testdata/station_dump.txt b/src/go/plugin/go.d/collector/ap/testdata/station_dump.txt similarity index 100% rename from src/go/plugin/go.d/modules/ap/testdata/station_dump.txt rename to src/go/plugin/go.d/collector/ap/testdata/station_dump.txt diff --git a/src/go/plugin/go.d/modules/apache/README.md b/src/go/plugin/go.d/collector/apache/README.md similarity index 100% rename from src/go/plugin/go.d/modules/apache/README.md rename to src/go/plugin/go.d/collector/apache/README.md diff --git a/src/go/plugin/go.d/modules/apache/apache.go b/src/go/plugin/go.d/collector/apache/apache.go similarity index 100% rename from src/go/plugin/go.d/modules/apache/apache.go rename to src/go/plugin/go.d/collector/apache/apache.go diff --git a/src/go/plugin/go.d/modules/apache/apache_test.go b/src/go/plugin/go.d/collector/apache/apache_test.go similarity index 100% rename from src/go/plugin/go.d/modules/apache/apache_test.go rename to src/go/plugin/go.d/collector/apache/apache_test.go diff --git a/src/go/plugin/go.d/modules/apache/charts.go b/src/go/plugin/go.d/collector/apache/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/apache/charts.go rename to src/go/plugin/go.d/collector/apache/charts.go diff --git a/src/go/plugin/go.d/modules/apache/collect.go b/src/go/plugin/go.d/collector/apache/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/apache/collect.go rename to src/go/plugin/go.d/collector/apache/collect.go diff --git a/src/go/plugin/go.d/modules/apache/config_schema.json b/src/go/plugin/go.d/collector/apache/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/apache/config_schema.json rename to src/go/plugin/go.d/collector/apache/config_schema.json diff --git a/src/go/plugin/go.d/modules/apache/init.go b/src/go/plugin/go.d/collector/apache/init.go similarity index 100% rename from src/go/plugin/go.d/modules/apache/init.go rename to src/go/plugin/go.d/collector/apache/init.go diff --git a/src/go/plugin/go.d/modules/apache/integrations/apache.md b/src/go/plugin/go.d/collector/apache/integrations/apache.md similarity index 100% rename from src/go/plugin/go.d/modules/apache/integrations/apache.md rename to src/go/plugin/go.d/collector/apache/integrations/apache.md diff --git a/src/go/plugin/go.d/modules/apache/integrations/httpd.md b/src/go/plugin/go.d/collector/apache/integrations/httpd.md similarity index 100% rename from src/go/plugin/go.d/modules/apache/integrations/httpd.md rename to src/go/plugin/go.d/collector/apache/integrations/httpd.md diff --git a/src/go/plugin/go.d/modules/apache/metadata.yaml b/src/go/plugin/go.d/collector/apache/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/apache/metadata.yaml rename to src/go/plugin/go.d/collector/apache/metadata.yaml diff --git a/src/go/plugin/go.d/modules/apache/metrics.go b/src/go/plugin/go.d/collector/apache/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/apache/metrics.go rename to src/go/plugin/go.d/collector/apache/metrics.go diff --git a/src/go/plugin/go.d/modules/apache/testdata/config.json b/src/go/plugin/go.d/collector/apache/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/apache/testdata/config.json rename to src/go/plugin/go.d/collector/apache/testdata/config.json diff --git a/src/go/plugin/go.d/modules/apache/testdata/config.yaml b/src/go/plugin/go.d/collector/apache/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/apache/testdata/config.yaml rename to src/go/plugin/go.d/collector/apache/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/apache/testdata/extended-status-mpm-event.txt b/src/go/plugin/go.d/collector/apache/testdata/extended-status-mpm-event.txt similarity index 100% rename from src/go/plugin/go.d/modules/apache/testdata/extended-status-mpm-event.txt rename to src/go/plugin/go.d/collector/apache/testdata/extended-status-mpm-event.txt diff --git a/src/go/plugin/go.d/modules/apache/testdata/extended-status-mpm-prefork.txt b/src/go/plugin/go.d/collector/apache/testdata/extended-status-mpm-prefork.txt similarity index 100% rename from src/go/plugin/go.d/modules/apache/testdata/extended-status-mpm-prefork.txt rename to src/go/plugin/go.d/collector/apache/testdata/extended-status-mpm-prefork.txt diff --git a/src/go/plugin/go.d/modules/apache/testdata/lighttpd-status.txt b/src/go/plugin/go.d/collector/apache/testdata/lighttpd-status.txt similarity index 100% rename from src/go/plugin/go.d/modules/apache/testdata/lighttpd-status.txt rename to src/go/plugin/go.d/collector/apache/testdata/lighttpd-status.txt diff --git a/src/go/plugin/go.d/modules/apache/testdata/simple-status-mpm-event.txt b/src/go/plugin/go.d/collector/apache/testdata/simple-status-mpm-event.txt similarity index 100% rename from src/go/plugin/go.d/modules/apache/testdata/simple-status-mpm-event.txt rename to src/go/plugin/go.d/collector/apache/testdata/simple-status-mpm-event.txt diff --git a/src/go/plugin/go.d/modules/apcupsd/README.md b/src/go/plugin/go.d/collector/apcupsd/README.md similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/README.md rename to src/go/plugin/go.d/collector/apcupsd/README.md diff --git a/src/go/plugin/go.d/modules/apcupsd/apcupsd.go b/src/go/plugin/go.d/collector/apcupsd/apcupsd.go similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/apcupsd.go rename to src/go/plugin/go.d/collector/apcupsd/apcupsd.go diff --git a/src/go/plugin/go.d/modules/apcupsd/apcupsd_test.go b/src/go/plugin/go.d/collector/apcupsd/apcupsd_test.go similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/apcupsd_test.go rename to src/go/plugin/go.d/collector/apcupsd/apcupsd_test.go diff --git a/src/go/plugin/go.d/modules/apcupsd/charts.go b/src/go/plugin/go.d/collector/apcupsd/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/charts.go rename to src/go/plugin/go.d/collector/apcupsd/charts.go diff --git a/src/go/plugin/go.d/modules/apcupsd/client.go b/src/go/plugin/go.d/collector/apcupsd/client.go similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/client.go rename to src/go/plugin/go.d/collector/apcupsd/client.go diff --git a/src/go/plugin/go.d/modules/apcupsd/collect.go b/src/go/plugin/go.d/collector/apcupsd/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/collect.go rename to src/go/plugin/go.d/collector/apcupsd/collect.go diff --git a/src/go/plugin/go.d/modules/apcupsd/config_schema.json b/src/go/plugin/go.d/collector/apcupsd/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/config_schema.json rename to src/go/plugin/go.d/collector/apcupsd/config_schema.json diff --git a/src/go/plugin/go.d/modules/apcupsd/integrations/apc_ups.md b/src/go/plugin/go.d/collector/apcupsd/integrations/apc_ups.md similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/integrations/apc_ups.md rename to src/go/plugin/go.d/collector/apcupsd/integrations/apc_ups.md diff --git a/src/go/plugin/go.d/modules/apcupsd/metadata.yaml b/src/go/plugin/go.d/collector/apcupsd/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/metadata.yaml rename to src/go/plugin/go.d/collector/apcupsd/metadata.yaml diff --git a/src/go/plugin/go.d/modules/apcupsd/status.go b/src/go/plugin/go.d/collector/apcupsd/status.go similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/status.go rename to src/go/plugin/go.d/collector/apcupsd/status.go diff --git a/src/go/plugin/go.d/modules/apcupsd/testdata/config.json b/src/go/plugin/go.d/collector/apcupsd/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/testdata/config.json rename to src/go/plugin/go.d/collector/apcupsd/testdata/config.json diff --git a/src/go/plugin/go.d/modules/apcupsd/testdata/config.yaml b/src/go/plugin/go.d/collector/apcupsd/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/testdata/config.yaml rename to src/go/plugin/go.d/collector/apcupsd/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/apcupsd/testdata/status.txt b/src/go/plugin/go.d/collector/apcupsd/testdata/status.txt similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/testdata/status.txt rename to src/go/plugin/go.d/collector/apcupsd/testdata/status.txt diff --git a/src/go/plugin/go.d/modules/apcupsd/testdata/status_commlost.txt b/src/go/plugin/go.d/collector/apcupsd/testdata/status_commlost.txt similarity index 100% rename from src/go/plugin/go.d/modules/apcupsd/testdata/status_commlost.txt rename to src/go/plugin/go.d/collector/apcupsd/testdata/status_commlost.txt diff --git a/src/go/plugin/go.d/modules/beanstalk/README.md b/src/go/plugin/go.d/collector/beanstalk/README.md similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/README.md rename to src/go/plugin/go.d/collector/beanstalk/README.md diff --git a/src/go/plugin/go.d/modules/beanstalk/beanstalk.go b/src/go/plugin/go.d/collector/beanstalk/beanstalk.go similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/beanstalk.go rename to src/go/plugin/go.d/collector/beanstalk/beanstalk.go diff --git a/src/go/plugin/go.d/modules/beanstalk/beanstalk_test.go b/src/go/plugin/go.d/collector/beanstalk/beanstalk_test.go similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/beanstalk_test.go rename to src/go/plugin/go.d/collector/beanstalk/beanstalk_test.go diff --git a/src/go/plugin/go.d/modules/beanstalk/charts.go b/src/go/plugin/go.d/collector/beanstalk/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/charts.go rename to src/go/plugin/go.d/collector/beanstalk/charts.go diff --git a/src/go/plugin/go.d/modules/beanstalk/client.go b/src/go/plugin/go.d/collector/beanstalk/client.go similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/client.go rename to src/go/plugin/go.d/collector/beanstalk/client.go diff --git a/src/go/plugin/go.d/modules/beanstalk/collect.go b/src/go/plugin/go.d/collector/beanstalk/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/collect.go rename to src/go/plugin/go.d/collector/beanstalk/collect.go diff --git a/src/go/plugin/go.d/modules/beanstalk/config_schema.json b/src/go/plugin/go.d/collector/beanstalk/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/config_schema.json rename to src/go/plugin/go.d/collector/beanstalk/config_schema.json diff --git a/src/go/plugin/go.d/modules/beanstalk/init.go b/src/go/plugin/go.d/collector/beanstalk/init.go similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/init.go rename to src/go/plugin/go.d/collector/beanstalk/init.go diff --git a/src/go/plugin/go.d/modules/beanstalk/integrations/beanstalk.md b/src/go/plugin/go.d/collector/beanstalk/integrations/beanstalk.md similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/integrations/beanstalk.md rename to src/go/plugin/go.d/collector/beanstalk/integrations/beanstalk.md diff --git a/src/go/plugin/go.d/modules/beanstalk/metadata.yaml b/src/go/plugin/go.d/collector/beanstalk/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/metadata.yaml rename to src/go/plugin/go.d/collector/beanstalk/metadata.yaml diff --git a/src/go/plugin/go.d/modules/beanstalk/testdata/config.json b/src/go/plugin/go.d/collector/beanstalk/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/testdata/config.json rename to src/go/plugin/go.d/collector/beanstalk/testdata/config.json diff --git a/src/go/plugin/go.d/modules/beanstalk/testdata/config.yaml b/src/go/plugin/go.d/collector/beanstalk/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/testdata/config.yaml rename to src/go/plugin/go.d/collector/beanstalk/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/beanstalk/testdata/list-tubes.txt b/src/go/plugin/go.d/collector/beanstalk/testdata/list-tubes.txt similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/testdata/list-tubes.txt rename to src/go/plugin/go.d/collector/beanstalk/testdata/list-tubes.txt diff --git a/src/go/plugin/go.d/modules/beanstalk/testdata/stats-tube-default.txt b/src/go/plugin/go.d/collector/beanstalk/testdata/stats-tube-default.txt similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/testdata/stats-tube-default.txt rename to src/go/plugin/go.d/collector/beanstalk/testdata/stats-tube-default.txt diff --git a/src/go/plugin/go.d/modules/beanstalk/testdata/stats.txt b/src/go/plugin/go.d/collector/beanstalk/testdata/stats.txt similarity index 100% rename from src/go/plugin/go.d/modules/beanstalk/testdata/stats.txt rename to src/go/plugin/go.d/collector/beanstalk/testdata/stats.txt diff --git a/src/go/plugin/go.d/modules/bind/README.md b/src/go/plugin/go.d/collector/bind/README.md similarity index 100% rename from src/go/plugin/go.d/modules/bind/README.md rename to src/go/plugin/go.d/collector/bind/README.md diff --git a/src/go/plugin/go.d/modules/bind/bind.go b/src/go/plugin/go.d/collector/bind/bind.go similarity index 100% rename from src/go/plugin/go.d/modules/bind/bind.go rename to src/go/plugin/go.d/collector/bind/bind.go diff --git a/src/go/plugin/go.d/modules/bind/bind_test.go b/src/go/plugin/go.d/collector/bind/bind_test.go similarity index 100% rename from src/go/plugin/go.d/modules/bind/bind_test.go rename to src/go/plugin/go.d/collector/bind/bind_test.go diff --git a/src/go/plugin/go.d/modules/bind/charts.go b/src/go/plugin/go.d/collector/bind/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/bind/charts.go rename to src/go/plugin/go.d/collector/bind/charts.go diff --git a/src/go/plugin/go.d/modules/bind/collect.go b/src/go/plugin/go.d/collector/bind/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/bind/collect.go rename to src/go/plugin/go.d/collector/bind/collect.go diff --git a/src/go/plugin/go.d/modules/bind/config_schema.json b/src/go/plugin/go.d/collector/bind/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/bind/config_schema.json rename to src/go/plugin/go.d/collector/bind/config_schema.json diff --git a/src/go/plugin/go.d/modules/bind/init.go b/src/go/plugin/go.d/collector/bind/init.go similarity index 100% rename from src/go/plugin/go.d/modules/bind/init.go rename to src/go/plugin/go.d/collector/bind/init.go diff --git a/src/go/plugin/go.d/modules/bind/json_client.go b/src/go/plugin/go.d/collector/bind/json_client.go similarity index 100% rename from src/go/plugin/go.d/modules/bind/json_client.go rename to src/go/plugin/go.d/collector/bind/json_client.go diff --git a/src/go/plugin/go.d/modules/bind/testdata/config.json b/src/go/plugin/go.d/collector/bind/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/bind/testdata/config.json rename to src/go/plugin/go.d/collector/bind/testdata/config.json diff --git a/src/go/plugin/go.d/modules/bind/testdata/config.yaml b/src/go/plugin/go.d/collector/bind/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/bind/testdata/config.yaml rename to src/go/plugin/go.d/collector/bind/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/bind/testdata/query-server.json b/src/go/plugin/go.d/collector/bind/testdata/query-server.json similarity index 100% rename from src/go/plugin/go.d/modules/bind/testdata/query-server.json rename to src/go/plugin/go.d/collector/bind/testdata/query-server.json diff --git a/src/go/plugin/go.d/modules/bind/testdata/query-server.xml b/src/go/plugin/go.d/collector/bind/testdata/query-server.xml similarity index 100% rename from src/go/plugin/go.d/modules/bind/testdata/query-server.xml rename to src/go/plugin/go.d/collector/bind/testdata/query-server.xml diff --git a/src/go/plugin/go.d/modules/bind/xml3_client.go b/src/go/plugin/go.d/collector/bind/xml3_client.go similarity index 100% rename from src/go/plugin/go.d/modules/bind/xml3_client.go rename to src/go/plugin/go.d/collector/bind/xml3_client.go diff --git a/src/go/plugin/go.d/modules/boinc/README.md b/src/go/plugin/go.d/collector/boinc/README.md similarity index 100% rename from src/go/plugin/go.d/modules/boinc/README.md rename to src/go/plugin/go.d/collector/boinc/README.md diff --git a/src/go/plugin/go.d/modules/boinc/boinc.go b/src/go/plugin/go.d/collector/boinc/boinc.go similarity index 100% rename from src/go/plugin/go.d/modules/boinc/boinc.go rename to src/go/plugin/go.d/collector/boinc/boinc.go diff --git a/src/go/plugin/go.d/modules/boinc/boinc_test.go b/src/go/plugin/go.d/collector/boinc/boinc_test.go similarity index 100% rename from src/go/plugin/go.d/modules/boinc/boinc_test.go rename to src/go/plugin/go.d/collector/boinc/boinc_test.go diff --git a/src/go/plugin/go.d/modules/boinc/charts.go b/src/go/plugin/go.d/collector/boinc/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/boinc/charts.go rename to src/go/plugin/go.d/collector/boinc/charts.go diff --git a/src/go/plugin/go.d/modules/boinc/client.go b/src/go/plugin/go.d/collector/boinc/client.go similarity index 100% rename from src/go/plugin/go.d/modules/boinc/client.go rename to src/go/plugin/go.d/collector/boinc/client.go diff --git a/src/go/plugin/go.d/modules/boinc/client_proto.go b/src/go/plugin/go.d/collector/boinc/client_proto.go similarity index 100% rename from src/go/plugin/go.d/modules/boinc/client_proto.go rename to src/go/plugin/go.d/collector/boinc/client_proto.go diff --git a/src/go/plugin/go.d/modules/boinc/collect.go b/src/go/plugin/go.d/collector/boinc/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/boinc/collect.go rename to src/go/plugin/go.d/collector/boinc/collect.go diff --git a/src/go/plugin/go.d/modules/boinc/config_schema.json b/src/go/plugin/go.d/collector/boinc/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/boinc/config_schema.json rename to src/go/plugin/go.d/collector/boinc/config_schema.json diff --git a/src/go/plugin/go.d/modules/boinc/integrations/boinc.md b/src/go/plugin/go.d/collector/boinc/integrations/boinc.md similarity index 100% rename from src/go/plugin/go.d/modules/boinc/integrations/boinc.md rename to src/go/plugin/go.d/collector/boinc/integrations/boinc.md diff --git a/src/go/plugin/go.d/modules/boinc/metadata.yaml b/src/go/plugin/go.d/collector/boinc/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/boinc/metadata.yaml rename to src/go/plugin/go.d/collector/boinc/metadata.yaml diff --git a/src/go/plugin/go.d/modules/boinc/testdata/config.json b/src/go/plugin/go.d/collector/boinc/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/boinc/testdata/config.json rename to src/go/plugin/go.d/collector/boinc/testdata/config.json diff --git a/src/go/plugin/go.d/modules/boinc/testdata/config.yaml b/src/go/plugin/go.d/collector/boinc/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/boinc/testdata/config.yaml rename to src/go/plugin/go.d/collector/boinc/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/boinc/testdata/get_results.xml b/src/go/plugin/go.d/collector/boinc/testdata/get_results.xml similarity index 100% rename from src/go/plugin/go.d/modules/boinc/testdata/get_results.xml rename to src/go/plugin/go.d/collector/boinc/testdata/get_results.xml diff --git a/src/go/plugin/go.d/modules/boinc/testdata/get_results_no_tasks.xml b/src/go/plugin/go.d/collector/boinc/testdata/get_results_no_tasks.xml similarity index 100% rename from src/go/plugin/go.d/modules/boinc/testdata/get_results_no_tasks.xml rename to src/go/plugin/go.d/collector/boinc/testdata/get_results_no_tasks.xml diff --git a/src/go/plugin/go.d/modules/cassandra/README.md b/src/go/plugin/go.d/collector/cassandra/README.md similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/README.md rename to src/go/plugin/go.d/collector/cassandra/README.md diff --git a/src/go/plugin/go.d/modules/cassandra/cassandra.go b/src/go/plugin/go.d/collector/cassandra/cassandra.go similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/cassandra.go rename to src/go/plugin/go.d/collector/cassandra/cassandra.go diff --git a/src/go/plugin/go.d/modules/cassandra/cassandra_test.go b/src/go/plugin/go.d/collector/cassandra/cassandra_test.go similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/cassandra_test.go rename to src/go/plugin/go.d/collector/cassandra/cassandra_test.go diff --git a/src/go/plugin/go.d/modules/cassandra/charts.go b/src/go/plugin/go.d/collector/cassandra/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/charts.go rename to src/go/plugin/go.d/collector/cassandra/charts.go diff --git a/src/go/plugin/go.d/modules/cassandra/collect.go b/src/go/plugin/go.d/collector/cassandra/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/collect.go rename to src/go/plugin/go.d/collector/cassandra/collect.go diff --git a/src/go/plugin/go.d/modules/cassandra/config_schema.json b/src/go/plugin/go.d/collector/cassandra/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/config_schema.json rename to src/go/plugin/go.d/collector/cassandra/config_schema.json diff --git a/src/go/plugin/go.d/modules/cassandra/init.go b/src/go/plugin/go.d/collector/cassandra/init.go similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/init.go rename to src/go/plugin/go.d/collector/cassandra/init.go diff --git a/src/go/plugin/go.d/modules/cassandra/integrations/cassandra.md b/src/go/plugin/go.d/collector/cassandra/integrations/cassandra.md similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/integrations/cassandra.md rename to src/go/plugin/go.d/collector/cassandra/integrations/cassandra.md diff --git a/src/go/plugin/go.d/modules/cassandra/jmx_exporter.yaml b/src/go/plugin/go.d/collector/cassandra/jmx_exporter.yaml similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/jmx_exporter.yaml rename to src/go/plugin/go.d/collector/cassandra/jmx_exporter.yaml diff --git a/src/go/plugin/go.d/modules/cassandra/metadata.yaml b/src/go/plugin/go.d/collector/cassandra/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/metadata.yaml rename to src/go/plugin/go.d/collector/cassandra/metadata.yaml diff --git a/src/go/plugin/go.d/modules/cassandra/metrics.go b/src/go/plugin/go.d/collector/cassandra/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/metrics.go rename to src/go/plugin/go.d/collector/cassandra/metrics.go diff --git a/src/go/plugin/go.d/modules/cassandra/testdata/config.json b/src/go/plugin/go.d/collector/cassandra/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/testdata/config.json rename to src/go/plugin/go.d/collector/cassandra/testdata/config.json diff --git a/src/go/plugin/go.d/modules/cassandra/testdata/config.yaml b/src/go/plugin/go.d/collector/cassandra/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/testdata/config.yaml rename to src/go/plugin/go.d/collector/cassandra/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/cassandra/testdata/metrics.txt b/src/go/plugin/go.d/collector/cassandra/testdata/metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/cassandra/testdata/metrics.txt rename to src/go/plugin/go.d/collector/cassandra/testdata/metrics.txt diff --git a/src/go/plugin/go.d/modules/ceph/README.md b/src/go/plugin/go.d/collector/ceph/README.md similarity index 100% rename from src/go/plugin/go.d/modules/ceph/README.md rename to src/go/plugin/go.d/collector/ceph/README.md diff --git a/src/go/plugin/go.d/modules/ceph/api.go b/src/go/plugin/go.d/collector/ceph/api.go similarity index 100% rename from src/go/plugin/go.d/modules/ceph/api.go rename to src/go/plugin/go.d/collector/ceph/api.go diff --git a/src/go/plugin/go.d/modules/ceph/auth.go b/src/go/plugin/go.d/collector/ceph/auth.go similarity index 100% rename from src/go/plugin/go.d/modules/ceph/auth.go rename to src/go/plugin/go.d/collector/ceph/auth.go diff --git a/src/go/plugin/go.d/modules/ceph/ceph.go b/src/go/plugin/go.d/collector/ceph/ceph.go similarity index 100% rename from src/go/plugin/go.d/modules/ceph/ceph.go rename to src/go/plugin/go.d/collector/ceph/ceph.go diff --git a/src/go/plugin/go.d/modules/ceph/ceph_test.go b/src/go/plugin/go.d/collector/ceph/ceph_test.go similarity index 100% rename from src/go/plugin/go.d/modules/ceph/ceph_test.go rename to src/go/plugin/go.d/collector/ceph/ceph_test.go diff --git a/src/go/plugin/go.d/modules/ceph/charts.go b/src/go/plugin/go.d/collector/ceph/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/ceph/charts.go rename to src/go/plugin/go.d/collector/ceph/charts.go diff --git a/src/go/plugin/go.d/modules/ceph/collect.go b/src/go/plugin/go.d/collector/ceph/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/ceph/collect.go rename to src/go/plugin/go.d/collector/ceph/collect.go diff --git a/src/go/plugin/go.d/modules/ceph/collect_health.go b/src/go/plugin/go.d/collector/ceph/collect_health.go similarity index 100% rename from src/go/plugin/go.d/modules/ceph/collect_health.go rename to src/go/plugin/go.d/collector/ceph/collect_health.go diff --git a/src/go/plugin/go.d/modules/ceph/collect_osd.go b/src/go/plugin/go.d/collector/ceph/collect_osd.go similarity index 100% rename from src/go/plugin/go.d/modules/ceph/collect_osd.go rename to src/go/plugin/go.d/collector/ceph/collect_osd.go diff --git a/src/go/plugin/go.d/modules/ceph/collect_pools.go b/src/go/plugin/go.d/collector/ceph/collect_pools.go similarity index 100% rename from src/go/plugin/go.d/modules/ceph/collect_pools.go rename to src/go/plugin/go.d/collector/ceph/collect_pools.go diff --git a/src/go/plugin/go.d/modules/ceph/config_schema.json b/src/go/plugin/go.d/collector/ceph/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/ceph/config_schema.json rename to src/go/plugin/go.d/collector/ceph/config_schema.json diff --git a/src/go/plugin/go.d/modules/ceph/init.go b/src/go/plugin/go.d/collector/ceph/init.go similarity index 100% rename from src/go/plugin/go.d/modules/ceph/init.go rename to src/go/plugin/go.d/collector/ceph/init.go diff --git a/src/go/plugin/go.d/modules/ceph/integrations/ceph.md b/src/go/plugin/go.d/collector/ceph/integrations/ceph.md similarity index 100% rename from src/go/plugin/go.d/modules/ceph/integrations/ceph.md rename to src/go/plugin/go.d/collector/ceph/integrations/ceph.md diff --git a/src/go/plugin/go.d/modules/ceph/metadata.yaml b/src/go/plugin/go.d/collector/ceph/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/ceph/metadata.yaml rename to src/go/plugin/go.d/collector/ceph/metadata.yaml diff --git a/src/go/plugin/go.d/modules/ceph/testdata/config.json b/src/go/plugin/go.d/collector/ceph/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/ceph/testdata/config.json rename to src/go/plugin/go.d/collector/ceph/testdata/config.json diff --git a/src/go/plugin/go.d/modules/ceph/testdata/config.yaml b/src/go/plugin/go.d/collector/ceph/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/ceph/testdata/config.yaml rename to src/go/plugin/go.d/collector/ceph/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/ceph/testdata/v16.2.15/api_health_minimal.json b/src/go/plugin/go.d/collector/ceph/testdata/v16.2.15/api_health_minimal.json similarity index 100% rename from src/go/plugin/go.d/modules/ceph/testdata/v16.2.15/api_health_minimal.json rename to src/go/plugin/go.d/collector/ceph/testdata/v16.2.15/api_health_minimal.json diff --git a/src/go/plugin/go.d/modules/ceph/testdata/v16.2.15/api_monitor.json b/src/go/plugin/go.d/collector/ceph/testdata/v16.2.15/api_monitor.json similarity index 100% rename from src/go/plugin/go.d/modules/ceph/testdata/v16.2.15/api_monitor.json rename to src/go/plugin/go.d/collector/ceph/testdata/v16.2.15/api_monitor.json diff --git a/src/go/plugin/go.d/modules/ceph/testdata/v16.2.15/api_osd.json b/src/go/plugin/go.d/collector/ceph/testdata/v16.2.15/api_osd.json similarity index 100% rename from src/go/plugin/go.d/modules/ceph/testdata/v16.2.15/api_osd.json rename to src/go/plugin/go.d/collector/ceph/testdata/v16.2.15/api_osd.json diff --git a/src/go/plugin/go.d/modules/ceph/testdata/v16.2.15/api_pool_stats.json b/src/go/plugin/go.d/collector/ceph/testdata/v16.2.15/api_pool_stats.json similarity index 100% rename from src/go/plugin/go.d/modules/ceph/testdata/v16.2.15/api_pool_stats.json rename to src/go/plugin/go.d/collector/ceph/testdata/v16.2.15/api_pool_stats.json diff --git a/src/go/plugin/go.d/modules/chrony/README.md b/src/go/plugin/go.d/collector/chrony/README.md similarity index 100% rename from src/go/plugin/go.d/modules/chrony/README.md rename to src/go/plugin/go.d/collector/chrony/README.md diff --git a/src/go/plugin/go.d/modules/chrony/charts.go b/src/go/plugin/go.d/collector/chrony/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/chrony/charts.go rename to src/go/plugin/go.d/collector/chrony/charts.go diff --git a/src/go/plugin/go.d/modules/chrony/chrony.go b/src/go/plugin/go.d/collector/chrony/chrony.go similarity index 100% rename from src/go/plugin/go.d/modules/chrony/chrony.go rename to src/go/plugin/go.d/collector/chrony/chrony.go diff --git a/src/go/plugin/go.d/modules/chrony/chrony_test.go b/src/go/plugin/go.d/collector/chrony/chrony_test.go similarity index 100% rename from src/go/plugin/go.d/modules/chrony/chrony_test.go rename to src/go/plugin/go.d/collector/chrony/chrony_test.go diff --git a/src/go/plugin/go.d/modules/chrony/client.go b/src/go/plugin/go.d/collector/chrony/client.go similarity index 100% rename from src/go/plugin/go.d/modules/chrony/client.go rename to src/go/plugin/go.d/collector/chrony/client.go diff --git a/src/go/plugin/go.d/modules/chrony/collect.go b/src/go/plugin/go.d/collector/chrony/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/chrony/collect.go rename to src/go/plugin/go.d/collector/chrony/collect.go diff --git a/src/go/plugin/go.d/modules/chrony/config_schema.json b/src/go/plugin/go.d/collector/chrony/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/chrony/config_schema.json rename to src/go/plugin/go.d/collector/chrony/config_schema.json diff --git a/src/go/plugin/go.d/modules/chrony/exec.go b/src/go/plugin/go.d/collector/chrony/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/chrony/exec.go rename to src/go/plugin/go.d/collector/chrony/exec.go diff --git a/src/go/plugin/go.d/modules/chrony/init.go b/src/go/plugin/go.d/collector/chrony/init.go similarity index 100% rename from src/go/plugin/go.d/modules/chrony/init.go rename to src/go/plugin/go.d/collector/chrony/init.go diff --git a/src/go/plugin/go.d/modules/chrony/integrations/chrony.md b/src/go/plugin/go.d/collector/chrony/integrations/chrony.md similarity index 100% rename from src/go/plugin/go.d/modules/chrony/integrations/chrony.md rename to src/go/plugin/go.d/collector/chrony/integrations/chrony.md diff --git a/src/go/plugin/go.d/modules/chrony/metadata.yaml b/src/go/plugin/go.d/collector/chrony/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/chrony/metadata.yaml rename to src/go/plugin/go.d/collector/chrony/metadata.yaml diff --git a/src/go/plugin/go.d/modules/chrony/testdata/config.json b/src/go/plugin/go.d/collector/chrony/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/chrony/testdata/config.json rename to src/go/plugin/go.d/collector/chrony/testdata/config.json diff --git a/src/go/plugin/go.d/modules/chrony/testdata/config.yaml b/src/go/plugin/go.d/collector/chrony/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/chrony/testdata/config.yaml rename to src/go/plugin/go.d/collector/chrony/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/clickhouse/README.md b/src/go/plugin/go.d/collector/clickhouse/README.md similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/README.md rename to src/go/plugin/go.d/collector/clickhouse/README.md diff --git a/src/go/plugin/go.d/modules/clickhouse/charts.go b/src/go/plugin/go.d/collector/clickhouse/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/charts.go rename to src/go/plugin/go.d/collector/clickhouse/charts.go diff --git a/src/go/plugin/go.d/modules/clickhouse/clickhouse.go b/src/go/plugin/go.d/collector/clickhouse/clickhouse.go similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/clickhouse.go rename to src/go/plugin/go.d/collector/clickhouse/clickhouse.go diff --git a/src/go/plugin/go.d/modules/clickhouse/clickhouse_test.go b/src/go/plugin/go.d/collector/clickhouse/clickhouse_test.go similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/clickhouse_test.go rename to src/go/plugin/go.d/collector/clickhouse/clickhouse_test.go diff --git a/src/go/plugin/go.d/modules/clickhouse/collect.go b/src/go/plugin/go.d/collector/clickhouse/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/collect.go rename to src/go/plugin/go.d/collector/clickhouse/collect.go diff --git a/src/go/plugin/go.d/modules/clickhouse/collect_system_async_metrics.go b/src/go/plugin/go.d/collector/clickhouse/collect_system_async_metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/collect_system_async_metrics.go rename to src/go/plugin/go.d/collector/clickhouse/collect_system_async_metrics.go diff --git a/src/go/plugin/go.d/modules/clickhouse/collect_system_disks.go b/src/go/plugin/go.d/collector/clickhouse/collect_system_disks.go similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/collect_system_disks.go rename to src/go/plugin/go.d/collector/clickhouse/collect_system_disks.go diff --git a/src/go/plugin/go.d/modules/clickhouse/collect_system_events.go b/src/go/plugin/go.d/collector/clickhouse/collect_system_events.go similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/collect_system_events.go rename to src/go/plugin/go.d/collector/clickhouse/collect_system_events.go diff --git a/src/go/plugin/go.d/modules/clickhouse/collect_system_metrics.go b/src/go/plugin/go.d/collector/clickhouse/collect_system_metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/collect_system_metrics.go rename to src/go/plugin/go.d/collector/clickhouse/collect_system_metrics.go diff --git a/src/go/plugin/go.d/modules/clickhouse/collect_system_parts.go b/src/go/plugin/go.d/collector/clickhouse/collect_system_parts.go similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/collect_system_parts.go rename to src/go/plugin/go.d/collector/clickhouse/collect_system_parts.go diff --git a/src/go/plugin/go.d/modules/clickhouse/collect_system_processes.go b/src/go/plugin/go.d/collector/clickhouse/collect_system_processes.go similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/collect_system_processes.go rename to src/go/plugin/go.d/collector/clickhouse/collect_system_processes.go diff --git a/src/go/plugin/go.d/modules/clickhouse/config_schema.json b/src/go/plugin/go.d/collector/clickhouse/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/config_schema.json rename to src/go/plugin/go.d/collector/clickhouse/config_schema.json diff --git a/src/go/plugin/go.d/modules/clickhouse/init.go b/src/go/plugin/go.d/collector/clickhouse/init.go similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/init.go rename to src/go/plugin/go.d/collector/clickhouse/init.go diff --git a/src/go/plugin/go.d/modules/clickhouse/integrations/clickhouse.md b/src/go/plugin/go.d/collector/clickhouse/integrations/clickhouse.md similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/integrations/clickhouse.md rename to src/go/plugin/go.d/collector/clickhouse/integrations/clickhouse.md diff --git a/src/go/plugin/go.d/modules/clickhouse/metadata.yaml b/src/go/plugin/go.d/collector/clickhouse/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/metadata.yaml rename to src/go/plugin/go.d/collector/clickhouse/metadata.yaml diff --git a/src/go/plugin/go.d/modules/clickhouse/testdata/config.json b/src/go/plugin/go.d/collector/clickhouse/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/testdata/config.json rename to src/go/plugin/go.d/collector/clickhouse/testdata/config.json diff --git a/src/go/plugin/go.d/modules/clickhouse/testdata/config.yaml b/src/go/plugin/go.d/collector/clickhouse/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/testdata/config.yaml rename to src/go/plugin/go.d/collector/clickhouse/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/clickhouse/testdata/resp_longest_query_time.csv b/src/go/plugin/go.d/collector/clickhouse/testdata/resp_longest_query_time.csv similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/testdata/resp_longest_query_time.csv rename to src/go/plugin/go.d/collector/clickhouse/testdata/resp_longest_query_time.csv diff --git a/src/go/plugin/go.d/modules/clickhouse/testdata/resp_system_async_metrics.csv b/src/go/plugin/go.d/collector/clickhouse/testdata/resp_system_async_metrics.csv similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/testdata/resp_system_async_metrics.csv rename to src/go/plugin/go.d/collector/clickhouse/testdata/resp_system_async_metrics.csv diff --git a/src/go/plugin/go.d/modules/clickhouse/testdata/resp_system_disks.csv b/src/go/plugin/go.d/collector/clickhouse/testdata/resp_system_disks.csv similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/testdata/resp_system_disks.csv rename to src/go/plugin/go.d/collector/clickhouse/testdata/resp_system_disks.csv diff --git a/src/go/plugin/go.d/modules/clickhouse/testdata/resp_system_events.csv b/src/go/plugin/go.d/collector/clickhouse/testdata/resp_system_events.csv similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/testdata/resp_system_events.csv rename to src/go/plugin/go.d/collector/clickhouse/testdata/resp_system_events.csv diff --git a/src/go/plugin/go.d/modules/clickhouse/testdata/resp_system_metrics.csv b/src/go/plugin/go.d/collector/clickhouse/testdata/resp_system_metrics.csv similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/testdata/resp_system_metrics.csv rename to src/go/plugin/go.d/collector/clickhouse/testdata/resp_system_metrics.csv diff --git a/src/go/plugin/go.d/modules/clickhouse/testdata/resp_system_parts.csv b/src/go/plugin/go.d/collector/clickhouse/testdata/resp_system_parts.csv similarity index 100% rename from src/go/plugin/go.d/modules/clickhouse/testdata/resp_system_parts.csv rename to src/go/plugin/go.d/collector/clickhouse/testdata/resp_system_parts.csv diff --git a/src/go/plugin/go.d/modules/cockroachdb/README.md b/src/go/plugin/go.d/collector/cockroachdb/README.md similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/README.md rename to src/go/plugin/go.d/collector/cockroachdb/README.md diff --git a/src/go/plugin/go.d/modules/cockroachdb/charts.go b/src/go/plugin/go.d/collector/cockroachdb/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/charts.go rename to src/go/plugin/go.d/collector/cockroachdb/charts.go diff --git a/src/go/plugin/go.d/modules/cockroachdb/cockroachdb.go b/src/go/plugin/go.d/collector/cockroachdb/cockroachdb.go similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/cockroachdb.go rename to src/go/plugin/go.d/collector/cockroachdb/cockroachdb.go diff --git a/src/go/plugin/go.d/modules/cockroachdb/cockroachdb_test.go b/src/go/plugin/go.d/collector/cockroachdb/cockroachdb_test.go similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/cockroachdb_test.go rename to src/go/plugin/go.d/collector/cockroachdb/cockroachdb_test.go diff --git a/src/go/plugin/go.d/modules/cockroachdb/collect.go b/src/go/plugin/go.d/collector/cockroachdb/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/collect.go rename to src/go/plugin/go.d/collector/cockroachdb/collect.go diff --git a/src/go/plugin/go.d/modules/cockroachdb/config_schema.json b/src/go/plugin/go.d/collector/cockroachdb/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/config_schema.json rename to src/go/plugin/go.d/collector/cockroachdb/config_schema.json diff --git a/src/go/plugin/go.d/modules/cockroachdb/init.go b/src/go/plugin/go.d/collector/cockroachdb/init.go similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/init.go rename to src/go/plugin/go.d/collector/cockroachdb/init.go diff --git a/src/go/plugin/go.d/modules/cockroachdb/integrations/cockroachdb.md b/src/go/plugin/go.d/collector/cockroachdb/integrations/cockroachdb.md similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/integrations/cockroachdb.md rename to src/go/plugin/go.d/collector/cockroachdb/integrations/cockroachdb.md diff --git a/src/go/plugin/go.d/modules/cockroachdb/metadata.yaml b/src/go/plugin/go.d/collector/cockroachdb/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/metadata.yaml rename to src/go/plugin/go.d/collector/cockroachdb/metadata.yaml diff --git a/src/go/plugin/go.d/modules/cockroachdb/metrics.go b/src/go/plugin/go.d/collector/cockroachdb/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/metrics.go rename to src/go/plugin/go.d/collector/cockroachdb/metrics.go diff --git a/src/go/plugin/go.d/modules/cockroachdb/testdata/config.json b/src/go/plugin/go.d/collector/cockroachdb/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/testdata/config.json rename to src/go/plugin/go.d/collector/cockroachdb/testdata/config.json diff --git a/src/go/plugin/go.d/modules/cockroachdb/testdata/config.yaml b/src/go/plugin/go.d/collector/cockroachdb/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/testdata/config.yaml rename to src/go/plugin/go.d/collector/cockroachdb/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/cockroachdb/testdata/metrics.txt b/src/go/plugin/go.d/collector/cockroachdb/testdata/metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/testdata/metrics.txt rename to src/go/plugin/go.d/collector/cockroachdb/testdata/metrics.txt diff --git a/src/go/plugin/go.d/modules/cockroachdb/testdata/non_cockroachdb.txt b/src/go/plugin/go.d/collector/cockroachdb/testdata/non_cockroachdb.txt similarity index 100% rename from src/go/plugin/go.d/modules/cockroachdb/testdata/non_cockroachdb.txt rename to src/go/plugin/go.d/collector/cockroachdb/testdata/non_cockroachdb.txt diff --git a/src/go/plugin/go.d/modules/consul/README.md b/src/go/plugin/go.d/collector/consul/README.md similarity index 100% rename from src/go/plugin/go.d/modules/consul/README.md rename to src/go/plugin/go.d/collector/consul/README.md diff --git a/src/go/plugin/go.d/modules/consul/charts.go b/src/go/plugin/go.d/collector/consul/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/consul/charts.go rename to src/go/plugin/go.d/collector/consul/charts.go diff --git a/src/go/plugin/go.d/modules/consul/collect.go b/src/go/plugin/go.d/collector/consul/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/consul/collect.go rename to src/go/plugin/go.d/collector/consul/collect.go diff --git a/src/go/plugin/go.d/modules/consul/collect_autopilot.go b/src/go/plugin/go.d/collector/consul/collect_autopilot.go similarity index 100% rename from src/go/plugin/go.d/modules/consul/collect_autopilot.go rename to src/go/plugin/go.d/collector/consul/collect_autopilot.go diff --git a/src/go/plugin/go.d/modules/consul/collect_checks.go b/src/go/plugin/go.d/collector/consul/collect_checks.go similarity index 100% rename from src/go/plugin/go.d/modules/consul/collect_checks.go rename to src/go/plugin/go.d/collector/consul/collect_checks.go diff --git a/src/go/plugin/go.d/modules/consul/collect_config.go b/src/go/plugin/go.d/collector/consul/collect_config.go similarity index 100% rename from src/go/plugin/go.d/modules/consul/collect_config.go rename to src/go/plugin/go.d/collector/consul/collect_config.go diff --git a/src/go/plugin/go.d/modules/consul/collect_metrics.go b/src/go/plugin/go.d/collector/consul/collect_metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/consul/collect_metrics.go rename to src/go/plugin/go.d/collector/consul/collect_metrics.go diff --git a/src/go/plugin/go.d/modules/consul/collect_net_rtt.go b/src/go/plugin/go.d/collector/consul/collect_net_rtt.go similarity index 100% rename from src/go/plugin/go.d/modules/consul/collect_net_rtt.go rename to src/go/plugin/go.d/collector/consul/collect_net_rtt.go diff --git a/src/go/plugin/go.d/modules/consul/config_schema.json b/src/go/plugin/go.d/collector/consul/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/config_schema.json rename to src/go/plugin/go.d/collector/consul/config_schema.json diff --git a/src/go/plugin/go.d/modules/consul/consul.go b/src/go/plugin/go.d/collector/consul/consul.go similarity index 100% rename from src/go/plugin/go.d/modules/consul/consul.go rename to src/go/plugin/go.d/collector/consul/consul.go diff --git a/src/go/plugin/go.d/modules/consul/consul_test.go b/src/go/plugin/go.d/collector/consul/consul_test.go similarity index 100% rename from src/go/plugin/go.d/modules/consul/consul_test.go rename to src/go/plugin/go.d/collector/consul/consul_test.go diff --git a/src/go/plugin/go.d/modules/consul/init.go b/src/go/plugin/go.d/collector/consul/init.go similarity index 100% rename from src/go/plugin/go.d/modules/consul/init.go rename to src/go/plugin/go.d/collector/consul/init.go diff --git a/src/go/plugin/go.d/modules/consul/integrations/consul.md b/src/go/plugin/go.d/collector/consul/integrations/consul.md similarity index 100% rename from src/go/plugin/go.d/modules/consul/integrations/consul.md rename to src/go/plugin/go.d/collector/consul/integrations/consul.md diff --git a/src/go/plugin/go.d/modules/consul/metadata.yaml b/src/go/plugin/go.d/collector/consul/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/consul/metadata.yaml rename to src/go/plugin/go.d/collector/consul/metadata.yaml diff --git a/src/go/plugin/go.d/modules/consul/testdata/config.json b/src/go/plugin/go.d/collector/consul/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/config.json rename to src/go/plugin/go.d/collector/consul/testdata/config.json diff --git a/src/go/plugin/go.d/modules/consul/testdata/config.yaml b/src/go/plugin/go.d/collector/consul/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/config.yaml rename to src/go/plugin/go.d/collector/consul/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.13.2/client_v1-agent-metrics.txt b/src/go/plugin/go.d/collector/consul/testdata/v1.13.2/client_v1-agent-metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.13.2/client_v1-agent-metrics.txt rename to src/go/plugin/go.d/collector/consul/testdata/v1.13.2/client_v1-agent-metrics.txt diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.13.2/client_v1-agent-self.json b/src/go/plugin/go.d/collector/consul/testdata/v1.13.2/client_v1-agent-self.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.13.2/client_v1-agent-self.json rename to src/go/plugin/go.d/collector/consul/testdata/v1.13.2/client_v1-agent-self.json diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-metrics.txt b/src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-metrics.txt rename to src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-metrics.txt diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-metrics_with_hostname.txt b/src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-metrics_with_hostname.txt similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-metrics_with_hostname.txt rename to src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-metrics_with_hostname.txt diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-self.json b/src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-self.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-self.json rename to src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-self.json diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-self_cloud-managed.json b/src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-self_cloud-managed.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-self_cloud-managed.json rename to src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-self_cloud-managed.json diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-self_disabled_prom.json b/src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-self_disabled_prom.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-self_disabled_prom.json rename to src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-self_disabled_prom.json diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-self_with_hostname.json b/src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-self_with_hostname.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-agent-self_with_hostname.json rename to src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-agent-self_with_hostname.json diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-coordinate-nodes.json b/src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-coordinate-nodes.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-coordinate-nodes.json rename to src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-coordinate-nodes.json diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-operator-autopilot-health.json b/src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-operator-autopilot-health.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.13.2/server_v1-operator-autopilot-health.json rename to src/go/plugin/go.d/collector/consul/testdata/v1.13.2/server_v1-operator-autopilot-health.json diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.13.2/v1-agent-checks.json b/src/go/plugin/go.d/collector/consul/testdata/v1.13.2/v1-agent-checks.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.13.2/v1-agent-checks.json rename to src/go/plugin/go.d/collector/consul/testdata/v1.13.2/v1-agent-checks.json diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.14.3-cloud/server_v1-agent-metrics.txt b/src/go/plugin/go.d/collector/consul/testdata/v1.14.3-cloud/server_v1-agent-metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.14.3-cloud/server_v1-agent-metrics.txt rename to src/go/plugin/go.d/collector/consul/testdata/v1.14.3-cloud/server_v1-agent-metrics.txt diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.14.3-cloud/server_v1-agent-self.json b/src/go/plugin/go.d/collector/consul/testdata/v1.14.3-cloud/server_v1-agent-self.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.14.3-cloud/server_v1-agent-self.json rename to src/go/plugin/go.d/collector/consul/testdata/v1.14.3-cloud/server_v1-agent-self.json diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.14.3-cloud/server_v1-coordinate-nodes.json b/src/go/plugin/go.d/collector/consul/testdata/v1.14.3-cloud/server_v1-coordinate-nodes.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.14.3-cloud/server_v1-coordinate-nodes.json rename to src/go/plugin/go.d/collector/consul/testdata/v1.14.3-cloud/server_v1-coordinate-nodes.json diff --git a/src/go/plugin/go.d/modules/consul/testdata/v1.14.3-cloud/v1-agent-checks.json b/src/go/plugin/go.d/collector/consul/testdata/v1.14.3-cloud/v1-agent-checks.json similarity index 100% rename from src/go/plugin/go.d/modules/consul/testdata/v1.14.3-cloud/v1-agent-checks.json rename to src/go/plugin/go.d/collector/consul/testdata/v1.14.3-cloud/v1-agent-checks.json diff --git a/src/go/plugin/go.d/modules/coredns/README.md b/src/go/plugin/go.d/collector/coredns/README.md similarity index 100% rename from src/go/plugin/go.d/modules/coredns/README.md rename to src/go/plugin/go.d/collector/coredns/README.md diff --git a/src/go/plugin/go.d/modules/coredns/charts.go b/src/go/plugin/go.d/collector/coredns/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/coredns/charts.go rename to src/go/plugin/go.d/collector/coredns/charts.go diff --git a/src/go/plugin/go.d/modules/coredns/collect.go b/src/go/plugin/go.d/collector/coredns/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/coredns/collect.go rename to src/go/plugin/go.d/collector/coredns/collect.go diff --git a/src/go/plugin/go.d/modules/coredns/config_schema.json b/src/go/plugin/go.d/collector/coredns/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/coredns/config_schema.json rename to src/go/plugin/go.d/collector/coredns/config_schema.json diff --git a/src/go/plugin/go.d/modules/coredns/coredns.go b/src/go/plugin/go.d/collector/coredns/coredns.go similarity index 100% rename from src/go/plugin/go.d/modules/coredns/coredns.go rename to src/go/plugin/go.d/collector/coredns/coredns.go diff --git a/src/go/plugin/go.d/modules/coredns/coredns_test.go b/src/go/plugin/go.d/collector/coredns/coredns_test.go similarity index 100% rename from src/go/plugin/go.d/modules/coredns/coredns_test.go rename to src/go/plugin/go.d/collector/coredns/coredns_test.go diff --git a/src/go/plugin/go.d/modules/coredns/init.go b/src/go/plugin/go.d/collector/coredns/init.go similarity index 100% rename from src/go/plugin/go.d/modules/coredns/init.go rename to src/go/plugin/go.d/collector/coredns/init.go diff --git a/src/go/plugin/go.d/modules/coredns/integrations/coredns.md b/src/go/plugin/go.d/collector/coredns/integrations/coredns.md similarity index 100% rename from src/go/plugin/go.d/modules/coredns/integrations/coredns.md rename to src/go/plugin/go.d/collector/coredns/integrations/coredns.md diff --git a/src/go/plugin/go.d/modules/coredns/metadata.yaml b/src/go/plugin/go.d/collector/coredns/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/coredns/metadata.yaml rename to src/go/plugin/go.d/collector/coredns/metadata.yaml diff --git a/src/go/plugin/go.d/modules/coredns/metrics.go b/src/go/plugin/go.d/collector/coredns/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/coredns/metrics.go rename to src/go/plugin/go.d/collector/coredns/metrics.go diff --git a/src/go/plugin/go.d/modules/coredns/testdata/config.json b/src/go/plugin/go.d/collector/coredns/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/coredns/testdata/config.json rename to src/go/plugin/go.d/collector/coredns/testdata/config.json diff --git a/src/go/plugin/go.d/modules/coredns/testdata/config.yaml b/src/go/plugin/go.d/collector/coredns/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/coredns/testdata/config.yaml rename to src/go/plugin/go.d/collector/coredns/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/coredns/testdata/no_version/no_load.txt b/src/go/plugin/go.d/collector/coredns/testdata/no_version/no_load.txt similarity index 100% rename from src/go/plugin/go.d/modules/coredns/testdata/no_version/no_load.txt rename to src/go/plugin/go.d/collector/coredns/testdata/no_version/no_load.txt diff --git a/src/go/plugin/go.d/modules/coredns/testdata/version169/no_load.txt b/src/go/plugin/go.d/collector/coredns/testdata/version169/no_load.txt similarity index 100% rename from src/go/plugin/go.d/modules/coredns/testdata/version169/no_load.txt rename to src/go/plugin/go.d/collector/coredns/testdata/version169/no_load.txt diff --git a/src/go/plugin/go.d/modules/coredns/testdata/version169/some_load.txt b/src/go/plugin/go.d/collector/coredns/testdata/version169/some_load.txt similarity index 100% rename from src/go/plugin/go.d/modules/coredns/testdata/version169/some_load.txt rename to src/go/plugin/go.d/collector/coredns/testdata/version169/some_load.txt diff --git a/src/go/plugin/go.d/modules/coredns/testdata/version170/no_load.txt b/src/go/plugin/go.d/collector/coredns/testdata/version170/no_load.txt similarity index 100% rename from src/go/plugin/go.d/modules/coredns/testdata/version170/no_load.txt rename to src/go/plugin/go.d/collector/coredns/testdata/version170/no_load.txt diff --git a/src/go/plugin/go.d/modules/coredns/testdata/version170/some_load.txt b/src/go/plugin/go.d/collector/coredns/testdata/version170/some_load.txt similarity index 100% rename from src/go/plugin/go.d/modules/coredns/testdata/version170/some_load.txt rename to src/go/plugin/go.d/collector/coredns/testdata/version170/some_load.txt diff --git a/src/go/plugin/go.d/modules/couchbase/README.md b/src/go/plugin/go.d/collector/couchbase/README.md similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/README.md rename to src/go/plugin/go.d/collector/couchbase/README.md diff --git a/src/go/plugin/go.d/modules/couchbase/charts.go b/src/go/plugin/go.d/collector/couchbase/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/charts.go rename to src/go/plugin/go.d/collector/couchbase/charts.go diff --git a/src/go/plugin/go.d/modules/couchbase/collect.go b/src/go/plugin/go.d/collector/couchbase/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/collect.go rename to src/go/plugin/go.d/collector/couchbase/collect.go diff --git a/src/go/plugin/go.d/modules/couchbase/config_schema.json b/src/go/plugin/go.d/collector/couchbase/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/config_schema.json rename to src/go/plugin/go.d/collector/couchbase/config_schema.json diff --git a/src/go/plugin/go.d/modules/couchbase/couchbase.go b/src/go/plugin/go.d/collector/couchbase/couchbase.go similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/couchbase.go rename to src/go/plugin/go.d/collector/couchbase/couchbase.go diff --git a/src/go/plugin/go.d/modules/couchbase/couchbase_test.go b/src/go/plugin/go.d/collector/couchbase/couchbase_test.go similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/couchbase_test.go rename to src/go/plugin/go.d/collector/couchbase/couchbase_test.go diff --git a/src/go/plugin/go.d/modules/couchbase/init.go b/src/go/plugin/go.d/collector/couchbase/init.go similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/init.go rename to src/go/plugin/go.d/collector/couchbase/init.go diff --git a/src/go/plugin/go.d/modules/couchbase/integrations/couchbase.md b/src/go/plugin/go.d/collector/couchbase/integrations/couchbase.md similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/integrations/couchbase.md rename to src/go/plugin/go.d/collector/couchbase/integrations/couchbase.md diff --git a/src/go/plugin/go.d/modules/couchbase/metadata.yaml b/src/go/plugin/go.d/collector/couchbase/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/metadata.yaml rename to src/go/plugin/go.d/collector/couchbase/metadata.yaml diff --git a/src/go/plugin/go.d/modules/couchbase/metrics.go b/src/go/plugin/go.d/collector/couchbase/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/metrics.go rename to src/go/plugin/go.d/collector/couchbase/metrics.go diff --git a/src/go/plugin/go.d/modules/couchbase/testdata/6.6.0/buckets_basic_stats.json b/src/go/plugin/go.d/collector/couchbase/testdata/6.6.0/buckets_basic_stats.json similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/testdata/6.6.0/buckets_basic_stats.json rename to src/go/plugin/go.d/collector/couchbase/testdata/6.6.0/buckets_basic_stats.json diff --git a/src/go/plugin/go.d/modules/couchbase/testdata/config.json b/src/go/plugin/go.d/collector/couchbase/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/testdata/config.json rename to src/go/plugin/go.d/collector/couchbase/testdata/config.json diff --git a/src/go/plugin/go.d/modules/couchbase/testdata/config.yaml b/src/go/plugin/go.d/collector/couchbase/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/couchbase/testdata/config.yaml rename to src/go/plugin/go.d/collector/couchbase/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/couchdb/README.md b/src/go/plugin/go.d/collector/couchdb/README.md similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/README.md rename to src/go/plugin/go.d/collector/couchdb/README.md diff --git a/src/go/plugin/go.d/modules/couchdb/charts.go b/src/go/plugin/go.d/collector/couchdb/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/charts.go rename to src/go/plugin/go.d/collector/couchdb/charts.go diff --git a/src/go/plugin/go.d/modules/couchdb/collect.go b/src/go/plugin/go.d/collector/couchdb/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/collect.go rename to src/go/plugin/go.d/collector/couchdb/collect.go diff --git a/src/go/plugin/go.d/modules/couchdb/config_schema.json b/src/go/plugin/go.d/collector/couchdb/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/config_schema.json rename to src/go/plugin/go.d/collector/couchdb/config_schema.json diff --git a/src/go/plugin/go.d/modules/couchdb/couchdb.go b/src/go/plugin/go.d/collector/couchdb/couchdb.go similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/couchdb.go rename to src/go/plugin/go.d/collector/couchdb/couchdb.go diff --git a/src/go/plugin/go.d/modules/couchdb/couchdb_test.go b/src/go/plugin/go.d/collector/couchdb/couchdb_test.go similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/couchdb_test.go rename to src/go/plugin/go.d/collector/couchdb/couchdb_test.go diff --git a/src/go/plugin/go.d/modules/couchdb/init.go b/src/go/plugin/go.d/collector/couchdb/init.go similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/init.go rename to src/go/plugin/go.d/collector/couchdb/init.go diff --git a/src/go/plugin/go.d/modules/couchdb/integrations/couchdb.md b/src/go/plugin/go.d/collector/couchdb/integrations/couchdb.md similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/integrations/couchdb.md rename to src/go/plugin/go.d/collector/couchdb/integrations/couchdb.md diff --git a/src/go/plugin/go.d/modules/couchdb/metadata.yaml b/src/go/plugin/go.d/collector/couchdb/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/metadata.yaml rename to src/go/plugin/go.d/collector/couchdb/metadata.yaml diff --git a/src/go/plugin/go.d/modules/couchdb/metrics.go b/src/go/plugin/go.d/collector/couchdb/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/metrics.go rename to src/go/plugin/go.d/collector/couchdb/metrics.go diff --git a/src/go/plugin/go.d/modules/couchdb/testdata/config.json b/src/go/plugin/go.d/collector/couchdb/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/testdata/config.json rename to src/go/plugin/go.d/collector/couchdb/testdata/config.json diff --git a/src/go/plugin/go.d/modules/couchdb/testdata/config.yaml b/src/go/plugin/go.d/collector/couchdb/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/testdata/config.yaml rename to src/go/plugin/go.d/collector/couchdb/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/couchdb/testdata/v3.1.1/active_tasks.json b/src/go/plugin/go.d/collector/couchdb/testdata/v3.1.1/active_tasks.json similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/testdata/v3.1.1/active_tasks.json rename to src/go/plugin/go.d/collector/couchdb/testdata/v3.1.1/active_tasks.json diff --git a/src/go/plugin/go.d/modules/couchdb/testdata/v3.1.1/dbs_info.json b/src/go/plugin/go.d/collector/couchdb/testdata/v3.1.1/dbs_info.json similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/testdata/v3.1.1/dbs_info.json rename to src/go/plugin/go.d/collector/couchdb/testdata/v3.1.1/dbs_info.json diff --git a/src/go/plugin/go.d/modules/couchdb/testdata/v3.1.1/node_stats.json b/src/go/plugin/go.d/collector/couchdb/testdata/v3.1.1/node_stats.json similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/testdata/v3.1.1/node_stats.json rename to src/go/plugin/go.d/collector/couchdb/testdata/v3.1.1/node_stats.json diff --git a/src/go/plugin/go.d/modules/couchdb/testdata/v3.1.1/node_system.json b/src/go/plugin/go.d/collector/couchdb/testdata/v3.1.1/node_system.json similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/testdata/v3.1.1/node_system.json rename to src/go/plugin/go.d/collector/couchdb/testdata/v3.1.1/node_system.json diff --git a/src/go/plugin/go.d/modules/couchdb/testdata/v3.1.1/root.json b/src/go/plugin/go.d/collector/couchdb/testdata/v3.1.1/root.json similarity index 100% rename from src/go/plugin/go.d/modules/couchdb/testdata/v3.1.1/root.json rename to src/go/plugin/go.d/collector/couchdb/testdata/v3.1.1/root.json diff --git a/src/go/plugin/go.d/modules/dmcache/README.md b/src/go/plugin/go.d/collector/dmcache/README.md similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/README.md rename to src/go/plugin/go.d/collector/dmcache/README.md diff --git a/src/go/plugin/go.d/modules/dmcache/charts.go b/src/go/plugin/go.d/collector/dmcache/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/charts.go rename to src/go/plugin/go.d/collector/dmcache/charts.go diff --git a/src/go/plugin/go.d/modules/dmcache/collect.go b/src/go/plugin/go.d/collector/dmcache/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/collect.go rename to src/go/plugin/go.d/collector/dmcache/collect.go diff --git a/src/go/plugin/go.d/modules/dmcache/config_schema.json b/src/go/plugin/go.d/collector/dmcache/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/config_schema.json rename to src/go/plugin/go.d/collector/dmcache/config_schema.json diff --git a/src/go/plugin/go.d/modules/dmcache/dmcache.go b/src/go/plugin/go.d/collector/dmcache/dmcache.go similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/dmcache.go rename to src/go/plugin/go.d/collector/dmcache/dmcache.go diff --git a/src/go/plugin/go.d/modules/dmcache/dmcache_test.go b/src/go/plugin/go.d/collector/dmcache/dmcache_test.go similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/dmcache_test.go rename to src/go/plugin/go.d/collector/dmcache/dmcache_test.go diff --git a/src/go/plugin/go.d/modules/dmcache/doc.go b/src/go/plugin/go.d/collector/dmcache/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/doc.go rename to src/go/plugin/go.d/collector/dmcache/doc.go diff --git a/src/go/plugin/go.d/modules/dmcache/exec.go b/src/go/plugin/go.d/collector/dmcache/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/exec.go rename to src/go/plugin/go.d/collector/dmcache/exec.go diff --git a/src/go/plugin/go.d/modules/dmcache/init.go b/src/go/plugin/go.d/collector/dmcache/init.go similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/init.go rename to src/go/plugin/go.d/collector/dmcache/init.go diff --git a/src/go/plugin/go.d/modules/dmcache/integrations/dmcache_devices.md b/src/go/plugin/go.d/collector/dmcache/integrations/dmcache_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/integrations/dmcache_devices.md rename to src/go/plugin/go.d/collector/dmcache/integrations/dmcache_devices.md diff --git a/src/go/plugin/go.d/modules/dmcache/metadata.yaml b/src/go/plugin/go.d/collector/dmcache/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/metadata.yaml rename to src/go/plugin/go.d/collector/dmcache/metadata.yaml diff --git a/src/go/plugin/go.d/modules/dmcache/testdata/config.json b/src/go/plugin/go.d/collector/dmcache/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/testdata/config.json rename to src/go/plugin/go.d/collector/dmcache/testdata/config.json diff --git a/src/go/plugin/go.d/modules/dmcache/testdata/config.yaml b/src/go/plugin/go.d/collector/dmcache/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dmcache/testdata/config.yaml rename to src/go/plugin/go.d/collector/dmcache/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/dnsdist/README.md b/src/go/plugin/go.d/collector/dnsdist/README.md similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/README.md rename to src/go/plugin/go.d/collector/dnsdist/README.md diff --git a/src/go/plugin/go.d/modules/dnsdist/charts.go b/src/go/plugin/go.d/collector/dnsdist/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/charts.go rename to src/go/plugin/go.d/collector/dnsdist/charts.go diff --git a/src/go/plugin/go.d/modules/dnsdist/collect.go b/src/go/plugin/go.d/collector/dnsdist/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/collect.go rename to src/go/plugin/go.d/collector/dnsdist/collect.go diff --git a/src/go/plugin/go.d/modules/dnsdist/config_schema.json b/src/go/plugin/go.d/collector/dnsdist/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/config_schema.json rename to src/go/plugin/go.d/collector/dnsdist/config_schema.json diff --git a/src/go/plugin/go.d/modules/dnsdist/dnsdist.go b/src/go/plugin/go.d/collector/dnsdist/dnsdist.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/dnsdist.go rename to src/go/plugin/go.d/collector/dnsdist/dnsdist.go diff --git a/src/go/plugin/go.d/modules/dnsdist/dnsdist_test.go b/src/go/plugin/go.d/collector/dnsdist/dnsdist_test.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/dnsdist_test.go rename to src/go/plugin/go.d/collector/dnsdist/dnsdist_test.go diff --git a/src/go/plugin/go.d/modules/dnsdist/init.go b/src/go/plugin/go.d/collector/dnsdist/init.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/init.go rename to src/go/plugin/go.d/collector/dnsdist/init.go diff --git a/src/go/plugin/go.d/modules/dnsdist/integrations/dnsdist.md b/src/go/plugin/go.d/collector/dnsdist/integrations/dnsdist.md similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/integrations/dnsdist.md rename to src/go/plugin/go.d/collector/dnsdist/integrations/dnsdist.md diff --git a/src/go/plugin/go.d/modules/dnsdist/metadata.yaml b/src/go/plugin/go.d/collector/dnsdist/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/metadata.yaml rename to src/go/plugin/go.d/collector/dnsdist/metadata.yaml diff --git a/src/go/plugin/go.d/modules/dnsdist/metrics.go b/src/go/plugin/go.d/collector/dnsdist/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/metrics.go rename to src/go/plugin/go.d/collector/dnsdist/metrics.go diff --git a/src/go/plugin/go.d/modules/dnsdist/testdata/config.json b/src/go/plugin/go.d/collector/dnsdist/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/testdata/config.json rename to src/go/plugin/go.d/collector/dnsdist/testdata/config.json diff --git a/src/go/plugin/go.d/modules/dnsdist/testdata/config.yaml b/src/go/plugin/go.d/collector/dnsdist/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/testdata/config.yaml rename to src/go/plugin/go.d/collector/dnsdist/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/dnsdist/testdata/v1.5.1/jsonstat.json b/src/go/plugin/go.d/collector/dnsdist/testdata/v1.5.1/jsonstat.json similarity index 100% rename from src/go/plugin/go.d/modules/dnsdist/testdata/v1.5.1/jsonstat.json rename to src/go/plugin/go.d/collector/dnsdist/testdata/v1.5.1/jsonstat.json diff --git a/src/go/plugin/go.d/modules/dnsmasq/README.md b/src/go/plugin/go.d/collector/dnsmasq/README.md similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq/README.md rename to src/go/plugin/go.d/collector/dnsmasq/README.md diff --git a/src/go/plugin/go.d/modules/dnsmasq/charts.go b/src/go/plugin/go.d/collector/dnsmasq/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq/charts.go rename to src/go/plugin/go.d/collector/dnsmasq/charts.go diff --git a/src/go/plugin/go.d/modules/dnsmasq/collect.go b/src/go/plugin/go.d/collector/dnsmasq/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq/collect.go rename to src/go/plugin/go.d/collector/dnsmasq/collect.go diff --git a/src/go/plugin/go.d/modules/dnsmasq/config_schema.json b/src/go/plugin/go.d/collector/dnsmasq/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq/config_schema.json rename to src/go/plugin/go.d/collector/dnsmasq/config_schema.json diff --git a/src/go/plugin/go.d/modules/dnsmasq/dnsmasq.go b/src/go/plugin/go.d/collector/dnsmasq/dnsmasq.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq/dnsmasq.go rename to src/go/plugin/go.d/collector/dnsmasq/dnsmasq.go diff --git a/src/go/plugin/go.d/modules/dnsmasq/dnsmasq_test.go b/src/go/plugin/go.d/collector/dnsmasq/dnsmasq_test.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq/dnsmasq_test.go rename to src/go/plugin/go.d/collector/dnsmasq/dnsmasq_test.go diff --git a/src/go/plugin/go.d/modules/dnsmasq/init.go b/src/go/plugin/go.d/collector/dnsmasq/init.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq/init.go rename to src/go/plugin/go.d/collector/dnsmasq/init.go diff --git a/src/go/plugin/go.d/modules/dnsmasq/integrations/dnsmasq.md b/src/go/plugin/go.d/collector/dnsmasq/integrations/dnsmasq.md similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq/integrations/dnsmasq.md rename to src/go/plugin/go.d/collector/dnsmasq/integrations/dnsmasq.md diff --git a/src/go/plugin/go.d/modules/dnsmasq/metadata.yaml b/src/go/plugin/go.d/collector/dnsmasq/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq/metadata.yaml rename to src/go/plugin/go.d/collector/dnsmasq/metadata.yaml diff --git a/src/go/plugin/go.d/modules/dnsmasq/testdata/config.json b/src/go/plugin/go.d/collector/dnsmasq/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq/testdata/config.json rename to src/go/plugin/go.d/collector/dnsmasq/testdata/config.json diff --git a/src/go/plugin/go.d/modules/dnsmasq/testdata/config.yaml b/src/go/plugin/go.d/collector/dnsmasq/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq/testdata/config.yaml rename to src/go/plugin/go.d/collector/dnsmasq/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/README.md b/src/go/plugin/go.d/collector/dnsmasq_dhcp/README.md similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/README.md rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/README.md diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/charts.go b/src/go/plugin/go.d/collector/dnsmasq_dhcp/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/charts.go rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/charts.go diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/collect.go b/src/go/plugin/go.d/collector/dnsmasq_dhcp/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/collect.go rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/collect.go diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/config_schema.json b/src/go/plugin/go.d/collector/dnsmasq_dhcp/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/config_schema.json rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/config_schema.json diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/dhcp.go b/src/go/plugin/go.d/collector/dnsmasq_dhcp/dhcp.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/dhcp.go rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/dhcp.go diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/dhcp_test.go b/src/go/plugin/go.d/collector/dnsmasq_dhcp/dhcp_test.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/dhcp_test.go rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/dhcp_test.go diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/doc.go b/src/go/plugin/go.d/collector/dnsmasq_dhcp/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/doc.go rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/doc.go diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/init.go b/src/go/plugin/go.d/collector/dnsmasq_dhcp/init.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/init.go rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/init.go diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/integrations/dnsmasq_dhcp.md b/src/go/plugin/go.d/collector/dnsmasq_dhcp/integrations/dnsmasq_dhcp.md similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/integrations/dnsmasq_dhcp.md rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/integrations/dnsmasq_dhcp.md diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/metadata.yaml b/src/go/plugin/go.d/collector/dnsmasq_dhcp/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/metadata.yaml rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/metadata.yaml diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/parse_configuration.go b/src/go/plugin/go.d/collector/dnsmasq_dhcp/parse_configuration.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/parse_configuration.go rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/parse_configuration.go diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/config.json b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/config.json rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/config.json diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/config.yaml b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/config.yaml rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.conf b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.conf similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.conf rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.conf diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d/.dnsmasq.conf b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d/.dnsmasq.conf similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d/.dnsmasq.conf rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d/.dnsmasq.conf diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d/dnsmasqv4.any b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d/dnsmasqv4.any similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d/dnsmasqv4.any rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d/dnsmasqv4.any diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d/dnsmasqv6.any b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d/dnsmasqv6.any similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d/dnsmasqv6.any rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d/dnsmasqv6.any diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d2/dnsmasqv4.any b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d2/dnsmasqv4.any similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d2/dnsmasqv4.any rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d2/dnsmasqv4.any diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d2/dnsmasqv6.any b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d2/dnsmasqv6.any similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d2/dnsmasqv6.any rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d2/dnsmasqv6.any diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d2/~dnsmasq.conf b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d2/~dnsmasq.conf similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d2/~dnsmasq.conf rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d2/~dnsmasq.conf diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasq.bak b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasq.bak similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasq.bak rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasq.bak diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasqv4.any b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasqv4.any similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasqv4.any rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasqv4.any diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasqv6.any b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasqv6.any similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasqv6.any rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d3/dnsmasqv6.any diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasq.other b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasq.other similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasq.other rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasq.other diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasqv4.conf b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasqv4.conf similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasqv4.conf rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasqv4.conf diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasqv6.conf b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasqv6.conf similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasqv6.conf rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.d4/dnsmasqv6.conf diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.leases b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.leases similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq.leases rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq.leases diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq2.conf b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq2.conf similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq2.conf rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq2.conf diff --git a/src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq3.conf b/src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq3.conf similarity index 100% rename from src/go/plugin/go.d/modules/dnsmasq_dhcp/testdata/dnsmasq3.conf rename to src/go/plugin/go.d/collector/dnsmasq_dhcp/testdata/dnsmasq3.conf diff --git a/src/go/plugin/go.d/modules/dnsquery/README.md b/src/go/plugin/go.d/collector/dnsquery/README.md similarity index 100% rename from src/go/plugin/go.d/modules/dnsquery/README.md rename to src/go/plugin/go.d/collector/dnsquery/README.md diff --git a/src/go/plugin/go.d/modules/dnsquery/charts.go b/src/go/plugin/go.d/collector/dnsquery/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsquery/charts.go rename to src/go/plugin/go.d/collector/dnsquery/charts.go diff --git a/src/go/plugin/go.d/modules/dnsquery/collect.go b/src/go/plugin/go.d/collector/dnsquery/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsquery/collect.go rename to src/go/plugin/go.d/collector/dnsquery/collect.go diff --git a/src/go/plugin/go.d/modules/dnsquery/config_schema.json b/src/go/plugin/go.d/collector/dnsquery/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/dnsquery/config_schema.json rename to src/go/plugin/go.d/collector/dnsquery/config_schema.json diff --git a/src/go/plugin/go.d/modules/dnsquery/dnsquery.go b/src/go/plugin/go.d/collector/dnsquery/dnsquery.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsquery/dnsquery.go rename to src/go/plugin/go.d/collector/dnsquery/dnsquery.go diff --git a/src/go/plugin/go.d/modules/dnsquery/dnsquery_test.go b/src/go/plugin/go.d/collector/dnsquery/dnsquery_test.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsquery/dnsquery_test.go rename to src/go/plugin/go.d/collector/dnsquery/dnsquery_test.go diff --git a/src/go/plugin/go.d/modules/dnsquery/init.go b/src/go/plugin/go.d/collector/dnsquery/init.go similarity index 100% rename from src/go/plugin/go.d/modules/dnsquery/init.go rename to src/go/plugin/go.d/collector/dnsquery/init.go diff --git a/src/go/plugin/go.d/modules/dnsquery/integrations/dns_query.md b/src/go/plugin/go.d/collector/dnsquery/integrations/dns_query.md similarity index 100% rename from src/go/plugin/go.d/modules/dnsquery/integrations/dns_query.md rename to src/go/plugin/go.d/collector/dnsquery/integrations/dns_query.md diff --git a/src/go/plugin/go.d/modules/dnsquery/metadata.yaml b/src/go/plugin/go.d/collector/dnsquery/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dnsquery/metadata.yaml rename to src/go/plugin/go.d/collector/dnsquery/metadata.yaml diff --git a/src/go/plugin/go.d/modules/dnsquery/testdata/config.json b/src/go/plugin/go.d/collector/dnsquery/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/dnsquery/testdata/config.json rename to src/go/plugin/go.d/collector/dnsquery/testdata/config.json diff --git a/src/go/plugin/go.d/modules/dnsquery/testdata/config.yaml b/src/go/plugin/go.d/collector/dnsquery/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dnsquery/testdata/config.yaml rename to src/go/plugin/go.d/collector/dnsquery/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/docker/README.md b/src/go/plugin/go.d/collector/docker/README.md similarity index 100% rename from src/go/plugin/go.d/modules/docker/README.md rename to src/go/plugin/go.d/collector/docker/README.md diff --git a/src/go/plugin/go.d/modules/docker/charts.go b/src/go/plugin/go.d/collector/docker/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/docker/charts.go rename to src/go/plugin/go.d/collector/docker/charts.go diff --git a/src/go/plugin/go.d/modules/docker/collect.go b/src/go/plugin/go.d/collector/docker/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/docker/collect.go rename to src/go/plugin/go.d/collector/docker/collect.go diff --git a/src/go/plugin/go.d/modules/docker/config_schema.json b/src/go/plugin/go.d/collector/docker/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/docker/config_schema.json rename to src/go/plugin/go.d/collector/docker/config_schema.json diff --git a/src/go/plugin/go.d/modules/docker/docker.go b/src/go/plugin/go.d/collector/docker/docker.go similarity index 100% rename from src/go/plugin/go.d/modules/docker/docker.go rename to src/go/plugin/go.d/collector/docker/docker.go diff --git a/src/go/plugin/go.d/modules/docker/docker_test.go b/src/go/plugin/go.d/collector/docker/docker_test.go similarity index 100% rename from src/go/plugin/go.d/modules/docker/docker_test.go rename to src/go/plugin/go.d/collector/docker/docker_test.go diff --git a/src/go/plugin/go.d/modules/docker/integrations/docker.md b/src/go/plugin/go.d/collector/docker/integrations/docker.md similarity index 100% rename from src/go/plugin/go.d/modules/docker/integrations/docker.md rename to src/go/plugin/go.d/collector/docker/integrations/docker.md diff --git a/src/go/plugin/go.d/modules/docker/metadata.yaml b/src/go/plugin/go.d/collector/docker/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/docker/metadata.yaml rename to src/go/plugin/go.d/collector/docker/metadata.yaml diff --git a/src/go/plugin/go.d/modules/docker/testdata/config.json b/src/go/plugin/go.d/collector/docker/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/docker/testdata/config.json rename to src/go/plugin/go.d/collector/docker/testdata/config.json diff --git a/src/go/plugin/go.d/modules/docker/testdata/config.yaml b/src/go/plugin/go.d/collector/docker/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/docker/testdata/config.yaml rename to src/go/plugin/go.d/collector/docker/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/docker_engine/README.md b/src/go/plugin/go.d/collector/docker_engine/README.md similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/README.md rename to src/go/plugin/go.d/collector/docker_engine/README.md diff --git a/src/go/plugin/go.d/modules/docker_engine/charts.go b/src/go/plugin/go.d/collector/docker_engine/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/charts.go rename to src/go/plugin/go.d/collector/docker_engine/charts.go diff --git a/src/go/plugin/go.d/modules/docker_engine/collect.go b/src/go/plugin/go.d/collector/docker_engine/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/collect.go rename to src/go/plugin/go.d/collector/docker_engine/collect.go diff --git a/src/go/plugin/go.d/modules/docker_engine/config_schema.json b/src/go/plugin/go.d/collector/docker_engine/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/config_schema.json rename to src/go/plugin/go.d/collector/docker_engine/config_schema.json diff --git a/src/go/plugin/go.d/modules/docker_engine/docker_engine.go b/src/go/plugin/go.d/collector/docker_engine/docker_engine.go similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/docker_engine.go rename to src/go/plugin/go.d/collector/docker_engine/docker_engine.go diff --git a/src/go/plugin/go.d/modules/docker_engine/docker_engine_test.go b/src/go/plugin/go.d/collector/docker_engine/docker_engine_test.go similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/docker_engine_test.go rename to src/go/plugin/go.d/collector/docker_engine/docker_engine_test.go diff --git a/src/go/plugin/go.d/modules/docker_engine/init.go b/src/go/plugin/go.d/collector/docker_engine/init.go similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/init.go rename to src/go/plugin/go.d/collector/docker_engine/init.go diff --git a/src/go/plugin/go.d/modules/docker_engine/integrations/docker_engine.md b/src/go/plugin/go.d/collector/docker_engine/integrations/docker_engine.md similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/integrations/docker_engine.md rename to src/go/plugin/go.d/collector/docker_engine/integrations/docker_engine.md diff --git a/src/go/plugin/go.d/modules/docker_engine/metadata.yaml b/src/go/plugin/go.d/collector/docker_engine/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/metadata.yaml rename to src/go/plugin/go.d/collector/docker_engine/metadata.yaml diff --git a/src/go/plugin/go.d/modules/docker_engine/metrics.go b/src/go/plugin/go.d/collector/docker_engine/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/metrics.go rename to src/go/plugin/go.d/collector/docker_engine/metrics.go diff --git a/src/go/plugin/go.d/modules/docker_engine/testdata/config.json b/src/go/plugin/go.d/collector/docker_engine/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/testdata/config.json rename to src/go/plugin/go.d/collector/docker_engine/testdata/config.json diff --git a/src/go/plugin/go.d/modules/docker_engine/testdata/config.yaml b/src/go/plugin/go.d/collector/docker_engine/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/testdata/config.yaml rename to src/go/plugin/go.d/collector/docker_engine/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/docker_engine/testdata/non-docker-engine.txt b/src/go/plugin/go.d/collector/docker_engine/testdata/non-docker-engine.txt similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/testdata/non-docker-engine.txt rename to src/go/plugin/go.d/collector/docker_engine/testdata/non-docker-engine.txt diff --git a/src/go/plugin/go.d/modules/docker_engine/testdata/v17.05.0-ce.txt b/src/go/plugin/go.d/collector/docker_engine/testdata/v17.05.0-ce.txt similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/testdata/v17.05.0-ce.txt rename to src/go/plugin/go.d/collector/docker_engine/testdata/v17.05.0-ce.txt diff --git a/src/go/plugin/go.d/modules/docker_engine/testdata/v18.09.3-ce-swarm.txt b/src/go/plugin/go.d/collector/docker_engine/testdata/v18.09.3-ce-swarm.txt similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/testdata/v18.09.3-ce-swarm.txt rename to src/go/plugin/go.d/collector/docker_engine/testdata/v18.09.3-ce-swarm.txt diff --git a/src/go/plugin/go.d/modules/docker_engine/testdata/v18.09.3-ce.txt b/src/go/plugin/go.d/collector/docker_engine/testdata/v18.09.3-ce.txt similarity index 100% rename from src/go/plugin/go.d/modules/docker_engine/testdata/v18.09.3-ce.txt rename to src/go/plugin/go.d/collector/docker_engine/testdata/v18.09.3-ce.txt diff --git a/src/go/plugin/go.d/modules/dockerhub/README.md b/src/go/plugin/go.d/collector/dockerhub/README.md similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/README.md rename to src/go/plugin/go.d/collector/dockerhub/README.md diff --git a/src/go/plugin/go.d/modules/dockerhub/apiclient.go b/src/go/plugin/go.d/collector/dockerhub/apiclient.go similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/apiclient.go rename to src/go/plugin/go.d/collector/dockerhub/apiclient.go diff --git a/src/go/plugin/go.d/modules/dockerhub/charts.go b/src/go/plugin/go.d/collector/dockerhub/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/charts.go rename to src/go/plugin/go.d/collector/dockerhub/charts.go diff --git a/src/go/plugin/go.d/modules/dockerhub/collect.go b/src/go/plugin/go.d/collector/dockerhub/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/collect.go rename to src/go/plugin/go.d/collector/dockerhub/collect.go diff --git a/src/go/plugin/go.d/modules/dockerhub/config_schema.json b/src/go/plugin/go.d/collector/dockerhub/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/config_schema.json rename to src/go/plugin/go.d/collector/dockerhub/config_schema.json diff --git a/src/go/plugin/go.d/modules/dockerhub/dockerhub.go b/src/go/plugin/go.d/collector/dockerhub/dockerhub.go similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/dockerhub.go rename to src/go/plugin/go.d/collector/dockerhub/dockerhub.go diff --git a/src/go/plugin/go.d/modules/dockerhub/dockerhub_test.go b/src/go/plugin/go.d/collector/dockerhub/dockerhub_test.go similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/dockerhub_test.go rename to src/go/plugin/go.d/collector/dockerhub/dockerhub_test.go diff --git a/src/go/plugin/go.d/modules/dockerhub/init.go b/src/go/plugin/go.d/collector/dockerhub/init.go similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/init.go rename to src/go/plugin/go.d/collector/dockerhub/init.go diff --git a/src/go/plugin/go.d/modules/dockerhub/integrations/docker_hub_repository.md b/src/go/plugin/go.d/collector/dockerhub/integrations/docker_hub_repository.md similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/integrations/docker_hub_repository.md rename to src/go/plugin/go.d/collector/dockerhub/integrations/docker_hub_repository.md diff --git a/src/go/plugin/go.d/modules/dockerhub/metadata.yaml b/src/go/plugin/go.d/collector/dockerhub/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/metadata.yaml rename to src/go/plugin/go.d/collector/dockerhub/metadata.yaml diff --git a/src/go/plugin/go.d/modules/dockerhub/testdata/config.json b/src/go/plugin/go.d/collector/dockerhub/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/testdata/config.json rename to src/go/plugin/go.d/collector/dockerhub/testdata/config.json diff --git a/src/go/plugin/go.d/modules/dockerhub/testdata/config.yaml b/src/go/plugin/go.d/collector/dockerhub/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/testdata/config.yaml rename to src/go/plugin/go.d/collector/dockerhub/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/dockerhub/testdata/repo1.txt b/src/go/plugin/go.d/collector/dockerhub/testdata/repo1.txt similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/testdata/repo1.txt rename to src/go/plugin/go.d/collector/dockerhub/testdata/repo1.txt diff --git a/src/go/plugin/go.d/modules/dockerhub/testdata/repo2.txt b/src/go/plugin/go.d/collector/dockerhub/testdata/repo2.txt similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/testdata/repo2.txt rename to src/go/plugin/go.d/collector/dockerhub/testdata/repo2.txt diff --git a/src/go/plugin/go.d/modules/dockerhub/testdata/repo3.txt b/src/go/plugin/go.d/collector/dockerhub/testdata/repo3.txt similarity index 100% rename from src/go/plugin/go.d/modules/dockerhub/testdata/repo3.txt rename to src/go/plugin/go.d/collector/dockerhub/testdata/repo3.txt diff --git a/src/go/plugin/go.d/modules/dovecot/README.md b/src/go/plugin/go.d/collector/dovecot/README.md similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/README.md rename to src/go/plugin/go.d/collector/dovecot/README.md diff --git a/src/go/plugin/go.d/modules/dovecot/charts.go b/src/go/plugin/go.d/collector/dovecot/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/charts.go rename to src/go/plugin/go.d/collector/dovecot/charts.go diff --git a/src/go/plugin/go.d/modules/dovecot/client.go b/src/go/plugin/go.d/collector/dovecot/client.go similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/client.go rename to src/go/plugin/go.d/collector/dovecot/client.go diff --git a/src/go/plugin/go.d/modules/dovecot/collect.go b/src/go/plugin/go.d/collector/dovecot/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/collect.go rename to src/go/plugin/go.d/collector/dovecot/collect.go diff --git a/src/go/plugin/go.d/modules/dovecot/config_schema.json b/src/go/plugin/go.d/collector/dovecot/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/config_schema.json rename to src/go/plugin/go.d/collector/dovecot/config_schema.json diff --git a/src/go/plugin/go.d/modules/dovecot/dovecot.go b/src/go/plugin/go.d/collector/dovecot/dovecot.go similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/dovecot.go rename to src/go/plugin/go.d/collector/dovecot/dovecot.go diff --git a/src/go/plugin/go.d/modules/dovecot/dovecot_test.go b/src/go/plugin/go.d/collector/dovecot/dovecot_test.go similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/dovecot_test.go rename to src/go/plugin/go.d/collector/dovecot/dovecot_test.go diff --git a/src/go/plugin/go.d/modules/dovecot/integrations/dovecot.md b/src/go/plugin/go.d/collector/dovecot/integrations/dovecot.md similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/integrations/dovecot.md rename to src/go/plugin/go.d/collector/dovecot/integrations/dovecot.md diff --git a/src/go/plugin/go.d/modules/dovecot/metadata.yaml b/src/go/plugin/go.d/collector/dovecot/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/metadata.yaml rename to src/go/plugin/go.d/collector/dovecot/metadata.yaml diff --git a/src/go/plugin/go.d/modules/dovecot/testdata/config.json b/src/go/plugin/go.d/collector/dovecot/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/testdata/config.json rename to src/go/plugin/go.d/collector/dovecot/testdata/config.json diff --git a/src/go/plugin/go.d/modules/dovecot/testdata/config.yaml b/src/go/plugin/go.d/collector/dovecot/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/testdata/config.yaml rename to src/go/plugin/go.d/collector/dovecot/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/dovecot/testdata/export_global.txt b/src/go/plugin/go.d/collector/dovecot/testdata/export_global.txt similarity index 100% rename from src/go/plugin/go.d/modules/dovecot/testdata/export_global.txt rename to src/go/plugin/go.d/collector/dovecot/testdata/export_global.txt diff --git a/src/go/plugin/go.d/modules/elasticsearch/README.md b/src/go/plugin/go.d/collector/elasticsearch/README.md similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/README.md rename to src/go/plugin/go.d/collector/elasticsearch/README.md diff --git a/src/go/plugin/go.d/modules/elasticsearch/charts.go b/src/go/plugin/go.d/collector/elasticsearch/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/charts.go rename to src/go/plugin/go.d/collector/elasticsearch/charts.go diff --git a/src/go/plugin/go.d/modules/elasticsearch/collect.go b/src/go/plugin/go.d/collector/elasticsearch/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/collect.go rename to src/go/plugin/go.d/collector/elasticsearch/collect.go diff --git a/src/go/plugin/go.d/modules/elasticsearch/config_schema.json b/src/go/plugin/go.d/collector/elasticsearch/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/config_schema.json rename to src/go/plugin/go.d/collector/elasticsearch/config_schema.json diff --git a/src/go/plugin/go.d/modules/elasticsearch/elasticsearch.go b/src/go/plugin/go.d/collector/elasticsearch/elasticsearch.go similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/elasticsearch.go rename to src/go/plugin/go.d/collector/elasticsearch/elasticsearch.go diff --git a/src/go/plugin/go.d/modules/elasticsearch/elasticsearch_test.go b/src/go/plugin/go.d/collector/elasticsearch/elasticsearch_test.go similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/elasticsearch_test.go rename to src/go/plugin/go.d/collector/elasticsearch/elasticsearch_test.go diff --git a/src/go/plugin/go.d/modules/elasticsearch/init.go b/src/go/plugin/go.d/collector/elasticsearch/init.go similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/init.go rename to src/go/plugin/go.d/collector/elasticsearch/init.go diff --git a/src/go/plugin/go.d/modules/elasticsearch/integrations/elasticsearch.md b/src/go/plugin/go.d/collector/elasticsearch/integrations/elasticsearch.md similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/integrations/elasticsearch.md rename to src/go/plugin/go.d/collector/elasticsearch/integrations/elasticsearch.md diff --git a/src/go/plugin/go.d/modules/elasticsearch/integrations/opensearch.md b/src/go/plugin/go.d/collector/elasticsearch/integrations/opensearch.md similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/integrations/opensearch.md rename to src/go/plugin/go.d/collector/elasticsearch/integrations/opensearch.md diff --git a/src/go/plugin/go.d/modules/elasticsearch/metadata.yaml b/src/go/plugin/go.d/collector/elasticsearch/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/metadata.yaml rename to src/go/plugin/go.d/collector/elasticsearch/metadata.yaml diff --git a/src/go/plugin/go.d/modules/elasticsearch/metrics.go b/src/go/plugin/go.d/collector/elasticsearch/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/metrics.go rename to src/go/plugin/go.d/collector/elasticsearch/metrics.go diff --git a/src/go/plugin/go.d/modules/elasticsearch/testdata/config.json b/src/go/plugin/go.d/collector/elasticsearch/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/testdata/config.json rename to src/go/plugin/go.d/collector/elasticsearch/testdata/config.json diff --git a/src/go/plugin/go.d/modules/elasticsearch/testdata/config.yaml b/src/go/plugin/go.d/collector/elasticsearch/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/testdata/config.yaml rename to src/go/plugin/go.d/collector/elasticsearch/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/cat_indices_stats.json b/src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/cat_indices_stats.json similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/cat_indices_stats.json rename to src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/cat_indices_stats.json diff --git a/src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/cluster_health.json b/src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/cluster_health.json similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/cluster_health.json rename to src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/cluster_health.json diff --git a/src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/cluster_stats.json b/src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/cluster_stats.json similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/cluster_stats.json rename to src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/cluster_stats.json diff --git a/src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/info.json b/src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/info.json similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/info.json rename to src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/info.json diff --git a/src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/nodes_local_stats.json b/src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/nodes_local_stats.json similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/nodes_local_stats.json rename to src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/nodes_local_stats.json diff --git a/src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/nodes_stats.json b/src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/nodes_stats.json similarity index 100% rename from src/go/plugin/go.d/modules/elasticsearch/testdata/v8.4.2/nodes_stats.json rename to src/go/plugin/go.d/collector/elasticsearch/testdata/v8.4.2/nodes_stats.json diff --git a/src/go/plugin/go.d/modules/envoy/README.md b/src/go/plugin/go.d/collector/envoy/README.md similarity index 100% rename from src/go/plugin/go.d/modules/envoy/README.md rename to src/go/plugin/go.d/collector/envoy/README.md diff --git a/src/go/plugin/go.d/modules/envoy/charts.go b/src/go/plugin/go.d/collector/envoy/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/envoy/charts.go rename to src/go/plugin/go.d/collector/envoy/charts.go diff --git a/src/go/plugin/go.d/modules/envoy/collect.go b/src/go/plugin/go.d/collector/envoy/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/envoy/collect.go rename to src/go/plugin/go.d/collector/envoy/collect.go diff --git a/src/go/plugin/go.d/modules/envoy/config_schema.json b/src/go/plugin/go.d/collector/envoy/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/envoy/config_schema.json rename to src/go/plugin/go.d/collector/envoy/config_schema.json diff --git a/src/go/plugin/go.d/modules/envoy/envoy.go b/src/go/plugin/go.d/collector/envoy/envoy.go similarity index 100% rename from src/go/plugin/go.d/modules/envoy/envoy.go rename to src/go/plugin/go.d/collector/envoy/envoy.go diff --git a/src/go/plugin/go.d/modules/envoy/envoy_test.go b/src/go/plugin/go.d/collector/envoy/envoy_test.go similarity index 100% rename from src/go/plugin/go.d/modules/envoy/envoy_test.go rename to src/go/plugin/go.d/collector/envoy/envoy_test.go diff --git a/src/go/plugin/go.d/modules/envoy/init.go b/src/go/plugin/go.d/collector/envoy/init.go similarity index 100% rename from src/go/plugin/go.d/modules/envoy/init.go rename to src/go/plugin/go.d/collector/envoy/init.go diff --git a/src/go/plugin/go.d/modules/envoy/integrations/envoy.md b/src/go/plugin/go.d/collector/envoy/integrations/envoy.md similarity index 100% rename from src/go/plugin/go.d/modules/envoy/integrations/envoy.md rename to src/go/plugin/go.d/collector/envoy/integrations/envoy.md diff --git a/src/go/plugin/go.d/modules/envoy/metadata.yaml b/src/go/plugin/go.d/collector/envoy/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/envoy/metadata.yaml rename to src/go/plugin/go.d/collector/envoy/metadata.yaml diff --git a/src/go/plugin/go.d/modules/envoy/testdata/config.json b/src/go/plugin/go.d/collector/envoy/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/envoy/testdata/config.json rename to src/go/plugin/go.d/collector/envoy/testdata/config.json diff --git a/src/go/plugin/go.d/modules/envoy/testdata/config.yaml b/src/go/plugin/go.d/collector/envoy/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/envoy/testdata/config.yaml rename to src/go/plugin/go.d/collector/envoy/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/envoy/testdata/consul-dataplane.txt b/src/go/plugin/go.d/collector/envoy/testdata/consul-dataplane.txt similarity index 100% rename from src/go/plugin/go.d/modules/envoy/testdata/consul-dataplane.txt rename to src/go/plugin/go.d/collector/envoy/testdata/consul-dataplane.txt diff --git a/src/go/plugin/go.d/modules/envoy/testdata/envoy.txt b/src/go/plugin/go.d/collector/envoy/testdata/envoy.txt similarity index 100% rename from src/go/plugin/go.d/modules/envoy/testdata/envoy.txt rename to src/go/plugin/go.d/collector/envoy/testdata/envoy.txt diff --git a/src/go/plugin/go.d/modules/exim/README.md b/src/go/plugin/go.d/collector/exim/README.md similarity index 100% rename from src/go/plugin/go.d/modules/exim/README.md rename to src/go/plugin/go.d/collector/exim/README.md diff --git a/src/go/plugin/go.d/modules/exim/charts.go b/src/go/plugin/go.d/collector/exim/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/exim/charts.go rename to src/go/plugin/go.d/collector/exim/charts.go diff --git a/src/go/plugin/go.d/modules/exim/collect.go b/src/go/plugin/go.d/collector/exim/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/exim/collect.go rename to src/go/plugin/go.d/collector/exim/collect.go diff --git a/src/go/plugin/go.d/modules/exim/config_schema.json b/src/go/plugin/go.d/collector/exim/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/exim/config_schema.json rename to src/go/plugin/go.d/collector/exim/config_schema.json diff --git a/src/go/plugin/go.d/modules/exim/exec.go b/src/go/plugin/go.d/collector/exim/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/exim/exec.go rename to src/go/plugin/go.d/collector/exim/exec.go diff --git a/src/go/plugin/go.d/modules/exim/exim.go b/src/go/plugin/go.d/collector/exim/exim.go similarity index 100% rename from src/go/plugin/go.d/modules/exim/exim.go rename to src/go/plugin/go.d/collector/exim/exim.go diff --git a/src/go/plugin/go.d/modules/exim/exim_test.go b/src/go/plugin/go.d/collector/exim/exim_test.go similarity index 100% rename from src/go/plugin/go.d/modules/exim/exim_test.go rename to src/go/plugin/go.d/collector/exim/exim_test.go diff --git a/src/go/plugin/go.d/modules/exim/init.go b/src/go/plugin/go.d/collector/exim/init.go similarity index 100% rename from src/go/plugin/go.d/modules/exim/init.go rename to src/go/plugin/go.d/collector/exim/init.go diff --git a/src/go/plugin/go.d/modules/exim/integrations/exim.md b/src/go/plugin/go.d/collector/exim/integrations/exim.md similarity index 100% rename from src/go/plugin/go.d/modules/exim/integrations/exim.md rename to src/go/plugin/go.d/collector/exim/integrations/exim.md diff --git a/src/go/plugin/go.d/modules/exim/metadata.yaml b/src/go/plugin/go.d/collector/exim/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/exim/metadata.yaml rename to src/go/plugin/go.d/collector/exim/metadata.yaml diff --git a/src/go/plugin/go.d/modules/exim/testdata/config.json b/src/go/plugin/go.d/collector/exim/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/exim/testdata/config.json rename to src/go/plugin/go.d/collector/exim/testdata/config.json diff --git a/src/go/plugin/go.d/modules/exim/testdata/config.yaml b/src/go/plugin/go.d/collector/exim/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/exim/testdata/config.yaml rename to src/go/plugin/go.d/collector/exim/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/fail2ban/README.md b/src/go/plugin/go.d/collector/fail2ban/README.md similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/README.md rename to src/go/plugin/go.d/collector/fail2ban/README.md diff --git a/src/go/plugin/go.d/modules/fail2ban/charts.go b/src/go/plugin/go.d/collector/fail2ban/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/charts.go rename to src/go/plugin/go.d/collector/fail2ban/charts.go diff --git a/src/go/plugin/go.d/modules/fail2ban/collect.go b/src/go/plugin/go.d/collector/fail2ban/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/collect.go rename to src/go/plugin/go.d/collector/fail2ban/collect.go diff --git a/src/go/plugin/go.d/modules/fail2ban/config_schema.json b/src/go/plugin/go.d/collector/fail2ban/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/config_schema.json rename to src/go/plugin/go.d/collector/fail2ban/config_schema.json diff --git a/src/go/plugin/go.d/modules/fail2ban/doc.go b/src/go/plugin/go.d/collector/fail2ban/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/doc.go rename to src/go/plugin/go.d/collector/fail2ban/doc.go diff --git a/src/go/plugin/go.d/modules/fail2ban/exec.go b/src/go/plugin/go.d/collector/fail2ban/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/exec.go rename to src/go/plugin/go.d/collector/fail2ban/exec.go diff --git a/src/go/plugin/go.d/modules/fail2ban/fail2ban.go b/src/go/plugin/go.d/collector/fail2ban/fail2ban.go similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/fail2ban.go rename to src/go/plugin/go.d/collector/fail2ban/fail2ban.go diff --git a/src/go/plugin/go.d/modules/fail2ban/fail2ban_test.go b/src/go/plugin/go.d/collector/fail2ban/fail2ban_test.go similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/fail2ban_test.go rename to src/go/plugin/go.d/collector/fail2ban/fail2ban_test.go diff --git a/src/go/plugin/go.d/modules/fail2ban/init.go b/src/go/plugin/go.d/collector/fail2ban/init.go similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/init.go rename to src/go/plugin/go.d/collector/fail2ban/init.go diff --git a/src/go/plugin/go.d/modules/fail2ban/integrations/fail2ban.md b/src/go/plugin/go.d/collector/fail2ban/integrations/fail2ban.md similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/integrations/fail2ban.md rename to src/go/plugin/go.d/collector/fail2ban/integrations/fail2ban.md diff --git a/src/go/plugin/go.d/modules/fail2ban/metadata.yaml b/src/go/plugin/go.d/collector/fail2ban/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/metadata.yaml rename to src/go/plugin/go.d/collector/fail2ban/metadata.yaml diff --git a/src/go/plugin/go.d/modules/fail2ban/testdata/config.json b/src/go/plugin/go.d/collector/fail2ban/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/testdata/config.json rename to src/go/plugin/go.d/collector/fail2ban/testdata/config.json diff --git a/src/go/plugin/go.d/modules/fail2ban/testdata/config.yaml b/src/go/plugin/go.d/collector/fail2ban/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/testdata/config.yaml rename to src/go/plugin/go.d/collector/fail2ban/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/fail2ban/testdata/fail2ban-jail-status.txt b/src/go/plugin/go.d/collector/fail2ban/testdata/fail2ban-jail-status.txt similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/testdata/fail2ban-jail-status.txt rename to src/go/plugin/go.d/collector/fail2ban/testdata/fail2ban-jail-status.txt diff --git a/src/go/plugin/go.d/modules/fail2ban/testdata/fail2ban-status.txt b/src/go/plugin/go.d/collector/fail2ban/testdata/fail2ban-status.txt similarity index 100% rename from src/go/plugin/go.d/modules/fail2ban/testdata/fail2ban-status.txt rename to src/go/plugin/go.d/collector/fail2ban/testdata/fail2ban-status.txt diff --git a/src/go/plugin/go.d/modules/filecheck/README.md b/src/go/plugin/go.d/collector/filecheck/README.md similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/README.md rename to src/go/plugin/go.d/collector/filecheck/README.md diff --git a/src/go/plugin/go.d/modules/filecheck/cache.go b/src/go/plugin/go.d/collector/filecheck/cache.go similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/cache.go rename to src/go/plugin/go.d/collector/filecheck/cache.go diff --git a/src/go/plugin/go.d/modules/filecheck/charts.go b/src/go/plugin/go.d/collector/filecheck/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/charts.go rename to src/go/plugin/go.d/collector/filecheck/charts.go diff --git a/src/go/plugin/go.d/modules/filecheck/collect.go b/src/go/plugin/go.d/collector/filecheck/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/collect.go rename to src/go/plugin/go.d/collector/filecheck/collect.go diff --git a/src/go/plugin/go.d/modules/filecheck/collect_dirs.go b/src/go/plugin/go.d/collector/filecheck/collect_dirs.go similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/collect_dirs.go rename to src/go/plugin/go.d/collector/filecheck/collect_dirs.go diff --git a/src/go/plugin/go.d/modules/filecheck/collect_files.go b/src/go/plugin/go.d/collector/filecheck/collect_files.go similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/collect_files.go rename to src/go/plugin/go.d/collector/filecheck/collect_files.go diff --git a/src/go/plugin/go.d/modules/filecheck/config_schema.json b/src/go/plugin/go.d/collector/filecheck/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/config_schema.json rename to src/go/plugin/go.d/collector/filecheck/config_schema.json diff --git a/src/go/plugin/go.d/modules/filecheck/discover.go b/src/go/plugin/go.d/collector/filecheck/discover.go similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/discover.go rename to src/go/plugin/go.d/collector/filecheck/discover.go diff --git a/src/go/plugin/go.d/modules/filecheck/filecheck.go b/src/go/plugin/go.d/collector/filecheck/filecheck.go similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/filecheck.go rename to src/go/plugin/go.d/collector/filecheck/filecheck.go diff --git a/src/go/plugin/go.d/modules/filecheck/filecheck_test.go b/src/go/plugin/go.d/collector/filecheck/filecheck_test.go similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/filecheck_test.go rename to src/go/plugin/go.d/collector/filecheck/filecheck_test.go diff --git a/src/go/plugin/go.d/modules/filecheck/init.go b/src/go/plugin/go.d/collector/filecheck/init.go similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/init.go rename to src/go/plugin/go.d/collector/filecheck/init.go diff --git a/src/go/plugin/go.d/modules/filecheck/integrations/files_and_directories.md b/src/go/plugin/go.d/collector/filecheck/integrations/files_and_directories.md similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/integrations/files_and_directories.md rename to src/go/plugin/go.d/collector/filecheck/integrations/files_and_directories.md diff --git a/src/go/plugin/go.d/modules/filecheck/metadata.yaml b/src/go/plugin/go.d/collector/filecheck/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/metadata.yaml rename to src/go/plugin/go.d/collector/filecheck/metadata.yaml diff --git a/src/go/plugin/go.d/modules/filecheck/testdata/config.json b/src/go/plugin/go.d/collector/filecheck/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/testdata/config.json rename to src/go/plugin/go.d/collector/filecheck/testdata/config.json diff --git a/src/go/plugin/go.d/modules/filecheck/testdata/config.yaml b/src/go/plugin/go.d/collector/filecheck/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/testdata/config.yaml rename to src/go/plugin/go.d/collector/filecheck/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/filecheck/testdata/dir/empty_file.log b/src/go/plugin/go.d/collector/filecheck/testdata/dir/empty_file.log similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/testdata/dir/empty_file.log rename to src/go/plugin/go.d/collector/filecheck/testdata/dir/empty_file.log diff --git a/src/go/plugin/go.d/modules/filecheck/testdata/dir/file.log b/src/go/plugin/go.d/collector/filecheck/testdata/dir/file.log similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/testdata/dir/file.log rename to src/go/plugin/go.d/collector/filecheck/testdata/dir/file.log diff --git a/src/go/plugin/go.d/modules/filecheck/testdata/dir/subdir/empty_file.log b/src/go/plugin/go.d/collector/filecheck/testdata/dir/subdir/empty_file.log similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/testdata/dir/subdir/empty_file.log rename to src/go/plugin/go.d/collector/filecheck/testdata/dir/subdir/empty_file.log diff --git a/src/go/plugin/go.d/modules/filecheck/testdata/empty_file.log b/src/go/plugin/go.d/collector/filecheck/testdata/empty_file.log similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/testdata/empty_file.log rename to src/go/plugin/go.d/collector/filecheck/testdata/empty_file.log diff --git a/src/go/plugin/go.d/modules/filecheck/testdata/file.log b/src/go/plugin/go.d/collector/filecheck/testdata/file.log similarity index 100% rename from src/go/plugin/go.d/modules/filecheck/testdata/file.log rename to src/go/plugin/go.d/collector/filecheck/testdata/file.log diff --git a/src/go/plugin/go.d/modules/fluentd/README.md b/src/go/plugin/go.d/collector/fluentd/README.md similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/README.md rename to src/go/plugin/go.d/collector/fluentd/README.md diff --git a/src/go/plugin/go.d/modules/fluentd/apiclient.go b/src/go/plugin/go.d/collector/fluentd/apiclient.go similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/apiclient.go rename to src/go/plugin/go.d/collector/fluentd/apiclient.go diff --git a/src/go/plugin/go.d/modules/fluentd/charts.go b/src/go/plugin/go.d/collector/fluentd/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/charts.go rename to src/go/plugin/go.d/collector/fluentd/charts.go diff --git a/src/go/plugin/go.d/modules/fluentd/collect.go b/src/go/plugin/go.d/collector/fluentd/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/collect.go rename to src/go/plugin/go.d/collector/fluentd/collect.go diff --git a/src/go/plugin/go.d/modules/fluentd/config_schema.json b/src/go/plugin/go.d/collector/fluentd/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/config_schema.json rename to src/go/plugin/go.d/collector/fluentd/config_schema.json diff --git a/src/go/plugin/go.d/modules/fluentd/fluentd.go b/src/go/plugin/go.d/collector/fluentd/fluentd.go similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/fluentd.go rename to src/go/plugin/go.d/collector/fluentd/fluentd.go diff --git a/src/go/plugin/go.d/modules/fluentd/fluentd_test.go b/src/go/plugin/go.d/collector/fluentd/fluentd_test.go similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/fluentd_test.go rename to src/go/plugin/go.d/collector/fluentd/fluentd_test.go diff --git a/src/go/plugin/go.d/modules/fluentd/init.go b/src/go/plugin/go.d/collector/fluentd/init.go similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/init.go rename to src/go/plugin/go.d/collector/fluentd/init.go diff --git a/src/go/plugin/go.d/modules/fluentd/integrations/fluentd.md b/src/go/plugin/go.d/collector/fluentd/integrations/fluentd.md similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/integrations/fluentd.md rename to src/go/plugin/go.d/collector/fluentd/integrations/fluentd.md diff --git a/src/go/plugin/go.d/modules/fluentd/metadata.yaml b/src/go/plugin/go.d/collector/fluentd/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/metadata.yaml rename to src/go/plugin/go.d/collector/fluentd/metadata.yaml diff --git a/src/go/plugin/go.d/modules/fluentd/testdata/config.json b/src/go/plugin/go.d/collector/fluentd/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/testdata/config.json rename to src/go/plugin/go.d/collector/fluentd/testdata/config.json diff --git a/src/go/plugin/go.d/modules/fluentd/testdata/config.yaml b/src/go/plugin/go.d/collector/fluentd/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/testdata/config.yaml rename to src/go/plugin/go.d/collector/fluentd/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/fluentd/testdata/plugins.json b/src/go/plugin/go.d/collector/fluentd/testdata/plugins.json similarity index 100% rename from src/go/plugin/go.d/modules/fluentd/testdata/plugins.json rename to src/go/plugin/go.d/collector/fluentd/testdata/plugins.json diff --git a/src/go/plugin/go.d/modules/freeradius/README.md b/src/go/plugin/go.d/collector/freeradius/README.md similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/README.md rename to src/go/plugin/go.d/collector/freeradius/README.md diff --git a/src/go/plugin/go.d/modules/freeradius/api/client.go b/src/go/plugin/go.d/collector/freeradius/api/client.go similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/api/client.go rename to src/go/plugin/go.d/collector/freeradius/api/client.go diff --git a/src/go/plugin/go.d/modules/freeradius/api/client_test.go b/src/go/plugin/go.d/collector/freeradius/api/client_test.go similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/api/client_test.go rename to src/go/plugin/go.d/collector/freeradius/api/client_test.go diff --git a/src/go/plugin/go.d/modules/freeradius/api/dictionary.go b/src/go/plugin/go.d/collector/freeradius/api/dictionary.go similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/api/dictionary.go rename to src/go/plugin/go.d/collector/freeradius/api/dictionary.go diff --git a/src/go/plugin/go.d/modules/freeradius/charts.go b/src/go/plugin/go.d/collector/freeradius/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/charts.go rename to src/go/plugin/go.d/collector/freeradius/charts.go diff --git a/src/go/plugin/go.d/modules/freeradius/collect.go b/src/go/plugin/go.d/collector/freeradius/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/collect.go rename to src/go/plugin/go.d/collector/freeradius/collect.go diff --git a/src/go/plugin/go.d/modules/freeradius/config_schema.json b/src/go/plugin/go.d/collector/freeradius/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/config_schema.json rename to src/go/plugin/go.d/collector/freeradius/config_schema.json diff --git a/src/go/plugin/go.d/modules/freeradius/freeradius.go b/src/go/plugin/go.d/collector/freeradius/freeradius.go similarity index 96% rename from src/go/plugin/go.d/modules/freeradius/freeradius.go rename to src/go/plugin/go.d/collector/freeradius/freeradius.go index 46aa0619570441..55575527f5a5cd 100644 --- a/src/go/plugin/go.d/modules/freeradius/freeradius.go +++ b/src/go/plugin/go.d/collector/freeradius/freeradius.go @@ -9,7 +9,7 @@ import ( "time" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/freeradius/api" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/freeradius/api" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt" ) diff --git a/src/go/plugin/go.d/modules/freeradius/freeradius_test.go b/src/go/plugin/go.d/collector/freeradius/freeradius_test.go similarity index 98% rename from src/go/plugin/go.d/modules/freeradius/freeradius_test.go rename to src/go/plugin/go.d/collector/freeradius/freeradius_test.go index 21ad25517afeb2..324bb11d83b6ea 100644 --- a/src/go/plugin/go.d/modules/freeradius/freeradius_test.go +++ b/src/go/plugin/go.d/collector/freeradius/freeradius_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/freeradius/api" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/freeradius/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/go/plugin/go.d/modules/freeradius/init.go b/src/go/plugin/go.d/collector/freeradius/init.go similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/init.go rename to src/go/plugin/go.d/collector/freeradius/init.go diff --git a/src/go/plugin/go.d/modules/freeradius/integrations/freeradius.md b/src/go/plugin/go.d/collector/freeradius/integrations/freeradius.md similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/integrations/freeradius.md rename to src/go/plugin/go.d/collector/freeradius/integrations/freeradius.md diff --git a/src/go/plugin/go.d/modules/freeradius/metadata.yaml b/src/go/plugin/go.d/collector/freeradius/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/metadata.yaml rename to src/go/plugin/go.d/collector/freeradius/metadata.yaml diff --git a/src/go/plugin/go.d/modules/freeradius/testdata/config.json b/src/go/plugin/go.d/collector/freeradius/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/testdata/config.json rename to src/go/plugin/go.d/collector/freeradius/testdata/config.json diff --git a/src/go/plugin/go.d/modules/freeradius/testdata/config.yaml b/src/go/plugin/go.d/collector/freeradius/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/freeradius/testdata/config.yaml rename to src/go/plugin/go.d/collector/freeradius/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/gearman/README.md b/src/go/plugin/go.d/collector/gearman/README.md similarity index 100% rename from src/go/plugin/go.d/modules/gearman/README.md rename to src/go/plugin/go.d/collector/gearman/README.md diff --git a/src/go/plugin/go.d/modules/gearman/charts.go b/src/go/plugin/go.d/collector/gearman/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/gearman/charts.go rename to src/go/plugin/go.d/collector/gearman/charts.go diff --git a/src/go/plugin/go.d/modules/gearman/client.go b/src/go/plugin/go.d/collector/gearman/client.go similarity index 100% rename from src/go/plugin/go.d/modules/gearman/client.go rename to src/go/plugin/go.d/collector/gearman/client.go diff --git a/src/go/plugin/go.d/modules/gearman/collect.go b/src/go/plugin/go.d/collector/gearman/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/gearman/collect.go rename to src/go/plugin/go.d/collector/gearman/collect.go diff --git a/src/go/plugin/go.d/modules/gearman/config_schema.json b/src/go/plugin/go.d/collector/gearman/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/gearman/config_schema.json rename to src/go/plugin/go.d/collector/gearman/config_schema.json diff --git a/src/go/plugin/go.d/modules/gearman/gearman.go b/src/go/plugin/go.d/collector/gearman/gearman.go similarity index 100% rename from src/go/plugin/go.d/modules/gearman/gearman.go rename to src/go/plugin/go.d/collector/gearman/gearman.go diff --git a/src/go/plugin/go.d/modules/gearman/gearman_test.go b/src/go/plugin/go.d/collector/gearman/gearman_test.go similarity index 100% rename from src/go/plugin/go.d/modules/gearman/gearman_test.go rename to src/go/plugin/go.d/collector/gearman/gearman_test.go diff --git a/src/go/plugin/go.d/modules/gearman/integrations/gearman.md b/src/go/plugin/go.d/collector/gearman/integrations/gearman.md similarity index 100% rename from src/go/plugin/go.d/modules/gearman/integrations/gearman.md rename to src/go/plugin/go.d/collector/gearman/integrations/gearman.md diff --git a/src/go/plugin/go.d/modules/gearman/metadata.yaml b/src/go/plugin/go.d/collector/gearman/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/gearman/metadata.yaml rename to src/go/plugin/go.d/collector/gearman/metadata.yaml diff --git a/src/go/plugin/go.d/modules/gearman/testdata/config.json b/src/go/plugin/go.d/collector/gearman/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/gearman/testdata/config.json rename to src/go/plugin/go.d/collector/gearman/testdata/config.json diff --git a/src/go/plugin/go.d/modules/gearman/testdata/config.yaml b/src/go/plugin/go.d/collector/gearman/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/gearman/testdata/config.yaml rename to src/go/plugin/go.d/collector/gearman/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/gearman/testdata/priority-status.txt b/src/go/plugin/go.d/collector/gearman/testdata/priority-status.txt similarity index 100% rename from src/go/plugin/go.d/modules/gearman/testdata/priority-status.txt rename to src/go/plugin/go.d/collector/gearman/testdata/priority-status.txt diff --git a/src/go/plugin/go.d/modules/gearman/testdata/status.txt b/src/go/plugin/go.d/collector/gearman/testdata/status.txt similarity index 100% rename from src/go/plugin/go.d/modules/gearman/testdata/status.txt rename to src/go/plugin/go.d/collector/gearman/testdata/status.txt diff --git a/src/go/plugin/go.d/modules/geth/README.md b/src/go/plugin/go.d/collector/geth/README.md similarity index 100% rename from src/go/plugin/go.d/modules/geth/README.md rename to src/go/plugin/go.d/collector/geth/README.md diff --git a/src/go/plugin/go.d/modules/geth/charts.go b/src/go/plugin/go.d/collector/geth/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/geth/charts.go rename to src/go/plugin/go.d/collector/geth/charts.go diff --git a/src/go/plugin/go.d/modules/geth/collect.go b/src/go/plugin/go.d/collector/geth/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/geth/collect.go rename to src/go/plugin/go.d/collector/geth/collect.go diff --git a/src/go/plugin/go.d/modules/geth/config_schema.json b/src/go/plugin/go.d/collector/geth/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/geth/config_schema.json rename to src/go/plugin/go.d/collector/geth/config_schema.json diff --git a/src/go/plugin/go.d/modules/geth/geth.go b/src/go/plugin/go.d/collector/geth/geth.go similarity index 100% rename from src/go/plugin/go.d/modules/geth/geth.go rename to src/go/plugin/go.d/collector/geth/geth.go diff --git a/src/go/plugin/go.d/modules/geth/geth_test.go b/src/go/plugin/go.d/collector/geth/geth_test.go similarity index 100% rename from src/go/plugin/go.d/modules/geth/geth_test.go rename to src/go/plugin/go.d/collector/geth/geth_test.go diff --git a/src/go/plugin/go.d/modules/geth/init.go b/src/go/plugin/go.d/collector/geth/init.go similarity index 100% rename from src/go/plugin/go.d/modules/geth/init.go rename to src/go/plugin/go.d/collector/geth/init.go diff --git a/src/go/plugin/go.d/modules/geth/integrations/go-ethereum.md b/src/go/plugin/go.d/collector/geth/integrations/go-ethereum.md similarity index 100% rename from src/go/plugin/go.d/modules/geth/integrations/go-ethereum.md rename to src/go/plugin/go.d/collector/geth/integrations/go-ethereum.md diff --git a/src/go/plugin/go.d/modules/geth/metadata.yaml b/src/go/plugin/go.d/collector/geth/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/geth/metadata.yaml rename to src/go/plugin/go.d/collector/geth/metadata.yaml diff --git a/src/go/plugin/go.d/modules/geth/metrics.go b/src/go/plugin/go.d/collector/geth/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/geth/metrics.go rename to src/go/plugin/go.d/collector/geth/metrics.go diff --git a/src/go/plugin/go.d/modules/geth/testdata/config.json b/src/go/plugin/go.d/collector/geth/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/geth/testdata/config.json rename to src/go/plugin/go.d/collector/geth/testdata/config.json diff --git a/src/go/plugin/go.d/modules/geth/testdata/config.yaml b/src/go/plugin/go.d/collector/geth/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/geth/testdata/config.yaml rename to src/go/plugin/go.d/collector/geth/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/geth/testdata/metrics_geth.txt b/src/go/plugin/go.d/collector/geth/testdata/metrics_geth.txt similarity index 100% rename from src/go/plugin/go.d/modules/geth/testdata/metrics_geth.txt rename to src/go/plugin/go.d/collector/geth/testdata/metrics_geth.txt diff --git a/src/go/plugin/go.d/modules/haproxy/README.md b/src/go/plugin/go.d/collector/haproxy/README.md similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/README.md rename to src/go/plugin/go.d/collector/haproxy/README.md diff --git a/src/go/plugin/go.d/modules/haproxy/charts.go b/src/go/plugin/go.d/collector/haproxy/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/charts.go rename to src/go/plugin/go.d/collector/haproxy/charts.go diff --git a/src/go/plugin/go.d/modules/haproxy/collect.go b/src/go/plugin/go.d/collector/haproxy/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/collect.go rename to src/go/plugin/go.d/collector/haproxy/collect.go diff --git a/src/go/plugin/go.d/modules/haproxy/config_schema.json b/src/go/plugin/go.d/collector/haproxy/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/config_schema.json rename to src/go/plugin/go.d/collector/haproxy/config_schema.json diff --git a/src/go/plugin/go.d/modules/haproxy/haproxy.go b/src/go/plugin/go.d/collector/haproxy/haproxy.go similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/haproxy.go rename to src/go/plugin/go.d/collector/haproxy/haproxy.go diff --git a/src/go/plugin/go.d/modules/haproxy/haproxy_test.go b/src/go/plugin/go.d/collector/haproxy/haproxy_test.go similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/haproxy_test.go rename to src/go/plugin/go.d/collector/haproxy/haproxy_test.go diff --git a/src/go/plugin/go.d/modules/haproxy/init.go b/src/go/plugin/go.d/collector/haproxy/init.go similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/init.go rename to src/go/plugin/go.d/collector/haproxy/init.go diff --git a/src/go/plugin/go.d/modules/haproxy/integrations/haproxy.md b/src/go/plugin/go.d/collector/haproxy/integrations/haproxy.md similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/integrations/haproxy.md rename to src/go/plugin/go.d/collector/haproxy/integrations/haproxy.md diff --git a/src/go/plugin/go.d/modules/haproxy/metadata.yaml b/src/go/plugin/go.d/collector/haproxy/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/metadata.yaml rename to src/go/plugin/go.d/collector/haproxy/metadata.yaml diff --git a/src/go/plugin/go.d/modules/haproxy/testdata/config.json b/src/go/plugin/go.d/collector/haproxy/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/testdata/config.json rename to src/go/plugin/go.d/collector/haproxy/testdata/config.json diff --git a/src/go/plugin/go.d/modules/haproxy/testdata/config.yaml b/src/go/plugin/go.d/collector/haproxy/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/testdata/config.yaml rename to src/go/plugin/go.d/collector/haproxy/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/haproxy/testdata/v2.3.10/metrics.txt b/src/go/plugin/go.d/collector/haproxy/testdata/v2.3.10/metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/haproxy/testdata/v2.3.10/metrics.txt rename to src/go/plugin/go.d/collector/haproxy/testdata/v2.3.10/metrics.txt diff --git a/src/go/plugin/go.d/modules/hddtemp/README.md b/src/go/plugin/go.d/collector/hddtemp/README.md similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/README.md rename to src/go/plugin/go.d/collector/hddtemp/README.md diff --git a/src/go/plugin/go.d/modules/hddtemp/charts.go b/src/go/plugin/go.d/collector/hddtemp/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/charts.go rename to src/go/plugin/go.d/collector/hddtemp/charts.go diff --git a/src/go/plugin/go.d/modules/hddtemp/client.go b/src/go/plugin/go.d/collector/hddtemp/client.go similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/client.go rename to src/go/plugin/go.d/collector/hddtemp/client.go diff --git a/src/go/plugin/go.d/modules/hddtemp/collect.go b/src/go/plugin/go.d/collector/hddtemp/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/collect.go rename to src/go/plugin/go.d/collector/hddtemp/collect.go diff --git a/src/go/plugin/go.d/modules/hddtemp/config_schema.json b/src/go/plugin/go.d/collector/hddtemp/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/config_schema.json rename to src/go/plugin/go.d/collector/hddtemp/config_schema.json diff --git a/src/go/plugin/go.d/modules/hddtemp/hddtemp.go b/src/go/plugin/go.d/collector/hddtemp/hddtemp.go similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/hddtemp.go rename to src/go/plugin/go.d/collector/hddtemp/hddtemp.go diff --git a/src/go/plugin/go.d/modules/hddtemp/hddtemp_test.go b/src/go/plugin/go.d/collector/hddtemp/hddtemp_test.go similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/hddtemp_test.go rename to src/go/plugin/go.d/collector/hddtemp/hddtemp_test.go diff --git a/src/go/plugin/go.d/modules/hddtemp/integrations/hdd_temperature.md b/src/go/plugin/go.d/collector/hddtemp/integrations/hdd_temperature.md similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/integrations/hdd_temperature.md rename to src/go/plugin/go.d/collector/hddtemp/integrations/hdd_temperature.md diff --git a/src/go/plugin/go.d/modules/hddtemp/metadata.yaml b/src/go/plugin/go.d/collector/hddtemp/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/metadata.yaml rename to src/go/plugin/go.d/collector/hddtemp/metadata.yaml diff --git a/src/go/plugin/go.d/modules/hddtemp/testdata/config.json b/src/go/plugin/go.d/collector/hddtemp/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/testdata/config.json rename to src/go/plugin/go.d/collector/hddtemp/testdata/config.json diff --git a/src/go/plugin/go.d/modules/hddtemp/testdata/config.yaml b/src/go/plugin/go.d/collector/hddtemp/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/testdata/config.yaml rename to src/go/plugin/go.d/collector/hddtemp/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/hddtemp/testdata/hddtemp-all-ok.txt b/src/go/plugin/go.d/collector/hddtemp/testdata/hddtemp-all-ok.txt similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/testdata/hddtemp-all-ok.txt rename to src/go/plugin/go.d/collector/hddtemp/testdata/hddtemp-all-ok.txt diff --git a/src/go/plugin/go.d/modules/hddtemp/testdata/hddtemp-all-sleep.txt b/src/go/plugin/go.d/collector/hddtemp/testdata/hddtemp-all-sleep.txt similarity index 100% rename from src/go/plugin/go.d/modules/hddtemp/testdata/hddtemp-all-sleep.txt rename to src/go/plugin/go.d/collector/hddtemp/testdata/hddtemp-all-sleep.txt diff --git a/src/go/plugin/go.d/modules/hdfs/README.md b/src/go/plugin/go.d/collector/hdfs/README.md similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/README.md rename to src/go/plugin/go.d/collector/hdfs/README.md diff --git a/src/go/plugin/go.d/modules/hdfs/charts.go b/src/go/plugin/go.d/collector/hdfs/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/charts.go rename to src/go/plugin/go.d/collector/hdfs/charts.go diff --git a/src/go/plugin/go.d/modules/hdfs/collect.go b/src/go/plugin/go.d/collector/hdfs/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/collect.go rename to src/go/plugin/go.d/collector/hdfs/collect.go diff --git a/src/go/plugin/go.d/modules/hdfs/config_schema.json b/src/go/plugin/go.d/collector/hdfs/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/config_schema.json rename to src/go/plugin/go.d/collector/hdfs/config_schema.json diff --git a/src/go/plugin/go.d/modules/hdfs/hdfs.go b/src/go/plugin/go.d/collector/hdfs/hdfs.go similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/hdfs.go rename to src/go/plugin/go.d/collector/hdfs/hdfs.go diff --git a/src/go/plugin/go.d/modules/hdfs/hdfs_test.go b/src/go/plugin/go.d/collector/hdfs/hdfs_test.go similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/hdfs_test.go rename to src/go/plugin/go.d/collector/hdfs/hdfs_test.go diff --git a/src/go/plugin/go.d/modules/hdfs/integrations/hadoop_distributed_file_system_hdfs.md b/src/go/plugin/go.d/collector/hdfs/integrations/hadoop_distributed_file_system_hdfs.md similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/integrations/hadoop_distributed_file_system_hdfs.md rename to src/go/plugin/go.d/collector/hdfs/integrations/hadoop_distributed_file_system_hdfs.md diff --git a/src/go/plugin/go.d/modules/hdfs/metadata.yaml b/src/go/plugin/go.d/collector/hdfs/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/metadata.yaml rename to src/go/plugin/go.d/collector/hdfs/metadata.yaml diff --git a/src/go/plugin/go.d/modules/hdfs/metrics.go b/src/go/plugin/go.d/collector/hdfs/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/metrics.go rename to src/go/plugin/go.d/collector/hdfs/metrics.go diff --git a/src/go/plugin/go.d/modules/hdfs/raw_data.go b/src/go/plugin/go.d/collector/hdfs/raw_data.go similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/raw_data.go rename to src/go/plugin/go.d/collector/hdfs/raw_data.go diff --git a/src/go/plugin/go.d/modules/hdfs/testdata/config.json b/src/go/plugin/go.d/collector/hdfs/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/testdata/config.json rename to src/go/plugin/go.d/collector/hdfs/testdata/config.json diff --git a/src/go/plugin/go.d/modules/hdfs/testdata/config.yaml b/src/go/plugin/go.d/collector/hdfs/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/testdata/config.yaml rename to src/go/plugin/go.d/collector/hdfs/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/hdfs/testdata/datanode.json b/src/go/plugin/go.d/collector/hdfs/testdata/datanode.json similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/testdata/datanode.json rename to src/go/plugin/go.d/collector/hdfs/testdata/datanode.json diff --git a/src/go/plugin/go.d/modules/hdfs/testdata/namenode.json b/src/go/plugin/go.d/collector/hdfs/testdata/namenode.json similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/testdata/namenode.json rename to src/go/plugin/go.d/collector/hdfs/testdata/namenode.json diff --git a/src/go/plugin/go.d/modules/hdfs/testdata/unknownnode.json b/src/go/plugin/go.d/collector/hdfs/testdata/unknownnode.json similarity index 100% rename from src/go/plugin/go.d/modules/hdfs/testdata/unknownnode.json rename to src/go/plugin/go.d/collector/hdfs/testdata/unknownnode.json diff --git a/src/go/plugin/go.d/modules/hpssa/README.md b/src/go/plugin/go.d/collector/hpssa/README.md similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/README.md rename to src/go/plugin/go.d/collector/hpssa/README.md diff --git a/src/go/plugin/go.d/modules/hpssa/charts.go b/src/go/plugin/go.d/collector/hpssa/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/charts.go rename to src/go/plugin/go.d/collector/hpssa/charts.go diff --git a/src/go/plugin/go.d/modules/hpssa/collect.go b/src/go/plugin/go.d/collector/hpssa/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/collect.go rename to src/go/plugin/go.d/collector/hpssa/collect.go diff --git a/src/go/plugin/go.d/modules/hpssa/config_schema.json b/src/go/plugin/go.d/collector/hpssa/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/config_schema.json rename to src/go/plugin/go.d/collector/hpssa/config_schema.json diff --git a/src/go/plugin/go.d/modules/hpssa/exec.go b/src/go/plugin/go.d/collector/hpssa/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/exec.go rename to src/go/plugin/go.d/collector/hpssa/exec.go diff --git a/src/go/plugin/go.d/modules/hpssa/hpssa.go b/src/go/plugin/go.d/collector/hpssa/hpssa.go similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/hpssa.go rename to src/go/plugin/go.d/collector/hpssa/hpssa.go diff --git a/src/go/plugin/go.d/modules/hpssa/hpssa_test.go b/src/go/plugin/go.d/collector/hpssa/hpssa_test.go similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/hpssa_test.go rename to src/go/plugin/go.d/collector/hpssa/hpssa_test.go diff --git a/src/go/plugin/go.d/modules/hpssa/init.go b/src/go/plugin/go.d/collector/hpssa/init.go similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/init.go rename to src/go/plugin/go.d/collector/hpssa/init.go diff --git a/src/go/plugin/go.d/modules/hpssa/integrations/hpe_smart_arrays.md b/src/go/plugin/go.d/collector/hpssa/integrations/hpe_smart_arrays.md similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/integrations/hpe_smart_arrays.md rename to src/go/plugin/go.d/collector/hpssa/integrations/hpe_smart_arrays.md diff --git a/src/go/plugin/go.d/modules/hpssa/metadata.yaml b/src/go/plugin/go.d/collector/hpssa/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/metadata.yaml rename to src/go/plugin/go.d/collector/hpssa/metadata.yaml diff --git a/src/go/plugin/go.d/modules/hpssa/parse.go b/src/go/plugin/go.d/collector/hpssa/parse.go similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/parse.go rename to src/go/plugin/go.d/collector/hpssa/parse.go diff --git a/src/go/plugin/go.d/modules/hpssa/testdata/config.json b/src/go/plugin/go.d/collector/hpssa/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/testdata/config.json rename to src/go/plugin/go.d/collector/hpssa/testdata/config.json diff --git a/src/go/plugin/go.d/modules/hpssa/testdata/config.yaml b/src/go/plugin/go.d/collector/hpssa/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/testdata/config.yaml rename to src/go/plugin/go.d/collector/hpssa/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/hpssa/testdata/ssacli-P212_P410i.txt b/src/go/plugin/go.d/collector/hpssa/testdata/ssacli-P212_P410i.txt similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/testdata/ssacli-P212_P410i.txt rename to src/go/plugin/go.d/collector/hpssa/testdata/ssacli-P212_P410i.txt diff --git a/src/go/plugin/go.d/modules/hpssa/testdata/ssacli-P400ar.txt b/src/go/plugin/go.d/collector/hpssa/testdata/ssacli-P400ar.txt similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/testdata/ssacli-P400ar.txt rename to src/go/plugin/go.d/collector/hpssa/testdata/ssacli-P400ar.txt diff --git a/src/go/plugin/go.d/modules/hpssa/testdata/ssacli-P400i-unassigned.txt b/src/go/plugin/go.d/collector/hpssa/testdata/ssacli-P400i-unassigned.txt similarity index 100% rename from src/go/plugin/go.d/modules/hpssa/testdata/ssacli-P400i-unassigned.txt rename to src/go/plugin/go.d/collector/hpssa/testdata/ssacli-P400i-unassigned.txt diff --git a/src/go/plugin/go.d/modules/httpcheck/README.md b/src/go/plugin/go.d/collector/httpcheck/README.md similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/README.md rename to src/go/plugin/go.d/collector/httpcheck/README.md diff --git a/src/go/plugin/go.d/modules/httpcheck/charts.go b/src/go/plugin/go.d/collector/httpcheck/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/charts.go rename to src/go/plugin/go.d/collector/httpcheck/charts.go diff --git a/src/go/plugin/go.d/modules/httpcheck/collect.go b/src/go/plugin/go.d/collector/httpcheck/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/collect.go rename to src/go/plugin/go.d/collector/httpcheck/collect.go diff --git a/src/go/plugin/go.d/modules/httpcheck/config_schema.json b/src/go/plugin/go.d/collector/httpcheck/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/config_schema.json rename to src/go/plugin/go.d/collector/httpcheck/config_schema.json diff --git a/src/go/plugin/go.d/modules/httpcheck/cookiejar.go b/src/go/plugin/go.d/collector/httpcheck/cookiejar.go similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/cookiejar.go rename to src/go/plugin/go.d/collector/httpcheck/cookiejar.go diff --git a/src/go/plugin/go.d/modules/httpcheck/httpcheck.go b/src/go/plugin/go.d/collector/httpcheck/httpcheck.go similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/httpcheck.go rename to src/go/plugin/go.d/collector/httpcheck/httpcheck.go diff --git a/src/go/plugin/go.d/modules/httpcheck/httpcheck_test.go b/src/go/plugin/go.d/collector/httpcheck/httpcheck_test.go similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/httpcheck_test.go rename to src/go/plugin/go.d/collector/httpcheck/httpcheck_test.go diff --git a/src/go/plugin/go.d/modules/httpcheck/init.go b/src/go/plugin/go.d/collector/httpcheck/init.go similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/init.go rename to src/go/plugin/go.d/collector/httpcheck/init.go diff --git a/src/go/plugin/go.d/modules/httpcheck/integrations/http_endpoints.md b/src/go/plugin/go.d/collector/httpcheck/integrations/http_endpoints.md similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/integrations/http_endpoints.md rename to src/go/plugin/go.d/collector/httpcheck/integrations/http_endpoints.md diff --git a/src/go/plugin/go.d/modules/httpcheck/metadata.yaml b/src/go/plugin/go.d/collector/httpcheck/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/metadata.yaml rename to src/go/plugin/go.d/collector/httpcheck/metadata.yaml diff --git a/src/go/plugin/go.d/modules/httpcheck/metrics.go b/src/go/plugin/go.d/collector/httpcheck/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/metrics.go rename to src/go/plugin/go.d/collector/httpcheck/metrics.go diff --git a/src/go/plugin/go.d/modules/httpcheck/testdata/config.json b/src/go/plugin/go.d/collector/httpcheck/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/testdata/config.json rename to src/go/plugin/go.d/collector/httpcheck/testdata/config.json diff --git a/src/go/plugin/go.d/modules/httpcheck/testdata/config.yaml b/src/go/plugin/go.d/collector/httpcheck/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/testdata/config.yaml rename to src/go/plugin/go.d/collector/httpcheck/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/httpcheck/testdata/cookie.txt b/src/go/plugin/go.d/collector/httpcheck/testdata/cookie.txt similarity index 100% rename from src/go/plugin/go.d/modules/httpcheck/testdata/cookie.txt rename to src/go/plugin/go.d/collector/httpcheck/testdata/cookie.txt diff --git a/src/go/plugin/go.d/modules/icecast/README.md b/src/go/plugin/go.d/collector/icecast/README.md similarity index 100% rename from src/go/plugin/go.d/modules/icecast/README.md rename to src/go/plugin/go.d/collector/icecast/README.md diff --git a/src/go/plugin/go.d/modules/icecast/charts.go b/src/go/plugin/go.d/collector/icecast/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/icecast/charts.go rename to src/go/plugin/go.d/collector/icecast/charts.go diff --git a/src/go/plugin/go.d/modules/icecast/collect.go b/src/go/plugin/go.d/collector/icecast/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/icecast/collect.go rename to src/go/plugin/go.d/collector/icecast/collect.go diff --git a/src/go/plugin/go.d/modules/icecast/config_schema.json b/src/go/plugin/go.d/collector/icecast/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/icecast/config_schema.json rename to src/go/plugin/go.d/collector/icecast/config_schema.json diff --git a/src/go/plugin/go.d/modules/icecast/icecast.go b/src/go/plugin/go.d/collector/icecast/icecast.go similarity index 100% rename from src/go/plugin/go.d/modules/icecast/icecast.go rename to src/go/plugin/go.d/collector/icecast/icecast.go diff --git a/src/go/plugin/go.d/modules/icecast/icecast_test.go b/src/go/plugin/go.d/collector/icecast/icecast_test.go similarity index 100% rename from src/go/plugin/go.d/modules/icecast/icecast_test.go rename to src/go/plugin/go.d/collector/icecast/icecast_test.go diff --git a/src/go/plugin/go.d/modules/icecast/integrations/icecast.md b/src/go/plugin/go.d/collector/icecast/integrations/icecast.md similarity index 100% rename from src/go/plugin/go.d/modules/icecast/integrations/icecast.md rename to src/go/plugin/go.d/collector/icecast/integrations/icecast.md diff --git a/src/go/plugin/go.d/modules/icecast/metadata.yaml b/src/go/plugin/go.d/collector/icecast/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/icecast/metadata.yaml rename to src/go/plugin/go.d/collector/icecast/metadata.yaml diff --git a/src/go/plugin/go.d/modules/icecast/server_stats.go b/src/go/plugin/go.d/collector/icecast/server_stats.go similarity index 100% rename from src/go/plugin/go.d/modules/icecast/server_stats.go rename to src/go/plugin/go.d/collector/icecast/server_stats.go diff --git a/src/go/plugin/go.d/modules/icecast/testdata/config.json b/src/go/plugin/go.d/collector/icecast/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/icecast/testdata/config.json rename to src/go/plugin/go.d/collector/icecast/testdata/config.json diff --git a/src/go/plugin/go.d/modules/icecast/testdata/config.yaml b/src/go/plugin/go.d/collector/icecast/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/icecast/testdata/config.yaml rename to src/go/plugin/go.d/collector/icecast/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/icecast/testdata/stats_multi_source.json b/src/go/plugin/go.d/collector/icecast/testdata/stats_multi_source.json similarity index 100% rename from src/go/plugin/go.d/modules/icecast/testdata/stats_multi_source.json rename to src/go/plugin/go.d/collector/icecast/testdata/stats_multi_source.json diff --git a/src/go/plugin/go.d/modules/icecast/testdata/stats_no_sources.json b/src/go/plugin/go.d/collector/icecast/testdata/stats_no_sources.json similarity index 100% rename from src/go/plugin/go.d/modules/icecast/testdata/stats_no_sources.json rename to src/go/plugin/go.d/collector/icecast/testdata/stats_no_sources.json diff --git a/src/go/plugin/go.d/modules/icecast/testdata/stats_single_source.json b/src/go/plugin/go.d/collector/icecast/testdata/stats_single_source.json similarity index 100% rename from src/go/plugin/go.d/modules/icecast/testdata/stats_single_source.json rename to src/go/plugin/go.d/collector/icecast/testdata/stats_single_source.json diff --git a/src/go/plugin/go.d/collector/init.go b/src/go/plugin/go.d/collector/init.go new file mode 100644 index 00000000000000..a5c6b645edab59 --- /dev/null +++ b/src/go/plugin/go.d/collector/init.go @@ -0,0 +1,128 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +package collector + +import ( + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/activemq" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/adaptecraid" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/ap" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/apache" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/apcupsd" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/beanstalk" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/bind" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/boinc" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/cassandra" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/ceph" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/chrony" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/clickhouse" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/cockroachdb" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/consul" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/coredns" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/couchbase" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/couchdb" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/dmcache" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/dnsdist" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/dnsmasq" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/dnsmasq_dhcp" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/dnsquery" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/docker" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/docker_engine" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/dockerhub" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/dovecot" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/elasticsearch" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/envoy" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/exim" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/fail2ban" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/filecheck" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/fluentd" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/freeradius" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/gearman" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/geth" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/haproxy" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/hddtemp" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/hdfs" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/hpssa" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/httpcheck" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/icecast" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/intelgpu" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/ipfs" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/isc_dhcpd" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/k8s_kubelet" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/k8s_kubeproxy" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/k8s_state" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/lighttpd" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/litespeed" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/logind" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/logstash" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/lvm" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/maxscale" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/megacli" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/memcached" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/mongodb" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/monit" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/mysql" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/nginx" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/nginxplus" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/nginxunit" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/nginxvts" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/nsd" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/ntpd" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/nvidia_smi" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/nvme" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/openldap" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/openvpn" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/openvpn_status_log" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/oracledb" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/pgbouncer" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/phpdaemon" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/phpfpm" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/pihole" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/pika" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/ping" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/portcheck" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/postfix" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/postgres" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/powerdns" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/powerdns_recursor" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/prometheus" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/proxysql" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/pulsar" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/puppet" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/rabbitmq" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/redis" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/rethinkdb" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/riakkv" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/rspamd" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/samba" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/scaleio" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/sensors" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/smartctl" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/snmp" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/spigotmc" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/squid" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/squidlog" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/storcli" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/supervisord" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/systemdunits" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/tengine" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/testrandom" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/tomcat" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/tor" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/traefik" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/typesense" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/unbound" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/upsd" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/uwsgi" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/varnish" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vcsa" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vernemq" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/w1sensor" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/weblog" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/whoisquery" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/windows" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/wireguard" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/x509check" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/zfspool" + _ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/zookeeper" +) diff --git a/src/go/plugin/go.d/modules/intelgpu/README.md b/src/go/plugin/go.d/collector/intelgpu/README.md similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/README.md rename to src/go/plugin/go.d/collector/intelgpu/README.md diff --git a/src/go/plugin/go.d/modules/intelgpu/charts.go b/src/go/plugin/go.d/collector/intelgpu/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/charts.go rename to src/go/plugin/go.d/collector/intelgpu/charts.go diff --git a/src/go/plugin/go.d/modules/intelgpu/collect.go b/src/go/plugin/go.d/collector/intelgpu/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/collect.go rename to src/go/plugin/go.d/collector/intelgpu/collect.go diff --git a/src/go/plugin/go.d/modules/intelgpu/config_schema.json b/src/go/plugin/go.d/collector/intelgpu/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/config_schema.json rename to src/go/plugin/go.d/collector/intelgpu/config_schema.json diff --git a/src/go/plugin/go.d/modules/intelgpu/exec.go b/src/go/plugin/go.d/collector/intelgpu/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/exec.go rename to src/go/plugin/go.d/collector/intelgpu/exec.go diff --git a/src/go/plugin/go.d/modules/intelgpu/init.go b/src/go/plugin/go.d/collector/intelgpu/init.go similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/init.go rename to src/go/plugin/go.d/collector/intelgpu/init.go diff --git a/src/go/plugin/go.d/modules/intelgpu/integrations/intel_gpu.md b/src/go/plugin/go.d/collector/intelgpu/integrations/intel_gpu.md similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/integrations/intel_gpu.md rename to src/go/plugin/go.d/collector/intelgpu/integrations/intel_gpu.md diff --git a/src/go/plugin/go.d/modules/intelgpu/intelgpu.go b/src/go/plugin/go.d/collector/intelgpu/intelgpu.go similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/intelgpu.go rename to src/go/plugin/go.d/collector/intelgpu/intelgpu.go diff --git a/src/go/plugin/go.d/modules/intelgpu/intelgpu_test.go b/src/go/plugin/go.d/collector/intelgpu/intelgpu_test.go similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/intelgpu_test.go rename to src/go/plugin/go.d/collector/intelgpu/intelgpu_test.go diff --git a/src/go/plugin/go.d/modules/intelgpu/metadata.yaml b/src/go/plugin/go.d/collector/intelgpu/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/metadata.yaml rename to src/go/plugin/go.d/collector/intelgpu/metadata.yaml diff --git a/src/go/plugin/go.d/modules/intelgpu/testdata/config.json b/src/go/plugin/go.d/collector/intelgpu/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/testdata/config.json rename to src/go/plugin/go.d/collector/intelgpu/testdata/config.json diff --git a/src/go/plugin/go.d/modules/intelgpu/testdata/config.yaml b/src/go/plugin/go.d/collector/intelgpu/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/testdata/config.yaml rename to src/go/plugin/go.d/collector/intelgpu/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/intelgpu/testdata/igt.json b/src/go/plugin/go.d/collector/intelgpu/testdata/igt.json similarity index 100% rename from src/go/plugin/go.d/modules/intelgpu/testdata/igt.json rename to src/go/plugin/go.d/collector/intelgpu/testdata/igt.json diff --git a/src/go/plugin/go.d/modules/ipfs/README.md b/src/go/plugin/go.d/collector/ipfs/README.md similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/README.md rename to src/go/plugin/go.d/collector/ipfs/README.md diff --git a/src/go/plugin/go.d/modules/ipfs/charts.go b/src/go/plugin/go.d/collector/ipfs/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/charts.go rename to src/go/plugin/go.d/collector/ipfs/charts.go diff --git a/src/go/plugin/go.d/modules/ipfs/collect.go b/src/go/plugin/go.d/collector/ipfs/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/collect.go rename to src/go/plugin/go.d/collector/ipfs/collect.go diff --git a/src/go/plugin/go.d/modules/ipfs/config_schema.json b/src/go/plugin/go.d/collector/ipfs/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/config_schema.json rename to src/go/plugin/go.d/collector/ipfs/config_schema.json diff --git a/src/go/plugin/go.d/modules/ipfs/integrations/ipfs.md b/src/go/plugin/go.d/collector/ipfs/integrations/ipfs.md similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/integrations/ipfs.md rename to src/go/plugin/go.d/collector/ipfs/integrations/ipfs.md diff --git a/src/go/plugin/go.d/modules/ipfs/ipfs.go b/src/go/plugin/go.d/collector/ipfs/ipfs.go similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/ipfs.go rename to src/go/plugin/go.d/collector/ipfs/ipfs.go diff --git a/src/go/plugin/go.d/modules/ipfs/ipfs_test.go b/src/go/plugin/go.d/collector/ipfs/ipfs_test.go similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/ipfs_test.go rename to src/go/plugin/go.d/collector/ipfs/ipfs_test.go diff --git a/src/go/plugin/go.d/modules/ipfs/metadata.yaml b/src/go/plugin/go.d/collector/ipfs/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/metadata.yaml rename to src/go/plugin/go.d/collector/ipfs/metadata.yaml diff --git a/src/go/plugin/go.d/modules/ipfs/testdata/api_v0_pin_ls.json b/src/go/plugin/go.d/collector/ipfs/testdata/api_v0_pin_ls.json similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/testdata/api_v0_pin_ls.json rename to src/go/plugin/go.d/collector/ipfs/testdata/api_v0_pin_ls.json diff --git a/src/go/plugin/go.d/modules/ipfs/testdata/api_v0_stats_bw.json b/src/go/plugin/go.d/collector/ipfs/testdata/api_v0_stats_bw.json similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/testdata/api_v0_stats_bw.json rename to src/go/plugin/go.d/collector/ipfs/testdata/api_v0_stats_bw.json diff --git a/src/go/plugin/go.d/modules/ipfs/testdata/api_v0_stats_repo.json b/src/go/plugin/go.d/collector/ipfs/testdata/api_v0_stats_repo.json similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/testdata/api_v0_stats_repo.json rename to src/go/plugin/go.d/collector/ipfs/testdata/api_v0_stats_repo.json diff --git a/src/go/plugin/go.d/modules/ipfs/testdata/api_v0_swarm_peers.json b/src/go/plugin/go.d/collector/ipfs/testdata/api_v0_swarm_peers.json similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/testdata/api_v0_swarm_peers.json rename to src/go/plugin/go.d/collector/ipfs/testdata/api_v0_swarm_peers.json diff --git a/src/go/plugin/go.d/modules/ipfs/testdata/config.json b/src/go/plugin/go.d/collector/ipfs/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/testdata/config.json rename to src/go/plugin/go.d/collector/ipfs/testdata/config.json diff --git a/src/go/plugin/go.d/modules/ipfs/testdata/config.yaml b/src/go/plugin/go.d/collector/ipfs/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/ipfs/testdata/config.yaml rename to src/go/plugin/go.d/collector/ipfs/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/README.md b/src/go/plugin/go.d/collector/isc_dhcpd/README.md similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/README.md rename to src/go/plugin/go.d/collector/isc_dhcpd/README.md diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/charts.go b/src/go/plugin/go.d/collector/isc_dhcpd/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/charts.go rename to src/go/plugin/go.d/collector/isc_dhcpd/charts.go diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/collect.go b/src/go/plugin/go.d/collector/isc_dhcpd/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/collect.go rename to src/go/plugin/go.d/collector/isc_dhcpd/collect.go diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/config_schema.json b/src/go/plugin/go.d/collector/isc_dhcpd/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/config_schema.json rename to src/go/plugin/go.d/collector/isc_dhcpd/config_schema.json diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/doc.go b/src/go/plugin/go.d/collector/isc_dhcpd/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/doc.go rename to src/go/plugin/go.d/collector/isc_dhcpd/doc.go diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/init.go b/src/go/plugin/go.d/collector/isc_dhcpd/init.go similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/init.go rename to src/go/plugin/go.d/collector/isc_dhcpd/init.go diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/integrations/isc_dhcp.md b/src/go/plugin/go.d/collector/isc_dhcpd/integrations/isc_dhcp.md similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/integrations/isc_dhcp.md rename to src/go/plugin/go.d/collector/isc_dhcpd/integrations/isc_dhcp.md diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/isc_dhcpd.go b/src/go/plugin/go.d/collector/isc_dhcpd/isc_dhcpd.go similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/isc_dhcpd.go rename to src/go/plugin/go.d/collector/isc_dhcpd/isc_dhcpd.go diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/isc_dhcpd_test.go b/src/go/plugin/go.d/collector/isc_dhcpd/isc_dhcpd_test.go similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/isc_dhcpd_test.go rename to src/go/plugin/go.d/collector/isc_dhcpd/isc_dhcpd_test.go diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/metadata.yaml b/src/go/plugin/go.d/collector/isc_dhcpd/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/metadata.yaml rename to src/go/plugin/go.d/collector/isc_dhcpd/metadata.yaml diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/parse.go b/src/go/plugin/go.d/collector/isc_dhcpd/parse.go similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/parse.go rename to src/go/plugin/go.d/collector/isc_dhcpd/parse.go diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/testdata/config.json b/src/go/plugin/go.d/collector/isc_dhcpd/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/testdata/config.json rename to src/go/plugin/go.d/collector/isc_dhcpd/testdata/config.json diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/testdata/config.yaml b/src/go/plugin/go.d/collector/isc_dhcpd/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/testdata/config.yaml rename to src/go/plugin/go.d/collector/isc_dhcpd/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/testdata/dhcpd.leases_empty b/src/go/plugin/go.d/collector/isc_dhcpd/testdata/dhcpd.leases_empty similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/testdata/dhcpd.leases_empty rename to src/go/plugin/go.d/collector/isc_dhcpd/testdata/dhcpd.leases_empty diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/testdata/dhcpd.leases_ipv4 b/src/go/plugin/go.d/collector/isc_dhcpd/testdata/dhcpd.leases_ipv4 similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/testdata/dhcpd.leases_ipv4 rename to src/go/plugin/go.d/collector/isc_dhcpd/testdata/dhcpd.leases_ipv4 diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/testdata/dhcpd.leases_ipv4_backup b/src/go/plugin/go.d/collector/isc_dhcpd/testdata/dhcpd.leases_ipv4_backup similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/testdata/dhcpd.leases_ipv4_backup rename to src/go/plugin/go.d/collector/isc_dhcpd/testdata/dhcpd.leases_ipv4_backup diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/testdata/dhcpd.leases_ipv4_inactive b/src/go/plugin/go.d/collector/isc_dhcpd/testdata/dhcpd.leases_ipv4_inactive similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/testdata/dhcpd.leases_ipv4_inactive rename to src/go/plugin/go.d/collector/isc_dhcpd/testdata/dhcpd.leases_ipv4_inactive diff --git a/src/go/plugin/go.d/modules/isc_dhcpd/testdata/dhcpd.leases_ipv6 b/src/go/plugin/go.d/collector/isc_dhcpd/testdata/dhcpd.leases_ipv6 similarity index 100% rename from src/go/plugin/go.d/modules/isc_dhcpd/testdata/dhcpd.leases_ipv6 rename to src/go/plugin/go.d/collector/isc_dhcpd/testdata/dhcpd.leases_ipv6 diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/README.md b/src/go/plugin/go.d/collector/k8s_kubelet/README.md similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/README.md rename to src/go/plugin/go.d/collector/k8s_kubelet/README.md diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/charts.go b/src/go/plugin/go.d/collector/k8s_kubelet/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/charts.go rename to src/go/plugin/go.d/collector/k8s_kubelet/charts.go diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/collect.go b/src/go/plugin/go.d/collector/k8s_kubelet/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/collect.go rename to src/go/plugin/go.d/collector/k8s_kubelet/collect.go diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/config_schema.json b/src/go/plugin/go.d/collector/k8s_kubelet/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/config_schema.json rename to src/go/plugin/go.d/collector/k8s_kubelet/config_schema.json diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/init.go b/src/go/plugin/go.d/collector/k8s_kubelet/init.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/init.go rename to src/go/plugin/go.d/collector/k8s_kubelet/init.go diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/integrations/kubelet.md b/src/go/plugin/go.d/collector/k8s_kubelet/integrations/kubelet.md similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/integrations/kubelet.md rename to src/go/plugin/go.d/collector/k8s_kubelet/integrations/kubelet.md diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/kubelet.go b/src/go/plugin/go.d/collector/k8s_kubelet/kubelet.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/kubelet.go rename to src/go/plugin/go.d/collector/k8s_kubelet/kubelet.go diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/kubelet_test.go b/src/go/plugin/go.d/collector/k8s_kubelet/kubelet_test.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/kubelet_test.go rename to src/go/plugin/go.d/collector/k8s_kubelet/kubelet_test.go diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/metadata.yaml b/src/go/plugin/go.d/collector/k8s_kubelet/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/metadata.yaml rename to src/go/plugin/go.d/collector/k8s_kubelet/metadata.yaml diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/metrics.go b/src/go/plugin/go.d/collector/k8s_kubelet/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/metrics.go rename to src/go/plugin/go.d/collector/k8s_kubelet/metrics.go diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/testdata/config.json b/src/go/plugin/go.d/collector/k8s_kubelet/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/testdata/config.json rename to src/go/plugin/go.d/collector/k8s_kubelet/testdata/config.json diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/testdata/config.yaml b/src/go/plugin/go.d/collector/k8s_kubelet/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/testdata/config.yaml rename to src/go/plugin/go.d/collector/k8s_kubelet/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/testdata/metrics.txt b/src/go/plugin/go.d/collector/k8s_kubelet/testdata/metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/testdata/metrics.txt rename to src/go/plugin/go.d/collector/k8s_kubelet/testdata/metrics.txt diff --git a/src/go/plugin/go.d/modules/k8s_kubelet/testdata/token.txt b/src/go/plugin/go.d/collector/k8s_kubelet/testdata/token.txt similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubelet/testdata/token.txt rename to src/go/plugin/go.d/collector/k8s_kubelet/testdata/token.txt diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/README.md b/src/go/plugin/go.d/collector/k8s_kubeproxy/README.md similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/README.md rename to src/go/plugin/go.d/collector/k8s_kubeproxy/README.md diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/charts.go b/src/go/plugin/go.d/collector/k8s_kubeproxy/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/charts.go rename to src/go/plugin/go.d/collector/k8s_kubeproxy/charts.go diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/collect.go b/src/go/plugin/go.d/collector/k8s_kubeproxy/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/collect.go rename to src/go/plugin/go.d/collector/k8s_kubeproxy/collect.go diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/config_schema.json b/src/go/plugin/go.d/collector/k8s_kubeproxy/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/config_schema.json rename to src/go/plugin/go.d/collector/k8s_kubeproxy/config_schema.json diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/init.go b/src/go/plugin/go.d/collector/k8s_kubeproxy/init.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/init.go rename to src/go/plugin/go.d/collector/k8s_kubeproxy/init.go diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/integrations/kubeproxy.md b/src/go/plugin/go.d/collector/k8s_kubeproxy/integrations/kubeproxy.md similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/integrations/kubeproxy.md rename to src/go/plugin/go.d/collector/k8s_kubeproxy/integrations/kubeproxy.md diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/kubeproxy.go b/src/go/plugin/go.d/collector/k8s_kubeproxy/kubeproxy.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/kubeproxy.go rename to src/go/plugin/go.d/collector/k8s_kubeproxy/kubeproxy.go diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/kubeproxy_test.go b/src/go/plugin/go.d/collector/k8s_kubeproxy/kubeproxy_test.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/kubeproxy_test.go rename to src/go/plugin/go.d/collector/k8s_kubeproxy/kubeproxy_test.go diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/metadata.yaml b/src/go/plugin/go.d/collector/k8s_kubeproxy/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/metadata.yaml rename to src/go/plugin/go.d/collector/k8s_kubeproxy/metadata.yaml diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/metrics.go b/src/go/plugin/go.d/collector/k8s_kubeproxy/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/metrics.go rename to src/go/plugin/go.d/collector/k8s_kubeproxy/metrics.go diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/testdata/config.json b/src/go/plugin/go.d/collector/k8s_kubeproxy/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/testdata/config.json rename to src/go/plugin/go.d/collector/k8s_kubeproxy/testdata/config.json diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/testdata/config.yaml b/src/go/plugin/go.d/collector/k8s_kubeproxy/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/testdata/config.yaml rename to src/go/plugin/go.d/collector/k8s_kubeproxy/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/k8s_kubeproxy/testdata/metrics.txt b/src/go/plugin/go.d/collector/k8s_kubeproxy/testdata/metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/k8s_kubeproxy/testdata/metrics.txt rename to src/go/plugin/go.d/collector/k8s_kubeproxy/testdata/metrics.txt diff --git a/src/go/plugin/go.d/modules/k8s_state/README.md b/src/go/plugin/go.d/collector/k8s_state/README.md similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/README.md rename to src/go/plugin/go.d/collector/k8s_state/README.md diff --git a/src/go/plugin/go.d/modules/k8s_state/charts.go b/src/go/plugin/go.d/collector/k8s_state/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/charts.go rename to src/go/plugin/go.d/collector/k8s_state/charts.go diff --git a/src/go/plugin/go.d/modules/k8s_state/client.go b/src/go/plugin/go.d/collector/k8s_state/client.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/client.go rename to src/go/plugin/go.d/collector/k8s_state/client.go diff --git a/src/go/plugin/go.d/modules/k8s_state/cluster_meta.go b/src/go/plugin/go.d/collector/k8s_state/cluster_meta.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/cluster_meta.go rename to src/go/plugin/go.d/collector/k8s_state/cluster_meta.go diff --git a/src/go/plugin/go.d/modules/k8s_state/collect.go b/src/go/plugin/go.d/collector/k8s_state/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/collect.go rename to src/go/plugin/go.d/collector/k8s_state/collect.go diff --git a/src/go/plugin/go.d/modules/k8s_state/config_schema.json b/src/go/plugin/go.d/collector/k8s_state/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/config_schema.json rename to src/go/plugin/go.d/collector/k8s_state/config_schema.json diff --git a/src/go/plugin/go.d/modules/k8s_state/discover_kubernetes.go b/src/go/plugin/go.d/collector/k8s_state/discover_kubernetes.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/discover_kubernetes.go rename to src/go/plugin/go.d/collector/k8s_state/discover_kubernetes.go diff --git a/src/go/plugin/go.d/modules/k8s_state/discover_node.go b/src/go/plugin/go.d/collector/k8s_state/discover_node.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/discover_node.go rename to src/go/plugin/go.d/collector/k8s_state/discover_node.go diff --git a/src/go/plugin/go.d/modules/k8s_state/discover_pod.go b/src/go/plugin/go.d/collector/k8s_state/discover_pod.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/discover_pod.go rename to src/go/plugin/go.d/collector/k8s_state/discover_pod.go diff --git a/src/go/plugin/go.d/modules/k8s_state/init.go b/src/go/plugin/go.d/collector/k8s_state/init.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/init.go rename to src/go/plugin/go.d/collector/k8s_state/init.go diff --git a/src/go/plugin/go.d/modules/k8s_state/integrations/kubernetes_cluster_state.md b/src/go/plugin/go.d/collector/k8s_state/integrations/kubernetes_cluster_state.md similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/integrations/kubernetes_cluster_state.md rename to src/go/plugin/go.d/collector/k8s_state/integrations/kubernetes_cluster_state.md diff --git a/src/go/plugin/go.d/modules/k8s_state/kube_state.go b/src/go/plugin/go.d/collector/k8s_state/kube_state.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/kube_state.go rename to src/go/plugin/go.d/collector/k8s_state/kube_state.go diff --git a/src/go/plugin/go.d/modules/k8s_state/kube_state_test.go b/src/go/plugin/go.d/collector/k8s_state/kube_state_test.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/kube_state_test.go rename to src/go/plugin/go.d/collector/k8s_state/kube_state_test.go diff --git a/src/go/plugin/go.d/modules/k8s_state/metadata.yaml b/src/go/plugin/go.d/collector/k8s_state/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/metadata.yaml rename to src/go/plugin/go.d/collector/k8s_state/metadata.yaml diff --git a/src/go/plugin/go.d/modules/k8s_state/resource.go b/src/go/plugin/go.d/collector/k8s_state/resource.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/resource.go rename to src/go/plugin/go.d/collector/k8s_state/resource.go diff --git a/src/go/plugin/go.d/modules/k8s_state/state.go b/src/go/plugin/go.d/collector/k8s_state/state.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/state.go rename to src/go/plugin/go.d/collector/k8s_state/state.go diff --git a/src/go/plugin/go.d/modules/k8s_state/testdata/config.json b/src/go/plugin/go.d/collector/k8s_state/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/testdata/config.json rename to src/go/plugin/go.d/collector/k8s_state/testdata/config.json diff --git a/src/go/plugin/go.d/modules/k8s_state/testdata/config.yaml b/src/go/plugin/go.d/collector/k8s_state/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/testdata/config.yaml rename to src/go/plugin/go.d/collector/k8s_state/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/k8s_state/update_node_state.go b/src/go/plugin/go.d/collector/k8s_state/update_node_state.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/update_node_state.go rename to src/go/plugin/go.d/collector/k8s_state/update_node_state.go diff --git a/src/go/plugin/go.d/modules/k8s_state/update_pod_state.go b/src/go/plugin/go.d/collector/k8s_state/update_pod_state.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/update_pod_state.go rename to src/go/plugin/go.d/collector/k8s_state/update_pod_state.go diff --git a/src/go/plugin/go.d/modules/k8s_state/update_state.go b/src/go/plugin/go.d/collector/k8s_state/update_state.go similarity index 100% rename from src/go/plugin/go.d/modules/k8s_state/update_state.go rename to src/go/plugin/go.d/collector/k8s_state/update_state.go diff --git a/src/go/plugin/go.d/modules/lighttpd/README.md b/src/go/plugin/go.d/collector/lighttpd/README.md similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/README.md rename to src/go/plugin/go.d/collector/lighttpd/README.md diff --git a/src/go/plugin/go.d/modules/lighttpd/charts.go b/src/go/plugin/go.d/collector/lighttpd/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/charts.go rename to src/go/plugin/go.d/collector/lighttpd/charts.go diff --git a/src/go/plugin/go.d/modules/lighttpd/collect.go b/src/go/plugin/go.d/collector/lighttpd/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/collect.go rename to src/go/plugin/go.d/collector/lighttpd/collect.go diff --git a/src/go/plugin/go.d/modules/lighttpd/config_schema.json b/src/go/plugin/go.d/collector/lighttpd/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/config_schema.json rename to src/go/plugin/go.d/collector/lighttpd/config_schema.json diff --git a/src/go/plugin/go.d/modules/lighttpd/integrations/lighttpd.md b/src/go/plugin/go.d/collector/lighttpd/integrations/lighttpd.md similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/integrations/lighttpd.md rename to src/go/plugin/go.d/collector/lighttpd/integrations/lighttpd.md diff --git a/src/go/plugin/go.d/modules/lighttpd/lighttpd.go b/src/go/plugin/go.d/collector/lighttpd/lighttpd.go similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/lighttpd.go rename to src/go/plugin/go.d/collector/lighttpd/lighttpd.go diff --git a/src/go/plugin/go.d/modules/lighttpd/lighttpd_test.go b/src/go/plugin/go.d/collector/lighttpd/lighttpd_test.go similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/lighttpd_test.go rename to src/go/plugin/go.d/collector/lighttpd/lighttpd_test.go diff --git a/src/go/plugin/go.d/modules/lighttpd/metadata.yaml b/src/go/plugin/go.d/collector/lighttpd/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/metadata.yaml rename to src/go/plugin/go.d/collector/lighttpd/metadata.yaml diff --git a/src/go/plugin/go.d/modules/lighttpd/status.go b/src/go/plugin/go.d/collector/lighttpd/status.go similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/status.go rename to src/go/plugin/go.d/collector/lighttpd/status.go diff --git a/src/go/plugin/go.d/modules/lighttpd/testdata/apache-status.txt b/src/go/plugin/go.d/collector/lighttpd/testdata/apache-status.txt similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/testdata/apache-status.txt rename to src/go/plugin/go.d/collector/lighttpd/testdata/apache-status.txt diff --git a/src/go/plugin/go.d/modules/lighttpd/testdata/config.json b/src/go/plugin/go.d/collector/lighttpd/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/testdata/config.json rename to src/go/plugin/go.d/collector/lighttpd/testdata/config.json diff --git a/src/go/plugin/go.d/modules/lighttpd/testdata/config.yaml b/src/go/plugin/go.d/collector/lighttpd/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/testdata/config.yaml rename to src/go/plugin/go.d/collector/lighttpd/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/lighttpd/testdata/status.txt b/src/go/plugin/go.d/collector/lighttpd/testdata/status.txt similarity index 100% rename from src/go/plugin/go.d/modules/lighttpd/testdata/status.txt rename to src/go/plugin/go.d/collector/lighttpd/testdata/status.txt diff --git a/src/go/plugin/go.d/modules/litespeed/README.md b/src/go/plugin/go.d/collector/litespeed/README.md similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/README.md rename to src/go/plugin/go.d/collector/litespeed/README.md diff --git a/src/go/plugin/go.d/modules/litespeed/charts.go b/src/go/plugin/go.d/collector/litespeed/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/charts.go rename to src/go/plugin/go.d/collector/litespeed/charts.go diff --git a/src/go/plugin/go.d/modules/litespeed/collect.go b/src/go/plugin/go.d/collector/litespeed/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/collect.go rename to src/go/plugin/go.d/collector/litespeed/collect.go diff --git a/src/go/plugin/go.d/modules/litespeed/config_schema.json b/src/go/plugin/go.d/collector/litespeed/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/config_schema.json rename to src/go/plugin/go.d/collector/litespeed/config_schema.json diff --git a/src/go/plugin/go.d/modules/litespeed/doc.go b/src/go/plugin/go.d/collector/litespeed/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/doc.go rename to src/go/plugin/go.d/collector/litespeed/doc.go diff --git a/src/go/plugin/go.d/modules/litespeed/integrations/litespeed.md b/src/go/plugin/go.d/collector/litespeed/integrations/litespeed.md similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/integrations/litespeed.md rename to src/go/plugin/go.d/collector/litespeed/integrations/litespeed.md diff --git a/src/go/plugin/go.d/modules/litespeed/litespeed.go b/src/go/plugin/go.d/collector/litespeed/litespeed.go similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/litespeed.go rename to src/go/plugin/go.d/collector/litespeed/litespeed.go diff --git a/src/go/plugin/go.d/modules/litespeed/litespeed_test.go b/src/go/plugin/go.d/collector/litespeed/litespeed_test.go similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/litespeed_test.go rename to src/go/plugin/go.d/collector/litespeed/litespeed_test.go diff --git a/src/go/plugin/go.d/modules/litespeed/metadata.yaml b/src/go/plugin/go.d/collector/litespeed/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/metadata.yaml rename to src/go/plugin/go.d/collector/litespeed/metadata.yaml diff --git a/src/go/plugin/go.d/modules/litespeed/testdata/.rtreport b/src/go/plugin/go.d/collector/litespeed/testdata/.rtreport similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/testdata/.rtreport rename to src/go/plugin/go.d/collector/litespeed/testdata/.rtreport diff --git a/src/go/plugin/go.d/modules/litespeed/testdata/.rtreport.2 b/src/go/plugin/go.d/collector/litespeed/testdata/.rtreport.2 similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/testdata/.rtreport.2 rename to src/go/plugin/go.d/collector/litespeed/testdata/.rtreport.2 diff --git a/src/go/plugin/go.d/modules/litespeed/testdata/config.json b/src/go/plugin/go.d/collector/litespeed/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/testdata/config.json rename to src/go/plugin/go.d/collector/litespeed/testdata/config.json diff --git a/src/go/plugin/go.d/modules/litespeed/testdata/config.yaml b/src/go/plugin/go.d/collector/litespeed/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/litespeed/testdata/config.yaml rename to src/go/plugin/go.d/collector/litespeed/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/logind/README.md b/src/go/plugin/go.d/collector/logind/README.md similarity index 100% rename from src/go/plugin/go.d/modules/logind/README.md rename to src/go/plugin/go.d/collector/logind/README.md diff --git a/src/go/plugin/go.d/modules/logind/charts.go b/src/go/plugin/go.d/collector/logind/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/logind/charts.go rename to src/go/plugin/go.d/collector/logind/charts.go diff --git a/src/go/plugin/go.d/modules/logind/collect.go b/src/go/plugin/go.d/collector/logind/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/logind/collect.go rename to src/go/plugin/go.d/collector/logind/collect.go diff --git a/src/go/plugin/go.d/modules/logind/config_schema.json b/src/go/plugin/go.d/collector/logind/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/logind/config_schema.json rename to src/go/plugin/go.d/collector/logind/config_schema.json diff --git a/src/go/plugin/go.d/modules/logind/connection.go b/src/go/plugin/go.d/collector/logind/connection.go similarity index 100% rename from src/go/plugin/go.d/modules/logind/connection.go rename to src/go/plugin/go.d/collector/logind/connection.go diff --git a/src/go/plugin/go.d/modules/logind/doc.go b/src/go/plugin/go.d/collector/logind/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/logind/doc.go rename to src/go/plugin/go.d/collector/logind/doc.go diff --git a/src/go/plugin/go.d/modules/logind/integrations/systemd-logind_users.md b/src/go/plugin/go.d/collector/logind/integrations/systemd-logind_users.md similarity index 100% rename from src/go/plugin/go.d/modules/logind/integrations/systemd-logind_users.md rename to src/go/plugin/go.d/collector/logind/integrations/systemd-logind_users.md diff --git a/src/go/plugin/go.d/modules/logind/logind.go b/src/go/plugin/go.d/collector/logind/logind.go similarity index 100% rename from src/go/plugin/go.d/modules/logind/logind.go rename to src/go/plugin/go.d/collector/logind/logind.go diff --git a/src/go/plugin/go.d/modules/logind/logind_test.go b/src/go/plugin/go.d/collector/logind/logind_test.go similarity index 100% rename from src/go/plugin/go.d/modules/logind/logind_test.go rename to src/go/plugin/go.d/collector/logind/logind_test.go diff --git a/src/go/plugin/go.d/modules/logind/metadata.yaml b/src/go/plugin/go.d/collector/logind/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/logind/metadata.yaml rename to src/go/plugin/go.d/collector/logind/metadata.yaml diff --git a/src/go/plugin/go.d/modules/logind/testdata/config.json b/src/go/plugin/go.d/collector/logind/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/logind/testdata/config.json rename to src/go/plugin/go.d/collector/logind/testdata/config.json diff --git a/src/go/plugin/go.d/modules/logind/testdata/config.yaml b/src/go/plugin/go.d/collector/logind/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/logind/testdata/config.yaml rename to src/go/plugin/go.d/collector/logind/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/logstash/README.md b/src/go/plugin/go.d/collector/logstash/README.md similarity index 100% rename from src/go/plugin/go.d/modules/logstash/README.md rename to src/go/plugin/go.d/collector/logstash/README.md diff --git a/src/go/plugin/go.d/modules/logstash/charts.go b/src/go/plugin/go.d/collector/logstash/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/logstash/charts.go rename to src/go/plugin/go.d/collector/logstash/charts.go diff --git a/src/go/plugin/go.d/modules/logstash/collect.go b/src/go/plugin/go.d/collector/logstash/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/logstash/collect.go rename to src/go/plugin/go.d/collector/logstash/collect.go diff --git a/src/go/plugin/go.d/modules/logstash/config_schema.json b/src/go/plugin/go.d/collector/logstash/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/logstash/config_schema.json rename to src/go/plugin/go.d/collector/logstash/config_schema.json diff --git a/src/go/plugin/go.d/modules/logstash/integrations/logstash.md b/src/go/plugin/go.d/collector/logstash/integrations/logstash.md similarity index 100% rename from src/go/plugin/go.d/modules/logstash/integrations/logstash.md rename to src/go/plugin/go.d/collector/logstash/integrations/logstash.md diff --git a/src/go/plugin/go.d/modules/logstash/logstash.go b/src/go/plugin/go.d/collector/logstash/logstash.go similarity index 100% rename from src/go/plugin/go.d/modules/logstash/logstash.go rename to src/go/plugin/go.d/collector/logstash/logstash.go diff --git a/src/go/plugin/go.d/modules/logstash/logstash_test.go b/src/go/plugin/go.d/collector/logstash/logstash_test.go similarity index 100% rename from src/go/plugin/go.d/modules/logstash/logstash_test.go rename to src/go/plugin/go.d/collector/logstash/logstash_test.go diff --git a/src/go/plugin/go.d/modules/logstash/metadata.yaml b/src/go/plugin/go.d/collector/logstash/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/logstash/metadata.yaml rename to src/go/plugin/go.d/collector/logstash/metadata.yaml diff --git a/src/go/plugin/go.d/modules/logstash/node_stats.go b/src/go/plugin/go.d/collector/logstash/node_stats.go similarity index 100% rename from src/go/plugin/go.d/modules/logstash/node_stats.go rename to src/go/plugin/go.d/collector/logstash/node_stats.go diff --git a/src/go/plugin/go.d/modules/logstash/testdata/config.json b/src/go/plugin/go.d/collector/logstash/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/logstash/testdata/config.json rename to src/go/plugin/go.d/collector/logstash/testdata/config.json diff --git a/src/go/plugin/go.d/modules/logstash/testdata/config.yaml b/src/go/plugin/go.d/collector/logstash/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/logstash/testdata/config.yaml rename to src/go/plugin/go.d/collector/logstash/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/logstash/testdata/stats.json b/src/go/plugin/go.d/collector/logstash/testdata/stats.json similarity index 100% rename from src/go/plugin/go.d/modules/logstash/testdata/stats.json rename to src/go/plugin/go.d/collector/logstash/testdata/stats.json diff --git a/src/go/plugin/go.d/modules/lvm/README.md b/src/go/plugin/go.d/collector/lvm/README.md similarity index 100% rename from src/go/plugin/go.d/modules/lvm/README.md rename to src/go/plugin/go.d/collector/lvm/README.md diff --git a/src/go/plugin/go.d/modules/lvm/charts.go b/src/go/plugin/go.d/collector/lvm/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/lvm/charts.go rename to src/go/plugin/go.d/collector/lvm/charts.go diff --git a/src/go/plugin/go.d/modules/lvm/collect.go b/src/go/plugin/go.d/collector/lvm/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/lvm/collect.go rename to src/go/plugin/go.d/collector/lvm/collect.go diff --git a/src/go/plugin/go.d/modules/lvm/config_schema.json b/src/go/plugin/go.d/collector/lvm/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/lvm/config_schema.json rename to src/go/plugin/go.d/collector/lvm/config_schema.json diff --git a/src/go/plugin/go.d/modules/lvm/doc.go b/src/go/plugin/go.d/collector/lvm/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/lvm/doc.go rename to src/go/plugin/go.d/collector/lvm/doc.go diff --git a/src/go/plugin/go.d/modules/lvm/exec.go b/src/go/plugin/go.d/collector/lvm/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/lvm/exec.go rename to src/go/plugin/go.d/collector/lvm/exec.go diff --git a/src/go/plugin/go.d/modules/lvm/init.go b/src/go/plugin/go.d/collector/lvm/init.go similarity index 100% rename from src/go/plugin/go.d/modules/lvm/init.go rename to src/go/plugin/go.d/collector/lvm/init.go diff --git a/src/go/plugin/go.d/modules/lvm/integrations/lvm_logical_volumes.md b/src/go/plugin/go.d/collector/lvm/integrations/lvm_logical_volumes.md similarity index 100% rename from src/go/plugin/go.d/modules/lvm/integrations/lvm_logical_volumes.md rename to src/go/plugin/go.d/collector/lvm/integrations/lvm_logical_volumes.md diff --git a/src/go/plugin/go.d/modules/lvm/lvm.go b/src/go/plugin/go.d/collector/lvm/lvm.go similarity index 100% rename from src/go/plugin/go.d/modules/lvm/lvm.go rename to src/go/plugin/go.d/collector/lvm/lvm.go diff --git a/src/go/plugin/go.d/modules/lvm/lvm_test.go b/src/go/plugin/go.d/collector/lvm/lvm_test.go similarity index 100% rename from src/go/plugin/go.d/modules/lvm/lvm_test.go rename to src/go/plugin/go.d/collector/lvm/lvm_test.go diff --git a/src/go/plugin/go.d/modules/lvm/metadata.yaml b/src/go/plugin/go.d/collector/lvm/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/lvm/metadata.yaml rename to src/go/plugin/go.d/collector/lvm/metadata.yaml diff --git a/src/go/plugin/go.d/modules/lvm/testdata/config.json b/src/go/plugin/go.d/collector/lvm/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/lvm/testdata/config.json rename to src/go/plugin/go.d/collector/lvm/testdata/config.json diff --git a/src/go/plugin/go.d/modules/lvm/testdata/config.yaml b/src/go/plugin/go.d/collector/lvm/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/lvm/testdata/config.yaml rename to src/go/plugin/go.d/collector/lvm/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/lvm/testdata/lvs-report-no-thin.json b/src/go/plugin/go.d/collector/lvm/testdata/lvs-report-no-thin.json similarity index 100% rename from src/go/plugin/go.d/modules/lvm/testdata/lvs-report-no-thin.json rename to src/go/plugin/go.d/collector/lvm/testdata/lvs-report-no-thin.json diff --git a/src/go/plugin/go.d/modules/lvm/testdata/lvs-report.json b/src/go/plugin/go.d/collector/lvm/testdata/lvs-report.json similarity index 100% rename from src/go/plugin/go.d/modules/lvm/testdata/lvs-report.json rename to src/go/plugin/go.d/collector/lvm/testdata/lvs-report.json diff --git a/src/go/plugin/go.d/modules/maxscale/README.md b/src/go/plugin/go.d/collector/maxscale/README.md similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/README.md rename to src/go/plugin/go.d/collector/maxscale/README.md diff --git a/src/go/plugin/go.d/modules/maxscale/charts.go b/src/go/plugin/go.d/collector/maxscale/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/charts.go rename to src/go/plugin/go.d/collector/maxscale/charts.go diff --git a/src/go/plugin/go.d/modules/maxscale/collect.go b/src/go/plugin/go.d/collector/maxscale/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/collect.go rename to src/go/plugin/go.d/collector/maxscale/collect.go diff --git a/src/go/plugin/go.d/modules/maxscale/config_schema.json b/src/go/plugin/go.d/collector/maxscale/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/config_schema.json rename to src/go/plugin/go.d/collector/maxscale/config_schema.json diff --git a/src/go/plugin/go.d/modules/maxscale/integrations/maxscale.md b/src/go/plugin/go.d/collector/maxscale/integrations/maxscale.md similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/integrations/maxscale.md rename to src/go/plugin/go.d/collector/maxscale/integrations/maxscale.md diff --git a/src/go/plugin/go.d/modules/maxscale/maxscale.go b/src/go/plugin/go.d/collector/maxscale/maxscale.go similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/maxscale.go rename to src/go/plugin/go.d/collector/maxscale/maxscale.go diff --git a/src/go/plugin/go.d/modules/maxscale/maxscale_test.go b/src/go/plugin/go.d/collector/maxscale/maxscale_test.go similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/maxscale_test.go rename to src/go/plugin/go.d/collector/maxscale/maxscale_test.go diff --git a/src/go/plugin/go.d/modules/maxscale/metadata.yaml b/src/go/plugin/go.d/collector/maxscale/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/metadata.yaml rename to src/go/plugin/go.d/collector/maxscale/metadata.yaml diff --git a/src/go/plugin/go.d/modules/maxscale/restapi.go b/src/go/plugin/go.d/collector/maxscale/restapi.go similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/restapi.go rename to src/go/plugin/go.d/collector/maxscale/restapi.go diff --git a/src/go/plugin/go.d/modules/maxscale/testdata/config.json b/src/go/plugin/go.d/collector/maxscale/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/testdata/config.json rename to src/go/plugin/go.d/collector/maxscale/testdata/config.json diff --git a/src/go/plugin/go.d/modules/maxscale/testdata/config.yaml b/src/go/plugin/go.d/collector/maxscale/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/testdata/config.yaml rename to src/go/plugin/go.d/collector/maxscale/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/maxscale/testdata/v24.02.3/maxscale.json b/src/go/plugin/go.d/collector/maxscale/testdata/v24.02.3/maxscale.json similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/testdata/v24.02.3/maxscale.json rename to src/go/plugin/go.d/collector/maxscale/testdata/v24.02.3/maxscale.json diff --git a/src/go/plugin/go.d/modules/maxscale/testdata/v24.02.3/maxscale_threads.json b/src/go/plugin/go.d/collector/maxscale/testdata/v24.02.3/maxscale_threads.json similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/testdata/v24.02.3/maxscale_threads.json rename to src/go/plugin/go.d/collector/maxscale/testdata/v24.02.3/maxscale_threads.json diff --git a/src/go/plugin/go.d/modules/maxscale/testdata/v24.02.3/servers.json b/src/go/plugin/go.d/collector/maxscale/testdata/v24.02.3/servers.json similarity index 100% rename from src/go/plugin/go.d/modules/maxscale/testdata/v24.02.3/servers.json rename to src/go/plugin/go.d/collector/maxscale/testdata/v24.02.3/servers.json diff --git a/src/go/plugin/go.d/modules/megacli/README.md b/src/go/plugin/go.d/collector/megacli/README.md similarity index 100% rename from src/go/plugin/go.d/modules/megacli/README.md rename to src/go/plugin/go.d/collector/megacli/README.md diff --git a/src/go/plugin/go.d/modules/megacli/charts.go b/src/go/plugin/go.d/collector/megacli/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/megacli/charts.go rename to src/go/plugin/go.d/collector/megacli/charts.go diff --git a/src/go/plugin/go.d/modules/megacli/collect.go b/src/go/plugin/go.d/collector/megacli/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/megacli/collect.go rename to src/go/plugin/go.d/collector/megacli/collect.go diff --git a/src/go/plugin/go.d/modules/megacli/collect_bbu.go b/src/go/plugin/go.d/collector/megacli/collect_bbu.go similarity index 100% rename from src/go/plugin/go.d/modules/megacli/collect_bbu.go rename to src/go/plugin/go.d/collector/megacli/collect_bbu.go diff --git a/src/go/plugin/go.d/modules/megacli/collect_phys_drives.go b/src/go/plugin/go.d/collector/megacli/collect_phys_drives.go similarity index 100% rename from src/go/plugin/go.d/modules/megacli/collect_phys_drives.go rename to src/go/plugin/go.d/collector/megacli/collect_phys_drives.go diff --git a/src/go/plugin/go.d/modules/megacli/config_schema.json b/src/go/plugin/go.d/collector/megacli/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/megacli/config_schema.json rename to src/go/plugin/go.d/collector/megacli/config_schema.json diff --git a/src/go/plugin/go.d/modules/megacli/doc.go b/src/go/plugin/go.d/collector/megacli/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/megacli/doc.go rename to src/go/plugin/go.d/collector/megacli/doc.go diff --git a/src/go/plugin/go.d/modules/megacli/exec.go b/src/go/plugin/go.d/collector/megacli/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/megacli/exec.go rename to src/go/plugin/go.d/collector/megacli/exec.go diff --git a/src/go/plugin/go.d/modules/megacli/init.go b/src/go/plugin/go.d/collector/megacli/init.go similarity index 100% rename from src/go/plugin/go.d/modules/megacli/init.go rename to src/go/plugin/go.d/collector/megacli/init.go diff --git a/src/go/plugin/go.d/modules/megacli/integrations/megacli_megaraid.md b/src/go/plugin/go.d/collector/megacli/integrations/megacli_megaraid.md similarity index 100% rename from src/go/plugin/go.d/modules/megacli/integrations/megacli_megaraid.md rename to src/go/plugin/go.d/collector/megacli/integrations/megacli_megaraid.md diff --git a/src/go/plugin/go.d/modules/megacli/megacli.go b/src/go/plugin/go.d/collector/megacli/megacli.go similarity index 100% rename from src/go/plugin/go.d/modules/megacli/megacli.go rename to src/go/plugin/go.d/collector/megacli/megacli.go diff --git a/src/go/plugin/go.d/modules/megacli/megacli_test.go b/src/go/plugin/go.d/collector/megacli/megacli_test.go similarity index 100% rename from src/go/plugin/go.d/modules/megacli/megacli_test.go rename to src/go/plugin/go.d/collector/megacli/megacli_test.go diff --git a/src/go/plugin/go.d/modules/megacli/metadata.yaml b/src/go/plugin/go.d/collector/megacli/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/megacli/metadata.yaml rename to src/go/plugin/go.d/collector/megacli/metadata.yaml diff --git a/src/go/plugin/go.d/modules/megacli/testdata/config.json b/src/go/plugin/go.d/collector/megacli/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/megacli/testdata/config.json rename to src/go/plugin/go.d/collector/megacli/testdata/config.json diff --git a/src/go/plugin/go.d/modules/megacli/testdata/config.yaml b/src/go/plugin/go.d/collector/megacli/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/megacli/testdata/config.yaml rename to src/go/plugin/go.d/collector/megacli/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/megacli/testdata/mega-bbu-info-old.txt b/src/go/plugin/go.d/collector/megacli/testdata/mega-bbu-info-old.txt similarity index 100% rename from src/go/plugin/go.d/modules/megacli/testdata/mega-bbu-info-old.txt rename to src/go/plugin/go.d/collector/megacli/testdata/mega-bbu-info-old.txt diff --git a/src/go/plugin/go.d/modules/megacli/testdata/mega-bbu-info-recent.txt b/src/go/plugin/go.d/collector/megacli/testdata/mega-bbu-info-recent.txt similarity index 100% rename from src/go/plugin/go.d/modules/megacli/testdata/mega-bbu-info-recent.txt rename to src/go/plugin/go.d/collector/megacli/testdata/mega-bbu-info-recent.txt diff --git a/src/go/plugin/go.d/modules/megacli/testdata/mega-phys-drives-info.txt b/src/go/plugin/go.d/collector/megacli/testdata/mega-phys-drives-info.txt similarity index 100% rename from src/go/plugin/go.d/modules/megacli/testdata/mega-phys-drives-info.txt rename to src/go/plugin/go.d/collector/megacli/testdata/mega-phys-drives-info.txt diff --git a/src/go/plugin/go.d/modules/memcached/README.md b/src/go/plugin/go.d/collector/memcached/README.md similarity index 100% rename from src/go/plugin/go.d/modules/memcached/README.md rename to src/go/plugin/go.d/collector/memcached/README.md diff --git a/src/go/plugin/go.d/modules/memcached/charts.go b/src/go/plugin/go.d/collector/memcached/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/memcached/charts.go rename to src/go/plugin/go.d/collector/memcached/charts.go diff --git a/src/go/plugin/go.d/modules/memcached/client.go b/src/go/plugin/go.d/collector/memcached/client.go similarity index 100% rename from src/go/plugin/go.d/modules/memcached/client.go rename to src/go/plugin/go.d/collector/memcached/client.go diff --git a/src/go/plugin/go.d/modules/memcached/collect.go b/src/go/plugin/go.d/collector/memcached/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/memcached/collect.go rename to src/go/plugin/go.d/collector/memcached/collect.go diff --git a/src/go/plugin/go.d/modules/memcached/config_schema.json b/src/go/plugin/go.d/collector/memcached/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/memcached/config_schema.json rename to src/go/plugin/go.d/collector/memcached/config_schema.json diff --git a/src/go/plugin/go.d/modules/memcached/integrations/memcached.md b/src/go/plugin/go.d/collector/memcached/integrations/memcached.md similarity index 100% rename from src/go/plugin/go.d/modules/memcached/integrations/memcached.md rename to src/go/plugin/go.d/collector/memcached/integrations/memcached.md diff --git a/src/go/plugin/go.d/modules/memcached/memcached.go b/src/go/plugin/go.d/collector/memcached/memcached.go similarity index 100% rename from src/go/plugin/go.d/modules/memcached/memcached.go rename to src/go/plugin/go.d/collector/memcached/memcached.go diff --git a/src/go/plugin/go.d/modules/memcached/memcached_test.go b/src/go/plugin/go.d/collector/memcached/memcached_test.go similarity index 100% rename from src/go/plugin/go.d/modules/memcached/memcached_test.go rename to src/go/plugin/go.d/collector/memcached/memcached_test.go diff --git a/src/go/plugin/go.d/modules/memcached/metadata.yaml b/src/go/plugin/go.d/collector/memcached/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/memcached/metadata.yaml rename to src/go/plugin/go.d/collector/memcached/metadata.yaml diff --git a/src/go/plugin/go.d/modules/memcached/testdata/config.json b/src/go/plugin/go.d/collector/memcached/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/memcached/testdata/config.json rename to src/go/plugin/go.d/collector/memcached/testdata/config.json diff --git a/src/go/plugin/go.d/modules/memcached/testdata/config.yaml b/src/go/plugin/go.d/collector/memcached/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/memcached/testdata/config.yaml rename to src/go/plugin/go.d/collector/memcached/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/memcached/testdata/stats.txt b/src/go/plugin/go.d/collector/memcached/testdata/stats.txt similarity index 100% rename from src/go/plugin/go.d/modules/memcached/testdata/stats.txt rename to src/go/plugin/go.d/collector/memcached/testdata/stats.txt diff --git a/src/go/plugin/go.d/modules/mongodb/README.md b/src/go/plugin/go.d/collector/mongodb/README.md similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/README.md rename to src/go/plugin/go.d/collector/mongodb/README.md diff --git a/src/go/plugin/go.d/modules/mongodb/charts.go b/src/go/plugin/go.d/collector/mongodb/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/charts.go rename to src/go/plugin/go.d/collector/mongodb/charts.go diff --git a/src/go/plugin/go.d/modules/mongodb/client.go b/src/go/plugin/go.d/collector/mongodb/client.go similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/client.go rename to src/go/plugin/go.d/collector/mongodb/client.go diff --git a/src/go/plugin/go.d/modules/mongodb/collect.go b/src/go/plugin/go.d/collector/mongodb/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/collect.go rename to src/go/plugin/go.d/collector/mongodb/collect.go diff --git a/src/go/plugin/go.d/modules/mongodb/collect_dbstats.go b/src/go/plugin/go.d/collector/mongodb/collect_dbstats.go similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/collect_dbstats.go rename to src/go/plugin/go.d/collector/mongodb/collect_dbstats.go diff --git a/src/go/plugin/go.d/modules/mongodb/collect_replsetgetstatus.go b/src/go/plugin/go.d/collector/mongodb/collect_replsetgetstatus.go similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/collect_replsetgetstatus.go rename to src/go/plugin/go.d/collector/mongodb/collect_replsetgetstatus.go diff --git a/src/go/plugin/go.d/modules/mongodb/collect_serverstatus.go b/src/go/plugin/go.d/collector/mongodb/collect_serverstatus.go similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/collect_serverstatus.go rename to src/go/plugin/go.d/collector/mongodb/collect_serverstatus.go diff --git a/src/go/plugin/go.d/modules/mongodb/collect_sharding.go b/src/go/plugin/go.d/collector/mongodb/collect_sharding.go similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/collect_sharding.go rename to src/go/plugin/go.d/collector/mongodb/collect_sharding.go diff --git a/src/go/plugin/go.d/modules/mongodb/config_schema.json b/src/go/plugin/go.d/collector/mongodb/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/config_schema.json rename to src/go/plugin/go.d/collector/mongodb/config_schema.json diff --git a/src/go/plugin/go.d/modules/mongodb/documents.go b/src/go/plugin/go.d/collector/mongodb/documents.go similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/documents.go rename to src/go/plugin/go.d/collector/mongodb/documents.go diff --git a/src/go/plugin/go.d/modules/mongodb/init.go b/src/go/plugin/go.d/collector/mongodb/init.go similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/init.go rename to src/go/plugin/go.d/collector/mongodb/init.go diff --git a/src/go/plugin/go.d/modules/mongodb/integrations/mongodb.md b/src/go/plugin/go.d/collector/mongodb/integrations/mongodb.md similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/integrations/mongodb.md rename to src/go/plugin/go.d/collector/mongodb/integrations/mongodb.md diff --git a/src/go/plugin/go.d/modules/mongodb/metadata.yaml b/src/go/plugin/go.d/collector/mongodb/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/metadata.yaml rename to src/go/plugin/go.d/collector/mongodb/metadata.yaml diff --git a/src/go/plugin/go.d/modules/mongodb/mongodb.go b/src/go/plugin/go.d/collector/mongodb/mongodb.go similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/mongodb.go rename to src/go/plugin/go.d/collector/mongodb/mongodb.go diff --git a/src/go/plugin/go.d/modules/mongodb/mongodb_test.go b/src/go/plugin/go.d/collector/mongodb/mongodb_test.go similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/mongodb_test.go rename to src/go/plugin/go.d/collector/mongodb/mongodb_test.go diff --git a/src/go/plugin/go.d/modules/mongodb/testdata/config.json b/src/go/plugin/go.d/collector/mongodb/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/testdata/config.json rename to src/go/plugin/go.d/collector/mongodb/testdata/config.json diff --git a/src/go/plugin/go.d/modules/mongodb/testdata/config.yaml b/src/go/plugin/go.d/collector/mongodb/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/testdata/config.yaml rename to src/go/plugin/go.d/collector/mongodb/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/mongodb/testdata/v6.0.3/dbStats.json b/src/go/plugin/go.d/collector/mongodb/testdata/v6.0.3/dbStats.json similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/testdata/v6.0.3/dbStats.json rename to src/go/plugin/go.d/collector/mongodb/testdata/v6.0.3/dbStats.json diff --git a/src/go/plugin/go.d/modules/mongodb/testdata/v6.0.3/mongod-serverStatus.json b/src/go/plugin/go.d/collector/mongodb/testdata/v6.0.3/mongod-serverStatus.json similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/testdata/v6.0.3/mongod-serverStatus.json rename to src/go/plugin/go.d/collector/mongodb/testdata/v6.0.3/mongod-serverStatus.json diff --git a/src/go/plugin/go.d/modules/mongodb/testdata/v6.0.3/mongos-serverStatus.json b/src/go/plugin/go.d/collector/mongodb/testdata/v6.0.3/mongos-serverStatus.json similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/testdata/v6.0.3/mongos-serverStatus.json rename to src/go/plugin/go.d/collector/mongodb/testdata/v6.0.3/mongos-serverStatus.json diff --git a/src/go/plugin/go.d/modules/mongodb/testdata/v6.0.3/replSetGetStatus.json b/src/go/plugin/go.d/collector/mongodb/testdata/v6.0.3/replSetGetStatus.json similarity index 100% rename from src/go/plugin/go.d/modules/mongodb/testdata/v6.0.3/replSetGetStatus.json rename to src/go/plugin/go.d/collector/mongodb/testdata/v6.0.3/replSetGetStatus.json diff --git a/src/go/plugin/go.d/modules/monit/README.md b/src/go/plugin/go.d/collector/monit/README.md similarity index 100% rename from src/go/plugin/go.d/modules/monit/README.md rename to src/go/plugin/go.d/collector/monit/README.md diff --git a/src/go/plugin/go.d/modules/monit/charts.go b/src/go/plugin/go.d/collector/monit/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/monit/charts.go rename to src/go/plugin/go.d/collector/monit/charts.go diff --git a/src/go/plugin/go.d/modules/monit/collect.go b/src/go/plugin/go.d/collector/monit/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/monit/collect.go rename to src/go/plugin/go.d/collector/monit/collect.go diff --git a/src/go/plugin/go.d/modules/monit/config_schema.json b/src/go/plugin/go.d/collector/monit/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/monit/config_schema.json rename to src/go/plugin/go.d/collector/monit/config_schema.json diff --git a/src/go/plugin/go.d/modules/monit/integrations/monit.md b/src/go/plugin/go.d/collector/monit/integrations/monit.md similarity index 100% rename from src/go/plugin/go.d/modules/monit/integrations/monit.md rename to src/go/plugin/go.d/collector/monit/integrations/monit.md diff --git a/src/go/plugin/go.d/modules/monit/metadata.yaml b/src/go/plugin/go.d/collector/monit/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/monit/metadata.yaml rename to src/go/plugin/go.d/collector/monit/metadata.yaml diff --git a/src/go/plugin/go.d/modules/monit/monit.go b/src/go/plugin/go.d/collector/monit/monit.go similarity index 100% rename from src/go/plugin/go.d/modules/monit/monit.go rename to src/go/plugin/go.d/collector/monit/monit.go diff --git a/src/go/plugin/go.d/modules/monit/monit_test.go b/src/go/plugin/go.d/collector/monit/monit_test.go similarity index 100% rename from src/go/plugin/go.d/modules/monit/monit_test.go rename to src/go/plugin/go.d/collector/monit/monit_test.go diff --git a/src/go/plugin/go.d/modules/monit/status.go b/src/go/plugin/go.d/collector/monit/status.go similarity index 100% rename from src/go/plugin/go.d/modules/monit/status.go rename to src/go/plugin/go.d/collector/monit/status.go diff --git a/src/go/plugin/go.d/modules/monit/testdata/config.json b/src/go/plugin/go.d/collector/monit/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/monit/testdata/config.json rename to src/go/plugin/go.d/collector/monit/testdata/config.json diff --git a/src/go/plugin/go.d/modules/monit/testdata/config.yaml b/src/go/plugin/go.d/collector/monit/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/monit/testdata/config.yaml rename to src/go/plugin/go.d/collector/monit/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/monit/testdata/v5.33.0/status.xml b/src/go/plugin/go.d/collector/monit/testdata/v5.33.0/status.xml similarity index 100% rename from src/go/plugin/go.d/modules/monit/testdata/v5.33.0/status.xml rename to src/go/plugin/go.d/collector/monit/testdata/v5.33.0/status.xml diff --git a/src/go/plugin/go.d/modules/mysql/README.md b/src/go/plugin/go.d/collector/mysql/README.md similarity index 100% rename from src/go/plugin/go.d/modules/mysql/README.md rename to src/go/plugin/go.d/collector/mysql/README.md diff --git a/src/go/plugin/go.d/modules/mysql/charts.go b/src/go/plugin/go.d/collector/mysql/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/charts.go rename to src/go/plugin/go.d/collector/mysql/charts.go diff --git a/src/go/plugin/go.d/modules/mysql/collect.go b/src/go/plugin/go.d/collector/mysql/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/collect.go rename to src/go/plugin/go.d/collector/mysql/collect.go diff --git a/src/go/plugin/go.d/modules/mysql/collect_global_status.go b/src/go/plugin/go.d/collector/mysql/collect_global_status.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/collect_global_status.go rename to src/go/plugin/go.d/collector/mysql/collect_global_status.go diff --git a/src/go/plugin/go.d/modules/mysql/collect_global_vars.go b/src/go/plugin/go.d/collector/mysql/collect_global_vars.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/collect_global_vars.go rename to src/go/plugin/go.d/collector/mysql/collect_global_vars.go diff --git a/src/go/plugin/go.d/modules/mysql/collect_process_list.go b/src/go/plugin/go.d/collector/mysql/collect_process_list.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/collect_process_list.go rename to src/go/plugin/go.d/collector/mysql/collect_process_list.go diff --git a/src/go/plugin/go.d/modules/mysql/collect_slave_status.go b/src/go/plugin/go.d/collector/mysql/collect_slave_status.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/collect_slave_status.go rename to src/go/plugin/go.d/collector/mysql/collect_slave_status.go diff --git a/src/go/plugin/go.d/modules/mysql/collect_user_statistics.go b/src/go/plugin/go.d/collector/mysql/collect_user_statistics.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/collect_user_statistics.go rename to src/go/plugin/go.d/collector/mysql/collect_user_statistics.go diff --git a/src/go/plugin/go.d/modules/mysql/collect_version.go b/src/go/plugin/go.d/collector/mysql/collect_version.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/collect_version.go rename to src/go/plugin/go.d/collector/mysql/collect_version.go diff --git a/src/go/plugin/go.d/modules/mysql/config_schema.json b/src/go/plugin/go.d/collector/mysql/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/mysql/config_schema.json rename to src/go/plugin/go.d/collector/mysql/config_schema.json diff --git a/src/go/plugin/go.d/modules/mysql/disable_logging.go b/src/go/plugin/go.d/collector/mysql/disable_logging.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/disable_logging.go rename to src/go/plugin/go.d/collector/mysql/disable_logging.go diff --git a/src/go/plugin/go.d/modules/mysql/integrations/mariadb.md b/src/go/plugin/go.d/collector/mysql/integrations/mariadb.md similarity index 100% rename from src/go/plugin/go.d/modules/mysql/integrations/mariadb.md rename to src/go/plugin/go.d/collector/mysql/integrations/mariadb.md diff --git a/src/go/plugin/go.d/modules/mysql/integrations/mysql.md b/src/go/plugin/go.d/collector/mysql/integrations/mysql.md similarity index 100% rename from src/go/plugin/go.d/modules/mysql/integrations/mysql.md rename to src/go/plugin/go.d/collector/mysql/integrations/mysql.md diff --git a/src/go/plugin/go.d/modules/mysql/integrations/percona_mysql.md b/src/go/plugin/go.d/collector/mysql/integrations/percona_mysql.md similarity index 100% rename from src/go/plugin/go.d/modules/mysql/integrations/percona_mysql.md rename to src/go/plugin/go.d/collector/mysql/integrations/percona_mysql.md diff --git a/src/go/plugin/go.d/modules/mysql/metadata.yaml b/src/go/plugin/go.d/collector/mysql/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/mysql/metadata.yaml rename to src/go/plugin/go.d/collector/mysql/metadata.yaml diff --git a/src/go/plugin/go.d/modules/mysql/mycnf.go b/src/go/plugin/go.d/collector/mysql/mycnf.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/mycnf.go rename to src/go/plugin/go.d/collector/mysql/mycnf.go diff --git a/src/go/plugin/go.d/modules/mysql/mycnf_test.go b/src/go/plugin/go.d/collector/mysql/mycnf_test.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/mycnf_test.go rename to src/go/plugin/go.d/collector/mysql/mycnf_test.go diff --git a/src/go/plugin/go.d/modules/mysql/mysql.go b/src/go/plugin/go.d/collector/mysql/mysql.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/mysql.go rename to src/go/plugin/go.d/collector/mysql/mysql.go diff --git a/src/go/plugin/go.d/modules/mysql/mysql_test.go b/src/go/plugin/go.d/collector/mysql/mysql_test.go similarity index 100% rename from src/go/plugin/go.d/modules/mysql/mysql_test.go rename to src/go/plugin/go.d/collector/mysql/mysql_test.go diff --git a/src/go/plugin/go.d/modules/mysql/testdata/config.json b/src/go/plugin/go.d/collector/mysql/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/config.json rename to src/go/plugin/go.d/collector/mysql/testdata/config.json diff --git a/src/go/plugin/go.d/modules/mysql/testdata/config.yaml b/src/go/plugin/go.d/collector/mysql/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/config.yaml rename to src/go/plugin/go.d/collector/mysql/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_status.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_status.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_status.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_status.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_variables.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_variables.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_variables.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_variables.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/process_list.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4-galera-cluster/process_list.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/process_list.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4-galera-cluster/process_list.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/user_statistics.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4-galera-cluster/user_statistics.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/user_statistics.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4-galera-cluster/user_statistics.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/version.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4-galera-cluster/version.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/version.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4-galera-cluster/version.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_multi_source.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/all_slaves_status_multi_source.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_multi_source.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/all_slaves_status_multi_source.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_single_source.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/all_slaves_status_single_source.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_single_source.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/all_slaves_status_single_source.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/global_status.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/global_status.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/global_status.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/global_status.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/global_variables.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/global_variables.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/global_variables.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/global_variables.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/process_list.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/process_list.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/process_list.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/process_list.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/user_statistics.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/user_statistics.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/user_statistics.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/user_statistics.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/version.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/version.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/version.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v10.8.4/version.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/global_status.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v5.5.64/global_status.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/global_status.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v5.5.64/global_status.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/global_variables.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v5.5.64/global_variables.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/global_variables.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v5.5.64/global_variables.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/process_list.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v5.5.64/process_list.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/process_list.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v5.5.64/process_list.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/version.txt b/src/go/plugin/go.d/collector/mysql/testdata/mariadb/v5.5.64/version.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/version.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mariadb/v5.5.64/version.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/global_status.txt b/src/go/plugin/go.d/collector/mysql/testdata/mysql/v8.0.30/global_status.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/global_status.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mysql/v8.0.30/global_status.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/global_variables.txt b/src/go/plugin/go.d/collector/mysql/testdata/mysql/v8.0.30/global_variables.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/global_variables.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mysql/v8.0.30/global_variables.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/process_list.txt b/src/go/plugin/go.d/collector/mysql/testdata/mysql/v8.0.30/process_list.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/process_list.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mysql/v8.0.30/process_list.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/replica_status_multi_source.txt b/src/go/plugin/go.d/collector/mysql/testdata/mysql/v8.0.30/replica_status_multi_source.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/replica_status_multi_source.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mysql/v8.0.30/replica_status_multi_source.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/version.txt b/src/go/plugin/go.d/collector/mysql/testdata/mysql/v8.0.30/version.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/version.txt rename to src/go/plugin/go.d/collector/mysql/testdata/mysql/v8.0.30/version.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/global_status.txt b/src/go/plugin/go.d/collector/mysql/testdata/percona/v8.0.29/global_status.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/global_status.txt rename to src/go/plugin/go.d/collector/mysql/testdata/percona/v8.0.29/global_status.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/global_variables.txt b/src/go/plugin/go.d/collector/mysql/testdata/percona/v8.0.29/global_variables.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/global_variables.txt rename to src/go/plugin/go.d/collector/mysql/testdata/percona/v8.0.29/global_variables.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/process_list.txt b/src/go/plugin/go.d/collector/mysql/testdata/percona/v8.0.29/process_list.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/process_list.txt rename to src/go/plugin/go.d/collector/mysql/testdata/percona/v8.0.29/process_list.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/user_statistics.txt b/src/go/plugin/go.d/collector/mysql/testdata/percona/v8.0.29/user_statistics.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/user_statistics.txt rename to src/go/plugin/go.d/collector/mysql/testdata/percona/v8.0.29/user_statistics.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/version.txt b/src/go/plugin/go.d/collector/mysql/testdata/percona/v8.0.29/version.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/version.txt rename to src/go/plugin/go.d/collector/mysql/testdata/percona/v8.0.29/version.txt diff --git a/src/go/plugin/go.d/modules/mysql/testdata/session_variables.txt b/src/go/plugin/go.d/collector/mysql/testdata/session_variables.txt similarity index 100% rename from src/go/plugin/go.d/modules/mysql/testdata/session_variables.txt rename to src/go/plugin/go.d/collector/mysql/testdata/session_variables.txt diff --git a/src/go/plugin/go.d/modules/nginx/README.md b/src/go/plugin/go.d/collector/nginx/README.md similarity index 100% rename from src/go/plugin/go.d/modules/nginx/README.md rename to src/go/plugin/go.d/collector/nginx/README.md diff --git a/src/go/plugin/go.d/modules/nginx/charts.go b/src/go/plugin/go.d/collector/nginx/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/nginx/charts.go rename to src/go/plugin/go.d/collector/nginx/charts.go diff --git a/src/go/plugin/go.d/modules/nginx/collect.go b/src/go/plugin/go.d/collector/nginx/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/nginx/collect.go rename to src/go/plugin/go.d/collector/nginx/collect.go diff --git a/src/go/plugin/go.d/modules/nginx/config_schema.json b/src/go/plugin/go.d/collector/nginx/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/nginx/config_schema.json rename to src/go/plugin/go.d/collector/nginx/config_schema.json diff --git a/src/go/plugin/go.d/modules/nginx/integrations/nginx.md b/src/go/plugin/go.d/collector/nginx/integrations/nginx.md similarity index 100% rename from src/go/plugin/go.d/modules/nginx/integrations/nginx.md rename to src/go/plugin/go.d/collector/nginx/integrations/nginx.md diff --git a/src/go/plugin/go.d/modules/nginx/metadata.yaml b/src/go/plugin/go.d/collector/nginx/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nginx/metadata.yaml rename to src/go/plugin/go.d/collector/nginx/metadata.yaml diff --git a/src/go/plugin/go.d/modules/nginx/nginx.go b/src/go/plugin/go.d/collector/nginx/nginx.go similarity index 100% rename from src/go/plugin/go.d/modules/nginx/nginx.go rename to src/go/plugin/go.d/collector/nginx/nginx.go diff --git a/src/go/plugin/go.d/modules/nginx/nginx_test.go b/src/go/plugin/go.d/collector/nginx/nginx_test.go similarity index 100% rename from src/go/plugin/go.d/modules/nginx/nginx_test.go rename to src/go/plugin/go.d/collector/nginx/nginx_test.go diff --git a/src/go/plugin/go.d/modules/nginx/status.go b/src/go/plugin/go.d/collector/nginx/status.go similarity index 100% rename from src/go/plugin/go.d/modules/nginx/status.go rename to src/go/plugin/go.d/collector/nginx/status.go diff --git a/src/go/plugin/go.d/modules/nginx/testdata/config.json b/src/go/plugin/go.d/collector/nginx/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/nginx/testdata/config.json rename to src/go/plugin/go.d/collector/nginx/testdata/config.json diff --git a/src/go/plugin/go.d/modules/nginx/testdata/config.yaml b/src/go/plugin/go.d/collector/nginx/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nginx/testdata/config.yaml rename to src/go/plugin/go.d/collector/nginx/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/nginx/testdata/status.txt b/src/go/plugin/go.d/collector/nginx/testdata/status.txt similarity index 100% rename from src/go/plugin/go.d/modules/nginx/testdata/status.txt rename to src/go/plugin/go.d/collector/nginx/testdata/status.txt diff --git a/src/go/plugin/go.d/modules/nginx/testdata/tengine-status.txt b/src/go/plugin/go.d/collector/nginx/testdata/tengine-status.txt similarity index 100% rename from src/go/plugin/go.d/modules/nginx/testdata/tengine-status.txt rename to src/go/plugin/go.d/collector/nginx/testdata/tengine-status.txt diff --git a/src/go/plugin/go.d/modules/nginxplus/README.md b/src/go/plugin/go.d/collector/nginxplus/README.md similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/README.md rename to src/go/plugin/go.d/collector/nginxplus/README.md diff --git a/src/go/plugin/go.d/modules/nginxplus/cache.go b/src/go/plugin/go.d/collector/nginxplus/cache.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/cache.go rename to src/go/plugin/go.d/collector/nginxplus/cache.go diff --git a/src/go/plugin/go.d/modules/nginxplus/charts.go b/src/go/plugin/go.d/collector/nginxplus/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/charts.go rename to src/go/plugin/go.d/collector/nginxplus/charts.go diff --git a/src/go/plugin/go.d/modules/nginxplus/collect.go b/src/go/plugin/go.d/collector/nginxplus/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/collect.go rename to src/go/plugin/go.d/collector/nginxplus/collect.go diff --git a/src/go/plugin/go.d/modules/nginxplus/config_schema.json b/src/go/plugin/go.d/collector/nginxplus/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/config_schema.json rename to src/go/plugin/go.d/collector/nginxplus/config_schema.json diff --git a/src/go/plugin/go.d/modules/nginxplus/integrations/nginx_plus.md b/src/go/plugin/go.d/collector/nginxplus/integrations/nginx_plus.md similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/integrations/nginx_plus.md rename to src/go/plugin/go.d/collector/nginxplus/integrations/nginx_plus.md diff --git a/src/go/plugin/go.d/modules/nginxplus/metadata.yaml b/src/go/plugin/go.d/collector/nginxplus/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/metadata.yaml rename to src/go/plugin/go.d/collector/nginxplus/metadata.yaml diff --git a/src/go/plugin/go.d/modules/nginxplus/nginx_http_api.go b/src/go/plugin/go.d/collector/nginxplus/nginx_http_api.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/nginx_http_api.go rename to src/go/plugin/go.d/collector/nginxplus/nginx_http_api.go diff --git a/src/go/plugin/go.d/modules/nginxplus/nginx_http_api_query.go b/src/go/plugin/go.d/collector/nginxplus/nginx_http_api_query.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/nginx_http_api_query.go rename to src/go/plugin/go.d/collector/nginxplus/nginx_http_api_query.go diff --git a/src/go/plugin/go.d/modules/nginxplus/nginxplus.go b/src/go/plugin/go.d/collector/nginxplus/nginxplus.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/nginxplus.go rename to src/go/plugin/go.d/collector/nginxplus/nginxplus.go diff --git a/src/go/plugin/go.d/modules/nginxplus/nginxplus_test.go b/src/go/plugin/go.d/collector/nginxplus/nginxplus_test.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/nginxplus_test.go rename to src/go/plugin/go.d/collector/nginxplus/nginxplus_test.go diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/404.json b/src/go/plugin/go.d/collector/nginxplus/testdata/404.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/404.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/404.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/api_versions.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/api_versions.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/api_versions.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/api_versions.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/connections.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/connections.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/connections.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/connections.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/endpoints_http.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/endpoints_http.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/endpoints_http.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/endpoints_http.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/endpoints_root.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/endpoints_root.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/endpoints_root.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/endpoints_root.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/endpoints_stream.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/endpoints_stream.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/endpoints_stream.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/endpoints_stream.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/http_caches.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/http_caches.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/http_caches.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/http_caches.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/http_location_zones.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/http_location_zones.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/http_location_zones.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/http_location_zones.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/http_requests.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/http_requests.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/http_requests.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/http_requests.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/http_server_zones.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/http_server_zones.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/http_server_zones.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/http_server_zones.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/http_upstreams.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/http_upstreams.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/http_upstreams.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/http_upstreams.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/nginx.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/nginx.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/nginx.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/nginx.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/resolvers.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/resolvers.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/resolvers.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/resolvers.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/ssl.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/ssl.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/ssl.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/ssl.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/stream_server_zones.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/stream_server_zones.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/stream_server_zones.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/stream_server_zones.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/api-8/stream_upstreams.json b/src/go/plugin/go.d/collector/nginxplus/testdata/api-8/stream_upstreams.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/api-8/stream_upstreams.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/api-8/stream_upstreams.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/config.json b/src/go/plugin/go.d/collector/nginxplus/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/config.json rename to src/go/plugin/go.d/collector/nginxplus/testdata/config.json diff --git a/src/go/plugin/go.d/modules/nginxplus/testdata/config.yaml b/src/go/plugin/go.d/collector/nginxplus/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nginxplus/testdata/config.yaml rename to src/go/plugin/go.d/collector/nginxplus/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/nginxunit/README.md b/src/go/plugin/go.d/collector/nginxunit/README.md similarity index 100% rename from src/go/plugin/go.d/modules/nginxunit/README.md rename to src/go/plugin/go.d/collector/nginxunit/README.md diff --git a/src/go/plugin/go.d/modules/nginxunit/charts.go b/src/go/plugin/go.d/collector/nginxunit/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxunit/charts.go rename to src/go/plugin/go.d/collector/nginxunit/charts.go diff --git a/src/go/plugin/go.d/modules/nginxunit/collect.go b/src/go/plugin/go.d/collector/nginxunit/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxunit/collect.go rename to src/go/plugin/go.d/collector/nginxunit/collect.go diff --git a/src/go/plugin/go.d/modules/nginxunit/config_schema.json b/src/go/plugin/go.d/collector/nginxunit/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxunit/config_schema.json rename to src/go/plugin/go.d/collector/nginxunit/config_schema.json diff --git a/src/go/plugin/go.d/modules/nginxunit/integrations/nginx_unit.md b/src/go/plugin/go.d/collector/nginxunit/integrations/nginx_unit.md similarity index 100% rename from src/go/plugin/go.d/modules/nginxunit/integrations/nginx_unit.md rename to src/go/plugin/go.d/collector/nginxunit/integrations/nginx_unit.md diff --git a/src/go/plugin/go.d/modules/nginxunit/metadata.yaml b/src/go/plugin/go.d/collector/nginxunit/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nginxunit/metadata.yaml rename to src/go/plugin/go.d/collector/nginxunit/metadata.yaml diff --git a/src/go/plugin/go.d/modules/nginxunit/nginxunit.go b/src/go/plugin/go.d/collector/nginxunit/nginxunit.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxunit/nginxunit.go rename to src/go/plugin/go.d/collector/nginxunit/nginxunit.go diff --git a/src/go/plugin/go.d/modules/nginxunit/nginxunit_test.go b/src/go/plugin/go.d/collector/nginxunit/nginxunit_test.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxunit/nginxunit_test.go rename to src/go/plugin/go.d/collector/nginxunit/nginxunit_test.go diff --git a/src/go/plugin/go.d/modules/nginxunit/testdata/config.json b/src/go/plugin/go.d/collector/nginxunit/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxunit/testdata/config.json rename to src/go/plugin/go.d/collector/nginxunit/testdata/config.json diff --git a/src/go/plugin/go.d/modules/nginxunit/testdata/config.yaml b/src/go/plugin/go.d/collector/nginxunit/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nginxunit/testdata/config.yaml rename to src/go/plugin/go.d/collector/nginxunit/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/nginxunit/testdata/v1.29.1/status.json b/src/go/plugin/go.d/collector/nginxunit/testdata/v1.29.1/status.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxunit/testdata/v1.29.1/status.json rename to src/go/plugin/go.d/collector/nginxunit/testdata/v1.29.1/status.json diff --git a/src/go/plugin/go.d/modules/nginxvts/README.md b/src/go/plugin/go.d/collector/nginxvts/README.md similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/README.md rename to src/go/plugin/go.d/collector/nginxvts/README.md diff --git a/src/go/plugin/go.d/modules/nginxvts/charts.go b/src/go/plugin/go.d/collector/nginxvts/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/charts.go rename to src/go/plugin/go.d/collector/nginxvts/charts.go diff --git a/src/go/plugin/go.d/modules/nginxvts/collect.go b/src/go/plugin/go.d/collector/nginxvts/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/collect.go rename to src/go/plugin/go.d/collector/nginxvts/collect.go diff --git a/src/go/plugin/go.d/modules/nginxvts/config_schema.json b/src/go/plugin/go.d/collector/nginxvts/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/config_schema.json rename to src/go/plugin/go.d/collector/nginxvts/config_schema.json diff --git a/src/go/plugin/go.d/modules/nginxvts/init.go b/src/go/plugin/go.d/collector/nginxvts/init.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/init.go rename to src/go/plugin/go.d/collector/nginxvts/init.go diff --git a/src/go/plugin/go.d/modules/nginxvts/integrations/nginx_vts.md b/src/go/plugin/go.d/collector/nginxvts/integrations/nginx_vts.md similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/integrations/nginx_vts.md rename to src/go/plugin/go.d/collector/nginxvts/integrations/nginx_vts.md diff --git a/src/go/plugin/go.d/modules/nginxvts/metadata.yaml b/src/go/plugin/go.d/collector/nginxvts/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/metadata.yaml rename to src/go/plugin/go.d/collector/nginxvts/metadata.yaml diff --git a/src/go/plugin/go.d/modules/nginxvts/metrics.go b/src/go/plugin/go.d/collector/nginxvts/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/metrics.go rename to src/go/plugin/go.d/collector/nginxvts/metrics.go diff --git a/src/go/plugin/go.d/modules/nginxvts/nginxvts.go b/src/go/plugin/go.d/collector/nginxvts/nginxvts.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/nginxvts.go rename to src/go/plugin/go.d/collector/nginxvts/nginxvts.go diff --git a/src/go/plugin/go.d/modules/nginxvts/nginxvts_test.go b/src/go/plugin/go.d/collector/nginxvts/nginxvts_test.go similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/nginxvts_test.go rename to src/go/plugin/go.d/collector/nginxvts/nginxvts_test.go diff --git a/src/go/plugin/go.d/modules/nginxvts/testdata/config.json b/src/go/plugin/go.d/collector/nginxvts/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/testdata/config.json rename to src/go/plugin/go.d/collector/nginxvts/testdata/config.json diff --git a/src/go/plugin/go.d/modules/nginxvts/testdata/config.yaml b/src/go/plugin/go.d/collector/nginxvts/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/testdata/config.yaml rename to src/go/plugin/go.d/collector/nginxvts/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/nginxvts/testdata/vts-v0.1.18.json b/src/go/plugin/go.d/collector/nginxvts/testdata/vts-v0.1.18.json similarity index 100% rename from src/go/plugin/go.d/modules/nginxvts/testdata/vts-v0.1.18.json rename to src/go/plugin/go.d/collector/nginxvts/testdata/vts-v0.1.18.json diff --git a/src/go/plugin/go.d/modules/nsd/README.md b/src/go/plugin/go.d/collector/nsd/README.md similarity index 100% rename from src/go/plugin/go.d/modules/nsd/README.md rename to src/go/plugin/go.d/collector/nsd/README.md diff --git a/src/go/plugin/go.d/modules/nsd/charts.go b/src/go/plugin/go.d/collector/nsd/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/nsd/charts.go rename to src/go/plugin/go.d/collector/nsd/charts.go diff --git a/src/go/plugin/go.d/modules/nsd/collect.go b/src/go/plugin/go.d/collector/nsd/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/nsd/collect.go rename to src/go/plugin/go.d/collector/nsd/collect.go diff --git a/src/go/plugin/go.d/modules/nsd/config_schema.json b/src/go/plugin/go.d/collector/nsd/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/nsd/config_schema.json rename to src/go/plugin/go.d/collector/nsd/config_schema.json diff --git a/src/go/plugin/go.d/modules/nsd/doc.go b/src/go/plugin/go.d/collector/nsd/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/nsd/doc.go rename to src/go/plugin/go.d/collector/nsd/doc.go diff --git a/src/go/plugin/go.d/modules/nsd/exec.go b/src/go/plugin/go.d/collector/nsd/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/nsd/exec.go rename to src/go/plugin/go.d/collector/nsd/exec.go diff --git a/src/go/plugin/go.d/modules/nsd/init.go b/src/go/plugin/go.d/collector/nsd/init.go similarity index 100% rename from src/go/plugin/go.d/modules/nsd/init.go rename to src/go/plugin/go.d/collector/nsd/init.go diff --git a/src/go/plugin/go.d/modules/nsd/integrations/nsd.md b/src/go/plugin/go.d/collector/nsd/integrations/nsd.md similarity index 100% rename from src/go/plugin/go.d/modules/nsd/integrations/nsd.md rename to src/go/plugin/go.d/collector/nsd/integrations/nsd.md diff --git a/src/go/plugin/go.d/modules/nsd/metadata.yaml b/src/go/plugin/go.d/collector/nsd/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nsd/metadata.yaml rename to src/go/plugin/go.d/collector/nsd/metadata.yaml diff --git a/src/go/plugin/go.d/modules/nsd/nsd.go b/src/go/plugin/go.d/collector/nsd/nsd.go similarity index 100% rename from src/go/plugin/go.d/modules/nsd/nsd.go rename to src/go/plugin/go.d/collector/nsd/nsd.go diff --git a/src/go/plugin/go.d/modules/nsd/nsd_test.go b/src/go/plugin/go.d/collector/nsd/nsd_test.go similarity index 100% rename from src/go/plugin/go.d/modules/nsd/nsd_test.go rename to src/go/plugin/go.d/collector/nsd/nsd_test.go diff --git a/src/go/plugin/go.d/modules/nsd/stats_counters.go b/src/go/plugin/go.d/collector/nsd/stats_counters.go similarity index 100% rename from src/go/plugin/go.d/modules/nsd/stats_counters.go rename to src/go/plugin/go.d/collector/nsd/stats_counters.go diff --git a/src/go/plugin/go.d/modules/nsd/testdata/config.json b/src/go/plugin/go.d/collector/nsd/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/nsd/testdata/config.json rename to src/go/plugin/go.d/collector/nsd/testdata/config.json diff --git a/src/go/plugin/go.d/modules/nsd/testdata/config.yaml b/src/go/plugin/go.d/collector/nsd/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nsd/testdata/config.yaml rename to src/go/plugin/go.d/collector/nsd/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/nsd/testdata/stats.txt b/src/go/plugin/go.d/collector/nsd/testdata/stats.txt similarity index 100% rename from src/go/plugin/go.d/modules/nsd/testdata/stats.txt rename to src/go/plugin/go.d/collector/nsd/testdata/stats.txt diff --git a/src/go/plugin/go.d/modules/ntpd/README.md b/src/go/plugin/go.d/collector/ntpd/README.md similarity index 100% rename from src/go/plugin/go.d/modules/ntpd/README.md rename to src/go/plugin/go.d/collector/ntpd/README.md diff --git a/src/go/plugin/go.d/modules/ntpd/charts.go b/src/go/plugin/go.d/collector/ntpd/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/ntpd/charts.go rename to src/go/plugin/go.d/collector/ntpd/charts.go diff --git a/src/go/plugin/go.d/modules/ntpd/client.go b/src/go/plugin/go.d/collector/ntpd/client.go similarity index 100% rename from src/go/plugin/go.d/modules/ntpd/client.go rename to src/go/plugin/go.d/collector/ntpd/client.go diff --git a/src/go/plugin/go.d/modules/ntpd/collect.go b/src/go/plugin/go.d/collector/ntpd/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/ntpd/collect.go rename to src/go/plugin/go.d/collector/ntpd/collect.go diff --git a/src/go/plugin/go.d/modules/ntpd/config_schema.json b/src/go/plugin/go.d/collector/ntpd/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/ntpd/config_schema.json rename to src/go/plugin/go.d/collector/ntpd/config_schema.json diff --git a/src/go/plugin/go.d/modules/ntpd/integrations/ntpd.md b/src/go/plugin/go.d/collector/ntpd/integrations/ntpd.md similarity index 100% rename from src/go/plugin/go.d/modules/ntpd/integrations/ntpd.md rename to src/go/plugin/go.d/collector/ntpd/integrations/ntpd.md diff --git a/src/go/plugin/go.d/modules/ntpd/metadata.yaml b/src/go/plugin/go.d/collector/ntpd/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/ntpd/metadata.yaml rename to src/go/plugin/go.d/collector/ntpd/metadata.yaml diff --git a/src/go/plugin/go.d/modules/ntpd/ntpd.go b/src/go/plugin/go.d/collector/ntpd/ntpd.go similarity index 100% rename from src/go/plugin/go.d/modules/ntpd/ntpd.go rename to src/go/plugin/go.d/collector/ntpd/ntpd.go diff --git a/src/go/plugin/go.d/modules/ntpd/ntpd_test.go b/src/go/plugin/go.d/collector/ntpd/ntpd_test.go similarity index 100% rename from src/go/plugin/go.d/modules/ntpd/ntpd_test.go rename to src/go/plugin/go.d/collector/ntpd/ntpd_test.go diff --git a/src/go/plugin/go.d/modules/ntpd/testdata/config.json b/src/go/plugin/go.d/collector/ntpd/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/ntpd/testdata/config.json rename to src/go/plugin/go.d/collector/ntpd/testdata/config.json diff --git a/src/go/plugin/go.d/modules/ntpd/testdata/config.yaml b/src/go/plugin/go.d/collector/ntpd/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/ntpd/testdata/config.yaml rename to src/go/plugin/go.d/collector/ntpd/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/nvidia_smi/README.md b/src/go/plugin/go.d/collector/nvidia_smi/README.md similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/README.md rename to src/go/plugin/go.d/collector/nvidia_smi/README.md diff --git a/src/go/plugin/go.d/modules/nvidia_smi/charts.go b/src/go/plugin/go.d/collector/nvidia_smi/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/charts.go rename to src/go/plugin/go.d/collector/nvidia_smi/charts.go diff --git a/src/go/plugin/go.d/modules/nvidia_smi/collect.go b/src/go/plugin/go.d/collector/nvidia_smi/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/collect.go rename to src/go/plugin/go.d/collector/nvidia_smi/collect.go diff --git a/src/go/plugin/go.d/modules/nvidia_smi/config_schema.json b/src/go/plugin/go.d/collector/nvidia_smi/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/config_schema.json rename to src/go/plugin/go.d/collector/nvidia_smi/config_schema.json diff --git a/src/go/plugin/go.d/modules/nvidia_smi/exec.go b/src/go/plugin/go.d/collector/nvidia_smi/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/exec.go rename to src/go/plugin/go.d/collector/nvidia_smi/exec.go diff --git a/src/go/plugin/go.d/modules/nvidia_smi/gpu_info.go b/src/go/plugin/go.d/collector/nvidia_smi/gpu_info.go similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/gpu_info.go rename to src/go/plugin/go.d/collector/nvidia_smi/gpu_info.go diff --git a/src/go/plugin/go.d/modules/nvidia_smi/init.go b/src/go/plugin/go.d/collector/nvidia_smi/init.go similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/init.go rename to src/go/plugin/go.d/collector/nvidia_smi/init.go diff --git a/src/go/plugin/go.d/modules/nvidia_smi/integrations/nvidia_gpu.md b/src/go/plugin/go.d/collector/nvidia_smi/integrations/nvidia_gpu.md similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/integrations/nvidia_gpu.md rename to src/go/plugin/go.d/collector/nvidia_smi/integrations/nvidia_gpu.md diff --git a/src/go/plugin/go.d/modules/nvidia_smi/metadata.yaml b/src/go/plugin/go.d/collector/nvidia_smi/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/metadata.yaml rename to src/go/plugin/go.d/collector/nvidia_smi/metadata.yaml diff --git a/src/go/plugin/go.d/modules/nvidia_smi/nvidia_smi.go b/src/go/plugin/go.d/collector/nvidia_smi/nvidia_smi.go similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/nvidia_smi.go rename to src/go/plugin/go.d/collector/nvidia_smi/nvidia_smi.go diff --git a/src/go/plugin/go.d/modules/nvidia_smi/nvidia_smi_test.go b/src/go/plugin/go.d/collector/nvidia_smi/nvidia_smi_test.go similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/nvidia_smi_test.go rename to src/go/plugin/go.d/collector/nvidia_smi/nvidia_smi_test.go diff --git a/src/go/plugin/go.d/modules/nvidia_smi/testdata/a100-sxm4-mig.xml b/src/go/plugin/go.d/collector/nvidia_smi/testdata/a100-sxm4-mig.xml similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/testdata/a100-sxm4-mig.xml rename to src/go/plugin/go.d/collector/nvidia_smi/testdata/a100-sxm4-mig.xml diff --git a/src/go/plugin/go.d/modules/nvidia_smi/testdata/config.json b/src/go/plugin/go.d/collector/nvidia_smi/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/testdata/config.json rename to src/go/plugin/go.d/collector/nvidia_smi/testdata/config.json diff --git a/src/go/plugin/go.d/modules/nvidia_smi/testdata/config.yaml b/src/go/plugin/go.d/collector/nvidia_smi/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/testdata/config.yaml rename to src/go/plugin/go.d/collector/nvidia_smi/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/nvidia_smi/testdata/rtx-2080-win.xml b/src/go/plugin/go.d/collector/nvidia_smi/testdata/rtx-2080-win.xml similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/testdata/rtx-2080-win.xml rename to src/go/plugin/go.d/collector/nvidia_smi/testdata/rtx-2080-win.xml diff --git a/src/go/plugin/go.d/modules/nvidia_smi/testdata/rtx-3060.xml b/src/go/plugin/go.d/collector/nvidia_smi/testdata/rtx-3060.xml similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/testdata/rtx-3060.xml rename to src/go/plugin/go.d/collector/nvidia_smi/testdata/rtx-3060.xml diff --git a/src/go/plugin/go.d/modules/nvidia_smi/testdata/rtx-4090-driver-535.xml b/src/go/plugin/go.d/collector/nvidia_smi/testdata/rtx-4090-driver-535.xml similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/testdata/rtx-4090-driver-535.xml rename to src/go/plugin/go.d/collector/nvidia_smi/testdata/rtx-4090-driver-535.xml diff --git a/src/go/plugin/go.d/modules/nvidia_smi/testdata/tesla-p100.xml b/src/go/plugin/go.d/collector/nvidia_smi/testdata/tesla-p100.xml similarity index 100% rename from src/go/plugin/go.d/modules/nvidia_smi/testdata/tesla-p100.xml rename to src/go/plugin/go.d/collector/nvidia_smi/testdata/tesla-p100.xml diff --git a/src/go/plugin/go.d/modules/nvme/README.md b/src/go/plugin/go.d/collector/nvme/README.md similarity index 100% rename from src/go/plugin/go.d/modules/nvme/README.md rename to src/go/plugin/go.d/collector/nvme/README.md diff --git a/src/go/plugin/go.d/modules/nvme/charts.go b/src/go/plugin/go.d/collector/nvme/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/nvme/charts.go rename to src/go/plugin/go.d/collector/nvme/charts.go diff --git a/src/go/plugin/go.d/modules/nvme/collect.go b/src/go/plugin/go.d/collector/nvme/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/nvme/collect.go rename to src/go/plugin/go.d/collector/nvme/collect.go diff --git a/src/go/plugin/go.d/modules/nvme/config_schema.json b/src/go/plugin/go.d/collector/nvme/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/nvme/config_schema.json rename to src/go/plugin/go.d/collector/nvme/config_schema.json diff --git a/src/go/plugin/go.d/modules/nvme/doc.go b/src/go/plugin/go.d/collector/nvme/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/nvme/doc.go rename to src/go/plugin/go.d/collector/nvme/doc.go diff --git a/src/go/plugin/go.d/modules/nvme/exec.go b/src/go/plugin/go.d/collector/nvme/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/nvme/exec.go rename to src/go/plugin/go.d/collector/nvme/exec.go diff --git a/src/go/plugin/go.d/modules/nvme/init.go b/src/go/plugin/go.d/collector/nvme/init.go similarity index 100% rename from src/go/plugin/go.d/modules/nvme/init.go rename to src/go/plugin/go.d/collector/nvme/init.go diff --git a/src/go/plugin/go.d/modules/nvme/integrations/nvme_devices.md b/src/go/plugin/go.d/collector/nvme/integrations/nvme_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/nvme/integrations/nvme_devices.md rename to src/go/plugin/go.d/collector/nvme/integrations/nvme_devices.md diff --git a/src/go/plugin/go.d/modules/nvme/metadata.yaml b/src/go/plugin/go.d/collector/nvme/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nvme/metadata.yaml rename to src/go/plugin/go.d/collector/nvme/metadata.yaml diff --git a/src/go/plugin/go.d/modules/nvme/nvme.go b/src/go/plugin/go.d/collector/nvme/nvme.go similarity index 100% rename from src/go/plugin/go.d/modules/nvme/nvme.go rename to src/go/plugin/go.d/collector/nvme/nvme.go diff --git a/src/go/plugin/go.d/modules/nvme/nvme_test.go b/src/go/plugin/go.d/collector/nvme/nvme_test.go similarity index 100% rename from src/go/plugin/go.d/modules/nvme/nvme_test.go rename to src/go/plugin/go.d/collector/nvme/nvme_test.go diff --git a/src/go/plugin/go.d/modules/nvme/testdata/config.json b/src/go/plugin/go.d/collector/nvme/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/nvme/testdata/config.json rename to src/go/plugin/go.d/collector/nvme/testdata/config.json diff --git a/src/go/plugin/go.d/modules/nvme/testdata/config.yaml b/src/go/plugin/go.d/collector/nvme/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/nvme/testdata/config.yaml rename to src/go/plugin/go.d/collector/nvme/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/nvme/testdata/nvme-list-empty.json b/src/go/plugin/go.d/collector/nvme/testdata/nvme-list-empty.json similarity index 100% rename from src/go/plugin/go.d/modules/nvme/testdata/nvme-list-empty.json rename to src/go/plugin/go.d/collector/nvme/testdata/nvme-list-empty.json diff --git a/src/go/plugin/go.d/modules/nvme/testdata/nvme-list.json b/src/go/plugin/go.d/collector/nvme/testdata/nvme-list.json similarity index 100% rename from src/go/plugin/go.d/modules/nvme/testdata/nvme-list.json rename to src/go/plugin/go.d/collector/nvme/testdata/nvme-list.json diff --git a/src/go/plugin/go.d/modules/nvme/testdata/nvme-smart-log-float.json b/src/go/plugin/go.d/collector/nvme/testdata/nvme-smart-log-float.json similarity index 100% rename from src/go/plugin/go.d/modules/nvme/testdata/nvme-smart-log-float.json rename to src/go/plugin/go.d/collector/nvme/testdata/nvme-smart-log-float.json diff --git a/src/go/plugin/go.d/modules/nvme/testdata/nvme-smart-log-string.json b/src/go/plugin/go.d/collector/nvme/testdata/nvme-smart-log-string.json similarity index 100% rename from src/go/plugin/go.d/modules/nvme/testdata/nvme-smart-log-string.json rename to src/go/plugin/go.d/collector/nvme/testdata/nvme-smart-log-string.json diff --git a/src/go/plugin/go.d/modules/nvme/testdata/nvme-smart-log.json b/src/go/plugin/go.d/collector/nvme/testdata/nvme-smart-log.json similarity index 100% rename from src/go/plugin/go.d/modules/nvme/testdata/nvme-smart-log.json rename to src/go/plugin/go.d/collector/nvme/testdata/nvme-smart-log.json diff --git a/src/go/plugin/go.d/modules/openldap/README.md b/src/go/plugin/go.d/collector/openldap/README.md similarity index 100% rename from src/go/plugin/go.d/modules/openldap/README.md rename to src/go/plugin/go.d/collector/openldap/README.md diff --git a/src/go/plugin/go.d/modules/openldap/charts.go b/src/go/plugin/go.d/collector/openldap/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/openldap/charts.go rename to src/go/plugin/go.d/collector/openldap/charts.go diff --git a/src/go/plugin/go.d/modules/openldap/client.go b/src/go/plugin/go.d/collector/openldap/client.go similarity index 100% rename from src/go/plugin/go.d/modules/openldap/client.go rename to src/go/plugin/go.d/collector/openldap/client.go diff --git a/src/go/plugin/go.d/modules/openldap/collect.go b/src/go/plugin/go.d/collector/openldap/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/openldap/collect.go rename to src/go/plugin/go.d/collector/openldap/collect.go diff --git a/src/go/plugin/go.d/modules/openldap/collect_mon_counters.go b/src/go/plugin/go.d/collector/openldap/collect_mon_counters.go similarity index 100% rename from src/go/plugin/go.d/modules/openldap/collect_mon_counters.go rename to src/go/plugin/go.d/collector/openldap/collect_mon_counters.go diff --git a/src/go/plugin/go.d/modules/openldap/collect_operations.go b/src/go/plugin/go.d/collector/openldap/collect_operations.go similarity index 100% rename from src/go/plugin/go.d/modules/openldap/collect_operations.go rename to src/go/plugin/go.d/collector/openldap/collect_operations.go diff --git a/src/go/plugin/go.d/modules/openldap/config_schema.json b/src/go/plugin/go.d/collector/openldap/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/openldap/config_schema.json rename to src/go/plugin/go.d/collector/openldap/config_schema.json diff --git a/src/go/plugin/go.d/modules/openldap/integrations/openldap.md b/src/go/plugin/go.d/collector/openldap/integrations/openldap.md similarity index 100% rename from src/go/plugin/go.d/modules/openldap/integrations/openldap.md rename to src/go/plugin/go.d/collector/openldap/integrations/openldap.md diff --git a/src/go/plugin/go.d/modules/openldap/metadata.yaml b/src/go/plugin/go.d/collector/openldap/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/openldap/metadata.yaml rename to src/go/plugin/go.d/collector/openldap/metadata.yaml diff --git a/src/go/plugin/go.d/modules/openldap/openldap.go b/src/go/plugin/go.d/collector/openldap/openldap.go similarity index 100% rename from src/go/plugin/go.d/modules/openldap/openldap.go rename to src/go/plugin/go.d/collector/openldap/openldap.go diff --git a/src/go/plugin/go.d/modules/openldap/openldap_test.go b/src/go/plugin/go.d/collector/openldap/openldap_test.go similarity index 100% rename from src/go/plugin/go.d/modules/openldap/openldap_test.go rename to src/go/plugin/go.d/collector/openldap/openldap_test.go diff --git a/src/go/plugin/go.d/modules/openldap/testdata/config.json b/src/go/plugin/go.d/collector/openldap/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/openldap/testdata/config.json rename to src/go/plugin/go.d/collector/openldap/testdata/config.json diff --git a/src/go/plugin/go.d/modules/openldap/testdata/config.yaml b/src/go/plugin/go.d/collector/openldap/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/openldap/testdata/config.yaml rename to src/go/plugin/go.d/collector/openldap/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/openvpn/README.md b/src/go/plugin/go.d/collector/openvpn/README.md similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/README.md rename to src/go/plugin/go.d/collector/openvpn/README.md diff --git a/src/go/plugin/go.d/modules/openvpn/charts.go b/src/go/plugin/go.d/collector/openvpn/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/charts.go rename to src/go/plugin/go.d/collector/openvpn/charts.go diff --git a/src/go/plugin/go.d/modules/openvpn/client/client.go b/src/go/plugin/go.d/collector/openvpn/client/client.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/client/client.go rename to src/go/plugin/go.d/collector/openvpn/client/client.go diff --git a/src/go/plugin/go.d/modules/openvpn/client/client_test.go b/src/go/plugin/go.d/collector/openvpn/client/client_test.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/client/client_test.go rename to src/go/plugin/go.d/collector/openvpn/client/client_test.go diff --git a/src/go/plugin/go.d/modules/openvpn/client/commands.go b/src/go/plugin/go.d/collector/openvpn/client/commands.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/client/commands.go rename to src/go/plugin/go.d/collector/openvpn/client/commands.go diff --git a/src/go/plugin/go.d/modules/openvpn/client/testdata/load-stats.txt b/src/go/plugin/go.d/collector/openvpn/client/testdata/load-stats.txt similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/client/testdata/load-stats.txt rename to src/go/plugin/go.d/collector/openvpn/client/testdata/load-stats.txt diff --git a/src/go/plugin/go.d/modules/openvpn/client/testdata/status3.txt b/src/go/plugin/go.d/collector/openvpn/client/testdata/status3.txt similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/client/testdata/status3.txt rename to src/go/plugin/go.d/collector/openvpn/client/testdata/status3.txt diff --git a/src/go/plugin/go.d/modules/openvpn/client/testdata/version.txt b/src/go/plugin/go.d/collector/openvpn/client/testdata/version.txt similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/client/testdata/version.txt rename to src/go/plugin/go.d/collector/openvpn/client/testdata/version.txt diff --git a/src/go/plugin/go.d/modules/openvpn/client/types.go b/src/go/plugin/go.d/collector/openvpn/client/types.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/client/types.go rename to src/go/plugin/go.d/collector/openvpn/client/types.go diff --git a/src/go/plugin/go.d/modules/openvpn/collect.go b/src/go/plugin/go.d/collector/openvpn/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/collect.go rename to src/go/plugin/go.d/collector/openvpn/collect.go diff --git a/src/go/plugin/go.d/modules/openvpn/config_schema.json b/src/go/plugin/go.d/collector/openvpn/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/config_schema.json rename to src/go/plugin/go.d/collector/openvpn/config_schema.json diff --git a/src/go/plugin/go.d/modules/openvpn/init.go b/src/go/plugin/go.d/collector/openvpn/init.go similarity index 88% rename from src/go/plugin/go.d/modules/openvpn/init.go rename to src/go/plugin/go.d/collector/openvpn/init.go index 76fc666144089b..1150e52675c945 100644 --- a/src/go/plugin/go.d/modules/openvpn/init.go +++ b/src/go/plugin/go.d/collector/openvpn/init.go @@ -4,7 +4,7 @@ package openvpn import ( "github.com/netdata/netdata/go/plugins/pkg/matcher" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/openvpn/client" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/openvpn/client" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket" ) diff --git a/src/go/plugin/go.d/modules/openvpn/integrations/openvpn.md b/src/go/plugin/go.d/collector/openvpn/integrations/openvpn.md similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/integrations/openvpn.md rename to src/go/plugin/go.d/collector/openvpn/integrations/openvpn.md diff --git a/src/go/plugin/go.d/modules/openvpn/metadata.yaml b/src/go/plugin/go.d/collector/openvpn/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/metadata.yaml rename to src/go/plugin/go.d/collector/openvpn/metadata.yaml diff --git a/src/go/plugin/go.d/modules/openvpn/openvpn.go b/src/go/plugin/go.d/collector/openvpn/openvpn.go similarity index 96% rename from src/go/plugin/go.d/modules/openvpn/openvpn.go rename to src/go/plugin/go.d/collector/openvpn/openvpn.go index ac3619705c224c..ff36187d53e728 100644 --- a/src/go/plugin/go.d/modules/openvpn/openvpn.go +++ b/src/go/plugin/go.d/collector/openvpn/openvpn.go @@ -8,7 +8,7 @@ import ( "github.com/netdata/netdata/go/plugins/pkg/matcher" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/openvpn/client" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/openvpn/client" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket" ) diff --git a/src/go/plugin/go.d/modules/openvpn/openvpn_test.go b/src/go/plugin/go.d/collector/openvpn/openvpn_test.go similarity index 98% rename from src/go/plugin/go.d/modules/openvpn/openvpn_test.go rename to src/go/plugin/go.d/collector/openvpn/openvpn_test.go index 86308120435965..62803bb656944e 100644 --- a/src/go/plugin/go.d/modules/openvpn/openvpn_test.go +++ b/src/go/plugin/go.d/collector/openvpn/openvpn_test.go @@ -8,7 +8,7 @@ import ( "github.com/netdata/netdata/go/plugins/pkg/matcher" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/openvpn/client" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/openvpn/client" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket" "github.com/stretchr/testify/assert" diff --git a/src/go/plugin/go.d/modules/openvpn/testdata/config.json b/src/go/plugin/go.d/collector/openvpn/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/testdata/config.json rename to src/go/plugin/go.d/collector/openvpn/testdata/config.json diff --git a/src/go/plugin/go.d/modules/openvpn/testdata/config.yaml b/src/go/plugin/go.d/collector/openvpn/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/openvpn/testdata/config.yaml rename to src/go/plugin/go.d/collector/openvpn/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/README.md b/src/go/plugin/go.d/collector/openvpn_status_log/README.md similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/README.md rename to src/go/plugin/go.d/collector/openvpn_status_log/README.md diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/charts.go b/src/go/plugin/go.d/collector/openvpn_status_log/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/charts.go rename to src/go/plugin/go.d/collector/openvpn_status_log/charts.go diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/collect.go b/src/go/plugin/go.d/collector/openvpn_status_log/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/collect.go rename to src/go/plugin/go.d/collector/openvpn_status_log/collect.go diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/config_schema.json b/src/go/plugin/go.d/collector/openvpn_status_log/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/config_schema.json rename to src/go/plugin/go.d/collector/openvpn_status_log/config_schema.json diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/init.go b/src/go/plugin/go.d/collector/openvpn_status_log/init.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/init.go rename to src/go/plugin/go.d/collector/openvpn_status_log/init.go diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/integrations/openvpn_status_log.md b/src/go/plugin/go.d/collector/openvpn_status_log/integrations/openvpn_status_log.md similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/integrations/openvpn_status_log.md rename to src/go/plugin/go.d/collector/openvpn_status_log/integrations/openvpn_status_log.md diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/metadata.yaml b/src/go/plugin/go.d/collector/openvpn_status_log/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/metadata.yaml rename to src/go/plugin/go.d/collector/openvpn_status_log/metadata.yaml diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/openvpn.go b/src/go/plugin/go.d/collector/openvpn_status_log/openvpn.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/openvpn.go rename to src/go/plugin/go.d/collector/openvpn_status_log/openvpn.go diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/openvpn_test.go b/src/go/plugin/go.d/collector/openvpn_status_log/openvpn_test.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/openvpn_test.go rename to src/go/plugin/go.d/collector/openvpn_status_log/openvpn_test.go diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/parser.go b/src/go/plugin/go.d/collector/openvpn_status_log/parser.go similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/parser.go rename to src/go/plugin/go.d/collector/openvpn_status_log/parser.go diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/testdata/config.json b/src/go/plugin/go.d/collector/openvpn_status_log/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/testdata/config.json rename to src/go/plugin/go.d/collector/openvpn_status_log/testdata/config.json diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/testdata/config.yaml b/src/go/plugin/go.d/collector/openvpn_status_log/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/testdata/config.yaml rename to src/go/plugin/go.d/collector/openvpn_status_log/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/testdata/empty.txt b/src/go/plugin/go.d/collector/openvpn_status_log/testdata/empty.txt similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/testdata/empty.txt rename to src/go/plugin/go.d/collector/openvpn_status_log/testdata/empty.txt diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/static-key.txt b/src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/static-key.txt similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/static-key.txt rename to src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/static-key.txt diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt b/src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt rename to src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version1.txt b/src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version1.txt similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version1.txt rename to src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version1.txt diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt b/src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt rename to src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version2.txt b/src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version2.txt similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version2.txt rename to src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version2.txt diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt b/src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt rename to src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt diff --git a/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version3.txt b/src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version3.txt similarity index 100% rename from src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version3.txt rename to src/go/plugin/go.d/collector/openvpn_status_log/testdata/v2.5.1/version3.txt diff --git a/src/go/plugin/go.d/modules/oracledb/README.md b/src/go/plugin/go.d/collector/oracledb/README.md similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/README.md rename to src/go/plugin/go.d/collector/oracledb/README.md diff --git a/src/go/plugin/go.d/modules/oracledb/charts.go b/src/go/plugin/go.d/collector/oracledb/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/charts.go rename to src/go/plugin/go.d/collector/oracledb/charts.go diff --git a/src/go/plugin/go.d/modules/oracledb/collect.go b/src/go/plugin/go.d/collector/oracledb/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/collect.go rename to src/go/plugin/go.d/collector/oracledb/collect.go diff --git a/src/go/plugin/go.d/modules/oracledb/collect_sysmetric.go b/src/go/plugin/go.d/collector/oracledb/collect_sysmetric.go similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/collect_sysmetric.go rename to src/go/plugin/go.d/collector/oracledb/collect_sysmetric.go diff --git a/src/go/plugin/go.d/modules/oracledb/collect_sysstat.go b/src/go/plugin/go.d/collector/oracledb/collect_sysstat.go similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/collect_sysstat.go rename to src/go/plugin/go.d/collector/oracledb/collect_sysstat.go diff --git a/src/go/plugin/go.d/modules/oracledb/collect_tablespace.go b/src/go/plugin/go.d/collector/oracledb/collect_tablespace.go similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/collect_tablespace.go rename to src/go/plugin/go.d/collector/oracledb/collect_tablespace.go diff --git a/src/go/plugin/go.d/modules/oracledb/collect_wait_class.go b/src/go/plugin/go.d/collector/oracledb/collect_wait_class.go similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/collect_wait_class.go rename to src/go/plugin/go.d/collector/oracledb/collect_wait_class.go diff --git a/src/go/plugin/go.d/modules/oracledb/config_schema.json b/src/go/plugin/go.d/collector/oracledb/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/config_schema.json rename to src/go/plugin/go.d/collector/oracledb/config_schema.json diff --git a/src/go/plugin/go.d/modules/oracledb/init.go b/src/go/plugin/go.d/collector/oracledb/init.go similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/init.go rename to src/go/plugin/go.d/collector/oracledb/init.go diff --git a/src/go/plugin/go.d/modules/oracledb/integrations/oracle_db.md b/src/go/plugin/go.d/collector/oracledb/integrations/oracle_db.md similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/integrations/oracle_db.md rename to src/go/plugin/go.d/collector/oracledb/integrations/oracle_db.md diff --git a/src/go/plugin/go.d/modules/oracledb/metadata.yaml b/src/go/plugin/go.d/collector/oracledb/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/metadata.yaml rename to src/go/plugin/go.d/collector/oracledb/metadata.yaml diff --git a/src/go/plugin/go.d/modules/oracledb/oracledb.go b/src/go/plugin/go.d/collector/oracledb/oracledb.go similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/oracledb.go rename to src/go/plugin/go.d/collector/oracledb/oracledb.go diff --git a/src/go/plugin/go.d/modules/oracledb/oracledb_test.go b/src/go/plugin/go.d/collector/oracledb/oracledb_test.go similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/oracledb_test.go rename to src/go/plugin/go.d/collector/oracledb/oracledb_test.go diff --git a/src/go/plugin/go.d/modules/oracledb/testdata/config.json b/src/go/plugin/go.d/collector/oracledb/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/testdata/config.json rename to src/go/plugin/go.d/collector/oracledb/testdata/config.json diff --git a/src/go/plugin/go.d/modules/oracledb/testdata/config.yaml b/src/go/plugin/go.d/collector/oracledb/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/testdata/config.yaml rename to src/go/plugin/go.d/collector/oracledb/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/oracledb/testdata/v21.3.0-xe/sysmetric.txt b/src/go/plugin/go.d/collector/oracledb/testdata/v21.3.0-xe/sysmetric.txt similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/testdata/v21.3.0-xe/sysmetric.txt rename to src/go/plugin/go.d/collector/oracledb/testdata/v21.3.0-xe/sysmetric.txt diff --git a/src/go/plugin/go.d/modules/oracledb/testdata/v21.3.0-xe/sysstat.txt b/src/go/plugin/go.d/collector/oracledb/testdata/v21.3.0-xe/sysstat.txt similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/testdata/v21.3.0-xe/sysstat.txt rename to src/go/plugin/go.d/collector/oracledb/testdata/v21.3.0-xe/sysstat.txt diff --git a/src/go/plugin/go.d/modules/oracledb/testdata/v21.3.0-xe/tablespace.txt b/src/go/plugin/go.d/collector/oracledb/testdata/v21.3.0-xe/tablespace.txt similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/testdata/v21.3.0-xe/tablespace.txt rename to src/go/plugin/go.d/collector/oracledb/testdata/v21.3.0-xe/tablespace.txt diff --git a/src/go/plugin/go.d/modules/oracledb/testdata/v21.3.0-xe/wait_class.txt b/src/go/plugin/go.d/collector/oracledb/testdata/v21.3.0-xe/wait_class.txt similarity index 100% rename from src/go/plugin/go.d/modules/oracledb/testdata/v21.3.0-xe/wait_class.txt rename to src/go/plugin/go.d/collector/oracledb/testdata/v21.3.0-xe/wait_class.txt diff --git a/src/go/plugin/go.d/modules/pgbouncer/README.md b/src/go/plugin/go.d/collector/pgbouncer/README.md similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/README.md rename to src/go/plugin/go.d/collector/pgbouncer/README.md diff --git a/src/go/plugin/go.d/modules/pgbouncer/charts.go b/src/go/plugin/go.d/collector/pgbouncer/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/charts.go rename to src/go/plugin/go.d/collector/pgbouncer/charts.go diff --git a/src/go/plugin/go.d/modules/pgbouncer/collect.go b/src/go/plugin/go.d/collector/pgbouncer/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/collect.go rename to src/go/plugin/go.d/collector/pgbouncer/collect.go diff --git a/src/go/plugin/go.d/modules/pgbouncer/config_schema.json b/src/go/plugin/go.d/collector/pgbouncer/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/config_schema.json rename to src/go/plugin/go.d/collector/pgbouncer/config_schema.json diff --git a/src/go/plugin/go.d/modules/pgbouncer/init.go b/src/go/plugin/go.d/collector/pgbouncer/init.go similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/init.go rename to src/go/plugin/go.d/collector/pgbouncer/init.go diff --git a/src/go/plugin/go.d/modules/pgbouncer/integrations/pgbouncer.md b/src/go/plugin/go.d/collector/pgbouncer/integrations/pgbouncer.md similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/integrations/pgbouncer.md rename to src/go/plugin/go.d/collector/pgbouncer/integrations/pgbouncer.md diff --git a/src/go/plugin/go.d/modules/pgbouncer/metadata.yaml b/src/go/plugin/go.d/collector/pgbouncer/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/metadata.yaml rename to src/go/plugin/go.d/collector/pgbouncer/metadata.yaml diff --git a/src/go/plugin/go.d/modules/pgbouncer/metrics.go b/src/go/plugin/go.d/collector/pgbouncer/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/metrics.go rename to src/go/plugin/go.d/collector/pgbouncer/metrics.go diff --git a/src/go/plugin/go.d/modules/pgbouncer/pgbouncer.go b/src/go/plugin/go.d/collector/pgbouncer/pgbouncer.go similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/pgbouncer.go rename to src/go/plugin/go.d/collector/pgbouncer/pgbouncer.go diff --git a/src/go/plugin/go.d/modules/pgbouncer/pgbouncer_test.go b/src/go/plugin/go.d/collector/pgbouncer/pgbouncer_test.go similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/pgbouncer_test.go rename to src/go/plugin/go.d/collector/pgbouncer/pgbouncer_test.go diff --git a/src/go/plugin/go.d/modules/pgbouncer/testdata/config.json b/src/go/plugin/go.d/collector/pgbouncer/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/testdata/config.json rename to src/go/plugin/go.d/collector/pgbouncer/testdata/config.json diff --git a/src/go/plugin/go.d/modules/pgbouncer/testdata/config.yaml b/src/go/plugin/go.d/collector/pgbouncer/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/testdata/config.yaml rename to src/go/plugin/go.d/collector/pgbouncer/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/pgbouncer/testdata/v1.17.0/config.txt b/src/go/plugin/go.d/collector/pgbouncer/testdata/v1.17.0/config.txt similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/testdata/v1.17.0/config.txt rename to src/go/plugin/go.d/collector/pgbouncer/testdata/v1.17.0/config.txt diff --git a/src/go/plugin/go.d/modules/pgbouncer/testdata/v1.17.0/databases.txt b/src/go/plugin/go.d/collector/pgbouncer/testdata/v1.17.0/databases.txt similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/testdata/v1.17.0/databases.txt rename to src/go/plugin/go.d/collector/pgbouncer/testdata/v1.17.0/databases.txt diff --git a/src/go/plugin/go.d/modules/pgbouncer/testdata/v1.17.0/pools.txt b/src/go/plugin/go.d/collector/pgbouncer/testdata/v1.17.0/pools.txt similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/testdata/v1.17.0/pools.txt rename to src/go/plugin/go.d/collector/pgbouncer/testdata/v1.17.0/pools.txt diff --git a/src/go/plugin/go.d/modules/pgbouncer/testdata/v1.17.0/stats.txt b/src/go/plugin/go.d/collector/pgbouncer/testdata/v1.17.0/stats.txt similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/testdata/v1.17.0/stats.txt rename to src/go/plugin/go.d/collector/pgbouncer/testdata/v1.17.0/stats.txt diff --git a/src/go/plugin/go.d/modules/pgbouncer/testdata/v1.17.0/version.txt b/src/go/plugin/go.d/collector/pgbouncer/testdata/v1.17.0/version.txt similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/testdata/v1.17.0/version.txt rename to src/go/plugin/go.d/collector/pgbouncer/testdata/v1.17.0/version.txt diff --git a/src/go/plugin/go.d/modules/pgbouncer/testdata/v1.7.0/version.txt b/src/go/plugin/go.d/collector/pgbouncer/testdata/v1.7.0/version.txt similarity index 100% rename from src/go/plugin/go.d/modules/pgbouncer/testdata/v1.7.0/version.txt rename to src/go/plugin/go.d/collector/pgbouncer/testdata/v1.7.0/version.txt diff --git a/src/go/plugin/go.d/modules/phpdaemon/README.md b/src/go/plugin/go.d/collector/phpdaemon/README.md similarity index 100% rename from src/go/plugin/go.d/modules/phpdaemon/README.md rename to src/go/plugin/go.d/collector/phpdaemon/README.md diff --git a/src/go/plugin/go.d/modules/phpdaemon/charts.go b/src/go/plugin/go.d/collector/phpdaemon/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/phpdaemon/charts.go rename to src/go/plugin/go.d/collector/phpdaemon/charts.go diff --git a/src/go/plugin/go.d/modules/phpdaemon/collect.go b/src/go/plugin/go.d/collector/phpdaemon/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/phpdaemon/collect.go rename to src/go/plugin/go.d/collector/phpdaemon/collect.go diff --git a/src/go/plugin/go.d/modules/phpdaemon/config_schema.json b/src/go/plugin/go.d/collector/phpdaemon/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/phpdaemon/config_schema.json rename to src/go/plugin/go.d/collector/phpdaemon/config_schema.json diff --git a/src/go/plugin/go.d/modules/phpdaemon/integrations/phpdaemon.md b/src/go/plugin/go.d/collector/phpdaemon/integrations/phpdaemon.md similarity index 100% rename from src/go/plugin/go.d/modules/phpdaemon/integrations/phpdaemon.md rename to src/go/plugin/go.d/collector/phpdaemon/integrations/phpdaemon.md diff --git a/src/go/plugin/go.d/modules/phpdaemon/metadata.yaml b/src/go/plugin/go.d/collector/phpdaemon/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/phpdaemon/metadata.yaml rename to src/go/plugin/go.d/collector/phpdaemon/metadata.yaml diff --git a/src/go/plugin/go.d/modules/phpdaemon/phpdaemon.go b/src/go/plugin/go.d/collector/phpdaemon/phpdaemon.go similarity index 100% rename from src/go/plugin/go.d/modules/phpdaemon/phpdaemon.go rename to src/go/plugin/go.d/collector/phpdaemon/phpdaemon.go diff --git a/src/go/plugin/go.d/modules/phpdaemon/phpdaemon_test.go b/src/go/plugin/go.d/collector/phpdaemon/phpdaemon_test.go similarity index 100% rename from src/go/plugin/go.d/modules/phpdaemon/phpdaemon_test.go rename to src/go/plugin/go.d/collector/phpdaemon/phpdaemon_test.go diff --git a/src/go/plugin/go.d/modules/phpdaemon/testdata/config.json b/src/go/plugin/go.d/collector/phpdaemon/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/phpdaemon/testdata/config.json rename to src/go/plugin/go.d/collector/phpdaemon/testdata/config.json diff --git a/src/go/plugin/go.d/modules/phpdaemon/testdata/config.yaml b/src/go/plugin/go.d/collector/phpdaemon/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/phpdaemon/testdata/config.yaml rename to src/go/plugin/go.d/collector/phpdaemon/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/phpdaemon/testdata/fullstatus.json b/src/go/plugin/go.d/collector/phpdaemon/testdata/fullstatus.json similarity index 100% rename from src/go/plugin/go.d/modules/phpdaemon/testdata/fullstatus.json rename to src/go/plugin/go.d/collector/phpdaemon/testdata/fullstatus.json diff --git a/src/go/plugin/go.d/modules/phpfpm/README.md b/src/go/plugin/go.d/collector/phpfpm/README.md similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/README.md rename to src/go/plugin/go.d/collector/phpfpm/README.md diff --git a/src/go/plugin/go.d/modules/phpfpm/charts.go b/src/go/plugin/go.d/collector/phpfpm/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/charts.go rename to src/go/plugin/go.d/collector/phpfpm/charts.go diff --git a/src/go/plugin/go.d/modules/phpfpm/client.go b/src/go/plugin/go.d/collector/phpfpm/client.go similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/client.go rename to src/go/plugin/go.d/collector/phpfpm/client.go diff --git a/src/go/plugin/go.d/modules/phpfpm/collect.go b/src/go/plugin/go.d/collector/phpfpm/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/collect.go rename to src/go/plugin/go.d/collector/phpfpm/collect.go diff --git a/src/go/plugin/go.d/modules/phpfpm/config_schema.json b/src/go/plugin/go.d/collector/phpfpm/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/config_schema.json rename to src/go/plugin/go.d/collector/phpfpm/config_schema.json diff --git a/src/go/plugin/go.d/modules/phpfpm/decode.go b/src/go/plugin/go.d/collector/phpfpm/decode.go similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/decode.go rename to src/go/plugin/go.d/collector/phpfpm/decode.go diff --git a/src/go/plugin/go.d/modules/phpfpm/init.go b/src/go/plugin/go.d/collector/phpfpm/init.go similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/init.go rename to src/go/plugin/go.d/collector/phpfpm/init.go diff --git a/src/go/plugin/go.d/modules/phpfpm/integrations/php-fpm.md b/src/go/plugin/go.d/collector/phpfpm/integrations/php-fpm.md similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/integrations/php-fpm.md rename to src/go/plugin/go.d/collector/phpfpm/integrations/php-fpm.md diff --git a/src/go/plugin/go.d/modules/phpfpm/metadata.yaml b/src/go/plugin/go.d/collector/phpfpm/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/metadata.yaml rename to src/go/plugin/go.d/collector/phpfpm/metadata.yaml diff --git a/src/go/plugin/go.d/modules/phpfpm/phpfpm.go b/src/go/plugin/go.d/collector/phpfpm/phpfpm.go similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/phpfpm.go rename to src/go/plugin/go.d/collector/phpfpm/phpfpm.go diff --git a/src/go/plugin/go.d/modules/phpfpm/phpfpm_test.go b/src/go/plugin/go.d/collector/phpfpm/phpfpm_test.go similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/phpfpm_test.go rename to src/go/plugin/go.d/collector/phpfpm/phpfpm_test.go diff --git a/src/go/plugin/go.d/modules/phpfpm/testdata/config.json b/src/go/plugin/go.d/collector/phpfpm/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/testdata/config.json rename to src/go/plugin/go.d/collector/phpfpm/testdata/config.json diff --git a/src/go/plugin/go.d/modules/phpfpm/testdata/config.yaml b/src/go/plugin/go.d/collector/phpfpm/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/testdata/config.yaml rename to src/go/plugin/go.d/collector/phpfpm/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/phpfpm/testdata/status-full-no-idle.json b/src/go/plugin/go.d/collector/phpfpm/testdata/status-full-no-idle.json similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/testdata/status-full-no-idle.json rename to src/go/plugin/go.d/collector/phpfpm/testdata/status-full-no-idle.json diff --git a/src/go/plugin/go.d/modules/phpfpm/testdata/status-full.json b/src/go/plugin/go.d/collector/phpfpm/testdata/status-full.json similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/testdata/status-full.json rename to src/go/plugin/go.d/collector/phpfpm/testdata/status-full.json diff --git a/src/go/plugin/go.d/modules/phpfpm/testdata/status-full.txt b/src/go/plugin/go.d/collector/phpfpm/testdata/status-full.txt similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/testdata/status-full.txt rename to src/go/plugin/go.d/collector/phpfpm/testdata/status-full.txt diff --git a/src/go/plugin/go.d/modules/phpfpm/testdata/status.json b/src/go/plugin/go.d/collector/phpfpm/testdata/status.json similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/testdata/status.json rename to src/go/plugin/go.d/collector/phpfpm/testdata/status.json diff --git a/src/go/plugin/go.d/modules/phpfpm/testdata/status.txt b/src/go/plugin/go.d/collector/phpfpm/testdata/status.txt similarity index 100% rename from src/go/plugin/go.d/modules/phpfpm/testdata/status.txt rename to src/go/plugin/go.d/collector/phpfpm/testdata/status.txt diff --git a/src/go/plugin/go.d/modules/pihole/README.md b/src/go/plugin/go.d/collector/pihole/README.md similarity index 100% rename from src/go/plugin/go.d/modules/pihole/README.md rename to src/go/plugin/go.d/collector/pihole/README.md diff --git a/src/go/plugin/go.d/modules/pihole/charts.go b/src/go/plugin/go.d/collector/pihole/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/pihole/charts.go rename to src/go/plugin/go.d/collector/pihole/charts.go diff --git a/src/go/plugin/go.d/modules/pihole/collect.go b/src/go/plugin/go.d/collector/pihole/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/pihole/collect.go rename to src/go/plugin/go.d/collector/pihole/collect.go diff --git a/src/go/plugin/go.d/modules/pihole/config_schema.json b/src/go/plugin/go.d/collector/pihole/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/pihole/config_schema.json rename to src/go/plugin/go.d/collector/pihole/config_schema.json diff --git a/src/go/plugin/go.d/modules/pihole/init.go b/src/go/plugin/go.d/collector/pihole/init.go similarity index 100% rename from src/go/plugin/go.d/modules/pihole/init.go rename to src/go/plugin/go.d/collector/pihole/init.go diff --git a/src/go/plugin/go.d/modules/pihole/integrations/pi-hole.md b/src/go/plugin/go.d/collector/pihole/integrations/pi-hole.md similarity index 100% rename from src/go/plugin/go.d/modules/pihole/integrations/pi-hole.md rename to src/go/plugin/go.d/collector/pihole/integrations/pi-hole.md diff --git a/src/go/plugin/go.d/modules/pihole/metadata.yaml b/src/go/plugin/go.d/collector/pihole/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/pihole/metadata.yaml rename to src/go/plugin/go.d/collector/pihole/metadata.yaml diff --git a/src/go/plugin/go.d/modules/pihole/metrics.go b/src/go/plugin/go.d/collector/pihole/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/pihole/metrics.go rename to src/go/plugin/go.d/collector/pihole/metrics.go diff --git a/src/go/plugin/go.d/modules/pihole/pihole.go b/src/go/plugin/go.d/collector/pihole/pihole.go similarity index 100% rename from src/go/plugin/go.d/modules/pihole/pihole.go rename to src/go/plugin/go.d/collector/pihole/pihole.go diff --git a/src/go/plugin/go.d/modules/pihole/pihole_test.go b/src/go/plugin/go.d/collector/pihole/pihole_test.go similarity index 100% rename from src/go/plugin/go.d/modules/pihole/pihole_test.go rename to src/go/plugin/go.d/collector/pihole/pihole_test.go diff --git a/src/go/plugin/go.d/modules/pihole/testdata/config.json b/src/go/plugin/go.d/collector/pihole/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/pihole/testdata/config.json rename to src/go/plugin/go.d/collector/pihole/testdata/config.json diff --git a/src/go/plugin/go.d/modules/pihole/testdata/config.yaml b/src/go/plugin/go.d/collector/pihole/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/pihole/testdata/config.yaml rename to src/go/plugin/go.d/collector/pihole/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/pihole/testdata/getForwardDestinations.json b/src/go/plugin/go.d/collector/pihole/testdata/getForwardDestinations.json similarity index 100% rename from src/go/plugin/go.d/modules/pihole/testdata/getForwardDestinations.json rename to src/go/plugin/go.d/collector/pihole/testdata/getForwardDestinations.json diff --git a/src/go/plugin/go.d/modules/pihole/testdata/getQueryTypes.json b/src/go/plugin/go.d/collector/pihole/testdata/getQueryTypes.json similarity index 100% rename from src/go/plugin/go.d/modules/pihole/testdata/getQueryTypes.json rename to src/go/plugin/go.d/collector/pihole/testdata/getQueryTypes.json diff --git a/src/go/plugin/go.d/modules/pihole/testdata/setupVars.conf b/src/go/plugin/go.d/collector/pihole/testdata/setupVars.conf similarity index 100% rename from src/go/plugin/go.d/modules/pihole/testdata/setupVars.conf rename to src/go/plugin/go.d/collector/pihole/testdata/setupVars.conf diff --git a/src/go/plugin/go.d/modules/pihole/testdata/summaryRaw.json b/src/go/plugin/go.d/collector/pihole/testdata/summaryRaw.json similarity index 100% rename from src/go/plugin/go.d/modules/pihole/testdata/summaryRaw.json rename to src/go/plugin/go.d/collector/pihole/testdata/summaryRaw.json diff --git a/src/go/plugin/go.d/modules/pika/README.md b/src/go/plugin/go.d/collector/pika/README.md similarity index 100% rename from src/go/plugin/go.d/modules/pika/README.md rename to src/go/plugin/go.d/collector/pika/README.md diff --git a/src/go/plugin/go.d/modules/pika/charts.go b/src/go/plugin/go.d/collector/pika/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/pika/charts.go rename to src/go/plugin/go.d/collector/pika/charts.go diff --git a/src/go/plugin/go.d/modules/pika/collect.go b/src/go/plugin/go.d/collector/pika/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/pika/collect.go rename to src/go/plugin/go.d/collector/pika/collect.go diff --git a/src/go/plugin/go.d/modules/pika/collect_info.go b/src/go/plugin/go.d/collector/pika/collect_info.go similarity index 100% rename from src/go/plugin/go.d/modules/pika/collect_info.go rename to src/go/plugin/go.d/collector/pika/collect_info.go diff --git a/src/go/plugin/go.d/modules/pika/config_schema.json b/src/go/plugin/go.d/collector/pika/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/pika/config_schema.json rename to src/go/plugin/go.d/collector/pika/config_schema.json diff --git a/src/go/plugin/go.d/modules/pika/init.go b/src/go/plugin/go.d/collector/pika/init.go similarity index 100% rename from src/go/plugin/go.d/modules/pika/init.go rename to src/go/plugin/go.d/collector/pika/init.go diff --git a/src/go/plugin/go.d/modules/pika/integrations/pika.md b/src/go/plugin/go.d/collector/pika/integrations/pika.md similarity index 100% rename from src/go/plugin/go.d/modules/pika/integrations/pika.md rename to src/go/plugin/go.d/collector/pika/integrations/pika.md diff --git a/src/go/plugin/go.d/modules/pika/metadata.yaml b/src/go/plugin/go.d/collector/pika/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/pika/metadata.yaml rename to src/go/plugin/go.d/collector/pika/metadata.yaml diff --git a/src/go/plugin/go.d/modules/pika/pika.go b/src/go/plugin/go.d/collector/pika/pika.go similarity index 100% rename from src/go/plugin/go.d/modules/pika/pika.go rename to src/go/plugin/go.d/collector/pika/pika.go diff --git a/src/go/plugin/go.d/modules/pika/pika_test.go b/src/go/plugin/go.d/collector/pika/pika_test.go similarity index 100% rename from src/go/plugin/go.d/modules/pika/pika_test.go rename to src/go/plugin/go.d/collector/pika/pika_test.go diff --git a/src/go/plugin/go.d/modules/pika/testdata/config.json b/src/go/plugin/go.d/collector/pika/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/pika/testdata/config.json rename to src/go/plugin/go.d/collector/pika/testdata/config.json diff --git a/src/go/plugin/go.d/modules/pika/testdata/config.yaml b/src/go/plugin/go.d/collector/pika/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/pika/testdata/config.yaml rename to src/go/plugin/go.d/collector/pika/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/pika/testdata/redis/info_all.txt b/src/go/plugin/go.d/collector/pika/testdata/redis/info_all.txt similarity index 100% rename from src/go/plugin/go.d/modules/pika/testdata/redis/info_all.txt rename to src/go/plugin/go.d/collector/pika/testdata/redis/info_all.txt diff --git a/src/go/plugin/go.d/modules/pika/testdata/v3.4.0/info_all.txt b/src/go/plugin/go.d/collector/pika/testdata/v3.4.0/info_all.txt similarity index 100% rename from src/go/plugin/go.d/modules/pika/testdata/v3.4.0/info_all.txt rename to src/go/plugin/go.d/collector/pika/testdata/v3.4.0/info_all.txt diff --git a/src/go/plugin/go.d/modules/ping/README.md b/src/go/plugin/go.d/collector/ping/README.md similarity index 100% rename from src/go/plugin/go.d/modules/ping/README.md rename to src/go/plugin/go.d/collector/ping/README.md diff --git a/src/go/plugin/go.d/modules/ping/charts.go b/src/go/plugin/go.d/collector/ping/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/ping/charts.go rename to src/go/plugin/go.d/collector/ping/charts.go diff --git a/src/go/plugin/go.d/modules/ping/collect.go b/src/go/plugin/go.d/collector/ping/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/ping/collect.go rename to src/go/plugin/go.d/collector/ping/collect.go diff --git a/src/go/plugin/go.d/modules/ping/config_schema.json b/src/go/plugin/go.d/collector/ping/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/ping/config_schema.json rename to src/go/plugin/go.d/collector/ping/config_schema.json diff --git a/src/go/plugin/go.d/modules/ping/init.go b/src/go/plugin/go.d/collector/ping/init.go similarity index 100% rename from src/go/plugin/go.d/modules/ping/init.go rename to src/go/plugin/go.d/collector/ping/init.go diff --git a/src/go/plugin/go.d/modules/ping/integrations/ping.md b/src/go/plugin/go.d/collector/ping/integrations/ping.md similarity index 100% rename from src/go/plugin/go.d/modules/ping/integrations/ping.md rename to src/go/plugin/go.d/collector/ping/integrations/ping.md diff --git a/src/go/plugin/go.d/modules/ping/metadata.yaml b/src/go/plugin/go.d/collector/ping/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/ping/metadata.yaml rename to src/go/plugin/go.d/collector/ping/metadata.yaml diff --git a/src/go/plugin/go.d/modules/ping/ping.go b/src/go/plugin/go.d/collector/ping/ping.go similarity index 100% rename from src/go/plugin/go.d/modules/ping/ping.go rename to src/go/plugin/go.d/collector/ping/ping.go diff --git a/src/go/plugin/go.d/modules/ping/ping_test.go b/src/go/plugin/go.d/collector/ping/ping_test.go similarity index 100% rename from src/go/plugin/go.d/modules/ping/ping_test.go rename to src/go/plugin/go.d/collector/ping/ping_test.go diff --git a/src/go/plugin/go.d/modules/ping/prober.go b/src/go/plugin/go.d/collector/ping/prober.go similarity index 100% rename from src/go/plugin/go.d/modules/ping/prober.go rename to src/go/plugin/go.d/collector/ping/prober.go diff --git a/src/go/plugin/go.d/modules/ping/testdata/config.json b/src/go/plugin/go.d/collector/ping/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/ping/testdata/config.json rename to src/go/plugin/go.d/collector/ping/testdata/config.json diff --git a/src/go/plugin/go.d/modules/ping/testdata/config.yaml b/src/go/plugin/go.d/collector/ping/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/ping/testdata/config.yaml rename to src/go/plugin/go.d/collector/ping/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/portcheck/README.md b/src/go/plugin/go.d/collector/portcheck/README.md similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/README.md rename to src/go/plugin/go.d/collector/portcheck/README.md diff --git a/src/go/plugin/go.d/modules/portcheck/charts.go b/src/go/plugin/go.d/collector/portcheck/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/charts.go rename to src/go/plugin/go.d/collector/portcheck/charts.go diff --git a/src/go/plugin/go.d/modules/portcheck/check_tcp_port.go b/src/go/plugin/go.d/collector/portcheck/check_tcp_port.go similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/check_tcp_port.go rename to src/go/plugin/go.d/collector/portcheck/check_tcp_port.go diff --git a/src/go/plugin/go.d/modules/portcheck/check_udp_port.go b/src/go/plugin/go.d/collector/portcheck/check_udp_port.go similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/check_udp_port.go rename to src/go/plugin/go.d/collector/portcheck/check_udp_port.go diff --git a/src/go/plugin/go.d/modules/portcheck/collect.go b/src/go/plugin/go.d/collector/portcheck/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/collect.go rename to src/go/plugin/go.d/collector/portcheck/collect.go diff --git a/src/go/plugin/go.d/modules/portcheck/config_schema.json b/src/go/plugin/go.d/collector/portcheck/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/config_schema.json rename to src/go/plugin/go.d/collector/portcheck/config_schema.json diff --git a/src/go/plugin/go.d/modules/portcheck/init.go b/src/go/plugin/go.d/collector/portcheck/init.go similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/init.go rename to src/go/plugin/go.d/collector/portcheck/init.go diff --git a/src/go/plugin/go.d/modules/portcheck/integrations/tcp-udp_endpoints.md b/src/go/plugin/go.d/collector/portcheck/integrations/tcp-udp_endpoints.md similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/integrations/tcp-udp_endpoints.md rename to src/go/plugin/go.d/collector/portcheck/integrations/tcp-udp_endpoints.md diff --git a/src/go/plugin/go.d/modules/portcheck/metadata.yaml b/src/go/plugin/go.d/collector/portcheck/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/metadata.yaml rename to src/go/plugin/go.d/collector/portcheck/metadata.yaml diff --git a/src/go/plugin/go.d/modules/portcheck/portcheck.go b/src/go/plugin/go.d/collector/portcheck/portcheck.go similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/portcheck.go rename to src/go/plugin/go.d/collector/portcheck/portcheck.go diff --git a/src/go/plugin/go.d/modules/portcheck/portcheck_test.go b/src/go/plugin/go.d/collector/portcheck/portcheck_test.go similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/portcheck_test.go rename to src/go/plugin/go.d/collector/portcheck/portcheck_test.go diff --git a/src/go/plugin/go.d/modules/portcheck/testdata/config.json b/src/go/plugin/go.d/collector/portcheck/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/testdata/config.json rename to src/go/plugin/go.d/collector/portcheck/testdata/config.json diff --git a/src/go/plugin/go.d/modules/portcheck/testdata/config.yaml b/src/go/plugin/go.d/collector/portcheck/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/portcheck/testdata/config.yaml rename to src/go/plugin/go.d/collector/portcheck/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/postfix/README.md b/src/go/plugin/go.d/collector/postfix/README.md similarity index 100% rename from src/go/plugin/go.d/modules/postfix/README.md rename to src/go/plugin/go.d/collector/postfix/README.md diff --git a/src/go/plugin/go.d/modules/postfix/charts.go b/src/go/plugin/go.d/collector/postfix/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/postfix/charts.go rename to src/go/plugin/go.d/collector/postfix/charts.go diff --git a/src/go/plugin/go.d/modules/postfix/collect.go b/src/go/plugin/go.d/collector/postfix/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/postfix/collect.go rename to src/go/plugin/go.d/collector/postfix/collect.go diff --git a/src/go/plugin/go.d/modules/postfix/config_schema.json b/src/go/plugin/go.d/collector/postfix/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/postfix/config_schema.json rename to src/go/plugin/go.d/collector/postfix/config_schema.json diff --git a/src/go/plugin/go.d/modules/postfix/exec.go b/src/go/plugin/go.d/collector/postfix/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/postfix/exec.go rename to src/go/plugin/go.d/collector/postfix/exec.go diff --git a/src/go/plugin/go.d/modules/postfix/init.go b/src/go/plugin/go.d/collector/postfix/init.go similarity index 100% rename from src/go/plugin/go.d/modules/postfix/init.go rename to src/go/plugin/go.d/collector/postfix/init.go diff --git a/src/go/plugin/go.d/modules/postfix/integrations/postfix.md b/src/go/plugin/go.d/collector/postfix/integrations/postfix.md similarity index 100% rename from src/go/plugin/go.d/modules/postfix/integrations/postfix.md rename to src/go/plugin/go.d/collector/postfix/integrations/postfix.md diff --git a/src/go/plugin/go.d/modules/postfix/metadata.yaml b/src/go/plugin/go.d/collector/postfix/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/postfix/metadata.yaml rename to src/go/plugin/go.d/collector/postfix/metadata.yaml diff --git a/src/go/plugin/go.d/modules/postfix/postfix.go b/src/go/plugin/go.d/collector/postfix/postfix.go similarity index 100% rename from src/go/plugin/go.d/modules/postfix/postfix.go rename to src/go/plugin/go.d/collector/postfix/postfix.go diff --git a/src/go/plugin/go.d/modules/postfix/postfix_test.go b/src/go/plugin/go.d/collector/postfix/postfix_test.go similarity index 100% rename from src/go/plugin/go.d/modules/postfix/postfix_test.go rename to src/go/plugin/go.d/collector/postfix/postfix_test.go diff --git a/src/go/plugin/go.d/modules/postfix/testdata/config.json b/src/go/plugin/go.d/collector/postfix/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/postfix/testdata/config.json rename to src/go/plugin/go.d/collector/postfix/testdata/config.json diff --git a/src/go/plugin/go.d/modules/postfix/testdata/config.yaml b/src/go/plugin/go.d/collector/postfix/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/postfix/testdata/config.yaml rename to src/go/plugin/go.d/collector/postfix/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/postfix/testdata/postqueue.txt b/src/go/plugin/go.d/collector/postfix/testdata/postqueue.txt similarity index 100% rename from src/go/plugin/go.d/modules/postfix/testdata/postqueue.txt rename to src/go/plugin/go.d/collector/postfix/testdata/postqueue.txt diff --git a/src/go/plugin/go.d/modules/postgres/README.md b/src/go/plugin/go.d/collector/postgres/README.md similarity index 100% rename from src/go/plugin/go.d/modules/postgres/README.md rename to src/go/plugin/go.d/collector/postgres/README.md diff --git a/src/go/plugin/go.d/modules/postgres/charts.go b/src/go/plugin/go.d/collector/postgres/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/charts.go rename to src/go/plugin/go.d/collector/postgres/charts.go diff --git a/src/go/plugin/go.d/modules/postgres/collect.go b/src/go/plugin/go.d/collector/postgres/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/collect.go rename to src/go/plugin/go.d/collector/postgres/collect.go diff --git a/src/go/plugin/go.d/modules/postgres/collect_metrics.go b/src/go/plugin/go.d/collector/postgres/collect_metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/collect_metrics.go rename to src/go/plugin/go.d/collector/postgres/collect_metrics.go diff --git a/src/go/plugin/go.d/modules/postgres/config_schema.json b/src/go/plugin/go.d/collector/postgres/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/postgres/config_schema.json rename to src/go/plugin/go.d/collector/postgres/config_schema.json diff --git a/src/go/plugin/go.d/modules/postgres/do_query.go b/src/go/plugin/go.d/collector/postgres/do_query.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/do_query.go rename to src/go/plugin/go.d/collector/postgres/do_query.go diff --git a/src/go/plugin/go.d/modules/postgres/do_query_bloat.go b/src/go/plugin/go.d/collector/postgres/do_query_bloat.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/do_query_bloat.go rename to src/go/plugin/go.d/collector/postgres/do_query_bloat.go diff --git a/src/go/plugin/go.d/modules/postgres/do_query_columns.go b/src/go/plugin/go.d/collector/postgres/do_query_columns.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/do_query_columns.go rename to src/go/plugin/go.d/collector/postgres/do_query_columns.go diff --git a/src/go/plugin/go.d/modules/postgres/do_query_databases.go b/src/go/plugin/go.d/collector/postgres/do_query_databases.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/do_query_databases.go rename to src/go/plugin/go.d/collector/postgres/do_query_databases.go diff --git a/src/go/plugin/go.d/modules/postgres/do_query_global.go b/src/go/plugin/go.d/collector/postgres/do_query_global.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/do_query_global.go rename to src/go/plugin/go.d/collector/postgres/do_query_global.go diff --git a/src/go/plugin/go.d/modules/postgres/do_query_indexes.go b/src/go/plugin/go.d/collector/postgres/do_query_indexes.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/do_query_indexes.go rename to src/go/plugin/go.d/collector/postgres/do_query_indexes.go diff --git a/src/go/plugin/go.d/modules/postgres/do_query_misc.go b/src/go/plugin/go.d/collector/postgres/do_query_misc.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/do_query_misc.go rename to src/go/plugin/go.d/collector/postgres/do_query_misc.go diff --git a/src/go/plugin/go.d/modules/postgres/do_query_replication.go b/src/go/plugin/go.d/collector/postgres/do_query_replication.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/do_query_replication.go rename to src/go/plugin/go.d/collector/postgres/do_query_replication.go diff --git a/src/go/plugin/go.d/modules/postgres/do_query_tables.go b/src/go/plugin/go.d/collector/postgres/do_query_tables.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/do_query_tables.go rename to src/go/plugin/go.d/collector/postgres/do_query_tables.go diff --git a/src/go/plugin/go.d/modules/postgres/init.go b/src/go/plugin/go.d/collector/postgres/init.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/init.go rename to src/go/plugin/go.d/collector/postgres/init.go diff --git a/src/go/plugin/go.d/modules/postgres/integrations/postgresql.md b/src/go/plugin/go.d/collector/postgres/integrations/postgresql.md similarity index 100% rename from src/go/plugin/go.d/modules/postgres/integrations/postgresql.md rename to src/go/plugin/go.d/collector/postgres/integrations/postgresql.md diff --git a/src/go/plugin/go.d/modules/postgres/metadata.yaml b/src/go/plugin/go.d/collector/postgres/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/postgres/metadata.yaml rename to src/go/plugin/go.d/collector/postgres/metadata.yaml diff --git a/src/go/plugin/go.d/modules/postgres/metrics.go b/src/go/plugin/go.d/collector/postgres/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/metrics.go rename to src/go/plugin/go.d/collector/postgres/metrics.go diff --git a/src/go/plugin/go.d/modules/postgres/postgres.go b/src/go/plugin/go.d/collector/postgres/postgres.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/postgres.go rename to src/go/plugin/go.d/collector/postgres/postgres.go diff --git a/src/go/plugin/go.d/modules/postgres/postgres_test.go b/src/go/plugin/go.d/collector/postgres/postgres_test.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/postgres_test.go rename to src/go/plugin/go.d/collector/postgres/postgres_test.go diff --git a/src/go/plugin/go.d/modules/postgres/queries.go b/src/go/plugin/go.d/collector/postgres/queries.go similarity index 100% rename from src/go/plugin/go.d/modules/postgres/queries.go rename to src/go/plugin/go.d/collector/postgres/queries.go diff --git a/src/go/plugin/go.d/modules/postgres/testdata/config.json b/src/go/plugin/go.d/collector/postgres/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/config.json rename to src/go/plugin/go.d/collector/postgres/testdata/config.json diff --git a/src/go/plugin/go.d/modules/postgres/testdata/config.yaml b/src/go/plugin/go.d/collector/postgres/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/config.yaml rename to src/go/plugin/go.d/collector/postgres/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/autovacuum_workers.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/autovacuum_workers.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/autovacuum_workers.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/autovacuum_workers.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/bloat_tables.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/bloat_tables.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/bloat_tables.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/bloat_tables.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/catalog_relations.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/catalog_relations.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/catalog_relations.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/catalog_relations.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/checkpoints.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/checkpoints.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/checkpoints.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/checkpoints.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/database_conflicts.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/database_conflicts.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/database_conflicts.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/database_conflicts.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/database_locks.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/database_locks.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/database_locks.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/database_locks.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/database_size.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/database_size.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/database_size.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/database_size.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/database_stats.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/database_stats.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/database_stats.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/database_stats.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/is_super_user-false.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/is_super_user-false.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/is_super_user-false.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/is_super_user-false.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/is_super_user-true.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/is_super_user-true.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/is_super_user-true.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/is_super_user-true.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/pg_is_in_recovery-true.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/pg_is_in_recovery-true.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/pg_is_in_recovery-true.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/pg_is_in_recovery-true.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/queryable_database_list.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/queryable_database_list.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/queryable_database_list.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/queryable_database_list.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/replication_slot_files.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/replication_slot_files.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/replication_slot_files.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/replication_slot_files.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/replication_standby_app_wal_delta.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/replication_standby_app_wal_delta.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/replication_standby_app_wal_delta.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/replication_standby_app_wal_delta.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/replication_standby_app_wal_lag.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/replication_standby_app_wal_lag.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/replication_standby_app_wal_lag.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/replication_standby_app_wal_lag.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/server_connections_state.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/server_connections_state.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/server_connections_state.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/server_connections_state.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/server_current_connections.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/server_current_connections.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/server_current_connections.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/server_current_connections.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/server_version_num.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/server_version_num.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/server_version_num.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/server_version_num.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/settings_max_connections.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/settings_max_connections.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/settings_max_connections.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/settings_max_connections.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/settings_max_locks_held.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/settings_max_locks_held.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/settings_max_locks_held.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/settings_max_locks_held.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/stat_user_indexes_db_postgres.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/stat_user_indexes_db_postgres.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/stat_user_indexes_db_postgres.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/stat_user_indexes_db_postgres.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/stat_user_tables_db_postgres.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/stat_user_tables_db_postgres.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/stat_user_tables_db_postgres.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/stat_user_tables_db_postgres.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/statio_user_tables_db_postgres.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/statio_user_tables_db_postgres.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/statio_user_tables_db_postgres.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/statio_user_tables_db_postgres.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/table_columns_stats.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/table_columns_stats.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/table_columns_stats.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/table_columns_stats.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/txid_wraparound.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/txid_wraparound.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/txid_wraparound.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/txid_wraparound.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/uptime.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/uptime.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/uptime.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/uptime.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/wal_archive_files.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/wal_archive_files.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/wal_archive_files.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/wal_archive_files.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/wal_files.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/wal_files.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/wal_files.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/wal_files.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/wal_writes.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/wal_writes.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/wal_writes.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/wal_writes.txt diff --git a/src/go/plugin/go.d/modules/postgres/testdata/v14.4/xact_query_running_time.txt b/src/go/plugin/go.d/collector/postgres/testdata/v14.4/xact_query_running_time.txt similarity index 100% rename from src/go/plugin/go.d/modules/postgres/testdata/v14.4/xact_query_running_time.txt rename to src/go/plugin/go.d/collector/postgres/testdata/v14.4/xact_query_running_time.txt diff --git a/src/go/plugin/go.d/modules/powerdns/README.md b/src/go/plugin/go.d/collector/powerdns/README.md similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/README.md rename to src/go/plugin/go.d/collector/powerdns/README.md diff --git a/src/go/plugin/go.d/modules/powerdns/authoritativens.go b/src/go/plugin/go.d/collector/powerdns/authoritativens.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/authoritativens.go rename to src/go/plugin/go.d/collector/powerdns/authoritativens.go diff --git a/src/go/plugin/go.d/modules/powerdns/authoritativens_test.go b/src/go/plugin/go.d/collector/powerdns/authoritativens_test.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/authoritativens_test.go rename to src/go/plugin/go.d/collector/powerdns/authoritativens_test.go diff --git a/src/go/plugin/go.d/modules/powerdns/charts.go b/src/go/plugin/go.d/collector/powerdns/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/charts.go rename to src/go/plugin/go.d/collector/powerdns/charts.go diff --git a/src/go/plugin/go.d/modules/powerdns/collect.go b/src/go/plugin/go.d/collector/powerdns/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/collect.go rename to src/go/plugin/go.d/collector/powerdns/collect.go diff --git a/src/go/plugin/go.d/modules/powerdns/config_schema.json b/src/go/plugin/go.d/collector/powerdns/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/config_schema.json rename to src/go/plugin/go.d/collector/powerdns/config_schema.json diff --git a/src/go/plugin/go.d/modules/powerdns/init.go b/src/go/plugin/go.d/collector/powerdns/init.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/init.go rename to src/go/plugin/go.d/collector/powerdns/init.go diff --git a/src/go/plugin/go.d/modules/powerdns/integrations/powerdns_authoritative_server.md b/src/go/plugin/go.d/collector/powerdns/integrations/powerdns_authoritative_server.md similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/integrations/powerdns_authoritative_server.md rename to src/go/plugin/go.d/collector/powerdns/integrations/powerdns_authoritative_server.md diff --git a/src/go/plugin/go.d/modules/powerdns/metadata.yaml b/src/go/plugin/go.d/collector/powerdns/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/metadata.yaml rename to src/go/plugin/go.d/collector/powerdns/metadata.yaml diff --git a/src/go/plugin/go.d/modules/powerdns/metrics.go b/src/go/plugin/go.d/collector/powerdns/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/metrics.go rename to src/go/plugin/go.d/collector/powerdns/metrics.go diff --git a/src/go/plugin/go.d/modules/powerdns/testdata/config.json b/src/go/plugin/go.d/collector/powerdns/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/testdata/config.json rename to src/go/plugin/go.d/collector/powerdns/testdata/config.json diff --git a/src/go/plugin/go.d/modules/powerdns/testdata/config.yaml b/src/go/plugin/go.d/collector/powerdns/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/testdata/config.yaml rename to src/go/plugin/go.d/collector/powerdns/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/powerdns/testdata/recursor/statistics.json b/src/go/plugin/go.d/collector/powerdns/testdata/recursor/statistics.json similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/testdata/recursor/statistics.json rename to src/go/plugin/go.d/collector/powerdns/testdata/recursor/statistics.json diff --git a/src/go/plugin/go.d/modules/powerdns/testdata/v4.3.0/statistics.json b/src/go/plugin/go.d/collector/powerdns/testdata/v4.3.0/statistics.json similarity index 100% rename from src/go/plugin/go.d/modules/powerdns/testdata/v4.3.0/statistics.json rename to src/go/plugin/go.d/collector/powerdns/testdata/v4.3.0/statistics.json diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/README.md b/src/go/plugin/go.d/collector/powerdns_recursor/README.md similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/README.md rename to src/go/plugin/go.d/collector/powerdns_recursor/README.md diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/charts.go b/src/go/plugin/go.d/collector/powerdns_recursor/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/charts.go rename to src/go/plugin/go.d/collector/powerdns_recursor/charts.go diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/collect.go b/src/go/plugin/go.d/collector/powerdns_recursor/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/collect.go rename to src/go/plugin/go.d/collector/powerdns_recursor/collect.go diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/config_schema.json b/src/go/plugin/go.d/collector/powerdns_recursor/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/config_schema.json rename to src/go/plugin/go.d/collector/powerdns_recursor/config_schema.json diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/init.go b/src/go/plugin/go.d/collector/powerdns_recursor/init.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/init.go rename to src/go/plugin/go.d/collector/powerdns_recursor/init.go diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/integrations/powerdns_recursor.md b/src/go/plugin/go.d/collector/powerdns_recursor/integrations/powerdns_recursor.md similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/integrations/powerdns_recursor.md rename to src/go/plugin/go.d/collector/powerdns_recursor/integrations/powerdns_recursor.md diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/metadata.yaml b/src/go/plugin/go.d/collector/powerdns_recursor/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/metadata.yaml rename to src/go/plugin/go.d/collector/powerdns_recursor/metadata.yaml diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/metrics.go b/src/go/plugin/go.d/collector/powerdns_recursor/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/metrics.go rename to src/go/plugin/go.d/collector/powerdns_recursor/metrics.go diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/recursor.go b/src/go/plugin/go.d/collector/powerdns_recursor/recursor.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/recursor.go rename to src/go/plugin/go.d/collector/powerdns_recursor/recursor.go diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/recursor_test.go b/src/go/plugin/go.d/collector/powerdns_recursor/recursor_test.go similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/recursor_test.go rename to src/go/plugin/go.d/collector/powerdns_recursor/recursor_test.go diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/testdata/authoritative/statistics.json b/src/go/plugin/go.d/collector/powerdns_recursor/testdata/authoritative/statistics.json similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/testdata/authoritative/statistics.json rename to src/go/plugin/go.d/collector/powerdns_recursor/testdata/authoritative/statistics.json diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/testdata/config.json b/src/go/plugin/go.d/collector/powerdns_recursor/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/testdata/config.json rename to src/go/plugin/go.d/collector/powerdns_recursor/testdata/config.json diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/testdata/config.yaml b/src/go/plugin/go.d/collector/powerdns_recursor/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/testdata/config.yaml rename to src/go/plugin/go.d/collector/powerdns_recursor/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/powerdns_recursor/testdata/v4.3.1/statistics.json b/src/go/plugin/go.d/collector/powerdns_recursor/testdata/v4.3.1/statistics.json similarity index 100% rename from src/go/plugin/go.d/modules/powerdns_recursor/testdata/v4.3.1/statistics.json rename to src/go/plugin/go.d/collector/powerdns_recursor/testdata/v4.3.1/statistics.json diff --git a/src/go/plugin/go.d/modules/prometheus/README.md b/src/go/plugin/go.d/collector/prometheus/README.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/README.md rename to src/go/plugin/go.d/collector/prometheus/README.md diff --git a/src/go/plugin/go.d/modules/prometheus/cache.go b/src/go/plugin/go.d/collector/prometheus/cache.go similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/cache.go rename to src/go/plugin/go.d/collector/prometheus/cache.go diff --git a/src/go/plugin/go.d/modules/prometheus/charts.go b/src/go/plugin/go.d/collector/prometheus/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/charts.go rename to src/go/plugin/go.d/collector/prometheus/charts.go diff --git a/src/go/plugin/go.d/modules/prometheus/collect.go b/src/go/plugin/go.d/collector/prometheus/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/collect.go rename to src/go/plugin/go.d/collector/prometheus/collect.go diff --git a/src/go/plugin/go.d/modules/prometheus/config_schema.json b/src/go/plugin/go.d/collector/prometheus/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/config_schema.json rename to src/go/plugin/go.d/collector/prometheus/config_schema.json diff --git a/src/go/plugin/go.d/modules/prometheus/init.go b/src/go/plugin/go.d/collector/prometheus/init.go similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/init.go rename to src/go/plugin/go.d/collector/prometheus/init.go diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/4d_server.md b/src/go/plugin/go.d/collector/prometheus/integrations/4d_server.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/4d_server.md rename to src/go/plugin/go.d/collector/prometheus/integrations/4d_server.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/8430ft_modem.md b/src/go/plugin/go.d/collector/prometheus/integrations/8430ft_modem.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/8430ft_modem.md rename to src/go/plugin/go.d/collector/prometheus/integrations/8430ft_modem.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/a10_acos_network_devices.md b/src/go/plugin/go.d/collector/prometheus/integrations/a10_acos_network_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/a10_acos_network_devices.md rename to src/go/plugin/go.d/collector/prometheus/integrations/a10_acos_network_devices.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/airthings_waveplus_air_sensor.md b/src/go/plugin/go.d/collector/prometheus/integrations/airthings_waveplus_air_sensor.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/airthings_waveplus_air_sensor.md rename to src/go/plugin/go.d/collector/prometheus/integrations/airthings_waveplus_air_sensor.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/akamai_edge_dns_traffic.md b/src/go/plugin/go.d/collector/prometheus/integrations/akamai_edge_dns_traffic.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/akamai_edge_dns_traffic.md rename to src/go/plugin/go.d/collector/prometheus/integrations/akamai_edge_dns_traffic.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/akamai_global_traffic_management.md b/src/go/plugin/go.d/collector/prometheus/integrations/akamai_global_traffic_management.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/akamai_global_traffic_management.md rename to src/go/plugin/go.d/collector/prometheus/integrations/akamai_global_traffic_management.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/akami_cloudmonitor.md b/src/go/plugin/go.d/collector/prometheus/integrations/akami_cloudmonitor.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/akami_cloudmonitor.md rename to src/go/plugin/go.d/collector/prometheus/integrations/akami_cloudmonitor.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/alamos_fe2_server.md b/src/go/plugin/go.d/collector/prometheus/integrations/alamos_fe2_server.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/alamos_fe2_server.md rename to src/go/plugin/go.d/collector/prometheus/integrations/alamos_fe2_server.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/alibaba_cloud.md b/src/go/plugin/go.d/collector/prometheus/integrations/alibaba_cloud.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/alibaba_cloud.md rename to src/go/plugin/go.d/collector/prometheus/integrations/alibaba_cloud.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/altaro_backup.md b/src/go/plugin/go.d/collector/prometheus/integrations/altaro_backup.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/altaro_backup.md rename to src/go/plugin/go.d/collector/prometheus/integrations/altaro_backup.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/amd_cpu_&_gpu.md b/src/go/plugin/go.d/collector/prometheus/integrations/amd_cpu_&_gpu.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/amd_cpu_&_gpu.md rename to src/go/plugin/go.d/collector/prometheus/integrations/amd_cpu_&_gpu.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/andrews_&_arnold_line_status.md b/src/go/plugin/go.d/collector/prometheus/integrations/andrews_&_arnold_line_status.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/andrews_&_arnold_line_status.md rename to src/go/plugin/go.d/collector/prometheus/integrations/andrews_&_arnold_line_status.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/apache_airflow.md b/src/go/plugin/go.d/collector/prometheus/integrations/apache_airflow.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/apache_airflow.md rename to src/go/plugin/go.d/collector/prometheus/integrations/apache_airflow.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/apache_flink.md b/src/go/plugin/go.d/collector/prometheus/integrations/apache_flink.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/apache_flink.md rename to src/go/plugin/go.d/collector/prometheus/integrations/apache_flink.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/apicast.md b/src/go/plugin/go.d/collector/prometheus/integrations/apicast.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/apicast.md rename to src/go/plugin/go.d/collector/prometheus/integrations/apicast.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/apple_time_machine.md b/src/go/plugin/go.d/collector/prometheus/integrations/apple_time_machine.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/apple_time_machine.md rename to src/go/plugin/go.d/collector/prometheus/integrations/apple_time_machine.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/arm_hwcpipe.md b/src/go/plugin/go.d/collector/prometheus/integrations/arm_hwcpipe.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/arm_hwcpipe.md rename to src/go/plugin/go.d/collector/prometheus/integrations/arm_hwcpipe.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/aruba_devices.md b/src/go/plugin/go.d/collector/prometheus/integrations/aruba_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/aruba_devices.md rename to src/go/plugin/go.d/collector/prometheus/integrations/aruba_devices.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/arvancloud_cdn.md b/src/go/plugin/go.d/collector/prometheus/integrations/arvancloud_cdn.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/arvancloud_cdn.md rename to src/go/plugin/go.d/collector/prometheus/integrations/arvancloud_cdn.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/audisto.md b/src/go/plugin/go.d/collector/prometheus/integrations/audisto.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/audisto.md rename to src/go/plugin/go.d/collector/prometheus/integrations/audisto.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/authlog.md b/src/go/plugin/go.d/collector/prometheus/integrations/authlog.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/authlog.md rename to src/go/plugin/go.d/collector/prometheus/integrations/authlog.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/aws_ec2_compute_instances.md b/src/go/plugin/go.d/collector/prometheus/integrations/aws_ec2_compute_instances.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/aws_ec2_compute_instances.md rename to src/go/plugin/go.d/collector/prometheus/integrations/aws_ec2_compute_instances.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/aws_ec2_spot_instance.md b/src/go/plugin/go.d/collector/prometheus/integrations/aws_ec2_spot_instance.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/aws_ec2_spot_instance.md rename to src/go/plugin/go.d/collector/prometheus/integrations/aws_ec2_spot_instance.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/aws_ecs.md b/src/go/plugin/go.d/collector/prometheus/integrations/aws_ecs.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/aws_ecs.md rename to src/go/plugin/go.d/collector/prometheus/integrations/aws_ecs.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/aws_health_events.md b/src/go/plugin/go.d/collector/prometheus/integrations/aws_health_events.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/aws_health_events.md rename to src/go/plugin/go.d/collector/prometheus/integrations/aws_health_events.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/aws_instance_health.md b/src/go/plugin/go.d/collector/prometheus/integrations/aws_instance_health.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/aws_instance_health.md rename to src/go/plugin/go.d/collector/prometheus/integrations/aws_instance_health.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/aws_quota.md b/src/go/plugin/go.d/collector/prometheus/integrations/aws_quota.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/aws_quota.md rename to src/go/plugin/go.d/collector/prometheus/integrations/aws_quota.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/aws_rds.md b/src/go/plugin/go.d/collector/prometheus/integrations/aws_rds.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/aws_rds.md rename to src/go/plugin/go.d/collector/prometheus/integrations/aws_rds.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/aws_s3_buckets.md b/src/go/plugin/go.d/collector/prometheus/integrations/aws_s3_buckets.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/aws_s3_buckets.md rename to src/go/plugin/go.d/collector/prometheus/integrations/aws_s3_buckets.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/aws_sqs.md b/src/go/plugin/go.d/collector/prometheus/integrations/aws_sqs.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/aws_sqs.md rename to src/go/plugin/go.d/collector/prometheus/integrations/aws_sqs.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/azure_ad_app_passwords.md b/src/go/plugin/go.d/collector/prometheus/integrations/azure_ad_app_passwords.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/azure_ad_app_passwords.md rename to src/go/plugin/go.d/collector/prometheus/integrations/azure_ad_app_passwords.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/azure_application.md b/src/go/plugin/go.d/collector/prometheus/integrations/azure_application.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/azure_application.md rename to src/go/plugin/go.d/collector/prometheus/integrations/azure_application.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/azure_elastic_pool_sql.md b/src/go/plugin/go.d/collector/prometheus/integrations/azure_elastic_pool_sql.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/azure_elastic_pool_sql.md rename to src/go/plugin/go.d/collector/prometheus/integrations/azure_elastic_pool_sql.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/azure_resources.md b/src/go/plugin/go.d/collector/prometheus/integrations/azure_resources.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/azure_resources.md rename to src/go/plugin/go.d/collector/prometheus/integrations/azure_resources.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/azure_service_bus.md b/src/go/plugin/go.d/collector/prometheus/integrations/azure_service_bus.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/azure_service_bus.md rename to src/go/plugin/go.d/collector/prometheus/integrations/azure_service_bus.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/azure_sql.md b/src/go/plugin/go.d/collector/prometheus/integrations/azure_sql.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/azure_sql.md rename to src/go/plugin/go.d/collector/prometheus/integrations/azure_sql.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/bigquery.md b/src/go/plugin/go.d/collector/prometheus/integrations/bigquery.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/bigquery.md rename to src/go/plugin/go.d/collector/prometheus/integrations/bigquery.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/bird_routing_daemon.md b/src/go/plugin/go.d/collector/prometheus/integrations/bird_routing_daemon.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/bird_routing_daemon.md rename to src/go/plugin/go.d/collector/prometheus/integrations/bird_routing_daemon.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/blackbox.md b/src/go/plugin/go.d/collector/prometheus/integrations/blackbox.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/blackbox.md rename to src/go/plugin/go.d/collector/prometheus/integrations/blackbox.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/bobcat_miner_300.md b/src/go/plugin/go.d/collector/prometheus/integrations/bobcat_miner_300.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/bobcat_miner_300.md rename to src/go/plugin/go.d/collector/prometheus/integrations/bobcat_miner_300.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/borg_backup.md b/src/go/plugin/go.d/collector/prometheus/integrations/borg_backup.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/borg_backup.md rename to src/go/plugin/go.d/collector/prometheus/integrations/borg_backup.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/bosh.md b/src/go/plugin/go.d/collector/prometheus/integrations/bosh.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/bosh.md rename to src/go/plugin/go.d/collector/prometheus/integrations/bosh.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/bpftrace_variables.md b/src/go/plugin/go.d/collector/prometheus/integrations/bpftrace_variables.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/bpftrace_variables.md rename to src/go/plugin/go.d/collector/prometheus/integrations/bpftrace_variables.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/bungeecord.md b/src/go/plugin/go.d/collector/prometheus/integrations/bungeecord.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/bungeecord.md rename to src/go/plugin/go.d/collector/prometheus/integrations/bungeecord.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/cadvisor.md b/src/go/plugin/go.d/collector/prometheus/integrations/cadvisor.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/cadvisor.md rename to src/go/plugin/go.d/collector/prometheus/integrations/cadvisor.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/celery.md b/src/go/plugin/go.d/collector/prometheus/integrations/celery.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/celery.md rename to src/go/plugin/go.d/collector/prometheus/integrations/celery.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/certificate_transparency.md b/src/go/plugin/go.d/collector/prometheus/integrations/certificate_transparency.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/certificate_transparency.md rename to src/go/plugin/go.d/collector/prometheus/integrations/certificate_transparency.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/checkpoint_device.md b/src/go/plugin/go.d/collector/prometheus/integrations/checkpoint_device.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/checkpoint_device.md rename to src/go/plugin/go.d/collector/prometheus/integrations/checkpoint_device.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/chia.md b/src/go/plugin/go.d/collector/prometheus/integrations/chia.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/chia.md rename to src/go/plugin/go.d/collector/prometheus/integrations/chia.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/christ_elektronik_clm5ip_power_panel.md b/src/go/plugin/go.d/collector/prometheus/integrations/christ_elektronik_clm5ip_power_panel.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/christ_elektronik_clm5ip_power_panel.md rename to src/go/plugin/go.d/collector/prometheus/integrations/christ_elektronik_clm5ip_power_panel.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/cilium_agent.md b/src/go/plugin/go.d/collector/prometheus/integrations/cilium_agent.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/cilium_agent.md rename to src/go/plugin/go.d/collector/prometheus/integrations/cilium_agent.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/cilium_operator.md b/src/go/plugin/go.d/collector/prometheus/integrations/cilium_operator.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/cilium_operator.md rename to src/go/plugin/go.d/collector/prometheus/integrations/cilium_operator.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/cilium_proxy.md b/src/go/plugin/go.d/collector/prometheus/integrations/cilium_proxy.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/cilium_proxy.md rename to src/go/plugin/go.d/collector/prometheus/integrations/cilium_proxy.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/cisco_aci.md b/src/go/plugin/go.d/collector/prometheus/integrations/cisco_aci.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/cisco_aci.md rename to src/go/plugin/go.d/collector/prometheus/integrations/cisco_aci.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/citrix_netscaler.md b/src/go/plugin/go.d/collector/prometheus/integrations/citrix_netscaler.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/citrix_netscaler.md rename to src/go/plugin/go.d/collector/prometheus/integrations/citrix_netscaler.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/clamav_daemon.md b/src/go/plugin/go.d/collector/prometheus/integrations/clamav_daemon.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/clamav_daemon.md rename to src/go/plugin/go.d/collector/prometheus/integrations/clamav_daemon.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/clamscan_results.md b/src/go/plugin/go.d/collector/prometheus/integrations/clamscan_results.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/clamscan_results.md rename to src/go/plugin/go.d/collector/prometheus/integrations/clamscan_results.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/clash.md b/src/go/plugin/go.d/collector/prometheus/integrations/clash.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/clash.md rename to src/go/plugin/go.d/collector/prometheus/integrations/clash.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/cloud_foundry.md b/src/go/plugin/go.d/collector/prometheus/integrations/cloud_foundry.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/cloud_foundry.md rename to src/go/plugin/go.d/collector/prometheus/integrations/cloud_foundry.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/cloud_foundry_firehose.md b/src/go/plugin/go.d/collector/prometheus/integrations/cloud_foundry_firehose.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/cloud_foundry_firehose.md rename to src/go/plugin/go.d/collector/prometheus/integrations/cloud_foundry_firehose.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/cloudflare_pcap.md b/src/go/plugin/go.d/collector/prometheus/integrations/cloudflare_pcap.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/cloudflare_pcap.md rename to src/go/plugin/go.d/collector/prometheus/integrations/cloudflare_pcap.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/cloudwatch.md b/src/go/plugin/go.d/collector/prometheus/integrations/cloudwatch.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/cloudwatch.md rename to src/go/plugin/go.d/collector/prometheus/integrations/cloudwatch.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/clustercontrol_cmon.md b/src/go/plugin/go.d/collector/prometheus/integrations/clustercontrol_cmon.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/clustercontrol_cmon.md rename to src/go/plugin/go.d/collector/prometheus/integrations/clustercontrol_cmon.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/collectd.md b/src/go/plugin/go.d/collector/prometheus/integrations/collectd.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/collectd.md rename to src/go/plugin/go.d/collector/prometheus/integrations/collectd.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/concourse.md b/src/go/plugin/go.d/collector/prometheus/integrations/concourse.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/concourse.md rename to src/go/plugin/go.d/collector/prometheus/integrations/concourse.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/craftbeerpi.md b/src/go/plugin/go.d/collector/prometheus/integrations/craftbeerpi.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/craftbeerpi.md rename to src/go/plugin/go.d/collector/prometheus/integrations/craftbeerpi.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/crowdsec.md b/src/go/plugin/go.d/collector/prometheus/integrations/crowdsec.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/crowdsec.md rename to src/go/plugin/go.d/collector/prometheus/integrations/crowdsec.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/crypto_exchanges.md b/src/go/plugin/go.d/collector/prometheus/integrations/crypto_exchanges.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/crypto_exchanges.md rename to src/go/plugin/go.d/collector/prometheus/integrations/crypto_exchanges.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/cryptowatch.md b/src/go/plugin/go.d/collector/prometheus/integrations/cryptowatch.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/cryptowatch.md rename to src/go/plugin/go.d/collector/prometheus/integrations/cryptowatch.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/custom_exporter.md b/src/go/plugin/go.d/collector/prometheus/integrations/custom_exporter.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/custom_exporter.md rename to src/go/plugin/go.d/collector/prometheus/integrations/custom_exporter.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/cvmfs_clients.md b/src/go/plugin/go.d/collector/prometheus/integrations/cvmfs_clients.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/cvmfs_clients.md rename to src/go/plugin/go.d/collector/prometheus/integrations/cvmfs_clients.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ddwrt_routers.md b/src/go/plugin/go.d/collector/prometheus/integrations/ddwrt_routers.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ddwrt_routers.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ddwrt_routers.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/dell_emc_ecs_cluster.md b/src/go/plugin/go.d/collector/prometheus/integrations/dell_emc_ecs_cluster.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/dell_emc_ecs_cluster.md rename to src/go/plugin/go.d/collector/prometheus/integrations/dell_emc_ecs_cluster.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/dell_emc_isilon_cluster.md b/src/go/plugin/go.d/collector/prometheus/integrations/dell_emc_isilon_cluster.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/dell_emc_isilon_cluster.md rename to src/go/plugin/go.d/collector/prometheus/integrations/dell_emc_isilon_cluster.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/dell_emc_xtremio_cluster.md b/src/go/plugin/go.d/collector/prometheus/integrations/dell_emc_xtremio_cluster.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/dell_emc_xtremio_cluster.md rename to src/go/plugin/go.d/collector/prometheus/integrations/dell_emc_xtremio_cluster.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/dell_powermax.md b/src/go/plugin/go.d/collector/prometheus/integrations/dell_powermax.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/dell_powermax.md rename to src/go/plugin/go.d/collector/prometheus/integrations/dell_powermax.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/dependency-track.md b/src/go/plugin/go.d/collector/prometheus/integrations/dependency-track.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/dependency-track.md rename to src/go/plugin/go.d/collector/prometheus/integrations/dependency-track.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/digitalocean.md b/src/go/plugin/go.d/collector/prometheus/integrations/digitalocean.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/digitalocean.md rename to src/go/plugin/go.d/collector/prometheus/integrations/digitalocean.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/discourse.md b/src/go/plugin/go.d/collector/prometheus/integrations/discourse.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/discourse.md rename to src/go/plugin/go.d/collector/prometheus/integrations/discourse.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/dmarc.md b/src/go/plugin/go.d/collector/prometheus/integrations/dmarc.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/dmarc.md rename to src/go/plugin/go.d/collector/prometheus/integrations/dmarc.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/dnsbl.md b/src/go/plugin/go.d/collector/prometheus/integrations/dnsbl.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/dnsbl.md rename to src/go/plugin/go.d/collector/prometheus/integrations/dnsbl.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/dutch_electricity_smart_meter.md b/src/go/plugin/go.d/collector/prometheus/integrations/dutch_electricity_smart_meter.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/dutch_electricity_smart_meter.md rename to src/go/plugin/go.d/collector/prometheus/integrations/dutch_electricity_smart_meter.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/dynatrace.md b/src/go/plugin/go.d/collector/prometheus/integrations/dynatrace.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/dynatrace.md rename to src/go/plugin/go.d/collector/prometheus/integrations/dynatrace.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/eaton_ups.md b/src/go/plugin/go.d/collector/prometheus/integrations/eaton_ups.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/eaton_ups.md rename to src/go/plugin/go.d/collector/prometheus/integrations/eaton_ups.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/elgato_key_light_devices..md b/src/go/plugin/go.d/collector/prometheus/integrations/elgato_key_light_devices..md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/elgato_key_light_devices..md rename to src/go/plugin/go.d/collector/prometheus/integrations/elgato_key_light_devices..md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/energomera_smart_power_meters.md b/src/go/plugin/go.d/collector/prometheus/integrations/energomera_smart_power_meters.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/energomera_smart_power_meters.md rename to src/go/plugin/go.d/collector/prometheus/integrations/energomera_smart_power_meters.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/eos.md b/src/go/plugin/go.d/collector/prometheus/integrations/eos.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/eos.md rename to src/go/plugin/go.d/collector/prometheus/integrations/eos.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/etcd.md b/src/go/plugin/go.d/collector/prometheus/integrations/etcd.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/etcd.md rename to src/go/plugin/go.d/collector/prometheus/integrations/etcd.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/excel_spreadsheet.md b/src/go/plugin/go.d/collector/prometheus/integrations/excel_spreadsheet.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/excel_spreadsheet.md rename to src/go/plugin/go.d/collector/prometheus/integrations/excel_spreadsheet.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/fastd.md b/src/go/plugin/go.d/collector/prometheus/integrations/fastd.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/fastd.md rename to src/go/plugin/go.d/collector/prometheus/integrations/fastd.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/fortigate_firewall.md b/src/go/plugin/go.d/collector/prometheus/integrations/fortigate_firewall.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/fortigate_firewall.md rename to src/go/plugin/go.d/collector/prometheus/integrations/fortigate_firewall.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/freebsd_nfs.md b/src/go/plugin/go.d/collector/prometheus/integrations/freebsd_nfs.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/freebsd_nfs.md rename to src/go/plugin/go.d/collector/prometheus/integrations/freebsd_nfs.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/freebsd_rctl-racct.md b/src/go/plugin/go.d/collector/prometheus/integrations/freebsd_rctl-racct.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/freebsd_rctl-racct.md rename to src/go/plugin/go.d/collector/prometheus/integrations/freebsd_rctl-racct.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/freifunk_network.md b/src/go/plugin/go.d/collector/prometheus/integrations/freifunk_network.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/freifunk_network.md rename to src/go/plugin/go.d/collector/prometheus/integrations/freifunk_network.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/fritzbox_network_devices.md b/src/go/plugin/go.d/collector/prometheus/integrations/fritzbox_network_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/fritzbox_network_devices.md rename to src/go/plugin/go.d/collector/prometheus/integrations/fritzbox_network_devices.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/frrouting.md b/src/go/plugin/go.d/collector/prometheus/integrations/frrouting.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/frrouting.md rename to src/go/plugin/go.d/collector/prometheus/integrations/frrouting.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/gcp_gce.md b/src/go/plugin/go.d/collector/prometheus/integrations/gcp_gce.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/gcp_gce.md rename to src/go/plugin/go.d/collector/prometheus/integrations/gcp_gce.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/gcp_quota.md b/src/go/plugin/go.d/collector/prometheus/integrations/gcp_quota.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/gcp_quota.md rename to src/go/plugin/go.d/collector/prometheus/integrations/gcp_quota.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/generic_command_line_output.md b/src/go/plugin/go.d/collector/prometheus/integrations/generic_command_line_output.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/generic_command_line_output.md rename to src/go/plugin/go.d/collector/prometheus/integrations/generic_command_line_output.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/generic_storage_enclosure_tool.md b/src/go/plugin/go.d/collector/prometheus/integrations/generic_storage_enclosure_tool.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/generic_storage_enclosure_tool.md rename to src/go/plugin/go.d/collector/prometheus/integrations/generic_storage_enclosure_tool.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/github_api_rate_limit.md b/src/go/plugin/go.d/collector/prometheus/integrations/github_api_rate_limit.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/github_api_rate_limit.md rename to src/go/plugin/go.d/collector/prometheus/integrations/github_api_rate_limit.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/github_repository.md b/src/go/plugin/go.d/collector/prometheus/integrations/github_repository.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/github_repository.md rename to src/go/plugin/go.d/collector/prometheus/integrations/github_repository.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/gitlab_runner.md b/src/go/plugin/go.d/collector/prometheus/integrations/gitlab_runner.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/gitlab_runner.md rename to src/go/plugin/go.d/collector/prometheus/integrations/gitlab_runner.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/gobetween.md b/src/go/plugin/go.d/collector/prometheus/integrations/gobetween.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/gobetween.md rename to src/go/plugin/go.d/collector/prometheus/integrations/gobetween.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/google_cloud_platform.md b/src/go/plugin/go.d/collector/prometheus/integrations/google_cloud_platform.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/google_cloud_platform.md rename to src/go/plugin/go.d/collector/prometheus/integrations/google_cloud_platform.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/google_pagespeed.md b/src/go/plugin/go.d/collector/prometheus/integrations/google_pagespeed.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/google_pagespeed.md rename to src/go/plugin/go.d/collector/prometheus/integrations/google_pagespeed.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/google_stackdriver.md b/src/go/plugin/go.d/collector/prometheus/integrations/google_stackdriver.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/google_stackdriver.md rename to src/go/plugin/go.d/collector/prometheus/integrations/google_stackdriver.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/gpsd.md b/src/go/plugin/go.d/collector/prometheus/integrations/gpsd.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/gpsd.md rename to src/go/plugin/go.d/collector/prometheus/integrations/gpsd.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/grafana.md b/src/go/plugin/go.d/collector/prometheus/integrations/grafana.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/grafana.md rename to src/go/plugin/go.d/collector/prometheus/integrations/grafana.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/graylog_server.md b/src/go/plugin/go.d/collector/prometheus/integrations/graylog_server.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/graylog_server.md rename to src/go/plugin/go.d/collector/prometheus/integrations/graylog_server.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/gtp.md b/src/go/plugin/go.d/collector/prometheus/integrations/gtp.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/gtp.md rename to src/go/plugin/go.d/collector/prometheus/integrations/gtp.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/halon.md b/src/go/plugin/go.d/collector/prometheus/integrations/halon.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/halon.md rename to src/go/plugin/go.d/collector/prometheus/integrations/halon.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/hana.md b/src/go/plugin/go.d/collector/prometheus/integrations/hana.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/hana.md rename to src/go/plugin/go.d/collector/prometheus/integrations/hana.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/hashicorp_vault_secrets.md b/src/go/plugin/go.d/collector/prometheus/integrations/hashicorp_vault_secrets.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/hashicorp_vault_secrets.md rename to src/go/plugin/go.d/collector/prometheus/integrations/hashicorp_vault_secrets.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/hasura_graphql_server.md b/src/go/plugin/go.d/collector/prometheus/integrations/hasura_graphql_server.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/hasura_graphql_server.md rename to src/go/plugin/go.d/collector/prometheus/integrations/hasura_graphql_server.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/hdsentinel.md b/src/go/plugin/go.d/collector/prometheus/integrations/hdsentinel.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/hdsentinel.md rename to src/go/plugin/go.d/collector/prometheus/integrations/hdsentinel.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/helium_hotspot.md b/src/go/plugin/go.d/collector/prometheus/integrations/helium_hotspot.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/helium_hotspot.md rename to src/go/plugin/go.d/collector/prometheus/integrations/helium_hotspot.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/helium_miner_validator.md b/src/go/plugin/go.d/collector/prometheus/integrations/helium_miner_validator.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/helium_miner_validator.md rename to src/go/plugin/go.d/collector/prometheus/integrations/helium_miner_validator.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/hhvm.md b/src/go/plugin/go.d/collector/prometheus/integrations/hhvm.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/hhvm.md rename to src/go/plugin/go.d/collector/prometheus/integrations/hhvm.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/hitron_cgn_series_cpe.md b/src/go/plugin/go.d/collector/prometheus/integrations/hitron_cgn_series_cpe.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/hitron_cgn_series_cpe.md rename to src/go/plugin/go.d/collector/prometheus/integrations/hitron_cgn_series_cpe.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/hitron_coda_cable_modem.md b/src/go/plugin/go.d/collector/prometheus/integrations/hitron_coda_cable_modem.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/hitron_coda_cable_modem.md rename to src/go/plugin/go.d/collector/prometheus/integrations/hitron_coda_cable_modem.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/homebridge.md b/src/go/plugin/go.d/collector/prometheus/integrations/homebridge.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/homebridge.md rename to src/go/plugin/go.d/collector/prometheus/integrations/homebridge.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/homey.md b/src/go/plugin/go.d/collector/prometheus/integrations/homey.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/homey.md rename to src/go/plugin/go.d/collector/prometheus/integrations/homey.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/honeypot.md b/src/go/plugin/go.d/collector/prometheus/integrations/honeypot.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/honeypot.md rename to src/go/plugin/go.d/collector/prometheus/integrations/honeypot.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/hp_ilo.md b/src/go/plugin/go.d/collector/prometheus/integrations/hp_ilo.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/hp_ilo.md rename to src/go/plugin/go.d/collector/prometheus/integrations/hp_ilo.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/huawei_devices.md b/src/go/plugin/go.d/collector/prometheus/integrations/huawei_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/huawei_devices.md rename to src/go/plugin/go.d/collector/prometheus/integrations/huawei_devices.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/hubble.md b/src/go/plugin/go.d/collector/prometheus/integrations/hubble.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/hubble.md rename to src/go/plugin/go.d/collector/prometheus/integrations/hubble.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ibm_aix_systems_njmon.md b/src/go/plugin/go.d/collector/prometheus/integrations/ibm_aix_systems_njmon.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ibm_aix_systems_njmon.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ibm_aix_systems_njmon.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ibm_cryptoexpress_cex_cards.md b/src/go/plugin/go.d/collector/prometheus/integrations/ibm_cryptoexpress_cex_cards.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ibm_cryptoexpress_cex_cards.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ibm_cryptoexpress_cex_cards.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ibm_mq.md b/src/go/plugin/go.d/collector/prometheus/integrations/ibm_mq.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ibm_mq.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ibm_mq.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ibm_spectrum.md b/src/go/plugin/go.d/collector/prometheus/integrations/ibm_spectrum.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ibm_spectrum.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ibm_spectrum.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ibm_spectrum_virtualize.md b/src/go/plugin/go.d/collector/prometheus/integrations/ibm_spectrum_virtualize.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ibm_spectrum_virtualize.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ibm_spectrum_virtualize.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ibm_z_hardware_management_console.md b/src/go/plugin/go.d/collector/prometheus/integrations/ibm_z_hardware_management_console.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ibm_z_hardware_management_console.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ibm_z_hardware_management_console.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/influxdb.md b/src/go/plugin/go.d/collector/prometheus/integrations/influxdb.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/influxdb.md rename to src/go/plugin/go.d/collector/prometheus/integrations/influxdb.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/iota_full_node.md b/src/go/plugin/go.d/collector/prometheus/integrations/iota_full_node.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/iota_full_node.md rename to src/go/plugin/go.d/collector/prometheus/integrations/iota_full_node.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ipmi_by_soundcloud.md b/src/go/plugin/go.d/collector/prometheus/integrations/ipmi_by_soundcloud.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ipmi_by_soundcloud.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ipmi_by_soundcloud.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/iqair_airvisual_air_quality_monitors.md b/src/go/plugin/go.d/collector/prometheus/integrations/iqair_airvisual_air_quality_monitors.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/iqair_airvisual_air_quality_monitors.md rename to src/go/plugin/go.d/collector/prometheus/integrations/iqair_airvisual_air_quality_monitors.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/jarvis_standing_desk.md b/src/go/plugin/go.d/collector/prometheus/integrations/jarvis_standing_desk.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/jarvis_standing_desk.md rename to src/go/plugin/go.d/collector/prometheus/integrations/jarvis_standing_desk.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/jenkins.md b/src/go/plugin/go.d/collector/prometheus/integrations/jenkins.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/jenkins.md rename to src/go/plugin/go.d/collector/prometheus/integrations/jenkins.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/jetbrains_floating_license_server.md b/src/go/plugin/go.d/collector/prometheus/integrations/jetbrains_floating_license_server.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/jetbrains_floating_license_server.md rename to src/go/plugin/go.d/collector/prometheus/integrations/jetbrains_floating_license_server.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/jmx.md b/src/go/plugin/go.d/collector/prometheus/integrations/jmx.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/jmx.md rename to src/go/plugin/go.d/collector/prometheus/integrations/jmx.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/jolokia.md b/src/go/plugin/go.d/collector/prometheus/integrations/jolokia.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/jolokia.md rename to src/go/plugin/go.d/collector/prometheus/integrations/jolokia.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/journald.md b/src/go/plugin/go.d/collector/prometheus/integrations/journald.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/journald.md rename to src/go/plugin/go.d/collector/prometheus/integrations/journald.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/kafka.md b/src/go/plugin/go.d/collector/prometheus/integrations/kafka.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/kafka.md rename to src/go/plugin/go.d/collector/prometheus/integrations/kafka.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/kafka_connect.md b/src/go/plugin/go.d/collector/prometheus/integrations/kafka_connect.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/kafka_connect.md rename to src/go/plugin/go.d/collector/prometheus/integrations/kafka_connect.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/kafka_consumer_lag.md b/src/go/plugin/go.d/collector/prometheus/integrations/kafka_consumer_lag.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/kafka_consumer_lag.md rename to src/go/plugin/go.d/collector/prometheus/integrations/kafka_consumer_lag.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/kafka_zookeeper.md b/src/go/plugin/go.d/collector/prometheus/integrations/kafka_zookeeper.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/kafka_zookeeper.md rename to src/go/plugin/go.d/collector/prometheus/integrations/kafka_zookeeper.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/kannel.md b/src/go/plugin/go.d/collector/prometheus/integrations/kannel.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/kannel.md rename to src/go/plugin/go.d/collector/prometheus/integrations/kannel.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/keepalived.md b/src/go/plugin/go.d/collector/prometheus/integrations/keepalived.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/keepalived.md rename to src/go/plugin/go.d/collector/prometheus/integrations/keepalived.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/kubernetes_cluster_cloud_cost.md b/src/go/plugin/go.d/collector/prometheus/integrations/kubernetes_cluster_cloud_cost.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/kubernetes_cluster_cloud_cost.md rename to src/go/plugin/go.d/collector/prometheus/integrations/kubernetes_cluster_cloud_cost.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/lagerist_disk_latency.md b/src/go/plugin/go.d/collector/prometheus/integrations/lagerist_disk_latency.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/lagerist_disk_latency.md rename to src/go/plugin/go.d/collector/prometheus/integrations/lagerist_disk_latency.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ldap.md b/src/go/plugin/go.d/collector/prometheus/integrations/ldap.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ldap.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ldap.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/linode.md b/src/go/plugin/go.d/collector/prometheus/integrations/linode.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/linode.md rename to src/go/plugin/go.d/collector/prometheus/integrations/linode.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/loki.md b/src/go/plugin/go.d/collector/prometheus/integrations/loki.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/loki.md rename to src/go/plugin/go.d/collector/prometheus/integrations/loki.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/lustre_metadata.md b/src/go/plugin/go.d/collector/prometheus/integrations/lustre_metadata.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/lustre_metadata.md rename to src/go/plugin/go.d/collector/prometheus/integrations/lustre_metadata.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/lynis_audit_reports.md b/src/go/plugin/go.d/collector/prometheus/integrations/lynis_audit_reports.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/lynis_audit_reports.md rename to src/go/plugin/go.d/collector/prometheus/integrations/lynis_audit_reports.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/machbase.md b/src/go/plugin/go.d/collector/prometheus/integrations/machbase.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/machbase.md rename to src/go/plugin/go.d/collector/prometheus/integrations/machbase.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/maildir.md b/src/go/plugin/go.d/collector/prometheus/integrations/maildir.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/maildir.md rename to src/go/plugin/go.d/collector/prometheus/integrations/maildir.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/meilisearch.md b/src/go/plugin/go.d/collector/prometheus/integrations/meilisearch.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/meilisearch.md rename to src/go/plugin/go.d/collector/prometheus/integrations/meilisearch.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/memcached_community.md b/src/go/plugin/go.d/collector/prometheus/integrations/memcached_community.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/memcached_community.md rename to src/go/plugin/go.d/collector/prometheus/integrations/memcached_community.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/meraki_dashboard.md b/src/go/plugin/go.d/collector/prometheus/integrations/meraki_dashboard.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/meraki_dashboard.md rename to src/go/plugin/go.d/collector/prometheus/integrations/meraki_dashboard.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/mesos.md b/src/go/plugin/go.d/collector/prometheus/integrations/mesos.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/mesos.md rename to src/go/plugin/go.d/collector/prometheus/integrations/mesos.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/mikrotik_devices.md b/src/go/plugin/go.d/collector/prometheus/integrations/mikrotik_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/mikrotik_devices.md rename to src/go/plugin/go.d/collector/prometheus/integrations/mikrotik_devices.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/mikrotik_routeros_devices.md b/src/go/plugin/go.d/collector/prometheus/integrations/mikrotik_routeros_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/mikrotik_routeros_devices.md rename to src/go/plugin/go.d/collector/prometheus/integrations/mikrotik_routeros_devices.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/minecraft.md b/src/go/plugin/go.d/collector/prometheus/integrations/minecraft.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/minecraft.md rename to src/go/plugin/go.d/collector/prometheus/integrations/minecraft.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/modbus_protocol.md b/src/go/plugin/go.d/collector/prometheus/integrations/modbus_protocol.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/modbus_protocol.md rename to src/go/plugin/go.d/collector/prometheus/integrations/modbus_protocol.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/mogilefs.md b/src/go/plugin/go.d/collector/prometheus/integrations/mogilefs.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/mogilefs.md rename to src/go/plugin/go.d/collector/prometheus/integrations/mogilefs.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/monnit_sensors_mqtt.md b/src/go/plugin/go.d/collector/prometheus/integrations/monnit_sensors_mqtt.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/monnit_sensors_mqtt.md rename to src/go/plugin/go.d/collector/prometheus/integrations/monnit_sensors_mqtt.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/mosquitto.md b/src/go/plugin/go.d/collector/prometheus/integrations/mosquitto.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/mosquitto.md rename to src/go/plugin/go.d/collector/prometheus/integrations/mosquitto.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/mp707_usb_thermometer.md b/src/go/plugin/go.d/collector/prometheus/integrations/mp707_usb_thermometer.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/mp707_usb_thermometer.md rename to src/go/plugin/go.d/collector/prometheus/integrations/mp707_usb_thermometer.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/mqtt_blackbox.md b/src/go/plugin/go.d/collector/prometheus/integrations/mqtt_blackbox.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/mqtt_blackbox.md rename to src/go/plugin/go.d/collector/prometheus/integrations/mqtt_blackbox.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/mtail.md b/src/go/plugin/go.d/collector/prometheus/integrations/mtail.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/mtail.md rename to src/go/plugin/go.d/collector/prometheus/integrations/mtail.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/naemon.md b/src/go/plugin/go.d/collector/prometheus/integrations/naemon.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/naemon.md rename to src/go/plugin/go.d/collector/prometheus/integrations/naemon.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/nagios.md b/src/go/plugin/go.d/collector/prometheus/integrations/nagios.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/nagios.md rename to src/go/plugin/go.d/collector/prometheus/integrations/nagios.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/nature_remo_e_lite_devices.md b/src/go/plugin/go.d/collector/prometheus/integrations/nature_remo_e_lite_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/nature_remo_e_lite_devices.md rename to src/go/plugin/go.d/collector/prometheus/integrations/nature_remo_e_lite_devices.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/netapp_ontap_api.md b/src/go/plugin/go.d/collector/prometheus/integrations/netapp_ontap_api.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/netapp_ontap_api.md rename to src/go/plugin/go.d/collector/prometheus/integrations/netapp_ontap_api.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/netapp_solidfire.md b/src/go/plugin/go.d/collector/prometheus/integrations/netapp_solidfire.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/netapp_solidfire.md rename to src/go/plugin/go.d/collector/prometheus/integrations/netapp_solidfire.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/netatmo_sensors.md b/src/go/plugin/go.d/collector/prometheus/integrations/netatmo_sensors.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/netatmo_sensors.md rename to src/go/plugin/go.d/collector/prometheus/integrations/netatmo_sensors.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/netflow.md b/src/go/plugin/go.d/collector/prometheus/integrations/netflow.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/netflow.md rename to src/go/plugin/go.d/collector/prometheus/integrations/netflow.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/netmeter.md b/src/go/plugin/go.d/collector/prometheus/integrations/netmeter.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/netmeter.md rename to src/go/plugin/go.d/collector/prometheus/integrations/netmeter.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/new_relic.md b/src/go/plugin/go.d/collector/prometheus/integrations/new_relic.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/new_relic.md rename to src/go/plugin/go.d/collector/prometheus/integrations/new_relic.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/nextcloud_servers.md b/src/go/plugin/go.d/collector/prometheus/integrations/nextcloud_servers.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/nextcloud_servers.md rename to src/go/plugin/go.d/collector/prometheus/integrations/nextcloud_servers.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/nextdns.md b/src/go/plugin/go.d/collector/prometheus/integrations/nextdns.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/nextdns.md rename to src/go/plugin/go.d/collector/prometheus/integrations/nextdns.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/nftables.md b/src/go/plugin/go.d/collector/prometheus/integrations/nftables.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/nftables.md rename to src/go/plugin/go.d/collector/prometheus/integrations/nftables.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/nrpe_daemon.md b/src/go/plugin/go.d/collector/prometheus/integrations/nrpe_daemon.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/nrpe_daemon.md rename to src/go/plugin/go.d/collector/prometheus/integrations/nrpe_daemon.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/nsx-t.md b/src/go/plugin/go.d/collector/prometheus/integrations/nsx-t.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/nsx-t.md rename to src/go/plugin/go.d/collector/prometheus/integrations/nsx-t.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/nvml.md b/src/go/plugin/go.d/collector/prometheus/integrations/nvml.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/nvml.md rename to src/go/plugin/go.d/collector/prometheus/integrations/nvml.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/obs_studio.md b/src/go/plugin/go.d/collector/prometheus/integrations/obs_studio.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/obs_studio.md rename to src/go/plugin/go.d/collector/prometheus/integrations/obs_studio.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/odbc.md b/src/go/plugin/go.d/collector/prometheus/integrations/odbc.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/odbc.md rename to src/go/plugin/go.d/collector/prometheus/integrations/odbc.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/open_vswitch.md b/src/go/plugin/go.d/collector/prometheus/integrations/open_vswitch.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/open_vswitch.md rename to src/go/plugin/go.d/collector/prometheus/integrations/open_vswitch.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/openhab.md b/src/go/plugin/go.d/collector/prometheus/integrations/openhab.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/openhab.md rename to src/go/plugin/go.d/collector/prometheus/integrations/openhab.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/openldap_community.md b/src/go/plugin/go.d/collector/prometheus/integrations/openldap_community.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/openldap_community.md rename to src/go/plugin/go.d/collector/prometheus/integrations/openldap_community.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/openrc.md b/src/go/plugin/go.d/collector/prometheus/integrations/openrc.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/openrc.md rename to src/go/plugin/go.d/collector/prometheus/integrations/openrc.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/openrct2.md b/src/go/plugin/go.d/collector/prometheus/integrations/openrct2.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/openrct2.md rename to src/go/plugin/go.d/collector/prometheus/integrations/openrct2.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/openroadm_devices.md b/src/go/plugin/go.d/collector/prometheus/integrations/openroadm_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/openroadm_devices.md rename to src/go/plugin/go.d/collector/prometheus/integrations/openroadm_devices.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/openstack.md b/src/go/plugin/go.d/collector/prometheus/integrations/openstack.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/openstack.md rename to src/go/plugin/go.d/collector/prometheus/integrations/openstack.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/openvas.md b/src/go/plugin/go.d/collector/prometheus/integrations/openvas.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/openvas.md rename to src/go/plugin/go.d/collector/prometheus/integrations/openvas.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/openweathermap.md b/src/go/plugin/go.d/collector/prometheus/integrations/openweathermap.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/openweathermap.md rename to src/go/plugin/go.d/collector/prometheus/integrations/openweathermap.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/oracle_db_community.md b/src/go/plugin/go.d/collector/prometheus/integrations/oracle_db_community.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/oracle_db_community.md rename to src/go/plugin/go.d/collector/prometheus/integrations/oracle_db_community.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/otrs.md b/src/go/plugin/go.d/collector/prometheus/integrations/otrs.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/otrs.md rename to src/go/plugin/go.d/collector/prometheus/integrations/otrs.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/patroni.md b/src/go/plugin/go.d/collector/prometheus/integrations/patroni.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/patroni.md rename to src/go/plugin/go.d/collector/prometheus/integrations/patroni.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/personal_weather_station.md b/src/go/plugin/go.d/collector/prometheus/integrations/personal_weather_station.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/personal_weather_station.md rename to src/go/plugin/go.d/collector/prometheus/integrations/personal_weather_station.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/pgbackrest.md b/src/go/plugin/go.d/collector/prometheus/integrations/pgbackrest.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/pgbackrest.md rename to src/go/plugin/go.d/collector/prometheus/integrations/pgbackrest.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/pgpool-ii.md b/src/go/plugin/go.d/collector/prometheus/integrations/pgpool-ii.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/pgpool-ii.md rename to src/go/plugin/go.d/collector/prometheus/integrations/pgpool-ii.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/philips_hue.md b/src/go/plugin/go.d/collector/prometheus/integrations/philips_hue.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/philips_hue.md rename to src/go/plugin/go.d/collector/prometheus/integrations/philips_hue.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/pimoroni_enviro+.md b/src/go/plugin/go.d/collector/prometheus/integrations/pimoroni_enviro+.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/pimoroni_enviro+.md rename to src/go/plugin/go.d/collector/prometheus/integrations/pimoroni_enviro+.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/pingdom.md b/src/go/plugin/go.d/collector/prometheus/integrations/pingdom.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/pingdom.md rename to src/go/plugin/go.d/collector/prometheus/integrations/pingdom.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/podman.md b/src/go/plugin/go.d/collector/prometheus/integrations/podman.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/podman.md rename to src/go/plugin/go.d/collector/prometheus/integrations/podman.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/powerpal_devices.md b/src/go/plugin/go.d/collector/prometheus/integrations/powerpal_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/powerpal_devices.md rename to src/go/plugin/go.d/collector/prometheus/integrations/powerpal_devices.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/proftpd.md b/src/go/plugin/go.d/collector/prometheus/integrations/proftpd.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/proftpd.md rename to src/go/plugin/go.d/collector/prometheus/integrations/proftpd.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/prometheus_endpoint.md b/src/go/plugin/go.d/collector/prometheus/integrations/prometheus_endpoint.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/prometheus_endpoint.md rename to src/go/plugin/go.d/collector/prometheus/integrations/prometheus_endpoint.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/proxmox_ve.md b/src/go/plugin/go.d/collector/prometheus/integrations/proxmox_ve.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/proxmox_ve.md rename to src/go/plugin/go.d/collector/prometheus/integrations/proxmox_ve.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/radio_thermostat.md b/src/go/plugin/go.d/collector/prometheus/integrations/radio_thermostat.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/radio_thermostat.md rename to src/go/plugin/go.d/collector/prometheus/integrations/radio_thermostat.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/radius.md b/src/go/plugin/go.d/collector/prometheus/integrations/radius.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/radius.md rename to src/go/plugin/go.d/collector/prometheus/integrations/radius.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/rancher.md b/src/go/plugin/go.d/collector/prometheus/integrations/rancher.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/rancher.md rename to src/go/plugin/go.d/collector/prometheus/integrations/rancher.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/raritan_pdu.md b/src/go/plugin/go.d/collector/prometheus/integrations/raritan_pdu.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/raritan_pdu.md rename to src/go/plugin/go.d/collector/prometheus/integrations/raritan_pdu.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/redis_queue.md b/src/go/plugin/go.d/collector/prometheus/integrations/redis_queue.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/redis_queue.md rename to src/go/plugin/go.d/collector/prometheus/integrations/redis_queue.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ripe_atlas.md b/src/go/plugin/go.d/collector/prometheus/integrations/ripe_atlas.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ripe_atlas.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ripe_atlas.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/sabnzbd.md b/src/go/plugin/go.d/collector/prometheus/integrations/sabnzbd.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/sabnzbd.md rename to src/go/plugin/go.d/collector/prometheus/integrations/sabnzbd.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/salicru_eqx_inverter.md b/src/go/plugin/go.d/collector/prometheus/integrations/salicru_eqx_inverter.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/salicru_eqx_inverter.md rename to src/go/plugin/go.d/collector/prometheus/integrations/salicru_eqx_inverter.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/sense_energy.md b/src/go/plugin/go.d/collector/prometheus/integrations/sense_energy.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/sense_energy.md rename to src/go/plugin/go.d/collector/prometheus/integrations/sense_energy.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/sentry.md b/src/go/plugin/go.d/collector/prometheus/integrations/sentry.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/sentry.md rename to src/go/plugin/go.d/collector/prometheus/integrations/sentry.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/servertech.md b/src/go/plugin/go.d/collector/prometheus/integrations/servertech.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/servertech.md rename to src/go/plugin/go.d/collector/prometheus/integrations/servertech.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/shell_command.md b/src/go/plugin/go.d/collector/prometheus/integrations/shell_command.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/shell_command.md rename to src/go/plugin/go.d/collector/prometheus/integrations/shell_command.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/shelly_humidity_sensor.md b/src/go/plugin/go.d/collector/prometheus/integrations/shelly_humidity_sensor.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/shelly_humidity_sensor.md rename to src/go/plugin/go.d/collector/prometheus/integrations/shelly_humidity_sensor.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/sia.md b/src/go/plugin/go.d/collector/prometheus/integrations/sia.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/sia.md rename to src/go/plugin/go.d/collector/prometheus/integrations/sia.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/siemens_s7_plc.md b/src/go/plugin/go.d/collector/prometheus/integrations/siemens_s7_plc.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/siemens_s7_plc.md rename to src/go/plugin/go.d/collector/prometheus/integrations/siemens_s7_plc.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/site_24x7.md b/src/go/plugin/go.d/collector/prometheus/integrations/site_24x7.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/site_24x7.md rename to src/go/plugin/go.d/collector/prometheus/integrations/site_24x7.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/slurm.md b/src/go/plugin/go.d/collector/prometheus/integrations/slurm.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/slurm.md rename to src/go/plugin/go.d/collector/prometheus/integrations/slurm.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/sma_inverters.md b/src/go/plugin/go.d/collector/prometheus/integrations/sma_inverters.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/sma_inverters.md rename to src/go/plugin/go.d/collector/prometheus/integrations/sma_inverters.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/smart_meters_sml.md b/src/go/plugin/go.d/collector/prometheus/integrations/smart_meters_sml.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/smart_meters_sml.md rename to src/go/plugin/go.d/collector/prometheus/integrations/smart_meters_sml.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/smartrg_808ac_cable_modem.md b/src/go/plugin/go.d/collector/prometheus/integrations/smartrg_808ac_cable_modem.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/smartrg_808ac_cable_modem.md rename to src/go/plugin/go.d/collector/prometheus/integrations/smartrg_808ac_cable_modem.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/softether_vpn_server.md b/src/go/plugin/go.d/collector/prometheus/integrations/softether_vpn_server.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/softether_vpn_server.md rename to src/go/plugin/go.d/collector/prometheus/integrations/softether_vpn_server.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/solar_logging_stick.md b/src/go/plugin/go.d/collector/prometheus/integrations/solar_logging_stick.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/solar_logging_stick.md rename to src/go/plugin/go.d/collector/prometheus/integrations/solar_logging_stick.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/solaredge_inverters.md b/src/go/plugin/go.d/collector/prometheus/integrations/solaredge_inverters.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/solaredge_inverters.md rename to src/go/plugin/go.d/collector/prometheus/integrations/solaredge_inverters.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/solis_ginlong_5g_inverters.md b/src/go/plugin/go.d/collector/prometheus/integrations/solis_ginlong_5g_inverters.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/solis_ginlong_5g_inverters.md rename to src/go/plugin/go.d/collector/prometheus/integrations/solis_ginlong_5g_inverters.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/sonic_nos.md b/src/go/plugin/go.d/collector/prometheus/integrations/sonic_nos.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/sonic_nos.md rename to src/go/plugin/go.d/collector/prometheus/integrations/sonic_nos.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/spacelift.md b/src/go/plugin/go.d/collector/prometheus/integrations/spacelift.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/spacelift.md rename to src/go/plugin/go.d/collector/prometheus/integrations/spacelift.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/speedify_cli.md b/src/go/plugin/go.d/collector/prometheus/integrations/speedify_cli.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/speedify_cli.md rename to src/go/plugin/go.d/collector/prometheus/integrations/speedify_cli.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/sphinx.md b/src/go/plugin/go.d/collector/prometheus/integrations/sphinx.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/sphinx.md rename to src/go/plugin/go.d/collector/prometheus/integrations/sphinx.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/sql_database_agnostic.md b/src/go/plugin/go.d/collector/prometheus/integrations/sql_database_agnostic.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/sql_database_agnostic.md rename to src/go/plugin/go.d/collector/prometheus/integrations/sql_database_agnostic.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ssh.md b/src/go/plugin/go.d/collector/prometheus/integrations/ssh.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ssh.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ssh.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ssl_certificate.md b/src/go/plugin/go.d/collector/prometheus/integrations/ssl_certificate.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ssl_certificate.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ssl_certificate.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/starlink_spacex.md b/src/go/plugin/go.d/collector/prometheus/integrations/starlink_spacex.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/starlink_spacex.md rename to src/go/plugin/go.d/collector/prometheus/integrations/starlink_spacex.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/starwind_vsan_vsphere_edition.md b/src/go/plugin/go.d/collector/prometheus/integrations/starwind_vsan_vsphere_edition.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/starwind_vsan_vsphere_edition.md rename to src/go/plugin/go.d/collector/prometheus/integrations/starwind_vsan_vsphere_edition.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/statuspage.md b/src/go/plugin/go.d/collector/prometheus/integrations/statuspage.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/statuspage.md rename to src/go/plugin/go.d/collector/prometheus/integrations/statuspage.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/steam.md b/src/go/plugin/go.d/collector/prometheus/integrations/steam.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/steam.md rename to src/go/plugin/go.d/collector/prometheus/integrations/steam.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/storidge.md b/src/go/plugin/go.d/collector/prometheus/integrations/storidge.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/storidge.md rename to src/go/plugin/go.d/collector/prometheus/integrations/storidge.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/stream.md b/src/go/plugin/go.d/collector/prometheus/integrations/stream.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/stream.md rename to src/go/plugin/go.d/collector/prometheus/integrations/stream.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/strongswan.md b/src/go/plugin/go.d/collector/prometheus/integrations/strongswan.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/strongswan.md rename to src/go/plugin/go.d/collector/prometheus/integrations/strongswan.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/sunspec_solar_energy.md b/src/go/plugin/go.d/collector/prometheus/integrations/sunspec_solar_energy.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/sunspec_solar_energy.md rename to src/go/plugin/go.d/collector/prometheus/integrations/sunspec_solar_energy.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/suricata.md b/src/go/plugin/go.d/collector/prometheus/integrations/suricata.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/suricata.md rename to src/go/plugin/go.d/collector/prometheus/integrations/suricata.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/synology_activebackup.md b/src/go/plugin/go.d/collector/prometheus/integrations/synology_activebackup.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/synology_activebackup.md rename to src/go/plugin/go.d/collector/prometheus/integrations/synology_activebackup.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/sysload.md b/src/go/plugin/go.d/collector/prometheus/integrations/sysload.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/sysload.md rename to src/go/plugin/go.d/collector/prometheus/integrations/sysload.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/t-rex_nvidia_gpu_miner.md b/src/go/plugin/go.d/collector/prometheus/integrations/t-rex_nvidia_gpu_miner.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/t-rex_nvidia_gpu_miner.md rename to src/go/plugin/go.d/collector/prometheus/integrations/t-rex_nvidia_gpu_miner.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/tacacs.md b/src/go/plugin/go.d/collector/prometheus/integrations/tacacs.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/tacacs.md rename to src/go/plugin/go.d/collector/prometheus/integrations/tacacs.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/tado_smart_heating_solution.md b/src/go/plugin/go.d/collector/prometheus/integrations/tado_smart_heating_solution.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/tado_smart_heating_solution.md rename to src/go/plugin/go.d/collector/prometheus/integrations/tado_smart_heating_solution.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/tankerkoenig_api.md b/src/go/plugin/go.d/collector/prometheus/integrations/tankerkoenig_api.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/tankerkoenig_api.md rename to src/go/plugin/go.d/collector/prometheus/integrations/tankerkoenig_api.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/tesla_powerwall.md b/src/go/plugin/go.d/collector/prometheus/integrations/tesla_powerwall.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/tesla_powerwall.md rename to src/go/plugin/go.d/collector/prometheus/integrations/tesla_powerwall.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/tesla_vehicle.md b/src/go/plugin/go.d/collector/prometheus/integrations/tesla_vehicle.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/tesla_vehicle.md rename to src/go/plugin/go.d/collector/prometheus/integrations/tesla_vehicle.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/tesla_wall_connector.md b/src/go/plugin/go.d/collector/prometheus/integrations/tesla_wall_connector.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/tesla_wall_connector.md rename to src/go/plugin/go.d/collector/prometheus/integrations/tesla_wall_connector.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/tp-link_p110.md b/src/go/plugin/go.d/collector/prometheus/integrations/tp-link_p110.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/tp-link_p110.md rename to src/go/plugin/go.d/collector/prometheus/integrations/tp-link_p110.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/traceroute.md b/src/go/plugin/go.d/collector/prometheus/integrations/traceroute.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/traceroute.md rename to src/go/plugin/go.d/collector/prometheus/integrations/traceroute.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/twincat_ads_web_service.md b/src/go/plugin/go.d/collector/prometheus/integrations/twincat_ads_web_service.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/twincat_ads_web_service.md rename to src/go/plugin/go.d/collector/prometheus/integrations/twincat_ads_web_service.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/twitch.md b/src/go/plugin/go.d/collector/prometheus/integrations/twitch.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/twitch.md rename to src/go/plugin/go.d/collector/prometheus/integrations/twitch.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/ubiquiti_ufiber_olt.md b/src/go/plugin/go.d/collector/prometheus/integrations/ubiquiti_ufiber_olt.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/ubiquiti_ufiber_olt.md rename to src/go/plugin/go.d/collector/prometheus/integrations/ubiquiti_ufiber_olt.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/uptimerobot.md b/src/go/plugin/go.d/collector/prometheus/integrations/uptimerobot.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/uptimerobot.md rename to src/go/plugin/go.d/collector/prometheus/integrations/uptimerobot.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/vault_pki.md b/src/go/plugin/go.d/collector/prometheus/integrations/vault_pki.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/vault_pki.md rename to src/go/plugin/go.d/collector/prometheus/integrations/vault_pki.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/vertica.md b/src/go/plugin/go.d/collector/prometheus/integrations/vertica.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/vertica.md rename to src/go/plugin/go.d/collector/prometheus/integrations/vertica.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/vscode.md b/src/go/plugin/go.d/collector/prometheus/integrations/vscode.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/vscode.md rename to src/go/plugin/go.d/collector/prometheus/integrations/vscode.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/warp10.md b/src/go/plugin/go.d/collector/prometheus/integrations/warp10.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/warp10.md rename to src/go/plugin/go.d/collector/prometheus/integrations/warp10.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/xiaomi_mi_flora.md b/src/go/plugin/go.d/collector/prometheus/integrations/xiaomi_mi_flora.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/xiaomi_mi_flora.md rename to src/go/plugin/go.d/collector/prometheus/integrations/xiaomi_mi_flora.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/xmpp_server.md b/src/go/plugin/go.d/collector/prometheus/integrations/xmpp_server.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/xmpp_server.md rename to src/go/plugin/go.d/collector/prometheus/integrations/xmpp_server.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/yourls_url_shortener.md b/src/go/plugin/go.d/collector/prometheus/integrations/yourls_url_shortener.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/yourls_url_shortener.md rename to src/go/plugin/go.d/collector/prometheus/integrations/yourls_url_shortener.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/zerto.md b/src/go/plugin/go.d/collector/prometheus/integrations/zerto.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/zerto.md rename to src/go/plugin/go.d/collector/prometheus/integrations/zerto.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/zulip.md b/src/go/plugin/go.d/collector/prometheus/integrations/zulip.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/zulip.md rename to src/go/plugin/go.d/collector/prometheus/integrations/zulip.md diff --git a/src/go/plugin/go.d/modules/prometheus/integrations/zyxel_gs1200-8.md b/src/go/plugin/go.d/collector/prometheus/integrations/zyxel_gs1200-8.md similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/integrations/zyxel_gs1200-8.md rename to src/go/plugin/go.d/collector/prometheus/integrations/zyxel_gs1200-8.md diff --git a/src/go/plugin/go.d/modules/prometheus/metadata.yaml b/src/go/plugin/go.d/collector/prometheus/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/metadata.yaml rename to src/go/plugin/go.d/collector/prometheus/metadata.yaml diff --git a/src/go/plugin/go.d/modules/prometheus/prometheus.go b/src/go/plugin/go.d/collector/prometheus/prometheus.go similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/prometheus.go rename to src/go/plugin/go.d/collector/prometheus/prometheus.go diff --git a/src/go/plugin/go.d/modules/prometheus/prometheus_test.go b/src/go/plugin/go.d/collector/prometheus/prometheus_test.go similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/prometheus_test.go rename to src/go/plugin/go.d/collector/prometheus/prometheus_test.go diff --git a/src/go/plugin/go.d/modules/prometheus/testdata/config.json b/src/go/plugin/go.d/collector/prometheus/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/testdata/config.json rename to src/go/plugin/go.d/collector/prometheus/testdata/config.json diff --git a/src/go/plugin/go.d/modules/prometheus/testdata/config.yaml b/src/go/plugin/go.d/collector/prometheus/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/prometheus/testdata/config.yaml rename to src/go/plugin/go.d/collector/prometheus/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/proxysql/README.md b/src/go/plugin/go.d/collector/proxysql/README.md similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/README.md rename to src/go/plugin/go.d/collector/proxysql/README.md diff --git a/src/go/plugin/go.d/modules/proxysql/cache.go b/src/go/plugin/go.d/collector/proxysql/cache.go similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/cache.go rename to src/go/plugin/go.d/collector/proxysql/cache.go diff --git a/src/go/plugin/go.d/modules/proxysql/charts.go b/src/go/plugin/go.d/collector/proxysql/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/charts.go rename to src/go/plugin/go.d/collector/proxysql/charts.go diff --git a/src/go/plugin/go.d/modules/proxysql/collect.go b/src/go/plugin/go.d/collector/proxysql/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/collect.go rename to src/go/plugin/go.d/collector/proxysql/collect.go diff --git a/src/go/plugin/go.d/modules/proxysql/config_schema.json b/src/go/plugin/go.d/collector/proxysql/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/config_schema.json rename to src/go/plugin/go.d/collector/proxysql/config_schema.json diff --git a/src/go/plugin/go.d/modules/proxysql/integrations/proxysql.md b/src/go/plugin/go.d/collector/proxysql/integrations/proxysql.md similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/integrations/proxysql.md rename to src/go/plugin/go.d/collector/proxysql/integrations/proxysql.md diff --git a/src/go/plugin/go.d/modules/proxysql/metadata.yaml b/src/go/plugin/go.d/collector/proxysql/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/metadata.yaml rename to src/go/plugin/go.d/collector/proxysql/metadata.yaml diff --git a/src/go/plugin/go.d/modules/proxysql/proxysql.go b/src/go/plugin/go.d/collector/proxysql/proxysql.go similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/proxysql.go rename to src/go/plugin/go.d/collector/proxysql/proxysql.go diff --git a/src/go/plugin/go.d/modules/proxysql/proxysql_test.go b/src/go/plugin/go.d/collector/proxysql/proxysql_test.go similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/proxysql_test.go rename to src/go/plugin/go.d/collector/proxysql/proxysql_test.go diff --git a/src/go/plugin/go.d/modules/proxysql/testdata/config.json b/src/go/plugin/go.d/collector/proxysql/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/testdata/config.json rename to src/go/plugin/go.d/collector/proxysql/testdata/config.json diff --git a/src/go/plugin/go.d/modules/proxysql/testdata/config.yaml b/src/go/plugin/go.d/collector/proxysql/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/testdata/config.yaml rename to src/go/plugin/go.d/collector/proxysql/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/stats_memory_metrics.txt b/src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/stats_memory_metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/stats_memory_metrics.txt rename to src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/stats_memory_metrics.txt diff --git a/src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/stats_mysql_commands_counters.txt b/src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/stats_mysql_commands_counters.txt similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/stats_mysql_commands_counters.txt rename to src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/stats_mysql_commands_counters.txt diff --git a/src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/stats_mysql_connection_pool .txt b/src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/stats_mysql_connection_pool .txt similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/stats_mysql_connection_pool .txt rename to src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/stats_mysql_connection_pool .txt diff --git a/src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/stats_mysql_global.txt b/src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/stats_mysql_global.txt similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/stats_mysql_global.txt rename to src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/stats_mysql_global.txt diff --git a/src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/stats_mysql_users.txt b/src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/stats_mysql_users.txt similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/stats_mysql_users.txt rename to src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/stats_mysql_users.txt diff --git a/src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/version.txt b/src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/version.txt similarity index 100% rename from src/go/plugin/go.d/modules/proxysql/testdata/v2.0.10/version.txt rename to src/go/plugin/go.d/collector/proxysql/testdata/v2.0.10/version.txt diff --git a/src/go/plugin/go.d/modules/pulsar/README.md b/src/go/plugin/go.d/collector/pulsar/README.md similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/README.md rename to src/go/plugin/go.d/collector/pulsar/README.md diff --git a/src/go/plugin/go.d/modules/pulsar/cache.go b/src/go/plugin/go.d/collector/pulsar/cache.go similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/cache.go rename to src/go/plugin/go.d/collector/pulsar/cache.go diff --git a/src/go/plugin/go.d/modules/pulsar/charts.go b/src/go/plugin/go.d/collector/pulsar/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/charts.go rename to src/go/plugin/go.d/collector/pulsar/charts.go diff --git a/src/go/plugin/go.d/modules/pulsar/collect.go b/src/go/plugin/go.d/collector/pulsar/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/collect.go rename to src/go/plugin/go.d/collector/pulsar/collect.go diff --git a/src/go/plugin/go.d/modules/pulsar/config_schema.json b/src/go/plugin/go.d/collector/pulsar/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/config_schema.json rename to src/go/plugin/go.d/collector/pulsar/config_schema.json diff --git a/src/go/plugin/go.d/modules/pulsar/init.go b/src/go/plugin/go.d/collector/pulsar/init.go similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/init.go rename to src/go/plugin/go.d/collector/pulsar/init.go diff --git a/src/go/plugin/go.d/modules/pulsar/integrations/apache_pulsar.md b/src/go/plugin/go.d/collector/pulsar/integrations/apache_pulsar.md similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/integrations/apache_pulsar.md rename to src/go/plugin/go.d/collector/pulsar/integrations/apache_pulsar.md diff --git a/src/go/plugin/go.d/modules/pulsar/metadata.yaml b/src/go/plugin/go.d/collector/pulsar/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/metadata.yaml rename to src/go/plugin/go.d/collector/pulsar/metadata.yaml diff --git a/src/go/plugin/go.d/modules/pulsar/metrics.go b/src/go/plugin/go.d/collector/pulsar/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/metrics.go rename to src/go/plugin/go.d/collector/pulsar/metrics.go diff --git a/src/go/plugin/go.d/modules/pulsar/pulsar.go b/src/go/plugin/go.d/collector/pulsar/pulsar.go similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/pulsar.go rename to src/go/plugin/go.d/collector/pulsar/pulsar.go diff --git a/src/go/plugin/go.d/modules/pulsar/pulsar_test.go b/src/go/plugin/go.d/collector/pulsar/pulsar_test.go similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/pulsar_test.go rename to src/go/plugin/go.d/collector/pulsar/pulsar_test.go diff --git a/src/go/plugin/go.d/modules/pulsar/testdata/config.json b/src/go/plugin/go.d/collector/pulsar/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/testdata/config.json rename to src/go/plugin/go.d/collector/pulsar/testdata/config.json diff --git a/src/go/plugin/go.d/modules/pulsar/testdata/config.yaml b/src/go/plugin/go.d/collector/pulsar/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/testdata/config.yaml rename to src/go/plugin/go.d/collector/pulsar/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/pulsar/testdata/non-pulsar.txt b/src/go/plugin/go.d/collector/pulsar/testdata/non-pulsar.txt similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/testdata/non-pulsar.txt rename to src/go/plugin/go.d/collector/pulsar/testdata/non-pulsar.txt diff --git a/src/go/plugin/go.d/modules/pulsar/testdata/standalone-v2.5.0-namespaces.txt b/src/go/plugin/go.d/collector/pulsar/testdata/standalone-v2.5.0-namespaces.txt similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/testdata/standalone-v2.5.0-namespaces.txt rename to src/go/plugin/go.d/collector/pulsar/testdata/standalone-v2.5.0-namespaces.txt diff --git a/src/go/plugin/go.d/modules/pulsar/testdata/standalone-v2.5.0-topics-2.txt b/src/go/plugin/go.d/collector/pulsar/testdata/standalone-v2.5.0-topics-2.txt similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/testdata/standalone-v2.5.0-topics-2.txt rename to src/go/plugin/go.d/collector/pulsar/testdata/standalone-v2.5.0-topics-2.txt diff --git a/src/go/plugin/go.d/modules/pulsar/testdata/standalone-v2.5.0-topics.txt b/src/go/plugin/go.d/collector/pulsar/testdata/standalone-v2.5.0-topics.txt similarity index 100% rename from src/go/plugin/go.d/modules/pulsar/testdata/standalone-v2.5.0-topics.txt rename to src/go/plugin/go.d/collector/pulsar/testdata/standalone-v2.5.0-topics.txt diff --git a/src/go/plugin/go.d/modules/puppet/README.md b/src/go/plugin/go.d/collector/puppet/README.md similarity index 100% rename from src/go/plugin/go.d/modules/puppet/README.md rename to src/go/plugin/go.d/collector/puppet/README.md diff --git a/src/go/plugin/go.d/modules/puppet/charts.go b/src/go/plugin/go.d/collector/puppet/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/puppet/charts.go rename to src/go/plugin/go.d/collector/puppet/charts.go diff --git a/src/go/plugin/go.d/modules/puppet/collect.go b/src/go/plugin/go.d/collector/puppet/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/puppet/collect.go rename to src/go/plugin/go.d/collector/puppet/collect.go diff --git a/src/go/plugin/go.d/modules/puppet/config_schema.json b/src/go/plugin/go.d/collector/puppet/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/puppet/config_schema.json rename to src/go/plugin/go.d/collector/puppet/config_schema.json diff --git a/src/go/plugin/go.d/modules/puppet/integrations/puppet.md b/src/go/plugin/go.d/collector/puppet/integrations/puppet.md similarity index 100% rename from src/go/plugin/go.d/modules/puppet/integrations/puppet.md rename to src/go/plugin/go.d/collector/puppet/integrations/puppet.md diff --git a/src/go/plugin/go.d/modules/puppet/metadata.yaml b/src/go/plugin/go.d/collector/puppet/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/puppet/metadata.yaml rename to src/go/plugin/go.d/collector/puppet/metadata.yaml diff --git a/src/go/plugin/go.d/modules/puppet/puppet.go b/src/go/plugin/go.d/collector/puppet/puppet.go similarity index 100% rename from src/go/plugin/go.d/modules/puppet/puppet.go rename to src/go/plugin/go.d/collector/puppet/puppet.go diff --git a/src/go/plugin/go.d/modules/puppet/puppet_test.go b/src/go/plugin/go.d/collector/puppet/puppet_test.go similarity index 100% rename from src/go/plugin/go.d/modules/puppet/puppet_test.go rename to src/go/plugin/go.d/collector/puppet/puppet_test.go diff --git a/src/go/plugin/go.d/modules/puppet/response.go b/src/go/plugin/go.d/collector/puppet/response.go similarity index 100% rename from src/go/plugin/go.d/modules/puppet/response.go rename to src/go/plugin/go.d/collector/puppet/response.go diff --git a/src/go/plugin/go.d/modules/puppet/testdata/config.json b/src/go/plugin/go.d/collector/puppet/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/puppet/testdata/config.json rename to src/go/plugin/go.d/collector/puppet/testdata/config.json diff --git a/src/go/plugin/go.d/modules/puppet/testdata/config.yaml b/src/go/plugin/go.d/collector/puppet/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/puppet/testdata/config.yaml rename to src/go/plugin/go.d/collector/puppet/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/puppet/testdata/serviceStatusResponse.json b/src/go/plugin/go.d/collector/puppet/testdata/serviceStatusResponse.json similarity index 100% rename from src/go/plugin/go.d/modules/puppet/testdata/serviceStatusResponse.json rename to src/go/plugin/go.d/collector/puppet/testdata/serviceStatusResponse.json diff --git a/src/go/plugin/go.d/modules/rabbitmq/README.md b/src/go/plugin/go.d/collector/rabbitmq/README.md similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/README.md rename to src/go/plugin/go.d/collector/rabbitmq/README.md diff --git a/src/go/plugin/go.d/modules/rabbitmq/cache.go b/src/go/plugin/go.d/collector/rabbitmq/cache.go similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/cache.go rename to src/go/plugin/go.d/collector/rabbitmq/cache.go diff --git a/src/go/plugin/go.d/modules/rabbitmq/charts.go b/src/go/plugin/go.d/collector/rabbitmq/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/charts.go rename to src/go/plugin/go.d/collector/rabbitmq/charts.go diff --git a/src/go/plugin/go.d/modules/rabbitmq/collect.go b/src/go/plugin/go.d/collector/rabbitmq/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/collect.go rename to src/go/plugin/go.d/collector/rabbitmq/collect.go diff --git a/src/go/plugin/go.d/modules/rabbitmq/collect_nodes.go b/src/go/plugin/go.d/collector/rabbitmq/collect_nodes.go similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/collect_nodes.go rename to src/go/plugin/go.d/collector/rabbitmq/collect_nodes.go diff --git a/src/go/plugin/go.d/modules/rabbitmq/collect_overview.go b/src/go/plugin/go.d/collector/rabbitmq/collect_overview.go similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/collect_overview.go rename to src/go/plugin/go.d/collector/rabbitmq/collect_overview.go diff --git a/src/go/plugin/go.d/modules/rabbitmq/collect_queues.go b/src/go/plugin/go.d/collector/rabbitmq/collect_queues.go similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/collect_queues.go rename to src/go/plugin/go.d/collector/rabbitmq/collect_queues.go diff --git a/src/go/plugin/go.d/modules/rabbitmq/collect_vhosts.go b/src/go/plugin/go.d/collector/rabbitmq/collect_vhosts.go similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/collect_vhosts.go rename to src/go/plugin/go.d/collector/rabbitmq/collect_vhosts.go diff --git a/src/go/plugin/go.d/modules/rabbitmq/config_schema.json b/src/go/plugin/go.d/collector/rabbitmq/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/config_schema.json rename to src/go/plugin/go.d/collector/rabbitmq/config_schema.json diff --git a/src/go/plugin/go.d/modules/rabbitmq/integrations/rabbitmq.md b/src/go/plugin/go.d/collector/rabbitmq/integrations/rabbitmq.md similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/integrations/rabbitmq.md rename to src/go/plugin/go.d/collector/rabbitmq/integrations/rabbitmq.md diff --git a/src/go/plugin/go.d/modules/rabbitmq/metadata.yaml b/src/go/plugin/go.d/collector/rabbitmq/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/metadata.yaml rename to src/go/plugin/go.d/collector/rabbitmq/metadata.yaml diff --git a/src/go/plugin/go.d/modules/rabbitmq/rabbitmq.go b/src/go/plugin/go.d/collector/rabbitmq/rabbitmq.go similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/rabbitmq.go rename to src/go/plugin/go.d/collector/rabbitmq/rabbitmq.go diff --git a/src/go/plugin/go.d/modules/rabbitmq/rabbitmq_test.go b/src/go/plugin/go.d/collector/rabbitmq/rabbitmq_test.go similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/rabbitmq_test.go rename to src/go/plugin/go.d/collector/rabbitmq/rabbitmq_test.go diff --git a/src/go/plugin/go.d/modules/rabbitmq/restapi.go b/src/go/plugin/go.d/collector/rabbitmq/restapi.go similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/restapi.go rename to src/go/plugin/go.d/collector/rabbitmq/restapi.go diff --git a/src/go/plugin/go.d/modules/rabbitmq/testdata/config.json b/src/go/plugin/go.d/collector/rabbitmq/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/testdata/config.json rename to src/go/plugin/go.d/collector/rabbitmq/testdata/config.json diff --git a/src/go/plugin/go.d/modules/rabbitmq/testdata/config.yaml b/src/go/plugin/go.d/collector/rabbitmq/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/testdata/config.yaml rename to src/go/plugin/go.d/collector/rabbitmq/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/rabbitmq/testdata/v4.0.3/cluster/definitions.json b/src/go/plugin/go.d/collector/rabbitmq/testdata/v4.0.3/cluster/definitions.json similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/testdata/v4.0.3/cluster/definitions.json rename to src/go/plugin/go.d/collector/rabbitmq/testdata/v4.0.3/cluster/definitions.json diff --git a/src/go/plugin/go.d/modules/rabbitmq/testdata/v4.0.3/cluster/nodes.json b/src/go/plugin/go.d/collector/rabbitmq/testdata/v4.0.3/cluster/nodes.json similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/testdata/v4.0.3/cluster/nodes.json rename to src/go/plugin/go.d/collector/rabbitmq/testdata/v4.0.3/cluster/nodes.json diff --git a/src/go/plugin/go.d/modules/rabbitmq/testdata/v4.0.3/cluster/overview.json b/src/go/plugin/go.d/collector/rabbitmq/testdata/v4.0.3/cluster/overview.json similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/testdata/v4.0.3/cluster/overview.json rename to src/go/plugin/go.d/collector/rabbitmq/testdata/v4.0.3/cluster/overview.json diff --git a/src/go/plugin/go.d/modules/rabbitmq/testdata/v4.0.3/cluster/queues.json b/src/go/plugin/go.d/collector/rabbitmq/testdata/v4.0.3/cluster/queues.json similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/testdata/v4.0.3/cluster/queues.json rename to src/go/plugin/go.d/collector/rabbitmq/testdata/v4.0.3/cluster/queues.json diff --git a/src/go/plugin/go.d/modules/rabbitmq/testdata/v4.0.3/cluster/vhosts.json b/src/go/plugin/go.d/collector/rabbitmq/testdata/v4.0.3/cluster/vhosts.json similarity index 100% rename from src/go/plugin/go.d/modules/rabbitmq/testdata/v4.0.3/cluster/vhosts.json rename to src/go/plugin/go.d/collector/rabbitmq/testdata/v4.0.3/cluster/vhosts.json diff --git a/src/go/plugin/go.d/modules/redis/README.md b/src/go/plugin/go.d/collector/redis/README.md similarity index 100% rename from src/go/plugin/go.d/modules/redis/README.md rename to src/go/plugin/go.d/collector/redis/README.md diff --git a/src/go/plugin/go.d/modules/redis/charts.go b/src/go/plugin/go.d/collector/redis/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/redis/charts.go rename to src/go/plugin/go.d/collector/redis/charts.go diff --git a/src/go/plugin/go.d/modules/redis/collect.go b/src/go/plugin/go.d/collector/redis/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/redis/collect.go rename to src/go/plugin/go.d/collector/redis/collect.go diff --git a/src/go/plugin/go.d/modules/redis/collect_info.go b/src/go/plugin/go.d/collector/redis/collect_info.go similarity index 100% rename from src/go/plugin/go.d/modules/redis/collect_info.go rename to src/go/plugin/go.d/collector/redis/collect_info.go diff --git a/src/go/plugin/go.d/modules/redis/collect_ping_latency.go b/src/go/plugin/go.d/collector/redis/collect_ping_latency.go similarity index 100% rename from src/go/plugin/go.d/modules/redis/collect_ping_latency.go rename to src/go/plugin/go.d/collector/redis/collect_ping_latency.go diff --git a/src/go/plugin/go.d/modules/redis/config_schema.json b/src/go/plugin/go.d/collector/redis/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/redis/config_schema.json rename to src/go/plugin/go.d/collector/redis/config_schema.json diff --git a/src/go/plugin/go.d/modules/redis/init.go b/src/go/plugin/go.d/collector/redis/init.go similarity index 100% rename from src/go/plugin/go.d/modules/redis/init.go rename to src/go/plugin/go.d/collector/redis/init.go diff --git a/src/go/plugin/go.d/modules/redis/integrations/redis.md b/src/go/plugin/go.d/collector/redis/integrations/redis.md similarity index 100% rename from src/go/plugin/go.d/modules/redis/integrations/redis.md rename to src/go/plugin/go.d/collector/redis/integrations/redis.md diff --git a/src/go/plugin/go.d/modules/redis/metadata.yaml b/src/go/plugin/go.d/collector/redis/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/redis/metadata.yaml rename to src/go/plugin/go.d/collector/redis/metadata.yaml diff --git a/src/go/plugin/go.d/modules/redis/redis.go b/src/go/plugin/go.d/collector/redis/redis.go similarity index 100% rename from src/go/plugin/go.d/modules/redis/redis.go rename to src/go/plugin/go.d/collector/redis/redis.go diff --git a/src/go/plugin/go.d/modules/redis/redis_test.go b/src/go/plugin/go.d/collector/redis/redis_test.go similarity index 100% rename from src/go/plugin/go.d/modules/redis/redis_test.go rename to src/go/plugin/go.d/collector/redis/redis_test.go diff --git a/src/go/plugin/go.d/modules/redis/testdata/config.json b/src/go/plugin/go.d/collector/redis/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/redis/testdata/config.json rename to src/go/plugin/go.d/collector/redis/testdata/config.json diff --git a/src/go/plugin/go.d/modules/redis/testdata/config.yaml b/src/go/plugin/go.d/collector/redis/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/redis/testdata/config.yaml rename to src/go/plugin/go.d/collector/redis/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/redis/testdata/pika/info_all.txt b/src/go/plugin/go.d/collector/redis/testdata/pika/info_all.txt similarity index 100% rename from src/go/plugin/go.d/modules/redis/testdata/pika/info_all.txt rename to src/go/plugin/go.d/collector/redis/testdata/pika/info_all.txt diff --git a/src/go/plugin/go.d/modules/redis/testdata/v6.0.9/info_all.txt b/src/go/plugin/go.d/collector/redis/testdata/v6.0.9/info_all.txt similarity index 100% rename from src/go/plugin/go.d/modules/redis/testdata/v6.0.9/info_all.txt rename to src/go/plugin/go.d/collector/redis/testdata/v6.0.9/info_all.txt diff --git a/src/go/plugin/go.d/modules/rethinkdb/README.md b/src/go/plugin/go.d/collector/rethinkdb/README.md similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/README.md rename to src/go/plugin/go.d/collector/rethinkdb/README.md diff --git a/src/go/plugin/go.d/modules/rethinkdb/charts.go b/src/go/plugin/go.d/collector/rethinkdb/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/charts.go rename to src/go/plugin/go.d/collector/rethinkdb/charts.go diff --git a/src/go/plugin/go.d/modules/rethinkdb/client.go b/src/go/plugin/go.d/collector/rethinkdb/client.go similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/client.go rename to src/go/plugin/go.d/collector/rethinkdb/client.go diff --git a/src/go/plugin/go.d/modules/rethinkdb/collect.go b/src/go/plugin/go.d/collector/rethinkdb/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/collect.go rename to src/go/plugin/go.d/collector/rethinkdb/collect.go diff --git a/src/go/plugin/go.d/modules/rethinkdb/config_schema.json b/src/go/plugin/go.d/collector/rethinkdb/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/config_schema.json rename to src/go/plugin/go.d/collector/rethinkdb/config_schema.json diff --git a/src/go/plugin/go.d/modules/rethinkdb/integrations/rethinkdb.md b/src/go/plugin/go.d/collector/rethinkdb/integrations/rethinkdb.md similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/integrations/rethinkdb.md rename to src/go/plugin/go.d/collector/rethinkdb/integrations/rethinkdb.md diff --git a/src/go/plugin/go.d/modules/rethinkdb/metadata.yaml b/src/go/plugin/go.d/collector/rethinkdb/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/metadata.yaml rename to src/go/plugin/go.d/collector/rethinkdb/metadata.yaml diff --git a/src/go/plugin/go.d/modules/rethinkdb/rethinkdb.go b/src/go/plugin/go.d/collector/rethinkdb/rethinkdb.go similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/rethinkdb.go rename to src/go/plugin/go.d/collector/rethinkdb/rethinkdb.go diff --git a/src/go/plugin/go.d/modules/rethinkdb/rethinkdb_test.go b/src/go/plugin/go.d/collector/rethinkdb/rethinkdb_test.go similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/rethinkdb_test.go rename to src/go/plugin/go.d/collector/rethinkdb/rethinkdb_test.go diff --git a/src/go/plugin/go.d/modules/rethinkdb/testdata/config.json b/src/go/plugin/go.d/collector/rethinkdb/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/testdata/config.json rename to src/go/plugin/go.d/collector/rethinkdb/testdata/config.json diff --git a/src/go/plugin/go.d/modules/rethinkdb/testdata/config.yaml b/src/go/plugin/go.d/collector/rethinkdb/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/testdata/config.yaml rename to src/go/plugin/go.d/collector/rethinkdb/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/rethinkdb/testdata/v2.4.4/stats.txt b/src/go/plugin/go.d/collector/rethinkdb/testdata/v2.4.4/stats.txt similarity index 100% rename from src/go/plugin/go.d/modules/rethinkdb/testdata/v2.4.4/stats.txt rename to src/go/plugin/go.d/collector/rethinkdb/testdata/v2.4.4/stats.txt diff --git a/src/go/plugin/go.d/modules/riakkv/README.md b/src/go/plugin/go.d/collector/riakkv/README.md similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/README.md rename to src/go/plugin/go.d/collector/riakkv/README.md diff --git a/src/go/plugin/go.d/modules/riakkv/charts.go b/src/go/plugin/go.d/collector/riakkv/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/charts.go rename to src/go/plugin/go.d/collector/riakkv/charts.go diff --git a/src/go/plugin/go.d/modules/riakkv/collect.go b/src/go/plugin/go.d/collector/riakkv/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/collect.go rename to src/go/plugin/go.d/collector/riakkv/collect.go diff --git a/src/go/plugin/go.d/modules/riakkv/config_schema.json b/src/go/plugin/go.d/collector/riakkv/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/config_schema.json rename to src/go/plugin/go.d/collector/riakkv/config_schema.json diff --git a/src/go/plugin/go.d/modules/riakkv/integrations/riak_kv.md b/src/go/plugin/go.d/collector/riakkv/integrations/riak_kv.md similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/integrations/riak_kv.md rename to src/go/plugin/go.d/collector/riakkv/integrations/riak_kv.md diff --git a/src/go/plugin/go.d/modules/riakkv/metadata.yaml b/src/go/plugin/go.d/collector/riakkv/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/metadata.yaml rename to src/go/plugin/go.d/collector/riakkv/metadata.yaml diff --git a/src/go/plugin/go.d/modules/riakkv/riakkv.go b/src/go/plugin/go.d/collector/riakkv/riakkv.go similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/riakkv.go rename to src/go/plugin/go.d/collector/riakkv/riakkv.go diff --git a/src/go/plugin/go.d/modules/riakkv/riakkv_test.go b/src/go/plugin/go.d/collector/riakkv/riakkv_test.go similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/riakkv_test.go rename to src/go/plugin/go.d/collector/riakkv/riakkv_test.go diff --git a/src/go/plugin/go.d/modules/riakkv/stats.go b/src/go/plugin/go.d/collector/riakkv/stats.go similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/stats.go rename to src/go/plugin/go.d/collector/riakkv/stats.go diff --git a/src/go/plugin/go.d/modules/riakkv/testdata/config.json b/src/go/plugin/go.d/collector/riakkv/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/testdata/config.json rename to src/go/plugin/go.d/collector/riakkv/testdata/config.json diff --git a/src/go/plugin/go.d/modules/riakkv/testdata/config.yaml b/src/go/plugin/go.d/collector/riakkv/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/testdata/config.yaml rename to src/go/plugin/go.d/collector/riakkv/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/riakkv/testdata/stats.json b/src/go/plugin/go.d/collector/riakkv/testdata/stats.json similarity index 100% rename from src/go/plugin/go.d/modules/riakkv/testdata/stats.json rename to src/go/plugin/go.d/collector/riakkv/testdata/stats.json diff --git a/src/go/plugin/go.d/modules/rspamd/README.md b/src/go/plugin/go.d/collector/rspamd/README.md similarity index 100% rename from src/go/plugin/go.d/modules/rspamd/README.md rename to src/go/plugin/go.d/collector/rspamd/README.md diff --git a/src/go/plugin/go.d/modules/rspamd/charts.go b/src/go/plugin/go.d/collector/rspamd/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/rspamd/charts.go rename to src/go/plugin/go.d/collector/rspamd/charts.go diff --git a/src/go/plugin/go.d/modules/rspamd/collect.go b/src/go/plugin/go.d/collector/rspamd/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/rspamd/collect.go rename to src/go/plugin/go.d/collector/rspamd/collect.go diff --git a/src/go/plugin/go.d/modules/rspamd/config_schema.json b/src/go/plugin/go.d/collector/rspamd/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/rspamd/config_schema.json rename to src/go/plugin/go.d/collector/rspamd/config_schema.json diff --git a/src/go/plugin/go.d/modules/rspamd/integrations/rspamd.md b/src/go/plugin/go.d/collector/rspamd/integrations/rspamd.md similarity index 100% rename from src/go/plugin/go.d/modules/rspamd/integrations/rspamd.md rename to src/go/plugin/go.d/collector/rspamd/integrations/rspamd.md diff --git a/src/go/plugin/go.d/modules/rspamd/metadata.yaml b/src/go/plugin/go.d/collector/rspamd/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/rspamd/metadata.yaml rename to src/go/plugin/go.d/collector/rspamd/metadata.yaml diff --git a/src/go/plugin/go.d/modules/rspamd/rspamd.go b/src/go/plugin/go.d/collector/rspamd/rspamd.go similarity index 100% rename from src/go/plugin/go.d/modules/rspamd/rspamd.go rename to src/go/plugin/go.d/collector/rspamd/rspamd.go diff --git a/src/go/plugin/go.d/modules/rspamd/rspamd_test.go b/src/go/plugin/go.d/collector/rspamd/rspamd_test.go similarity index 100% rename from src/go/plugin/go.d/modules/rspamd/rspamd_test.go rename to src/go/plugin/go.d/collector/rspamd/rspamd_test.go diff --git a/src/go/plugin/go.d/modules/rspamd/testdata/config.json b/src/go/plugin/go.d/collector/rspamd/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/rspamd/testdata/config.json rename to src/go/plugin/go.d/collector/rspamd/testdata/config.json diff --git a/src/go/plugin/go.d/modules/rspamd/testdata/config.yaml b/src/go/plugin/go.d/collector/rspamd/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/rspamd/testdata/config.yaml rename to src/go/plugin/go.d/collector/rspamd/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/rspamd/testdata/v3.4-stat.json b/src/go/plugin/go.d/collector/rspamd/testdata/v3.4-stat.json similarity index 100% rename from src/go/plugin/go.d/modules/rspamd/testdata/v3.4-stat.json rename to src/go/plugin/go.d/collector/rspamd/testdata/v3.4-stat.json diff --git a/src/go/plugin/go.d/modules/samba/README.md b/src/go/plugin/go.d/collector/samba/README.md similarity index 100% rename from src/go/plugin/go.d/modules/samba/README.md rename to src/go/plugin/go.d/collector/samba/README.md diff --git a/src/go/plugin/go.d/modules/samba/charts.go b/src/go/plugin/go.d/collector/samba/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/samba/charts.go rename to src/go/plugin/go.d/collector/samba/charts.go diff --git a/src/go/plugin/go.d/modules/samba/collect.go b/src/go/plugin/go.d/collector/samba/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/samba/collect.go rename to src/go/plugin/go.d/collector/samba/collect.go diff --git a/src/go/plugin/go.d/modules/samba/config_schema.json b/src/go/plugin/go.d/collector/samba/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/samba/config_schema.json rename to src/go/plugin/go.d/collector/samba/config_schema.json diff --git a/src/go/plugin/go.d/modules/samba/exec.go b/src/go/plugin/go.d/collector/samba/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/samba/exec.go rename to src/go/plugin/go.d/collector/samba/exec.go diff --git a/src/go/plugin/go.d/modules/samba/init.go b/src/go/plugin/go.d/collector/samba/init.go similarity index 100% rename from src/go/plugin/go.d/modules/samba/init.go rename to src/go/plugin/go.d/collector/samba/init.go diff --git a/src/go/plugin/go.d/modules/samba/integrations/samba.md b/src/go/plugin/go.d/collector/samba/integrations/samba.md similarity index 100% rename from src/go/plugin/go.d/modules/samba/integrations/samba.md rename to src/go/plugin/go.d/collector/samba/integrations/samba.md diff --git a/src/go/plugin/go.d/modules/samba/metadata.yaml b/src/go/plugin/go.d/collector/samba/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/samba/metadata.yaml rename to src/go/plugin/go.d/collector/samba/metadata.yaml diff --git a/src/go/plugin/go.d/modules/samba/samba.go b/src/go/plugin/go.d/collector/samba/samba.go similarity index 100% rename from src/go/plugin/go.d/modules/samba/samba.go rename to src/go/plugin/go.d/collector/samba/samba.go diff --git a/src/go/plugin/go.d/modules/samba/samba_test.go b/src/go/plugin/go.d/collector/samba/samba_test.go similarity index 100% rename from src/go/plugin/go.d/modules/samba/samba_test.go rename to src/go/plugin/go.d/collector/samba/samba_test.go diff --git a/src/go/plugin/go.d/modules/samba/testdata/config.json b/src/go/plugin/go.d/collector/samba/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/samba/testdata/config.json rename to src/go/plugin/go.d/collector/samba/testdata/config.json diff --git a/src/go/plugin/go.d/modules/samba/testdata/config.yaml b/src/go/plugin/go.d/collector/samba/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/samba/testdata/config.yaml rename to src/go/plugin/go.d/collector/samba/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/samba/testdata/smbstatus-profile.txt b/src/go/plugin/go.d/collector/samba/testdata/smbstatus-profile.txt similarity index 100% rename from src/go/plugin/go.d/modules/samba/testdata/smbstatus-profile.txt rename to src/go/plugin/go.d/collector/samba/testdata/smbstatus-profile.txt diff --git a/src/go/plugin/go.d/modules/scaleio/README.md b/src/go/plugin/go.d/collector/scaleio/README.md similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/README.md rename to src/go/plugin/go.d/collector/scaleio/README.md diff --git a/src/go/plugin/go.d/modules/scaleio/charts.go b/src/go/plugin/go.d/collector/scaleio/charts.go similarity index 99% rename from src/go/plugin/go.d/modules/scaleio/charts.go rename to src/go/plugin/go.d/collector/scaleio/charts.go index 9efd52c77960c4..4a94e9e52451fe 100644 --- a/src/go/plugin/go.d/modules/scaleio/charts.go +++ b/src/go/plugin/go.d/collector/scaleio/charts.go @@ -5,7 +5,7 @@ package scaleio import ( "fmt" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/scaleio/client" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/scaleio/client" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" ) diff --git a/src/go/plugin/go.d/modules/scaleio/client/client.go b/src/go/plugin/go.d/collector/scaleio/client/client.go similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/client/client.go rename to src/go/plugin/go.d/collector/scaleio/client/client.go diff --git a/src/go/plugin/go.d/modules/scaleio/client/client_test.go b/src/go/plugin/go.d/collector/scaleio/client/client_test.go similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/client/client_test.go rename to src/go/plugin/go.d/collector/scaleio/client/client_test.go diff --git a/src/go/plugin/go.d/modules/scaleio/client/server.go b/src/go/plugin/go.d/collector/scaleio/client/server.go similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/client/server.go rename to src/go/plugin/go.d/collector/scaleio/client/server.go diff --git a/src/go/plugin/go.d/modules/scaleio/client/types.go b/src/go/plugin/go.d/collector/scaleio/client/types.go similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/client/types.go rename to src/go/plugin/go.d/collector/scaleio/client/types.go diff --git a/src/go/plugin/go.d/modules/scaleio/collect.go b/src/go/plugin/go.d/collector/scaleio/collect.go similarity index 94% rename from src/go/plugin/go.d/modules/scaleio/collect.go rename to src/go/plugin/go.d/collector/scaleio/collect.go index a7782a7d950354..e6ae9596e046a2 100644 --- a/src/go/plugin/go.d/modules/scaleio/collect.go +++ b/src/go/plugin/go.d/collector/scaleio/collect.go @@ -5,7 +5,7 @@ package scaleio import ( "time" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/scaleio/client" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/scaleio/client" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm" ) diff --git a/src/go/plugin/go.d/modules/scaleio/collect_sdc.go b/src/go/plugin/go.d/collector/scaleio/collect_sdc.go similarity index 90% rename from src/go/plugin/go.d/modules/scaleio/collect_sdc.go rename to src/go/plugin/go.d/collector/scaleio/collect_sdc.go index f626267070dbb0..e36ad1097d3b7e 100644 --- a/src/go/plugin/go.d/modules/scaleio/collect_sdc.go +++ b/src/go/plugin/go.d/collector/scaleio/collect_sdc.go @@ -2,7 +2,7 @@ package scaleio -import "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/scaleio/client" +import "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/scaleio/client" func (s *ScaleIO) collectSdc(ss map[string]client.SdcStatistics) map[string]sdcMetrics { ms := make(map[string]sdcMetrics, len(ss)) diff --git a/src/go/plugin/go.d/modules/scaleio/collect_storage_pool.go b/src/go/plugin/go.d/collector/scaleio/collect_storage_pool.go similarity index 94% rename from src/go/plugin/go.d/modules/scaleio/collect_storage_pool.go rename to src/go/plugin/go.d/collector/scaleio/collect_storage_pool.go index 4a347a64cccb73..05d39d5f196585 100644 --- a/src/go/plugin/go.d/modules/scaleio/collect_storage_pool.go +++ b/src/go/plugin/go.d/collector/scaleio/collect_storage_pool.go @@ -2,7 +2,7 @@ package scaleio -import "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/scaleio/client" +import "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/scaleio/client" func (s *ScaleIO) collectStoragePool(ss map[string]client.StoragePoolStatistics) map[string]storagePoolMetrics { ms := make(map[string]storagePoolMetrics, len(ss)) diff --git a/src/go/plugin/go.d/modules/scaleio/collect_system.go b/src/go/plugin/go.d/collector/scaleio/collect_system.go similarity index 98% rename from src/go/plugin/go.d/modules/scaleio/collect_system.go rename to src/go/plugin/go.d/collector/scaleio/collect_system.go index ae6e89aa961c5c..9247457a8b4e4b 100644 --- a/src/go/plugin/go.d/modules/scaleio/collect_system.go +++ b/src/go/plugin/go.d/collector/scaleio/collect_system.go @@ -2,7 +2,7 @@ package scaleio -import "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/scaleio/client" +import "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/scaleio/client" func (s *ScaleIO) collectSystem(ss client.SystemStatistics) systemMetrics { var sm systemMetrics diff --git a/src/go/plugin/go.d/modules/scaleio/config_schema.json b/src/go/plugin/go.d/collector/scaleio/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/config_schema.json rename to src/go/plugin/go.d/collector/scaleio/config_schema.json diff --git a/src/go/plugin/go.d/modules/scaleio/integrations/dell_emc_scaleio.md b/src/go/plugin/go.d/collector/scaleio/integrations/dell_emc_scaleio.md similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/integrations/dell_emc_scaleio.md rename to src/go/plugin/go.d/collector/scaleio/integrations/dell_emc_scaleio.md diff --git a/src/go/plugin/go.d/modules/scaleio/metadata.yaml b/src/go/plugin/go.d/collector/scaleio/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/metadata.yaml rename to src/go/plugin/go.d/collector/scaleio/metadata.yaml diff --git a/src/go/plugin/go.d/modules/scaleio/metrics.go b/src/go/plugin/go.d/collector/scaleio/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/metrics.go rename to src/go/plugin/go.d/collector/scaleio/metrics.go diff --git a/src/go/plugin/go.d/modules/scaleio/queries.go b/src/go/plugin/go.d/collector/scaleio/queries.go similarity index 96% rename from src/go/plugin/go.d/modules/scaleio/queries.go rename to src/go/plugin/go.d/collector/scaleio/queries.go index 4f38f9976a5751..05b35135ee9dde 100644 --- a/src/go/plugin/go.d/modules/scaleio/queries.go +++ b/src/go/plugin/go.d/collector/scaleio/queries.go @@ -2,7 +2,7 @@ package scaleio -import "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/scaleio/client" +import "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/scaleio/client" /* Starting from version 3 of ScaleIO/VxFlex API numOfScsiInitiators property is removed from the system selectedStatisticsQuery. diff --git a/src/go/plugin/go.d/modules/scaleio/scaleio.go b/src/go/plugin/go.d/collector/scaleio/scaleio.go similarity index 96% rename from src/go/plugin/go.d/modules/scaleio/scaleio.go rename to src/go/plugin/go.d/collector/scaleio/scaleio.go index 98bc110c37527f..626c7a23f0d37c 100644 --- a/src/go/plugin/go.d/modules/scaleio/scaleio.go +++ b/src/go/plugin/go.d/collector/scaleio/scaleio.go @@ -9,7 +9,7 @@ import ( "time" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/scaleio/client" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/scaleio/client" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web" ) diff --git a/src/go/plugin/go.d/modules/scaleio/scaleio_test.go b/src/go/plugin/go.d/collector/scaleio/scaleio_test.go similarity index 99% rename from src/go/plugin/go.d/modules/scaleio/scaleio_test.go rename to src/go/plugin/go.d/collector/scaleio/scaleio_test.go index 66752ebc8ae7a1..3dc74f4a52f1ff 100644 --- a/src/go/plugin/go.d/modules/scaleio/scaleio_test.go +++ b/src/go/plugin/go.d/collector/scaleio/scaleio_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/scaleio/client" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/scaleio/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/go/plugin/go.d/modules/scaleio/testdata/config.json b/src/go/plugin/go.d/collector/scaleio/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/testdata/config.json rename to src/go/plugin/go.d/collector/scaleio/testdata/config.json diff --git a/src/go/plugin/go.d/modules/scaleio/testdata/config.yaml b/src/go/plugin/go.d/collector/scaleio/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/testdata/config.yaml rename to src/go/plugin/go.d/collector/scaleio/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/scaleio/testdata/instances.json b/src/go/plugin/go.d/collector/scaleio/testdata/instances.json similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/testdata/instances.json rename to src/go/plugin/go.d/collector/scaleio/testdata/instances.json diff --git a/src/go/plugin/go.d/modules/scaleio/testdata/selected_statistics.json b/src/go/plugin/go.d/collector/scaleio/testdata/selected_statistics.json similarity index 100% rename from src/go/plugin/go.d/modules/scaleio/testdata/selected_statistics.json rename to src/go/plugin/go.d/collector/scaleio/testdata/selected_statistics.json diff --git a/src/go/plugin/go.d/modules/sensors/README.md b/src/go/plugin/go.d/collector/sensors/README.md similarity index 100% rename from src/go/plugin/go.d/modules/sensors/README.md rename to src/go/plugin/go.d/collector/sensors/README.md diff --git a/src/go/plugin/go.d/modules/sensors/charts.go b/src/go/plugin/go.d/collector/sensors/charts.go similarity index 99% rename from src/go/plugin/go.d/modules/sensors/charts.go rename to src/go/plugin/go.d/collector/sensors/charts.go index bfb17bfd43b275..f4ef212fd7a1fb 100644 --- a/src/go/plugin/go.d/modules/sensors/charts.go +++ b/src/go/plugin/go.d/collector/sensors/charts.go @@ -10,7 +10,7 @@ import ( "github.com/netdata/netdata/go/plugins/pkg/matcher" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/sensors/lmsensors" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/sensors/lmsensors" ) const ( diff --git a/src/go/plugin/go.d/modules/sensors/collect.go b/src/go/plugin/go.d/collector/sensors/collect.go similarity index 98% rename from src/go/plugin/go.d/modules/sensors/collect.go rename to src/go/plugin/go.d/collector/sensors/collect.go index 565dd847ce250b..93448afd4c5db4 100644 --- a/src/go/plugin/go.d/modules/sensors/collect.go +++ b/src/go/plugin/go.d/collector/sensors/collect.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/sensors/lmsensors" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/sensors/lmsensors" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix" ) diff --git a/src/go/plugin/go.d/modules/sensors/config_schema.json b/src/go/plugin/go.d/collector/sensors/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/sensors/config_schema.json rename to src/go/plugin/go.d/collector/sensors/config_schema.json diff --git a/src/go/plugin/go.d/modules/sensors/doc.go b/src/go/plugin/go.d/collector/sensors/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/sensors/doc.go rename to src/go/plugin/go.d/collector/sensors/doc.go diff --git a/src/go/plugin/go.d/modules/sensors/integrations/linux_sensors.md b/src/go/plugin/go.d/collector/sensors/integrations/linux_sensors.md similarity index 100% rename from src/go/plugin/go.d/modules/sensors/integrations/linux_sensors.md rename to src/go/plugin/go.d/collector/sensors/integrations/linux_sensors.md diff --git a/src/go/plugin/go.d/modules/sensors/lmsensors/LICENSE.md b/src/go/plugin/go.d/collector/sensors/lmsensors/LICENSE.md similarity index 100% rename from src/go/plugin/go.d/modules/sensors/lmsensors/LICENSE.md rename to src/go/plugin/go.d/collector/sensors/lmsensors/LICENSE.md diff --git a/src/go/plugin/go.d/modules/sensors/lmsensors/README.md b/src/go/plugin/go.d/collector/sensors/lmsensors/README.md similarity index 100% rename from src/go/plugin/go.d/modules/sensors/lmsensors/README.md rename to src/go/plugin/go.d/collector/sensors/lmsensors/README.md diff --git a/src/go/plugin/go.d/modules/sensors/lmsensors/doc.go b/src/go/plugin/go.d/collector/sensors/lmsensors/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/sensors/lmsensors/doc.go rename to src/go/plugin/go.d/collector/sensors/lmsensors/doc.go diff --git a/src/go/plugin/go.d/modules/sensors/lmsensors/fs.go b/src/go/plugin/go.d/collector/sensors/lmsensors/fs.go similarity index 100% rename from src/go/plugin/go.d/modules/sensors/lmsensors/fs.go rename to src/go/plugin/go.d/collector/sensors/lmsensors/fs.go diff --git a/src/go/plugin/go.d/modules/sensors/lmsensors/parse.go b/src/go/plugin/go.d/collector/sensors/lmsensors/parse.go similarity index 100% rename from src/go/plugin/go.d/modules/sensors/lmsensors/parse.go rename to src/go/plugin/go.d/collector/sensors/lmsensors/parse.go diff --git a/src/go/plugin/go.d/modules/sensors/lmsensors/scanner.go b/src/go/plugin/go.d/collector/sensors/lmsensors/scanner.go similarity index 100% rename from src/go/plugin/go.d/modules/sensors/lmsensors/scanner.go rename to src/go/plugin/go.d/collector/sensors/lmsensors/scanner.go diff --git a/src/go/plugin/go.d/modules/sensors/lmsensors/scanner_test.go b/src/go/plugin/go.d/collector/sensors/lmsensors/scanner_test.go similarity index 100% rename from src/go/plugin/go.d/modules/sensors/lmsensors/scanner_test.go rename to src/go/plugin/go.d/collector/sensors/lmsensors/scanner_test.go diff --git a/src/go/plugin/go.d/modules/sensors/lmsensors/sensor.go b/src/go/plugin/go.d/collector/sensors/lmsensors/sensor.go similarity index 100% rename from src/go/plugin/go.d/modules/sensors/lmsensors/sensor.go rename to src/go/plugin/go.d/collector/sensors/lmsensors/sensor.go diff --git a/src/go/plugin/go.d/modules/sensors/metadata.yaml b/src/go/plugin/go.d/collector/sensors/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/sensors/metadata.yaml rename to src/go/plugin/go.d/collector/sensors/metadata.yaml diff --git a/src/go/plugin/go.d/modules/sensors/sensors.go b/src/go/plugin/go.d/collector/sensors/sensors.go similarity index 95% rename from src/go/plugin/go.d/modules/sensors/sensors.go rename to src/go/plugin/go.d/collector/sensors/sensors.go index c52cbe947c9c2c..5b60f0994faaa6 100644 --- a/src/go/plugin/go.d/modules/sensors/sensors.go +++ b/src/go/plugin/go.d/collector/sensors/sensors.go @@ -9,7 +9,7 @@ import ( "errors" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/sensors/lmsensors" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/sensors/lmsensors" ) //go:embed "config_schema.json" diff --git a/src/go/plugin/go.d/modules/sensors/sensors_test.go b/src/go/plugin/go.d/collector/sensors/sensors_test.go similarity index 99% rename from src/go/plugin/go.d/modules/sensors/sensors_test.go rename to src/go/plugin/go.d/collector/sensors/sensors_test.go index 0e7ee089c9418e..4e9121a9c3cff3 100644 --- a/src/go/plugin/go.d/modules/sensors/sensors_test.go +++ b/src/go/plugin/go.d/collector/sensors/sensors_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/sensors/lmsensors" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/sensors/lmsensors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/go/plugin/go.d/modules/sensors/testdata/config.json b/src/go/plugin/go.d/collector/sensors/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/sensors/testdata/config.json rename to src/go/plugin/go.d/collector/sensors/testdata/config.json diff --git a/src/go/plugin/go.d/modules/sensors/testdata/config.yaml b/src/go/plugin/go.d/collector/sensors/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/sensors/testdata/config.yaml rename to src/go/plugin/go.d/collector/sensors/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/smartctl/README.md b/src/go/plugin/go.d/collector/smartctl/README.md similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/README.md rename to src/go/plugin/go.d/collector/smartctl/README.md diff --git a/src/go/plugin/go.d/modules/smartctl/charts.go b/src/go/plugin/go.d/collector/smartctl/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/charts.go rename to src/go/plugin/go.d/collector/smartctl/charts.go diff --git a/src/go/plugin/go.d/modules/smartctl/collect.go b/src/go/plugin/go.d/collector/smartctl/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/collect.go rename to src/go/plugin/go.d/collector/smartctl/collect.go diff --git a/src/go/plugin/go.d/modules/smartctl/config_schema.json b/src/go/plugin/go.d/collector/smartctl/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/config_schema.json rename to src/go/plugin/go.d/collector/smartctl/config_schema.json diff --git a/src/go/plugin/go.d/modules/smartctl/doc.go b/src/go/plugin/go.d/collector/smartctl/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/doc.go rename to src/go/plugin/go.d/collector/smartctl/doc.go diff --git a/src/go/plugin/go.d/modules/smartctl/exec.go b/src/go/plugin/go.d/collector/smartctl/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/exec.go rename to src/go/plugin/go.d/collector/smartctl/exec.go diff --git a/src/go/plugin/go.d/modules/smartctl/init.go b/src/go/plugin/go.d/collector/smartctl/init.go similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/init.go rename to src/go/plugin/go.d/collector/smartctl/init.go diff --git a/src/go/plugin/go.d/modules/smartctl/integrations/s.m.a.r.t..md b/src/go/plugin/go.d/collector/smartctl/integrations/s.m.a.r.t..md similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/integrations/s.m.a.r.t..md rename to src/go/plugin/go.d/collector/smartctl/integrations/s.m.a.r.t..md diff --git a/src/go/plugin/go.d/modules/smartctl/metadata.yaml b/src/go/plugin/go.d/collector/smartctl/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/metadata.yaml rename to src/go/plugin/go.d/collector/smartctl/metadata.yaml diff --git a/src/go/plugin/go.d/modules/smartctl/scan.go b/src/go/plugin/go.d/collector/smartctl/scan.go similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/scan.go rename to src/go/plugin/go.d/collector/smartctl/scan.go diff --git a/src/go/plugin/go.d/modules/smartctl/smart_device.go b/src/go/plugin/go.d/collector/smartctl/smart_device.go similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/smart_device.go rename to src/go/plugin/go.d/collector/smartctl/smart_device.go diff --git a/src/go/plugin/go.d/modules/smartctl/smartctl.go b/src/go/plugin/go.d/collector/smartctl/smartctl.go similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/smartctl.go rename to src/go/plugin/go.d/collector/smartctl/smartctl.go diff --git a/src/go/plugin/go.d/modules/smartctl/smartctl_test.go b/src/go/plugin/go.d/collector/smartctl/smartctl_test.go similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/smartctl_test.go rename to src/go/plugin/go.d/collector/smartctl/smartctl_test.go diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/config.json b/src/go/plugin/go.d/collector/smartctl/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/testdata/config.json rename to src/go/plugin/go.d/collector/smartctl/testdata/config.json diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/config.yaml b/src/go/plugin/go.d/collector/smartctl/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/testdata/config.yaml rename to src/go/plugin/go.d/collector/smartctl/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/device-nvme0.json b/src/go/plugin/go.d/collector/smartctl/testdata/type-nvme/device-nvme0.json similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/device-nvme0.json rename to src/go/plugin/go.d/collector/smartctl/testdata/type-nvme/device-nvme0.json diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/device-nvme1.json b/src/go/plugin/go.d/collector/smartctl/testdata/type-nvme/device-nvme1.json similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/device-nvme1.json rename to src/go/plugin/go.d/collector/smartctl/testdata/type-nvme/device-nvme1.json diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/scan.json b/src/go/plugin/go.d/collector/smartctl/testdata/type-nvme/scan.json similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/scan.json rename to src/go/plugin/go.d/collector/smartctl/testdata/type-nvme/scan.json diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/type-sat/device-hdd-sda.json b/src/go/plugin/go.d/collector/smartctl/testdata/type-sat/device-hdd-sda.json similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/testdata/type-sat/device-hdd-sda.json rename to src/go/plugin/go.d/collector/smartctl/testdata/type-sat/device-hdd-sda.json diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/type-sat/device-ssd-sdc.json b/src/go/plugin/go.d/collector/smartctl/testdata/type-sat/device-ssd-sdc.json similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/testdata/type-sat/device-ssd-sdc.json rename to src/go/plugin/go.d/collector/smartctl/testdata/type-sat/device-ssd-sdc.json diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/type-sat/scan.json b/src/go/plugin/go.d/collector/smartctl/testdata/type-sat/scan.json similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/testdata/type-sat/scan.json rename to src/go/plugin/go.d/collector/smartctl/testdata/type-sat/scan.json diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/type-scsi/device-sda.json b/src/go/plugin/go.d/collector/smartctl/testdata/type-scsi/device-sda.json similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/testdata/type-scsi/device-sda.json rename to src/go/plugin/go.d/collector/smartctl/testdata/type-scsi/device-sda.json diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/type-scsi/scan.json b/src/go/plugin/go.d/collector/smartctl/testdata/type-scsi/scan.json similarity index 100% rename from src/go/plugin/go.d/modules/smartctl/testdata/type-scsi/scan.json rename to src/go/plugin/go.d/collector/smartctl/testdata/type-scsi/scan.json diff --git a/src/go/plugin/go.d/modules/snmp/README.md b/src/go/plugin/go.d/collector/snmp/README.md similarity index 100% rename from src/go/plugin/go.d/modules/snmp/README.md rename to src/go/plugin/go.d/collector/snmp/README.md diff --git a/src/go/plugin/go.d/modules/snmp/charts.go b/src/go/plugin/go.d/collector/snmp/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/snmp/charts.go rename to src/go/plugin/go.d/collector/snmp/charts.go diff --git a/src/go/plugin/go.d/modules/snmp/collect.go b/src/go/plugin/go.d/collector/snmp/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/snmp/collect.go rename to src/go/plugin/go.d/collector/snmp/collect.go diff --git a/src/go/plugin/go.d/modules/snmp/collect_custom_oids.go b/src/go/plugin/go.d/collector/snmp/collect_custom_oids.go similarity index 100% rename from src/go/plugin/go.d/modules/snmp/collect_custom_oids.go rename to src/go/plugin/go.d/collector/snmp/collect_custom_oids.go diff --git a/src/go/plugin/go.d/modules/snmp/collect_if_mib.go b/src/go/plugin/go.d/collector/snmp/collect_if_mib.go similarity index 100% rename from src/go/plugin/go.d/modules/snmp/collect_if_mib.go rename to src/go/plugin/go.d/collector/snmp/collect_if_mib.go diff --git a/src/go/plugin/go.d/modules/snmp/collect_sys_info.go b/src/go/plugin/go.d/collector/snmp/collect_sys_info.go similarity index 96% rename from src/go/plugin/go.d/modules/snmp/collect_sys_info.go rename to src/go/plugin/go.d/collector/snmp/collect_sys_info.go index b2dda49043e0b7..e3b761d08918e4 100644 --- a/src/go/plugin/go.d/modules/snmp/collect_sys_info.go +++ b/src/go/plugin/go.d/collector/snmp/collect_sys_info.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/snmp/entnum" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/snmp/entnum" ) const ( diff --git a/src/go/plugin/go.d/modules/snmp/config.go b/src/go/plugin/go.d/collector/snmp/config.go similarity index 100% rename from src/go/plugin/go.d/modules/snmp/config.go rename to src/go/plugin/go.d/collector/snmp/config.go diff --git a/src/go/plugin/go.d/modules/snmp/config_schema.json b/src/go/plugin/go.d/collector/snmp/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/snmp/config_schema.json rename to src/go/plugin/go.d/collector/snmp/config_schema.json diff --git a/src/go/plugin/go.d/modules/snmp/entnum/enterprise-numbers.txt b/src/go/plugin/go.d/collector/snmp/entnum/enterprise-numbers.txt similarity index 100% rename from src/go/plugin/go.d/modules/snmp/entnum/enterprise-numbers.txt rename to src/go/plugin/go.d/collector/snmp/entnum/enterprise-numbers.txt diff --git a/src/go/plugin/go.d/modules/snmp/entnum/lookup.go b/src/go/plugin/go.d/collector/snmp/entnum/lookup.go similarity index 100% rename from src/go/plugin/go.d/modules/snmp/entnum/lookup.go rename to src/go/plugin/go.d/collector/snmp/entnum/lookup.go diff --git a/src/go/plugin/go.d/modules/snmp/init.go b/src/go/plugin/go.d/collector/snmp/init.go similarity index 100% rename from src/go/plugin/go.d/modules/snmp/init.go rename to src/go/plugin/go.d/collector/snmp/init.go diff --git a/src/go/plugin/go.d/modules/snmp/integrations/snmp_devices.md b/src/go/plugin/go.d/collector/snmp/integrations/snmp_devices.md similarity index 100% rename from src/go/plugin/go.d/modules/snmp/integrations/snmp_devices.md rename to src/go/plugin/go.d/collector/snmp/integrations/snmp_devices.md diff --git a/src/go/plugin/go.d/modules/snmp/metadata.yaml b/src/go/plugin/go.d/collector/snmp/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/snmp/metadata.yaml rename to src/go/plugin/go.d/collector/snmp/metadata.yaml diff --git a/src/go/plugin/go.d/modules/snmp/netif.go b/src/go/plugin/go.d/collector/snmp/netif.go similarity index 100% rename from src/go/plugin/go.d/modules/snmp/netif.go rename to src/go/plugin/go.d/collector/snmp/netif.go diff --git a/src/go/plugin/go.d/modules/snmp/snmp.go b/src/go/plugin/go.d/collector/snmp/snmp.go similarity index 100% rename from src/go/plugin/go.d/modules/snmp/snmp.go rename to src/go/plugin/go.d/collector/snmp/snmp.go diff --git a/src/go/plugin/go.d/modules/snmp/snmp_test.go b/src/go/plugin/go.d/collector/snmp/snmp_test.go similarity index 100% rename from src/go/plugin/go.d/modules/snmp/snmp_test.go rename to src/go/plugin/go.d/collector/snmp/snmp_test.go diff --git a/src/go/plugin/go.d/modules/snmp/testdata/config.json b/src/go/plugin/go.d/collector/snmp/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/snmp/testdata/config.json rename to src/go/plugin/go.d/collector/snmp/testdata/config.json diff --git a/src/go/plugin/go.d/modules/snmp/testdata/config.yaml b/src/go/plugin/go.d/collector/snmp/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/snmp/testdata/config.yaml rename to src/go/plugin/go.d/collector/snmp/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/spigotmc/README.md b/src/go/plugin/go.d/collector/spigotmc/README.md similarity index 100% rename from src/go/plugin/go.d/modules/spigotmc/README.md rename to src/go/plugin/go.d/collector/spigotmc/README.md diff --git a/src/go/plugin/go.d/modules/spigotmc/charts.go b/src/go/plugin/go.d/collector/spigotmc/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/spigotmc/charts.go rename to src/go/plugin/go.d/collector/spigotmc/charts.go diff --git a/src/go/plugin/go.d/modules/spigotmc/client.go b/src/go/plugin/go.d/collector/spigotmc/client.go similarity index 100% rename from src/go/plugin/go.d/modules/spigotmc/client.go rename to src/go/plugin/go.d/collector/spigotmc/client.go diff --git a/src/go/plugin/go.d/modules/spigotmc/collect.go b/src/go/plugin/go.d/collector/spigotmc/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/spigotmc/collect.go rename to src/go/plugin/go.d/collector/spigotmc/collect.go diff --git a/src/go/plugin/go.d/modules/spigotmc/config_schema.json b/src/go/plugin/go.d/collector/spigotmc/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/spigotmc/config_schema.json rename to src/go/plugin/go.d/collector/spigotmc/config_schema.json diff --git a/src/go/plugin/go.d/modules/spigotmc/integrations/spigotmc.md b/src/go/plugin/go.d/collector/spigotmc/integrations/spigotmc.md similarity index 100% rename from src/go/plugin/go.d/modules/spigotmc/integrations/spigotmc.md rename to src/go/plugin/go.d/collector/spigotmc/integrations/spigotmc.md diff --git a/src/go/plugin/go.d/modules/spigotmc/metadata.yaml b/src/go/plugin/go.d/collector/spigotmc/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/spigotmc/metadata.yaml rename to src/go/plugin/go.d/collector/spigotmc/metadata.yaml diff --git a/src/go/plugin/go.d/modules/spigotmc/spigotmc.go b/src/go/plugin/go.d/collector/spigotmc/spigotmc.go similarity index 100% rename from src/go/plugin/go.d/modules/spigotmc/spigotmc.go rename to src/go/plugin/go.d/collector/spigotmc/spigotmc.go diff --git a/src/go/plugin/go.d/modules/spigotmc/spigotmc_test.go b/src/go/plugin/go.d/collector/spigotmc/spigotmc_test.go similarity index 100% rename from src/go/plugin/go.d/modules/spigotmc/spigotmc_test.go rename to src/go/plugin/go.d/collector/spigotmc/spigotmc_test.go diff --git a/src/go/plugin/go.d/modules/spigotmc/testdata/config.json b/src/go/plugin/go.d/collector/spigotmc/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/spigotmc/testdata/config.json rename to src/go/plugin/go.d/collector/spigotmc/testdata/config.json diff --git a/src/go/plugin/go.d/modules/spigotmc/testdata/config.yaml b/src/go/plugin/go.d/collector/spigotmc/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/spigotmc/testdata/config.yaml rename to src/go/plugin/go.d/collector/spigotmc/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/squid/README.md b/src/go/plugin/go.d/collector/squid/README.md similarity index 100% rename from src/go/plugin/go.d/modules/squid/README.md rename to src/go/plugin/go.d/collector/squid/README.md diff --git a/src/go/plugin/go.d/modules/squid/charts.go b/src/go/plugin/go.d/collector/squid/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/squid/charts.go rename to src/go/plugin/go.d/collector/squid/charts.go diff --git a/src/go/plugin/go.d/modules/squid/collect.go b/src/go/plugin/go.d/collector/squid/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/squid/collect.go rename to src/go/plugin/go.d/collector/squid/collect.go diff --git a/src/go/plugin/go.d/modules/squid/config_schema.json b/src/go/plugin/go.d/collector/squid/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/squid/config_schema.json rename to src/go/plugin/go.d/collector/squid/config_schema.json diff --git a/src/go/plugin/go.d/modules/squid/integrations/squid.md b/src/go/plugin/go.d/collector/squid/integrations/squid.md similarity index 100% rename from src/go/plugin/go.d/modules/squid/integrations/squid.md rename to src/go/plugin/go.d/collector/squid/integrations/squid.md diff --git a/src/go/plugin/go.d/modules/squid/metadata.yaml b/src/go/plugin/go.d/collector/squid/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/squid/metadata.yaml rename to src/go/plugin/go.d/collector/squid/metadata.yaml diff --git a/src/go/plugin/go.d/modules/squid/squid.go b/src/go/plugin/go.d/collector/squid/squid.go similarity index 100% rename from src/go/plugin/go.d/modules/squid/squid.go rename to src/go/plugin/go.d/collector/squid/squid.go diff --git a/src/go/plugin/go.d/modules/squid/squid_test.go b/src/go/plugin/go.d/collector/squid/squid_test.go similarity index 100% rename from src/go/plugin/go.d/modules/squid/squid_test.go rename to src/go/plugin/go.d/collector/squid/squid_test.go diff --git a/src/go/plugin/go.d/modules/squid/testdata/config.json b/src/go/plugin/go.d/collector/squid/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/squid/testdata/config.json rename to src/go/plugin/go.d/collector/squid/testdata/config.json diff --git a/src/go/plugin/go.d/modules/squid/testdata/config.yaml b/src/go/plugin/go.d/collector/squid/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/squid/testdata/config.yaml rename to src/go/plugin/go.d/collector/squid/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/squid/testdata/counters.txt b/src/go/plugin/go.d/collector/squid/testdata/counters.txt similarity index 100% rename from src/go/plugin/go.d/modules/squid/testdata/counters.txt rename to src/go/plugin/go.d/collector/squid/testdata/counters.txt diff --git a/src/go/plugin/go.d/modules/squidlog/README.md b/src/go/plugin/go.d/collector/squidlog/README.md similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/README.md rename to src/go/plugin/go.d/collector/squidlog/README.md diff --git a/src/go/plugin/go.d/modules/squidlog/charts.go b/src/go/plugin/go.d/collector/squidlog/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/charts.go rename to src/go/plugin/go.d/collector/squidlog/charts.go diff --git a/src/go/plugin/go.d/modules/squidlog/collect.go b/src/go/plugin/go.d/collector/squidlog/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/collect.go rename to src/go/plugin/go.d/collector/squidlog/collect.go diff --git a/src/go/plugin/go.d/modules/squidlog/config_schema.json b/src/go/plugin/go.d/collector/squidlog/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/config_schema.json rename to src/go/plugin/go.d/collector/squidlog/config_schema.json diff --git a/src/go/plugin/go.d/modules/squidlog/init.go b/src/go/plugin/go.d/collector/squidlog/init.go similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/init.go rename to src/go/plugin/go.d/collector/squidlog/init.go diff --git a/src/go/plugin/go.d/modules/squidlog/integrations/squid_log_files.md b/src/go/plugin/go.d/collector/squidlog/integrations/squid_log_files.md similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/integrations/squid_log_files.md rename to src/go/plugin/go.d/collector/squidlog/integrations/squid_log_files.md diff --git a/src/go/plugin/go.d/modules/squidlog/logline.go b/src/go/plugin/go.d/collector/squidlog/logline.go similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/logline.go rename to src/go/plugin/go.d/collector/squidlog/logline.go diff --git a/src/go/plugin/go.d/modules/squidlog/logline_test.go b/src/go/plugin/go.d/collector/squidlog/logline_test.go similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/logline_test.go rename to src/go/plugin/go.d/collector/squidlog/logline_test.go diff --git a/src/go/plugin/go.d/modules/squidlog/metadata.yaml b/src/go/plugin/go.d/collector/squidlog/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/metadata.yaml rename to src/go/plugin/go.d/collector/squidlog/metadata.yaml diff --git a/src/go/plugin/go.d/modules/squidlog/metrics.go b/src/go/plugin/go.d/collector/squidlog/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/metrics.go rename to src/go/plugin/go.d/collector/squidlog/metrics.go diff --git a/src/go/plugin/go.d/modules/squidlog/squidlog.go b/src/go/plugin/go.d/collector/squidlog/squidlog.go similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/squidlog.go rename to src/go/plugin/go.d/collector/squidlog/squidlog.go diff --git a/src/go/plugin/go.d/modules/squidlog/squidlog_test.go b/src/go/plugin/go.d/collector/squidlog/squidlog_test.go similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/squidlog_test.go rename to src/go/plugin/go.d/collector/squidlog/squidlog_test.go diff --git a/src/go/plugin/go.d/modules/squidlog/testdata/access.log b/src/go/plugin/go.d/collector/squidlog/testdata/access.log similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/testdata/access.log rename to src/go/plugin/go.d/collector/squidlog/testdata/access.log diff --git a/src/go/plugin/go.d/modules/squidlog/testdata/config.json b/src/go/plugin/go.d/collector/squidlog/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/testdata/config.json rename to src/go/plugin/go.d/collector/squidlog/testdata/config.json diff --git a/src/go/plugin/go.d/modules/squidlog/testdata/config.yaml b/src/go/plugin/go.d/collector/squidlog/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/testdata/config.yaml rename to src/go/plugin/go.d/collector/squidlog/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/squidlog/testdata/unknown.log b/src/go/plugin/go.d/collector/squidlog/testdata/unknown.log similarity index 100% rename from src/go/plugin/go.d/modules/squidlog/testdata/unknown.log rename to src/go/plugin/go.d/collector/squidlog/testdata/unknown.log diff --git a/src/go/plugin/go.d/modules/storcli/README.md b/src/go/plugin/go.d/collector/storcli/README.md similarity index 100% rename from src/go/plugin/go.d/modules/storcli/README.md rename to src/go/plugin/go.d/collector/storcli/README.md diff --git a/src/go/plugin/go.d/modules/storcli/charts.go b/src/go/plugin/go.d/collector/storcli/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/storcli/charts.go rename to src/go/plugin/go.d/collector/storcli/charts.go diff --git a/src/go/plugin/go.d/modules/storcli/collect.go b/src/go/plugin/go.d/collector/storcli/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/storcli/collect.go rename to src/go/plugin/go.d/collector/storcli/collect.go diff --git a/src/go/plugin/go.d/modules/storcli/collect_controllers.go b/src/go/plugin/go.d/collector/storcli/collect_controllers.go similarity index 100% rename from src/go/plugin/go.d/modules/storcli/collect_controllers.go rename to src/go/plugin/go.d/collector/storcli/collect_controllers.go diff --git a/src/go/plugin/go.d/modules/storcli/collect_drives.go b/src/go/plugin/go.d/collector/storcli/collect_drives.go similarity index 100% rename from src/go/plugin/go.d/modules/storcli/collect_drives.go rename to src/go/plugin/go.d/collector/storcli/collect_drives.go diff --git a/src/go/plugin/go.d/modules/storcli/config_schema.json b/src/go/plugin/go.d/collector/storcli/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/storcli/config_schema.json rename to src/go/plugin/go.d/collector/storcli/config_schema.json diff --git a/src/go/plugin/go.d/modules/storcli/doc.go b/src/go/plugin/go.d/collector/storcli/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/storcli/doc.go rename to src/go/plugin/go.d/collector/storcli/doc.go diff --git a/src/go/plugin/go.d/modules/storcli/exec.go b/src/go/plugin/go.d/collector/storcli/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/storcli/exec.go rename to src/go/plugin/go.d/collector/storcli/exec.go diff --git a/src/go/plugin/go.d/modules/storcli/init.go b/src/go/plugin/go.d/collector/storcli/init.go similarity index 100% rename from src/go/plugin/go.d/modules/storcli/init.go rename to src/go/plugin/go.d/collector/storcli/init.go diff --git a/src/go/plugin/go.d/modules/storcli/integrations/storecli_raid.md b/src/go/plugin/go.d/collector/storcli/integrations/storecli_raid.md similarity index 100% rename from src/go/plugin/go.d/modules/storcli/integrations/storecli_raid.md rename to src/go/plugin/go.d/collector/storcli/integrations/storecli_raid.md diff --git a/src/go/plugin/go.d/modules/storcli/metadata.yaml b/src/go/plugin/go.d/collector/storcli/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/storcli/metadata.yaml rename to src/go/plugin/go.d/collector/storcli/metadata.yaml diff --git a/src/go/plugin/go.d/modules/storcli/storcli.go b/src/go/plugin/go.d/collector/storcli/storcli.go similarity index 100% rename from src/go/plugin/go.d/modules/storcli/storcli.go rename to src/go/plugin/go.d/collector/storcli/storcli.go diff --git a/src/go/plugin/go.d/modules/storcli/storcli_test.go b/src/go/plugin/go.d/collector/storcli/storcli_test.go similarity index 100% rename from src/go/plugin/go.d/modules/storcli/storcli_test.go rename to src/go/plugin/go.d/collector/storcli/storcli_test.go diff --git a/src/go/plugin/go.d/modules/storcli/testdata/config.json b/src/go/plugin/go.d/collector/storcli/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/storcli/testdata/config.json rename to src/go/plugin/go.d/collector/storcli/testdata/config.json diff --git a/src/go/plugin/go.d/modules/storcli/testdata/config.yaml b/src/go/plugin/go.d/collector/storcli/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/storcli/testdata/config.yaml rename to src/go/plugin/go.d/collector/storcli/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/storcli/testdata/megaraid-controllers-info.json b/src/go/plugin/go.d/collector/storcli/testdata/megaraid-controllers-info.json similarity index 100% rename from src/go/plugin/go.d/modules/storcli/testdata/megaraid-controllers-info.json rename to src/go/plugin/go.d/collector/storcli/testdata/megaraid-controllers-info.json diff --git a/src/go/plugin/go.d/modules/storcli/testdata/megaraid-drives-info.json b/src/go/plugin/go.d/collector/storcli/testdata/megaraid-drives-info.json similarity index 100% rename from src/go/plugin/go.d/modules/storcli/testdata/megaraid-drives-info.json rename to src/go/plugin/go.d/collector/storcli/testdata/megaraid-drives-info.json diff --git a/src/go/plugin/go.d/modules/storcli/testdata/mpt3sas-controllers-info.json b/src/go/plugin/go.d/collector/storcli/testdata/mpt3sas-controllers-info.json similarity index 100% rename from src/go/plugin/go.d/modules/storcli/testdata/mpt3sas-controllers-info.json rename to src/go/plugin/go.d/collector/storcli/testdata/mpt3sas-controllers-info.json diff --git a/src/go/plugin/go.d/modules/supervisord/README.md b/src/go/plugin/go.d/collector/supervisord/README.md similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/README.md rename to src/go/plugin/go.d/collector/supervisord/README.md diff --git a/src/go/plugin/go.d/modules/supervisord/charts.go b/src/go/plugin/go.d/collector/supervisord/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/charts.go rename to src/go/plugin/go.d/collector/supervisord/charts.go diff --git a/src/go/plugin/go.d/modules/supervisord/client.go b/src/go/plugin/go.d/collector/supervisord/client.go similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/client.go rename to src/go/plugin/go.d/collector/supervisord/client.go diff --git a/src/go/plugin/go.d/modules/supervisord/collect.go b/src/go/plugin/go.d/collector/supervisord/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/collect.go rename to src/go/plugin/go.d/collector/supervisord/collect.go diff --git a/src/go/plugin/go.d/modules/supervisord/config_schema.json b/src/go/plugin/go.d/collector/supervisord/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/config_schema.json rename to src/go/plugin/go.d/collector/supervisord/config_schema.json diff --git a/src/go/plugin/go.d/modules/supervisord/init.go b/src/go/plugin/go.d/collector/supervisord/init.go similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/init.go rename to src/go/plugin/go.d/collector/supervisord/init.go diff --git a/src/go/plugin/go.d/modules/supervisord/integrations/supervisor.md b/src/go/plugin/go.d/collector/supervisord/integrations/supervisor.md similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/integrations/supervisor.md rename to src/go/plugin/go.d/collector/supervisord/integrations/supervisor.md diff --git a/src/go/plugin/go.d/modules/supervisord/metadata.yaml b/src/go/plugin/go.d/collector/supervisord/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/metadata.yaml rename to src/go/plugin/go.d/collector/supervisord/metadata.yaml diff --git a/src/go/plugin/go.d/modules/supervisord/supervisord.go b/src/go/plugin/go.d/collector/supervisord/supervisord.go similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/supervisord.go rename to src/go/plugin/go.d/collector/supervisord/supervisord.go diff --git a/src/go/plugin/go.d/modules/supervisord/supervisord_test.go b/src/go/plugin/go.d/collector/supervisord/supervisord_test.go similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/supervisord_test.go rename to src/go/plugin/go.d/collector/supervisord/supervisord_test.go diff --git a/src/go/plugin/go.d/modules/supervisord/testdata/config.json b/src/go/plugin/go.d/collector/supervisord/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/testdata/config.json rename to src/go/plugin/go.d/collector/supervisord/testdata/config.json diff --git a/src/go/plugin/go.d/modules/supervisord/testdata/config.yaml b/src/go/plugin/go.d/collector/supervisord/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/supervisord/testdata/config.yaml rename to src/go/plugin/go.d/collector/supervisord/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/systemdunits/README.md b/src/go/plugin/go.d/collector/systemdunits/README.md similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/README.md rename to src/go/plugin/go.d/collector/systemdunits/README.md diff --git a/src/go/plugin/go.d/modules/systemdunits/charts.go b/src/go/plugin/go.d/collector/systemdunits/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/charts.go rename to src/go/plugin/go.d/collector/systemdunits/charts.go diff --git a/src/go/plugin/go.d/modules/systemdunits/client.go b/src/go/plugin/go.d/collector/systemdunits/client.go similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/client.go rename to src/go/plugin/go.d/collector/systemdunits/client.go diff --git a/src/go/plugin/go.d/modules/systemdunits/collect.go b/src/go/plugin/go.d/collector/systemdunits/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/collect.go rename to src/go/plugin/go.d/collector/systemdunits/collect.go diff --git a/src/go/plugin/go.d/modules/systemdunits/collect_unit_files.go b/src/go/plugin/go.d/collector/systemdunits/collect_unit_files.go similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/collect_unit_files.go rename to src/go/plugin/go.d/collector/systemdunits/collect_unit_files.go diff --git a/src/go/plugin/go.d/modules/systemdunits/collect_units.go b/src/go/plugin/go.d/collector/systemdunits/collect_units.go similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/collect_units.go rename to src/go/plugin/go.d/collector/systemdunits/collect_units.go diff --git a/src/go/plugin/go.d/modules/systemdunits/config_schema.json b/src/go/plugin/go.d/collector/systemdunits/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/config_schema.json rename to src/go/plugin/go.d/collector/systemdunits/config_schema.json diff --git a/src/go/plugin/go.d/modules/systemdunits/doc.go b/src/go/plugin/go.d/collector/systemdunits/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/doc.go rename to src/go/plugin/go.d/collector/systemdunits/doc.go diff --git a/src/go/plugin/go.d/modules/systemdunits/init.go b/src/go/plugin/go.d/collector/systemdunits/init.go similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/init.go rename to src/go/plugin/go.d/collector/systemdunits/init.go diff --git a/src/go/plugin/go.d/modules/systemdunits/integrations/systemd_units.md b/src/go/plugin/go.d/collector/systemdunits/integrations/systemd_units.md similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/integrations/systemd_units.md rename to src/go/plugin/go.d/collector/systemdunits/integrations/systemd_units.md diff --git a/src/go/plugin/go.d/modules/systemdunits/metadata.yaml b/src/go/plugin/go.d/collector/systemdunits/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/metadata.yaml rename to src/go/plugin/go.d/collector/systemdunits/metadata.yaml diff --git a/src/go/plugin/go.d/modules/systemdunits/systemdunits.go b/src/go/plugin/go.d/collector/systemdunits/systemdunits.go similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/systemdunits.go rename to src/go/plugin/go.d/collector/systemdunits/systemdunits.go diff --git a/src/go/plugin/go.d/modules/systemdunits/systemdunits_test.go b/src/go/plugin/go.d/collector/systemdunits/systemdunits_test.go similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/systemdunits_test.go rename to src/go/plugin/go.d/collector/systemdunits/systemdunits_test.go diff --git a/src/go/plugin/go.d/modules/systemdunits/testdata/config.json b/src/go/plugin/go.d/collector/systemdunits/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/testdata/config.json rename to src/go/plugin/go.d/collector/systemdunits/testdata/config.json diff --git a/src/go/plugin/go.d/modules/systemdunits/testdata/config.yaml b/src/go/plugin/go.d/collector/systemdunits/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/systemdunits/testdata/config.yaml rename to src/go/plugin/go.d/collector/systemdunits/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/tengine/README.md b/src/go/plugin/go.d/collector/tengine/README.md similarity index 100% rename from src/go/plugin/go.d/modules/tengine/README.md rename to src/go/plugin/go.d/collector/tengine/README.md diff --git a/src/go/plugin/go.d/modules/tengine/charts.go b/src/go/plugin/go.d/collector/tengine/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/tengine/charts.go rename to src/go/plugin/go.d/collector/tengine/charts.go diff --git a/src/go/plugin/go.d/modules/tengine/collect.go b/src/go/plugin/go.d/collector/tengine/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/tengine/collect.go rename to src/go/plugin/go.d/collector/tengine/collect.go diff --git a/src/go/plugin/go.d/modules/tengine/config_schema.json b/src/go/plugin/go.d/collector/tengine/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/tengine/config_schema.json rename to src/go/plugin/go.d/collector/tengine/config_schema.json diff --git a/src/go/plugin/go.d/modules/tengine/integrations/tengine.md b/src/go/plugin/go.d/collector/tengine/integrations/tengine.md similarity index 100% rename from src/go/plugin/go.d/modules/tengine/integrations/tengine.md rename to src/go/plugin/go.d/collector/tengine/integrations/tengine.md diff --git a/src/go/plugin/go.d/modules/tengine/metadata.yaml b/src/go/plugin/go.d/collector/tengine/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/tengine/metadata.yaml rename to src/go/plugin/go.d/collector/tengine/metadata.yaml diff --git a/src/go/plugin/go.d/modules/tengine/status.go b/src/go/plugin/go.d/collector/tengine/status.go similarity index 100% rename from src/go/plugin/go.d/modules/tengine/status.go rename to src/go/plugin/go.d/collector/tengine/status.go diff --git a/src/go/plugin/go.d/modules/tengine/tengine.go b/src/go/plugin/go.d/collector/tengine/tengine.go similarity index 100% rename from src/go/plugin/go.d/modules/tengine/tengine.go rename to src/go/plugin/go.d/collector/tengine/tengine.go diff --git a/src/go/plugin/go.d/modules/tengine/tengine_test.go b/src/go/plugin/go.d/collector/tengine/tengine_test.go similarity index 100% rename from src/go/plugin/go.d/modules/tengine/tengine_test.go rename to src/go/plugin/go.d/collector/tengine/tengine_test.go diff --git a/src/go/plugin/go.d/modules/tengine/testdata/config.json b/src/go/plugin/go.d/collector/tengine/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/tengine/testdata/config.json rename to src/go/plugin/go.d/collector/tengine/testdata/config.json diff --git a/src/go/plugin/go.d/modules/tengine/testdata/config.yaml b/src/go/plugin/go.d/collector/tengine/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/tengine/testdata/config.yaml rename to src/go/plugin/go.d/collector/tengine/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/tengine/testdata/status.txt b/src/go/plugin/go.d/collector/tengine/testdata/status.txt similarity index 100% rename from src/go/plugin/go.d/modules/tengine/testdata/status.txt rename to src/go/plugin/go.d/collector/tengine/testdata/status.txt diff --git a/src/go/plugin/go.d/modules/testrandom/charts.go b/src/go/plugin/go.d/collector/testrandom/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/testrandom/charts.go rename to src/go/plugin/go.d/collector/testrandom/charts.go diff --git a/src/go/plugin/go.d/modules/testrandom/collect.go b/src/go/plugin/go.d/collector/testrandom/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/testrandom/collect.go rename to src/go/plugin/go.d/collector/testrandom/collect.go diff --git a/src/go/plugin/go.d/modules/testrandom/config_schema.json b/src/go/plugin/go.d/collector/testrandom/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/testrandom/config_schema.json rename to src/go/plugin/go.d/collector/testrandom/config_schema.json diff --git a/src/go/plugin/go.d/modules/testrandom/init.go b/src/go/plugin/go.d/collector/testrandom/init.go similarity index 100% rename from src/go/plugin/go.d/modules/testrandom/init.go rename to src/go/plugin/go.d/collector/testrandom/init.go diff --git a/src/go/plugin/go.d/modules/testrandom/testdata/config.json b/src/go/plugin/go.d/collector/testrandom/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/testrandom/testdata/config.json rename to src/go/plugin/go.d/collector/testrandom/testdata/config.json diff --git a/src/go/plugin/go.d/modules/testrandom/testdata/config.yaml b/src/go/plugin/go.d/collector/testrandom/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/testrandom/testdata/config.yaml rename to src/go/plugin/go.d/collector/testrandom/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/testrandom/testrandom.go b/src/go/plugin/go.d/collector/testrandom/testrandom.go similarity index 100% rename from src/go/plugin/go.d/modules/testrandom/testrandom.go rename to src/go/plugin/go.d/collector/testrandom/testrandom.go diff --git a/src/go/plugin/go.d/modules/testrandom/testrandom_test.go b/src/go/plugin/go.d/collector/testrandom/testrandom_test.go similarity index 100% rename from src/go/plugin/go.d/modules/testrandom/testrandom_test.go rename to src/go/plugin/go.d/collector/testrandom/testrandom_test.go diff --git a/src/go/plugin/go.d/modules/tomcat/README.md b/src/go/plugin/go.d/collector/tomcat/README.md similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/README.md rename to src/go/plugin/go.d/collector/tomcat/README.md diff --git a/src/go/plugin/go.d/modules/tomcat/charts.go b/src/go/plugin/go.d/collector/tomcat/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/charts.go rename to src/go/plugin/go.d/collector/tomcat/charts.go diff --git a/src/go/plugin/go.d/modules/tomcat/collect.go b/src/go/plugin/go.d/collector/tomcat/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/collect.go rename to src/go/plugin/go.d/collector/tomcat/collect.go diff --git a/src/go/plugin/go.d/modules/tomcat/config_schema.json b/src/go/plugin/go.d/collector/tomcat/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/config_schema.json rename to src/go/plugin/go.d/collector/tomcat/config_schema.json diff --git a/src/go/plugin/go.d/modules/tomcat/init.go b/src/go/plugin/go.d/collector/tomcat/init.go similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/init.go rename to src/go/plugin/go.d/collector/tomcat/init.go diff --git a/src/go/plugin/go.d/modules/tomcat/integrations/tomcat.md b/src/go/plugin/go.d/collector/tomcat/integrations/tomcat.md similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/integrations/tomcat.md rename to src/go/plugin/go.d/collector/tomcat/integrations/tomcat.md diff --git a/src/go/plugin/go.d/modules/tomcat/metadata.yaml b/src/go/plugin/go.d/collector/tomcat/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/metadata.yaml rename to src/go/plugin/go.d/collector/tomcat/metadata.yaml diff --git a/src/go/plugin/go.d/modules/tomcat/status_response.go b/src/go/plugin/go.d/collector/tomcat/status_response.go similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/status_response.go rename to src/go/plugin/go.d/collector/tomcat/status_response.go diff --git a/src/go/plugin/go.d/modules/tomcat/testdata/config.json b/src/go/plugin/go.d/collector/tomcat/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/testdata/config.json rename to src/go/plugin/go.d/collector/tomcat/testdata/config.json diff --git a/src/go/plugin/go.d/modules/tomcat/testdata/config.yaml b/src/go/plugin/go.d/collector/tomcat/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/testdata/config.yaml rename to src/go/plugin/go.d/collector/tomcat/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/tomcat/testdata/server_status.xml b/src/go/plugin/go.d/collector/tomcat/testdata/server_status.xml similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/testdata/server_status.xml rename to src/go/plugin/go.d/collector/tomcat/testdata/server_status.xml diff --git a/src/go/plugin/go.d/modules/tomcat/tomcat.go b/src/go/plugin/go.d/collector/tomcat/tomcat.go similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/tomcat.go rename to src/go/plugin/go.d/collector/tomcat/tomcat.go diff --git a/src/go/plugin/go.d/modules/tomcat/tomcat_test.go b/src/go/plugin/go.d/collector/tomcat/tomcat_test.go similarity index 100% rename from src/go/plugin/go.d/modules/tomcat/tomcat_test.go rename to src/go/plugin/go.d/collector/tomcat/tomcat_test.go diff --git a/src/go/plugin/go.d/modules/tor/README.md b/src/go/plugin/go.d/collector/tor/README.md similarity index 100% rename from src/go/plugin/go.d/modules/tor/README.md rename to src/go/plugin/go.d/collector/tor/README.md diff --git a/src/go/plugin/go.d/modules/tor/charts.go b/src/go/plugin/go.d/collector/tor/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/tor/charts.go rename to src/go/plugin/go.d/collector/tor/charts.go diff --git a/src/go/plugin/go.d/modules/tor/client.go b/src/go/plugin/go.d/collector/tor/client.go similarity index 100% rename from src/go/plugin/go.d/modules/tor/client.go rename to src/go/plugin/go.d/collector/tor/client.go diff --git a/src/go/plugin/go.d/modules/tor/collect.go b/src/go/plugin/go.d/collector/tor/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/tor/collect.go rename to src/go/plugin/go.d/collector/tor/collect.go diff --git a/src/go/plugin/go.d/modules/tor/config_schema.json b/src/go/plugin/go.d/collector/tor/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/tor/config_schema.json rename to src/go/plugin/go.d/collector/tor/config_schema.json diff --git a/src/go/plugin/go.d/modules/tor/integrations/tor.md b/src/go/plugin/go.d/collector/tor/integrations/tor.md similarity index 100% rename from src/go/plugin/go.d/modules/tor/integrations/tor.md rename to src/go/plugin/go.d/collector/tor/integrations/tor.md diff --git a/src/go/plugin/go.d/modules/tor/metadata.yaml b/src/go/plugin/go.d/collector/tor/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/tor/metadata.yaml rename to src/go/plugin/go.d/collector/tor/metadata.yaml diff --git a/src/go/plugin/go.d/modules/tor/testdata/config.json b/src/go/plugin/go.d/collector/tor/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/tor/testdata/config.json rename to src/go/plugin/go.d/collector/tor/testdata/config.json diff --git a/src/go/plugin/go.d/modules/tor/testdata/config.yaml b/src/go/plugin/go.d/collector/tor/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/tor/testdata/config.yaml rename to src/go/plugin/go.d/collector/tor/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/tor/tor.go b/src/go/plugin/go.d/collector/tor/tor.go similarity index 100% rename from src/go/plugin/go.d/modules/tor/tor.go rename to src/go/plugin/go.d/collector/tor/tor.go diff --git a/src/go/plugin/go.d/modules/tor/tor_test.go b/src/go/plugin/go.d/collector/tor/tor_test.go similarity index 100% rename from src/go/plugin/go.d/modules/tor/tor_test.go rename to src/go/plugin/go.d/collector/tor/tor_test.go diff --git a/src/go/plugin/go.d/modules/traefik/README.md b/src/go/plugin/go.d/collector/traefik/README.md similarity index 100% rename from src/go/plugin/go.d/modules/traefik/README.md rename to src/go/plugin/go.d/collector/traefik/README.md diff --git a/src/go/plugin/go.d/modules/traefik/charts.go b/src/go/plugin/go.d/collector/traefik/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/traefik/charts.go rename to src/go/plugin/go.d/collector/traefik/charts.go diff --git a/src/go/plugin/go.d/modules/traefik/collect.go b/src/go/plugin/go.d/collector/traefik/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/traefik/collect.go rename to src/go/plugin/go.d/collector/traefik/collect.go diff --git a/src/go/plugin/go.d/modules/traefik/config_schema.json b/src/go/plugin/go.d/collector/traefik/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/traefik/config_schema.json rename to src/go/plugin/go.d/collector/traefik/config_schema.json diff --git a/src/go/plugin/go.d/modules/traefik/init.go b/src/go/plugin/go.d/collector/traefik/init.go similarity index 100% rename from src/go/plugin/go.d/modules/traefik/init.go rename to src/go/plugin/go.d/collector/traefik/init.go diff --git a/src/go/plugin/go.d/modules/traefik/integrations/traefik.md b/src/go/plugin/go.d/collector/traefik/integrations/traefik.md similarity index 100% rename from src/go/plugin/go.d/modules/traefik/integrations/traefik.md rename to src/go/plugin/go.d/collector/traefik/integrations/traefik.md diff --git a/src/go/plugin/go.d/modules/traefik/metadata.yaml b/src/go/plugin/go.d/collector/traefik/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/traefik/metadata.yaml rename to src/go/plugin/go.d/collector/traefik/metadata.yaml diff --git a/src/go/plugin/go.d/modules/traefik/testdata/config.json b/src/go/plugin/go.d/collector/traefik/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/traefik/testdata/config.json rename to src/go/plugin/go.d/collector/traefik/testdata/config.json diff --git a/src/go/plugin/go.d/modules/traefik/testdata/config.yaml b/src/go/plugin/go.d/collector/traefik/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/traefik/testdata/config.yaml rename to src/go/plugin/go.d/collector/traefik/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/traefik/testdata/v2.2.1/metrics.txt b/src/go/plugin/go.d/collector/traefik/testdata/v2.2.1/metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/traefik/testdata/v2.2.1/metrics.txt rename to src/go/plugin/go.d/collector/traefik/testdata/v2.2.1/metrics.txt diff --git a/src/go/plugin/go.d/modules/traefik/traefik.go b/src/go/plugin/go.d/collector/traefik/traefik.go similarity index 100% rename from src/go/plugin/go.d/modules/traefik/traefik.go rename to src/go/plugin/go.d/collector/traefik/traefik.go diff --git a/src/go/plugin/go.d/modules/traefik/traefik_test.go b/src/go/plugin/go.d/collector/traefik/traefik_test.go similarity index 100% rename from src/go/plugin/go.d/modules/traefik/traefik_test.go rename to src/go/plugin/go.d/collector/traefik/traefik_test.go diff --git a/src/go/plugin/go.d/modules/typesense/README.md b/src/go/plugin/go.d/collector/typesense/README.md similarity index 100% rename from src/go/plugin/go.d/modules/typesense/README.md rename to src/go/plugin/go.d/collector/typesense/README.md diff --git a/src/go/plugin/go.d/modules/typesense/charts.go b/src/go/plugin/go.d/collector/typesense/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/typesense/charts.go rename to src/go/plugin/go.d/collector/typesense/charts.go diff --git a/src/go/plugin/go.d/modules/typesense/collect.go b/src/go/plugin/go.d/collector/typesense/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/typesense/collect.go rename to src/go/plugin/go.d/collector/typesense/collect.go diff --git a/src/go/plugin/go.d/modules/typesense/config_schema.json b/src/go/plugin/go.d/collector/typesense/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/typesense/config_schema.json rename to src/go/plugin/go.d/collector/typesense/config_schema.json diff --git a/src/go/plugin/go.d/modules/typesense/init.go b/src/go/plugin/go.d/collector/typesense/init.go similarity index 100% rename from src/go/plugin/go.d/modules/typesense/init.go rename to src/go/plugin/go.d/collector/typesense/init.go diff --git a/src/go/plugin/go.d/modules/typesense/integrations/typesense.md b/src/go/plugin/go.d/collector/typesense/integrations/typesense.md similarity index 100% rename from src/go/plugin/go.d/modules/typesense/integrations/typesense.md rename to src/go/plugin/go.d/collector/typesense/integrations/typesense.md diff --git a/src/go/plugin/go.d/modules/typesense/metadata.yaml b/src/go/plugin/go.d/collector/typesense/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/typesense/metadata.yaml rename to src/go/plugin/go.d/collector/typesense/metadata.yaml diff --git a/src/go/plugin/go.d/modules/typesense/testdata/config.json b/src/go/plugin/go.d/collector/typesense/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/typesense/testdata/config.json rename to src/go/plugin/go.d/collector/typesense/testdata/config.json diff --git a/src/go/plugin/go.d/modules/typesense/testdata/config.yaml b/src/go/plugin/go.d/collector/typesense/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/typesense/testdata/config.yaml rename to src/go/plugin/go.d/collector/typesense/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/typesense/testdata/v27.0/health_nok.json b/src/go/plugin/go.d/collector/typesense/testdata/v27.0/health_nok.json similarity index 100% rename from src/go/plugin/go.d/modules/typesense/testdata/v27.0/health_nok.json rename to src/go/plugin/go.d/collector/typesense/testdata/v27.0/health_nok.json diff --git a/src/go/plugin/go.d/modules/typesense/testdata/v27.0/health_ok.json b/src/go/plugin/go.d/collector/typesense/testdata/v27.0/health_ok.json similarity index 100% rename from src/go/plugin/go.d/modules/typesense/testdata/v27.0/health_ok.json rename to src/go/plugin/go.d/collector/typesense/testdata/v27.0/health_ok.json diff --git a/src/go/plugin/go.d/modules/typesense/testdata/v27.0/stats.json b/src/go/plugin/go.d/collector/typesense/testdata/v27.0/stats.json similarity index 100% rename from src/go/plugin/go.d/modules/typesense/testdata/v27.0/stats.json rename to src/go/plugin/go.d/collector/typesense/testdata/v27.0/stats.json diff --git a/src/go/plugin/go.d/modules/typesense/typesense.go b/src/go/plugin/go.d/collector/typesense/typesense.go similarity index 100% rename from src/go/plugin/go.d/modules/typesense/typesense.go rename to src/go/plugin/go.d/collector/typesense/typesense.go diff --git a/src/go/plugin/go.d/modules/typesense/typesense_test.go b/src/go/plugin/go.d/collector/typesense/typesense_test.go similarity index 100% rename from src/go/plugin/go.d/modules/typesense/typesense_test.go rename to src/go/plugin/go.d/collector/typesense/typesense_test.go diff --git a/src/go/plugin/go.d/modules/unbound/README.md b/src/go/plugin/go.d/collector/unbound/README.md similarity index 100% rename from src/go/plugin/go.d/modules/unbound/README.md rename to src/go/plugin/go.d/collector/unbound/README.md diff --git a/src/go/plugin/go.d/modules/unbound/charts.go b/src/go/plugin/go.d/collector/unbound/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/unbound/charts.go rename to src/go/plugin/go.d/collector/unbound/charts.go diff --git a/src/go/plugin/go.d/modules/unbound/collect.go b/src/go/plugin/go.d/collector/unbound/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/unbound/collect.go rename to src/go/plugin/go.d/collector/unbound/collect.go diff --git a/src/go/plugin/go.d/modules/unbound/config/config.go b/src/go/plugin/go.d/collector/unbound/config/config.go similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/config.go rename to src/go/plugin/go.d/collector/unbound/config/config.go diff --git a/src/go/plugin/go.d/modules/unbound/config/config_test.go b/src/go/plugin/go.d/collector/unbound/config/config_test.go similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/config_test.go rename to src/go/plugin/go.d/collector/unbound/config/config_test.go diff --git a/src/go/plugin/go.d/modules/unbound/config/parse.go b/src/go/plugin/go.d/collector/unbound/config/parse.go similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/parse.go rename to src/go/plugin/go.d/collector/unbound/config/parse.go diff --git a/src/go/plugin/go.d/modules/unbound/config/parse_test.go b/src/go/plugin/go.d/collector/unbound/config/parse_test.go similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/parse_test.go rename to src/go/plugin/go.d/collector/unbound/config/parse_test.go diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/infinite_rec.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/infinite_rec.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/infinite_rec.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/infinite_rec.conf diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/non_existent_glob_include.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/non_existent_glob_include.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/non_existent_glob_include.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/non_existent_glob_include.conf diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/non_existent_include.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/non_existent_include.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/non_existent_include.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/non_existent_include.conf diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/valid_glob.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/valid_glob.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/valid_glob.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/valid_glob.conf diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/valid_glob2.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/valid_glob2.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/valid_glob2.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/valid_glob2.conf diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/valid_glob3.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/valid_glob3.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/valid_glob3.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/valid_glob3.conf diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/valid_include.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/valid_include.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/valid_include.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/valid_include.conf diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/valid_include2.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/valid_include2.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/valid_include2.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/valid_include2.conf diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/valid_include3.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/valid_include3.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/valid_include3.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/valid_include3.conf diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/valid_include_toplevel.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/valid_include_toplevel.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/valid_include_toplevel.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/valid_include_toplevel.conf diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/valid_include_toplevel2.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/valid_include_toplevel2.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/valid_include_toplevel2.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/valid_include_toplevel2.conf diff --git a/src/go/plugin/go.d/modules/unbound/config/testdata/valid_include_toplevel3.conf b/src/go/plugin/go.d/collector/unbound/config/testdata/valid_include_toplevel3.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config/testdata/valid_include_toplevel3.conf rename to src/go/plugin/go.d/collector/unbound/config/testdata/valid_include_toplevel3.conf diff --git a/src/go/plugin/go.d/modules/unbound/config_schema.json b/src/go/plugin/go.d/collector/unbound/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/unbound/config_schema.json rename to src/go/plugin/go.d/collector/unbound/config_schema.json diff --git a/src/go/plugin/go.d/modules/unbound/init.go b/src/go/plugin/go.d/collector/unbound/init.go similarity index 97% rename from src/go/plugin/go.d/modules/unbound/init.go rename to src/go/plugin/go.d/collector/unbound/init.go index 6895ce4271499c..b9f45a5354c6f3 100644 --- a/src/go/plugin/go.d/modules/unbound/init.go +++ b/src/go/plugin/go.d/collector/unbound/init.go @@ -7,7 +7,7 @@ import ( "errors" "net" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/unbound/config" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/unbound/config" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg" ) diff --git a/src/go/plugin/go.d/modules/unbound/integrations/unbound.md b/src/go/plugin/go.d/collector/unbound/integrations/unbound.md similarity index 100% rename from src/go/plugin/go.d/modules/unbound/integrations/unbound.md rename to src/go/plugin/go.d/collector/unbound/integrations/unbound.md diff --git a/src/go/plugin/go.d/modules/unbound/metadata.yaml b/src/go/plugin/go.d/collector/unbound/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/unbound/metadata.yaml rename to src/go/plugin/go.d/collector/unbound/metadata.yaml diff --git a/src/go/plugin/go.d/modules/unbound/testdata/config.json b/src/go/plugin/go.d/collector/unbound/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/config.json rename to src/go/plugin/go.d/collector/unbound/testdata/config.json diff --git a/src/go/plugin/go.d/modules/unbound/testdata/config.yaml b/src/go/plugin/go.d/collector/unbound/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/config.yaml rename to src/go/plugin/go.d/collector/unbound/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/unbound/testdata/stats/common.txt b/src/go/plugin/go.d/collector/unbound/testdata/stats/common.txt similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/stats/common.txt rename to src/go/plugin/go.d/collector/unbound/testdata/stats/common.txt diff --git a/src/go/plugin/go.d/modules/unbound/testdata/stats/extended.txt b/src/go/plugin/go.d/collector/unbound/testdata/stats/extended.txt similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/stats/extended.txt rename to src/go/plugin/go.d/collector/unbound/testdata/stats/extended.txt diff --git a/src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/cumulative/extended1.txt b/src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/cumulative/extended1.txt similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/cumulative/extended1.txt rename to src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/cumulative/extended1.txt diff --git a/src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/cumulative/extended2.txt b/src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/cumulative/extended2.txt similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/cumulative/extended2.txt rename to src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/cumulative/extended2.txt diff --git a/src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/cumulative/extended3.txt b/src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/cumulative/extended3.txt similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/cumulative/extended3.txt rename to src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/cumulative/extended3.txt diff --git a/src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/reset/extended1.txt b/src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/reset/extended1.txt similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/reset/extended1.txt rename to src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/reset/extended1.txt diff --git a/src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/reset/extended2.txt b/src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/reset/extended2.txt similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/reset/extended2.txt rename to src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/reset/extended2.txt diff --git a/src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/reset/extended3.txt b/src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/reset/extended3.txt similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/stats/lifecycle/reset/extended3.txt rename to src/go/plugin/go.d/collector/unbound/testdata/stats/lifecycle/reset/extended3.txt diff --git a/src/go/plugin/go.d/modules/unbound/testdata/unbound.conf b/src/go/plugin/go.d/collector/unbound/testdata/unbound.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/unbound.conf rename to src/go/plugin/go.d/collector/unbound/testdata/unbound.conf diff --git a/src/go/plugin/go.d/modules/unbound/testdata/unbound_disabled.conf b/src/go/plugin/go.d/collector/unbound/testdata/unbound_disabled.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/unbound_disabled.conf rename to src/go/plugin/go.d/collector/unbound/testdata/unbound_disabled.conf diff --git a/src/go/plugin/go.d/modules/unbound/testdata/unbound_empty.conf b/src/go/plugin/go.d/collector/unbound/testdata/unbound_empty.conf similarity index 100% rename from src/go/plugin/go.d/modules/unbound/testdata/unbound_empty.conf rename to src/go/plugin/go.d/collector/unbound/testdata/unbound_empty.conf diff --git a/src/go/plugin/go.d/modules/unbound/unbound.go b/src/go/plugin/go.d/collector/unbound/unbound.go similarity index 100% rename from src/go/plugin/go.d/modules/unbound/unbound.go rename to src/go/plugin/go.d/collector/unbound/unbound.go diff --git a/src/go/plugin/go.d/modules/unbound/unbound_test.go b/src/go/plugin/go.d/collector/unbound/unbound_test.go similarity index 100% rename from src/go/plugin/go.d/modules/unbound/unbound_test.go rename to src/go/plugin/go.d/collector/unbound/unbound_test.go diff --git a/src/go/plugin/go.d/modules/upsd/README.md b/src/go/plugin/go.d/collector/upsd/README.md similarity index 100% rename from src/go/plugin/go.d/modules/upsd/README.md rename to src/go/plugin/go.d/collector/upsd/README.md diff --git a/src/go/plugin/go.d/modules/upsd/charts.go b/src/go/plugin/go.d/collector/upsd/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/upsd/charts.go rename to src/go/plugin/go.d/collector/upsd/charts.go diff --git a/src/go/plugin/go.d/modules/upsd/client.go b/src/go/plugin/go.d/collector/upsd/client.go similarity index 100% rename from src/go/plugin/go.d/modules/upsd/client.go rename to src/go/plugin/go.d/collector/upsd/client.go diff --git a/src/go/plugin/go.d/modules/upsd/collect.go b/src/go/plugin/go.d/collector/upsd/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/upsd/collect.go rename to src/go/plugin/go.d/collector/upsd/collect.go diff --git a/src/go/plugin/go.d/modules/upsd/config_schema.json b/src/go/plugin/go.d/collector/upsd/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/upsd/config_schema.json rename to src/go/plugin/go.d/collector/upsd/config_schema.json diff --git a/src/go/plugin/go.d/modules/upsd/integrations/ups_nut.md b/src/go/plugin/go.d/collector/upsd/integrations/ups_nut.md similarity index 100% rename from src/go/plugin/go.d/modules/upsd/integrations/ups_nut.md rename to src/go/plugin/go.d/collector/upsd/integrations/ups_nut.md diff --git a/src/go/plugin/go.d/modules/upsd/metadata.yaml b/src/go/plugin/go.d/collector/upsd/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/upsd/metadata.yaml rename to src/go/plugin/go.d/collector/upsd/metadata.yaml diff --git a/src/go/plugin/go.d/modules/upsd/testdata/config.json b/src/go/plugin/go.d/collector/upsd/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/upsd/testdata/config.json rename to src/go/plugin/go.d/collector/upsd/testdata/config.json diff --git a/src/go/plugin/go.d/modules/upsd/testdata/config.yaml b/src/go/plugin/go.d/collector/upsd/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/upsd/testdata/config.yaml rename to src/go/plugin/go.d/collector/upsd/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/upsd/upsd.go b/src/go/plugin/go.d/collector/upsd/upsd.go similarity index 100% rename from src/go/plugin/go.d/modules/upsd/upsd.go rename to src/go/plugin/go.d/collector/upsd/upsd.go diff --git a/src/go/plugin/go.d/modules/upsd/upsd_test.go b/src/go/plugin/go.d/collector/upsd/upsd_test.go similarity index 100% rename from src/go/plugin/go.d/modules/upsd/upsd_test.go rename to src/go/plugin/go.d/collector/upsd/upsd_test.go diff --git a/src/go/plugin/go.d/modules/upsd/variables.go b/src/go/plugin/go.d/collector/upsd/variables.go similarity index 100% rename from src/go/plugin/go.d/modules/upsd/variables.go rename to src/go/plugin/go.d/collector/upsd/variables.go diff --git a/src/go/plugin/go.d/modules/uwsgi/README.md b/src/go/plugin/go.d/collector/uwsgi/README.md similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/README.md rename to src/go/plugin/go.d/collector/uwsgi/README.md diff --git a/src/go/plugin/go.d/modules/uwsgi/charts.go b/src/go/plugin/go.d/collector/uwsgi/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/charts.go rename to src/go/plugin/go.d/collector/uwsgi/charts.go diff --git a/src/go/plugin/go.d/modules/uwsgi/client.go b/src/go/plugin/go.d/collector/uwsgi/client.go similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/client.go rename to src/go/plugin/go.d/collector/uwsgi/client.go diff --git a/src/go/plugin/go.d/modules/uwsgi/collect.go b/src/go/plugin/go.d/collector/uwsgi/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/collect.go rename to src/go/plugin/go.d/collector/uwsgi/collect.go diff --git a/src/go/plugin/go.d/modules/uwsgi/config_schema.json b/src/go/plugin/go.d/collector/uwsgi/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/config_schema.json rename to src/go/plugin/go.d/collector/uwsgi/config_schema.json diff --git a/src/go/plugin/go.d/modules/uwsgi/init.go b/src/go/plugin/go.d/collector/uwsgi/init.go similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/init.go rename to src/go/plugin/go.d/collector/uwsgi/init.go diff --git a/src/go/plugin/go.d/modules/uwsgi/integrations/uwsgi.md b/src/go/plugin/go.d/collector/uwsgi/integrations/uwsgi.md similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/integrations/uwsgi.md rename to src/go/plugin/go.d/collector/uwsgi/integrations/uwsgi.md diff --git a/src/go/plugin/go.d/modules/uwsgi/metadata.yaml b/src/go/plugin/go.d/collector/uwsgi/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/metadata.yaml rename to src/go/plugin/go.d/collector/uwsgi/metadata.yaml diff --git a/src/go/plugin/go.d/modules/uwsgi/testdata/config.json b/src/go/plugin/go.d/collector/uwsgi/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/testdata/config.json rename to src/go/plugin/go.d/collector/uwsgi/testdata/config.json diff --git a/src/go/plugin/go.d/modules/uwsgi/testdata/config.yaml b/src/go/plugin/go.d/collector/uwsgi/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/testdata/config.yaml rename to src/go/plugin/go.d/collector/uwsgi/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/uwsgi/testdata/stats.json b/src/go/plugin/go.d/collector/uwsgi/testdata/stats.json similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/testdata/stats.json rename to src/go/plugin/go.d/collector/uwsgi/testdata/stats.json diff --git a/src/go/plugin/go.d/modules/uwsgi/testdata/stats_no_workers.json b/src/go/plugin/go.d/collector/uwsgi/testdata/stats_no_workers.json similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/testdata/stats_no_workers.json rename to src/go/plugin/go.d/collector/uwsgi/testdata/stats_no_workers.json diff --git a/src/go/plugin/go.d/modules/uwsgi/uwsgi.go b/src/go/plugin/go.d/collector/uwsgi/uwsgi.go similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/uwsgi.go rename to src/go/plugin/go.d/collector/uwsgi/uwsgi.go diff --git a/src/go/plugin/go.d/modules/uwsgi/uwsgi_test.go b/src/go/plugin/go.d/collector/uwsgi/uwsgi_test.go similarity index 100% rename from src/go/plugin/go.d/modules/uwsgi/uwsgi_test.go rename to src/go/plugin/go.d/collector/uwsgi/uwsgi_test.go diff --git a/src/go/plugin/go.d/modules/varnish/README.md b/src/go/plugin/go.d/collector/varnish/README.md similarity index 100% rename from src/go/plugin/go.d/modules/varnish/README.md rename to src/go/plugin/go.d/collector/varnish/README.md diff --git a/src/go/plugin/go.d/modules/varnish/charts.go b/src/go/plugin/go.d/collector/varnish/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/varnish/charts.go rename to src/go/plugin/go.d/collector/varnish/charts.go diff --git a/src/go/plugin/go.d/modules/varnish/collect.go b/src/go/plugin/go.d/collector/varnish/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/varnish/collect.go rename to src/go/plugin/go.d/collector/varnish/collect.go diff --git a/src/go/plugin/go.d/modules/varnish/config_schema.json b/src/go/plugin/go.d/collector/varnish/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/varnish/config_schema.json rename to src/go/plugin/go.d/collector/varnish/config_schema.json diff --git a/src/go/plugin/go.d/modules/varnish/exec.go b/src/go/plugin/go.d/collector/varnish/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/varnish/exec.go rename to src/go/plugin/go.d/collector/varnish/exec.go diff --git a/src/go/plugin/go.d/modules/varnish/init.go b/src/go/plugin/go.d/collector/varnish/init.go similarity index 100% rename from src/go/plugin/go.d/modules/varnish/init.go rename to src/go/plugin/go.d/collector/varnish/init.go diff --git a/src/go/plugin/go.d/modules/varnish/integrations/varnish.md b/src/go/plugin/go.d/collector/varnish/integrations/varnish.md similarity index 100% rename from src/go/plugin/go.d/modules/varnish/integrations/varnish.md rename to src/go/plugin/go.d/collector/varnish/integrations/varnish.md diff --git a/src/go/plugin/go.d/modules/varnish/metadata.yaml b/src/go/plugin/go.d/collector/varnish/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/varnish/metadata.yaml rename to src/go/plugin/go.d/collector/varnish/metadata.yaml diff --git a/src/go/plugin/go.d/modules/varnish/testdata/config.json b/src/go/plugin/go.d/collector/varnish/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/varnish/testdata/config.json rename to src/go/plugin/go.d/collector/varnish/testdata/config.json diff --git a/src/go/plugin/go.d/modules/varnish/testdata/config.yaml b/src/go/plugin/go.d/collector/varnish/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/varnish/testdata/config.yaml rename to src/go/plugin/go.d/collector/varnish/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/varnish/testdata/v7.1/varnishstat.txt b/src/go/plugin/go.d/collector/varnish/testdata/v7.1/varnishstat.txt similarity index 100% rename from src/go/plugin/go.d/modules/varnish/testdata/v7.1/varnishstat.txt rename to src/go/plugin/go.d/collector/varnish/testdata/v7.1/varnishstat.txt diff --git a/src/go/plugin/go.d/modules/varnish/varnish.go b/src/go/plugin/go.d/collector/varnish/varnish.go similarity index 100% rename from src/go/plugin/go.d/modules/varnish/varnish.go rename to src/go/plugin/go.d/collector/varnish/varnish.go diff --git a/src/go/plugin/go.d/modules/varnish/varnish_test.go b/src/go/plugin/go.d/collector/varnish/varnish_test.go similarity index 100% rename from src/go/plugin/go.d/modules/varnish/varnish_test.go rename to src/go/plugin/go.d/collector/varnish/varnish_test.go diff --git a/src/go/plugin/go.d/modules/vcsa/README.md b/src/go/plugin/go.d/collector/vcsa/README.md similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/README.md rename to src/go/plugin/go.d/collector/vcsa/README.md diff --git a/src/go/plugin/go.d/modules/vcsa/charts.go b/src/go/plugin/go.d/collector/vcsa/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/charts.go rename to src/go/plugin/go.d/collector/vcsa/charts.go diff --git a/src/go/plugin/go.d/modules/vcsa/client/client.go b/src/go/plugin/go.d/collector/vcsa/client/client.go similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/client/client.go rename to src/go/plugin/go.d/collector/vcsa/client/client.go diff --git a/src/go/plugin/go.d/modules/vcsa/client/client_test.go b/src/go/plugin/go.d/collector/vcsa/client/client_test.go similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/client/client_test.go rename to src/go/plugin/go.d/collector/vcsa/client/client_test.go diff --git a/src/go/plugin/go.d/modules/vcsa/collect.go b/src/go/plugin/go.d/collector/vcsa/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/collect.go rename to src/go/plugin/go.d/collector/vcsa/collect.go diff --git a/src/go/plugin/go.d/modules/vcsa/config_schema.json b/src/go/plugin/go.d/collector/vcsa/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/config_schema.json rename to src/go/plugin/go.d/collector/vcsa/config_schema.json diff --git a/src/go/plugin/go.d/modules/vcsa/init.go b/src/go/plugin/go.d/collector/vcsa/init.go similarity index 88% rename from src/go/plugin/go.d/modules/vcsa/init.go rename to src/go/plugin/go.d/collector/vcsa/init.go index 6af0178a156edd..f09220201a3397 100644 --- a/src/go/plugin/go.d/modules/vcsa/init.go +++ b/src/go/plugin/go.d/collector/vcsa/init.go @@ -5,7 +5,7 @@ package vcsa import ( "errors" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vcsa/client" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vcsa/client" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web" ) diff --git a/src/go/plugin/go.d/modules/vcsa/integrations/vcenter_server_appliance.md b/src/go/plugin/go.d/collector/vcsa/integrations/vcenter_server_appliance.md similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/integrations/vcenter_server_appliance.md rename to src/go/plugin/go.d/collector/vcsa/integrations/vcenter_server_appliance.md diff --git a/src/go/plugin/go.d/modules/vcsa/metadata.yaml b/src/go/plugin/go.d/collector/vcsa/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/metadata.yaml rename to src/go/plugin/go.d/collector/vcsa/metadata.yaml diff --git a/src/go/plugin/go.d/modules/vcsa/testdata/config.json b/src/go/plugin/go.d/collector/vcsa/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/testdata/config.json rename to src/go/plugin/go.d/collector/vcsa/testdata/config.json diff --git a/src/go/plugin/go.d/modules/vcsa/testdata/config.yaml b/src/go/plugin/go.d/collector/vcsa/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/testdata/config.yaml rename to src/go/plugin/go.d/collector/vcsa/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/vcsa/vcsa.go b/src/go/plugin/go.d/collector/vcsa/vcsa.go similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/vcsa.go rename to src/go/plugin/go.d/collector/vcsa/vcsa.go diff --git a/src/go/plugin/go.d/modules/vcsa/vcsa_test.go b/src/go/plugin/go.d/collector/vcsa/vcsa_test.go similarity index 100% rename from src/go/plugin/go.d/modules/vcsa/vcsa_test.go rename to src/go/plugin/go.d/collector/vcsa/vcsa_test.go diff --git a/src/go/plugin/go.d/modules/vernemq/README.md b/src/go/plugin/go.d/collector/vernemq/README.md similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/README.md rename to src/go/plugin/go.d/collector/vernemq/README.md diff --git a/src/go/plugin/go.d/modules/vernemq/charts.go b/src/go/plugin/go.d/collector/vernemq/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/charts.go rename to src/go/plugin/go.d/collector/vernemq/charts.go diff --git a/src/go/plugin/go.d/modules/vernemq/collect.go b/src/go/plugin/go.d/collector/vernemq/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/collect.go rename to src/go/plugin/go.d/collector/vernemq/collect.go diff --git a/src/go/plugin/go.d/modules/vernemq/config_schema.json b/src/go/plugin/go.d/collector/vernemq/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/config_schema.json rename to src/go/plugin/go.d/collector/vernemq/config_schema.json diff --git a/src/go/plugin/go.d/modules/vernemq/init.go b/src/go/plugin/go.d/collector/vernemq/init.go similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/init.go rename to src/go/plugin/go.d/collector/vernemq/init.go diff --git a/src/go/plugin/go.d/modules/vernemq/integrations/vernemq.md b/src/go/plugin/go.d/collector/vernemq/integrations/vernemq.md similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/integrations/vernemq.md rename to src/go/plugin/go.d/collector/vernemq/integrations/vernemq.md diff --git a/src/go/plugin/go.d/modules/vernemq/metadata.yaml b/src/go/plugin/go.d/collector/vernemq/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/metadata.yaml rename to src/go/plugin/go.d/collector/vernemq/metadata.yaml diff --git a/src/go/plugin/go.d/modules/vernemq/metrics.go b/src/go/plugin/go.d/collector/vernemq/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/metrics.go rename to src/go/plugin/go.d/collector/vernemq/metrics.go diff --git a/src/go/plugin/go.d/modules/vernemq/testdata/config.json b/src/go/plugin/go.d/collector/vernemq/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/testdata/config.json rename to src/go/plugin/go.d/collector/vernemq/testdata/config.json diff --git a/src/go/plugin/go.d/modules/vernemq/testdata/config.yaml b/src/go/plugin/go.d/collector/vernemq/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/testdata/config.yaml rename to src/go/plugin/go.d/collector/vernemq/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/vernemq/testdata/v1.10.1/metrics.txt b/src/go/plugin/go.d/collector/vernemq/testdata/v1.10.1/metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/testdata/v1.10.1/metrics.txt rename to src/go/plugin/go.d/collector/vernemq/testdata/v1.10.1/metrics.txt diff --git a/src/go/plugin/go.d/modules/vernemq/testdata/v2.0.1/metrics.txt b/src/go/plugin/go.d/collector/vernemq/testdata/v2.0.1/metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/testdata/v2.0.1/metrics.txt rename to src/go/plugin/go.d/collector/vernemq/testdata/v2.0.1/metrics.txt diff --git a/src/go/plugin/go.d/modules/vernemq/vernemq.go b/src/go/plugin/go.d/collector/vernemq/vernemq.go similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/vernemq.go rename to src/go/plugin/go.d/collector/vernemq/vernemq.go diff --git a/src/go/plugin/go.d/modules/vernemq/vernemq_test.go b/src/go/plugin/go.d/collector/vernemq/vernemq_test.go similarity index 100% rename from src/go/plugin/go.d/modules/vernemq/vernemq_test.go rename to src/go/plugin/go.d/collector/vernemq/vernemq_test.go diff --git a/src/go/plugin/go.d/modules/vsphere/README.md b/src/go/plugin/go.d/collector/vsphere/README.md similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/README.md rename to src/go/plugin/go.d/collector/vsphere/README.md diff --git a/src/go/plugin/go.d/modules/vsphere/charts.go b/src/go/plugin/go.d/collector/vsphere/charts.go similarity index 99% rename from src/go/plugin/go.d/modules/vsphere/charts.go rename to src/go/plugin/go.d/collector/vsphere/charts.go index 3cc21bef4ae3f2..e6e27da71a973c 100644 --- a/src/go/plugin/go.d/modules/vsphere/charts.go +++ b/src/go/plugin/go.d/collector/vsphere/charts.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" ) const ( diff --git a/src/go/plugin/go.d/modules/vsphere/client/client.go b/src/go/plugin/go.d/collector/vsphere/client/client.go similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/client/client.go rename to src/go/plugin/go.d/collector/vsphere/client/client.go diff --git a/src/go/plugin/go.d/modules/vsphere/client/client_test.go b/src/go/plugin/go.d/collector/vsphere/client/client_test.go similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/client/client_test.go rename to src/go/plugin/go.d/collector/vsphere/client/client_test.go diff --git a/src/go/plugin/go.d/modules/vsphere/client/keepalive.go b/src/go/plugin/go.d/collector/vsphere/client/keepalive.go similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/client/keepalive.go rename to src/go/plugin/go.d/collector/vsphere/client/keepalive.go diff --git a/src/go/plugin/go.d/modules/vsphere/collect.go b/src/go/plugin/go.d/collector/vsphere/collect.go similarity index 97% rename from src/go/plugin/go.d/modules/vsphere/collect.go rename to src/go/plugin/go.d/collector/vsphere/collect.go index 57805a67b03b38..480e50d3fb37be 100644 --- a/src/go/plugin/go.d/modules/vsphere/collect.go +++ b/src/go/plugin/go.d/collector/vsphere/collect.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrix" "github.com/vmware/govmomi/performance" diff --git a/src/go/plugin/go.d/modules/vsphere/config_schema.json b/src/go/plugin/go.d/collector/vsphere/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/config_schema.json rename to src/go/plugin/go.d/collector/vsphere/config_schema.json diff --git a/src/go/plugin/go.d/modules/vsphere/discover.go b/src/go/plugin/go.d/collector/vsphere/discover.go similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/discover.go rename to src/go/plugin/go.d/collector/vsphere/discover.go diff --git a/src/go/plugin/go.d/modules/vsphere/discover/build.go b/src/go/plugin/go.d/collector/vsphere/discover/build.go similarity index 98% rename from src/go/plugin/go.d/modules/vsphere/discover/build.go rename to src/go/plugin/go.d/collector/vsphere/discover/build.go index dbd0baab2db3e1..6ac12027d2f3e0 100644 --- a/src/go/plugin/go.d/modules/vsphere/discover/build.go +++ b/src/go/plugin/go.d/collector/vsphere/discover/build.go @@ -5,7 +5,7 @@ package discover import ( "time" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" "github.com/vmware/govmomi/vim25/mo" ) diff --git a/src/go/plugin/go.d/modules/vsphere/discover/discover.go b/src/go/plugin/go.d/collector/vsphere/discover/discover.go similarity index 95% rename from src/go/plugin/go.d/modules/vsphere/discover/discover.go rename to src/go/plugin/go.d/collector/vsphere/discover/discover.go index fc7903573854d9..ca6908952c0212 100644 --- a/src/go/plugin/go.d/modules/vsphere/discover/discover.go +++ b/src/go/plugin/go.d/collector/vsphere/discover/discover.go @@ -8,8 +8,8 @@ import ( "time" "github.com/netdata/netdata/go/plugins/logger" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/match" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/match" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" "github.com/vmware/govmomi/vim25/mo" "github.com/vmware/govmomi/vim25/types" diff --git a/src/go/plugin/go.d/modules/vsphere/discover/discover_test.go b/src/go/plugin/go.d/collector/vsphere/discover/discover_test.go similarity index 96% rename from src/go/plugin/go.d/modules/vsphere/discover/discover_test.go rename to src/go/plugin/go.d/collector/vsphere/discover/discover_test.go index 9d0df6077967d7..6b95b5831c5227 100644 --- a/src/go/plugin/go.d/modules/vsphere/discover/discover_test.go +++ b/src/go/plugin/go.d/collector/vsphere/discover/discover_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/client" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/client" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg" "github.com/stretchr/testify/assert" diff --git a/src/go/plugin/go.d/modules/vsphere/discover/filter.go b/src/go/plugin/go.d/collector/vsphere/discover/filter.go similarity index 93% rename from src/go/plugin/go.d/modules/vsphere/discover/filter.go rename to src/go/plugin/go.d/collector/vsphere/discover/filter.go index f9fb5ba958e899..2245637c83d1e8 100644 --- a/src/go/plugin/go.d/modules/vsphere/discover/filter.go +++ b/src/go/plugin/go.d/collector/vsphere/discover/filter.go @@ -5,7 +5,7 @@ package discover import ( "time" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" ) func (d Discoverer) matchHost(host *rs.Host) bool { diff --git a/src/go/plugin/go.d/modules/vsphere/discover/hierarchy.go b/src/go/plugin/go.d/collector/vsphere/discover/hierarchy.go similarity index 96% rename from src/go/plugin/go.d/modules/vsphere/discover/hierarchy.go rename to src/go/plugin/go.d/collector/vsphere/discover/hierarchy.go index 0f84da2dfa5afd..7c662097a9fc43 100644 --- a/src/go/plugin/go.d/modules/vsphere/discover/hierarchy.go +++ b/src/go/plugin/go.d/collector/vsphere/discover/hierarchy.go @@ -5,7 +5,7 @@ package discover import ( "time" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" ) func (d Discoverer) setHierarchy(res *rs.Resources) error { diff --git a/src/go/plugin/go.d/modules/vsphere/discover/metric_lists.go b/src/go/plugin/go.d/collector/vsphere/discover/metric_lists.go similarity index 97% rename from src/go/plugin/go.d/modules/vsphere/discover/metric_lists.go rename to src/go/plugin/go.d/collector/vsphere/discover/metric_lists.go index 03ae6d53aa2002..a25e017c271a1c 100644 --- a/src/go/plugin/go.d/modules/vsphere/discover/metric_lists.go +++ b/src/go/plugin/go.d/collector/vsphere/discover/metric_lists.go @@ -6,7 +6,7 @@ import ( "sort" "time" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" "github.com/vmware/govmomi/performance" "github.com/vmware/govmomi/vim25/types" diff --git a/src/go/plugin/go.d/modules/vsphere/init.go b/src/go/plugin/go.d/collector/vsphere/init.go similarity index 83% rename from src/go/plugin/go.d/modules/vsphere/init.go rename to src/go/plugin/go.d/collector/vsphere/init.go index 0869806eac7e7a..0a6d0ea5d7bc28 100644 --- a/src/go/plugin/go.d/modules/vsphere/init.go +++ b/src/go/plugin/go.d/collector/vsphere/init.go @@ -5,9 +5,9 @@ package vsphere import ( "errors" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/client" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/discover" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/scrape" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/client" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/discover" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/scrape" ) func (vs *VSphere) validateConfig() error { diff --git a/src/go/plugin/go.d/modules/vsphere/integrations/vmware_vcenter_server.md b/src/go/plugin/go.d/collector/vsphere/integrations/vmware_vcenter_server.md similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/integrations/vmware_vcenter_server.md rename to src/go/plugin/go.d/collector/vsphere/integrations/vmware_vcenter_server.md diff --git a/src/go/plugin/go.d/modules/vsphere/match/match.go b/src/go/plugin/go.d/collector/vsphere/match/match.go similarity index 98% rename from src/go/plugin/go.d/modules/vsphere/match/match.go rename to src/go/plugin/go.d/collector/vsphere/match/match.go index 8e63a7104ae834..f74adffac07edb 100644 --- a/src/go/plugin/go.d/modules/vsphere/match/match.go +++ b/src/go/plugin/go.d/collector/vsphere/match/match.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/netdata/netdata/go/plugins/pkg/matcher" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" ) type HostMatcher interface { diff --git a/src/go/plugin/go.d/modules/vsphere/match/match_test.go b/src/go/plugin/go.d/collector/vsphere/match/match_test.go similarity index 98% rename from src/go/plugin/go.d/modules/vsphere/match/match_test.go rename to src/go/plugin/go.d/collector/vsphere/match/match_test.go index a85f9f8f3dd0cd..4de730f604ff42 100644 --- a/src/go/plugin/go.d/modules/vsphere/match/match_test.go +++ b/src/go/plugin/go.d/collector/vsphere/match/match_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/netdata/netdata/go/plugins/pkg/matcher" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" "github.com/stretchr/testify/assert" ) diff --git a/src/go/plugin/go.d/modules/vsphere/metadata.yaml b/src/go/plugin/go.d/collector/vsphere/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/metadata.yaml rename to src/go/plugin/go.d/collector/vsphere/metadata.yaml diff --git a/src/go/plugin/go.d/modules/vsphere/metrics.txt b/src/go/plugin/go.d/collector/vsphere/metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/metrics.txt rename to src/go/plugin/go.d/collector/vsphere/metrics.txt diff --git a/src/go/plugin/go.d/modules/vsphere/resources/resources.go b/src/go/plugin/go.d/collector/vsphere/resources/resources.go similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/resources/resources.go rename to src/go/plugin/go.d/collector/vsphere/resources/resources.go diff --git a/src/go/plugin/go.d/modules/vsphere/scrape/scrape.go b/src/go/plugin/go.d/collector/vsphere/scrape/scrape.go similarity index 97% rename from src/go/plugin/go.d/modules/vsphere/scrape/scrape.go rename to src/go/plugin/go.d/collector/vsphere/scrape/scrape.go index 354585361ccd13..12c129422e2b44 100644 --- a/src/go/plugin/go.d/modules/vsphere/scrape/scrape.go +++ b/src/go/plugin/go.d/collector/vsphere/scrape/scrape.go @@ -10,7 +10,7 @@ import ( "time" "github.com/netdata/netdata/go/plugins/logger" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" "github.com/vmware/govmomi/performance" "github.com/vmware/govmomi/vim25/types" diff --git a/src/go/plugin/go.d/modules/vsphere/scrape/scrape_test.go b/src/go/plugin/go.d/collector/vsphere/scrape/scrape_test.go similarity index 86% rename from src/go/plugin/go.d/modules/vsphere/scrape/scrape_test.go rename to src/go/plugin/go.d/collector/vsphere/scrape/scrape_test.go index d6232ff660704f..c3ee523778d62b 100644 --- a/src/go/plugin/go.d/modules/vsphere/scrape/scrape_test.go +++ b/src/go/plugin/go.d/collector/vsphere/scrape/scrape_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/client" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/discover" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/client" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/discover" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg" "github.com/stretchr/testify/assert" diff --git a/src/go/plugin/go.d/modules/vsphere/scrape/throttled_caller.go b/src/go/plugin/go.d/collector/vsphere/scrape/throttled_caller.go similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/scrape/throttled_caller.go rename to src/go/plugin/go.d/collector/vsphere/scrape/throttled_caller.go diff --git a/src/go/plugin/go.d/modules/vsphere/scrape/throttled_caller_test.go b/src/go/plugin/go.d/collector/vsphere/scrape/throttled_caller_test.go similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/scrape/throttled_caller_test.go rename to src/go/plugin/go.d/collector/vsphere/scrape/throttled_caller_test.go diff --git a/src/go/plugin/go.d/modules/vsphere/task.go b/src/go/plugin/go.d/collector/vsphere/task.go similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/task.go rename to src/go/plugin/go.d/collector/vsphere/task.go diff --git a/src/go/plugin/go.d/modules/vsphere/task_test.go b/src/go/plugin/go.d/collector/vsphere/task_test.go similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/task_test.go rename to src/go/plugin/go.d/collector/vsphere/task_test.go diff --git a/src/go/plugin/go.d/modules/vsphere/testdata/config.json b/src/go/plugin/go.d/collector/vsphere/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/testdata/config.json rename to src/go/plugin/go.d/collector/vsphere/testdata/config.json diff --git a/src/go/plugin/go.d/modules/vsphere/testdata/config.yaml b/src/go/plugin/go.d/collector/vsphere/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/vsphere/testdata/config.yaml rename to src/go/plugin/go.d/collector/vsphere/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/vsphere/vsphere.go b/src/go/plugin/go.d/collector/vsphere/vsphere.go similarity index 95% rename from src/go/plugin/go.d/modules/vsphere/vsphere.go rename to src/go/plugin/go.d/collector/vsphere/vsphere.go index 0797886e5dbbce..7247b866bfc0f8 100644 --- a/src/go/plugin/go.d/modules/vsphere/vsphere.go +++ b/src/go/plugin/go.d/collector/vsphere/vsphere.go @@ -9,8 +9,8 @@ import ( "time" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/match" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/match" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web" diff --git a/src/go/plugin/go.d/modules/vsphere/vsphere_test.go b/src/go/plugin/go.d/collector/vsphere/vsphere_test.go similarity index 98% rename from src/go/plugin/go.d/modules/vsphere/vsphere_test.go rename to src/go/plugin/go.d/collector/vsphere/vsphere_test.go index b0c22a1f7c357d..c39338411790ec 100644 --- a/src/go/plugin/go.d/modules/vsphere/vsphere_test.go +++ b/src/go/plugin/go.d/collector/vsphere/vsphere_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/discover" - "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/match" - rs "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere/resources" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/discover" + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/match" + rs "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/vsphere/resources" "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/confopt" "github.com/stretchr/testify/assert" diff --git a/src/go/plugin/go.d/modules/w1sensor/README.md b/src/go/plugin/go.d/collector/w1sensor/README.md similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/README.md rename to src/go/plugin/go.d/collector/w1sensor/README.md diff --git a/src/go/plugin/go.d/modules/w1sensor/charts.go b/src/go/plugin/go.d/collector/w1sensor/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/charts.go rename to src/go/plugin/go.d/collector/w1sensor/charts.go diff --git a/src/go/plugin/go.d/modules/w1sensor/collect.go b/src/go/plugin/go.d/collector/w1sensor/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/collect.go rename to src/go/plugin/go.d/collector/w1sensor/collect.go diff --git a/src/go/plugin/go.d/modules/w1sensor/config_schema.json b/src/go/plugin/go.d/collector/w1sensor/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/config_schema.json rename to src/go/plugin/go.d/collector/w1sensor/config_schema.json diff --git a/src/go/plugin/go.d/modules/w1sensor/doc.go b/src/go/plugin/go.d/collector/w1sensor/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/doc.go rename to src/go/plugin/go.d/collector/w1sensor/doc.go diff --git a/src/go/plugin/go.d/modules/w1sensor/integrations/1-wire_sensors.md b/src/go/plugin/go.d/collector/w1sensor/integrations/1-wire_sensors.md similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/integrations/1-wire_sensors.md rename to src/go/plugin/go.d/collector/w1sensor/integrations/1-wire_sensors.md diff --git a/src/go/plugin/go.d/modules/w1sensor/metadata.yaml b/src/go/plugin/go.d/collector/w1sensor/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/metadata.yaml rename to src/go/plugin/go.d/collector/w1sensor/metadata.yaml diff --git a/src/go/plugin/go.d/modules/w1sensor/testdata/config.json b/src/go/plugin/go.d/collector/w1sensor/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/testdata/config.json rename to src/go/plugin/go.d/collector/w1sensor/testdata/config.json diff --git a/src/go/plugin/go.d/modules/w1sensor/testdata/config.yaml b/src/go/plugin/go.d/collector/w1sensor/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/testdata/config.yaml rename to src/go/plugin/go.d/collector/w1sensor/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/w1sensor/testdata/devices/28-01204e9d2fa0/w1_slave b/src/go/plugin/go.d/collector/w1sensor/testdata/devices/28-01204e9d2fa0/w1_slave similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/testdata/devices/28-01204e9d2fa0/w1_slave rename to src/go/plugin/go.d/collector/w1sensor/testdata/devices/28-01204e9d2fa0/w1_slave diff --git a/src/go/plugin/go.d/modules/w1sensor/testdata/devices/28-01204e9d2fa1/w1_slave b/src/go/plugin/go.d/collector/w1sensor/testdata/devices/28-01204e9d2fa1/w1_slave similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/testdata/devices/28-01204e9d2fa1/w1_slave rename to src/go/plugin/go.d/collector/w1sensor/testdata/devices/28-01204e9d2fa1/w1_slave diff --git a/src/go/plugin/go.d/modules/w1sensor/testdata/devices/28-01204e9d2fa2/w1_slave b/src/go/plugin/go.d/collector/w1sensor/testdata/devices/28-01204e9d2fa2/w1_slave similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/testdata/devices/28-01204e9d2fa2/w1_slave rename to src/go/plugin/go.d/collector/w1sensor/testdata/devices/28-01204e9d2fa2/w1_slave diff --git a/src/go/plugin/go.d/modules/w1sensor/testdata/devices/28-01204e9d2fa3/w1_slave b/src/go/plugin/go.d/collector/w1sensor/testdata/devices/28-01204e9d2fa3/w1_slave similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/testdata/devices/28-01204e9d2fa3/w1_slave rename to src/go/plugin/go.d/collector/w1sensor/testdata/devices/28-01204e9d2fa3/w1_slave diff --git a/src/go/plugin/go.d/modules/w1sensor/w1sensor.go b/src/go/plugin/go.d/collector/w1sensor/w1sensor.go similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/w1sensor.go rename to src/go/plugin/go.d/collector/w1sensor/w1sensor.go diff --git a/src/go/plugin/go.d/modules/w1sensor/w1sensor_test.go b/src/go/plugin/go.d/collector/w1sensor/w1sensor_test.go similarity index 100% rename from src/go/plugin/go.d/modules/w1sensor/w1sensor_test.go rename to src/go/plugin/go.d/collector/w1sensor/w1sensor_test.go diff --git a/src/go/plugin/go.d/modules/weblog/README.md b/src/go/plugin/go.d/collector/weblog/README.md similarity index 100% rename from src/go/plugin/go.d/modules/weblog/README.md rename to src/go/plugin/go.d/collector/weblog/README.md diff --git a/src/go/plugin/go.d/modules/weblog/charts.go b/src/go/plugin/go.d/collector/weblog/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/weblog/charts.go rename to src/go/plugin/go.d/collector/weblog/charts.go diff --git a/src/go/plugin/go.d/modules/weblog/collect.go b/src/go/plugin/go.d/collector/weblog/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/weblog/collect.go rename to src/go/plugin/go.d/collector/weblog/collect.go diff --git a/src/go/plugin/go.d/modules/weblog/config_schema.json b/src/go/plugin/go.d/collector/weblog/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/weblog/config_schema.json rename to src/go/plugin/go.d/collector/weblog/config_schema.json diff --git a/src/go/plugin/go.d/modules/weblog/init.go b/src/go/plugin/go.d/collector/weblog/init.go similarity index 100% rename from src/go/plugin/go.d/modules/weblog/init.go rename to src/go/plugin/go.d/collector/weblog/init.go diff --git a/src/go/plugin/go.d/modules/weblog/integrations/web_server_log_files.md b/src/go/plugin/go.d/collector/weblog/integrations/web_server_log_files.md similarity index 100% rename from src/go/plugin/go.d/modules/weblog/integrations/web_server_log_files.md rename to src/go/plugin/go.d/collector/weblog/integrations/web_server_log_files.md diff --git a/src/go/plugin/go.d/modules/weblog/logline.go b/src/go/plugin/go.d/collector/weblog/logline.go similarity index 100% rename from src/go/plugin/go.d/modules/weblog/logline.go rename to src/go/plugin/go.d/collector/weblog/logline.go diff --git a/src/go/plugin/go.d/modules/weblog/logline_test.go b/src/go/plugin/go.d/collector/weblog/logline_test.go similarity index 100% rename from src/go/plugin/go.d/modules/weblog/logline_test.go rename to src/go/plugin/go.d/collector/weblog/logline_test.go diff --git a/src/go/plugin/go.d/modules/weblog/metadata.yaml b/src/go/plugin/go.d/collector/weblog/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/weblog/metadata.yaml rename to src/go/plugin/go.d/collector/weblog/metadata.yaml diff --git a/src/go/plugin/go.d/modules/weblog/metrics.go b/src/go/plugin/go.d/collector/weblog/metrics.go similarity index 100% rename from src/go/plugin/go.d/modules/weblog/metrics.go rename to src/go/plugin/go.d/collector/weblog/metrics.go diff --git a/src/go/plugin/go.d/modules/weblog/parser.go b/src/go/plugin/go.d/collector/weblog/parser.go similarity index 100% rename from src/go/plugin/go.d/modules/weblog/parser.go rename to src/go/plugin/go.d/collector/weblog/parser.go diff --git a/src/go/plugin/go.d/modules/weblog/parser_test.go b/src/go/plugin/go.d/collector/weblog/parser_test.go similarity index 100% rename from src/go/plugin/go.d/modules/weblog/parser_test.go rename to src/go/plugin/go.d/collector/weblog/parser_test.go diff --git a/src/go/plugin/go.d/modules/weblog/testdata/common.log b/src/go/plugin/go.d/collector/weblog/testdata/common.log similarity index 100% rename from src/go/plugin/go.d/modules/weblog/testdata/common.log rename to src/go/plugin/go.d/collector/weblog/testdata/common.log diff --git a/src/go/plugin/go.d/modules/weblog/testdata/config.json b/src/go/plugin/go.d/collector/weblog/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/weblog/testdata/config.json rename to src/go/plugin/go.d/collector/weblog/testdata/config.json diff --git a/src/go/plugin/go.d/modules/weblog/testdata/config.yaml b/src/go/plugin/go.d/collector/weblog/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/weblog/testdata/config.yaml rename to src/go/plugin/go.d/collector/weblog/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/weblog/testdata/custom.log b/src/go/plugin/go.d/collector/weblog/testdata/custom.log similarity index 100% rename from src/go/plugin/go.d/modules/weblog/testdata/custom.log rename to src/go/plugin/go.d/collector/weblog/testdata/custom.log diff --git a/src/go/plugin/go.d/modules/weblog/testdata/custom_time_fields.log b/src/go/plugin/go.d/collector/weblog/testdata/custom_time_fields.log similarity index 100% rename from src/go/plugin/go.d/modules/weblog/testdata/custom_time_fields.log rename to src/go/plugin/go.d/collector/weblog/testdata/custom_time_fields.log diff --git a/src/go/plugin/go.d/modules/weblog/testdata/full.log b/src/go/plugin/go.d/collector/weblog/testdata/full.log similarity index 100% rename from src/go/plugin/go.d/modules/weblog/testdata/full.log rename to src/go/plugin/go.d/collector/weblog/testdata/full.log diff --git a/src/go/plugin/go.d/modules/weblog/testdata/u_ex221107.log b/src/go/plugin/go.d/collector/weblog/testdata/u_ex221107.log similarity index 100% rename from src/go/plugin/go.d/modules/weblog/testdata/u_ex221107.log rename to src/go/plugin/go.d/collector/weblog/testdata/u_ex221107.log diff --git a/src/go/plugin/go.d/modules/weblog/weblog.go b/src/go/plugin/go.d/collector/weblog/weblog.go similarity index 100% rename from src/go/plugin/go.d/modules/weblog/weblog.go rename to src/go/plugin/go.d/collector/weblog/weblog.go diff --git a/src/go/plugin/go.d/modules/weblog/weblog_test.go b/src/go/plugin/go.d/collector/weblog/weblog_test.go similarity index 100% rename from src/go/plugin/go.d/modules/weblog/weblog_test.go rename to src/go/plugin/go.d/collector/weblog/weblog_test.go diff --git a/src/go/plugin/go.d/modules/whoisquery/README.md b/src/go/plugin/go.d/collector/whoisquery/README.md similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/README.md rename to src/go/plugin/go.d/collector/whoisquery/README.md diff --git a/src/go/plugin/go.d/modules/whoisquery/charts.go b/src/go/plugin/go.d/collector/whoisquery/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/charts.go rename to src/go/plugin/go.d/collector/whoisquery/charts.go diff --git a/src/go/plugin/go.d/modules/whoisquery/collect.go b/src/go/plugin/go.d/collector/whoisquery/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/collect.go rename to src/go/plugin/go.d/collector/whoisquery/collect.go diff --git a/src/go/plugin/go.d/modules/whoisquery/config_schema.json b/src/go/plugin/go.d/collector/whoisquery/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/config_schema.json rename to src/go/plugin/go.d/collector/whoisquery/config_schema.json diff --git a/src/go/plugin/go.d/modules/whoisquery/init.go b/src/go/plugin/go.d/collector/whoisquery/init.go similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/init.go rename to src/go/plugin/go.d/collector/whoisquery/init.go diff --git a/src/go/plugin/go.d/modules/whoisquery/integrations/domain_expiration_date.md b/src/go/plugin/go.d/collector/whoisquery/integrations/domain_expiration_date.md similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/integrations/domain_expiration_date.md rename to src/go/plugin/go.d/collector/whoisquery/integrations/domain_expiration_date.md diff --git a/src/go/plugin/go.d/modules/whoisquery/metadata.yaml b/src/go/plugin/go.d/collector/whoisquery/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/metadata.yaml rename to src/go/plugin/go.d/collector/whoisquery/metadata.yaml diff --git a/src/go/plugin/go.d/modules/whoisquery/provider.go b/src/go/plugin/go.d/collector/whoisquery/provider.go similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/provider.go rename to src/go/plugin/go.d/collector/whoisquery/provider.go diff --git a/src/go/plugin/go.d/modules/whoisquery/testdata/config.json b/src/go/plugin/go.d/collector/whoisquery/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/testdata/config.json rename to src/go/plugin/go.d/collector/whoisquery/testdata/config.json diff --git a/src/go/plugin/go.d/modules/whoisquery/testdata/config.yaml b/src/go/plugin/go.d/collector/whoisquery/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/testdata/config.yaml rename to src/go/plugin/go.d/collector/whoisquery/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/whoisquery/whoisquery.go b/src/go/plugin/go.d/collector/whoisquery/whoisquery.go similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/whoisquery.go rename to src/go/plugin/go.d/collector/whoisquery/whoisquery.go diff --git a/src/go/plugin/go.d/modules/whoisquery/whoisquery_test.go b/src/go/plugin/go.d/collector/whoisquery/whoisquery_test.go similarity index 100% rename from src/go/plugin/go.d/modules/whoisquery/whoisquery_test.go rename to src/go/plugin/go.d/collector/whoisquery/whoisquery_test.go diff --git a/src/go/plugin/go.d/modules/windows/README.md b/src/go/plugin/go.d/collector/windows/README.md similarity index 100% rename from src/go/plugin/go.d/modules/windows/README.md rename to src/go/plugin/go.d/collector/windows/README.md diff --git a/src/go/plugin/go.d/modules/windows/charts.go b/src/go/plugin/go.d/collector/windows/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/charts.go rename to src/go/plugin/go.d/collector/windows/charts.go diff --git a/src/go/plugin/go.d/modules/windows/collect.go b/src/go/plugin/go.d/collector/windows/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect.go rename to src/go/plugin/go.d/collector/windows/collect.go diff --git a/src/go/plugin/go.d/modules/windows/collect_ad.go b/src/go/plugin/go.d/collector/windows/collect_ad.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_ad.go rename to src/go/plugin/go.d/collector/windows/collect_ad.go diff --git a/src/go/plugin/go.d/modules/windows/collect_adcs.go b/src/go/plugin/go.d/collector/windows/collect_adcs.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_adcs.go rename to src/go/plugin/go.d/collector/windows/collect_adcs.go diff --git a/src/go/plugin/go.d/modules/windows/collect_adfs.go b/src/go/plugin/go.d/collector/windows/collect_adfs.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_adfs.go rename to src/go/plugin/go.d/collector/windows/collect_adfs.go diff --git a/src/go/plugin/go.d/modules/windows/collect_collector.go b/src/go/plugin/go.d/collector/windows/collect_collector.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_collector.go rename to src/go/plugin/go.d/collector/windows/collect_collector.go diff --git a/src/go/plugin/go.d/modules/windows/collect_cpu.go b/src/go/plugin/go.d/collector/windows/collect_cpu.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_cpu.go rename to src/go/plugin/go.d/collector/windows/collect_cpu.go diff --git a/src/go/plugin/go.d/modules/windows/collect_exchange.go b/src/go/plugin/go.d/collector/windows/collect_exchange.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_exchange.go rename to src/go/plugin/go.d/collector/windows/collect_exchange.go diff --git a/src/go/plugin/go.d/modules/windows/collect_hyperv.go b/src/go/plugin/go.d/collector/windows/collect_hyperv.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_hyperv.go rename to src/go/plugin/go.d/collector/windows/collect_hyperv.go diff --git a/src/go/plugin/go.d/modules/windows/collect_iis.go b/src/go/plugin/go.d/collector/windows/collect_iis.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_iis.go rename to src/go/plugin/go.d/collector/windows/collect_iis.go diff --git a/src/go/plugin/go.d/modules/windows/collect_logical_disk.go b/src/go/plugin/go.d/collector/windows/collect_logical_disk.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_logical_disk.go rename to src/go/plugin/go.d/collector/windows/collect_logical_disk.go diff --git a/src/go/plugin/go.d/modules/windows/collect_logon.go b/src/go/plugin/go.d/collector/windows/collect_logon.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_logon.go rename to src/go/plugin/go.d/collector/windows/collect_logon.go diff --git a/src/go/plugin/go.d/modules/windows/collect_memory.go b/src/go/plugin/go.d/collector/windows/collect_memory.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_memory.go rename to src/go/plugin/go.d/collector/windows/collect_memory.go diff --git a/src/go/plugin/go.d/modules/windows/collect_mssql.go b/src/go/plugin/go.d/collector/windows/collect_mssql.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_mssql.go rename to src/go/plugin/go.d/collector/windows/collect_mssql.go diff --git a/src/go/plugin/go.d/modules/windows/collect_net.go b/src/go/plugin/go.d/collector/windows/collect_net.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_net.go rename to src/go/plugin/go.d/collector/windows/collect_net.go diff --git a/src/go/plugin/go.d/modules/windows/collect_netframework.go b/src/go/plugin/go.d/collector/windows/collect_netframework.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_netframework.go rename to src/go/plugin/go.d/collector/windows/collect_netframework.go diff --git a/src/go/plugin/go.d/modules/windows/collect_os.go b/src/go/plugin/go.d/collector/windows/collect_os.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_os.go rename to src/go/plugin/go.d/collector/windows/collect_os.go diff --git a/src/go/plugin/go.d/modules/windows/collect_process.go b/src/go/plugin/go.d/collector/windows/collect_process.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_process.go rename to src/go/plugin/go.d/collector/windows/collect_process.go diff --git a/src/go/plugin/go.d/modules/windows/collect_service.go b/src/go/plugin/go.d/collector/windows/collect_service.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_service.go rename to src/go/plugin/go.d/collector/windows/collect_service.go diff --git a/src/go/plugin/go.d/modules/windows/collect_system.go b/src/go/plugin/go.d/collector/windows/collect_system.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_system.go rename to src/go/plugin/go.d/collector/windows/collect_system.go diff --git a/src/go/plugin/go.d/modules/windows/collect_tcp.go b/src/go/plugin/go.d/collector/windows/collect_tcp.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_tcp.go rename to src/go/plugin/go.d/collector/windows/collect_tcp.go diff --git a/src/go/plugin/go.d/modules/windows/collect_thermalzone.go b/src/go/plugin/go.d/collector/windows/collect_thermalzone.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/collect_thermalzone.go rename to src/go/plugin/go.d/collector/windows/collect_thermalzone.go diff --git a/src/go/plugin/go.d/modules/windows/config_schema.json b/src/go/plugin/go.d/collector/windows/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/windows/config_schema.json rename to src/go/plugin/go.d/collector/windows/config_schema.json diff --git a/src/go/plugin/go.d/modules/windows/init.go b/src/go/plugin/go.d/collector/windows/init.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/init.go rename to src/go/plugin/go.d/collector/windows/init.go diff --git a/src/go/plugin/go.d/modules/windows/testdata/config.json b/src/go/plugin/go.d/collector/windows/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/windows/testdata/config.json rename to src/go/plugin/go.d/collector/windows/testdata/config.json diff --git a/src/go/plugin/go.d/modules/windows/testdata/config.yaml b/src/go/plugin/go.d/collector/windows/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/windows/testdata/config.yaml rename to src/go/plugin/go.d/collector/windows/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/windows/testdata/v0.20.0/metrics.txt b/src/go/plugin/go.d/collector/windows/testdata/v0.20.0/metrics.txt similarity index 100% rename from src/go/plugin/go.d/modules/windows/testdata/v0.20.0/metrics.txt rename to src/go/plugin/go.d/collector/windows/testdata/v0.20.0/metrics.txt diff --git a/src/go/plugin/go.d/modules/windows/windows.go b/src/go/plugin/go.d/collector/windows/windows.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/windows.go rename to src/go/plugin/go.d/collector/windows/windows.go diff --git a/src/go/plugin/go.d/modules/windows/windows_test.go b/src/go/plugin/go.d/collector/windows/windows_test.go similarity index 100% rename from src/go/plugin/go.d/modules/windows/windows_test.go rename to src/go/plugin/go.d/collector/windows/windows_test.go diff --git a/src/go/plugin/go.d/modules/wireguard/README.md b/src/go/plugin/go.d/collector/wireguard/README.md similarity index 100% rename from src/go/plugin/go.d/modules/wireguard/README.md rename to src/go/plugin/go.d/collector/wireguard/README.md diff --git a/src/go/plugin/go.d/modules/wireguard/charts.go b/src/go/plugin/go.d/collector/wireguard/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/wireguard/charts.go rename to src/go/plugin/go.d/collector/wireguard/charts.go diff --git a/src/go/plugin/go.d/modules/wireguard/collect.go b/src/go/plugin/go.d/collector/wireguard/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/wireguard/collect.go rename to src/go/plugin/go.d/collector/wireguard/collect.go diff --git a/src/go/plugin/go.d/modules/wireguard/config_schema.json b/src/go/plugin/go.d/collector/wireguard/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/wireguard/config_schema.json rename to src/go/plugin/go.d/collector/wireguard/config_schema.json diff --git a/src/go/plugin/go.d/modules/wireguard/integrations/wireguard.md b/src/go/plugin/go.d/collector/wireguard/integrations/wireguard.md similarity index 100% rename from src/go/plugin/go.d/modules/wireguard/integrations/wireguard.md rename to src/go/plugin/go.d/collector/wireguard/integrations/wireguard.md diff --git a/src/go/plugin/go.d/modules/wireguard/metadata.yaml b/src/go/plugin/go.d/collector/wireguard/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/wireguard/metadata.yaml rename to src/go/plugin/go.d/collector/wireguard/metadata.yaml diff --git a/src/go/plugin/go.d/modules/wireguard/testdata/config.json b/src/go/plugin/go.d/collector/wireguard/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/wireguard/testdata/config.json rename to src/go/plugin/go.d/collector/wireguard/testdata/config.json diff --git a/src/go/plugin/go.d/modules/wireguard/testdata/config.yaml b/src/go/plugin/go.d/collector/wireguard/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/wireguard/testdata/config.yaml rename to src/go/plugin/go.d/collector/wireguard/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/wireguard/wireguard.go b/src/go/plugin/go.d/collector/wireguard/wireguard.go similarity index 100% rename from src/go/plugin/go.d/modules/wireguard/wireguard.go rename to src/go/plugin/go.d/collector/wireguard/wireguard.go diff --git a/src/go/plugin/go.d/modules/wireguard/wireguard_test.go b/src/go/plugin/go.d/collector/wireguard/wireguard_test.go similarity index 100% rename from src/go/plugin/go.d/modules/wireguard/wireguard_test.go rename to src/go/plugin/go.d/collector/wireguard/wireguard_test.go diff --git a/src/go/plugin/go.d/modules/x509check/README.md b/src/go/plugin/go.d/collector/x509check/README.md similarity index 100% rename from src/go/plugin/go.d/modules/x509check/README.md rename to src/go/plugin/go.d/collector/x509check/README.md diff --git a/src/go/plugin/go.d/modules/x509check/charts.go b/src/go/plugin/go.d/collector/x509check/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/x509check/charts.go rename to src/go/plugin/go.d/collector/x509check/charts.go diff --git a/src/go/plugin/go.d/modules/x509check/collect.go b/src/go/plugin/go.d/collector/x509check/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/x509check/collect.go rename to src/go/plugin/go.d/collector/x509check/collect.go diff --git a/src/go/plugin/go.d/modules/x509check/config_schema.json b/src/go/plugin/go.d/collector/x509check/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/x509check/config_schema.json rename to src/go/plugin/go.d/collector/x509check/config_schema.json diff --git a/src/go/plugin/go.d/modules/x509check/init.go b/src/go/plugin/go.d/collector/x509check/init.go similarity index 100% rename from src/go/plugin/go.d/modules/x509check/init.go rename to src/go/plugin/go.d/collector/x509check/init.go diff --git a/src/go/plugin/go.d/modules/x509check/integrations/x.509_certificate.md b/src/go/plugin/go.d/collector/x509check/integrations/x.509_certificate.md similarity index 100% rename from src/go/plugin/go.d/modules/x509check/integrations/x.509_certificate.md rename to src/go/plugin/go.d/collector/x509check/integrations/x.509_certificate.md diff --git a/src/go/plugin/go.d/modules/x509check/metadata.yaml b/src/go/plugin/go.d/collector/x509check/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/x509check/metadata.yaml rename to src/go/plugin/go.d/collector/x509check/metadata.yaml diff --git a/src/go/plugin/go.d/modules/x509check/provider.go b/src/go/plugin/go.d/collector/x509check/provider.go similarity index 100% rename from src/go/plugin/go.d/modules/x509check/provider.go rename to src/go/plugin/go.d/collector/x509check/provider.go diff --git a/src/go/plugin/go.d/modules/x509check/testdata/config.json b/src/go/plugin/go.d/collector/x509check/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/x509check/testdata/config.json rename to src/go/plugin/go.d/collector/x509check/testdata/config.json diff --git a/src/go/plugin/go.d/modules/x509check/testdata/config.yaml b/src/go/plugin/go.d/collector/x509check/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/x509check/testdata/config.yaml rename to src/go/plugin/go.d/collector/x509check/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/x509check/x509check.go b/src/go/plugin/go.d/collector/x509check/x509check.go similarity index 100% rename from src/go/plugin/go.d/modules/x509check/x509check.go rename to src/go/plugin/go.d/collector/x509check/x509check.go diff --git a/src/go/plugin/go.d/modules/x509check/x509check_test.go b/src/go/plugin/go.d/collector/x509check/x509check_test.go similarity index 100% rename from src/go/plugin/go.d/modules/x509check/x509check_test.go rename to src/go/plugin/go.d/collector/x509check/x509check_test.go diff --git a/src/go/plugin/go.d/modules/zfspool/README.md b/src/go/plugin/go.d/collector/zfspool/README.md similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/README.md rename to src/go/plugin/go.d/collector/zfspool/README.md diff --git a/src/go/plugin/go.d/modules/zfspool/charts.go b/src/go/plugin/go.d/collector/zfspool/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/charts.go rename to src/go/plugin/go.d/collector/zfspool/charts.go diff --git a/src/go/plugin/go.d/modules/zfspool/collect.go b/src/go/plugin/go.d/collector/zfspool/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/collect.go rename to src/go/plugin/go.d/collector/zfspool/collect.go diff --git a/src/go/plugin/go.d/modules/zfspool/collect_zpool_list.go b/src/go/plugin/go.d/collector/zfspool/collect_zpool_list.go similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/collect_zpool_list.go rename to src/go/plugin/go.d/collector/zfspool/collect_zpool_list.go diff --git a/src/go/plugin/go.d/modules/zfspool/collect_zpool_list_vdev.go b/src/go/plugin/go.d/collector/zfspool/collect_zpool_list_vdev.go similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/collect_zpool_list_vdev.go rename to src/go/plugin/go.d/collector/zfspool/collect_zpool_list_vdev.go diff --git a/src/go/plugin/go.d/modules/zfspool/config_schema.json b/src/go/plugin/go.d/collector/zfspool/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/config_schema.json rename to src/go/plugin/go.d/collector/zfspool/config_schema.json diff --git a/src/go/plugin/go.d/modules/zfspool/doc.go b/src/go/plugin/go.d/collector/zfspool/doc.go similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/doc.go rename to src/go/plugin/go.d/collector/zfspool/doc.go diff --git a/src/go/plugin/go.d/modules/zfspool/exec.go b/src/go/plugin/go.d/collector/zfspool/exec.go similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/exec.go rename to src/go/plugin/go.d/collector/zfspool/exec.go diff --git a/src/go/plugin/go.d/modules/zfspool/init.go b/src/go/plugin/go.d/collector/zfspool/init.go similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/init.go rename to src/go/plugin/go.d/collector/zfspool/init.go diff --git a/src/go/plugin/go.d/modules/zfspool/integrations/zfs_pools.md b/src/go/plugin/go.d/collector/zfspool/integrations/zfs_pools.md similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/integrations/zfs_pools.md rename to src/go/plugin/go.d/collector/zfspool/integrations/zfs_pools.md diff --git a/src/go/plugin/go.d/modules/zfspool/metadata.yaml b/src/go/plugin/go.d/collector/zfspool/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/metadata.yaml rename to src/go/plugin/go.d/collector/zfspool/metadata.yaml diff --git a/src/go/plugin/go.d/modules/zfspool/testdata/config.json b/src/go/plugin/go.d/collector/zfspool/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/testdata/config.json rename to src/go/plugin/go.d/collector/zfspool/testdata/config.json diff --git a/src/go/plugin/go.d/modules/zfspool/testdata/config.yaml b/src/go/plugin/go.d/collector/zfspool/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/testdata/config.yaml rename to src/go/plugin/go.d/collector/zfspool/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/zfspool/testdata/zpool-list-vdev-logs-cache.txt b/src/go/plugin/go.d/collector/zfspool/testdata/zpool-list-vdev-logs-cache.txt similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/testdata/zpool-list-vdev-logs-cache.txt rename to src/go/plugin/go.d/collector/zfspool/testdata/zpool-list-vdev-logs-cache.txt diff --git a/src/go/plugin/go.d/modules/zfspool/testdata/zpool-list-vdev.txt b/src/go/plugin/go.d/collector/zfspool/testdata/zpool-list-vdev.txt similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/testdata/zpool-list-vdev.txt rename to src/go/plugin/go.d/collector/zfspool/testdata/zpool-list-vdev.txt diff --git a/src/go/plugin/go.d/modules/zfspool/testdata/zpool-list.txt b/src/go/plugin/go.d/collector/zfspool/testdata/zpool-list.txt similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/testdata/zpool-list.txt rename to src/go/plugin/go.d/collector/zfspool/testdata/zpool-list.txt diff --git a/src/go/plugin/go.d/modules/zfspool/zfspool.go b/src/go/plugin/go.d/collector/zfspool/zfspool.go similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/zfspool.go rename to src/go/plugin/go.d/collector/zfspool/zfspool.go diff --git a/src/go/plugin/go.d/modules/zfspool/zfspool_test.go b/src/go/plugin/go.d/collector/zfspool/zfspool_test.go similarity index 100% rename from src/go/plugin/go.d/modules/zfspool/zfspool_test.go rename to src/go/plugin/go.d/collector/zfspool/zfspool_test.go diff --git a/src/go/plugin/go.d/modules/zookeeper/README.md b/src/go/plugin/go.d/collector/zookeeper/README.md similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/README.md rename to src/go/plugin/go.d/collector/zookeeper/README.md diff --git a/src/go/plugin/go.d/modules/zookeeper/charts.go b/src/go/plugin/go.d/collector/zookeeper/charts.go similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/charts.go rename to src/go/plugin/go.d/collector/zookeeper/charts.go diff --git a/src/go/plugin/go.d/modules/zookeeper/collect.go b/src/go/plugin/go.d/collector/zookeeper/collect.go similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/collect.go rename to src/go/plugin/go.d/collector/zookeeper/collect.go diff --git a/src/go/plugin/go.d/modules/zookeeper/config_schema.json b/src/go/plugin/go.d/collector/zookeeper/config_schema.json similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/config_schema.json rename to src/go/plugin/go.d/collector/zookeeper/config_schema.json diff --git a/src/go/plugin/go.d/modules/zookeeper/fetcher.go b/src/go/plugin/go.d/collector/zookeeper/fetcher.go similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/fetcher.go rename to src/go/plugin/go.d/collector/zookeeper/fetcher.go diff --git a/src/go/plugin/go.d/modules/zookeeper/fetcher_test.go b/src/go/plugin/go.d/collector/zookeeper/fetcher_test.go similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/fetcher_test.go rename to src/go/plugin/go.d/collector/zookeeper/fetcher_test.go diff --git a/src/go/plugin/go.d/modules/zookeeper/init.go b/src/go/plugin/go.d/collector/zookeeper/init.go similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/init.go rename to src/go/plugin/go.d/collector/zookeeper/init.go diff --git a/src/go/plugin/go.d/modules/zookeeper/integrations/zookeeper.md b/src/go/plugin/go.d/collector/zookeeper/integrations/zookeeper.md similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/integrations/zookeeper.md rename to src/go/plugin/go.d/collector/zookeeper/integrations/zookeeper.md diff --git a/src/go/plugin/go.d/modules/zookeeper/metadata.yaml b/src/go/plugin/go.d/collector/zookeeper/metadata.yaml similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/metadata.yaml rename to src/go/plugin/go.d/collector/zookeeper/metadata.yaml diff --git a/src/go/plugin/go.d/modules/zookeeper/testdata/config.json b/src/go/plugin/go.d/collector/zookeeper/testdata/config.json similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/testdata/config.json rename to src/go/plugin/go.d/collector/zookeeper/testdata/config.json diff --git a/src/go/plugin/go.d/modules/zookeeper/testdata/config.yaml b/src/go/plugin/go.d/collector/zookeeper/testdata/config.yaml similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/testdata/config.yaml rename to src/go/plugin/go.d/collector/zookeeper/testdata/config.yaml diff --git a/src/go/plugin/go.d/modules/zookeeper/testdata/mntr.txt b/src/go/plugin/go.d/collector/zookeeper/testdata/mntr.txt similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/testdata/mntr.txt rename to src/go/plugin/go.d/collector/zookeeper/testdata/mntr.txt diff --git a/src/go/plugin/go.d/modules/zookeeper/testdata/mntr_notinwhitelist.txt b/src/go/plugin/go.d/collector/zookeeper/testdata/mntr_notinwhitelist.txt similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/testdata/mntr_notinwhitelist.txt rename to src/go/plugin/go.d/collector/zookeeper/testdata/mntr_notinwhitelist.txt diff --git a/src/go/plugin/go.d/modules/zookeeper/zookeeper.go b/src/go/plugin/go.d/collector/zookeeper/zookeeper.go similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/zookeeper.go rename to src/go/plugin/go.d/collector/zookeeper/zookeeper.go diff --git a/src/go/plugin/go.d/modules/zookeeper/zookeeper_test.go b/src/go/plugin/go.d/collector/zookeeper/zookeeper_test.go similarity index 100% rename from src/go/plugin/go.d/modules/zookeeper/zookeeper_test.go rename to src/go/plugin/go.d/collector/zookeeper/zookeeper_test.go diff --git a/src/go/plugin/go.d/modules/init.go b/src/go/plugin/go.d/modules/init.go deleted file mode 100644 index d71cf56a26bbb1..00000000000000 --- a/src/go/plugin/go.d/modules/init.go +++ /dev/null @@ -1,128 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-or-later - -package modules - -import ( - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/activemq" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/adaptecraid" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/ap" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/apache" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/apcupsd" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/beanstalk" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/bind" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/boinc" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/cassandra" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/ceph" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/chrony" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/clickhouse" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/cockroachdb" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/consul" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/coredns" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/couchbase" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/couchdb" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/dmcache" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/dnsdist" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/dnsmasq" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/dnsmasq_dhcp" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/dnsquery" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/docker" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/docker_engine" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/dockerhub" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/dovecot" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/elasticsearch" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/envoy" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/exim" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/fail2ban" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/filecheck" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/fluentd" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/freeradius" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/gearman" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/geth" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/haproxy" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/hddtemp" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/hdfs" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/hpssa" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/httpcheck" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/icecast" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/intelgpu" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/ipfs" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/isc_dhcpd" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/k8s_kubelet" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/k8s_kubeproxy" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/k8s_state" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/lighttpd" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/litespeed" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/logind" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/logstash" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/lvm" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/maxscale" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/megacli" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/memcached" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/mongodb" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/monit" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/mysql" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/nginx" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/nginxplus" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/nginxunit" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/nginxvts" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/nsd" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/ntpd" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/nvidia_smi" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/nvme" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/openldap" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/openvpn" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/openvpn_status_log" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/oracledb" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/pgbouncer" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/phpdaemon" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/phpfpm" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/pihole" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/pika" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/ping" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/portcheck" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/postfix" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/postgres" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/powerdns" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/powerdns_recursor" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/prometheus" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/proxysql" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/pulsar" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/puppet" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/rabbitmq" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/redis" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/rethinkdb" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/riakkv" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/rspamd" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/samba" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/scaleio" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/sensors" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/smartctl" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/snmp" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/spigotmc" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/squid" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/squidlog" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/storcli" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/supervisord" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/systemdunits" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/tengine" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/testrandom" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/tomcat" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/tor" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/traefik" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/typesense" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/unbound" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/upsd" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/uwsgi" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/varnish" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vcsa" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vernemq" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/vsphere" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/w1sensor" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/weblog" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/whoisquery" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/windows" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/wireguard" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/x509check" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/zfspool" - _ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/zookeeper" -)