vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2025-09-04 03:29:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve metric instance detection and pushing

Browse source
This commit is contained in:
Daniel 2021-12-22 11:20:18 +01:00
parent 471c3030b7
commit 75d108001b
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
metrics/api.go
View file

@ -120,7 +120,7 @@ func writeMetricsTo(ctx context.Context, url string) error {
func metricsWriter(ctx context.Context) error { func metricsWriter(ctx context.Context) error {
pushURL := pushOption() pushURL := pushOption()
ticker := time.NewTicker(10 * time.Second) ticker := time.NewTicker(1 * time.Minute)
defer ticker.Stop() defer ticker.Stop()
for { for {

6
metrics/config.go
View file

@ -3,6 +3,7 @@ package metrics
import ( import (
"flag" "flag"
"os" "os"
"strings"
"github.com/safing/portbase/config" "github.com/safing/portbase/config"
) )
@ -25,7 +26,10 @@ var (
func init() { func init() {
hostname, err := os.Hostname() hostname, err := os.Hostname()
if err == nil { if err == nil {
defaultInstance = hostname hostname = strings.ReplaceAll(hostname, "-", "")
if prometheusFormat.MatchString(hostname) {
defaultInstance = hostname
}
} }
flag.StringVar(&pushFlag, "push-metrics", "", "set default URL to push prometheus metrics to") flag.StringVar(&pushFlag, "push-metrics", "", "set default URL to push prometheus metrics to")

2
metrics/module.go
View file

@ -35,7 +35,7 @@ var (
) )
func init() { func init() {
module = modules.Register("metrics", prep, start, stop, "database", "api") module = modules.Register("metrics", prep, start, stop, "config", "database", "api")
} }
func prep() error { func prep() error {