diff options
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java index cd856c275ea..6aa5a8d9fc1 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java @@ -228,20 +228,27 @@ public class CoredumpHandler { private Dimensions generateDimensions(NodeAgentContext context) { NodeSpec node = context.node(); - ApplicationId owner = node.owner().get(); - NodeMembership membership = node.membership().get(); Dimensions.Builder dimensionsBuilder = new Dimensions.Builder() .add("host", node.hostname()) .add("flavor", node.flavor()) .add("state", node.state().toString()) - .add("zone", context.zone().getId().value()) - .add("tenantName", owner.tenant().value()) - .add("applicationName", owner.application().value()) - .add("instanceName", owner.instance().value()) - .add("app", String.join(".", owner.application().value(), owner.instance().value())) - .add("applicationId", owner.toFullString()) - .add("clustertype", membership.clusterType()) - .add("clusterid", membership.clusterId()); + .add("zone", context.zone().getId().value()); + + node.owner().ifPresent(owner -> + dimensionsBuilder + .add("tenantName", owner.tenant().value()) + .add("applicationName", owner.application().value()) + .add("instanceName", owner.instance().value()) + .add("app", String.join(".", owner.application().value(), owner.instance().value())) + .add("applicationId", owner.toFullString()) + ); + + node.membership().ifPresent(membership -> + dimensionsBuilder + .add("clustertype", membership.clusterType()) + .add("clusterid", membership.clusterId()) + ); + node.parentHostname().ifPresent(parent -> dimensionsBuilder.add("parentHostname", parent)); node.allowedToBeDown().ifPresent(allowed -> dimensionsBuilder.add("orchestratorState", allowed ? "ALLOWED_TO_BE_DOWN" : "NO_REMARKS")); |