95 files changed, 280 insertions, 143 deletions
diff --git a/src/go/collectors/go.d.plugin/config/go.d/snmp.conf b/src/go/collectors/go.d.plugin/config/go.d/snmp.conf
deleted file mode 100644
index 32a4addb2..000000000
--- a/src/go/collectors/go.d.plugin/config/go.d/snmp.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/snmp#readme
-
-#jobs:
-#  - name: switch
-#    update_every: 10
-#    hostname: "192.0.2.1"
-#    community: public
-#    options:
-#      version: 2
-#    user:
-#      name: "username"
-#      level: "authPriv"
-#      auth_proto: "sha256"
-#      auth_key: "auth_protocol_passphrase"
-#      priv_proto: "aes256"
-#      priv_key: "priv_protocol_passphrase"
-#    charts:
-#      - id: "bandwidth_port1"
-#        title: "Switch Bandwidth for port 1"
-#        units: "kilobits/s"
-#        type: "area"
-#        family: "ports"
-#        dimensions:
-#          - name: "in"
-#            oid: "1.3.6.1.2.1.2.2.1.10.1"
-#            algorithm: "incremental"
-#            multiplier: 8
-#            divisor: 1000
-#          - name: "out"
-#            oid: "1.3.6.1.2.1.2.2.1.16.1"
-#            multiplier: -8
-#            divisor: 1000
-#      - id: "bandwidth_port2"
-#        title: "Switch Bandwidth for port 2"
-#        units: "kilobits/s"
-#        type: "area"
-#        family: "ports"
-#        dimensions:
-#          - name: "in"
-#            oid: "1.3.6.1.2.1.2.2.1.10.2"
-#            algorithm: "incremental"
-#            multiplier: 8
-#            divisor: 1000
-#          - name: "out"
-#            oid: "1.3.6.1.2.1.2.2.1.16.2"
-#            multiplier: -8
-#            divisor: 1000
diff --git a/src/go/collectors/go.d.plugin/config/go.d.conf b/src/go/plugin/go.d/config/go.d.conf
index 8a5ac82ec..198bcd086 100644
--- a/src/go/collectors/go.d.plugin/config/go.d.conf
+++ b/src/go/plugin/go.d/config/go.d.conf
@@ -17,7 +17,9 @@ max_procs: 0
 modules:
 #  adaptec_raid: yes
 #  activemq: yes
+#  ap: yes
 #  apache: yes
+#  beanstalk: yes
 #  bind: yes
 #  chrony: yes
 #  clickhouse: yes
@@ -34,19 +36,24 @@ modules:
 #  docker: yes
 #  docker_engine: yes
 #  dockerhub: yes
+#  dovecot: yes
 #  elasticsearch: yes
 #  envoy: yes
 #  example: no
+#  exim: yes
 #  fail2ban: yes
 #  filecheck: yes
 #  fluentd: yes
 #  freeradius: yes
+#  gearman: yes
 #  haproxy: yes
 #  hddtemp: yes
 #  hdfs: yes
 #  hpssa: yes
 #  httpcheck: yes
+#  icecast: yes
 #  intelgpu: yes
+#  ipfs: yes
 #  isc_dhcpd: yes
 #  k8s_kubelet: yes
 #  k8s_kubeproxy: yes
@@ -56,11 +63,14 @@ modules:
 #  logstash: yes
 #  lvm: yes
 #  megacli: yes
+#  memcached: yes
 #  mongodb: yes
+#  monit: yes
 #  mysql: yes
 #  nginx: yes
 #  nginxplus: yes
 #  nginxvts: yes
+#  nsd: yes
 #  ntpd: yes
 #  nvme: yes
 #  nvidia_smi: no
@@ -74,25 +84,33 @@ modules:
 #  pika: yes
 #  portcheck: yes
 #  postgres: yes
+#  postfix: yes
 #  powerdns: yes
 #  powerdns_recursor: yes
 #  prometheus: yes
 #  pulsar: yes
+#  puppet: yes
 #  rabbitmq: yes
 #  redis: yes
+#  rethinkdb: yes
+#  riakkv: yes
 #  rspamd: yes
 #  scaleio: yes
 #  sensors: yes
 #  snmp: yes
+#  squid: yes
 #  squidlog: yes
 #  smartctl: yes
 #  storcli: yes
 #  supervisord: yes
 #  systemdunits: yes
 #  tengine: yes
+#  tomcat: yes
+#  tor: yes
 #  traefik: yes
 #  upsd: yes
 #  unbound: yes
+#  uwsgi: yes
 #  vernemq: yes
 #  vcsa: yes
 #  vsphere: yes
diff --git a/src/go/collectors/go.d.plugin/config/go.d/activemq.conf b/src/go/plugin/go.d/config/go.d/activemq.conf
index 69d7ce143..9bae9cc56 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/activemq.conf
+++ b/src/go/plugin/go.d/config/go.d/activemq.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/activemq#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/activemq#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/adaptec_raid.conf b/src/go/plugin/go.d/config/go.d/adaptec_raid.conf
index 21c548f2d..eafbd0303 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/adaptec_raid.conf
+++ b/src/go/plugin/go.d/config/go.d/adaptec_raid.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/adaptecraid#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/adaptecraid#readme
 
 jobs:
   - name: adaptec_raid
