Ignore logserver host
@@ -762,11 +762,11 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
Application application = getApplication(applicationId);
Map<String, List<URI>> clusterHosts = new HashMap<>();
application.getModel().getHosts().stream()
- .filter(host -> host.getServices().stream().anyMatch(serviceInfo -> serviceInfo.getProperty("clustertype").isPresent()))
+ .filter(host -> host.getServices().stream().noneMatch(serviceInfo -> serviceInfo.getServiceType().equalsIgnoreCase("logserver")))
.forEach(hostInfo -> {
ServiceInfo serviceInfo = hostInfo.getServices().stream().filter(service -> METRICS_PROXY_CONTAINER.serviceName.equals(service.getServiceType()))
.findFirst().orElseThrow(() -> new IllegalArgumentException("Unable to find services " + METRICS_PROXY_CONTAINER.serviceName.toString()));
- String clusterName = serviceInfo.getProperty("clusterinfo").orElse("");
+ String clusterName = serviceInfo.getProperty("clusterid").orElse("");
URI host = URI.create("http://" + hostInfo.getHostname() + ":" + servicePort(serviceInfo) + "/metrics/v1/values");
clusterHosts.computeIfAbsent(clusterName, l -> new ArrayList<URI>()).add(host);
}
