diff --git a/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/ClusterAdapterES7.java b/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/ClusterAdapterES7.java index bc8d9b1f528b..17843431a435 100644 --- a/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/ClusterAdapterES7.java +++ b/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/ClusterAdapterES7.java @@ -284,6 +284,7 @@ public Map nodesInfo() { private NodeInfo createNodeInfo(JsonNode nodesJson) { return NodeInfo.builder() + .name(nodesJson.at("/name").asText()) .version(nodesJson.at("/version").asText()) .os(nodesJson.at("/os")) .roles(toStream(nodesJson.at("/roles").elements()).map(JsonNode::asText).toList()) diff --git a/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ClusterAdapterOS2.java b/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ClusterAdapterOS2.java index 4bab3c02cda7..56ac83dd8eb0 100644 --- a/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ClusterAdapterOS2.java +++ b/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ClusterAdapterOS2.java @@ -293,6 +293,7 @@ public Map nodesInfo() { private NodeInfo createNodeInfo(JsonNode nodesJson) { return NodeInfo.builder() + .name(nodesJson.at("/name").asText()) .version(nodesJson.at("/version").asText()) .os(nodesJson.at("/os")) .roles(toStream(nodesJson.at("/roles").elements()).map(JsonNode::asText).toList()) diff --git a/graylog-storage-opensearch3/src/main/java/org/graylog/storage/opensearch3/ClusterAdapterOS.java b/graylog-storage-opensearch3/src/main/java/org/graylog/storage/opensearch3/ClusterAdapterOS.java index 09feb2c38d53..5516cc73b633 100644 --- a/graylog-storage-opensearch3/src/main/java/org/graylog/storage/opensearch3/ClusterAdapterOS.java +++ b/graylog-storage-opensearch3/src/main/java/org/graylog/storage/opensearch3/ClusterAdapterOS.java @@ -315,6 +315,7 @@ public Map nodesInfo() private org.graylog2.system.stats.elasticsearch.NodeInfo createNodeInfo(JsonNode nodesJson) { return org.graylog2.system.stats.elasticsearch.NodeInfo.builder() + .name(nodesJson.at("/name").asText()) .version(nodesJson.at("/version").asText()) .os(nodesJson.at("/os")) .roles(toStream(nodesJson.at("/roles").elements()).map(JsonNode::asText).toList()) diff --git a/graylog2-server/src/main/java/org/graylog2/system/stats/elasticsearch/NodeInfo.java b/graylog2-server/src/main/java/org/graylog2/system/stats/elasticsearch/NodeInfo.java index c7f86ee9b3b9..6fdc128c0e30 100644 --- a/graylog2-server/src/main/java/org/graylog2/system/stats/elasticsearch/NodeInfo.java +++ b/graylog2-server/src/main/java/org/graylog2/system/stats/elasticsearch/NodeInfo.java @@ -30,6 +30,9 @@ public static Builder builder() { return new AutoValue_NodeInfo.Builder(); } + @JsonProperty + public abstract String name(); + @JsonProperty public abstract String version(); @@ -44,6 +47,8 @@ public static Builder builder() { @AutoValue.Builder public abstract static class Builder { + public abstract Builder name(String name); + public abstract Builder version(String version); public abstract Builder os(Object os);