diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-03-19 12:41:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 12:41:47 +0100 |
| commit | 2a03e65bd95c6b3117178e115cfd57b885039881 (patch) | |
| tree | 4b0b442ae6698794bde834a5808a901a8dda62c1 | |
| parent | 2b9af119333af4e907115a8157d0a0ea8494a1a1 (diff) | |
| parent | ce21355bc1256f13bf9efb85ff54eeaf1287d362 (diff) | |
Merge pull request #17062 from vespa-engine/mortent/coredumps-vespa-cloud
Report system metadata field
2 files changed, 2 insertions, 0 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 f1a0ecdb1a3..9a34aa82e9c 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,6 +159,7 @@ 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 fe0a7a52a62..c899198f419 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,6 +154,7 @@ 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\"," + |