@@ -21,51 +21,95 @@ import (
2121 "github.com/prometheus/client_golang/prometheus/testutil"
2222)
2323
24- func TestSystemNtpStatus (t * testing.T ) {
24+ func TestSystemNtpStatus_7_4_0 (t * testing.T ) {
2525 c := newFakeClient ()
2626 c .prepare ("api/v2/monitor/system/ntp/status" , "testdata/system-ntp-status.jsonnet" )
27+ meta := & TargetMetadata {
28+ VersionMajor : 7 ,
29+ VersionMinor : 4 ,
30+ }
2731 r := prometheus .NewPedanticRegistry ()
28- if ! testProbe (probeSystemNtpStatus , c , r ) {
32+ if ! testProbeWithMetadata (probeSystemNtpStatus , c , meta , r ) {
2933 t .Errorf ("probeSystemNtpStatus() returned non-success" )
3034 }
3135
3236 em := `# HELP fortigate_system_ntp_delay NTP round trip delay, in milliseconds
3337 # TYPE fortigate_system_ntp_delay gauge
34- fortigate_system_ntp_delay{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",version="1035"} 324
35- fortigate_system_ntp_delay{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",version="1035"} 324
36- fortigate_system_ntp_delay{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",version="1035"} 324
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
3744 # HELP fortigate_system_ntp_dispersion NTP dispersion to primary clock, in milliseconds
3845 # TYPE fortigate_system_ntp_dispersion gauge
39- fortigate_system_ntp_dispersion{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",version="1035"} 342
40- fortigate_system_ntp_dispersion{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",version="1035"} 342
41- fortigate_system_ntp_dispersion{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",version="1035"} 342
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
4252 # HELP fortigate_system_ntp_dispersion_peer NTP peer dispersion, in milliseconds
4353 # TYPE fortigate_system_ntp_dispersion_peer gauge
44- fortigate_system_ntp_dispersion_peer{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",version="1035"} 123
45- fortigate_system_ntp_dispersion_peer{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",version="1035"} 123
46- fortigate_system_ntp_dispersion_peer{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",version="1035"} 123
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
4760 # HELP fortigate_system_ntp_expires NTP expire time, in seconds
4861 # TYPE fortigate_system_ntp_expires gauge
49- fortigate_system_ntp_expires{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",version="1035"} 145438
50- fortigate_system_ntp_expires{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",version="1035"} 124438
51- fortigate_system_ntp_expires{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",version="1035"} 245438
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
5268 # HELP fortigate_system_ntp_offset NTP combined offset, in milliseconds
5369 # TYPE fortigate_system_ntp_offset gauge
54- fortigate_system_ntp_offset{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",version="1035"} 5482
55- fortigate_system_ntp_offset{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",version="1035"} 5482
56- fortigate_system_ntp_offset{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",version="1035"} 5482
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
5776 # HELP fortigate_system_ntp_reftime NTP reftime in epoch seconds
5877 # TYPE fortigate_system_ntp_reftime counter
59- fortigate_system_ntp_reftime{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",version="1035"} 85742
60- fortigate_system_ntp_reftime{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",version="1035"} 85742
61- fortigate_system_ntp_reftime{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",version="1035"} 85742
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
6284 # HELP fortigate_system_ntp_stratum NTP stratum value
6385 # TYPE fortigate_system_ntp_stratum gauge
64- fortigate_system_ntp_stratum{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",version="1035"} 3
65- fortigate_system_ntp_stratum{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",version="1035"} 3
66- fortigate_system_ntp_stratum{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",version="1035"} 3
86+ fortigate_system_ntp_stratum{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="google",version="1035"} 3
87+ fortigate_system_ntp_stratum{ip="127.0.0.1",reachable="true",selected="true",server="HA-TEST",vdom="vdomtest",version="1035"} 3
88+ fortigate_system_ntp_stratum{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="google",version="1035"} 3
89+ fortigate_system_ntp_stratum{ip="127.0.0.2",reachable="false",selected="false",server="HA-CAP",vdom="vdomtest",version="1035"} 3
90+ fortigate_system_ntp_stratum{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="google",version="1035"} 3
91+ fortigate_system_ntp_stratum{ip="127.0.0.3",reachable="true",selected="true",server="HA-CODE",vdom="vdomtest",version="1035"} 3
6792 `
6893
94+ if err := testutil .CollectAndCompare (r , strings .NewReader (em )); err != nil {
95+ t .Fatalf ("metric compare: err %v" , err )
96+ }
97+ }
98+
99+ func TestSystemNtpStatus (t * testing.T ) {
100+ c := newFakeClient ()
101+ c .prepare ("api/v2/monitor/system/ntp/status" , "testdata/system-ntp-status.jsonnet" )
102+ meta := & TargetMetadata {
103+ VersionMajor : 7 ,
104+ VersionMinor : 2 ,
105+ }
106+ r := prometheus .NewPedanticRegistry ()
107+ if ! testProbeWithMetadata (probeSystemNtpStatus , c , meta , r ) {
108+ t .Errorf ("probeSystemNtpStatus() returned non-success" )
109+ }
110+
111+ em := ``
112+
69113 if err := testutil .CollectAndCompare (r , strings .NewReader (em )); err != nil {
70114 t .Fatalf ("metric compare: err %v" , err )
71115 }
0 commit comments