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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cmd/grafana-server/commands/buildinfo.go
View File

@@ -4,14 +4,12 @@ import (
"strconv"
"time"
"github.com/prometheus/client_golang/prometheus"
"github.com/grafana/grafana/pkg/extensions"
"github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/setting"
)
func setBuildInfo(reg prometheus.Registerer, opts ServerOptions) {
func setBuildInfo(opts ServerOptions) {
buildstampInt64, err := strconv.ParseInt(opts.BuildStamp, 10, 64)
if err != nil || buildstampInt64 == 0 {
buildstampInt64 = time.Now().Unix()
@@ -24,5 +22,5 @@ func setBuildInfo(reg prometheus.Registerer, opts ServerOptions) {
setting.IsEnterprise = extensions.IsEnterprise
setting.Packaging = validPackaging(Packaging)
metrics.SetBuildInformation(reg, opts.Version, opts.Commit, opts.BuildBranch, buildstampInt64)
metrics.SetBuildInformation(opts.Version, opts.Commit, opts.BuildBranch, buildstampInt64)
}