IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(alerting): only expose metrics if executing alerts (#85512)

Browse Source
This commit is contained in:
Jean-Philippe Quéméner 2024-04-03 17:18:02 +02:00 committed by GitHub
parent 85127464a3
commit 7cfd470c91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/ngalert/ngalert.go
View File

@ -279,6 +279,7 @@ func (ng *AlertNG) init() error {
cfg := state.ManagerCfg{ cfg := state.ManagerCfg{
Metrics: ng.Metrics.GetStateMetrics(), Metrics: ng.Metrics.GetStateMetrics(),
ExternalURL: appUrl, ExternalURL: appUrl,
DisableExecution: !ng.Cfg.UnifiedAlerting.ExecuteAlerts,
InstanceStore: ng.store, InstanceStore: ng.store,
Images: ng.ImageService, Images: ng.ImageService,
Clock: clk, Clock: clk,

5
pkg/services/ngalert/state/manager.go
View File

@ -71,6 +71,8 @@ type ManagerCfg struct {
ApplyNoDataAndErrorToAllStates bool ApplyNoDataAndErrorToAllStates bool
RulesPerRuleGroupLimit int64 RulesPerRuleGroupLimit int64
DisableExecution bool
Tracer tracing.Tracer Tracer tracing.Tracer
Log log.Logger Log log.Logger
} }
@ -78,7 +80,8 @@ type ManagerCfg struct {
func NewManager(cfg ManagerCfg, statePersister StatePersister) *Manager { func NewManager(cfg ManagerCfg, statePersister StatePersister) *Manager {
// Metrics for the cache use a collector, so they need access to the register directly. // Metrics for the cache use a collector, so they need access to the register directly.
c := newCache() c := newCache()
if cfg.Metrics != nil { // Only expose the metrics if this grafana server does execute alerts.
if cfg.Metrics != nil && !cfg.DisableExecution {
c.RegisterMetrics(cfg.Metrics.Registerer()) c.RegisterMetrics(cfg.Metrics.Registerer())
} }