From 8fef57aa8dee1853a92e4182aa25c1fc8535398a Mon Sep 17 00:00:00 2001 From: Sergey Stepanov Date: Thu, 6 Jul 2023 00:04:05 +0300 Subject: [PATCH] Use TLS with the monitoring / profiling routes --- pkg/coordinator/coordinator.go | 2 +- pkg/monitoring/monitoring.go | 3 ++- pkg/worker/worker.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/coordinator/coordinator.go b/pkg/coordinator/coordinator.go index c3601666..66c37e8e 100644 --- a/pkg/coordinator/coordinator.go +++ b/pkg/coordinator/coordinator.go @@ -28,7 +28,7 @@ func New(conf config.CoordinatorConfig, log *logger.Logger) (services service.Gr } services.Add(hub, h) if conf.Coordinator.Monitoring.IsEnabled() { - services.Add(monitoring.New(conf.Coordinator.Monitoring, h.GetHost(), log)) + services.Add(monitoring.New(conf.Coordinator.Monitoring, conf.Coordinator.Server, h.GetHost(), log)) } return } diff --git a/pkg/monitoring/monitoring.go b/pkg/monitoring/monitoring.go index a071672b..a040ea20 100644 --- a/pkg/monitoring/monitoring.go +++ b/pkg/monitoring/monitoring.go @@ -23,7 +23,7 @@ type Monitoring struct { // New creates new monitoring service. // The tag param specifies owner label for logs. -func New(conf config.Monitoring, baseAddr string, log *logger.Logger) *Monitoring { +func New(conf config.Monitoring, servConf config.Server, baseAddr string, log *logger.Logger) *Monitoring { serv, err := httpx.NewServer( net.JoinHostPort(baseAddr, strconv.Itoa(conf.Port)), func(s *httpx.Server) httpx.Handler { @@ -52,6 +52,7 @@ func New(conf config.Monitoring, baseAddr string, log *logger.Logger) *Monitorin return h }, httpx.WithPortRoll(true), + httpx.WithServerConfig(servConf), httpx.WithLogger(log), ) if err != nil { diff --git a/pkg/worker/worker.go b/pkg/worker/worker.go index 0af214cb..20e6dab1 100644 --- a/pkg/worker/worker.go +++ b/pkg/worker/worker.go @@ -48,7 +48,7 @@ func New(conf config.WorkerConfig, log *logger.Logger, done chan struct{}) (serv } services.Add(h) if conf.Worker.Monitoring.IsEnabled() { - services.Add(monitoring.New(conf.Worker.Monitoring, h.GetHost(), log)) + services.Add(monitoring.New(conf.Worker.Monitoring, conf.Worker.Server, h.GetHost(), log)) } st, err := GetCloudStorage(conf.Storage.Provider, conf.Storage.Key) if err != nil {