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

Changes required to install Elasticsearch 6 on staging #6421

Merged
merged 19 commits into from
Nov 14, 2024
Merged

Changes required to install Elasticsearch 6 on staging #6421

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
56c8188
update elasticsearch version on public.yml on staging
AmitPhulera Oct 21, 2024
6015334
add task to download es 6
AmitPhulera Oct 21, 2024
8d371ff
create misc settings for es6
AmitPhulera Oct 21, 2024
f493e31
include es5 related changes in main task
AmitPhulera Oct 21, 2024
05a2c0d
update es config file and service file
AmitPhulera Oct 21, 2024
88141e9
update elasticsearch_major_version to get right es client on staging
AmitPhulera Oct 21, 2024
a491b1b
update config file based on docs
AmitPhulera Oct 21, 2024
eb11aa5
fix jvm options thats were misconfigured
AmitPhulera Oct 22, 2024
fda8d7f
DRY up es version based config
AmitPhulera Oct 22, 2024
086eba4
fix typo
AmitPhulera Oct 22, 2024
56def3d
cleanup es 2 related settings
AmitPhulera Oct 22, 2024
a939217
fix download hash for es
AmitPhulera Oct 24, 2024
6acafad
don't use deprecated syntax to check checksum
AmitPhulera Oct 24, 2024
9621345
remove path.conf from setting
AmitPhulera Oct 24, 2024
f9a79f7
also create tmp dir
AmitPhulera Oct 24, 2024
98c2f9d
check if es directories exist and then create the one which are not p…
AmitPhulera Oct 24, 2024
01b369c
Merge remote-tracking branch 'origin/master' into ap/es6-install
AmitPhulera Oct 24, 2024
390dc72
Merge branch 'master' into ap/es6-install
AmitPhulera Oct 28, 2024
9f6f712
Merge branch 'master' into ap/es6-install
AmitPhulera Nov 12, 2024
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
1 change: 0 additions & 1 deletion src/commcare_cloud/ansible/roles/elasticsearch/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ elasticsearch_http_port: 9200
#es_snapshot_bucket: "dimagi-{{ deploy_env }}-es-snapshots"
es_repository_name: "{{ deploy_env }}_es_snapshot"
backup_es_swift: no
elasticsearch_enable_inline_groovy_scripts: True
elasticsearch_service_name: elasticsearch
elasticsearch_node_name: "{{ hostname }}"
elasticsearch_delete_old_logs: False
Expand Down
13 changes: 0 additions & 13 deletions src/commcare_cloud/ansible/roles/elasticsearch/templates/config/elasticsearch.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ path.logs: {{ elasticsearch_data_dir }}/logs
# but (todo) we DO NOT follow best practice.
discovery.zen.minimum_master_nodes: {{ [2, groups.elasticsearch|map('extract', hostvars, 'elasticsearch_master_value')|select()|list | length] | min }}

{% if elasticsearch_version is version('5.6.16', '<') %}
discovery.zen.fd.ping_timeout: 90s
discovery.zen.fd.ping_interval: 10s
discovery.zen.fd.ping_retries: 20
{% endif %}

{% if elasticsearch_version is version('5.0.0', '>=') %}
discovery.zen.ping_timeout: 90s
{% endif %}
Expand Down Expand Up @@ -69,13 +63,6 @@ network.host: "{{ lookup('dig', inventory_hostname, wantlist=True)[0] }}"
indices.fielddata.cache.size: {{ elasticsearch_fielddata_cache_size }}
{% endif %}

{% if elasticsearch_enable_inline_groovy_scripts %}
{% if elasticsearch_version is version('5.6.16', '<=') %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just going off of this, these settings seemed to also apply to ES5 and therefore aren't strictly an ES2 setting? Are they still safe to remove?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes this is safe to remove and is intentionally removed. This was there to in ES 5 to support if someone was using groovy scripts which are deprecated.
If someone installs commcare now they will not need es5 with groovy scripts so it is safe to remove for ES5 as well.

# somewhat of a security risk but required by pact custom reports
script.engine.groovy.inline.aggs: true
script.engine.groovy.inline.search: true
{% endif %}
{% endif %}

{% if backup_es_s3 and AMAZON_S3_ACCESS_KEY %}
cloud:
Expand Down
Loading