File tree 7 files changed +5
-42
lines changed
main/java/org/elasticsearch/xpack/eql/plugin
test/java/org/elasticsearch/xpack/eql/plugin
7 files changed +5
-42
lines changed Original file line number Diff line number Diff line change @@ -95,9 +95,6 @@ testClusters.all {
95
95
setting ' xpack.security.authc.api_key.enabled' , ' true'
96
96
setting ' xpack.security.http.ssl.enabled' , ' false'
97
97
setting ' xpack.security.transport.ssl.enabled' , ' false'
98
- if (BuildParams . isSnapshotBuild() == false ) {
99
- systemProperty ' es.eql_feature_flag_registered' , ' true'
100
- }
101
98
setting ' xpack.eql.enabled' , ' true'
102
99
// Truststore settings are not used since TLS is not enabled. Included for testing the get certificates API
103
100
setting ' xpack.security.http.ssl.certificate_authorities' , ' testnode.crt'
Original file line number Diff line number Diff line change @@ -54,7 +54,6 @@ testClusters.integTest {
54
54
setting ' indices.lifecycle.history_index_enabled' , ' false'
55
55
if (BuildParams . isSnapshotBuild() == false ) {
56
56
systemProperty ' es.autoscaling_feature_flag_registered' , ' true'
57
- systemProperty ' es.eql_feature_flag_registered' , ' true'
58
57
systemProperty ' es.searchable_snapshots_feature_enabled' , ' true'
59
58
}
60
59
setting ' xpack.autoscaling.enabled' , ' true'
Original file line number Diff line number Diff line change @@ -21,12 +21,6 @@ archivesBaseName = 'x-pack-eql'
21
21
// All integration tests live in qa modules
22
22
integTest. enabled = false
23
23
24
- tasks. named(' internalClusterTest' ). configure {
25
- if (BuildParams . isSnapshotBuild() == false ) {
26
- systemProperty ' es.eql_feature_flag_registered' , ' true'
27
- }
28
- }
29
-
30
24
dependencies {
31
25
compileOnly project(path : xpackModule(' core' ), configuration : ' default' )
32
26
compileOnly(project(' :modules:lang-painless' )) {
Original file line number Diff line number Diff line change @@ -19,9 +19,7 @@ dependencies {
19
19
20
20
testClusters. integTest {
21
21
testDistribution = ' DEFAULT'
22
- if (BuildParams . isSnapshotBuild()) {
23
- setting ' xpack.eql.enabled' , ' true'
24
- }
22
+ setting ' xpack.eql.enabled' , ' true'
25
23
setting ' xpack.license.self_generated.type' , ' basic'
26
24
setting ' xpack.monitoring.collection.enabled' , ' true'
27
25
}
Original file line number Diff line number Diff line change @@ -11,9 +11,7 @@ dependencies {
11
11
12
12
testClusters. integTest {
13
13
testDistribution = ' DEFAULT'
14
- if (BuildParams . isSnapshotBuild()) {
15
- setting ' xpack.eql.enabled' , ' true'
16
- }
14
+ setting ' xpack.eql.enabled' , ' true'
17
15
setting ' xpack.license.self_generated.type' , ' basic'
18
16
setting ' xpack.monitoring.collection.enabled' , ' true'
19
17
setting ' xpack.security.enabled' , ' true'
Original file line number Diff line number Diff line change @@ -49,27 +49,9 @@ public class EqlPlugin extends Plugin implements ActionPlugin {
49
49
50
50
private final boolean enabled ;
51
51
52
- private static final boolean EQL_FEATURE_FLAG_REGISTERED ;
53
-
54
- static {
55
- final String property = System .getProperty ("es.eql_feature_flag_registered" );
56
- if (Build .CURRENT .isSnapshot () && property != null ) {
57
- throw new IllegalArgumentException ("es.eql_feature_flag_registered is only supported in non-snapshot builds" );
58
- }
59
- if ("true" .equals (property )) {
60
- EQL_FEATURE_FLAG_REGISTERED = true ;
61
- } else if ("false" .equals (property ) || property == null ) {
62
- EQL_FEATURE_FLAG_REGISTERED = false ;
63
- } else {
64
- throw new IllegalArgumentException (
65
- "expected es.eql_feature_flag_registered to be unset or [true|false] but was [" + property + "]"
66
- );
67
- }
68
- }
69
-
70
52
public static final Setting <Boolean > EQL_ENABLED_SETTING = Setting .boolSetting (
71
53
"xpack.eql.enabled" ,
72
- false ,
54
+ true ,
73
55
Setting .Property .NodeScope
74
56
);
75
57
@@ -106,11 +88,7 @@ public Collection<Module> createGuiceModules() {
106
88
*/
107
89
@ Override
108
90
public List <Setting <?>> getSettings () {
109
- if (isSnapshot () || EQL_FEATURE_FLAG_REGISTERED ) {
110
- return Collections .singletonList (EQL_ENABLED_SETTING );
111
- } else {
112
- return Collections .emptyList ();
113
- }
91
+ return Collections .singletonList (EQL_ENABLED_SETTING );
114
92
}
115
93
116
94
@ Override
Original file line number Diff line number Diff line change 10
10
import org .elasticsearch .test .ESTestCase ;
11
11
12
12
import static org .hamcrest .Matchers .hasItem ;
13
- import static org .hamcrest .Matchers .not ;
14
13
15
14
public class EqlPluginTests extends ESTestCase {
16
15
public void testEnabledSettingRegisteredInSnapshotBuilds () {
@@ -34,6 +33,6 @@ protected boolean isSnapshot() {
34
33
}
35
34
36
35
};
37
- assertThat (plugin .getSettings (), not ( hasItem (EqlPlugin .EQL_ENABLED_SETTING ) ));
36
+ assertThat (plugin .getSettings (), hasItem (EqlPlugin .EQL_ENABLED_SETTING ));
38
37
}
39
38
}
You can’t perform that action at this time.
0 commit comments