Skip to content
This repository was archived by the owner on Jan 24, 2025. It is now read-only.

Commit 537958e

Browse files
authored
Merge pull request #1113 from alphagov/migrate-elasticsearch-opensearch
Migrate elasticsearch opensearch
2 parents 65afd6f + da82532 commit 537958e

8 files changed

+11
-11
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
sudo sysctl -w fs.file-max=262144
3535
sudo sysctl -w vm.max_map_count=262144
3636
37-
- uses: getong/elasticsearch-action@v1.2
37+
- uses: ankane/setup-opensearch@v1
3838
with:
39-
elasticsearch version: '7.6.1'
39+
opensearch-version: 1.2
4040
host port: 9200
4141
container port: 9200
4242
host node port: 9300

Gemfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ GEM
279279
raabro (1.4.0)
280280
racc (1.5.2)
281281
rack (2.2.3)
282-
rack-protection (2.1.0)
282+
rack-protection (2.2.0)
283283
rack
284284
rack-test (1.1.0)
285285
rack (>= 1.0, < 3)
@@ -315,7 +315,7 @@ GEM
315315
rb-fsevent (0.11.0)
316316
rb-inotify (0.10.1)
317317
ffi (~> 1.0)
318-
redis (4.1.4)
318+
redis (4.5.1)
319319
redis-namespace (1.8.1)
320320
redis (>= 3.0.4)
321321
regexp_parser (2.1.1)
@@ -396,11 +396,11 @@ GEM
396396
tilt
397397
sentry-raven (3.1.2)
398398
faraday (>= 1.0)
399-
sidekiq (5.2.9)
399+
sidekiq (5.2.10)
400400
connection_pool (~> 2.2, >= 2.2.2)
401401
rack (~> 2.0)
402402
rack-protection (>= 1.5.0)
403-
redis (>= 3.3.5, < 4.2)
403+
redis (~> 4.5, < 4.6.0)
404404
sidekiq-limit_fetch (3.4.0)
405405
sidekiq (>= 4)
406406
sidekiq-logging-json (0.0.19)

config/application.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class Application < Rails::Application
4747
html_tag
4848
}
4949

50-
config.elasticsearch = config_for(:elasticsearch)
50+
config.elasticsearch = config_for(:opensearch)
5151

5252
# Settings in config/environments/* take precedence over those specified here.
5353
# Application configuration can go into files in config/initializers

config/initializers/elasticsearch.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
def es_config_from_vcap
22
begin
33
vcap = JSON.parse(Rails.configuration.elasticsearch["vcap_services"])
4-
es_server = vcap["elasticsearch"][0]["credentials"]["uri"]
4+
es_server = vcap["opensearch"][0]["credentials"]["uri"]
55
rescue StandardError => e
66
Rails.logger.fatal "Failed to extract ES creds from VCAP_SERVICES. Exiting"
77
Rails.logger.fatal Rails.configuration.elasticsearch["vcap_services"]
File renamed without changes.

integration-worker-manifest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ applications:
1212
- publish-beta-integration-pg-12
1313
- publish-beta-integration-redis
1414
- logit-ssl-drain
15-
- elasticsearch-7-integration
15+
- opensearch-integration
1616
health-check-type: process

production-worker-manifest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ applications:
1212
- publish-beta-production-pg-12
1313
- publish-beta-production-redis
1414
- logit-ssl-drain
15-
- elasticsearch-7-production
15+
- opensearch-production
1616
health-check-type: process

staging-worker-manifest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ applications:
1212
- publish-beta-staging-pg-12
1313
- publish-beta-staging-redis
1414
- logit-ssl-drain
15-
- elasticsearch-7-staging
15+
- opensearch-staging
1616
health-check-type: process

0 commit comments

Comments
 (0)