diff --git a/src/go/collectors/go.d.plugin/config/go.d/apache.conf b/src/go/plugin/go.d/config/go.d/apache.conf
index d52c1f67b..86f4a75c4 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/apache.conf
+++ b/src/go/plugin/go.d/config/go.d/apache.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/apache#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/apache#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/bind.conf b/src/go/plugin/go.d/config/go.d/bind.conf
index 4302013ce..9e970e60e 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/bind.conf
+++ b/src/go/plugin/go.d/config/go.d/bind.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/bind#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/bind#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/cassandra.conf b/src/go/plugin/go.d/config/go.d/cassandra.conf
index 84de0b1c3..93283ee6c 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/cassandra.conf
+++ b/src/go/plugin/go.d/config/go.d/cassandra.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/cassandra#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/cassandra#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/chrony.conf b/src/go/plugin/go.d/config/go.d/chrony.conf
index 69d9b1c33..099ba3583 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/chrony.conf
+++ b/src/go/plugin/go.d/config/go.d/chrony.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/chrony#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/chrony#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/clickhouse.conf b/src/go/plugin/go.d/config/go.d/clickhouse.conf
index e8d6725ef..4f416138b 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/clickhouse.conf
+++ b/src/go/plugin/go.d/config/go.d/clickhouse.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/clickhouse#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/clickhouse#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/cockroachdb.conf b/src/go/plugin/go.d/config/go.d/cockroachdb.conf
index 83cc91a92..8d04dbfe0 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/cockroachdb.conf
+++ b/src/go/plugin/go.d/config/go.d/cockroachdb.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/cockroachdb#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/cockroachdb#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/consul.conf b/src/go/plugin/go.d/config/go.d/consul.conf
index 60aea1232..624b9a6d4 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/consul.conf
+++ b/src/go/plugin/go.d/config/go.d/consul.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/consul#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/consul#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/coredns.conf b/src/go/plugin/go.d/config/go.d/coredns.conf
index 3037b9db9..9b9d6ef9a 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/coredns.conf
+++ b/src/go/plugin/go.d/config/go.d/coredns.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/coredns#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/coredns#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/couchbase.conf b/src/go/plugin/go.d/config/go.d/couchbase.conf
index 77ecf3f10..aec5c342c 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/couchbase.conf
+++ b/src/go/plugin/go.d/config/go.d/couchbase.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/couchbase#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/couchbase#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/couchdb.conf b/src/go/plugin/go.d/config/go.d/couchdb.conf
index 8527f6b8c..5b62ad191 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/couchdb.conf
+++ b/src/go/plugin/go.d/config/go.d/couchdb.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/couchdb#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/couchdb#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/dmcache.conf b/src/go/plugin/go.d/config/go.d/dmcache.conf
index a17e6db79..8b39726cb 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/dmcache.conf
+++ b/src/go/plugin/go.d/config/go.d/dmcache.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/dmcache#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dmcache#readme
 
 jobs:
   - name: dmcache
diff --git a/src/go/collectors/go.d.plugin/config/go.d/dns_query.conf b/src/go/plugin/go.d/config/go.d/dns_query.conf
index 4fd374a8e..ca24265bf 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/dns_query.conf
+++ b/src/go/plugin/go.d/config/go.d/dns_query.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/dnsquery#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsquery#readme
 
 #jobs:
 # - name: example
diff --git a/src/go/collectors/go.d.plugin/config/go.d/dnsdist.conf b/src/go/plugin/go.d/config/go.d/dnsdist.conf
index 6da0539cd..cc991e018 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/dnsdist.conf
+++ b/src/go/plugin/go.d/config/go.d/dnsdist.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/dnsdist#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsdist#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/dnsmasq.conf b/src/go/plugin/go.d/config/go.d/dnsmasq.conf
index 47c94940d..3b9b3d326 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/dnsmasq.conf
+++ b/src/go/plugin/go.d/config/go.d/dnsmasq.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/dnsmasq#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsmasq#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/dnsmasq_dhcp.conf b/src/go/plugin/go.d/config/go.d/dnsmasq_dhcp.conf
index f3ca29fe7..1f51415dc 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/dnsmasq_dhcp.conf
+++ b/src/go/plugin/go.d/config/go.d/dnsmasq_dhcp.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/dnsmasq_dhcp#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsmasq_dhcp#readme
 
 jobs:
   - name: dnsmasq_dhcp
diff --git a/src/go/collectors/go.d.plugin/config/go.d/docker.conf b/src/go/plugin/go.d/config/go.d/docker.conf
index 4701e2e8f..084373f74 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/docker.conf
+++ b/src/go/plugin/go.d/config/go.d/docker.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/docker#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/docker#readme
 
 jobs:
   - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/docker_engine.conf b/src/go/plugin/go.d/config/go.d/docker_engine.conf
index 1a5de15ee..ba7342a77 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/docker_engine.conf
+++ b/src/go/plugin/go.d/config/go.d/docker_engine.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/docker_engine#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/docker_engine#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/dockerhub.conf b/src/go/plugin/go.d/config/go.d/dockerhub.conf
index 6d4ee5d6d..96b29e26b 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/dockerhub.conf
+++ b/src/go/plugin/go.d/config/go.d/dockerhub.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/dockerhub#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dockerhub#readme
 
 #jobs:
 #  - name: dockerhub
diff --git a/src/go/collectors/go.d.plugin/config/go.d/elasticsearch.conf b/src/go/plugin/go.d/config/go.d/elasticsearch.conf
index b641d6c3f..26ff2c9cd 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/elasticsearch.conf
+++ b/src/go/plugin/go.d/config/go.d/elasticsearch.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/elasticsearch#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/elasticsearch#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/envoy.conf b/src/go/plugin/go.d/config/go.d/envoy.conf
index b4a801cff..fc30a3502 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/envoy.conf
+++ b/src/go/plugin/go.d/config/go.d/envoy.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/envoy#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/envoy#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/example.conf b/src/go/plugin/go.d/config/go.d/example.conf
index b99370922..f92669a68 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/example.conf
+++ b/src/go/plugin/go.d/config/go.d/example.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/example#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/example#readme
 
 jobs:
   - name: example
diff --git a/src/go/collectors/go.d.plugin/config/go.d/fail2ban.conf b/src/go/plugin/go.d/config/go.d/fail2ban.conf
index 56f4a59e5..ac3d126b7 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/fail2ban.conf
+++ b/src/go/plugin/go.d/config/go.d/fail2ban.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/fail2ban#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/fail2ban#readme
 
 jobs:
   - name: fail2ban
diff --git a/src/go/collectors/go.d.plugin/config/go.d/filecheck.conf b/src/go/plugin/go.d/config/go.d/filecheck.conf
index 16b9c2281..ed33675ef 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/filecheck.conf
+++ b/src/go/plugin/go.d/config/go.d/filecheck.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/filecheck#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/filecheck#readme
 
 #jobs:
 # - name: files_example
