diff options
| author | Valerij Fredriksen <valerij92@gmail.com> | 2021-04-16 11:10:50 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerij92@gmail.com> | 2021-04-16 11:10:50 +0200 |
| commit | b4cdcb29514b43faf8062d47244f16835db616c4 (patch) | |
| tree | d16f6f0b4fc6abbf1044a4a264876272743d0616 /node-admin | |
| parent | bec000c3838e0cf3e7940c1666b1fdf8214aa4e1 (diff) | |
Move core attribute with the rest
Diffstat (limited to 'node-admin')
3 files changed, 1 insertions, 2 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 5be6c660dd5..93717543a1c 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 @@ -173,6 +173,7 @@ public class StorageMaintainer { private Map<String, Object> getCoredumpNodeAttributes(NodeAgentContext context, Optional<Container> container) { Map<String, String> attributes = new HashMap<>(); attributes.put("hostname", context.node().hostname()); + attributes.put("system", context.zone().getSystemName().value()); attributes.put("region", context.zone().getRegionName().value()); attributes.put("environment", context.zone().getEnvironment().value()); attributes.put("flavor", context.node().flavor()); 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 9a34aa82e9c..f1a0ecdb1a3 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 @@ -159,7 +159,6 @@ public class CoredumpHandler { Map<String, Object> metadata = new HashMap<>(coreCollector.collect(context, coredumpFilePathInContainer)); metadata.putAll(nodeAttributesSupplier.get()); metadata.put("coredump_path", doneCoredumpsPath.resolve(context.containerName().asString()).resolve(coredumpDirectory.getFileName()).toString()); - metadata.put("system", context.zone().getSystemName().value()); String metadataFields = objectMapper.writeValueAsString(Map.of("fields", metadata)); metadataPath.writeUtf8File(metadataFields); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java index c899198f419..fe0a7a52a62 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java @@ -154,7 +154,6 @@ public class CoredumpHandlerTest { String expectedMetadataStr = "{\"fields\":{" + "\"hostname\":\"host123.yahoo.com\"," + - "\"system\":\"main\"," + "\"kernel_version\":\"3.10.0-862.9.1.el7.x86_64\"," + "\"backtrace\":[\"call 1\",\"function 2\",\"something something\"]," + "\"vespa_version\":\"6.48.4\"," + |