diff options
author | Harald Musum <musum@yahooinc.com> | 2022-08-09 13:14:40 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-08-09 13:14:40 +0200 |
commit | 423bc233320d3e8b1d4cd7510e76756b5755aacb (patch) | |
tree | dcf302a38f5e722c5610447303614c710d80209b /metrics-proxy | |
parent | 31ff63622ec70bd4e9aa501ad0d335e0dd007b77 (diff) |
qrserver -> container, part 2
Diffstat (limited to 'metrics-proxy')
5 files changed, 9 insertions, 9 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/MetricsFormatter.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/MetricsFormatter.java index 64a21a54999..dd249c4a21f 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/MetricsFormatter.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/MetricsFormatter.java @@ -54,12 +54,12 @@ public class MetricsFormatter { return name; } - // E.g. container/qrserver.1 -> 'container.qrserver.1' + // E.g. container/default.1 -> 'container.default.1' private static String toServiceId(String configId) { return "'" + configId.replace("/", ".") + "'"; } - // E.g. container/qrserver.1 -> container.'qrserver.1' + // E.g. container/default.1 -> container.'default.1' private static String toSystemServiceId(String configId) { String name = configId.replace("/", "."); name = name.replaceFirst("\\.", ".'") + "'"; diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java index 4d1fb802afc..2e7f7c7a936 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java @@ -188,7 +188,7 @@ public class ApplicationMetricsHandlerTest { assertEquals("us-west", dimensions.get(PublicDimensions.ZONE)); assertEquals("search/", dimensions.get(PublicDimensions.API)); assertEquals("music", dimensions.get(PublicDimensions.DOCUMENT_TYPE)); - assertEquals("qrserver0", dimensions.get(PublicDimensions.SERVICE_ID)); + assertEquals("default0", dimensions.get(PublicDimensions.SERVICE_ID)); assertFalse(dimensions.containsKey("non-public")); } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java index 71a4466ea95..8c8a44deae6 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java @@ -49,19 +49,19 @@ public class RpcHealthMetricsTest { List<VespaService> services = tester.vespaServices().getInstancesById(SERVICE_1_CONFIG_ID); assertEquals(1, services.size()); - VespaService qrserver = services.get(0); - HealthMetric h = qrserver.getHealth(); + VespaService container = services.get(0); + HealthMetric h = container.getHealth(); assertNotNull("Health metric should never be null", h); assertTrue("Status failed, reason = " + h.getMessage(), h.isOk()); assertEquals("WORKING", h.getMessage()); mockHttpServer.setResponse(HEALTH_FAILED_RESPONSE); - h = qrserver.getHealth(); + h = container.getHealth(); assertNotNull("Health metric should never be null", h); assertFalse("Status should be failed" + h.getMessage(), h.isOk()); assertEquals("SOMETHING FAILED", h.getMessage()); - String jsonRPCMessage = getHealthMetrics(tester, qrserver.getMonitoringName().id); + String jsonRPCMessage = getHealthMetrics(tester, container.getMonitoringName().id); assertEquals(WANTED_RPC_RESPONSE, jsonRPCMessage); } } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java index 5d21fb46ae3..a2a4852ace4 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java @@ -11,7 +11,7 @@ public class ConfigSentinelDummy { + "fleetcontroller state=RUNNING mode=AUTO pid=6543 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"storage/cluster.storage/fleetcontroller/0\"\n" + "storagenode state=RUNNING mode=AUTO pid=6539 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"storage/cluster.storage/storage/0\"\n" + "searchnode4 state=RUNNING mode=AUTO pid=6534 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/g0/c1/r1\"\n" - + "qrserver2 state=RUNNING mode=AUTO pid=6521 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"container/qrserver.1\"\n" + + "container2 state=RUNNING mode=AUTO pid=6521 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"container/default.1\"\n" + "logserver state=RUNNING mode=AUTO pid=6518 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"admin/logserver\"\n" + "logd state=RUNNING mode=AUTO pid=6517 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"hosts/dell-bl5s7.trondheim.corp.yahoo.com/logd\"\n" + "searchnode2 state=RUNNING mode=AUTO pid=6527 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/g0/c0/r1\"\n" diff --git a/metrics-proxy/src/test/resources/generic-sample.json b/metrics-proxy/src/test/resources/generic-sample.json index c9b02696e69..13302121507 100644 --- a/metrics-proxy/src/test/resources/generic-sample.json +++ b/metrics-proxy/src/test/resources/generic-sample.json @@ -36,7 +36,7 @@ "applicationId": "music.default", "clustertype": "container", "clusterid": "default", - "instance": "qrserver0", + "instance": "default0", "zone": "us-west", "api": "search/", "documenttype": "music", |