IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Todd Treece
2023-12-06 16:34:23 -05:00
committed by GitHub
parent c631261681
commit 2a2a132c61
13 changed files with 197 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/grafana-server/commands/buildinfo.go
+6 -5
View File
@@ -5,22 +5,23 @@ import (
"time"
"github.com/grafana/grafana/pkg/extensions"
"github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/setting"
)
func setBuildInfo(opts ServerOptions) {
func getBuildstamp(opts ServerOptions) int64 {
buildstampInt64, err := strconv.ParseInt(opts.BuildStamp, 10, 64)
if err != nil || buildstampInt64 == 0 {
buildstampInt64 = time.Now().Unix()
}
return buildstampInt64
}
func setBuildInfo(opts ServerOptions) {
setting.BuildVersion = opts.Version
setting.BuildCommit = opts.Commit
setting.EnterpriseBuildCommit = opts.EnterpriseCommit
setting.BuildStamp = buildstampInt64
setting.BuildStamp = getBuildstamp(opts)
setting.BuildBranch = opts.BuildBranch
setting.IsEnterprise = extensions.IsEnterprise
setting.Packaging = validPackaging(Packaging)
metrics.SetBuildInformation(opts.Version, opts.Commit, opts.BuildBranch, buildstampInt64)
}
pkg/cmd/grafana-server/commands/cli.go
+3
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"
@@ -111,6 +112,8 @@ func RunServer(opts ServerOptions) error {
return err
}
metrics.SetBuildInformation(metrics.ProvideRegisterer(cfg), opts.Version, opts.Commit, opts.BuildBranch, getBuildstamp(opts))
s, err := server.Initialize(
cfg,
server.Options{
pkg/cmd/grafana-server/commands/target.go
+3
View File
@@ -11,6 +11,7 @@ import (
"github.com/grafana/grafana/pkg/api"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/server"
"github.com/grafana/grafana/pkg/setting"
)
@@ -88,6 +89,8 @@ func RunTargetServer(opts ServerOptions) error {
return err
}
metrics.SetBuildInformation(metrics.ProvideRegisterer(cfg), opts.Version, opts.Commit, opts.BuildBranch, getBuildstamp(opts))
s, err := server.InitializeModuleServer(
cfg,
server.Options{