From bc9fe7f656cbaacbf9bd62a54ec65b2ffe6e0453 Mon Sep 17 00:00:00 2001 From: LiHui Date: Mon, 4 Jan 2021 15:36:30 +0800 Subject: [PATCH] add process and goroutine metrics Signed-off-by: LiHui --- pkg/apiserver/apiserver.go | 2 ++ pkg/utils/metrics/metrics.go | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index 010b2687b..d3a47c7a3 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -82,10 +82,12 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/openpitrix" "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/simple/client/sonarqube" + "kubesphere.io/kubesphere/pkg/utils/metrics" utilnet "kubesphere.io/kubesphere/pkg/utils/net" "net/http" rt "runtime" runtimecache "sigs.k8s.io/controller-runtime/pkg/cache" + "strconv" "time" ) diff --git a/pkg/utils/metrics/metrics.go b/pkg/utils/metrics/metrics.go index 447549886..b18a1dd37 100644 --- a/pkg/utils/metrics/metrics.go +++ b/pkg/utils/metrics/metrics.go @@ -17,12 +17,18 @@ var ( MustRegister func(...compbasemetrics.Registerable) // Register registers a collectable metric but uses the defaultRegistry Register func(compbasemetrics.Registerable) error + + RawMustRegister func(...prometheus.Collector) ) func init() { defaultRegistry = compbasemetrics.NewKubeRegistry() MustRegister = defaultRegistry.MustRegister Register = defaultRegistry.Register + RawMustRegister = defaultRegistry.RawMustRegister + + RawMustRegister(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{})) + RawMustRegister(prometheus.NewGoCollector()) } // DefaultMetrics installs the default prometheus metrics handler @@ -33,6 +39,7 @@ func (m DefaultMetrics) Install(c *restful.Container) { c.Handle("/kapis/metrics", Handler()) } +//Overwrite version.Get func versionGet() apimachineryversion.Info { info := ksVersion.Get() return apimachineryversion.Info{