diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-05-10 11:22:47 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-05-10 11:22:47 +0200 |
| commit | 402cfece5ef38664cd3b63aea7ee2886d5081922 (patch) | |
| tree | 88b720db01f3781dadab009477aa13c66a149d54 /metrics-proxy | |
| parent | 64ceb264700e86c6bdaee45c258d69a3a9642a45 (diff) | |
Remove 'healthport' from vespa-services config.
- Only one port is used per service.
Diffstat (limited to 'metrics-proxy')
3 files changed, 1 insertions, 3 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java index 2668c158ed6..3fbd5e49882 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java @@ -50,7 +50,7 @@ public class VespaServices { List<VespaService> services = new ArrayList<>(); for (Service s : servicesConfig.service()) { log.log(DEBUG, "Re-configuring service " + s.name()); - VespaService vespaService = VespaService.create(s.name(), s.configId(), s.healthport(), monitoringSystemName, + VespaService vespaService = VespaService.create(s.name(), s.configId(), s.port(), monitoringSystemName, createServiceDimensions(s)); services.add(vespaService); } diff --git a/metrics-proxy/src/main/resources/configdefinitions/vespa-services.def b/metrics-proxy/src/main/resources/configdefinitions/vespa-services.def index 6fdacfffd42..146411cede4 100644 --- a/metrics-proxy/src/main/resources/configdefinitions/vespa-services.def +++ b/metrics-proxy/src/main/resources/configdefinitions/vespa-services.def @@ -5,6 +5,5 @@ package=ai.vespa.metricsproxy.service service[].configId string service[].name string default="" service[].port int default=-1 -service[].healthport int default=-1 service[].dimension[].key string service[].dimension[].value string diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java index 6bbf4ae1ef5..9507f01491e 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java @@ -123,7 +123,6 @@ public class IntegrationTester implements AutoCloseable { .name(serviceId.id) .configId(configId) .port(port) - .healthport(port) .dimension(new Service.Dimension.Builder().key("serviceDim").value("serviceDimValue")); } |