Merge pull request #886 from ripienaar/backport_nagios_prom_status

Backports a fix for prometheus exit codes on 0.0.35 cli release

cli/server_check_command.go

@@ -207,11 +207,7 @@ func (r *result) criticalIfErr(err error, format string, a ...any) bool {
 	return true
 }
 
-func (r *result) exitCode() int {
-	if checkRenderFormat == "prometheus" {
-		return 0
-	}
-
+func (r *result) nagiosCode() int {
 	switch r.Status {
 	case okCheckStatus:
 		return 0
@@ -224,6 +220,14 @@ func (r *result) exitCode() int {
 	}
 }
 
+func (r *result) exitCode() int {
+	if checkRenderFormat == "prometheus" {
+		return 0
+	}
+
+	return r.nagiosCode()
+}
+
 func (r *result) Exit() {
 	os.Exit(r.exitCode())
 }
@@ -307,7 +311,7 @@ func (r *result) renderPrometheus() string {
 	}, []string{"item", "status"})
 	prometheus.MustRegister(status)
 
-	status.WithLabelValues(sname, string(r.Status)).Set(float64(r.exitCode()))
+	status.WithLabelValues(sname, string(r.Status)).Set(float64(r.nagiosCode()))
 
 	var buf bytes.Buffer