Rename configId to nodeId in MetricsNodesConfig

6 files changed, 7 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java
index ded3ddbe105..0db48cb5e27 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java
@@ -22,7 +22,7 @@ public class MetricsNodesConfigGenerator {
 
     private static MetricsNodesConfig.Node.Builder toNodeBuilder(MetricsProxyContainer container) {
         var builder = new MetricsNodesConfig.Node.Builder()
-                .configId(container.getHost().getConfigId())
+                .nodeId(container.getHost().getConfigId())
                 .hostname(container.getHostName())
                 .metricsPort(MetricsProxyContainer.BASEPORT)
                 .metricsPath(MetricsHandler.VALUES_PATH);
@@ -30,7 +30,7 @@ public class MetricsNodesConfigGenerator {
         if (container.isHostedVespa)
             container.getHostResource().spec().membership()
                     .map(ClusterMembership::stringValue)
-                    .ifPresent(builder::configId);
+                    .ifPresent(builder::nodeId);
 
         return builder;
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
index e25cee82e8a..6164b311da0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
@@ -307,7 +307,7 @@ public class MetricsProxyContainerClusterTest {
     }
 
     private void assertNodeConfig(MetricsNodesConfig.Node node) {
-        assertTrue(node.configId().startsWith("container/foo/0/"));
+        assertTrue(node.nodeId().startsWith("container/foo/0/"));
         assertTrue(node.hostname().startsWith("node-1-3-9-"));
         assertEquals(MetricsProxyContainer.BASEPORT, node.metricsPort());
         assertEquals(MetricsHandler.VALUES_PATH, node.metricsPath());
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java
index 37cb3dc27a2..e1469a9881b 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java
@@ -21,7 +21,7 @@ public class Node {
     private final String metricsUriBase;
 
     public Node(MetricsNodesConfig.Node nodeConfig) {
-        this(nodeConfig.configId(), nodeConfig.hostname(), nodeConfig.metricsPort() , nodeConfig.metricsPath());
+        this(nodeConfig.nodeId(), nodeConfig.hostname(), nodeConfig.metricsPort() , nodeConfig.metricsPath());
     }
 
     public Node(String configId, String host, int port, String path) {
diff --git a/metrics-proxy/src/main/resources/configdefinitions/metrics-nodes.def b/metrics-proxy/src/main/resources/configdefinitions/metrics-nodes.def
index 3f4165c08ec..0de2f21d972 100644
--- a/metrics-proxy/src/main/resources/configdefinitions/metrics-nodes.def
+++ b/metrics-proxy/src/main/resources/configdefinitions/metrics-nodes.def
@@ -1,7 +1,7 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package=ai.vespa.metricsproxy.http.application
 
-node[].configId string
+node[].nodeId string
 node[].hostname string
 node[].metricsPort int
 node[].metricsPath string
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
index fbc0329b42f..2d12930bd0a 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
@@ -171,7 +171,7 @@ public class ApplicationMetricsHandlerTest {
 
     private MetricsNodesConfig.Node.Builder nodeConfig(String path) {
         return new MetricsNodesConfig.Node.Builder()
-                .configId(path)
+                .nodeId(path)
                 .hostname("localhost")
                 .metricsPath(path)
                 .metricsPort(port);
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java
index 7042ee68edc..5ff6b580988 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java
@@ -157,7 +157,7 @@ public class ApplicationMetricsRetrieverTest {
 
     private MetricsNodesConfig.Node.Builder nodeConfig(String path) {
         return new MetricsNodesConfig.Node.Builder()
-                .configId(path)
+                .nodeId(path)
                 .hostname(HOST)
                 .metricsPath(path)
                 .metricsPort(port);