Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SAK-47210 replace Elasticsearch with Opensearch #10469

Merged
merged 5 commits into from
Sep 13, 2022
Merged

SAK-47210 replace Elasticsearch with Opensearch #10469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18d385f
SAK-47210 replace Elasticsearch with Opensearch
ottenhoff Apr 25, 2022
82a0c0c
missed a couple
ottenhoff Apr 25, 2022
d987837
Fix a few more test errors
ottenhoff Apr 26, 2022
173bd67
set lucene for opensearch
ottenhoff Apr 26, 2022
d406b45
Update Opensearch version
ottenhoff Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assignment/impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@
<artifactId>elasticsearch-api</artifactId>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<groupId>org.opensearch</groupId>
<artifactId>opensearch</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
Expand Down
26 changes: 12 additions & 14 deletions .../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3170,13 +3170,11 @@
# roster.display.user.pronouns = true

## SEARCH
# Elastic search is the default search as of Sakai 10
# For more information please see this confluence page
# https://confluence.sakaiproject.org/display/SEARCH/Elasticsearch
# Every property of elasticsearch can be configured by using the prefix
# elasticsearch.
# And then using the property from the elasticsearch.yml file
# (As of version .90 this is https://github.com/elasticsearch/elasticsearch/blob/0.90/config/elasticsearch.yml)
# Opensearch is the open-source successor of Elasticsearch
# Every property of opensearch can be configured by using the prefix
# "opensearch"
# And then using the property from the opensearch.yml file
# https://github.com/opensearch-project/security/blob/main/securityconfig/opensearch.yml.example
# This file just contains some of the most common, please see that Yaml file and page
# for additional info.

Expand Down Expand Up @@ -3243,29 +3241,29 @@

# How many shards to start up for elastic search
# DEFAULT: 5
# elasticsearch.index.number_of_shards=5
# opensearch.index.number_of_shards=5

# How many replicates to start up for elastic search
# DEFAULT: 1
# elasticsearch.index.number_of_replicas=1
# opensearch.index.number_of_replicas=1

# Turning on http communication so you can use curl and other tools. You want to make sure this is firewalled to the outside world, but its really handy to have on even in production.
# DEFAULT: true
# elasticsearch.http.enabled=true
# opensearch.http.enabled=true

# Default port to use for http communication above
# DEFAULT: 9200
# elasticsearch.http.port=9200
# opensearch.http.port=9200

# Multicast is the default but unicast should be supported you need these options
# Turn multicast off
# elasticsearch.discovery.zen.ping.multicast.enabled=false
# opensearch.discovery.zen.ping.multicast.enabled=false

# Pick your communication port
# elasticsearch.transport.tcp.port=9300
# opensearch.transport.tcp.port=9300

# Set the location of all your nodes, including the port
# elasticsearch.discovery.zen.ping.unicast.hosts=ec2-184-169-221-255.us-west-1.compute.amazonaws.com:9300,ec2-204-236-163-255.us-west-1.compute.amazonaws.com:9300,ec2-184-169-227-255.us-west-1.compute.amazonaws.com:9300,ec2-204-236-170-255.us-west-1.compute.amazonaws.com:9300
# opensearch.discovery.zen.ping.unicast.hosts=ec2-184-169-221-255.us-west-1.compute.amazonaws.com:9300,ec2-204-236-163-255.us-west-1.compute.amazonaws.com:9300,ec2-184-169-227-255.us-west-1.compute.amazonaws.com:9300,ec2-204-236-170-255.us-west-1.compute.amazonaws.com:9300

# See the confluence page for more details on unicast/multicast/EC2 discovery options.

