proton metrics -> searchnode metrics

Use name of service and add API that does not use the generic /metrics
path for searchnode metrics

2 files changed, 7 insertions, 7 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ProtonMetrics.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SearchNodeMetrics.java
index 8d7daa44687..729c2488e2b 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ProtonMetrics.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SearchNodeMetrics.java
@@ -10,11 +10,11 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class ProtonMetrics {
+public class SearchNodeMetrics {
 
     private static final ObjectMapper jsonMapper = new ObjectMapper();
 
-    private static final Logger logger = Logger.getLogger(ProtonMetrics.class.getName());
+    private static final Logger logger = Logger.getLogger(SearchNodeMetrics.class.getName());
 
     public static final String DOCUMENTS_ACTIVE_COUNT = "documentsActiveCount";
     public static final String DOCUMENTS_READY_COUNT = "documentsReadyCount";
@@ -26,7 +26,7 @@ public class ProtonMetrics {
     private final String clusterId;
     private final Map<String, Double> metrics;
 
-    public ProtonMetrics(String clusterId) {
+    public SearchNodeMetrics(String clusterId) {
         this.clusterId = clusterId;
         metrics = new HashMap<>();
     }
@@ -45,7 +45,7 @@ public class ProtonMetrics {
 
     public double resourceMemoryUsageAverage() { return metrics.get(RESOURCE_MEMORY_USAGE_AVERAGE); }
 
-    public ProtonMetrics addMetric(String name, double value) {
+    public SearchNodeMetrics addMetric(String name, double value) {
         metrics.put(name, value);
         return this;
     }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
index 93ac16c606d..19bfc84db7a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
@@ -13,7 +13,7 @@ import com.yahoo.vespa.flags.json.FlagData;
 import com.yahoo.vespa.hosted.controller.api.application.v4.model.ClusterMetrics;
 import com.yahoo.vespa.hosted.controller.api.application.v4.model.DeploymentData;
 import com.yahoo.vespa.hosted.controller.api.application.v4.model.EndpointStatus;
-import com.yahoo.vespa.hosted.controller.api.application.v4.model.ProtonMetrics;
+import com.yahoo.vespa.hosted.controller.api.application.v4.model.SearchNodeMetrics;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 import com.yahoo.vespa.hosted.controller.api.integration.LogEntry;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.TestReport;
@@ -71,7 +71,7 @@ public interface ConfigServer {
 
     /**
      * Gets the contents of a file inside the current application package for a given deployment. If the path is to
-     * a directly, a JSON list with URLs to contents is returned.
+     * a directory, a JSON list with URLs to contents is returned.
      *
      * @param deployment deployment to get application package content for
      * @param path path within package to get
@@ -81,7 +81,7 @@ public interface ConfigServer {
 
     List<ClusterMetrics> getDeploymentMetrics(DeploymentId deployment);
 
-    List<ProtonMetrics> getProtonMetrics(DeploymentId deployment);
+    List<SearchNodeMetrics> getSearchNodeMetrics(DeploymentId deployment);
 
     List<String> getContentClusters(DeploymentId deployment);