allow ingester and distributor to run on same instance (grafana#4348)

trevorwhitney · slim-bean · web-flow · commit 12253ecf1bfc · 2021-09-17T16:29:30.000-04:00
* allow ingester and distributor to run on same instance

Signed-off-by: Trevor Whitney &lt;trevorjwhitney@gmail.com&gt;

* add comment around conditional distributor Push registration

Co-authored-by: Ed Welch &lt;edward.welch@grafana.com&gt;

* lint

Co-authored-by: Ed Welch &lt;edward.welch@grafana.com&gt;
diff --git a/pkg/loki/modules.go b/pkg/loki/modules.go
@@ -173,7 +173,9 @@ func (t *Loki) initDistributor() (services.Service, error) {
 		return nil, err
 	}
 
-	if !t.Cfg.isModuleEnabled(All) {
+	// Register the distributor to receive Push requests over GRPC
+	// EXCEPT when running with `-target=all` or `-target=` contains `ingester`
+	if !t.Cfg.isModuleEnabled(All) && !t.Cfg.isModuleEnabled(Ingester) {
 		logproto.RegisterPusherServer(t.Server.GRPC, t.distributor)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,9 @@ func (t *Loki) initDistributor() (services.Service, error) {`
`173`	`173`	`return nil, err`
`174`	`174`	`}`
`175`	`175`
`176`		`- if !t.Cfg.isModuleEnabled(All) {`
	`176`	`+ // Register the distributor to receive Push requests over GRPC`
	`177`	+ // EXCEPT when running with `-target=all` or `-target=` contains `ingester`
	`178`	`+ if !t.Cfg.isModuleEnabled(All) && !t.Cfg.isModuleEnabled(Ingester) {`
`177`	`179`	`logproto.RegisterPusherServer(t.Server.GRPC, t.distributor)`
`178`	`180`	`}`
`179`	`181`