diff --git a/net-mgmt/netdata-go/Makefile b/net-mgmt/netdata-go/Makefile
index 12c6d215f213..d86e5e9d3fcf 100644
--- a/net-mgmt/netdata-go/Makefile
+++ b/net-mgmt/netdata-go/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	netdata-go
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.35.0
+DISTVERSION=	0.36.0
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	External netdata collection plugin written in Go
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 
 GO_MODULE=	github.com/netdata/go.d.plugin
 GO_TARGET=	./cmd/godplugin:${PREFIX}/libexec/netdata/plugins.d/god.plugin
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/etc/netdata|${PREFIX}/etc/netdata|g' ${WRKSRC}/cmd/godplugin/main.go
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/netdata/conf.d
 	${INSTALL_DATA} ${WRKSRC}/config/go.d.conf ${STAGEDIR}${PREFIX}/lib/netdata/conf.d/go.d.conf.sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/netdata/conf.d/go.d
 	cd ${WRKSRC}/config/go.d && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/netdata/conf.d/go.d
 	(for file in ${STAGEDIR}${PREFIX}/lib/netdata/conf.d/go.d/*.conf; do \
 		${MV} $$file $$file".sample"; \
 	done)
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/netdata-go/distinfo b/net-mgmt/netdata-go/distinfo
index db071d74b37d..093474cc8878 100644
--- a/net-mgmt/netdata-go/distinfo
+++ b/net-mgmt/netdata-go/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1659979927
-SHA256 (go/net-mgmt_netdata-go/netdata-go-v0.35.0/v0.35.0.mod) = 25bacc5bef0f2f2005445c91f30ad677b9a0df1fe004fe9385da665035bd07c3
-SIZE (go/net-mgmt_netdata-go/netdata-go-v0.35.0/v0.35.0.mod) = 8480
-SHA256 (go/net-mgmt_netdata-go/netdata-go-v0.35.0/v0.35.0.zip) = a39aadd6942dd0ce8bfa2c47e9c499817f3f0d85c6dcb583def5247fb568ba79
-SIZE (go/net-mgmt_netdata-go/netdata-go-v0.35.0/v0.35.0.zip) = 1506144
+TIMESTAMP = 1660841963
+SHA256 (go/net-mgmt_netdata-go/netdata-go-v0.36.0/v0.36.0.mod) = f22ace728bd8d1b2e013620b6c0c9a97ef591c6a6f3c9a342940e92e21675d59
+SIZE (go/net-mgmt_netdata-go/netdata-go-v0.36.0/v0.36.0.mod) = 8933
+SHA256 (go/net-mgmt_netdata-go/netdata-go-v0.36.0/v0.36.0.zip) = c7a1cb891669f1f1ebb2172ae277ffcc3feb4d0412ff6a5a2e6956d7822bb35b
+SIZE (go/net-mgmt_netdata-go/netdata-go-v0.36.0/v0.36.0.zip) = 1497493
diff --git a/net-mgmt/netdata-go/pkg-plist b/net-mgmt/netdata-go/pkg-plist
index c81e754ce4f3..5cc090aca5a2 100644
--- a/net-mgmt/netdata-go/pkg-plist
+++ b/net-mgmt/netdata-go/pkg-plist
@@ -1,69 +1,73 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/activemq.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/apache.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/bind.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/chrony.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/cockroachdb.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/consul.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/coredns.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/couchbase.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/couchdb.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dns_query.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dnsdist.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dnsmasq.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dnsmasq_dhcp.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/docker.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/docker_engine.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dockerhub.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/elasticsearch.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/energid.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/example.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/filecheck.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/fluentd.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/freeradius.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/geth.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/haproxy.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/hdfs.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/httpcheck.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/isc_dhcpd.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/k8s_kubelet.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/k8s_kubeproxy.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/k8s_state.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/lighttpd.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/lighttpd2.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/logstash.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/mongodb.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/mysql.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nginx.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nginxvts.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/openvpn.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/openvpn_status_log.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pgbouncer.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/phpdaemon.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/phpfpm.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pihole.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pika.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/portcheck.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/postgres.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/powerdns.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/powerdns_recursor.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/prometheus.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pulsar.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/rabbitmq.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/redis.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/scaleio.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/snmp.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/solr.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/springboot2.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/squidlog.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/supervisord.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/systemdunits.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/tengine.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/traefik.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/unbound.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/vcsa.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/vernemq.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/vsphere.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/web_log.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/whoisquery.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/wireguard.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/wmi.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/x509check.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/zookeeper.conf.sample
 libexec/netdata/plugins.d/god.plugin