Skip to content

Commit 8299285

Browse files
PhilldomdPhilldomd
committed
Following the name standard for metrics
Signed-off-by: Örnfeldt Philip (66140321) <philip.ornfeldt@forsakringskassan.se>
1 parent 627992f commit 8299285

3 files changed

Lines changed: 68 additions & 68 deletions

File tree

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ Global:
5252
* _System/HAChecksums_
5353
* `fortigate_ha_member_has_role`
5454
* _System/Ntp/Status_
55-
* `fortigate_system_ntp_delay`
56-
* `fortigate_system_ntp_dispersion`
57-
* `fortigate_system_ntp_dispersion_peer`
58-
* `fortigate_system_ntp_expires`
59-
* `fortigate_system_ntp_offset`
60-
* `fortigate_system_ntp_reftime`
55+
* `fortigate_system_ntp_delay_seconds`
56+
* `fortigate_system_ntp_dispersion_seconds`
57+
* `fortigate_system_ntp_dispersion_peer_seconds`
58+
* `fortigate_system_ntp_expires_seconds`
59+
* `fortigate_system_ntp_offset_seconds`
60+
* `fortigate_system_ntp_reftime_seconds`
6161
* `fortigate_system_ntp_stratum`
6262
* _License/Status_
6363
* `fortigate_license_vdom_usage`

