DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Remove caches, retry fetching the hostname

Browse source 
Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2023-01-29 13:16:35 +02:00
parent 77f96d2761
commit 8d17498ab8
No known key found for this signature in database
GPG key ID: 7D073DCC2C074CB5
4 changed files with 49 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

20
metrics/metrics.go
View file

@ -2,7 +2,6 @@ package metrics
import (
"log"
"sync"
"garm/auth"
"garm/params"
@ -86,19 +85,6 @@ type GarmCollector struct {
instanceMetric *prometheus.Desc
runner *runner.Runner
cachedControllerInfo params.ControllerInfo
mux sync.Mutex
}
func (c *GarmCollector) controllerInfo() params.ControllerInfo {
controllerInfo, err := c.runner.GetControllerInfo(auth.GetAdminContext())
if err != nil {
log.Printf("error getting controller info: %s", err)
return c.cachedControllerInfo
}
c.mux.Lock()
defer c.mux.Unlock()
c.cachedControllerInfo = controllerInfo
return c.cachedControllerInfo
}
func (c *GarmCollector) Describe(ch chan<- *prometheus.Desc) {
@ -107,7 +93,11 @@ func (c *GarmCollector) Describe(ch chan<- *prometheus.Desc) {
}
func (c *GarmCollector) Collect(ch chan<- prometheus.Metric) {
controllerInfo := c.controllerInfo()
controllerInfo, err := c.runner.GetControllerInfo(auth.GetAdminContext())
if err != nil {
log.Printf("failed to get controller info: %s", err)
return
}
c.CollectInstanceMetric(ch, controllerInfo.Hostname, controllerInfo.ControllerID.String())
c.CollectHealthMetric(ch, controllerInfo.Hostname, controllerInfo.ControllerID.String())
}