File tree Expand file tree Collapse file tree 6 files changed +19
-7
lines changed
src/main/java/org/elasticsearch/xpack/eql/util Expand file tree Collapse file tree 6 files changed +19
-7
lines changed Original file line number Diff line number Diff line change
1
+ pr : 91834
2
+ summary : Limit CCS to v 7.15
3
+ area : EQL
4
+ type : bug
5
+ issues :
6
+ - 91762
Original file line number Diff line number Diff line change @@ -47,8 +47,9 @@ or alias.
47
47
48
48
* See <<eql-required-fields>>.
49
49
50
- * experimental:[] For cross-cluster search, the local and remote clusters must
51
- use the same {es} version. For security, see <<remote-clusters-security>>.
50
+ * experimental:[] For cross-cluster search, the local and remote clusters must use the same {es} version.
51
+ Local clusters version 7.17.7 or later also support cross-cluster search to remote clusters version 7.15.0 or later.
52
+ For security, see <<remote-clusters-security>>.
52
53
53
54
[[eql-search-api-limitations]]
54
55
===== Limitations
Original file line number Diff line number Diff line change @@ -800,6 +800,8 @@ experimental::[]
800
800
The EQL search API supports <<modules-cross-cluster-search,cross-cluster
801
801
search>>. However, the local and <<remote-clusters,remote clusters>>
802
802
must use the same {es} version.
803
+ Local clusters version 7.17.7 or later also support <<modules-cross-cluster-search,cross-cluster
804
+ search>> to <<remote-clusters,remote clusters>> version 7.15.0 or later.
803
805
804
806
The following <<cluster-update-settings,cluster update settings>> request
805
807
adds two remote clusters: `cluster_one` and `cluster_two`.
Original file line number Diff line number Diff line change @@ -439,6 +439,8 @@ in the following matrix.
439
439
440
440
IMPORTANT: For the <<eql-search-api,EQL search API>>, the local and remote
441
441
clusters must use the same {es} version.
442
+ Local clusters version 7.17.7 or later also support cross-cluster search to
443
+ <<remote-clusters,remote clusters>> version 7.15.0 or later.
442
444
443
445
[%collapsible%open]
444
446
.Version compatibility matrix
Original file line number Diff line number Diff line change 7
7
*/
8
8
9
9
10
- import org.elasticsearch.gradle.Version
11
10
import org.elasticsearch.gradle.internal.info.BuildParams
12
11
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
13
12
@@ -20,8 +19,8 @@ dependencies {
20
19
testImplementation project(' :client:rest-high-level' )
21
20
}
22
21
23
- // EQL was released as GA in v 7.11.0
24
- BuildParams . bwcVersions. withWireCompatiple(v -> v. onOrAfter(" 7.11 .0" )) { bwcVersion , baseName ->
22
+ // see org.elasticsearch.xpack.eql.util.RemoteClusterRegistry.FIRST_COMPATIBLE_VERSION
23
+ BuildParams . bwcVersions. withWireCompatiple(v -> v. onOrAfter(" 7.15 .0" )) { bwcVersion , baseName ->
25
24
26
25
/**
27
26
* We execute tests 3 times.
Original file line number Diff line number Diff line change 14
14
import org .elasticsearch .common .Strings ;
15
15
import org .elasticsearch .transport .RemoteClusterAware ;
16
16
import org .elasticsearch .transport .RemoteClusterService ;
17
+ import org .elasticsearch .xpack .eql .execution .search .RuntimeUtils ;
17
18
18
19
import java .util .Set ;
19
20
import java .util .TreeSet ;
@@ -25,6 +26,8 @@ public class RemoteClusterRegistry {
25
26
private final IndexNameExpressionResolver indexNameExpressionResolver ;
26
27
private final ClusterService clusterService ;
27
28
29
+ public static final Version FIRST_COMPATIBLE_VERSION = RuntimeUtils .SWITCH_TO_MULTI_VALUE_FIELDS_VERSION ;
30
+
28
31
public RemoteClusterRegistry (
29
32
RemoteClusterService remoteClusterService ,
30
33
IndicesOptions indicesOptions ,
@@ -41,8 +44,7 @@ public Set<String> versionIncompatibleClusters(String indexPattern) {
41
44
Set <String > incompatibleClusters = new TreeSet <>();
42
45
for (String clusterAlias : clusterAliases (Strings .splitStringByCommaToArray (indexPattern ), true )) {
43
46
Version clusterVersion = remoteClusterService .getConnection (clusterAlias ).getVersion ();
44
- // EQL was released as GA in v 7.11.0
45
- if (Version .CURRENT .isCompatible (clusterVersion ) == false || clusterVersion .before (Version .V_7_11_0 )) {
47
+ if (Version .CURRENT .isCompatible (clusterVersion ) == false || clusterVersion .before (FIRST_COMPATIBLE_VERSION )) {
46
48
incompatibleClusters .add (clusterAlias );
47
49
}
48
50
}
You can’t perform that action at this time.
0 commit comments