public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix promver collector to default buildinfo collector

This commit is contained in:
Cody Lee 2024-04-19 15:50:13 -05:00
parent 76f8becb5a
commit 5b58e6c237
No known key found for this signature in database
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/promunifi/collector.go
View File

@ -3,6 +3,7 @@ package promunifi
import ( import (
"fmt" "fmt"
"github.com/prometheus/client_golang/prometheus/collectors"
"net" "net"
"net/http" "net/http"
"reflect" "reflect"
@ -121,15 +122,15 @@ func (u *promUnifi) DebugOutput() (bool, error) {
if u == nil { if u == nil {
return true, nil return true, nil
} }
if !u.Enabled() { if !u.Enabled() {
return true, nil return true, nil
} }
if u.HTTPListen == "" { if u.HTTPListen == "" {
return false, fmt.Errorf("invalid listen string") return false, fmt.Errorf("invalid listen string")
} }
// check the port // check the port
parts := strings.Split(u.HTTPListen, ":") parts := strings.Split(u.HTTPListen, ":")
if len(parts) != 2 { if len(parts) != 2 {
@ -140,9 +141,9 @@ func (u *promUnifi) DebugOutput() (bool, error) {
if err != nil { if err != nil {
return false, err return false, err
} }
_ = ln.Close() _ = ln.Close()
return true, nil return true, nil
} }
@ -150,11 +151,11 @@ func (u *promUnifi) Enabled() bool {
if u == nil { if u == nil {
return false return false
} }
if u.Config == nil { if u.Config == nil {
return false return false
} }
return !u.Disable return !u.Disable
} }
@ -167,7 +168,7 @@ func (u *promUnifi) Run(c poller.Collect) error {
return nil return nil
} }
u.Logf("Prometheus is enabled") u.Logf("Prometheus is enabled")
u.Namespace = strings.Trim(strings.ReplaceAll(u.Namespace, "-", "_"), "_") u.Namespace = strings.Trim(strings.ReplaceAll(u.Namespace, "-", "_"), "_")
@ -198,7 +199,7 @@ func (u *promUnifi) Run(c poller.Collect) error {
promver.Branch = version.Branch promver.Branch = version.Branch
webserver.UpdateOutput(&webserver.Output{Name: PluginName, Config: u.Config}) webserver.UpdateOutput(&webserver.Output{Name: PluginName, Config: u.Config})
prometheus.MustRegister(promver.NewCollector(u.Namespace)) prometheus.MustRegister(collectors.NewBuildInfoCollector())
prometheus.MustRegister(u) prometheus.MustRegister(u)
mux.Handle("/metrics", promhttp.HandlerFor(prometheus.DefaultGatherer, mux.Handle("/metrics", promhttp.HandlerFor(prometheus.DefaultGatherer,
promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError},
@ -209,11 +210,11 @@ func (u *promUnifi) Run(c poller.Collect) error {
switch u.SSLKeyPath == "" && u.SSLCrtPath == "" { switch u.SSLKeyPath == "" && u.SSLCrtPath == "" {
case true: case true:
u.Logf("Prometheus exported at http://%s/ - namespace: %s", u.HTTPListen, u.Namespace) u.Logf("Prometheus exported at http://%s/ - namespace: %s", u.HTTPListen, u.Namespace)
return http.ListenAndServe(u.HTTPListen, mux) return http.ListenAndServe(u.HTTPListen, mux)
default: default:
u.Logf("Prometheus exported at https://%s/ - namespace: %s", u.HTTPListen, u.Namespace) u.Logf("Prometheus exported at https://%s/ - namespace: %s", u.HTTPListen, u.Namespace)
return http.ListenAndServeTLS(u.HTTPListen, u.SSLCrtPath, u.SSLKeyPath, mux) return http.ListenAndServeTLS(u.HTTPListen, u.SSLCrtPath, u.SSLKeyPath, mux)
} }
} }