From b38adc291a3d7fed89e9784bef89e22dcd21c428 Mon Sep 17 00:00:00 2001 From: Justin Cranford Date: Mon, 11 Jul 2022 16:20:46 -0400 Subject: [PATCH 1/3] Add CCx 2.0 feature flag --- .../main/java/org/elasticsearch/xpack/core/XPackSettings.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackSettings.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackSettings.java index 0e9bdf8b824ab..1f8f288f2b71e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackSettings.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackSettings.java @@ -8,6 +8,7 @@ package org.elasticsearch.xpack.core; import org.apache.logging.log4j.LogManager; +import org.elasticsearch.Build; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Settings; @@ -54,6 +55,9 @@ private XPackSettings() { */ public static final Setting CCR_ENABLED_SETTING = Setting.boolSetting("xpack.ccr.enabled", true, Property.NodeScope); + public static final boolean CROSS_CLUSTER_2_FEATURE_FLAG_ENABLED = Build.CURRENT.isSnapshot() + || "true".equals(System.getProperty("es.cross_cluster_2_feature_flag_enabled")); + /** Setting for enabling or disabling security. Defaults to true. */ public static final Setting SECURITY_ENABLED = Setting.boolSetting("xpack.security.enabled", true, Setting.Property.NodeScope); From 76f84cf71dffc9fcc0ec5f17c811c4cd57a458af Mon Sep 17 00:00:00 2001 From: Justin Cranford <89857999+justincr-elastic@users.noreply.github.com> Date: Mon, 11 Jul 2022 16:22:53 -0400 Subject: [PATCH 2/3] Update docs/changelog/88451.yaml --- docs/changelog/88451.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/88451.yaml diff --git a/docs/changelog/88451.yaml b/docs/changelog/88451.yaml new file mode 100644 index 0000000000000..c856b1d107f4e --- /dev/null +++ b/docs/changelog/88451.yaml @@ -0,0 +1,5 @@ +pr: 88451 +summary: Add CCx 2.0 feature flag +area: "Authorization, Authentication" +type: feature +issues: [] From 1a5476973c8a320a6daa79589e94f3e18585a7a6 Mon Sep 17 00:00:00 2001 From: Justin Cranford <89857999+justincr-elastic@users.noreply.github.com> Date: Wed, 13 Jul 2022 12:18:48 -0400 Subject: [PATCH 3/3] Delete docs/changelog/88451.yaml --- docs/changelog/88451.yaml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 docs/changelog/88451.yaml diff --git a/docs/changelog/88451.yaml b/docs/changelog/88451.yaml deleted file mode 100644 index c856b1d107f4e..0000000000000 --- a/docs/changelog/88451.yaml +++ /dev/null @@ -1,5 +0,0 @@ -pr: 88451 -summary: Add CCx 2.0 feature flag -area: "Authorization, Authentication" -type: feature -issues: []