Merge pull request #27939 from vespa-engine/mpolden/add-cluster-name

Add cluster name to service convergence response

1 files changed, 1 insertions, 0 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
index 61fe2f77224..bd6e0f90b54 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
@@ -449,6 +449,7 @@ public class ApplicationHandler extends HttpHandler {
                 Cursor serviceObject = serviceArray.addObject();
                 String hostName = serviceInfo.getHostName();
                 int statePort = ConfigConvergenceChecker.getStatePort(serviceInfo).get();
+                serviceInfo.getProperty("clustername").ifPresent(clusterName -> serviceObject.setString("clusterName", clusterName));
                 serviceObject.setString("host", hostName);
                 serviceObject.setLong("port", statePort);
                 serviceObject.setString("type", serviceInfo.getServiceType());