Rename vespa-nodes.def to metrics-nodes.def

5 files changed, 12 insertions, 12 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
index a16a31e533f..55602a05612 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
@@ -53,7 +53,7 @@ public class ApplicationMetricsRetriever extends AbstractComponent {
     private ForkJoinPool forkJoinPool = new ForkJoinPool(PARALLELISM);
 
     @Inject
-    public ApplicationMetricsRetriever(VespaNodesConfig nodesConfig) {
+    public ApplicationMetricsRetriever(MetricsNodesConfig nodesConfig) {
         clients = createNodeClients(nodesConfig);
         taskTimeout = timeout(clients.size());
     }
@@ -97,7 +97,7 @@ public class ApplicationMetricsRetriever extends AbstractComponent {
         return new AbstractMap.SimpleEntry<>(client.node, emptyList());
     }
 
-    private List<NodeMetricsClient> createNodeClients(VespaNodesConfig nodesConfig) {
+    private List<NodeMetricsClient> createNodeClients(MetricsNodesConfig nodesConfig) {
         return nodesConfig.node().stream()
                 .map(Node::new)
                 .map(node-> new NodeMetricsClient(httpClient, node, Clock.systemUTC()))
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 3dab7fae4c5..7cc47b31104 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
@@ -23,7 +23,7 @@ public class Node {
 
     private final String metricsUriBase;
 
-    public Node(VespaNodesConfig.Node nodeConfig) {
+    public Node(MetricsNodesConfig.Node nodeConfig) {
         this(nodeConfig.configId(), nodeConfig.hostname(), nodeConfig.metricsPort() , nodeConfig.metricsPath());
     }
 
diff --git a/metrics-proxy/src/main/resources/configdefinitions/vespa-nodes.def b/metrics-proxy/src/main/resources/configdefinitions/metrics-nodes.def
index 3f4165c08ec..3f4165c08ec 100644
--- a/metrics-proxy/src/main/resources/configdefinitions/vespa-nodes.def
+++ b/metrics-proxy/src/main/resources/configdefinitions/metrics-nodes.def
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 fe87a963eb6..e3d929823a4 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
@@ -163,17 +163,17 @@ public class ApplicationMetricsHandlerTest {
         }
     }
 
-    private VespaNodesConfig nodesConfig(String... paths) {
+    private MetricsNodesConfig nodesConfig(String... paths) {
         var nodes = Arrays.stream(paths)
                 .map(this::nodeConfig)
                 .collect(toList());
-        return new VespaNodesConfig.Builder()
+        return new MetricsNodesConfig.Builder()
                 .node(nodes)
                 .build();
     }
 
-    private VespaNodesConfig.Node.Builder nodeConfig(String path) {
-        return new VespaNodesConfig.Node.Builder()
+    private MetricsNodesConfig.Node.Builder nodeConfig(String path) {
+        return new MetricsNodesConfig.Node.Builder()
                 .configId(path)
                 .hostname("localhost")
                 .metricsPath(path)
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 f2948f67c7a..48d421cf1a4 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
@@ -50,7 +50,7 @@ public class ApplicationMetricsRetrieverTest {
         verifyRetrievingMetricsFromSingleNode(config, node);
     }
 
-    private void verifyRetrievingMetricsFromSingleNode(VespaNodesConfig config, Node node) {
+    private void verifyRetrievingMetricsFromSingleNode(MetricsNodesConfig config, Node node) {
         wireMockRule.stubFor(get(urlPathEqualTo(config.node(0).metricsPath()))
                                      .willReturn(aResponse().withBody(RESPONSE)));
 
@@ -149,17 +149,17 @@ public class ApplicationMetricsRetrieverTest {
         verifyRetrievingMetricsFromSingleNode(config, node);
     }
 
-    private VespaNodesConfig nodesConfig(String... paths) {
+    private MetricsNodesConfig nodesConfig(String... paths) {
         var nodes = Arrays.stream(paths)
                 .map(this::nodeConfig)
                 .collect(toList());
-        return new VespaNodesConfig.Builder()
+        return new MetricsNodesConfig.Builder()
                 .node(nodes)
                 .build();
     }
 
-    private VespaNodesConfig.Node.Builder nodeConfig(String path) {
-        return new VespaNodesConfig.Node.Builder()
+    private MetricsNodesConfig.Node.Builder nodeConfig(String path) {
+        return new MetricsNodesConfig.Node.Builder()
                 .configId(path)
                 .hostname(HOST)
                 .metricsPath(path)