diff --git a/src/go/collectors/go.d.plugin/config/go.d/fluentd.conf b/src/go/plugin/go.d/config/go.d/fluentd.conf
index 6a1507f17..a75dde619 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/fluentd.conf
+++ b/src/go/plugin/go.d/config/go.d/fluentd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/fluentd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/fluentd#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/freeradius.conf b/src/go/plugin/go.d/config/go.d/freeradius.conf
index 67cda5cca..ba8b066d0 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/freeradius.conf
+++ b/src/go/plugin/go.d/config/go.d/freeradius.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/freeradius#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/freeradius#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/geth.conf b/src/go/plugin/go.d/config/go.d/geth.conf
index 1b5647439..e09fc055e 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/geth.conf
+++ b/src/go/plugin/go.d/config/go.d/geth.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/geth#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/geth#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/haproxy.conf b/src/go/plugin/go.d/config/go.d/haproxy.conf
index 0802a8f02..f2f8011e1 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/haproxy.conf
+++ b/src/go/plugin/go.d/config/go.d/haproxy.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/haproxy#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/haproxy#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/hddtemp.conf b/src/go/plugin/go.d/config/go.d/hddtemp.conf
index a2ea8452d..6a9830a8d 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/hddtemp.conf
+++ b/src/go/plugin/go.d/config/go.d/hddtemp.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/hddtemp#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/hddtemp#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/hdfs.conf b/src/go/plugin/go.d/config/go.d/hdfs.conf
index 2e3e24b6b..93a6d24b0 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/hdfs.conf
+++ b/src/go/plugin/go.d/config/go.d/hdfs.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/hdfs#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/hdfs#readme
 
 #jobs:
 #  - name: namenode
diff --git a/src/go/collectors/go.d.plugin/config/go.d/hpssa.conf b/src/go/plugin/go.d/config/go.d/hpssa.conf
index c5abeb486..6638b6166 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/hpssa.conf
+++ b/src/go/plugin/go.d/config/go.d/hpssa.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/hpssa#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/hpssa#readme
 
 jobs:
   - name: hpssa
diff --git a/src/go/collectors/go.d.plugin/config/go.d/httpcheck.conf b/src/go/plugin/go.d/config/go.d/httpcheck.conf
index 908433e05..6aba8dca2 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/httpcheck.conf
+++ b/src/go/plugin/go.d/config/go.d/httpcheck.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/httpcheck#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/httpcheck#readme
 
 #jobs:
 #  - name: jira
diff --git a/src/go/collectors/go.d.plugin/config/go.d/intelgpu.conf b/src/go/plugin/go.d/config/go.d/intelgpu.conf
index 3639076f1..a8b3144f2 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/intelgpu.conf
+++ b/src/go/plugin/go.d/config/go.d/intelgpu.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/intelgpu#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/intelgpu#readme
 
 jobs:
   - name: intelgpu
diff --git a/src/go/collectors/go.d.plugin/config/go.d/isc_dhcpd.conf b/src/go/plugin/go.d/config/go.d/isc_dhcpd.conf
index aef144308..17a577bb4 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/isc_dhcpd.conf
+++ b/src/go/plugin/go.d/config/go.d/isc_dhcpd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/isc_dhcpd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/isc_dhcpd#readme
 
 #jobs:
 # - name: ipv4_example
diff --git a/src/go/collectors/go.d.plugin/config/go.d/k8s_kubelet.conf b/src/go/plugin/go.d/config/go.d/k8s_kubelet.conf
index 37a8ba6c0..1c0f8cd1f 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/k8s_kubelet.conf
+++ b/src/go/plugin/go.d/config/go.d/k8s_kubelet.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/k8s_kubelet#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/k8s_kubelet#readme
 
 #jobs:
 #  - url: http://127.0.0.1:10255/metrics
diff --git a/src/go/collectors/go.d.plugin/config/go.d/k8s_kubeproxy.conf b/src/go/plugin/go.d/config/go.d/k8s_kubeproxy.conf
index 2563f7b6e..a0b9ee240 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/k8s_kubeproxy.conf
+++ b/src/go/plugin/go.d/config/go.d/k8s_kubeproxy.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/k8s_kubeproxy#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/k8s_kubeproxy#readme
 
 #jobs:
 #  - url: http://127.0.0.1:10249/metrics
diff --git a/src/go/collectors/go.d.plugin/config/go.d/k8s_state.conf b/src/go/plugin/go.d/config/go.d/k8s_state.conf
index 3389d42bb..fd1c305e0 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/k8s_state.conf
+++ b/src/go/plugin/go.d/config/go.d/k8s_state.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/k8s_state#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/k8s_state#readme
 
 jobs:
   - name: k8s_state
diff --git a/src/go/collectors/go.d.plugin/config/go.d/lighttpd.conf b/src/go/plugin/go.d/config/go.d/lighttpd.conf
index 1a7c29bb1..51866bfb7 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/lighttpd.conf
+++ b/src/go/plugin/go.d/config/go.d/lighttpd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/lighttpd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/lighttpd#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/litespeed.conf b/src/go/plugin/go.d/config/go.d/litespeed.conf
index aa321ad21..c525ff0ac 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/litespeed.conf
+++ b/src/go/plugin/go.d/config/go.d/litespeed.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/litespeed#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/litespeed#readme
 
 jobs:
   - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/logind.conf b/src/go/plugin/go.d/config/go.d/logind.conf
index 170c400b4..219b37ae2 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/logind.conf
+++ b/src/go/plugin/go.d/config/go.d/logind.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/logind#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/logind#readme
 
 jobs:
   - name: logind
diff --git a/src/go/collectors/go.d.plugin/config/go.d/logstash.conf b/src/go/plugin/go.d/config/go.d/logstash.conf
index f1586e6aa..c67819e13 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/logstash.conf
+++ b/src/go/plugin/go.d/config/go.d/logstash.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/logstash#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/logstash#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/lvm.conf b/src/go/plugin/go.d/config/go.d/lvm.conf
index 883c37cfd..54da37b1a 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/lvm.conf
+++ b/src/go/plugin/go.d/config/go.d/lvm.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/lvm#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/lvm#readme
 
 jobs:
   - name: lvm
diff --git a/src/go/collectors/go.d.plugin/config/go.d/megacli.conf b/src/go/plugin/go.d/config/go.d/megacli.conf
index db0d43e47..8d26763b7 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/megacli.conf
+++ b/src/go/plugin/go.d/config/go.d/megacli.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/megacli#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/megacli#readme
 
 jobs:
   - name: megacli
