Code Review
/
salt-formulas
/
elasticsearch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Replace Salt elasticsearch_index_template state deprecated since 2017.7"
[salt-formulas/elasticsearch.git]
/
elasticsearch
/
map.jinja
diff --git
a/elasticsearch/map.jinja
b/elasticsearch/map.jinja
index 94f12fa888c53a9e748d9fe5acf1e6a7779fba8d..930a2f90bbe033828bee5f0425a0d057faf48b2d 100644
(file)
--- a/
elasticsearch/map.jinja
+++ b/
elasticsearch/map.jinja
@@
-4,7
+4,7
@@
Debian:
- elasticsearch
- default-jre-headless
curator_pkgs:
- elasticsearch
- default-jre-headless
curator_pkgs:
- -
python-
elasticsearch-curator
+ - elasticsearch-curator
- cron
service: elasticsearch
version: '1.4.4'
- cron
service: elasticsearch
version: '1.4.4'
@@
-12,12
+12,14
@@
RedHat:
pkgs:
- elasticsearch
curator_pkgs:
pkgs:
- elasticsearch
curator_pkgs:
- -
python-
elasticsearch-curator
+ - elasticsearch-curator
service: elasticsearch
version: '1.4.4'
service: elasticsearch
version: '1.4.4'
+default:
+ version: 5
{%- endload %}
{%- endload %}
-{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server')) %}
+{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server')
, base='default'
) %}
{%- load_yaml as client_defaults %}
Debian:
{%- load_yaml as client_defaults %}
Debian:
@@
-42,5
+44,7
@@
RedHat:
'default': {
'service_failed_warning_threshold_percent': 0.3,
'service_failed_critical_threshold_percent': 0.6,
'default': {
'service_failed_warning_threshold_percent': 0.3,
'service_failed_critical_threshold_percent': 0.6,
+ 'service_disk_space_watermark_minor_threshold_percent': 0.6,
+ 'service_disk_space_watermark_major_threshold_percent': 0.75,
},
}, grain='os_family', merge=salt['pillar.get']('elasticsearch:monitoring')) %}
},
}, grain='os_family', merge=salt['pillar.get']('elasticsearch:monitoring')) %}