Don't set number of replicas for indices that rely on auto_expand_rep…

…licas
javanna · May 24, 2024 · 7ffbba8 · 7ffbba8
1 parent 1ec137d
commit 7ffbba8
Show file tree

Hide file tree

Showing 23 changed files with 3 additions and 26 deletions.
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/connector-secrets.json b/x-pack/plugin/core/template-resources/src/main/resources/connector-secrets.json
@@ -3,7 +3,6 @@
     "index": {
       "auto_expand_replicas": "0-1",
       "number_of_shards": 1,
-      "number_of_replicas": 0,
       "priority": 100,
       "refresh_interval": "1s"
     }

diff --git a/...esources/src/main/resources/entsearch/analytics/behavioral_analytics-events-settings.json b/...esources/src/main/resources/entsearch/analytics/behavioral_analytics-events-settings.json
@@ -8,7 +8,6 @@
         },
         "codec": "best_compression",
         "number_of_shards": 1,
-        "number_of_replicas": 0,
         "auto_expand_replicas": "0-1",
         "final_pipeline": "behavioral_analytics-events-final_pipeline",
         "sort": {

diff --git a/...emplate-resources/src/main/resources/entsearch/connector/elastic-connectors-settings.json b/...emplate-resources/src/main/resources/entsearch/connector/elastic-connectors-settings.json
@@ -3,8 +3,7 @@
     "settings": {
       "hidden": true,
       "number_of_shards": "1",
-      "auto_expand_replicas": "0-1",
-      "number_of_replicas": "0"
+      "auto_expand_replicas": "0-1"
     }
   },
   "_meta": {

diff --git a/...plugin/core/template-resources/src/main/resources/idp/saml-service-provider-template.json b/...plugin/core/template-resources/src/main/resources/idp/saml-service-provider-template.json
@@ -8,7 +8,6 @@
   "order": 100,
   "settings": {
     "number_of_shards": 1,
-    "number_of_replicas": 0,
     "auto_expand_replicas": "0-1",
     "index.priority": 10,
     "index.format": 1

diff --git a/x-pack/plugin/core/template-resources/src/main/resources/ilm-history.json b/x-pack/plugin/core/template-resources/src/main/resources/ilm-history.json
@@ -8,7 +8,6 @@
   "template": {
     "settings": {
       "index.number_of_shards": 1,
-      "index.number_of_replicas": 0,
       "index.auto_expand_replicas": "0-1"
     },
     "lifecycle": {

diff --git a/x-pack/plugin/core/template-resources/src/main/resources/monitoring-alerts-7.json b/x-pack/plugin/core/template-resources/src/main/resources/monitoring-alerts-7.json
@@ -4,7 +4,6 @@
   "settings": {
     "index": {
       "number_of_shards": 1,
-      "number_of_replicas": 0,
       "auto_expand_replicas": "0-1",
       "format": 7,
       "codec": "best_compression"

diff --git a/x-pack/plugin/core/template-resources/src/main/resources/monitoring-es.json b/x-pack/plugin/core/template-resources/src/main/resources/monitoring-es.json
@@ -3,7 +3,6 @@
   "version": ${xpack.monitoring.template.release.version},
   "settings": {
     "index.number_of_shards": 1,
-    "index.number_of_replicas": 0,
     "index.auto_expand_replicas": "0-1",
     "index.format": 7,
     "index.codec": "best_compression"

diff --git a/x-pack/plugin/core/template-resources/src/main/resources/monitoring-kibana.json b/x-pack/plugin/core/template-resources/src/main/resources/monitoring-kibana.json
@@ -3,8 +3,7 @@
   "version": ${xpack.monitoring.template.release.version},
   "settings": {
     "index.number_of_shards": 1,
-    "index.number_of_replicas": 0,
-    "index.auto_expand_replicas": "0-1",
+        "index.auto_expand_replicas": "0-1",
     "index.format": 7,
     "index.codec": "best_compression"
   },

diff --git a/x-pack/plugin/core/template-resources/src/main/resources/monitoring-logstash.json b/x-pack/plugin/core/template-resources/src/main/resources/monitoring-logstash.json
@@ -3,8 +3,7 @@
   "version": ${xpack.monitoring.template.release.version},
   "settings": {
     "index.number_of_shards": 1,
-    "index.number_of_replicas": 0,
-    "index.auto_expand_replicas": "0-1",
+        "index.auto_expand_replicas": "0-1",
     "index.format": 7,
     "index.codec": "best_compression"
   },

diff --git a/.../template-resources/src/main/resources/profiling/component-template/profiling-events.json b/.../template-resources/src/main/resources/profiling/component-template/profiling-events.json
@@ -3,7 +3,6 @@
     "settings": {
       "index": {
         "number_of_shards": 4,
-        "number_of_replicas": 0,
         "auto_expand_replicas": "0-1",
         "max_result_window": 150000,
         "refresh_interval": "10s",

diff --git a/...late-resources/src/main/resources/profiling/component-template/profiling-executables.json b/...late-resources/src/main/resources/profiling/component-template/profiling-executables.json
@@ -2,7 +2,6 @@
   "template": {
     "settings": {
       "index": {
-        "number_of_replicas": 0,
         "auto_expand_replicas": "0-1",
         "refresh_interval": "10s",
         "hidden": true,

diff --git a/...e/template-resources/src/main/resources/profiling/component-template/profiling-hosts.json b/...e/template-resources/src/main/resources/profiling/component-template/profiling-hosts.json
@@ -2,7 +2,6 @@
   "template": {
     "settings": {
       "index": {
-        "number_of_replicas": 0,
         "auto_expand_replicas": "0-1",
         "refresh_interval": "10s",
         "sort": {

diff --git a/...template-resources/src/main/resources/profiling/component-template/profiling-metrics.json b/...template-resources/src/main/resources/profiling/component-template/profiling-metrics.json
@@ -2,7 +2,6 @@
   "template": {
     "settings": {
       "index": {
-        "number_of_replicas": 0,
         "auto_expand_replicas": "0-1",
         "refresh_interval": "10s",
         "sort": {

diff --git a/...late-resources/src/main/resources/profiling/component-template/profiling-stackframes.json b/...late-resources/src/main/resources/profiling/component-template/profiling-stackframes.json
@@ -3,7 +3,6 @@
     "settings": {
       "index": {
         "number_of_shards": 16,
-        "number_of_replicas": 0,
         "auto_expand_replicas": "0-1",
         "refresh_interval": "10s",
         "hidden": true,

diff --git a/...late-resources/src/main/resources/profiling/component-template/profiling-stacktraces.json b/...late-resources/src/main/resources/profiling/component-template/profiling-stacktraces.json
@@ -3,7 +3,6 @@
     "settings": {
       "index": {
         "number_of_shards": 16,
-        "number_of_replicas": 0,
         "auto_expand_replicas": "0-1",
         "refresh_interval": "10s",
         "hidden": true,

diff --git a/...template-resources/src/main/resources/profiling/component-template/profiling-symbols.json b/...template-resources/src/main/resources/profiling/component-template/profiling-symbols.json
@@ -3,7 +3,6 @@
     "settings": {
       "index": {
         "number_of_shards": "16",
-        "number_of_replicas": 0,
         "auto_expand_replicas": "0-1",
         "refresh_interval": "10s",
         "hidden": true

diff --git a/...e-resources/src/main/resources/profiling/index-template/profiling-returnpads-private.json b/...e-resources/src/main/resources/profiling/index-template/profiling-returnpads-private.json
@@ -5,7 +5,6 @@
   "template": {
     "settings": {
       "index": {
-        "number_of_replicas": 0,
         "auto_expand_replicas": "0-1",
         "refresh_interval": "10s",
         "hidden": true

diff --git a/...plate-resources/src/main/resources/profiling/index-template/profiling-sq-executables.json b/...plate-resources/src/main/resources/profiling/index-template/profiling-sq-executables.json
@@ -5,7 +5,6 @@
   "template": {
     "settings": {
       "index": {
-        "number_of_replicas": 0,
         "auto_expand_replicas": "0-1",
         "refresh_interval": "10s",
         "hidden": true

diff --git a/...mplate-resources/src/main/resources/profiling/index-template/profiling-sq-leafframes.json b/...mplate-resources/src/main/resources/profiling/index-template/profiling-sq-leafframes.json
@@ -5,7 +5,6 @@
   "template": {
     "settings": {
       "index": {
-        "number_of_replicas": 0,
         "auto_expand_replicas": "0-1",
         "refresh_interval": "10s",
         "hidden": true

diff --git a/x-pack/plugin/core/template-resources/src/main/resources/slm-history.json b/x-pack/plugin/core/template-resources/src/main/resources/slm-history.json
@@ -9,7 +9,6 @@
   "template": {
     "settings": {
       "index.number_of_shards": 1,
-      "index.number_of_replicas": 0,
       "index.auto_expand_replicas": "0-1"
     },
     "lifecycle": {

diff --git a/x-pack/plugin/core/template-resources/src/main/resources/watch-history-no-ilm.json b/x-pack/plugin/core/template-resources/src/main/resources/watch-history-no-ilm.json
@@ -7,7 +7,6 @@
   "template": {
     "settings": {
       "index.number_of_shards": 1,
-      "index.number_of_replicas": 0,
       "index.auto_expand_replicas": "0-1",
       "index.hidden": true,
       "index.format": 6

diff --git a/x-pack/plugin/core/template-resources/src/main/resources/watch-history.json b/x-pack/plugin/core/template-resources/src/main/resources/watch-history.json
@@ -7,7 +7,6 @@
   "template": {
     "settings": {
       "index.number_of_shards": 1,
-      "index.number_of_replicas": 0,
       "index.auto_expand_replicas": "0-1",
       "index.lifecycle.name": "watch-history-ilm-policy-16",
       "index.hidden": true,

diff --git a/x-pack/plugin/security/src/test/resources/missing-version-security-index-template.json b/x-pack/plugin/security/src/test/resources/missing-version-security-index-template.json
@@ -3,7 +3,6 @@
   "order" : 1000,
   "settings" : {
     "number_of_shards" : 1,
-    "number_of_replicas" : 0,
     "auto_expand_replicas" : "0-all",
     "analysis" : {
       "filter" : {