diff --git a/src/go/collectors/go.d.plugin/config/go.d/mongodb.conf b/src/go/plugin/go.d/config/go.d/mongodb.conf
index 1e5c024ac..ae41e4c73 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/mongodb.conf
+++ b/src/go/plugin/go.d/config/go.d/mongodb.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/mongodb#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/mongodb#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/mysql.conf b/src/go/plugin/go.d/config/go.d/mysql.conf
index 036d797e4..bdba6df76 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/mysql.conf
+++ b/src/go/plugin/go.d/config/go.d/mysql.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/mysql#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/mysql#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/nginx.conf b/src/go/plugin/go.d/config/go.d/nginx.conf
index 2c9346b83..03b56d238 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/nginx.conf
+++ b/src/go/plugin/go.d/config/go.d/nginx.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/nginx#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nginx#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/nginxplus.conf b/src/go/plugin/go.d/config/go.d/nginxplus.conf
index d10141c84..f0c022853 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/nginxplus.conf
+++ b/src/go/plugin/go.d/config/go.d/nginxplus.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/nginxplus#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nginxplus#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/nginxvts.conf b/src/go/plugin/go.d/config/go.d/nginxvts.conf
index 9b8dcde0a..1b4ea7f1e 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/nginxvts.conf
+++ b/src/go/plugin/go.d/config/go.d/nginxvts.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/nginxvts#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nginxvts#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/ntpd.conf b/src/go/plugin/go.d/config/go.d/ntpd.conf
index c999fa2f9..d607450a5 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/ntpd.conf
+++ b/src/go/plugin/go.d/config/go.d/ntpd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/ntpd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ntpd#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/nvidia_smi.conf b/src/go/plugin/go.d/config/go.d/nvidia_smi.conf
index e166d789a..4c1e01a40 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/nvidia_smi.conf
+++ b/src/go/plugin/go.d/config/go.d/nvidia_smi.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/nvidia_smi#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nvidia_smi#readme
 
 jobs:
   - name: nvidia_smi
diff --git a/src/go/collectors/go.d.plugin/config/go.d/nvme.conf b/src/go/plugin/go.d/config/go.d/nvme.conf
index c419b6a0c..ef0146265 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/nvme.conf
+++ b/src/go/plugin/go.d/config/go.d/nvme.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/nvme#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nvme#readme
 
 jobs:
   - name: nvme
diff --git a/src/go/collectors/go.d.plugin/config/go.d/openvpn.conf b/src/go/plugin/go.d/config/go.d/openvpn.conf
index 297244bfb..0bc65018e 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/openvpn.conf
+++ b/src/go/plugin/go.d/config/go.d/openvpn.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/openvpn#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/openvpn#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/openvpn_status_log.conf b/src/go/plugin/go.d/config/go.d/openvpn_status_log.conf
index 47e723e0b..ae401780c 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/openvpn_status_log.conf
+++ b/src/go/plugin/go.d/config/go.d/openvpn_status_log.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/openvpn_status_log#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/openvpn_status_log#readme
 
 jobs:
   - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/pgbouncer.conf b/src/go/plugin/go.d/config/go.d/pgbouncer.conf
index de4f2dc94..fdc067d77 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/pgbouncer.conf
+++ b/src/go/plugin/go.d/config/go.d/pgbouncer.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/pgbouncer#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pgbouncer#readme
 
 jobs:
   - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/phpdaemon.conf b/src/go/plugin/go.d/config/go.d/phpdaemon.conf
index 3663fc18a..2bd8c1398 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/phpdaemon.conf
+++ b/src/go/plugin/go.d/config/go.d/phpdaemon.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/phpdaemon#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/phpdaemon#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/phpfpm.conf b/src/go/plugin/go.d/config/go.d/phpfpm.conf
index 476f9ab12..a159a5e40 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/phpfpm.conf
+++ b/src/go/plugin/go.d/config/go.d/phpfpm.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/phpfpm#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/phpfpm#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/pihole.conf b/src/go/plugin/go.d/config/go.d/pihole.conf
index f92c39e87..3ff57d9ae 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/pihole.conf
+++ b/src/go/plugin/go.d/config/go.d/pihole.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/pihole#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pihole#readme
 
 #jobs:
 #  - name: pihole
diff --git a/src/go/collectors/go.d.plugin/config/go.d/pika.conf b/src/go/plugin/go.d/config/go.d/pika.conf
index 893b5520b..9f23d8609 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/pika.conf
+++ b/src/go/plugin/go.d/config/go.d/pika.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/pika#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pika#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/ping.conf b/src/go/plugin/go.d/config/go.d/ping.conf
index 4e84d34ed..b87719ced 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/ping.conf
+++ b/src/go/plugin/go.d/config/go.d/ping.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/ping#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ping#readme
 
 #jobs:
 #  - name: example
diff --git a/src/go/collectors/go.d.plugin/config/go.d/portcheck.conf b/src/go/plugin/go.d/config/go.d/portcheck.conf
index ffa794ffc..0800c9eeb 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/portcheck.conf
+++ b/src/go/plugin/go.d/config/go.d/portcheck.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/portcheck#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/portcheck#readme
 
 #jobs:
 # - name: job1
diff --git a/src/go/collectors/go.d.plugin/config/go.d/postgres.conf b/src/go/plugin/go.d/config/go.d/postgres.conf
index b684b70e8..8911d82b7 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/postgres.conf
+++ b/src/go/plugin/go.d/config/go.d/postgres.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/postgres#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/postgres#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/powerdns.conf b/src/go/plugin/go.d/config/go.d/powerdns.conf
index ad449f8fa..dd543c8a8 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/powerdns.conf
+++ b/src/go/plugin/go.d/config/go.d/powerdns.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/powerdns#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/powerdns#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/powerdns_recursor.conf b/src/go/plugin/go.d/config/go.d/powerdns_recursor.conf
index 73592fb4d..19f044c6c 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/powerdns_recursor.conf
+++ b/src/go/plugin/go.d/config/go.d/powerdns_recursor.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/powerdns_recursor#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/powerdns_recursor#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/prometheus.conf b/src/go/plugin/go.d/config/go.d/prometheus.conf
index 4934e2f69..ef051dff6 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/prometheus.conf
+++ b/src/go/plugin/go.d/config/go.d/prometheus.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/prometheus#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/prometheus#readme
 
 #jobs:
 #  - name: node_exporter_local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/proxysql.conf b/src/go/plugin/go.d/config/go.d/proxysql.conf
