--- 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}}
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/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
- 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']
- 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]']
- 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
- 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
- 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']
- 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
- Package[opensearch]
- Parameters differences:
--- Package[opensearch].orig
+++ Package[opensearch]
@@
- ensure => 1.3.20
+ ensure => 2.19.5
- Class[Opensearch::Packages]
- Parameters differences:
--- Class[Opensearch::Packages].orig
+++ Class[Opensearch::Packages]
@@
- version => 1.3.20
+ version => 2.19.5
- 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