diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-07-31 11:20:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-31 11:20:40 +0200 |
| commit | 9fc31757ffec6441b4c90c4ec977476572a4c348 (patch) | |
| tree | 955e186afd1a7041fd158b3309d2e03cd19d99ca | |
| parent | 9421630708db4764c6c8faa3a3de3f3d2cab0046 (diff) | |
| parent | 62fe264e7d02d527084952513995b592d845add0 (diff) | |
Merge pull request #10135 from vespa-engine/olaa/service-prefix
Prefix service names
3 files changed, 6 insertions, 6 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/MetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/MetricsRetriever.java index 01255fb5c2e..4fbeae11758 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/MetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/MetricsRetriever.java @@ -73,7 +73,7 @@ public class MetricsRetriever { service.field("metrics").traverse((ArrayTraverser) (i, m) -> { Inspector values = m.field("values"); switch (serviceName) { - case "container": + case "vespa.container": metrics.addContainerLatency( values.field("query_latency.sum").asDouble(), values.field("query_latency.count").asDouble()); @@ -81,12 +81,12 @@ public class MetricsRetriever { values.field("feed_latency.sum").asDouble(), values.field("feed_latency.count").asDouble()); break; - case "qrserver": + case "vespa.qrserver": metrics.addQrLatency( values.field("query_latency.sum").asDouble(), values.field("query_latency.count").asDouble()); break; - case "distributor": + case "vespa.distributor": metrics.addDocumentCount(values.field("vds.distributor.docsstored.average").asDouble()); break; } diff --git a/configserver/src/test/resources/metrics/container_metrics b/configserver/src/test/resources/metrics/container_metrics index 09232fe0f93..a6a5828934c 100644 --- a/configserver/src/test/resources/metrics/container_metrics +++ b/configserver/src/test/resources/metrics/container_metrics @@ -1,7 +1,7 @@ { "services": [ { - "name":"container", + "name":"vespa.container", "timestamp": 1557306075, "metrics": [ { @@ -26,7 +26,7 @@ }, { - "name":"qrserver", + "name":"vespa.qrserver", "timestamp": 1557306075, "metrics": [ { diff --git a/configserver/src/test/resources/metrics/content_metrics b/configserver/src/test/resources/metrics/content_metrics index a239aeea5ca..c881e574f8b 100644 --- a/configserver/src/test/resources/metrics/content_metrics +++ b/configserver/src/test/resources/metrics/content_metrics @@ -1,7 +1,7 @@ { "services": [ { - "name":"distributor", + "name":"vespa.distributor", "timestamp": 1557306075, "metrics": [ { |