Include cluster_id and cluster_type for core dump reports

1 files changed, 4 insertions, 0 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
index 10e0dd50761..9ced178cff9 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
@@ -188,6 +188,10 @@ public class StorageMaintainer {
             attributes.put("application", owner.application().value());
             attributes.put("instance", owner.instance().value());
         });
+        context.node().membership().ifPresent(membership -> {
+            attributes.put("cluster_id", membership.clusterId());
+            attributes.put("cluster_type", membership.type().value());
+        });
         return Collections.unmodifiableMap(attributes);
     }