diff options
author | Ola Aunronning <olaa@yahooinc.com> | 2023-06-05 16:51:27 +0200 |
---|---|---|
committer | Ola Aunronning <olaa@yahooinc.com> | 2023-06-07 11:31:37 +0200 |
commit | cb2fbccdd969571ffbeb16891961b52d0ef8dccd (patch) | |
tree | 637f3934b4fd9c0714019bbf567c6d911c466732 /metrics-proxy | |
parent | 0b04a04ee44fa10e8669338bd715f0c1f343e68d (diff) |
Add vespaVersion for host_life metric
Diffstat (limited to 'metrics-proxy')
4 files changed, 9 insertions, 4 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java index 7ce8dd12b30..32c59aed67b 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java @@ -9,7 +9,6 @@ import ai.vespa.metricsproxy.metric.model.DimensionId; import ai.vespa.metricsproxy.metric.model.MetricsPacket; import ai.vespa.metricsproxy.service.VespaService; import ai.vespa.metricsproxy.service.VespaServices; -import com.yahoo.component.Vtag; import java.time.Duration; import java.time.Instant; @@ -138,7 +137,6 @@ public class MetricsManager { private Map<DimensionId, String> getGlobalDimensions() { Map<DimensionId, String> globalDimensions = new LinkedHashMap<>(applicationDimensions.getDimensions()); globalDimensions.putAll(nodeDimensions.getDimensions()); - globalDimensions.put(VESPA_VERSION, Vtag.currentVersion.toFullString()); return globalDimensions; } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java index 1a7c1b4df4d..02785674103 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java @@ -5,6 +5,7 @@ import ai.vespa.metricsproxy.core.MetricsManager; import ai.vespa.metricsproxy.metric.dimensions.ApplicationDimensions; import ai.vespa.metricsproxy.metric.dimensions.NodeDimensions; import ai.vespa.metricsproxy.metric.model.ConsumerId; +import ai.vespa.metricsproxy.metric.model.DimensionId; import ai.vespa.metricsproxy.metric.model.MetricId; import ai.vespa.metricsproxy.metric.model.MetricsPacket; import ai.vespa.metricsproxy.metric.model.ServiceId; @@ -80,6 +81,14 @@ public class NodeMetricGatherer { builder.putMetric(MetricId.toMetricId(key), metrics.get(key).asLong()); } } + if (object.has("dimensions")) { + JsonNode dimensions = object.get("dimensions"); + Iterator<?> keys = dimensions.fieldNames(); + while(keys.hasNext()) { + String key = (String) keys.next(); + builder.putDimension(DimensionId.toDimensionId(key), dimensions.get(key).asText()); + } + } builder.addConsumers(Set.of(ConsumerId.toConsumerId("Vespa"))); builders.add(builder); } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java index 70f126a8514..12995adffc7 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java @@ -112,7 +112,6 @@ public class MetricsManagerTest { } private void assertGlobalDimensions(Map<DimensionId, String> dimensions) { - assertTrue(dimensions.containsKey(VESPA_VERSION)); assertEquals("value", dimensions.get(toDimensionId("global"))); assertEquals("metric-dim", dimensions.get(toDimensionId("dim0"))); } 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 c546f76f3da..2c216272022 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 @@ -68,7 +68,6 @@ public class PrometheusHandlerTest extends HttpHandlerTestBase { public void response_contains_node_metrics() { String cpu = getLine(valuesResponse, CPU_METRIC + "{"); assertTrue(cpu.contains("} 12.345")); // metric value - assertTrue(cpu.contains("{vespaVersion=")); } @Test |