george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1602] config: Enable metrics and profiler services with a flag

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-07-13 12:17:37 +03:00 • committed by fyrchik
parent 12dc5c3395
commit ac46d1a11f
16 changed files with 53 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/neofs-node/config.go
View file

@ -321,9 +321,11 @@ func initCfg(path string) *cfg {
user.IDFromKey(&c.ownerIDFromKey, key.PrivateKey.PublicKey)
if metricsconfig.Address(c.appCfg) != "" {
if metricsconfig.Enabled(c.appCfg) {
c.metricsCollector = metrics.NewStorageMetrics()
netState.metrics = c.metricsCollector
} else {
c.log.Info("prometheus metrics are disabled")
}
c.onShutdown(c.clientCache.CloseAll) // clean up connections

10
cmd/neofs-node/config/metrics/config.go
View file

@ -13,9 +13,17 @@ const (
ShutdownTimeoutDefault = 30 * time.Second
// AddressDefault is a default value for metrics HTTP service endpoint.
AddressDefault = ""
AddressDefault = "localhost:9090"
)
// Enabled returns the value of "enabled" config parameter
// from "metrics" section.
//
// Returns false if the value is missing or invalid.
func Enabled(c *config.Config) bool {
return config.BoolSafe(c.Sub(subsection), "enabled")
}
// ShutdownTimeout returns the value of "shutdown_timeout" config parameter
// from "metrics" section.
//

2
cmd/neofs-node/config/metrics/config_test.go
View file

@ -17,6 +17,7 @@ func TestMetricsSection(t *testing.T) {
require.Equal(t, metricsconfig.ShutdownTimeoutDefault, to)
require.Equal(t, metricsconfig.AddressDefault, addr)
require.False(t, metricsconfig.Enabled(configtest.EmptyConfig()))
})
const path = "../../../../config/example/node"
@ -27,6 +28,7 @@ func TestMetricsSection(t *testing.T) {
require.Equal(t, 15*time.Second, to)
require.Equal(t, "localhost:9090", addr)
require.True(t, metricsconfig.Enabled(c))
}
configtest.ForEachFileType(path, fileConfigTest)

10
cmd/neofs-node/config/profiler/config.go
View file

@ -13,9 +13,17 @@ const (
ShutdownTimeoutDefault = 30 * time.Second
// AddressDefault is a default value for profiler HTTP service endpoint.
AddressDefault = ""
AddressDefault = "localhost:6060"
)
// Enabled returns the value of "enabled" config parameter
// from "profiler" section.
//
// Returns false if the value is missing or invalid.
func Enabled(c *config.Config) bool {
return config.BoolSafe(c.Sub(subsection), "enabled")
}
// ShutdownTimeout returns the value of "shutdown_timeout" config parameter
// from "profiler" section.
//

2
cmd/neofs-node/config/profiler/config_test.go
View file

@ -17,6 +17,7 @@ func TestProfilerSection(t *testing.T) {
require.Equal(t, profilerconfig.ShutdownTimeoutDefault, to)
require.Equal(t, profilerconfig.AddressDefault, addr)
require.False(t, profilerconfig.Enabled(configtest.EmptyConfig()))
})
const path = "../../../../config/example/node"
@ -27,6 +28,7 @@ func TestProfilerSection(t *testing.T) {
require.Equal(t, 15*time.Second, to)
require.Equal(t, "localhost:6060", addr)
require.True(t, profilerconfig.Enabled(c))
}
configtest.ForEachFileType(path, fileConfigTest)

5
cmd/neofs-node/metrics.go
View file

@ -10,14 +10,13 @@ import (
)
func initMetrics(c *cfg) {
addr := metricsconfig.Address(c.appCfg)
if addr == "" {
if !metricsconfig.Enabled(c.appCfg) {
return
}
var prm httputil.Prm
prm.Address = addr
prm.Address = metricsconfig.Address(c.appCfg)
prm.Handler = promhttp.Handler()
srv := httputil.New(prm,

6
cmd/neofs-node/pprof.go
View file

@ -9,14 +9,14 @@ import (
)
func initProfiler(c *cfg) {
addr := profilerconfig.Address(c.appCfg)
if addr == "" {
if !profilerconfig.Enabled(c.appCfg) {
c.log.Info("pprof is disabled")
return
}
var prm httputil.Prm
prm.Address = addr
prm.Address = profilerconfig.Address(c.appCfg)
prm.Handler = httputil.Handler()
srv := httputil.New(prm,