From 3dd547b5af95aa76627451e0722f7d1a59d85a7f Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 25 Apr 2025 18:27:19 +0200
Subject: [PATCH] POC: separate GPRC connection for health check

---
 pkg/services/authz/zanzana.go | 40 +++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/pkg/services/authz/zanzana.go b/pkg/services/authz/zanzana.go
index 521db54c13e..070d234f314 100644
--- a/pkg/services/authz/zanzana.go
+++ b/pkg/services/authz/zanzana.go
@@ -24,6 +24,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1"
 	"github.com/grafana/grafana/pkg/services/authz/zanzana"
+	zanzanaserver "github.com/grafana/grafana/pkg/services/authz/zanzana/server"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/grpcserver"
 	"github.com/grafana/grafana/pkg/services/grpcserver/interceptors"
@@ -203,8 +204,10 @@ func (z *Zanzana) start(ctx context.Context) error {
 	authzextv1.RegisterAuthzExtentionServiceServer(grpcServer, zanzanaServer)
 
 	// register grpc health server
-	healthServer := zanzana.NewHealthServer(zanzanaServer)
-	healthv1pb.RegisterHealthServer(grpcServer, healthServer)
+	err = z.registerHealthServer(ctx, zanzanaServer, tracer)
+	if err != nil {
+		z.logger.Error("failed to register health server", "error", err)
+	}
 
 	if _, err := grpcserver.ProvideReflectionService(z.cfg, z.handle); err != nil {
 		return fmt.Errorf("failed to register reflection for zanzana: %w", err)
@@ -213,6 +216,39 @@ func (z *Zanzana) start(ctx context.Context) error {
 	return nil
 }
 
+func (z *Zanzana) registerHealthServer(ctx context.Context, zanzanaServer *zanzanaserver.Server, tracer tracing.Tracer) error {
+	healthCfg := z.cfg
+	healthCfg.GRPCServer.TLSConfig = nil
+	healthCfg.GRPCServer.Address = "127.0.0.1:10001"
+	handle, err := grpcserver.ProvideService(
+		healthCfg,
+		z.features,
+		interceptors.AuthenticatorFunc(grpcutils.NewUnsafeAuthenticator(nil)),
+		tracer,
+		prometheus.DefaultRegisterer,
+	)
+	if err != nil {
+		return fmt.Errorf("failed to create zanzana grpc server: %w", err)
+	}
+
+	// register grpc health server
+	grpcServer := handle.GetServer()
+	healthServer := zanzana.NewHealthServer(zanzanaServer)
+	healthv1pb.RegisterHealthServer(grpcServer, healthServer)
+
+	if _, err := grpcserver.ProvideReflectionService(healthCfg, handle); err != nil {
+		return fmt.Errorf("failed to register reflection for health server: %w", err)
+	}
+
+	go func() {
+		if err := handle.Run(ctx); err != nil {
+			z.logger.Error("failed to start zanzana grpc health server", "error", err)
+		}
+	}()
+
+	return nil
+}
+
 func (z *Zanzana) running(ctx context.Context) error {
 	if z.cfg.Env == setting.Dev && z.cfg.ZanzanaServer.OpenFGAHttpAddr != "" {
 		go func() {