From 8b59a3e3875c096a55d3d4f8e399e2c39e8bb694 Mon Sep 17 00:00:00 2001 From: Siyuan Miao Date: Fri, 7 Mar 2025 20:01:14 +0100 Subject: [PATCH] chore(prometheus): move prometheus to a new file --- main.go | 2 ++ prometheus.go | 17 +++++++++++++++++ web.go | 5 ----- 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 prometheus.go diff --git a/main.go b/main.go index e23e9c8..a3caba7 100644 --- a/main.go +++ b/main.go @@ -36,6 +36,8 @@ func Main() { StartNativeCtrlSocketServer() StartNativeVideoSocketServer() + initPrometheus() + go func() { err = ExtractAndRunNativeBin() if err != nil { diff --git a/prometheus.go b/prometheus.go new file mode 100644 index 0000000..8ebf259 --- /dev/null +++ b/prometheus.go @@ -0,0 +1,17 @@ +package kvm + +import ( + "net/http" + + "github.com/prometheus/client_golang/prometheus" + versioncollector "github.com/prometheus/client_golang/prometheus/collectors/version" + "github.com/prometheus/common/version" +) + +var promHandler http.Handler + +func initPrometheus() { + // A Prometheus metrics endpoint. + version.Version = builtAppVersion + prometheus.MustRegister(versioncollector.NewCollector("jetkvm")) +} diff --git a/web.go b/web.go index dea3e17..b35a2db 100644 --- a/web.go +++ b/web.go @@ -12,10 +12,7 @@ import ( "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/prometheus/client_golang/prometheus" - versioncollector "github.com/prometheus/client_golang/prometheus/collectors/version" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/prometheus/common/version" "golang.org/x/crypto/bcrypt" ) @@ -90,8 +87,6 @@ func setupRouter() *gin.Engine { r.POST("/device/setup", handleSetup) // A Prometheus metrics endpoint. - version.Version = builtAppVersion - prometheus.MustRegister(versioncollector.NewCollector("jetkvm")) r.GET("/metrics", gin.WrapH(promhttp.Handler())) // Protected routes (allows both password and noPassword modes)