index 36687b243..d97bf3285 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/proxysql.conf
+++ b/src/go/plugin/go.d/config/go.d/proxysql.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/proxysql#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/proxysql#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/pulsar.conf b/src/go/plugin/go.d/config/go.d/pulsar.conf
index 607c966c3..5dea6ade3 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/pulsar.conf
+++ b/src/go/plugin/go.d/config/go.d/pulsar.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/pulsar#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pulsar#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/rabbitmq.conf b/src/go/plugin/go.d/config/go.d/rabbitmq.conf
index 44c5db882..e64a75662 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/rabbitmq.conf
+++ b/src/go/plugin/go.d/config/go.d/rabbitmq.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/rabbitmq#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/rabbitmq#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/redis.conf b/src/go/plugin/go.d/config/go.d/redis.conf
index f06742d6d..8910b1547 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/redis.conf
+++ b/src/go/plugin/go.d/config/go.d/redis.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/redis#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/redis#readme
 
 jobs:
   - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/rspamd.conf b/src/go/plugin/go.d/config/go.d/rspamd.conf
index fe4424768..f4db129ca 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/rspamd.conf
+++ b/src/go/plugin/go.d/config/go.d/rspamd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/rspamd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/rspamd#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/scaleio.conf b/src/go/plugin/go.d/config/go.d/scaleio.conf
index d2f4d838b..9db85cc4d 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/scaleio.conf
+++ b/src/go/plugin/go.d/config/go.d/scaleio.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/scaleio#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/scaleio#readme
 
 #jobs:
 #  - name     : local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/sd/docker.conf b/src/go/plugin/go.d/config/go.d/sd/docker.conf
index b0f1a3aa9..c93fbef87 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/sd/docker.conf
+++ b/src/go/plugin/go.d/config/go.d/sd/docker.conf
@@ -26,6 +26,8 @@ classify:
     match:
       - tags: "apache"
         expr: '{{ match "sp" .Image "httpd httpd:* */apache */apache:* */apache2 */apache2:*" }}'
+      - tags: "beanstalk"
+        expr: '{{ match "sp" .Image "*/beanstalkd */beanstalkd:*" }}'
       - tags: "cockroachdb"
         expr: '{{ match "sp" .Image "cockroachdb/cockroach cockroachdb/cockroach:*" }}'
       - tags: "consul"
@@ -36,10 +38,18 @@ classify:
         expr: '{{ or (eq .PrivatePort "8091") (match "sp" .Image "couchbase couchbase:*") }}'
       - tags: "couchdb"
         expr: '{{ or (eq .PrivatePort "5984") (match "sp" .Image "couchdb couchdb:*") }}'
+      - tags: "dovecot"
+        expr: '{{ or (eq .PrivatePort "24242") (match "sp" .Image "*/dovecot */dovecot:*") }}'
       - tags: "elasticsearch"
         expr: '{{ or (eq .PrivatePort "9200") (match "sp" .Image "elasticsearch elasticsearch:* */elasticsearch */elasticsearch:* */opensearch */opensearch:*") }}'
+      - tags: "gearman"
+        expr: '{{ and (eq .PrivatePort "4730") (match "sp" .Image "*/gearmand */gearmand:*") }}'
+      - tags: "ipfs"
+        expr: '{{ and (eq .PrivatePort "5001") (match "sp" .Image "ipfs/kubo ipfs/kubo:*") }}'
       - tags: "lighttpd"
         expr: '{{ match "sp" .Image "*/lighttpd */lighttpd:*" }}'
+      - tags: "memcached"
+        expr: '{{ or (eq .PrivatePort "11211") (match "sp" .Image "memcached memcached:* */memcached */memcached:*") }}'
       - tags: "mongodb"
         expr: '{{ or (eq .PrivatePort "27017") (match "sp" .Image "mongo mongo:* */mongodb */mongodb:* */mongodb-community-server */mongodb-community-server:*") }}'
       - tags: "mysql"
@@ -54,12 +64,22 @@ classify:
         expr: '{{ or (eq .PrivatePort "5432") (match "sp" .Image "postgres postgres:* */postgres */postgres:* */postgresql */postgresql:*") }}'
       - tags: "proxysql"
         expr: '{{ or (eq .PrivatePort "6032") (match "sp" .Image "*/proxysql */proxysql:*") }}'
+      - tags: "puppet"
+        expr: '{{ or (eq .PrivatePort "8140") (match "sp" .Image "puppet/puppetserver puppet/puppetserver:*") }}'
       - tags: "rabbitmq"
         expr: '{{ or (eq .PrivatePort "15672") (match "sp" .Image "rabbitmq rabbitmq:* */rabbitmq */rabbitmq:*") }}'
       - tags: "redis"
         expr: '{{ or (eq .PrivatePort "6379") (match "sp" .Image "redis redis:* */redis */redis:*") }}'
+      - tags: "rethinkdb"
+        expr: '{{ and (eq .PrivatePort "28015") (match "sp" .Image "rethinkdb rethinkdb:* */rethinkdb */rethinkdb:*") }}'
+      - tags: "squid"
+        expr: '{{ match "sp" .Image "*/squid */squid:*" }}'
       - tags: "tengine"
         expr: '{{ match "sp" .Image "*/tengine */tengine:*" }}'
+      - tags: "tor"
+        expr: '{{ and (eq .PrivatePort "9051") (match "sp" .Image "*/tor */tor:*") }}'
+      - tags: "tomcat"
+        expr: '{{ match "sp" .Image "tomcat tomcat:* */tomcat */tomcat:*" }}'
       - tags: "vernemq"
         expr: '{{ match "sp" .Image "*/vernemq */vernemq:*" }}'
       - tags: "zookeeper"
@@ -73,6 +93,11 @@ compose:
           module: apache
           name: docker_{{.Name}}
           url: http://{{.Address}}/server-status?auto
+      - selector: "beanstalk"
+        template: |
+          module: beanstalk
+          name: docker_{{.Name}}
+          address: {{.Address}}
       - selector: "cockroachdb"
         template: |
           module: cockroachdb
@@ -103,6 +128,11 @@ compose:
           module: couchdb
           name: docker_{{.Name}}
           url: http://{{.Address}}
