--- Class[Opensearch].orig
+++ Class[Opensearch]
@@
- plugins_mandatory => []
+ plugins_mandatory => ['analysis-hebrew', 'analysis-icu', 'analysis-nori', 'analysis-smartcn', 'analysis-stempel', 'analysis-sudachi', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3']
@@
- instances => {'cloudelastic-chi-eqiad': {'watermarks': {'low': '100gb', 'high': '50gb', 'flood_stage': '10gb'}, 'unicast_hosts': ['cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet'], 'cluster_hosts': ['cloudelastic1007.eqiad.wmnet', 'cloudelastic1008.eqiad.wmnet', 'cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet', 'cloudelastic1012.eqiad.wmnet'], 'expected_nodes': 6, 'recover_after_nodes': 3, 'cluster_name': 'cloudelastic-chi-eqiad', 'short_cluster_name': 'chi', 'http_port': 9200, 'tls_port': 9243, 'tls_ro_port': 8243, 'transport_tcp_port': 9300, 'heap_memory': '55G', 'tune_gc_new_size_ratio': 3, 'certificate_name': 'cloudelastic.wikimedia.org'}, 'cloudelastic-omega-eqiad': {'watermarks': {'low': '100gb', 'high': '50gb', 'flood_stage': '10gb'}, 'unicast_hosts': ['cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet'], 'cluster_hosts': ['cloudelastic1007.eqiad.wmnet', 'cloudelastic1008.eqiad.wmnet', 'cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet', 'cloudelastic1012.eqiad.wmnet'], 'expected_nodes': 6, 'recover_after_nodes': 3, 'cluster_name': 'cloudelastic-omega-eqiad', 'short_cluster_name': 'omega', 'http_port': 9400, 'tls_port': 9443, 'tls_ro_port': 8443, 'transport_tcp_port': 9500, 'heap_memory': '14G', 'certificate_name': 'cloudelastic.wikimedia.org'}, 'cloudelastic-psi-eqiad': {'watermarks': {'low': '100gb', 'high': '50gb', 'flood_stage': '10gb'}, 'unicast_hosts': ['cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet'], 'cluster_hosts': ['cloudelastic1007.eqiad.wmnet', 'cloudelastic1008.eqiad.wmnet', 'cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet', 'cloudelastic1012.eqiad.wmnet'], 'expected_nodes': 6, 'recover_after_nodes': 3, 'cluster_name': 'cloudelastic-psi-eqiad', 'short_cluster_name': 'psi', 'http_port': 9600, 'tls_port': 9643, 'tls_ro_port': 8643, 'transport_tcp_port': 9700, 'heap_memory': '14G', 'certificate_name': 'cloudelastic.wikimedia.org'}}
+ instances => {'cloudelastic-chi-eqiad': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-nori', 'analysis-smartcn', 'analysis-stempel', 'analysis-sudachi', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3'], 'heap_memory': '55G', 'bind_networks': ['0.0.0.0'], 'certificate_name': 'cloudelastic.wikimedia.org', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'bulk_thread_pool_executors': 18, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'watermarks': {'low': '100gb', 'high': '50gb', 'flood_stage': '10gb'}, 'unicast_hosts': ['cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet'], 'cluster_hosts': ['cloudelastic1007.eqiad.wmnet', 'cloudelastic1008.eqiad.wmnet', 'cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet', 'cloudelastic1012.eqiad.wmnet'], 'expected_nodes': 6, 'recover_after_nodes': 3, 'cluster_name': 'cloudelastic-chi-eqiad', 'short_cluster_name': 'chi', 'http_port': 9200, 'tls_port': 9243, 'tls_ro_port': 8243, 'transport_tcp_port': 9300, 'tune_gc_new_size_ratio': 3}, 'cloudelastic-omega-eqiad': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-nori', 'analysis-smartcn', 'analysis-stempel', 'analysis-sudachi', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3'], 'heap_memory': '14G', 'bind_networks': ['0.0.0.0'], 'certificate_name': 'cloudelastic.wikimedia.org', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'bulk_thread_pool_executors': 18, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'watermarks': {'low': '100gb', 'high': '50gb', 'flood_stage': '10gb'}, 'unicast_hosts': ['cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet'], 'cluster_hosts': ['cloudelastic1007.eqiad.wmnet', 'cloudelastic1008.eqiad.wmnet', 'cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet', 'cloudelastic1012.eqiad.wmnet'], 'expected_nodes': 6, 'recover_after_nodes': 3, 'cluster_name': 'cloudelastic-omega-eqiad', 'short_cluster_name': 'omega', 'http_port': 9400, 'tls_port': 9443, 'tls_ro_port': 8443, 'transport_tcp_port': 9500}, 'cloudelastic-psi-eqiad': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-nori', 'analysis-smartcn', 'analysis-stempel', 'analysis-sudachi', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3'], 'heap_memory': '14G', 'bind_networks': ['0.0.0.0'], 'certificate_name': 'cloudelastic.wikimedia.org', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'bulk_thread_pool_executors': 18, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'watermarks': {'low': '100gb', 'high': '50gb', 'flood_stage': '10gb'}, 'unicast_hosts': ['cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet'], 'cluster_hosts': ['cloudelastic1007.eqiad.wmnet', 'cloudelastic1008.eqiad.wmnet', 'cloudelastic1009.eqiad.wmnet', 'cloudelastic1010.eqiad.wmnet', 'cloudelastic1011.eqiad.wmnet', 'cloudelastic1012.eqiad.wmnet'], 'expected_nodes': 6, 'recover_after_nodes': 3, 'cluster_name': 'cloudelastic-psi-eqiad', 'short_cluster_name': 'psi', 'http_port': 9600, 'tls_port': 9643, 'tls_ro_port': 8643, 'transport_tcp_port': 9700}}
File[/etc/opensearch/cloudelastic-omega-eqiad/opensearch.yml]
- Content differences:
--- /etc/opensearch/cloudelastic-omega-eqiad/opensearch.yml.orig
+++ /etc/opensearch/cloudelastic-omega-eqiad/opensearch.yml
@@ -28,7 +28,7 @@
#
# Row/rack awareness attributes
#
-
+cluster.routing.allocation.awareness.attributes: row
node.attr.row: eqiad-row-a
node.attr.rack: A2
#
@@ -83,7 +83,7 @@
# Set both 'bind_host' and 'publish_host':
#
-network.host: [ _local_,_site_ ]
+network.host: [ 0.0.0.0 ]
# Set a custom port for the node to node communication (9300 by default):
#
@@ -118,7 +118,7 @@
#
#
gateway:
- recover_after_time: 1s
+ recover_after_time: 5m
expected_nodes: 6
#
# ---------------------------------- Various -----------------------------------
@@ -131,7 +131,7 @@
#
# If a plugin listed here is not installed for current node, the node will not start.
#
-#plugin.mandatory: mapper-attachments
+plugin.mandatory: analysis-hebrew,analysis-icu,analysis-nori,analysis-smartcn,analysis-stempel,analysis-sudachi,analysis-ukrainian,cirrus-highlighter,opensearch-analysis-stconvert,opensearch-extra,opensearch-extra-analysis-esperanto,opensearch-extra-analysis-homoglyph,opensearch-extra-analysis-khmer,opensearch-extra-analysis-serbian,opensearch-extra-analysis-slovak,opensearch-extra-analysis-textify,opensearch-extra-analysis-turkish,opensearch-extra-analysis-ukrainian,opensearch-ltr,repository-s3
# Specify the pattern of index names allowed to be created automatically
action.auto_create_index: false
@@ -140,9 +140,9 @@
# still close/delete individual indices.
action.destructive_requires_name: true
-# Allow up to 1000 shards to be queried at a time. The default
+# Allow up to 5000 shards to be queried at a time. The default
# 1k is too low to allow mwgrep to operate.
-action.search.shard_count.limit: 1000
+action.search.shard_count.limit: 5000
# https://www.elastic.co/guide/en/elasticsearch/reference/7.12/modules-cluster.html#disk-based-shard-allocation
# Enable the disk space aware shard allocator
@@ -180,13 +180,23 @@
##
# Filter cache size
##
-indices.queries.cache.size: 10%
-
-
-
-
-
-
-
-
-
+indices.queries.cache.size: 20%
+
+##
+# Thread pool settings
+##
+thread_pool:
+ write:
+ size: 18
+ queue_size: 1000
+
+
+
+
+
+##
+# Size the LTR cache to prevent churn under normal and AB testing scenarios
+ltr.caches.max_mem: 100mb
+
+
+
File[/etc/opensearch/cloudelastic-psi-eqiad/opensearch.yml]
- Content differences:
--- /etc/opensearch/cloudelastic-psi-eqiad/opensearch.yml.orig
+++ /etc/opensearch/cloudelastic-psi-eqiad/opensearch.yml
@@ -28,7 +28,7 @@
#
# Row/rack awareness attributes
#
-
+cluster.routing.allocation.awareness.attributes: row
node.attr.row: eqiad-row-a
node.attr.rack: A2
#
@@ -83,7 +83,7 @@
# Set both 'bind_host' and 'publish_host':
#
-network.host: [ _local_,_site_ ]
+network.host: [ 0.0.0.0 ]
# Set a custom port for the node to node communication (9300 by default):
#
@@ -118,7 +118,7 @@
#
#
gateway:
- recover_after_time: 1s
+ recover_after_time: 5m
expected_nodes: 6
#
# ---------------------------------- Various -----------------------------------
@@ -131,7 +131,7 @@
#
# If a plugin listed here is not installed for current node, the node will not start.
#
-#plugin.mandatory: mapper-attachments
+plugin.mandatory: analysis-hebrew,analysis-icu,analysis-nori,analysis-smartcn,analysis-stempel,analysis-sudachi,analysis-ukrainian,cirrus-highlighter,opensearch-analysis-stconvert,opensearch-extra,opensearch-extra-analysis-esperanto,opensearch-extra-analysis-homoglyph,opensearch-extra-analysis-khmer,opensearch-extra-analysis-serbian,opensearch-extra-analysis-slovak,opensearch-extra-analysis-textify,opensearch-extra-analysis-turkish,opensearch-extra-analysis-ukrainian,opensearch-ltr,repository-s3
# Specify the pattern of index names allowed to be created automatically
action.auto_create_index: false
@@ -140,9 +140,9 @@
# still close/delete individual indices.
action.destructive_requires_name: true
-# Allow up to 1000 shards to be queried at a time. The default
+# Allow up to 5000 shards to be queried at a time. The default
# 1k is too low to allow mwgrep to operate.
-action.search.shard_count.limit: 1000
+action.search.shard_count.limit: 5000
# https://www.elastic.co/guide/en/elasticsearch/reference/7.12/modules-cluster.html#disk-based-shard-allocation
# Enable the disk space aware shard allocator
@@ -180,13 +180,23 @@
##
# Filter cache size
##
-indices.queries.cache.size: 10%
-
-
-
-
-
-
-
-
-
+indices.queries.cache.size: 20%
+
+##
+# Thread pool settings
+##
+thread_pool:
+ write:
+ size: 18
+ queue_size: 1000
+
+
+
+
+
+##
+# Size the LTR cache to prevent churn under normal and AB testing scenarios
+ltr.caches.max_mem: 100mb
+
+
+
Opensearch::Instance[cloudelastic-chi-eqiad]
- Parameters differences:
--- Opensearch::Instance[cloudelastic-chi-eqiad].orig
+++ Opensearch::Instance[cloudelastic-chi-eqiad]
+ ltr_cache_size => 100mb
+ plugins_mandatory => ['analysis-hebrew', 'analysis-icu', 'analysis-nori', 'analysis-smartcn', 'analysis-stempel', 'analysis-sudachi', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3']
+ bulk_thread_pool_executors => 18
+ awareness_attributes => row
+ bulk_thread_pool_capacity => 1000
@@
- recover_after_time => 1s
+ recover_after_time => 5m
@@
- filter_cache_size => 10%
+ filter_cache_size => 20%
@@
- bind_networks => ['_local_', '_site_']
+ bind_networks => ['0.0.0.0']
@@
- search_shard_count_limit => 1000
+ search_shard_count_limit => 5000
- Opensearch::Instance[cloudelastic-psi-eqiad]
- Parameters differences:
--- Opensearch::Instance[cloudelastic-psi-eqiad].orig
+++ Opensearch::Instance[cloudelastic-psi-eqiad]
+ ltr_cache_size => 100mb
+ plugins_mandatory => ['analysis-hebrew', 'analysis-icu', 'analysis-nori', 'analysis-smartcn', 'analysis-stempel', 'analysis-sudachi', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3']
+ bulk_thread_pool_executors => 18
+ awareness_attributes => row
+ bulk_thread_pool_capacity => 1000
@@
- recover_after_time => 1s
+ recover_after_time => 5m
@@
- filter_cache_size => 10%
+ filter_cache_size => 20%
@@
- bind_networks => ['_local_', '_site_']
+ bind_networks => ['0.0.0.0']
@@
- search_shard_count_limit => 1000
+ search_shard_count_limit => 5000
- Class[Profile::Opensearch::Server]
- Parameters differences:
--- Class[Profile::Opensearch::Server].orig
+++ Class[Profile::Opensearch::Server]
@@
- common_settings => {'watermarks': {'low': '100gb', 'high': '50gb', 'flood_stage': '10gb'}}
+ common_settings => {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-nori', 'analysis-smartcn', 'analysis-stempel', 'analysis-sudachi', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3'], 'heap_memory': '30G', 'bind_networks': ['0.0.0.0'], 'certificate_name': 'cloudelastic', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'bulk_thread_pool_executors': 18, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'watermarks': {'low': '100gb', 'high': '50gb', 'flood_stage': '10gb'}}
- Systemd::Override[opensearch_2@]
- File[/etc/systemd/system/opensearch_2@.service.d/opensearch_2@.conf]
- Content differences:
--- /etc/systemd/system/opensearch_2@.service.d/opensearch_2@.conf.orig
+++ /etc/systemd/system/opensearch_2@.service.d/opensearch_2@.conf
@@ -10,3 +10,23 @@
TemporaryFileSystem=/usr/share/opensearch/plugins:rw
BindPaths=
+BindPaths=/usr/share/opensearch/plugins/analysis-hebrew
+BindPaths=/usr/share/opensearch/plugins/analysis-icu
+BindPaths=/usr/share/opensearch/plugins/analysis-nori
+BindPaths=/usr/share/opensearch/plugins/analysis-smartcn
+BindPaths=/usr/share/opensearch/plugins/analysis-stempel
+BindPaths=/usr/share/opensearch/plugins/analysis-sudachi
+BindPaths=/usr/share/opensearch/plugins/analysis-ukrainian
+BindPaths=/usr/share/opensearch/plugins/cirrus-highlighter
+BindPaths=/usr/share/opensearch/plugins/opensearch-analysis-stconvert
+BindPaths=/usr/share/opensearch/plugins/opensearch-extra
+BindPaths=/usr/share/opensearch/plugins/opensearch-extra-analysis-esperanto
+BindPaths=/usr/share/opensearch/plugins/opensearch-extra-analysis-homoglyph
+BindPaths=/usr/share/opensearch/plugins/opensearch-extra-analysis-khmer
+BindPaths=/usr/share/opensearch/plugins/opensearch-extra-analysis-serbian
+BindPaths=/usr/share/opensearch/plugins/opensearch-extra-analysis-slovak
+BindPaths=/usr/share/opensearch/plugins/opensearch-extra-analysis-textify
+BindPaths=/usr/share/opensearch/plugins/opensearch-extra-analysis-turkish
+BindPaths=/usr/share/opensearch/plugins/opensearch-extra-analysis-ukrainian
+BindPaths=/usr/share/opensearch/plugins/opensearch-ltr
+BindPaths=/usr/share/opensearch/plugins/repository-s3
- Opensearch::Instance[cloudelastic-omega-eqiad]
- Parameters differences:
--- Opensearch::Instance[cloudelastic-omega-eqiad].orig
+++ Opensearch::Instance[cloudelastic-omega-eqiad]
+ ltr_cache_size => 100mb
+ plugins_mandatory => ['analysis-hebrew', 'analysis-icu', 'analysis-nori', 'analysis-smartcn', 'analysis-stempel', 'analysis-sudachi', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3']
+ bulk_thread_pool_executors => 18
+ awareness_attributes => row
+ bulk_thread_pool_capacity => 1000
@@
- recover_after_time => 1s
+ recover_after_time => 5m
@@
- filter_cache_size => 10%
+ filter_cache_size => 20%
@@
- bind_networks => ['_local_', '_site_']
+ bind_networks => ['0.0.0.0']
@@
- search_shard_count_limit => 1000
+ search_shard_count_limit => 5000