Add warning/critical values to perfdata output

Author: martialblog

cmd/query.go

@@ -34,11 +34,13 @@ func generateMetricOutput(rc int, metric string, value string) string {
 	return fmt.Sprintf(" \\_[%s] %s - value: %s\n", check.StatusText(rc), metric, value)
 }
 
-func generatePerfdata(metric string, value string) perfdata.Perfdata {
+func generatePerfdata(metric, value string, warning, critical *check.Threshold) perfdata.Perfdata {
 	// We trim the trailing "} from the string, so that the Perfdata won't have a trailing _
 	return perfdata.Perfdata{
 		Label: replacer.Replace(metric),
 		Value: value,
+		Warn:  warning,
+		Crit:  critical,
 	}
 }
 
@@ -136,7 +138,7 @@ Note: Time range values e.G. 'go_memstats_alloc_bytes_total[0s]' only the latest
 				metricOutput.WriteString(generateMetricOutput(rc, sample.Metric.String(), sample.Value.String()))
 
 				// Generate Perfdata from API return
-				perf := generatePerfdata(sample.Metric.String(), sample.Value.String())
+				perf := generatePerfdata(sample.Metric.String(), sample.Value.String(), warn, crit)
 				perfList.Add(&perf)
 			}
 			states = vStates
@@ -170,7 +172,7 @@ Note: Time range values e.G. 'go_memstats_alloc_bytes_total[0s]' only the latest
 				metricOutput.WriteString(generateMetricOutput(rc, samplepair.String(), samplepair.Value.String()))
 
 				// Generate Perfdata from API return
-				perf := generatePerfdata(samplestream.Metric.String(), samplepair.Value.String())
+				perf := generatePerfdata(samplestream.Metric.String(), samplepair.Value.String(), warn, crit)
 				perfList.Add(&perf)
 			}
 			states = mStates

cmd/query_test.go

@@ -97,7 +97,7 @@ func TestQueryCmd(t *testing.T) {
 				w.Write([]byte(`{"status":"success","data":{"resultType":"matrix","result":[{"metric":{"__name__":"up","instance":"localhost","job":"node"},"values":[[1670340712.988,"1"],[1670340772.988,"1"],[1670340832.990,"1"],[1670340892.990,"1"],[1670340952.990,"1"]]}]}}`))
 			})),
 			args:     []string{"run", "../main.go", "query", "--query", "up{job=\"prometheus\"}[5m]"},
-			expected: "[OK] - 1 Metrics OK | up_instance_localhost_job_node=1\n",
+			expected: "[OK] - 1 Metrics OK | up_instance_localhost_job_node=1;10;20\n",
 		},
 		{
 			name: "query-metric-exists",
@@ -106,7 +106,7 @@ func TestQueryCmd(t *testing.T) {
 				w.Write([]byte(`{"status":"success","data":{"resultType":"vector","result":[{"metric":{"__name__":"up","instance":"localhost","job":"prometheus"},"value":[1668782473.835,"1"]}]}}`))
 			})),
 			args:     []string{"run", "../main.go", "query", "--query", "up{job=\"prometheus\"}"},
-			expected: "[OK] - 1 Metrics OK | up_instance_localhost_job_prometheus=1\n",
+			expected: "[OK] - 1 Metrics OK | up_instance_localhost_job_prometheus=1;10;20\n",
 		},
 	}