+      - selector: "dovecot"
+        template: |
+          module: dovecot
+          name: docker_{{.Name}}
+          address: {{.Address}}
       - selector: "elasticsearch"
         template: |
           module: elasticsearch
@@ -115,11 +145,26 @@ compose:
           username: admin
           password: admin
           {{ end -}}
+      - selector: "gearman"
+        template: |
+          module: gearman
+          name: docker_{{.Name}}
+          address: {{.Address}}
+      - selector: "ipfs"
+        template: |
+          module: ipfs
+          name: docker_{{.Name}}
+          url: http://{{.Address}}
       - selector: "lighttpd"
         template: |
           module: lighttpd
           name: docker_{{.Name}}
           url: http://{{.Address}}/server-status?auto
+      - selector: "memcached"
+        template: |
+          module: memcached
+          name: docker_{{.Name}}
+          address: {{.Address}}
       - selector: "mongodb"
         template: |
           module: mongodb
@@ -154,6 +199,11 @@ compose:
           module: pika
           name: docker_{{.Name}}
           address: redis://@{{.Address}}
+      - selector: "rethinkdb"
+        template: |
+          module: rethinkdb
+          name: docker_{{.Name}}
+          address: {{.Address}}
       - selector: "postgres"
         template: |
           module: postgres
@@ -164,6 +214,12 @@ compose:
           module: proxysql
           name: docker_{{.Name}}
           dsn: stats:stats@tcp({{.Address}})/
+      - selector: "puppet"
+        template: |
+          module: puppet
+          name: docker_{{.Name}}
+          url: https://{{.Address}}
+          tls_skip_verify: yes
       - selector: "rabbitmq"
         template: |
           module: rabbitmq
@@ -174,11 +230,26 @@ compose:
           module: redis
           name: docker_{{.Name}}
           address: redis://@{{.Address}}
+      - selector: "squid"
+        template: |
+          module: squid
+          name: docker_{{.Name}}
+          url: http://{{.Address}}
       - selector: "tengine"
         template: |
           module: tengine
           name: docker_{{.Name}}
           url: http://{{.Address}}/us
+      - selector: "tomcat"
+        template: |
+          module: tomcat
+          name: docker_{{.Name}}
+          url: http://{{.Address}}
+      - selector: "tor"
+        template: |
+          module: tor
+          name: docker_{{.Name}}
+          address: {{.Address}}
       - selector: "vernemq"
         template: |
           module: vernemq
@@ -186,6 +257,6 @@ compose:
           url: http://{{.Address}}/metrics
       - selector: "zookeeper"
         template: |
-          module: vernemq
+          module: zookeeper
           name: docker_{{.Name}}
           address: {{.Address}}
diff --git a/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf b/src/go/plugin/go.d/config/go.d/sd/net_listeners.conf
index 8d59c0dcb..4462fc112 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf
+++ b/src/go/plugin/go.d/config/go.d/sd/net_listeners.conf
@@ -16,6 +16,8 @@ classify:
         expr: '{{ and (eq .Port "8161") (eq .Comm "activemq") }}'
       - tags: "apache"
         expr: '{{ and (eq .Port "80" "8080") (eq .Comm "apache" "apache2" "httpd") }}'
+      - tags: "beanstalk"
+        expr: '{{ or (eq .Port "11300") (eq .Comm "beanstalkd") }}'
       - tags: "bind"
         expr: '{{ and (eq .Port "8653") (eq .Comm "bind" "named") }}'
       - tags: "cassandra"
@@ -40,6 +42,8 @@ classify:
         expr: '{{ and (eq .Protocol "UDP") (eq .Port "53") (eq .Comm "dnsmasq") }}'
       - tags: "docker_engine"
         expr: '{{ and (eq .Port "9323") (eq .Comm "dockerd") }}'
+      - tags: "dovecot"
+        expr: '{{ and (eq .Port "24242") (eq .Comm "dovecot") }}'
       - tags: "elasticsearch"
         expr: '{{ or (eq .Port "9200") (glob .Cmdline "*elasticsearch*" "*opensearch*") }}'
       - tags: "envoy"
@@ -48,6 +52,8 @@ classify:
         expr: '{{ and (eq .Port "24220") (glob .Cmdline "*fluentd*") }}'
       - tags: "freeradius"
         expr: '{{ and (eq .Port "18121") (eq .Comm "freeradius") }}'
+      - tags: "gearman"
+        expr: '{{ or (eq .Port "4730") (eq .Comm "gearmand") }}'
       - tags: "geth"
         expr: '{{ and (eq .Port "6060") (eq .Comm "geth") }}'
       - tags: "haproxy"
@@ -58,6 +64,10 @@ classify:
         expr: '{{ and (eq .Port "9870") (eq .Comm "hadoop") }}'
       - tags: "hdfs_datanode"
         expr: '{{ and (eq .Port "9864") (eq .Comm "hadoop") }}'
+      - tags: "icecast"
+        expr: '{{ and (eq .Port "8000") (eq .Comm "icecast") }}'
+      - tags: "ipfs"
+        expr: '{{ and (eq .Port "5001") (eq .Comm "ipfs") }}'
       - tags: "kubelet"
         expr: '{{ and (eq .Port "10250" "10255") (eq .Comm "kubelet") }}'
       - tags: "kubeproxy"
@@ -66,8 +76,12 @@ classify:
         expr: '{{ and (eq .Port "80" "8080") (eq .Comm "lighttpd") }}'
       - tags: "logstash"
         expr: '{{ and (eq .Port "9600") (glob .Cmdline "*logstash*") }}'
+      - tags: "memcached"
+        expr: '{{ or (eq .Port "11211") (eq .Comm "memcached") }}'
       - tags: "mongodb"
         expr: '{{ or (eq .Port "27017") (eq .Comm "mongod") }}'
+      - tags: "monit"
+        expr: '{{ or (eq .Port "2812") (eq .Comm "monit") }}'
       - tags: "mysql"
         expr: '{{ or (eq .Port "3306") (eq .Comm "mysqld" "mariadbd") }}'
       - tags: "nginx"
@@ -90,20 +104,34 @@ classify:
         expr: '{{ and (eq .Port "8081") (eq .Comm "pdns_recursor") }}'
       - tags: "proxysql"
         expr: '{{ or (eq .Port "6032") (eq .Comm "proxysql") }}'
