1 files changed, 36 insertions, 19 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f4e61be24..586030e6d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,30 +2,47 @@
 * @ktsaou
 
 # Ownership by directory structure
-.travis/ @paulfantom
-# backends/
+.travis/ @paufantom
 build/ @paulfantom
-collectors/python.d.plugin/ @l2isbad @Ferroin
-contrib/ @paulfantom
-daemon/ @ktsaou
-database/ @ktsaou
+backends/ @ktsaou @vlvkobal
+backends/graphite/ @ktsaou @vlvkobal
+backends/json/ @ktsaou @vlvkobal
+backends/opentsdb/ @ktsaou @vlvkobal
+backends/prometheus/ @ktsaou @vlvkobal @paulfantom
+collectors/ @ktsaou @vlvkobal
+collectors/charts.d.plugin/ @ktsaou @paulfantom
+collectors/freebsd.plugin/ @vlvkobal
+collectors/macos.plugin/ @vlvkobal
+collectors/node.d.plugin/ @ktsaou @gmosx
+collectors/node.d.plugin/fronius/ @ktsaou @gmosx @ccremer
+collectors/node.d.plugin/snmp/ @ktsaou @gmosx @cakrit
+collectors/node.d.plugin/stiebeleltron/ @ktsaou @gmosx @ccremer
+collectors/python.d.plugin/ @l2isbad
+daemon/ @ktsaou @vlvkobal
+database/ @ktsaou @mfundul
 docker/ @paulfantom
-# health/ 
-# installer/
-# libnetdata/ 
-# makeself/ 
+health/ @ktsaou @mfundul
+health/health.d/ @ktsaou @cakrit
+health/notifications/ @ktsaou @Ferroin
+installer/ @ktsaou @paulfantom
+libnetdata/ @ktsaou @vlvkobal
+makeself/ @ktsaou @paulfantom
 packaging/ @paulfantom
-# registry/
-# streaming/
-# system/ 
-# tests/
-# web/
+registry/ @ktsaou @gmosx
+streaming/ @ktsaou @mfundul
+web/ @ktsaou @vlvkobal @gmosx
+
+# Ownership by filetype (overwrites ownership by directory)
+*.md @ktsaou @cakrit
+*.am @paulfantom @ktsaou
 
 # Ownership of specific files
-CHANGELOG.md @netdatabot
 .travis.yml @paulfantom
 .lgtm.yml @paulfantom
+.eslintrc @paulfantom
+.eslintignore @paulfantom
+.csslintrc @paulfantom
+.codeclimate.yml @paulfantom
+.codacy.yml @paulfantom
 
-# Ownership by filetype (overwrites ownership by directory)
-*.am @paulfantom @ktsaou
-*.c *.h @ktsaou @vlvkobal
+CHANGELOG.md @netdatabot