public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K8s: Remove grafanaAPIServer feature toggle (#81030)

Browse Source
This commit is contained in:
Ryan McKinley
2024-01-23 08:27:28 -08:00
committed by GitHub
parent aa25776f81
commit 2b355ff280
13 changed files with 8 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/infra/metrics/service.go
+3 -11
View File
@@ -12,7 +12,6 @@ import (
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics/graphitebridge"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/setting"
)
@@ -61,19 +60,12 @@ func (im *InternalMetricsService) Run(ctx context.Context) error {
}
func ProvideRegisterer(cfg *setting.Cfg) prometheus.Registerer {
if cfg.IsFeatureToggleEnabled(featuremgmt.FlagGrafanaAPIServer) {
return legacyregistry.Registerer()
}
return prometheus.DefaultRegisterer
return legacyregistry.Registerer()
}
func ProvideGatherer(cfg *setting.Cfg) prometheus.Gatherer {
if cfg.IsFeatureToggleEnabled(featuremgmt.FlagGrafanaAPIServer) {
k8sGatherer := newAddPrefixWrapper(legacyregistry.DefaultGatherer)
return newMultiRegistry(k8sGatherer, prometheus.DefaultGatherer)
}
return prometheus.DefaultGatherer
k8sGatherer := newAddPrefixWrapper(legacyregistry.DefaultGatherer)
return newMultiRegistry(k8sGatherer, prometheus.DefaultGatherer)
}
func ProvideRegistererForTest() prometheus.Registerer {