opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 08:12:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
This commit is contained in:
Todd Treece
2023-12-04 13:54:59 -05:00
committed by GitHub
parent cd584e9261
commit 38bc41651a
13 changed files with 197 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cmd/grafana-server/commands/cli.go
View File

@ -16,6 +16,7 @@ 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"
@ -97,9 +98,6 @@ func RunServer(opts ServerOptions) error {
}
}()
setBuildInfo(opts)
checkPrivileges()
configOptions := strings.Split(ConfigOverrides, " ")
cfg, err := setting.NewCfgFromArgs(setting.CommandLineArgs{
Config: ConfigFile,
@ -111,6 +109,9 @@ func RunServer(opts ServerOptions) error {
return err
}
setBuildInfo(metrics.ProvideRegisterer(cfg), opts)
checkPrivileges()
s, err := server.Initialize(
cfg,
server.Options{