‎pkg/probe/system_ntp_status.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
func probeSystemNtpStatus(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
2525
var (
2626
ntpExpires = prometheus.NewDesc(
27-
"fortigate_system_ntp_expires",
27+
"fortigate_system_ntp_expires_seconds",
2828
"NTP expire time, in seconds",
2929
[]string{"ip", "server", "reachable", "selected", "version", "vdom"}, nil,
3030
)
@@ -34,28 +34,28 @@ func probeSystemNtpStatus(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.
3434
[]string{"ip", "server", "reachable", "selected", "version", "vdom"}, nil,
3535
)
3636
ntpRefTime = prometheus.NewDesc(
37-
"fortigate_system_ntp_reftime",
37+
"fortigate_system_ntp_reftime_seconds",
3838
"NTP reftime in epoch seconds",
3939
[]string{"ip", "server", "reachable", "selected", "version", "vdom"}, nil,
4040
)
4141
ntpOffset = prometheus.NewDesc(
42-
"fortigate_system_ntp_offset",
43-
"NTP combined offset, in milliseconds",
42+
"fortigate_system_ntp_offset_seconds",
43+
"NTP combined offset, in seconds",
4444
[]string{"ip", "server", "reachable", "selected", "version", "vdom"}, nil,
4545
)
4646
ntpDelay = prometheus.NewDesc(
47-
"fortigate_system_ntp_delay",
48-
"NTP round trip delay, in milliseconds",
47+
"fortigate_system_ntp_delay_seconds",
48+
"NTP round trip delay, in seconds",
4949
[]string{"ip", "server", "reachable", "selected", "version", "vdom"}, nil,
5050
)
5151
ntpDispersion = prometheus.NewDesc(
52-
"fortigate_system_ntp_dispersion",
53-
"NTP dispersion to primary clock, in milliseconds",
52+
"fortigate_system_ntp_dispersion_seconds",
53+
"NTP dispersion to primary clock, in seconds",
5454
[]string{"ip", "server", "reachable", "selected", "version", "vdom"}, nil,
5555
)
5656
ntpPeerDispersion = prometheus.NewDesc(
57-
"fortigate_system_ntp_dispersion_peer",
58-
"NTP peer dispersion, in milliseconds",
57+
"fortigate_system_ntp_dispersion_peer_seconds",
58+
"NTP peer dispersion, in seconds",
5959
[]string{"ip", "server", "reachable", "selected", "version", "vdom"}, nil,
6060
)
6161
)
@@ -93,10 +93,10 @@ func probeSystemNtpStatus(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.
9393
m = append(m, prometheus.MustNewConstMetric(ntpExpires, prometheus.GaugeValue, float64(r.Expires), r.Ip, r.Server, strconv.FormatBool(r.Reachable), strconv.FormatBool(r.Reachable), strconv.Itoa(r.Version), res.VDOM))
9494
m = append(m, prometheus.MustNewConstMetric(ntpStratum, prometheus.GaugeValue, float64(r.Stratum), r.Ip, r.Server, strconv.FormatBool(r.Reachable), strconv.FormatBool(r.Reachable), strconv.Itoa(r.Version), res.VDOM))
9595
m = append(m, prometheus.MustNewConstMetric(ntpRefTime, prometheus.CounterValue, float64(r.Reftime), r.Ip, r.Server, strconv.FormatBool(r.Reachable), strconv.FormatBool(r.Reachable), strconv.Itoa(r.Version), res.VDOM))
96-
m = append(m, prometheus.MustNewConstMetric(ntpOffset, prometheus.GaugeValue, float64(r.Offset), r.Ip, r.Server, strconv.FormatBool(r.Reachable), strconv.FormatBool(r.Reachable), strconv.Itoa(r.Version), res.VDOM))
97-
m = append(m, prometheus.MustNewConstMetric(ntpDelay, prometheus.GaugeValue, float64(r.Delay), r.Ip, r.Server, strconv.FormatBool(r.Reachable), strconv.FormatBool(r.Reachable), strconv.Itoa(r.Version), res.VDOM))
98-
m = append(m, prometheus.MustNewConstMetric(ntpDispersion, prometheus.GaugeValue, float64(r.Dispersion), r.Ip, r.Server, strconv.FormatBool(r.Reachable), strconv.FormatBool(r.Reachable), strconv.Itoa(r.Version), res.VDOM))
99-
m = append(m, prometheus.MustNewConstMetric(ntpPeerDispersion, prometheus.GaugeValue, float64(r.PeerDispersion), r.Ip, r.Server, strconv.FormatBool(r.Reachable), strconv.FormatBool(r.Reachable), strconv.Itoa(r.Version), res.VDOM))
96+
m = append(m, prometheus.MustNewConstMetric(ntpOffset, prometheus.GaugeValue, float64(r.Offset) * 0.001, r.Ip, r.Server, strconv.FormatBool(r.Reachable), strconv.FormatBool(r.Reachable), strconv.Itoa(r.Version), res.VDOM))
97+
m = append(m, prometheus.MustNewConstMetric(ntpDelay, prometheus.GaugeValue, float64(r.Delay) * 0.001, r.Ip, r.Server, strconv.FormatBool(r.Reachable), strconv.FormatBool(r.Reachable), strconv.Itoa(r.Version), res.VDOM))
98+
m = append(m, prometheus.MustNewConstMetric(ntpDispersion, prometheus.GaugeValue, float64(r.Dispersion) * 0.001, r.Ip, r.Server, strconv.FormatBool(r.Reachable), strconv.FormatBool(r.Reachable), strconv.Itoa(r.Version), res.VDOM))
99+
m = append(m, prometheus.MustNewConstMetric(ntpPeerDispersion, prometheus.GaugeValue, float64(r.PeerDispersion) * 0.001, r.Ip, r.Server, strconv.FormatBool(r.Reachable), strconv.FormatBool(r.Reachable), strconv.Itoa(r.Version), res.VDOM))
100100
}
101101
}
102102
} else {

‎pkg/probe/system_ntp_status_test.go‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -33,54 +33,54 @@ func TestSystemNtpStatus_7_4_0(t *testing.T) {
3333
t.Errorf("probeSystemNtpStatus() returned non-success")
3434
}
3535

36-
em := `# HELP fortigate_system_ntp_delay NTP round trip delay, in milliseconds
37-
# TYPE fortigate_system_ntp_delay gauge
38-
fortigate_system_ntp_delay{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 324
39-
fortigate_system_ntp_delay{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 324
40-
fortigate_system_ntp_delay{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 324
41-
fortigate_system_ntp_delay{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 324
42-
fortigate_system_ntp_delay{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 324
43-
fortigate_system_ntp_delay{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 324
44-
# HELP fortigate_system_ntp_dispersion NTP dispersion to primary clock, in milliseconds
45-
# TYPE fortigate_system_ntp_dispersion gauge
46-
fortigate_system_ntp_dispersion{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 342
47-
fortigate_system_ntp_dispersion{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 342
48-
fortigate_system_ntp_dispersion{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 342
49-
fortigate_system_ntp_dispersion{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 342
50-
fortigate_system_ntp_dispersion{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 342
51-
fortigate_system_ntp_dispersion{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 342
52-
# HELP fortigate_system_ntp_dispersion_peer NTP peer dispersion, in milliseconds
53-
# TYPE fortigate_system_ntp_dispersion_peer gauge
54-
fortigate_system_ntp_dispersion_peer{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 123
55-
fortigate_system_ntp_dispersion_peer{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 123
56-
fortigate_system_ntp_dispersion_peer{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 123
57-
fortigate_system_ntp_dispersion_peer{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 123
58-
fortigate_system_ntp_dispersion_peer{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 123
59-
fortigate_system_ntp_dispersion_peer{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 123
60-
# HELP fortigate_system_ntp_expires NTP expire time, in seconds
61-
# TYPE fortigate_system_ntp_expires gauge
62-
fortigate_system_ntp_expires{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 145438
63-
fortigate_system_ntp_expires{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 145438
64-
fortigate_system_ntp_expires{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 124438
65-
fortigate_system_ntp_expires{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 124438
66-
fortigate_system_ntp_expires{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 245438
67-
fortigate_system_ntp_expires{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 245438
68-
# HELP fortigate_system_ntp_offset NTP combined offset, in milliseconds
69-
# TYPE fortigate_system_ntp_offset gauge
70-
fortigate_system_ntp_offset{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 5482
71-
fortigate_system_ntp_offset{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 5482
72-
fortigate_system_ntp_offset{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 5482
73-
fortigate_system_ntp_offset{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 5482
74-
fortigate_system_ntp_offset{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 5482
75-
fortigate_system_ntp_offset{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 5482
76-
# HELP fortigate_system_ntp_reftime NTP reftime in epoch seconds
77-
# TYPE fortigate_system_ntp_reftime counter
78-
fortigate_system_ntp_reftime{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 85742
79-
fortigate_system_ntp_reftime{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 85742
80-
fortigate_system_ntp_reftime{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 85742
81-
fortigate_system_ntp_reftime{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 85742
82-
fortigate_system_ntp_reftime{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 85742
83-
fortigate_system_ntp_reftime{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 85742
36+
em := `# HELP fortigate_system_ntp_delay_seconds NTP round trip delay, in seconds
37+
# TYPE fortigate_system_ntp_delay_seconds gauge
38+
fortigate_system_ntp_delay_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 0.324
39+
fortigate_system_ntp_delay_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 0.324
40+
fortigate_system_ntp_delay_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 0.324
41+
fortigate_system_ntp_delay_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 0.324
42+
fortigate_system_ntp_delay_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 0.324
43+
fortigate_system_ntp_delay_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 0.324
44+
# HELP fortigate_system_ntp_dispersion_seconds NTP dispersion to primary clock, in seconds
45+
# TYPE fortigate_system_ntp_dispersion_seconds gauge
46+
fortigate_system_ntp_dispersion_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 0.342
47+
fortigate_system_ntp_dispersion_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 0.342
48+
fortigate_system_ntp_dispersion_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 0.342
49+
fortigate_system_ntp_dispersion_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 0.342
50+
fortigate_system_ntp_dispersion_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 0.342
51+
fortigate_system_ntp_dispersion_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 0.342
52+
# HELP fortigate_system_ntp_dispersion_peer_seconds NTP peer dispersion, in seconds
53+
# TYPE fortigate_system_ntp_dispersion_peer_seconds gauge
54+
fortigate_system_ntp_dispersion_peer_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 0.123
55+
fortigate_system_ntp_dispersion_peer_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 0.123
56+
fortigate_system_ntp_dispersion_peer_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 0.123
57+
fortigate_system_ntp_dispersion_peer_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 0.123
58+
fortigate_system_ntp_dispersion_peer_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 0.123
59+
fortigate_system_ntp_dispersion_peer_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 0.123
60+
# HELP fortigate_system_ntp_expires_seconds NTP expire time, in seconds
61+
# TYPE fortigate_system_ntp_expires_seconds gauge
62+
fortigate_system_ntp_expires_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 145438
63+
fortigate_system_ntp_expires_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 145438
64+
fortigate_system_ntp_expires_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 124438
65+
fortigate_system_ntp_expires_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 124438
66+
fortigate_system_ntp_expires_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 245438
67+
fortigate_system_ntp_expires_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 245438
68+
# HELP fortigate_system_ntp_offset_seconds NTP combined offset, in seconds
69+
# TYPE fortigate_system_ntp_offset_seconds gauge
70+
fortigate_system_ntp_offset_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 5.482
71+
fortigate_system_ntp_offset_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 5.482
72+
fortigate_system_ntp_offset_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 5.482
73+
fortigate_system_ntp_offset_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 5.482
74+
fortigate_system_ntp_offset_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 5.482
75+
fortigate_system_ntp_offset_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 5.482
76+
# HELP fortigate_system_ntp_reftime_seconds NTP reftime in epoch seconds
77+
# TYPE fortigate_system_ntp_reftime_seconds counter
78+
fortigate_system_ntp_reftime_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 85742
79+
fortigate_system_ntp_reftime_seconds{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 85742
80+
fortigate_system_ntp_reftime_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 85742
81+
fortigate_system_ntp_reftime_seconds{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 85742
82+
fortigate_system_ntp_reftime_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 85742
83+
fortigate_system_ntp_reftime_seconds{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 85742
8484
# HELP fortigate_system_ntp_stratum NTP stratum value
8585
# TYPE fortigate_system_ntp_stratum gauge
8686
fortigate_system_ntp_stratum{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 3

0 commit comments

Comments
 (0)