+      - tags: "puppet"
+        expr: '{{ or (eq .Port "8140") (glob .Cmdline "*puppet-server*") }}'
       - tags: "rabbitmq"
         expr: '{{ or (eq .Port "15672") (glob .Cmdline "*rabbitmq*") }}'
       - tags: "redis"
         expr: '{{ or (eq .Port "6379") (eq .Comm "redis-server") }}'
+      - tags: "rethinkdb"
+        expr: '{{ and (eq .Port "28015") (eq .Comm "rethinkdb") }}'
+      - tags: "riak"
+        expr: '{{ and (eq .Port "8098") (glob .Cmdline "*riak*") }}'
       - tags: "rspamd"
         expr: '{{ and (eq .Port "11334") (eq .Comm "rspamd") }}'
+      - tags: "squid"
+        expr: '{{ and (eq .Port "3128") (eq .Comm "squid") }}'
       - tags: "supervisord"
         expr: '{{ and (eq .Port "9001") (eq .Comm "supervisord") }}'
+      - tags: "tomcat"
+        expr: '{{ and (eq .Port "8080") (glob .Cmdline "*tomcat*") }}'
+      - tags: "tor"
+        expr: '{{ and (eq .Port "9051") (eq .Comm "tor") }}'
       - tags: "traefik"
         expr: '{{ and (eq .Port "80" "8080") (eq .Comm "traefik") }}'
       - tags: "unbound"
         expr: '{{ and (eq .Port "8953") (eq .Comm "unbound") }}'
       - tags: "upsd"
         expr: '{{ or (eq .Port "3493") (eq .Comm "upsd") }}'
+      - tags: "uwsgi"
+        expr: '{{ and (eq .Port "1717") (eq .Comm "uwsgi") }}'
       - tags: "vernemq"
         expr: '{{ and (eq .Port "8888") (glob .Cmdline "*vernemq*") }}'
       - tags: "zookeeper"
@@ -129,6 +157,11 @@ compose:
           module: apache
           name: local
           url: http://{{.Address}}/server-status?auto
+      - selector: "beanstalk"
+        template: |
+          module: beanstalk
+          name: local
+          address: {{.Address}}
       - selector: "bind"
         template: |
           module: bind
@@ -193,6 +226,11 @@ compose:
           module: docker_engine
           name: local
           url: http://{{.Address}}/metrics
+      - selector: "dovecot"
+        template: |
+          module: dovecot
+          name: local
+          address: {{.Address}}
       - selector: "elasticsearch"
         template: |
           module: elasticsearch
@@ -227,6 +265,11 @@ compose:
           address: {{.IPAddress}}
           port: {{.Port}}
           secret: adminsecret
+      - selector: "gearman"
+        template: |
+          module: gearman
+          name: local
+          address: {{.Address}}
       - selector: "geth"
         template: |
           module: geth
@@ -252,6 +295,16 @@ compose:
           module: hdfs
           name: datanode_local
           url: http://{{.Address}}/jmx
+      - selector: "icecast"
+        template: |
+          module: icecast
+          name: local
+          url: http://{{.Address}}
+      - selector: "ipfs"
+        template: |
+          module: ipfs
+          name: local
+          url: http://{{.Address}}
       - selector: "kubelet"
         template: |
           module: k8s_kubelet
@@ -277,11 +330,23 @@ compose:
           module: logstash
           name: local
           url: http://{{.Address}}
+      - selector: "memcached"
+        template: |
+          module: memcached
+          name: local
+          address: {{.Address}}
       - selector: "mongodb"
         template: |
           module: mongodb
           name: local
           uri: mongodb://{{.Address}}
+      - selector: "monit"
+        template: |
+          module: monit
+          name: local
+          url: http://{{.Address}}
+          username: admin
+          password: monit
       - selector: "mysql"
         template: |
           - module: mysql
@@ -330,6 +395,16 @@ compose:
           module: pika
           name: local
           address: redis://@{{.IPAddress}}:{{.Port}}
+      - selector: "rethinkdb"
+        template: |
+          module: rethinkdb
+          name: local
+          address: {{.Address}}
+      - selector: "riak"
+        template: |
+          module: riakkv
+          name: local
+          url: http://{{.Address}}/stats
       - selector: "rspamd"
         template: |
           module: rspamd
@@ -365,6 +440,12 @@ compose:
           module: proxysql
           name: local
           dsn: stats:stats@tcp({{.Address}})/
+      - selector: "puppet"
+        template: |
+          module: puppet
+          name: local
+          url: https://{{.Address}}
+          tls_skip_verify: yes
       - selector: "rabbitmq"
         template: |
           module: rabbitmq
@@ -378,6 +459,11 @@ compose:
           module: redis
           name: local
           address: redis://@{{.Address}}
+      - selector: "squid"
+        template: |
+          module: squid
+          name: local
+          url: http://{{.Address}}
       - selector: "supervisord"
         template: |
           module: supervisord
@@ -388,11 +474,16 @@ compose:
           module: traefik
           name: local
           url: http://{{.Address}}/metrics
-      - selector: "traefik"
+      - selector: "tomcat"
         template: |
-          module: traefik
+          module: tomcat
           name: local
-          url: http://{{.Address}}/metrics
+          url: http://{{.Address}}
+      - selector: "tor"
+        template: |
+          module: tor
+          name: local
+          address: {{.Address}}
       - selector: "unbound"
         template: |
           module: unbound
@@ -403,6 +494,11 @@ compose:
           module: upsd
           name: local
           address: {{.Address}}
+      - selector: "uwsgi"
+        template: |
+          module: uwsgi
+          name: local
+          address: {{.Address}}
       - selector: "vernemq"
         template: |
           module: vernemq
diff --git a/src/go/collectors/go.d.plugin/config/go.d/sensors.conf b/src/go/plugin/go.d/config/go.d/sensors.conf
index 3b8febde8..d1b4c4f14 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/sensors.conf
+++ b/src/go/plugin/go.d/config/go.d/sensors.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/sensors#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/sensors#readme
 
 jobs:
   - name: sensors
diff --git a/src/go/collectors/go.d.plugin/config/go.d/smartctl.conf b/src/go/plugin/go.d/config/go.d/smartctl.conf
index dea5116be..7f8ca5ada 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/smartctl.conf
+++ b/src/go/plugin/go.d/config/go.d/smartctl.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/smartctl#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/smartctl#readme
 
 jobs:
   - name: smartctl
