From c966093b0982c3d98fe4f3b891b7e8986d92f96c Mon Sep 17 00:00:00 2001 From: Ola Aunronning Date: Tue, 26 Mar 2024 14:49:06 +0100 Subject: Include service status metric in prometheus output --- .../metricsproxy/metric/model/prometheus/PrometheusUtil.java | 12 ++++++++++++ .../metricsproxy/http/prometheus/PrometheusHandlerTest.java | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java index 46591f29b4f..973e1adb96d 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java @@ -13,6 +13,9 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; + /** * @author yj-jtakagi * @author gjoranv @@ -54,6 +57,15 @@ public class PrometheusUtil { sampleList.add(new Sample(metricName, labels, labelValues, metric.getValue().doubleValue(), packet.timestamp * 1000)); } } + if (!packets.isEmpty()) { + var firstPacket = packets.get(0); + var statusMetricName = serviceName + "_status"; + // MetricsPacket status 0 means OK, but it's the opposite in Prometheus. + var statusMetricValue = (firstPacket.statusCode == 0) ? 1 : 0; + var sampleList = singletonList(new Sample(statusMetricName, emptyList(), emptyList(), + statusMetricValue, firstPacket.timestamp * 1000)); + metricFamilySamples.add(new MetricFamilySamples(statusMetricName, Collector.Type.UNKNOWN, "status of service", sampleList)); + } })); return new PrometheusModel(metricFamilySamples); diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandlerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandlerTest.java index b36f521e4ac..fafdb5a2d0c 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandlerTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandlerTest.java @@ -83,6 +83,12 @@ public class PrometheusHandlerTest extends HttpHandlerTestBase { assertTrue(dummy0.contains("vespa_service=\"vespa_dummy\"")); } + @Test + public void response_contains_service_status() { + assertTrue(valuesResponse.contains("vespa_dummy_status 1.0")); + assertTrue(valuesResponse.contains("vespa_down_service_status 0.0")); + } + // Find the first line that contains the given string private String getLine(String raw, String searchString) { for (var s : raw.split("\\n")) { -- cgit v1.2.3