update CODEOWNERS, MAINTAINERS.md (#3946)

CODEOWNERS

@@ -1,4 +1,40 @@
-/cmd/grafana-agent-operator @captncraig @marctc @jcreixell
-/pkg/integrations/ @rgeyer @gaantunes @captncraig @marctc @jcreixell
-/pkg/operator @captncraig @marctc @jcreixell
-/pkg/traces/ @joe-elliott @mapno
+# The following groups are used to refer to a changing set of users:
+#
+# * @grafana/grafana-agent-core-maintainers: maintainers of type/core issues.
+# * @grafana/grafana-agent-signals-maintainers: maintainers of type/signals issues.
+# * @grafana/grafana-agent-operator-maintainers: maintainers of type/operator issues.
+# * @grafana/grafana-agent-infrastructure-maintainers: maintainers of type/infrastructure issues.
+#
+# Other users may be listed explicitly if maintainership does not fall into one
+# of the above groups.
+
+# The default owners for everything in the repo. Unless a later match takes
+# precedence, these owners are requested for review whenever someone opens a
+# pull request.
+* @grafana/grafana-agent-core-maintainers
+
+# Binaries:
+/cmd/grafana-agent-operator/  @grafana/grafana-agent-operator-maintainers
+
+# Documentation:
+/docs/sources/  @clayton-cornell
+
+# Components:
+/component/discovery/               @grafana/grafana-agent-infrastructure-maintainers
+/component/local/                   @grafana/grafana-agent-infrastructure-maintainers
+/component/loki/                    @grafana/grafana-agent-signals-maintainers
+/component/loki/source/podlogs/     @grafana/grafana-agent-infrastructure-maintainers
+/component/mimir/rules/kubernetes/  @grafana/grafana-agent-infrastructure-maintainers
+/component/otelcol/                 @grafana/grafana-agent-signals-maintainers
+/component/phlare/                  @grafana/grafana-agent-signals-maintainers
+/component/prometheus/              @grafana/grafana-agent-signals-maintainers
+/component/prometheus/exporter/     @grafana/grafana-agent-infrastructure-maintainers
+/component/remote/                  @grafana/grafana-agent-infrastructure-maintainers
+
+# Static mode packages:
+/pkg/integrations/  @grafana/grafana-agent-infrastructure-maintainers
+/pkg/logs/          @grafana/grafana-agent-signals-maintainers
+/pkg/metrics/       @grafana/grafana-agent-signals-maintainers
+/pkg/mimir/client/  @grafana/grafana-agent-infrastructure-maintainers
+/pkg/operator/      @grafana/grafana-agent-operator-maintainers
+/pkg/traces/        @grafana/grafana-agent-signals-maintainers

MAINTAINERS.md

@@ -1,19 +1,5 @@
-The following people are the primary maintainers of the project:
+The primary maintainers of the codebase are the list of team members in
+[GOVERNANCE](./GOVERNANCE.md).
 
-* Robert Fratto (<[email protected]> / @rfratto)
-* Matt Durham (<[email protected]> / @mattdurham)
-* Paschalis Tsilias (<[email protected]> / @tpaschalis)
-
-Some parts of the codebase have other maintainers:
-
-* `cmd/grafana-agent-operator`: Craig Peterson (<[email protected]> / @catpncraig), Marc Tudurí (<[email protected]> / @marctc), Jorge Creixell (<[email protected]> / @jcreixell)
-* `docs/sources`: Eve Meelan ([email protected] / @Eve832)
-* `pkg/integrations`: Gabriel Antunes (<[email protected]> / @gaantunes), Ryan Geyer (<[email protected]> / @rgeyer), Craig Peterson (<[email protected]> / @catpncraig), Marc Tudurí (<[email protected]> / @marctc), Jorge Creixell (<[email protected]> / @jcreixell)
-* `pkg/operator`: Craig Peterson (<[email protected]> / @catpncraig), Marc Tudurí (<[email protected]> / @marctc), Jorge Creixell (<[email protected]> / @jcreixell)
-* `pkg/traces`: Joe Elliott (<[email protected]> / @joe-elliott), Mario Rodriguez (<[email protected]>/ @mapno)
-
-For the sake of brevity, not all subtrees are explicitly listed. Due to the
-size of this repository, the natural changes in focus of maintainers over time,
-and nuances of where particular features live, this list will always be
-incomplete and out of date. However the listed maintainer(s) should be able to
-direct a PR/question to the right person.
+Some parts of the codebase have other maintainers based on GitHub groups. Refer
+to [CODEOWNERS](./CODEOWNERS) for which groups own which subtrees.