diff --git a/src/go/collectors/go.d.plugin/config/go.d/squidlog.conf b/src/go/plugin/go.d/config/go.d/squidlog.conf
index a008feabf..4c85e3849 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/squidlog.conf
+++ b/src/go/plugin/go.d/config/go.d/squidlog.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/squidlog#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/squidlog#readme
 
 jobs:
   - name: squidlog
diff --git a/src/go/collectors/go.d.plugin/config/go.d/storcli.conf b/src/go/plugin/go.d/config/go.d/storcli.conf
index a4a9e3e0a..704f7579d 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/storcli.conf
+++ b/src/go/plugin/go.d/config/go.d/storcli.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/storcli#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/storcli#readme
 
 jobs:
   - name: storcli
diff --git a/src/go/collectors/go.d.plugin/config/go.d/supervisord.conf b/src/go/plugin/go.d/config/go.d/supervisord.conf
index 3031e5059..5d3969b7d 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/supervisord.conf
+++ b/src/go/plugin/go.d/config/go.d/supervisord.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/supervisord#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/supervisord#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/systemdunits.conf b/src/go/plugin/go.d/config/go.d/systemdunits.conf
index 5c94fc00f..7aefd37ea 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/systemdunits.conf
+++ b/src/go/plugin/go.d/config/go.d/systemdunits.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/systemdunits#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/systemdunits#readme
 
 jobs:
  - name: service-units
diff --git a/src/go/collectors/go.d.plugin/config/go.d/tengine.conf b/src/go/plugin/go.d/config/go.d/tengine.conf
index 186d55c6c..aefaf2ac7 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/tengine.conf
+++ b/src/go/plugin/go.d/config/go.d/tengine.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/tengine#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/tengine#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/traefik.conf b/src/go/plugin/go.d/config/go.d/traefik.conf
index 69f5bb53e..8c005db01 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/traefik.conf
+++ b/src/go/plugin/go.d/config/go.d/traefik.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/traefik#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/traefik#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/unbound.conf b/src/go/plugin/go.d/config/go.d/unbound.conf
index e6497c23c..06552bfd9 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/unbound.conf
+++ b/src/go/plugin/go.d/config/go.d/unbound.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/unbound#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/unbound#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/upsd.conf b/src/go/plugin/go.d/config/go.d/upsd.conf
index 5abc3f405..6f7b31090 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/upsd.conf
+++ b/src/go/plugin/go.d/config/go.d/upsd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/upsd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/upsd#readme
 
 #jobs:
 #  - name: upsd
diff --git a/src/go/collectors/go.d.plugin/config/go.d/vcsa.conf b/src/go/plugin/go.d/config/go.d/vcsa.conf
index 84749fbd5..39ee86d91 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/vcsa.conf
+++ b/src/go/plugin/go.d/config/go.d/vcsa.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/vcsa#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/vcsa#readme
 
 #jobs:
 #  - name     : vcsa1
diff --git a/src/go/collectors/go.d.plugin/config/go.d/vernemq.conf b/src/go/plugin/go.d/config/go.d/vernemq.conf
index 24717a828..c954074f8 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/vernemq.conf
+++ b/src/go/plugin/go.d/config/go.d/vernemq.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/vernemq#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/vernemq#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/collectors/go.d.plugin/config/go.d/vsphere.conf b/src/go/plugin/go.d/config/go.d/vsphere.conf
index a83c27833..cbc58a354 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/vsphere.conf
+++ b/src/go/plugin/go.d/config/go.d/vsphere.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/vsphere#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/vsphere#readme
 
 #jobs:
 #  - name     : vcenter1
diff --git a/src/go/collectors/go.d.plugin/config/go.d/web_log.conf b/src/go/plugin/go.d/config/go.d/web_log.conf
index 496878851..502fece49 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/web_log.conf
+++ b/src/go/plugin/go.d/config/go.d/web_log.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/web_log#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/web_log#readme
 
 jobs:
   # NGINX
diff --git a/src/go/collectors/go.d.plugin/config/go.d/whoisquery.conf b/src/go/plugin/go.d/config/go.d/whoisquery.conf
index 57c031bc0..41f7232da 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/whoisquery.conf
+++ b/src/go/plugin/go.d/config/go.d/whoisquery.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/whoisquery#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/whoisquery#readme
 
 #jobs:
 #  - name: example
diff --git a/src/go/collectors/go.d.plugin/config/go.d/windows.conf b/src/go/plugin/go.d/config/go.d/windows.conf
index 73d4b062c..4671c20bc 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/windows.conf
+++ b/src/go/plugin/go.d/config/go.d/windows.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/windows#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/windows#readme
 
 #jobs:
 #  - name: win_server1
diff --git a/src/go/collectors/go.d.plugin/config/go.d/wireguard.conf b/src/go/plugin/go.d/config/go.d/wireguard.conf
index 225de4d6c..07ed61d06 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/wireguard.conf
+++ b/src/go/plugin/go.d/config/go.d/wireguard.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/wireguard#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/wireguard#readme
 
 jobs:
   - name: wireguard
diff --git a/src/go/collectors/go.d.plugin/config/go.d/x509check.conf b/src/go/plugin/go.d/config/go.d/x509check.conf
index d01417478..5231b1052 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/x509check.conf
+++ b/src/go/plugin/go.d/config/go.d/x509check.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/x509check#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/x509check#readme
 
 #jobs:
 #  - name: my_site_cert
diff --git a/src/go/collectors/go.d.plugin/config/go.d/zfspool.conf b/src/go/plugin/go.d/config/go.d/zfspool.conf
index f18ff54e1..e961d1971 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/zfspool.conf
+++ b/src/go/plugin/go.d/config/go.d/zfspool.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/zfspool#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/zfspool#readme
 
 jobs:
   - name: zfspool
diff --git a/src/go/collectors/go.d.plugin/config/go.d/zookeeper.conf b/src/go/plugin/go.d/config/go.d/zookeeper.conf
index e6ed50525..f200c7893 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/zookeeper.conf
+++ b/src/go/plugin/go.d/config/go.d/zookeeper.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/modules/zookeeper#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/zookeeper#readme
 
 #jobs:
 #  - name: local