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
Mitigate data leak
[salt-formulas/elasticsearch.git]
/
elasticsearch
/
map.jinja
diff --git
a/elasticsearch/map.jinja
b/elasticsearch/map.jinja
index b69b3698f78c7a68b4083472e66f8b612a339f12..6bfb50d70a84bd495b3992770dfc7cedd6f93f43 100644
(file)
--- a/
elasticsearch/map.jinja
+++ b/
elasticsearch/map.jinja
@@
-2,21
+2,20
@@
Debian:
pkgs:
- elasticsearch
Debian:
pkgs:
- elasticsearch
+ dependency_pkgs:
- default-jre-headless
curator_pkgs:
- default-jre-headless
curator_pkgs:
- -
python-
elasticsearch-curator
+ - elasticsearch-curator
- cron
service: elasticsearch
- cron
service: elasticsearch
- version: '1.4.4'
RedHat:
pkgs:
- elasticsearch
RedHat:
pkgs:
- elasticsearch
+ dependency_pkgs:
+ - java-1.8.0-openjdk-headless
curator_pkgs:
curator_pkgs:
- -
python-
elasticsearch-curator
+ - elasticsearch-curator
service: elasticsearch
service: elasticsearch
- version: '1.4.4'
-default:
- version: 2
{%- endload %}
{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server'), base='default') %}
{%- endload %}
{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server'), base='default') %}
@@
-28,6
+27,7
@@
Debian:
server:
host: 127.0.0.1
port: 9200
server:
host: 127.0.0.1
port: 9200
+ scheme: http
binary_port: 9300
RedHat:
pkgs:
binary_port: 9300
RedHat:
pkgs:
@@
-35,6
+35,7
@@
RedHat:
server:
host: 127.0.0.1
port: 9200
server:
host: 127.0.0.1
port: 9200
+ scheme: http
binary_port: 9300
{%- endload %}
binary_port: 9300
{%- endload %}
@@
-44,5
+45,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.8,
+ 'service_disk_space_watermark_major_threshold_percent': 0.85,
},
}, grain='os_family', merge=salt['pillar.get']('elasticsearch:monitoring')) %}
},
}, grain='os_family', merge=salt['pillar.get']('elasticsearch:monitoring')) %}