diff --git a/cmd/kg/main.go b/cmd/kg/main.go index c8d423d..11f20b9 100644 --- a/cmd/kg/main.go +++ b/cmd/kg/main.go @@ -250,8 +250,6 @@ func runRoot(_ *cobra.Command, _ []string) error { return fmt.Errorf("failed to create Kilo mesh: %v", err) } - m.RegisterMetrics(registry) - var g run.Group { h := internalserver.NewHandler( diff --git a/pkg/mesh/mesh.go b/pkg/mesh/mesh.go index 040790d..f1091dc 100644 --- a/pkg/mesh/mesh.go +++ b/pkg/mesh/mesh.go @@ -160,7 +160,7 @@ func New(backend Backend, enc encapsulation.Encapsulator, granularity Granularit if err != nil { return nil, fmt.Errorf("failed to IP tables controller: %v", err) } - return &Mesh{ + mesh := Mesh{ Backend: backend, cleanUpIface: cleanUpIface, cni: cni, @@ -205,7 +205,15 @@ func New(backend Backend, enc encapsulation.Encapsulator, granularity Granularit Help: "Number of reconciliation attempts.", }), logger: logger, - }, nil + } + registerer.MustRegister( + mesh.errorCounter, + mesh.leaderGuage, + mesh.nodesGuage, + mesh.peersGuage, + mesh.reconcileCounter, + ) + return &mesh, nil } // Run starts the mesh. @@ -575,18 +583,6 @@ func (m *Mesh) applyTopology() { } } -// RegisterMetrics registers Prometheus metrics on the given Prometheus -// registerer. -func (m *Mesh) RegisterMetrics(r prometheus.Registerer) { - r.MustRegister( - m.errorCounter, - m.leaderGuage, - m.nodesGuage, - m.peersGuage, - m.reconcileCounter, - ) -} - func (m *Mesh) cleanUp() { if err := m.ipTables.CleanUp(); err != nil { level.Error(m.logger).Log("error", fmt.Sprintf("failed to clean up IP tables: %v", err))