Expand Down
6 changes: 3 additions & 3 deletions conversations/impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>${sakai.elasticsearch.version}</version>
<groupId>org.opensearch</groupId>
<artifactId>opensearch</artifactId>
<version>${sakai.opensearch.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
53 changes: 24 additions & 29 deletions deploy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
<scope>compile</scope>
</dependency>

<!-- lucene jars required by elasticsearch and help -->
<!-- lucene jars required by opensearch and help -->
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
Expand Down Expand Up @@ -273,40 +273,35 @@
<artifactId>lucene-spatial3d</artifactId>
<scope>compile</scope>
</dependency>
<!-- elasticsearch libs -->
<!-- opensearch libs -->
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<groupId>org.opensearch</groupId>
<artifactId>opensearch</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-core</artifactId>
<groupId>org.opensearch</groupId>
<artifactId>opensearch-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-cli</artifactId>
<groupId>org.opensearch</groupId>
<artifactId>opensearch-cli</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-secure-sm</artifactId>
<groupId>org.opensearch</groupId>
<artifactId>opensearch-secure-sm</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-x-content</artifactId>
<groupId>org.opensearch</groupId>
<artifactId>opensearch-x-content</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-geo</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-lz4</artifactId>
<groupId>org.opensearch</groupId>
<artifactId>opensearch-geo</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -315,22 +310,22 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<groupId>org.opensearch.client</groupId>
<artifactId>opensearch-rest-high-level-client</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
<groupId>org.opensearch.client</groupId>
<artifactId>opensearch-rest-client</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>transport-netty4-client</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codelibs.elasticsearch.module</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>analysis-common</artifactId>
<scope>compile</scope>
</dependency>
Expand All @@ -340,22 +335,22 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>parent-join-client</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>aggs-matrix-stats-client</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>rank-eval-client</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>lang-mustache-client</artifactId>
<scope>compile</scope>
</dependency>
Expand Down
86 changes: 40 additions & 46 deletions master/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<sakai.ehcache.groupId>net.sf.ehcache</sakai.ehcache.groupId>
<sakai.ehcache.artifactId>ehcache-core</sakai.ehcache.artifactId>
<sakai.ehcache.version>2.6.11</sakai.ehcache.version>
<sakai.elasticsearch.version>7.17.1</sakai.elasticsearch.version>
<sakai.opensearch.version>1.3.4</sakai.opensearch.version>
<sakai.hibernate.version>5.3.20.Final</sakai.hibernate.version>
<sakai.hikaricp.version>4.0.3</sakai.hikaricp.version>
<sakai.httpclient.version>4.5.13</sakai.httpclient.version>
Expand All @@ -56,7 +56,7 @@
<sakai.jaxb.version>2.3.6</sakai.jaxb.version>
<sakai.jstl.version>1.2</sakai.jstl.version>
<sakai.lombok.version>1.18.24</sakai.lombok.version>
<sakai.lucene.version>8.11.1</sakai.lucene.version>
<sakai.lucene.version>8.10.1</sakai.lucene.version>
<sakai.netty.version>4.1.71.Final</sakai.netty.version>
<sakai.org.json.version>20210307</sakai.org.json.version>
<sakai.pluto.version>1.1.7</sakai.pluto.version>
Expand Down Expand Up @@ -1351,47 +1351,41 @@
<version>${sakai.openpdf.version}</version>
<scope>provided</scope>
</dependency>
<!-- elasticsearch -->
<!-- opensearch -->
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>${sakai.elasticsearch.version}</version>
<groupId>org.opensearch</groupId>
<artifactId>opensearch</artifactId>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-core</artifactId>
<version>${sakai.elasticsearch.version}</version>
<groupId>org.opensearch</groupId>
<artifactId>opensearch-core</artifactId>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-cli</artifactId>
<version>${sakai.elasticsearch.version}</version>
<groupId>org.opensearch</groupId>
<artifactId>opensearch-cli</artifactId>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-secure-sm</artifactId>
<version>${sakai.elasticsearch.version}</version>
<groupId>org.opensearch</groupId>
<artifactId>opensearch-secure-sm</artifactId>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-x-content</artifactId>
<version>${sakai.elasticsearch.version}</version>
<groupId>org.opensearch</groupId>
<artifactId>opensearch-x-content</artifactId>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-geo</artifactId>
<version>${sakai.elasticsearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-lz4</artifactId>
<version>${sakai.elasticsearch.version}</version>
<groupId>org.opensearch</groupId>
<artifactId>opensearch-geo</artifactId>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -1401,15 +1395,15 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<version>${sakai.elasticsearch.version}</version>
<groupId>org.opensearch.client</groupId>
<artifactId>opensearch-rest-high-level-client</artifactId>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
<version>${sakai.elasticsearch.version}</version>
<groupId>org.opensearch.client</groupId>
<artifactId>opensearch-rest-client</artifactId>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand All @@ -1419,39 +1413,39 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>transport-netty4-client</artifactId>
<version>${sakai.elasticsearch.version}</version>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codelibs.elasticsearch.module</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>analysis-common</artifactId>
<version>${sakai.elasticsearch.version}</version>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>parent-join-client</artifactId>
<version>${sakai.elasticsearch.version}</version>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>aggs-matrix-stats-client</artifactId>
<version>${sakai.elasticsearch.version}</version>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>rank-eval-client</artifactId>
<version>${sakai.elasticsearch.version}</version>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.plugin</groupId>
<groupId>org.opensearch.plugin</groupId>
<artifactId>lang-mustache-client</artifactId>
<version>${sakai.elasticsearch.version}</version>
<version>${sakai.opensearch.version}</version>
<scope>provided</scope>
</dependency>
<!-- netty -->
Expand Down Expand Up @@ -1594,7 +1588,7 @@
<version>5.10.0</version>
<scope>provided</scope>
</dependency>
<!-- elasticsearch 3rd party libs -->
<!-- opensearch 3rd party libs -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions msgcntr/messageforums-component-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@
<artifactId>elasticsearch-api</artifactId>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<groupId>org.opensearch</groupId>
<artifactId>opensearch</artifactId>
</dependency>
</dependencies>
<build>
Expand Down
6 changes: 3 additions & 3 deletions samigo/samigo-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@
<artifactId>search-api</artifactId>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<groupId>org.opensearch</groupId>
<artifactId>opensearch</artifactId>
<scope>provided</scope>
<version>${sakai.elasticsearch.version}</version>
<version>${sakai.opensearch.version}</version>
</dependency>
<dependency>
<groupId>net.htmlparser.jericho</groupId>
Expand Down
Loading