Skip to content

Commit 675b42f

Browse files
committed
Add x-pack features to XPackUsage and XPackInfo responses (#4065)
Relates: #4001 This commit adds features to XPackUsage and XPackInfo responses (cherry picked from commit 564cfae)
1 parent 035d1ef commit 675b42f

File tree

3 files changed

+55
-1
lines changed

3 files changed

+55
-1
lines changed

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

+9
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

+32
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
[DataMember(Name = "watcher")]
@@ -64,6 +74,9 @@ public class XPackUsageResponse : ResponseBase
6474
[DataMember(Name = "security")]
6575
public SecurityUsage Security { get; internal set; }
6676

77+
[DataMember(Name = "vectors")]
78+
public XPackUsage Vectors { get; internal set; }
79+
6780
[DataMember(Name = "voting_only")]
6881
public XPackUsage VotingOnly { get; internal set; }
6982
}
@@ -310,4 +323,23 @@ public class ForecastStatistics
310323
public long Total { get; internal set; }
311324
}
312325
}
326+
327+
public class IlmUsage
328+
{
329+
[DataMember(Name = "policy_count")]
330+
public int PolicyCount { get; internal set; }
331+
332+
[DataMember(Name = "policy_stats")]
333+
public IReadOnlyCollection<IlmPolicyStatistics> PolicyStatistics { get; internal set; } =
334+
EmptyReadOnly<IlmPolicyStatistics>.Collection;
335+
336+
public class IlmPolicyStatistics
337+
{
338+
[DataMember(Name = "phases")]
339+
public IPhases Phases { get; internal set; }
340+
341+
[DataMember(Name = "indices_managed")]
342+
public int IndicesManaged { get; internal set; }
343+
}
344+
}
313345
}

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

+14-1
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;
@@ -59,6 +60,13 @@ [I] public async Task XPackInfoResponse() => await Assert<XPackInfoResponse>(XPa
5960
r.Features.Sql.Should().NotBeNull();
6061
r.Features.Watcher.Should().NotBeNull();
6162
r.License.Should().NotBeNull();
63+
64+
if (TestConfiguration.Instance.InRange(">=7.3.0"))
65+
{
66+
r.Features.Flattened.Should().NotBeNull();
67+
r.Features.DataFrame.Should().NotBeNull();
68+
r.Features.Vectors.Should().NotBeNull();
69+
}
6270
});
6371

6472
[I] public async Task XPackUsageResponse() => await Assert<XPackUsageResponse>(XPackUsageStep, (v, r) =>
@@ -88,7 +96,12 @@ [I] public async Task XPackUsageResponse() => await Assert<XPackUsageResponse>(X
8896
r.Alerting.Watch.Should().NotBeNull();
8997

9098
if (TestConfiguration.Instance.InRange(">=7.3.0"))
91-
r.VotingOnly.Should().NotBeNull();
99+
{
100+
r.Flattened.Should().NotBeNull();
101+
r.DataFrame.Should().NotBeNull();
102+
r.Vectors.Should().NotBeNull();
103+
r.VotingOnly.Should().NotBeNull();
104+
}
92105
});
93106
}
94107
}

0 commit comments

Comments
 (0)