Skip to content

Commit 564cfae

Browse files
authored
Add x-pack features to XPackUsage and XPackInfo responses (#4065)
Relates: #4001 This commit adds features to XPackUsage and XPackInfo responses
1 parent 8acde7e commit 564cfae

File tree

3 files changed

+55
-1
lines changed

3 files changed

+55
-1
lines changed

src/Nest/XPack/Info/XPackInfo/XPackInfoResponse.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ public class XPackFeatures
4747
[DataMember(Name = "ccr")]
4848
public XPackFeature Ccr { get; internal set; }
4949

50+
[DataMember(Name = "data_frame")]
51+
public XPackFeature DataFrame { get; internal set; }
52+
53+
[DataMember(Name = "flattened")]
54+
public XPackFeature Flattened { get; internal set; }
55+
5056
[DataMember(Name = "graph")]
5157
public XPackFeature Graph { get; internal set; }
5258

@@ -71,6 +77,9 @@ public class XPackFeatures
7177
[DataMember(Name = "sql")]
7278
public XPackFeature Sql { get; internal set; }
7379

80+
[DataMember(Name = "vectors")]
81+
public XPackFeature Vectors { get; internal set; }
82+
7483
[DataMember(Name = "watcher")]
7584
public XPackFeature Watcher { get; internal set; }
7685
}

src/Nest/XPack/Info/XPackUsage/XPackUsageResponse.cs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections.Generic;
2+
using System.Collections.ObjectModel;
23
using System.Runtime.Serialization;
34
using Elasticsearch.Net;
45

@@ -44,6 +45,15 @@ public class XPackUsageResponse : ResponseBase
4445
[DataMember(Name = "rollup")]
4546
public XPackUsage Rollup { get; internal set; }
4647

48+
[DataMember(Name = "data_frame")]
49+
public XPackUsage DataFrame { get; internal set; }
50+
51+
[DataMember(Name = "flattened")]
52+
public XPackUsage Flattened { get; internal set; }
53+
54+
[DataMember(Name = "ilm")]
55+
public IlmUsage IndexLifecycleManagement { get; internal set; }
56+
4757
[DataMember(Name = "ccr")]
4858
public CcrUsage Ccr { get; internal set; }
4959

@@ -65,6 +75,9 @@ public class XPackUsageResponse : ResponseBase
6575
[DataMember(Name = "security")]
6676
public SecurityUsage Security { get; internal set; }
6777

78+
[DataMember(Name = "vectors")]
79+
public XPackUsage Vectors { get; internal set; }
80+
6881
[DataMember(Name = "voting_only")]
6982
public XPackUsage VotingOnly { get; internal set; }
7083
}
@@ -312,4 +325,23 @@ public class ForecastStatistics
312325
public long Total { get; internal set; }
313326
}
314327
}
328+
329+
public class IlmUsage
330+
{
331+
[DataMember(Name = "policy_count")]
332+
public int PolicyCount { get; internal set; }
333+
334+
[DataMember(Name = "policy_stats")]
335+
public IReadOnlyCollection<IlmPolicyStatistics> PolicyStatistics { get; internal set; } =
336+
EmptyReadOnly<IlmPolicyStatistics>.Collection;
337+
338+
public class IlmPolicyStatistics
339+
{
340+
[DataMember(Name = "phases")]
341+
public IPhases Phases { get; internal set; }
342+
343+
[DataMember(Name = "indices_managed")]
344+
public int IndicesManaged { get; internal set; }
345+
}
346+
}
315347
}

src/Tests/Tests/XPack/Info/XPackInfoApiTests.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Net;
12
using System.Threading.Tasks;
23
using Elastic.Xunit.XunitPlumbing;
34
using FluentAssertions;
@@ -61,6 +62,13 @@ [I] public async Task XPackInfoResponse() => await Assert<XPackInfoResponse>(XPa
6162
r.Features.Sql.Should().NotBeNull();
6263
r.Features.Watcher.Should().NotBeNull();
6364
r.License.Should().NotBeNull();
65+
66+
if (TestConfiguration.Instance.InRange(">=7.3.0"))
67+
{
68+
r.Features.Flattened.Should().NotBeNull();
69+
r.Features.DataFrame.Should().NotBeNull();
70+
r.Features.Vectors.Should().NotBeNull();
71+
}
6472
});
6573

6674
[I] public async Task XPackUsageResponse() => await Assert<XPackUsageResponse>(XPackUsageStep, (v, r) =>
@@ -90,7 +98,12 @@ [I] public async Task XPackUsageResponse() => await Assert<XPackUsageResponse>(X
9098
r.Alerting.Watch.Should().NotBeNull();
9199

92100
if (TestConfiguration.Instance.InRange(">=7.3.0"))
93-
r.VotingOnly.Should().NotBeNull();
101+
{
102+
r.Flattened.Should().NotBeNull();
103+
r.DataFrame.Should().NotBeNull();
104+
r.Vectors.Should().NotBeNull();
105+
r.VotingOnly.Should().NotBeNull();
106+
}
94107
});
95108
}
96109
}

0 commit comments

Comments
 (0)