6 files changed, 14 insertions, 17 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 969b6a8201f..f6988a6b566 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -945,7 +945,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
 
     // ---------------- SearchNode Metrics ------------------------------------------------------------------------
 
-    public SearchNodeMetricsResponse getProtonMetrics(ApplicationId applicationId) {
+    public SearchNodeMetricsResponse getSearchNodeMetrics(ApplicationId applicationId) {
         Application application = getApplication(applicationId);
         SearchNodeMetricsRetriever searchNodeMetricsRetriever = new SearchNodeMetricsRetriever();
         return searchNodeMetricsRetriever.getMetrics(application);
@@ -992,7 +992,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
 
     public ApplicationId getApplicationIdForHostname(String hostname) {
         Optional<ApplicationId> applicationId = tenantRepository.getAllTenantNames().stream()
-                .map(tenantName -> tenantRepository.getTenant(tenantName).getApplicationRepo().getApplicationIdForHostName(hostname))
+                .map(tenantName -> tenantRepository.getTenant(tenantName).getApplicationRepo().resolveApplicationId(hostname))
                 .filter(Objects::nonNull)
                 .findFirst();
         return applicationId.orElse(null);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index 09a687657c6..88e3134ccad 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -401,11 +401,6 @@ public class TenantApplications implements RequestHandler, HostValidator {
         hostRegistry.verifyHosts(applicationId, newHosts);
     }
 
-    // TODO: Duplicate of resolveApplicationId() above
-    public ApplicationId getApplicationIdForHostName(String hostname) {
-        return hostRegistry.getApplicationId(hostname);
-    }
-
     public TenantFileSystemDirs getTenantFileSystemDirs() { return tenantFileSystemDirs; }
 
     public CompletionWaiter createRemoveApplicationWaiter(ApplicationId applicationId) {
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 9619ad69b3c..86c0c90ca12 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
@@ -97,7 +97,9 @@ public class ApplicationHandler extends HttpHandler {
         if (path.matches("/application/v2/tenant/{tenant}/application/{application}/environment/{ignore}/region/{ignore}/instance/{instance}/filedistributionstatus")) return filedistributionStatus(applicationId(path), request);
         if (path.matches("/application/v2/tenant/{tenant}/application/{application}/environment/{ignore}/region/{ignore}/instance/{instance}/logs")) return logs(applicationId(path), request);
         if (path.matches("/application/v2/tenant/{tenant}/application/{application}/environment/{ignore}/region/{ignore}/instance/{instance}/metrics/deployment")) return deploymentMetrics(applicationId(path));
-        if (path.matches("/application/v2/tenant/{tenant}/application/{application}/environment/{ignore}/region/{ignore}/instance/{instance}/metrics/proton")) return protonMetrics(applicationId(path));
+        // TODO: Remove when all usage has migrated to  .../metrics/searchnode
+        if (path.matches("/application/v2/tenant/{tenant}/application/{application}/environment/{ignore}/region/{ignore}/instance/{instance}/metrics/proton")) return searchNodeMetrics(applicationId(path));
+        if (path.matches("/application/v2/tenant/{tenant}/application/{application}/environment/{ignore}/region/{ignore}/instance/{instance}/metrics/searchnode")) return searchNodeMetrics(applicationId(path));
         if (path.matches("/application/v2/tenant/{tenant}/application/{application}/environment/{ignore}/region/{ignore}/instance/{instance}/reindexing")) return getReindexingStatus(applicationId(path));
         if (path.matches("/application/v2/tenant/{tenant}/application/{application}/environment/{ignore}/region/{ignore}/instance/{instance}/service/{service}/{hostname}/status/{*}")) return serviceStatusPage(applicationId(path), path.get("service"), path.get("hostname"), path.getRest(), request);
         if (path.matches("/application/v2/tenant/{tenant}/application/{application}/environment/{ignore}/region/{ignore}/instance/{instance}/service/{service}/{hostname}/state/v1/{*}")) return serviceStateV1(applicationId(path), path.get("service"), path.get("hostname"), path.getRest(), request);
@@ -200,8 +202,8 @@ public class ApplicationHandler extends HttpHandler {
         return applicationRepository.getLogs(applicationId, hostname, apiParams);
     }
 
-    private HttpResponse protonMetrics(ApplicationId applicationId) {
-        return applicationRepository.getProtonMetrics(applicationId);
+    private HttpResponse searchNodeMetrics(ApplicationId applicationId) {
+        return applicationRepository.getSearchNodeMetrics(applicationId);
     }
 
     private HttpResponse deploymentMetrics(ApplicationId applicationId) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SearchNodeMetricsResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SearchNodeMetricsResponse.java
index c9d748a7e4c..311dbccb752 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SearchNodeMetricsResponse.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SearchNodeMetricsResponse.java
@@ -12,13 +12,13 @@ import java.util.Map;
  */
 public class SearchNodeMetricsResponse extends SlimeJsonResponse {
 
-    public SearchNodeMetricsResponse(ApplicationId applicationId, Map<String, SearchNodeMetricsAggregator> aggregatedProtonMetrics) {
+    public SearchNodeMetricsResponse(ApplicationId applicationId, Map<String, SearchNodeMetricsAggregator> aggregatedMetrics) {
         Cursor application = slime.setObject();
         application.setString("applicationId", applicationId.serializedForm());
 
         Cursor clusters = application.setArray("clusters");
 
-        for (var entry : aggregatedProtonMetrics.entrySet()) {
+        for (var entry : aggregatedMetrics.entrySet()) {
             Cursor cluster = clusters.addObject();
             cluster.setString("clusterId", entry.getKey());
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterSearchNodeMetricsRetriever.java
index bbdae8f2318..5b58e79b6d8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterSearchNodeMetricsRetriever.java
@@ -22,9 +22,9 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
-public class ClusterProtonMetricsRetriever {
+public class ClusterSearchNodeMetricsRetriever {
 
-    private static final Logger log = Logger.getLogger(ClusterProtonMetricsRetriever.class.getName());
+    private static final Logger log = Logger.getLogger(ClusterSearchNodeMetricsRetriever.class.getName());
 
     private static final CloseableHttpClient httpClient = VespaHttpClientBuilder
             .custom()
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/SearchNodeMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/SearchNodeMetricsRetriever.java
index d417fb8683d..eb2f4ad37a4 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/SearchNodeMetricsRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/SearchNodeMetricsRetriever.java
@@ -11,13 +11,13 @@ import java.util.function.Predicate;
 
 public class SearchNodeMetricsRetriever {
 
-    private final ClusterProtonMetricsRetriever metricsRetriever;
+    private final ClusterSearchNodeMetricsRetriever metricsRetriever;
 
     public SearchNodeMetricsRetriever() {
-        this( new ClusterProtonMetricsRetriever());
+        this( new ClusterSearchNodeMetricsRetriever());
     }
 
-    public SearchNodeMetricsRetriever(ClusterProtonMetricsRetriever metricsRetriever) {
+    public SearchNodeMetricsRetriever(ClusterSearchNodeMetricsRetriever metricsRetriever) {
         this.metricsRetriever = metricsRetriever;
     }