Page Menu
Home
Software Heritage
Search
Configure Global Search
Log In
Files
F7123711
D5063.id18052.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Subscribers
None
D5063.id18052.diff
View Options
diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -1512,10 +1512,6 @@
swh::remote_service::search::config::empty: {}
-swh::remote_service::search::config::storage0:
- cls: remote
- url: "http://storage01.euwest.azure.internal.softwareheritage.org:%{hiera('swh::remote_service::search::port')}/"
-
swh::remote_service::search::config::localhost:
cls: remote
url: "http://localhost:%{hiera('swh::remote_service::search::port')}/"
@@ -1524,7 +1520,7 @@
cls: remote
url: "http://search1.internal.softwareheritage.org:%{hiera('swh::remote_service::search::port')}/"
-swh::remote_service::search::config: "%{alias('swh::remote_service::search::config::empty')}"
+swh::remote_service::search::config: "%{alias('swh::remote_service::search::config::localhost')}"
# Indexer backend configurations
swh::remote_service::indexer::config::saam:
@@ -2138,7 +2134,7 @@
- "::1"
swh::deploy::scheduler::remote::config: "%{alias('swh::deploy::scheduler::config::local')}"
-swh::elasticsearch::nodes:
+swh::elasticsearch::storage_nodes:
- host: esnode2.internal.softwareheritage.org
port: 9200
- host: esnode3.internal.softwareheritage.org
@@ -2146,6 +2142,14 @@
- host: esnode1.internal.softwareheritage.org
port: 9200
+swh::elasticsearch::search_nodes:
+ - host: search-esnode1.internal.softwareheritage.org
+ port: 9200
+ - host: search-esnode2.internal.softwareheritage.org
+ port: 9200
+ - host: search-esnode3.internal.softwareheritage.org
+ port: 9200
+
swh::deploy::scheduler::archive::conf_file: "%{lookup('swh::deploy::scheduler::conf_dir')}/elastic.yml"
swh::deploy::scheduler::archive::user: "%{hiera('swh::deploy::scheduler::user')}"
swh::deploy::scheduler::archive::config:
@@ -2155,7 +2159,7 @@
args:
index_name_prefix: swh-tasks
storage_nodes:
- "%{alias('swh::elasticsearch::nodes')}"
+ "%{alias('swh::elasticsearch::storage_nodes')}"
client_options:
sniff_on_start: false
sniff_on_connection_fail: true
@@ -3181,7 +3185,7 @@
search:
cls: elasticsearch
args:
- hosts: "%{alias('swh::elasticsearch::nodes')}"
+ hosts: "%{alias('swh::elasticsearch::search_nodes')}"
swh::deploy::search::journal_client::service_types:
- objects
@@ -3191,7 +3195,7 @@
swh::deploy::search::journal_client::objects::config:
search:
cls: elasticsearch
- hosts: "%{alias('swh::elasticsearch::nodes')}"
+ hosts: "%{alias('swh::elasticsearch::search_nodes')}"
journal:
brokers: "%{alias('swh::deploy::journal::brokers')}"
group_id: swh.search.journal_client
@@ -3205,7 +3209,7 @@
swh::deploy::search::journal_client::indexed::config:
search:
cls: elasticsearch
- hosts: "%{alias('swh::elasticsearch::nodes')}"
+ hosts: "%{alias('swh::elasticsearch::search_nodes')}"
journal:
brokers: "%{alias('swh::deploy::journal::brokers')}"
group_id: swh.search.journal_client.indexed
diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml
--- a/data/deployments/staging/common.yaml
+++ b/data/deployments/staging/common.yaml
@@ -281,7 +281,7 @@
elasticsearch::jvm_options::heap_size: 16g
elasticsearch::config::prometheus::indices: true
-swh::elasticsearch::nodes:
+swh::elasticsearch::search_nodes:
- host: search-esnode0.internal.staging.swh.network
port: 9200
diff --git a/data/hostname/search1.internal.softwareheritage.org.yaml b/data/hostname/search1.internal.softwareheritage.org.yaml
--- a/data/hostname/search1.internal.softwareheritage.org.yaml
+++ b/data/hostname/search1.internal.softwareheritage.org.yaml
@@ -1,11 +1 @@
-
-# Elasticsearch
-swh::elasticsearch::nodes:
- - host: search-esnode1.internal.softwareheritage.org
- port: 9200
- - host: search-esnode2.internal.softwareheritage.org
- port: 9200
- - host: search-esnode3.internal.softwareheritage.org
- port: 9200
-
swh::deploy::search::backend::listen::host: 0.0.0.0
diff --git a/data/hostname/webapp1.internal.softwareheritage.org.yaml b/data/hostname/webapp1.internal.softwareheritage.org.yaml
--- a/data/hostname/webapp1.internal.softwareheritage.org.yaml
+++ b/data/hostname/webapp1.internal.softwareheritage.org.yaml
@@ -9,22 +9,10 @@
swh::deploy::webapp::vhost::letsencrypt_cert: archive_webapp1
-# Copied from staging
-# will be replaced by the production configuration
-# when it will be deployed
-swh::elasticsearch::nodes:
- - host: search-esnode0.internal.staging.swh.network
- port: 9200
-## End of search / staging specific configuration
-
swh::deploy::storage::db::host: db.internal.softwareheritage.org
swh::deploy::storage::backend::workers: 16
swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::localhost')}"
-swh::remote_service::search::config: "%{alias('swh::remote_service::search::config::localhost')}"
swh::deploy::reverse_proxy::services:
- webapp
-
-swh::deploy::search::config:
- search: "%{alias('swh::remote_service::search::config::search1')}"
diff --git a/site-modules/role/manifests/swh_rp_webapps.pp b/site-modules/role/manifests/swh_rp_webapps.pp
--- a/site-modules/role/manifests/swh_rp_webapps.pp
+++ b/site-modules/role/manifests/swh_rp_webapps.pp
@@ -2,4 +2,5 @@
# Extra deposit and storage services
include profile::swh::deploy::deposit
include profile::swh::deploy::storage
+ include profile::swh::deploy::search
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Dec 19 2024, 9:15 PM (11 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3227530
Attached To
D5063: webapp: use swh-search as main search engine in production
Event Timeline
Log In to Comment