Skip to content

Commit 77aa9b3

Browse files
Fix Node Info (#4544) (#4547)
This commit adds some missing roles to NodeRole and some additional properties to NodeInfo. Co-authored-by: Stuart Cam <stuart.cam@elastic.co>
1 parent a0f69f2 commit 77aa9b3

File tree

2 files changed

+46
-24
lines changed

2 files changed

+46
-24
lines changed

src/Nest/Cluster/NodesInfo/NodeInfo.cs

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,32 @@ namespace Nest
88
[DataContract]
99
public class NodeInfo
1010
{
11-
[DataMember(Name = "build_hash")]
12-
public string BuildHash { get; internal set; }
11+
[DataMember(Name = "name")]
12+
public string Name { get; internal set; }
13+
14+
[DataMember(Name = "transport_address")]
15+
public string TransportAddress { get; internal set; }
1316

1417
[DataMember(Name = "host")]
1518
public string Host { get; internal set; }
1619

17-
[DataMember(Name = "http")]
18-
public NodeInfoHttp Http { get; internal set; }
19-
2020
[DataMember(Name = "ip")]
2121
public string Ip { get; internal set; }
2222

23-
[DataMember(Name = "jvm")]
24-
public NodeJvmInfo Jvm { get; internal set; }
25-
26-
[DataMember(Name = "name")]
27-
public string Name { get; internal set; }
23+
[DataMember(Name = "version")]
24+
public string Version { get; internal set; }
2825

29-
[DataMember(Name = "network")]
30-
public NodeInfoNetwork Network { get; internal set; }
26+
[DataMember(Name = "build_flavor")]
27+
public string BuildFlavor { get; internal set; }
3128

32-
[DataMember(Name = "os")]
33-
public NodeOperatingSystemInfo OperatingSystem { get; internal set; }
29+
[DataMember(Name = "build_type")]
30+
public string BuildType { get; internal set; }
3431

35-
[DataMember(Name = "plugins")]
36-
public List<PluginStats> Plugins { get; internal set; }
32+
[DataMember(Name = "build_hash")]
33+
public string BuildHash { get; internal set; }
3734

38-
[DataMember(Name = "process")]
39-
public NodeProcessInfo Process { get; internal set; }
35+
[DataMember(Name = "total_indexing_buffer")]
36+
public long? TotalIndexingBuffer { get; internal set; }
4037

4138
/// <summary>
4239
/// All of the different roles that the node fulfills. An empty
@@ -45,21 +42,36 @@ public class NodeInfo
4542
[DataMember(Name = "roles")]
4643
public List<NodeRole> Roles { get; internal set; }
4744

45+
[DataMember(Name ="attributes")]
46+
public IReadOnlyDictionary<string, string> Attributes { get; internal set; } = EmptyReadOnly<string, string>.Dictionary;
47+
4848
[DataMember(Name = "settings")]
4949
public DynamicDictionary Settings { get; internal set; }
5050

51+
[DataMember(Name = "os")]
52+
public NodeOperatingSystemInfo OperatingSystem { get; internal set; }
53+
54+
[DataMember(Name = "process")]
55+
public NodeProcessInfo Process { get; internal set; }
56+
57+
[DataMember(Name = "jvm")]
58+
public NodeJvmInfo Jvm { get; internal set; }
59+
60+
[DataMember(Name = "http")]
61+
public NodeInfoHttp Http { get; internal set; }
62+
63+
[DataMember(Name = "network")]
64+
public NodeInfoNetwork Network { get; internal set; }
65+
66+
[DataMember(Name = "plugins")]
67+
public List<PluginStats> Plugins { get; internal set; }
68+
5169
[DataMember(Name = "thread_pool")]
5270
[JsonFormatter(typeof(VerbatimInterfaceReadOnlyDictionaryKeysFormatter<string, NodeThreadPoolInfo>))]
5371
public IReadOnlyDictionary<string, NodeThreadPoolInfo> ThreadPool { get; internal set; }
5472

5573
[DataMember(Name = "transport")]
5674
public NodeInfoTransport Transport { get; internal set; }
57-
58-
[DataMember(Name = "transport_address")]
59-
public string TransportAddress { get; internal set; }
60-
61-
[DataMember(Name = "version")]
62-
public string Version { get; internal set; }
6375
}
6476

6577
[DataContract]

src/Nest/Cluster/NodesInfo/NodeRole.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace Nest
55
{
6+
// TODO: Make a string in 8.0
67
[StringEnum]
78
public enum NodeRole
89
{
@@ -23,5 +24,14 @@ public enum NodeRole
2324

2425
[EnumMember(Value = "voting_only")]
2526
VotingOnly,
27+
28+
[EnumMember(Value = "transform")]
29+
Transform,
30+
31+
[EnumMember(Value = "remote_cluster_client")]
32+
RemoteClusterClient,
33+
34+
[EnumMember(Value = "coordinating_only")]
35+
CoordinatingOnly,
2636
}
2737
}

0 commit comments

Comments
 (0)