Revert "K8s: Refactor metrics to share k8s registry (#77957)" (#79079)

This reverts commit 38bc41651a.
This commit is contained in:
Todd Treece
2023-12-05 09:34:07 -05:00
committed by GitHub
parent c30098e772
commit 7e2aad1d01
13 changed files with 39 additions and 197 deletions
+3 -4
View File
@@ -16,7 +16,6 @@ import (
"github.com/grafana/grafana/pkg/api"
gcli "github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/infra/process"
"github.com/grafana/grafana/pkg/server"
_ "github.com/grafana/grafana/pkg/services/alerting/conditions"
@@ -98,6 +97,9 @@ func RunServer(opts ServerOptions) error {
}
}()
setBuildInfo(opts)
checkPrivileges()
configOptions := strings.Split(ConfigOverrides, " ")
cfg, err := setting.NewCfgFromArgs(setting.CommandLineArgs{
Config: ConfigFile,
@@ -109,9 +111,6 @@ func RunServer(opts ServerOptions) error {
return err
}
setBuildInfo(metrics.ProvideRegisterer(cfg), opts)
checkPrivileges()
s, err := server.Initialize(
cfg,
server.Options{