summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorOla Aunrønning <olaa@verizonmedia.com>2019-07-31 11:00:01 +0200
committerOla Aunrønning <olaa@verizonmedia.com>2019-07-31 11:00:01 +0200
commit62fe264e7d02d527084952513995b592d845add0 (patch)
tree720e4dc8158b3c1b6810a16c8941e112c16a48ec /configserver
parente36cd3e8019db574b0fc718177d01a34574a2fdd (diff)
Prefix service names
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/metrics/MetricsRetriever.java6
-rw-r--r--configserver/src/test/resources/metrics/container_metrics4
-rw-r--r--configserver/src/test/resources/metrics/content_metrics2
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 0881d32b21e..e218198f9b3 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
@@ -65,7 +65,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());
@@ -73,12 +73,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": [
{