Breaking: Rename minitor_check_milliseconds
and minitor_monitor_up_count
To conform with Prometheus metric name best practices, these have been renamed as follows: * `minitor_check_milliseconds` to `minitor_check_seconds` * `minitor_monitor_up_count` to `minitor_monitor_up`
This commit is contained in:
parent
958446050f
commit
60cfac948b
@ -9,6 +9,7 @@ linters:
|
||||
- gomnd
|
||||
- goprintffuncname
|
||||
- misspell
|
||||
- promlinter
|
||||
- tagliatelle
|
||||
- tenv
|
||||
- testpackage
|
||||
|
2
main.go
2
main.go
@ -76,7 +76,7 @@ func checkMonitors(config *Config) error {
|
||||
|
||||
// Track status metrics
|
||||
Metrics.SetMonitorStatus(monitor.Name, monitor.IsUp())
|
||||
Metrics.CountCheck(monitor.Name, success, monitor.LastCheckMilliseconds(), hasAlert)
|
||||
Metrics.CountCheck(monitor.Name, success, monitor.LastCheckSeconds(), hasAlert)
|
||||
|
||||
if alertNotice != nil {
|
||||
err := sendAlerts(config, monitor, alertNotice)
|
||||
|
@ -43,14 +43,14 @@ func NewMetrics() *MinitorMetrics {
|
||||
),
|
||||
checkTime: prometheus.NewGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "minitor_check_milliseconds",
|
||||
Name: "minitor_check_seconds",
|
||||
Help: "Time in miliseconds that a check ran for",
|
||||
},
|
||||
[]string{"monitor", "status"},
|
||||
),
|
||||
monitorStatus: prometheus.NewGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "minitor_monitor_up_count",
|
||||
Name: "minitor_monitor_up",
|
||||
Help: "Status of currently responsive monitors",
|
||||
},
|
||||
[]string{"monitor"},
|
||||
@ -77,7 +77,7 @@ func (metrics *MinitorMetrics) SetMonitorStatus(monitor string, isUp bool) {
|
||||
}
|
||||
|
||||
// CountCheck counts the result of a particular Monitor check
|
||||
func (metrics *MinitorMetrics) CountCheck(monitor string, isSuccess bool, ms int64, isAlert bool) {
|
||||
func (metrics *MinitorMetrics) CountCheck(monitor string, isSuccess bool, secs float64, isAlert bool) {
|
||||
status := "failure"
|
||||
if isSuccess {
|
||||
status = "success"
|
||||
@ -94,7 +94,7 @@ func (metrics *MinitorMetrics) CountCheck(monitor string, isSuccess bool, ms int
|
||||
|
||||
metrics.checkTime.With(
|
||||
prometheus.Labels{"monitor": monitor, "status": status},
|
||||
).Set(float64(ms))
|
||||
).Set(secs)
|
||||
}
|
||||
|
||||
// CountAlert counts an alert
|
||||
|
@ -91,9 +91,9 @@ func (monitor Monitor) IsUp() bool {
|
||||
return monitor.alertCount == 0
|
||||
}
|
||||
|
||||
// LastCheckMilliseconds gives number of miliseconds the last check ran for
|
||||
func (monitor Monitor) LastCheckMilliseconds() int64 {
|
||||
return monitor.lastCheckDuration.Milliseconds()
|
||||
// LastCheckSeconds gives number of seconds the last check ran for
|
||||
func (monitor Monitor) LastCheckSeconds() float64 {
|
||||
return monitor.lastCheckDuration.Seconds()
|
||||
}
|
||||
|
||||
func (monitor *Monitor) success() (notice *AlertNotice) {
|
||||
|
Loading…
Reference in New Issue
Block a user