fix: correct version comparison for FortiOS 7.4+ feature gates

The check 'VersionMajor >= 7 && VersionMinor >= 4' fails for future
major versions with minor < 4 (e.g., 8.0 would not match). Use
'VersionMajor > 7 || (VersionMajor == 7 && VersionMinor >= 4)' to
correctly express 'version 7.4 or later'.

Signed-off-by: Aprazors <Aprazors@gmail.com>

Author: Aprazor

pkg/probe/system_ha_peer.go

@@ -61,7 +61,7 @@ func probeSystemHaPeer(c fortigatehttpclient.FortiHTTP, meta *TargetMetadata) ([
 	}
 	m := []prometheus.Metric{}
 	for _, r := range res.Result {
-		if meta.VersionMajor >= 7 && meta.VersionMinor >= 4 {
+		if meta.VersionMajor > 7 || (meta.VersionMajor == 7 && meta.VersionMinor >= 4) {
 			m = append(m, prometheus.MustNewConstMetric(info, prometheus.GaugeValue, 1, r.Serial, strconv.FormatInt(r.Vcluster, 10), r.Hostname, strconv.FormatFloat(r.Priority, 'f', -1, 64)))
 			if r.Primary {
 				m = append(m, prometheus.MustNewConstMetric(primary, prometheus.GaugeValue, 1, strconv.FormatInt(r.Vcluster, 10), r.Hostname))

pkg/probe/system_ntp_status.go

@@ -88,7 +88,7 @@ func probeSystemNtpStatus(c fortigatehttpclient.FortiHTTP, meta *TargetMetadata)
 	}
 
 	m := []prometheus.Metric{}
-	if meta.VersionMajor >= 7 && meta.VersionMinor >= 4 {
+	if meta.VersionMajor > 7 || (meta.VersionMajor == 7 && meta.VersionMinor >= 4) {
 		for _, res := range result {
 			for _, r := range res.Results {
 				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))