X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=elasticsearch%2Fmap.jinja;h=93b3f0756e6db1fab9a7f571ed129f125ff7fe3b;hp=94f12fa888c53a9e748d9fe5acf1e6a7779fba8d;hb=2649b586a27b2bbc18ce9e515b5c474e47250cbb;hpb=a54736f0beb8be8b5f15ba3ed5b5894f60639d00

diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja
index 94f12fa..93b3f07 100644
--- a/elasticsearch/map.jinja
+++ b/elasticsearch/map.jinja
@@ -4,20 +4,18 @@ Debian:
   - elasticsearch
   - default-jre-headless
   curator_pkgs:
-  - python-elasticsearch-curator
+  - elasticsearch-curator
   - cron
   service: elasticsearch
-  version: '1.4.4'
 RedHat:
   pkgs:
   - elasticsearch
   curator_pkgs:
-  - python-elasticsearch-curator
+  - elasticsearch-curator
   service: elasticsearch
-  version: '1.4.4'
 {%- 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:
@@ -42,5 +40,7 @@ RedHat:
     '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')) %}