diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-01-20 12:02:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-20 12:02:49 +0100 |
| commit | 9ba0df95ef5e96c38ba53aff3b465ff2238948f8 (patch) | |
| tree | 751dbd3c1a26d5ff9b69d6c4dca46477e925ddb0 /config-model/src | |
| parent | 0c6b28ef310bb5714b8c2ba10651ae87068e9b59 (diff) | |
| parent | 2b80ddb639d6740099107896548e24f694539ef0 (diff) | |
Merge pull request #11840 from vespa-engine/gjoranv/node-info
Gjoranv/node info
Diffstat (limited to 'config-model/src')
2 files changed, 3 insertions, 3 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 32ecc6e36ba..21fa05ceeab 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() - .nodeId(container.getHost().getConfigId()) + .role(container.getHost().getConfigId()) .hostname(container.getHostName()) .metricsPort(MetricsProxyContainer.BASEPORT) .metricsPath(MetricsV1Handler.VALUES_PATH); @@ -30,7 +30,7 @@ public class MetricsNodesConfigGenerator { if (container.isHostedVespa) container.getHostResource().spec().membership() .map(ClusterMembership::stringValue) - .ifPresent(builder::nodeId); + .ifPresent(builder::role); 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 3d43f8921a3..6fe69ac5c64 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.nodeId().startsWith("container/foo/0/")); + assertTrue(node.role().startsWith("container/foo/0/")); assertTrue(node.hostname().startsWith("node-1-3-9-")); assertEquals(MetricsProxyContainer.BASEPORT, node.metricsPort()); assertEquals(MetricsV1Handler.VALUES_PATH, node.metricsPath()); |