--- Opensearch::Cross_cluster_settings[production-search-omega-codfw].orig
+++ Opensearch::Cross_cluster_settings[production-search-omega-codfw]
@@
- settings => {'production-search-codfw': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '30G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'cluster_name': 'production-search-codfw', 'short_cluster_name': 'chi', 'http_port': 9200, 'tls_port': 9243, 'certificate_name': 'search.discovery.wmnet', 'transport_tcp_port': 9300, 'unicast_hosts': ['cirrussearch2093.codfw.wmnet', 'cirrussearch2061.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2111.codfw.wmnet'], 'cluster_hosts': ['cirrussearch2061.codfw.wmnet', 'cirrussearch2062.codfw.wmnet', 'cirrussearch2063.codfw.wmnet', 'cirrussearch2064.codfw.wmnet', 'cirrussearch2065.codfw.wmnet', 'cirrussearch2066.codfw.wmnet', 'cirrussearch2067.codfw.wmnet', 'cirrussearch2068.codfw.wmnet', 'cirrussearch2069.codfw.wmnet', 'cirrussearch2070.codfw.wmnet', 'cirrussearch2071.codfw.wmnet', 'cirrussearch2072.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2074.codfw.wmnet', 'cirrussearch2075.codfw.wmnet', 'cirrussearch2076.codfw.wmnet', 'cirrussearch2077.codfw.wmnet', 'cirrussearch2078.codfw.wmnet', 'cirrussearch2079.codfw.wmnet', 'cirrussearch2080.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2082.codfw.wmnet', 'cirrussearch2083.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2085.codfw.wmnet', 'cirrussearch2086.codfw.wmnet', 'cirrussearch2087.codfw.wmnet', 'cirrussearch2088.codfw.wmnet', 'cirrussearch2089.codfw.wmnet', 'cirrussearch2090.codfw.wmnet', 'cirrussearch2091.codfw.wmnet', 'cirrussearch2092.codfw.wmnet', 'cirrussearch2093.codfw.wmnet', 'cirrussearch2094.codfw.wmnet', 'cirrussearch2095.codfw.wmnet', 'cirrussearch2096.codfw.wmnet', 'cirrussearch2097.codfw.wmnet', 'cirrussearch2098.codfw.wmnet', 'cirrussearch2099.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2101.codfw.wmnet', 'cirrussearch2102.codfw.wmnet', 'cirrussearch2103.codfw.wmnet', 'cirrussearch2104.codfw.wmnet', 'cirrussearch2105.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2107.codfw.wmnet', 'cirrussearch2108.codfw.wmnet', 'cirrussearch2109.codfw.wmnet', 'cirrussearch2110.codfw.wmnet', 'cirrussearch2111.codfw.wmnet', 'cirrussearch2112.codfw.wmnet', 'cirrussearch2113.codfw.wmnet', 'cirrussearch2114.codfw.wmnet', 'cirrussearch2115.codfw.wmnet'], 'expected_nodes': 36, 'recover_after_nodes': 24, 'indices_to_monitor': ['commonswiki_file', 'wikidatawiki_content', 'enwiki_general', 'enwiki_content', 'viwiki_general', 'commonswiki_general', 'cebwiki_content', 'metawiki_general', 'dewiki_content', 'frwiki_content']}, 'production-search-omega-codfw': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '10G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'cluster_name': 'production-search-omega-codfw', 'short_cluster_name': 'omega', 'http_port': 9400, 'tls_port': 9443, 'certificate_name': 'search.discovery.wmnet', 'transport_tcp_port': 9500, 'unicast_hosts': ['cirrussearch2092.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2086.codfw.wmnet'], 'cluster_hosts': ['cirrussearch2087.codfw.wmnet', 'cirrussearch2088.codfw.wmnet', 'cirrussearch2061.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2074.codfw.wmnet', 'cirrussearch2090.codfw.wmnet', 'cirrussearch2111.codfw.wmnet', 'cirrussearch2092.codfw.wmnet', 'cirrussearch2093.codfw.wmnet', 'cirrussearch2063.codfw.wmnet', 'cirrussearch2070.codfw.wmnet', 'cirrussearch2077.codfw.wmnet', 'cirrussearch2097.codfw.wmnet', 'cirrussearch2098.codfw.wmnet', 'cirrussearch2099.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2065.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2102.codfw.wmnet', 'cirrussearch2112.codfw.wmnet', 'cirrussearch2104.codfw.wmnet', 'cirrussearch2105.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2067.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2086.codfw.wmnet', 'cirrussearch2114.codfw.wmnet'], 'expected_nodes': 18, 'recover_after_nodes': 11}, 'production-search-psi-codfw': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '10G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'cluster_name': 'production-search-psi-codfw', 'short_cluster_name': 'psi', 'http_port': 9600, 'tls_port': 9643, 'certificate_name': 'search.discovery.wmnet', 'transport_tcp_port': 9700, 'unicast_hosts': ['cirrussearch2108.codfw.wmnet', 'cirrussearch2076.codfw.wmnet', 'cirrussearch2080.codfw.wmnet', 'cirrussearch2083.codfw.wmnet', 'cirrussearch2115.codfw.wmnet'], 'cluster_hosts': ['cirrussearch2089.codfw.wmnet', 'cirrussearch2062.codfw.wmnet', 'cirrussearch2069.codfw.wmnet', 'cirrussearch2075.codfw.wmnet', 'cirrussearch2076.codfw.wmnet', 'cirrussearch2091.codfw.wmnet', 'cirrussearch2094.codfw.wmnet', 'cirrussearch2095.codfw.wmnet', 'cirrussearch2064.codfw.wmnet', 'cirrussearch2078.codfw.wmnet', 'cirrussearch2079.codfw.wmnet', 'cirrussearch2080.codfw.wmnet', 'cirrussearch2096.codfw.wmnet', 'cirrussearch2110.codfw.wmnet', 'cirrussearch2101.codfw.wmnet', 'cirrussearch2066.codfw.wmnet', 'cirrussearch2071.codfw.wmnet', 'cirrussearch2072.codfw.wmnet', 'cirrussearch2082.codfw.wmnet', 'cirrussearch2083.codfw.wmnet', 'cirrussearch2103.codfw.wmnet', 'cirrussearch2113.codfw.wmnet', 'cirrussearch2107.codfw.wmnet', 'cirrussearch2108.codfw.wmnet', 'cirrussearch2068.codfw.wmnet', 'cirrussearch2085.codfw.wmnet', 'cirrussearch2109.codfw.wmnet', 'cirrussearch2115.codfw.wmnet'], 'expected_nodes': 18, 'recover_after_nodes': 11}}
+ settings => {'production-search-codfw': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr', 'analysis-nori', 'analysis-sudachi', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '30G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'cluster_name': 'production-search-codfw', 'short_cluster_name': 'chi', 'http_port': 9200, 'tls_port': 9243, 'certificate_name': 'search.discovery.wmnet', 'transport_tcp_port': 9300, 'unicast_hosts': ['cirrussearch2093.codfw.wmnet', 'cirrussearch2061.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2111.codfw.wmnet'], 'cluster_hosts': ['cirrussearch2061.codfw.wmnet', 'cirrussearch2062.codfw.wmnet', 'cirrussearch2063.codfw.wmnet', 'cirrussearch2064.codfw.wmnet', 'cirrussearch2065.codfw.wmnet', 'cirrussearch2066.codfw.wmnet', 'cirrussearch2067.codfw.wmnet', 'cirrussearch2068.codfw.wmnet', 'cirrussearch2069.codfw.wmnet', 'cirrussearch2070.codfw.wmnet', 'cirrussearch2071.codfw.wmnet', 'cirrussearch2072.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2074.codfw.wmnet', 'cirrussearch2075.codfw.wmnet', 'cirrussearch2076.codfw.wmnet', 'cirrussearch2077.codfw.wmnet', 'cirrussearch2078.codfw.wmnet', 'cirrussearch2079.codfw.wmnet', 'cirrussearch2080.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2082.codfw.wmnet', 'cirrussearch2083.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2085.codfw.wmnet', 'cirrussearch2086.codfw.wmnet', 'cirrussearch2087.codfw.wmnet', 'cirrussearch2088.codfw.wmnet', 'cirrussearch2089.codfw.wmnet', 'cirrussearch2090.codfw.wmnet', 'cirrussearch2091.codfw.wmnet', 'cirrussearch2092.codfw.wmnet', 'cirrussearch2093.codfw.wmnet', 'cirrussearch2094.codfw.wmnet', 'cirrussearch2095.codfw.wmnet', 'cirrussearch2096.codfw.wmnet', 'cirrussearch2097.codfw.wmnet', 'cirrussearch2098.codfw.wmnet', 'cirrussearch2099.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2101.codfw.wmnet', 'cirrussearch2102.codfw.wmnet', 'cirrussearch2103.codfw.wmnet', 'cirrussearch2104.codfw.wmnet', 'cirrussearch2105.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2107.codfw.wmnet', 'cirrussearch2108.codfw.wmnet', 'cirrussearch2109.codfw.wmnet', 'cirrussearch2110.codfw.wmnet', 'cirrussearch2111.codfw.wmnet', 'cirrussearch2112.codfw.wmnet', 'cirrussearch2113.codfw.wmnet', 'cirrussearch2114.codfw.wmnet', 'cirrussearch2115.codfw.wmnet'], 'expected_nodes': 36, 'recover_after_nodes': 24, 'indices_to_monitor': ['commonswiki_file', 'wikidatawiki_content', 'enwiki_general', 'enwiki_content', 'viwiki_general', 'commonswiki_general', 'cebwiki_content', 'metawiki_general', 'dewiki_content', 'frwiki_content']}, 'production-search-omega-codfw': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr', 'analysis-nori', 'analysis-sudachi', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '10G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'cluster_name': 'production-search-omega-codfw', 'short_cluster_name': 'omega', 'http_port': 9400, 'tls_port': 9443, 'certificate_name': 'search.discovery.wmnet', 'transport_tcp_port': 9500, 'unicast_hosts': ['cirrussearch2092.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2086.codfw.wmnet'], 'cluster_hosts': ['cirrussearch2087.codfw.wmnet', 'cirrussearch2088.codfw.wmnet', 'cirrussearch2061.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2074.codfw.wmnet', 'cirrussearch2090.codfw.wmnet', 'cirrussearch2111.codfw.wmnet', 'cirrussearch2092.codfw.wmnet', 'cirrussearch2093.codfw.wmnet', 'cirrussearch2063.codfw.wmnet', 'cirrussearch2070.codfw.wmnet', 'cirrussearch2077.codfw.wmnet', 'cirrussearch2097.codfw.wmnet', 'cirrussearch2098.codfw.wmnet', 'cirrussearch2099.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2065.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2102.codfw.wmnet', 'cirrussearch2112.codfw.wmnet', 'cirrussearch2104.codfw.wmnet', 'cirrussearch2105.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2067.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2086.codfw.wmnet', 'cirrussearch2114.codfw.wmnet'], 'expected_nodes': 18, 'recover_after_nodes': 11}, 'production-search-psi-codfw': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr', 'analysis-nori', 'analysis-sudachi', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '10G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'cluster_name': 'production-search-psi-codfw', 'short_cluster_name': 'psi', 'http_port': 9600, 'tls_port': 9643, 'certificate_name': 'search.discovery.wmnet', 'transport_tcp_port': 9700, 'unicast_hosts': ['cirrussearch2108.codfw.wmnet', 'cirrussearch2076.codfw.wmnet', 'cirrussearch2080.codfw.wmnet', 'cirrussearch2083.codfw.wmnet', 'cirrussearch2115.codfw.wmnet'], 'cluster_hosts': ['cirrussearch2089.codfw.wmnet', 'cirrussearch2062.codfw.wmnet', 'cirrussearch2069.codfw.wmnet', 'cirrussearch2075.codfw.wmnet', 'cirrussearch2076.codfw.wmnet', 'cirrussearch2091.codfw.wmnet', 'cirrussearch2094.codfw.wmnet', 'cirrussearch2095.codfw.wmnet', 'cirrussearch2064.codfw.wmnet', 'cirrussearch2078.codfw.wmnet', 'cirrussearch2079.codfw.wmnet', 'cirrussearch2080.codfw.wmnet', 'cirrussearch2096.codfw.wmnet', 'cirrussearch2110.codfw.wmnet', 'cirrussearch2101.codfw.wmnet', 'cirrussearch2066.codfw.wmnet', 'cirrussearch2071.codfw.wmnet', 'cirrussearch2072.codfw.wmnet', 'cirrussearch2082.codfw.wmnet', 'cirrussearch2083.codfw.wmnet', 'cirrussearch2103.codfw.wmnet', 'cirrussearch2113.codfw.wmnet', 'cirrussearch2107.codfw.wmnet', 'cirrussearch2108.codfw.wmnet', 'cirrussearch2068.codfw.wmnet', 'cirrussearch2085.codfw.wmnet', 'cirrussearch2109.codfw.wmnet', 'cirrussearch2115.codfw.wmnet'], 'expected_nodes': 18, 'recover_after_nodes': 11}}
Systemd::Unit[opensearch_2@.service]
- Parameters differences:
--- Systemd::Unit[opensearch_2@.service].orig
+++ Systemd::Unit[opensearch_2@.service]
+ ensure => present
+ override => False
+ override_filename => puppet-override.conf
+ require => ['Class[Systemd]']
+ unit => opensearch_2@.service
+ restart => False
- File[/etc/apt/sources.list.d/wikimedia-opensearch-plugins.list]
- Content differences:
--- /etc/apt/sources.list.d/wikimedia-opensearch-plugins.list.orig
+++ /etc/apt/sources.list.d/wikimedia-opensearch-plugins.list
@@ -1,2 +1,2 @@
-deb http://apt.wikimedia.org/wikimedia bullseye-wikimedia component/opensearch13
-deb-src http://apt.wikimedia.org/wikimedia bullseye-wikimedia component/opensearch13
+deb http://apt.wikimedia.org/wikimedia bullseye-wikimedia component/opensearch2
+deb-src http://apt.wikimedia.org/wikimedia bullseye-wikimedia component/opensearch2
- Exec[systemd daemon-reload for opensearch_2@.service (opensearch_2@.service)]
- Parameters differences:
--- Exec[systemd daemon-reload for opensearch_2@.service (opensearch_2@.service)].orig
+++ Exec[systemd daemon-reload for opensearch_2@.service (opensearch_2@.service)]
+ refreshonly => True
+ command => /bin/systemctl daemon-reload
- Service[opensearch_1@production-search-codfw]
- Parameters differences:
--- Service[opensearch_1@production-search-codfw].orig
+++ Service[opensearch_1@production-search-codfw]
- provider => systemd
- ensure => running
- tag => opensearch_services
- require => ['Systemd::Unit[opensearch_1@.service]', 'File[/etc/opensearch/production-search-codfw/opensearch.yml]', 'File[/etc/opensearch/production-search-codfw/logging.yml]', 'File[/etc/opensearch/production-search-codfw/log4j2.properties]', 'File[/etc/opensearch/production-search-codfw/jvm.options]', 'File[/srv/opensearch/production-search-codfw]', 'Systemd::Tmpfile[opensearch-production-search-codfw]']
- enable => True
- File[/etc/apt/sources.list.d/wikimedia-opensearch.list]
- Content differences:
--- /etc/apt/sources.list.d/wikimedia-opensearch.list.orig
+++ /etc/apt/sources.list.d/wikimedia-opensearch.list
@@ -1,2 +1,2 @@
-deb http://apt.wikimedia.org/wikimedia bullseye-wikimedia thirdparty/opensearch1
-deb-src http://apt.wikimedia.org/wikimedia bullseye-wikimedia thirdparty/opensearch1
+deb http://apt.wikimedia.org/wikimedia bullseye-wikimedia thirdparty/opensearch2
+deb-src http://apt.wikimedia.org/wikimedia bullseye-wikimedia thirdparty/opensearch2
- Class[Profile::Opensearch::Cirrus::Server]
- Parameters differences:
--- Class[Profile::Opensearch::Cirrus::Server].orig
+++ Class[Profile::Opensearch::Cirrus::Server]
@@
- version => 1.3.20
+ version => 2.19.5
- Service[opensearch_2@production-search-omega-codfw]
- Parameters differences:
--- Service[opensearch_2@production-search-omega-codfw].orig
+++ Service[opensearch_2@production-search-omega-codfw]
+ provider => systemd
+ ensure => running
+ tag => opensearch_services
+ require => ['Systemd::Unit[opensearch_2@.service]', 'File[/etc/opensearch/production-search-omega-codfw/opensearch.yml]', 'File[/etc/opensearch/production-search-omega-codfw/logging.yml]', 'File[/etc/opensearch/production-search-omega-codfw/log4j2.properties]', 'File[/etc/opensearch/production-search-omega-codfw/jvm.options]', 'File[/srv/opensearch/production-search-omega-codfw]', 'Systemd::Tmpfile[opensearch-production-search-omega-codfw]']
+ enable => True
- Class[Opensearch::Packages]
- Parameters differences:
--- Class[Opensearch::Packages].orig
+++ Class[Opensearch::Packages]
@@
- version => 1.3.20
+ version => 2.19.5
- File[/lib/systemd/system/opensearch_1@.service]
- Parameters differences:
--- File[/lib/systemd/system/opensearch_1@.service].orig
+++ File[/lib/systemd/system/opensearch_1@.service]
- notify => Exec[systemd daemon-reload for opensearch_1@.service (opensearch_1@.service)]
- ensure => present
- mode => 0444
- group => root
- owner => root
- Content differences:
--- /lib/systemd/system/opensearch_1@.service.orig
+++ /lib/systemd/system/opensearch_1@.service
@@ -1,73 +0,0 @@
-[Unit]
-Description=OpenSearch (cluster %i)
-PartOf=opensearch.service
-Documentation=https://opensearch.org/docs
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-Type=notify
-RuntimeDirectory=opensearch
-PrivateTmp=true
-Environment=OPENSEARCH_HOME=/usr/share/opensearch
-Environment=OPENSEARCH_PATH_CONF=/etc/opensearch/%i
-Environment=OPENSEARCH_JVM_OPTIONS=/etc/opensearch/%i/jvm.options
-Environment=PID_DIR=/run/opensearch-%i
-Environment=OPENSEARCH_SD_NOTIFY=true
-
-Environment=LD_LIBRARY_PATH=/usr/share/opensearch/plugins/opensearch-knn/lib
-Environment=JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
-
-WorkingDirectory=/usr/share/opensearch
-
-User=opensearch
-Group=opensearch
-
-# Force creation of /run/opensearch (see T276198)
-ExecStartPre=/bin/systemd-tmpfiles --create /etc/tmpfiles.d/opensearch-%i.conf
-ExecStart=/usr/share/opensearch/bin/opensearch \
- -p ${PID_DIR}/%i.pid \
- --quiet \
- -Epath.logs=/var/log/opensearch \
- -Epath.data=/srv/opensearch/%i
-
-# StandardOutput is configured to redirect to journalctl since
-# some error messages may be logged in standard output before
-# opensearch logging system is initialized. OpenSearch
-# stores its logs in /var/log/opensearch and does not use
-# journalctl by default. If you also want to enable journalctl
-# logging, you can simply remove the "quiet" option from ExecStart.
-StandardOutput=journal
-StandardError=inherit
-
-# Specifies the maximum file descriptor number that can be opened by this process
-LimitNOFILE=65535
-
-# Specifies the maximum number of processes
-LimitNPROC=4096
-
-# Specifies the maximum size of virtual memory
-LimitAS=infinity
-
-# Specifies the maximum file size
-LimitFSIZE=infinity
-
-# Disable timeout logic and wait until process is stopped
-TimeoutStopSec=0
-
-# SIGTERM signal is used to stop the Java process
-KillSignal=SIGTERM
-
-# Send the signal only to the JVM rather than its control group
-KillMode=process
-
-# Java process is never killed
-SendSIGKILL=no
-
-# When a JVM receives a SIGTERM signal it exits with code 143
-SuccessExitStatus=143
-
-[Install]
-WantedBy=multi-user.target
-
-# Built for packages-7.4.1 (packages)
- File[/etc/opensearch/production-search-omega-codfw/opensearch.yml]
- Content differences:
--- /etc/opensearch/production-search-omega-codfw/opensearch.yml.orig
+++ /etc/opensearch/production-search-omega-codfw/opensearch.yml
@@ -90,18 +90,17 @@
transport.tcp.port: 9500
#
# --------------------------------- Discovery ----------------------------------
+# See also: https://docs.opensearch.org/2.19/tuning-your-cluster#step-4-configure-discovery-hosts-and-initial-cluster-manager-nodes-for-a-cluster
#
# Pass an initial list of hosts to perform discovery when this node is started:
# The default list of hosts is ["127.0.0.1", "[::1]"]
#
#discovery.seed_hosts: ["host1", "host2"]
-#
-# Bootstrap the cluster using an initial set of master-eligible nodes:
-#
-#cluster.initial_master_nodes: ["node-1", "node-2"]
-#
-discovery.zen.ping.unicast.hosts: ["cirrussearch2092.codfw.wmnet", "cirrussearch2100.codfw.wmnet", "cirrussearch2106.codfw.wmnet", "cirrussearch2073.codfw.wmnet", "cirrussearch2086.codfw.wmnet"]
-#
+discovery.seed_hosts: ["cirrussearch2092.codfw.wmnet", "cirrussearch2100.codfw.wmnet", "cirrussearch2106.codfw.wmnet", "cirrussearch2073.codfw.wmnet", "cirrussearch2086.codfw.wmnet"]
+
+# Bootstrap the cluster using an initial set of cluster-manager-eligible node names
+# Only set this during first cluster formation; remove it after the cluster forms
+# cluster.initial_cluster_manager_nodes: ["node-1", "node-2"]
# For more information, consult the discovery and cluster formation module documentation.
#
# ---------------------------------- Gateway -----------------------------------
@@ -127,7 +126,7 @@
#
# If a plugin listed here is not installed for current node, the node will not start.
#
-plugin.mandatory: analysis-hebrew,analysis-icu,analysis-smartcn,analysis-stempel,analysis-ukrainian,cirrus-highlighter,opensearch-analysis-stconvert,opensearch-extra,opensearch-extra-analysis-esperanto,opensearch-extra-analysis-serbian,opensearch-extra-analysis-slovak,ltr
+plugin.mandatory: analysis-hebrew,analysis-icu,analysis-smartcn,analysis-stempel,analysis-ukrainian,cirrus-highlighter,opensearch-analysis-stconvert,opensearch-extra,opensearch-extra-analysis-esperanto,opensearch-extra-analysis-serbian,opensearch-extra-analysis-slovak,ltr,analysis-nori,analysis-sudachi,opensearch-extra-analysis-homoglyph,opensearch-extra-analysis-khmer,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: +apifeatureusage-*,+glent_*,-*
@@ -140,14 +139,16 @@
# 1k is too low to allow mwgrep to operate.
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
cluster.routing.allocation.disk.threshold_enabled: true
-# Stop allocating new shards to nodes when this threshold is reached
+# Stop allocating shards to nodes (default 80%)
cluster.routing.allocation.disk.watermark.low: 75%
-# Move shards off of nodes when this threshold is reached
+# Begin evicting shards off the node (default 90%)
cluster.routing.allocation.disk.watermark.high: 80%
-# Set indexes read-only with allocated shards on affected node when this threshold is reached
+# Set indexes read-only with allocated shards on affected node (default 95%)
cluster.routing.allocation.disk.watermark.flood_stage: 95%
+
# Check disk utilization every 60 seconds
cluster.info.update.interval: 60s
@@ -193,3 +194,4 @@
ltr.caches.max_mem: 100mb
+
- Class[Profile::Opensearch::Server]
- Parameters differences:
--- Class[Profile::Opensearch::Server].orig
+++ Class[Profile::Opensearch::Server]
@@
- common_settings => {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '30G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%'}
+ common_settings => {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr', 'analysis-nori', 'analysis-sudachi', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '30G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%'}
@@
- version => 1.3.20
+ version => 2.19.5
@@
- java_home => /usr/lib/jvm/java-11-openjdk-amd64
+ java_home => /usr/lib/jvm/java-21-openjdk-amd64
- Systemd::Unit[opensearch_2@-opensearch_2@]
- Parameters differences:
--- Systemd::Unit[opensearch_2@-opensearch_2@].orig
+++ Systemd::Unit[opensearch_2@-opensearch_2@]
+ ensure => present
+ override => True
+ override_filename => opensearch_2@
+ require => ['Class[Systemd]']
+ unit => opensearch_2@
+ restart => False
- Service[opensearch_1@production-search-omega-codfw]
- Parameters differences:
--- Service[opensearch_1@production-search-omega-codfw].orig
+++ Service[opensearch_1@production-search-omega-codfw]
- provider => systemd
- ensure => running
- tag => opensearch_services
- require => ['Systemd::Unit[opensearch_1@.service]', 'File[/etc/opensearch/production-search-omega-codfw/opensearch.yml]', 'File[/etc/opensearch/production-search-omega-codfw/logging.yml]', 'File[/etc/opensearch/production-search-omega-codfw/log4j2.properties]', 'File[/etc/opensearch/production-search-omega-codfw/jvm.options]', 'File[/srv/opensearch/production-search-omega-codfw]', 'Systemd::Tmpfile[opensearch-production-search-omega-codfw]']
- enable => True
- File[/etc/opensearch/instances]
- Content differences:
--- /etc/opensearch/instances.orig
+++ /etc/opensearch/instances
@@ -1,2 +1,2 @@
-opensearch_1@production-search-codfw
-opensearch_1@production-search-omega-codfw
+opensearch_2@production-search-codfw
+opensearch_2@production-search-omega-codfw
- Apt::Repository[wikimedia-opensearch-plugins]
- Parameters differences:
--- Apt::Repository[wikimedia-opensearch-plugins].orig
+++ Apt::Repository[wikimedia-opensearch-plugins]
@@
- components => component/opensearch13
+ components => component/opensearch2
- File[/etc/systemd/system/opensearch_2@.service.d]
- Parameters differences:
--- File[/etc/systemd/system/opensearch_2@.service.d].orig
+++ File[/etc/systemd/system/opensearch_2@.service.d]
+ group => root
+ owner => root
+ ensure => directory
+ mode => 0555
- Systemd::Override[opensearch_2@]
- Parameters differences:
--- Systemd::Override[opensearch_2@].orig
+++ Systemd::Override[opensearch_2@]
+ ensure => present
+ unit => opensearch_2@
+ restart => False
- Exec[install-opensearch]
- Parameters differences:
--- Exec[install-opensearch].orig
+++ Exec[install-opensearch]
+ before => Package[opensearch]
+ command => /usr/bin/apt-get -q -y -o DPkg::Options::=--force-confold install opensearch=2.19.5
+ unless => /usr/bin/dpkg-query -W -f='${Status} ${Version}\n' opensearch 2>/dev/null | /bin/grep -Fxq 'install ok installed 2.19.5'
+ timeout => 300
+ logoutput => False
+ environment => ['OPENSEARCH_INITIAL_ADMIN_PASSWORD=OpensearchTemp1!', 'DEBIAN_FRONTEND=noninteractive']
- Service[opensearch_2@production-search-codfw]
- Parameters differences:
--- Service[opensearch_2@production-search-codfw].orig
+++ Service[opensearch_2@production-search-codfw]
+ provider => systemd
+ ensure => running
+ tag => opensearch_services
+ require => ['Systemd::Unit[opensearch_2@.service]', 'File[/etc/opensearch/production-search-codfw/opensearch.yml]', 'File[/etc/opensearch/production-search-codfw/logging.yml]', 'File[/etc/opensearch/production-search-codfw/log4j2.properties]', 'File[/etc/opensearch/production-search-codfw/jvm.options]', 'File[/srv/opensearch/production-search-codfw]', 'Systemd::Tmpfile[opensearch-production-search-codfw]']
+ enable => True
- Opensearch::Instance[production-search-codfw]
- Parameters differences:
--- Opensearch::Instance[production-search-codfw].orig
+++ Opensearch::Instance[production-search-codfw]
@@
- version => 1.3.20
+ version => 2.19.5
@@
- plugins_mandatory => ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr']
+ plugins_mandatory => ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr', 'analysis-nori', 'analysis-sudachi', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3']
- Exec[systemd daemon-reload for opensearch_1@.service (opensearch_1@.service)]
- Parameters differences:
--- Exec[systemd daemon-reload for opensearch_1@.service (opensearch_1@.service)].orig
+++ Exec[systemd daemon-reload for opensearch_1@.service (opensearch_1@.service)]
- refreshonly => True
- command => /bin/systemctl daemon-reload
- File[/etc/systemd/system/opensearch_2@.service.d/opensearch_2@.conf]
- Parameters differences:
--- File[/etc/systemd/system/opensearch_2@.service.d/opensearch_2@.conf].orig
+++ File[/etc/systemd/system/opensearch_2@.service.d/opensearch_2@.conf]
+ notify => Exec[systemd daemon-reload for opensearch_2@.service (opensearch_2@-opensearch_2@)]
+ ensure => present
+ mode => 0444
+ group => root
+ owner => root
- Content differences:
--- /etc/systemd/system/opensearch_2@.service.d/opensearch_2@.conf.orig
+++ /etc/systemd/system/opensearch_2@.service.d/opensearch_2@.conf
@@ -0,0 +1,33 @@
+# The OpenSearch packages come with a lot of plugins
+# we don't want or need. This override helps us
+# expose only the plugins we explicitly set via
+# $plugins_mandatory var
+[Service]
+# Give OpenSearch its own mount namespace
+PrivateMounts=yes
+
+# Replace plugins dir with an empty tmpfs
+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-smartcn
+BindPaths=/usr/share/opensearch/plugins/analysis-stempel
+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-serbian
+BindPaths=/usr/share/opensearch/plugins/opensearch-extra-analysis-slovak
+BindPaths=/usr/share/opensearch/plugins/ltr
+BindPaths=/usr/share/opensearch/plugins/analysis-nori
+BindPaths=/usr/share/opensearch/plugins/analysis-sudachi
+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-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
- Package[wmf-opensearch-search-plugins]
- Parameters differences:
--- Package[wmf-opensearch-search-plugins].orig
+++ Package[wmf-opensearch-search-plugins]
@@
- before => ['Service[opensearch_1@production-search-codfw]', 'Service[opensearch_1@production-search-omega-codfw]']
+ before => ['Service[opensearch_2@production-search-codfw]', 'Service[opensearch_2@production-search-omega-codfw]']
- Systemd::Unit[opensearch_1@.service]
- Parameters differences:
--- Systemd::Unit[opensearch_1@.service].orig
+++ Systemd::Unit[opensearch_1@.service]
- ensure => present
- override => False
- override_filename => puppet-override.conf
- require => ['Class[Systemd]']
- unit => opensearch_1@.service
- restart => False
- File[/etc/opensearch/production-search-codfw/log4j2.properties]
- Content differences:
--- /etc/opensearch/production-search-codfw/log4j2.properties.orig
+++ /etc/opensearch/production-search-codfw/log4j2.properties
@@ -185,7 +185,6 @@
rootLogger.appenderRef.ship_to_logstash.ref = ship_to_logstash
logger.index_indexing_slowlog.appenderRef.ship_to_logstash.ref = ship_to_logstash
logger.index_search_slowlog_rolling.appenderRef.ship_to_logstash.ref = ship_to_logstash
-logger.index_search_slowlog_rolling.appenderRef.ship_to_logstash.ref = ship_to_logstash
# Define Logstash appender
appender.ship_to_logstash.name=ship_to_logstash
- Opensearch::Instance[production-search-omega-codfw]
- Parameters differences:
--- Opensearch::Instance[production-search-omega-codfw].orig
+++ Opensearch::Instance[production-search-omega-codfw]
@@
- version => 1.3.20
+ version => 2.19.5
@@
- plugins_mandatory => ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr']
+ plugins_mandatory => ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr', 'analysis-nori', 'analysis-sudachi', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3']
- Package[opensearch]
- Parameters differences:
--- Package[opensearch].orig
+++ Package[opensearch]
@@
- ensure => 1.3.20
+ ensure => 2.19.5
- File[/lib/systemd/system/opensearch_2@.service]
- Parameters differences:
--- File[/lib/systemd/system/opensearch_2@.service].orig
+++ File[/lib/systemd/system/opensearch_2@.service]
+ notify => Exec[systemd daemon-reload for opensearch_2@.service (opensearch_2@.service)]
+ ensure => present
+ mode => 0444
+ group => root
+ owner => root
- Content differences:
--- /lib/systemd/system/opensearch_2@.service.orig
+++ /lib/systemd/system/opensearch_2@.service
@@ -0,0 +1,73 @@
+[Unit]
+Description=OpenSearch (cluster %i)
+PartOf=opensearch.service
+Documentation=https://opensearch.org/docs
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=notify
+RuntimeDirectory=opensearch
+PrivateTmp=true
+Environment=OPENSEARCH_HOME=/usr/share/opensearch
+Environment=OPENSEARCH_PATH_CONF=/etc/opensearch/%i
+Environment=OPENSEARCH_JVM_OPTIONS=/etc/opensearch/%i/jvm.options
+Environment=PID_DIR=/run/opensearch-%i
+Environment=OPENSEARCH_SD_NOTIFY=true
+
+Environment=LD_LIBRARY_PATH=/usr/share/opensearch/plugins/opensearch-knn/lib
+Environment=JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
+
+WorkingDirectory=/usr/share/opensearch
+
+User=opensearch
+Group=opensearch
+
+# Force creation of /run/opensearch (see T276198)
+ExecStartPre=/bin/systemd-tmpfiles --create /etc/tmpfiles.d/opensearch-%i.conf
+ExecStart=/usr/share/opensearch/bin/opensearch \
+ -p ${PID_DIR}/%i.pid \
+ --quiet \
+ -Epath.logs=/var/log/opensearch \
+ -Epath.data=/srv/opensearch/%i
+
+# StandardOutput is configured to redirect to journalctl since
+# some error messages may be logged in standard output before
+# opensearch logging system is initialized. OpenSearch
+# stores its logs in /var/log/opensearch and does not use
+# journalctl by default. If you also want to enable journalctl
+# logging, you can simply remove the "quiet" option from ExecStart.
+StandardOutput=journal
+StandardError=inherit
+
+# Specifies the maximum file descriptor number that can be opened by this process
+LimitNOFILE=65535
+
+# Specifies the maximum number of processes
+LimitNPROC=4096
+
+# Specifies the maximum size of virtual memory
+LimitAS=infinity
+
+# Specifies the maximum file size
+LimitFSIZE=infinity
+
+# Disable timeout logic and wait until process is stopped
+TimeoutStopSec=0
+
+# SIGTERM signal is used to stop the Java process
+KillSignal=SIGTERM
+
+# Send the signal only to the JVM rather than its control group
+KillMode=process
+
+# Java process is never killed
+SendSIGKILL=no
+
+# When a JVM receives a SIGTERM signal it exits with code 143
+SuccessExitStatus=143
+
+[Install]
+WantedBy=multi-user.target
+
+# Built for packages-7.4.1 (packages)
- Class[Opensearch]
- Parameters differences:
--- Class[Opensearch].orig
+++ Class[Opensearch]
@@
- version => 1.3.20
+ version => 2.19.5
@@
- instances => {'production-search-codfw': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '30G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'cluster_name': 'production-search-codfw', 'short_cluster_name': 'chi', 'http_port': 9200, 'tls_port': 9243, 'certificate_name': 'search.discovery.wmnet', 'transport_tcp_port': 9300, 'unicast_hosts': ['cirrussearch2093.codfw.wmnet', 'cirrussearch2061.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2111.codfw.wmnet'], 'cluster_hosts': ['cirrussearch2061.codfw.wmnet', 'cirrussearch2062.codfw.wmnet', 'cirrussearch2063.codfw.wmnet', 'cirrussearch2064.codfw.wmnet', 'cirrussearch2065.codfw.wmnet', 'cirrussearch2066.codfw.wmnet', 'cirrussearch2067.codfw.wmnet', 'cirrussearch2068.codfw.wmnet', 'cirrussearch2069.codfw.wmnet', 'cirrussearch2070.codfw.wmnet', 'cirrussearch2071.codfw.wmnet', 'cirrussearch2072.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2074.codfw.wmnet', 'cirrussearch2075.codfw.wmnet', 'cirrussearch2076.codfw.wmnet', 'cirrussearch2077.codfw.wmnet', 'cirrussearch2078.codfw.wmnet', 'cirrussearch2079.codfw.wmnet', 'cirrussearch2080.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2082.codfw.wmnet', 'cirrussearch2083.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2085.codfw.wmnet', 'cirrussearch2086.codfw.wmnet', 'cirrussearch2087.codfw.wmnet', 'cirrussearch2088.codfw.wmnet', 'cirrussearch2089.codfw.wmnet', 'cirrussearch2090.codfw.wmnet', 'cirrussearch2091.codfw.wmnet', 'cirrussearch2092.codfw.wmnet', 'cirrussearch2093.codfw.wmnet', 'cirrussearch2094.codfw.wmnet', 'cirrussearch2095.codfw.wmnet', 'cirrussearch2096.codfw.wmnet', 'cirrussearch2097.codfw.wmnet', 'cirrussearch2098.codfw.wmnet', 'cirrussearch2099.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2101.codfw.wmnet', 'cirrussearch2102.codfw.wmnet', 'cirrussearch2103.codfw.wmnet', 'cirrussearch2104.codfw.wmnet', 'cirrussearch2105.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2107.codfw.wmnet', 'cirrussearch2108.codfw.wmnet', 'cirrussearch2109.codfw.wmnet', 'cirrussearch2110.codfw.wmnet', 'cirrussearch2111.codfw.wmnet', 'cirrussearch2112.codfw.wmnet', 'cirrussearch2113.codfw.wmnet', 'cirrussearch2114.codfw.wmnet', 'cirrussearch2115.codfw.wmnet'], 'expected_nodes': 36, 'recover_after_nodes': 24, 'indices_to_monitor': ['commonswiki_file', 'wikidatawiki_content', 'enwiki_general', 'enwiki_content', 'viwiki_general', 'commonswiki_general', 'cebwiki_content', 'metawiki_general', 'dewiki_content', 'frwiki_content']}, 'production-search-omega-codfw': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '10G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'cluster_name': 'production-search-omega-codfw', 'short_cluster_name': 'omega', 'http_port': 9400, 'tls_port': 9443, 'certificate_name': 'search.discovery.wmnet', 'transport_tcp_port': 9500, 'unicast_hosts': ['cirrussearch2092.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2086.codfw.wmnet'], 'cluster_hosts': ['cirrussearch2087.codfw.wmnet', 'cirrussearch2088.codfw.wmnet', 'cirrussearch2061.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2074.codfw.wmnet', 'cirrussearch2090.codfw.wmnet', 'cirrussearch2111.codfw.wmnet', 'cirrussearch2092.codfw.wmnet', 'cirrussearch2093.codfw.wmnet', 'cirrussearch2063.codfw.wmnet', 'cirrussearch2070.codfw.wmnet', 'cirrussearch2077.codfw.wmnet', 'cirrussearch2097.codfw.wmnet', 'cirrussearch2098.codfw.wmnet', 'cirrussearch2099.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2065.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2102.codfw.wmnet', 'cirrussearch2112.codfw.wmnet', 'cirrussearch2104.codfw.wmnet', 'cirrussearch2105.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2067.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2086.codfw.wmnet', 'cirrussearch2114.codfw.wmnet'], 'expected_nodes': 18, 'recover_after_nodes': 11}}
+ instances => {'production-search-codfw': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr', 'analysis-nori', 'analysis-sudachi', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '30G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'cluster_name': 'production-search-codfw', 'short_cluster_name': 'chi', 'http_port': 9200, 'tls_port': 9243, 'certificate_name': 'search.discovery.wmnet', 'transport_tcp_port': 9300, 'unicast_hosts': ['cirrussearch2093.codfw.wmnet', 'cirrussearch2061.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2111.codfw.wmnet'], 'cluster_hosts': ['cirrussearch2061.codfw.wmnet', 'cirrussearch2062.codfw.wmnet', 'cirrussearch2063.codfw.wmnet', 'cirrussearch2064.codfw.wmnet', 'cirrussearch2065.codfw.wmnet', 'cirrussearch2066.codfw.wmnet', 'cirrussearch2067.codfw.wmnet', 'cirrussearch2068.codfw.wmnet', 'cirrussearch2069.codfw.wmnet', 'cirrussearch2070.codfw.wmnet', 'cirrussearch2071.codfw.wmnet', 'cirrussearch2072.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2074.codfw.wmnet', 'cirrussearch2075.codfw.wmnet', 'cirrussearch2076.codfw.wmnet', 'cirrussearch2077.codfw.wmnet', 'cirrussearch2078.codfw.wmnet', 'cirrussearch2079.codfw.wmnet', 'cirrussearch2080.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2082.codfw.wmnet', 'cirrussearch2083.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2085.codfw.wmnet', 'cirrussearch2086.codfw.wmnet', 'cirrussearch2087.codfw.wmnet', 'cirrussearch2088.codfw.wmnet', 'cirrussearch2089.codfw.wmnet', 'cirrussearch2090.codfw.wmnet', 'cirrussearch2091.codfw.wmnet', 'cirrussearch2092.codfw.wmnet', 'cirrussearch2093.codfw.wmnet', 'cirrussearch2094.codfw.wmnet', 'cirrussearch2095.codfw.wmnet', 'cirrussearch2096.codfw.wmnet', 'cirrussearch2097.codfw.wmnet', 'cirrussearch2098.codfw.wmnet', 'cirrussearch2099.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2101.codfw.wmnet', 'cirrussearch2102.codfw.wmnet', 'cirrussearch2103.codfw.wmnet', 'cirrussearch2104.codfw.wmnet', 'cirrussearch2105.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2107.codfw.wmnet', 'cirrussearch2108.codfw.wmnet', 'cirrussearch2109.codfw.wmnet', 'cirrussearch2110.codfw.wmnet', 'cirrussearch2111.codfw.wmnet', 'cirrussearch2112.codfw.wmnet', 'cirrussearch2113.codfw.wmnet', 'cirrussearch2114.codfw.wmnet', 'cirrussearch2115.codfw.wmnet'], 'expected_nodes': 36, 'recover_after_nodes': 24, 'indices_to_monitor': ['commonswiki_file', 'wikidatawiki_content', 'enwiki_general', 'enwiki_content', 'viwiki_general', 'commonswiki_general', 'cebwiki_content', 'metawiki_general', 'dewiki_content', 'frwiki_content']}, 'production-search-omega-codfw': {'awareness_attributes': 'row', 'plugins_mandatory': ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr', 'analysis-nori', 'analysis-sudachi', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3'], 'watermarks': {'low': '75%', 'high': '80%', 'flood_stage': '95%'}, 'heap_memory': '10G', 'recover_after_time': '5m', 'search_shard_count_limit': 5000, 'ltr_cache_size': '100mb', 'auto_create_index': '+apifeatureusage-*,+glent_*,-*', 'script_max_compilations_per_minute': 10000, 'bulk_thread_pool_executors': 6, 'bulk_thread_pool_capacity': 1000, 'filter_cache_size': '20%', 'cluster_name': 'production-search-omega-codfw', 'short_cluster_name': 'omega', 'http_port': 9400, 'tls_port': 9443, 'certificate_name': 'search.discovery.wmnet', 'transport_tcp_port': 9500, 'unicast_hosts': ['cirrussearch2092.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2086.codfw.wmnet'], 'cluster_hosts': ['cirrussearch2087.codfw.wmnet', 'cirrussearch2088.codfw.wmnet', 'cirrussearch2061.codfw.wmnet', 'cirrussearch2073.codfw.wmnet', 'cirrussearch2074.codfw.wmnet', 'cirrussearch2090.codfw.wmnet', 'cirrussearch2111.codfw.wmnet', 'cirrussearch2092.codfw.wmnet', 'cirrussearch2093.codfw.wmnet', 'cirrussearch2063.codfw.wmnet', 'cirrussearch2070.codfw.wmnet', 'cirrussearch2077.codfw.wmnet', 'cirrussearch2097.codfw.wmnet', 'cirrussearch2098.codfw.wmnet', 'cirrussearch2099.codfw.wmnet', 'cirrussearch2100.codfw.wmnet', 'cirrussearch2065.codfw.wmnet', 'cirrussearch2081.codfw.wmnet', 'cirrussearch2102.codfw.wmnet', 'cirrussearch2112.codfw.wmnet', 'cirrussearch2104.codfw.wmnet', 'cirrussearch2105.codfw.wmnet', 'cirrussearch2106.codfw.wmnet', 'cirrussearch2067.codfw.wmnet', 'cirrussearch2084.codfw.wmnet', 'cirrussearch2086.codfw.wmnet', 'cirrussearch2114.codfw.wmnet'], 'expected_nodes': 18, 'recover_after_nodes': 11}}
@@
- plugins_mandatory => ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr']
+ plugins_mandatory => ['analysis-hebrew', 'analysis-icu', 'analysis-smartcn', 'analysis-stempel', 'analysis-ukrainian', 'cirrus-highlighter', 'opensearch-analysis-stconvert', 'opensearch-extra', 'opensearch-extra-analysis-esperanto', 'opensearch-extra-analysis-serbian', 'opensearch-extra-analysis-slovak', 'ltr', 'analysis-nori', 'analysis-sudachi', 'opensearch-extra-analysis-homoglyph', 'opensearch-extra-analysis-khmer', 'opensearch-extra-analysis-textify', 'opensearch-extra-analysis-turkish', 'opensearch-extra-analysis-ukrainian', 'opensearch-ltr', 'repository-s3']
@@
- java_home => /usr/lib/jvm/java-11-openjdk-amd64
+ java_home => /usr/lib/jvm/java-21-openjdk-amd64