X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=elasticsearch%2Fmap.jinja;h=930a2f90bbe033828bee5f0425a0d057faf48b2d;hp=23e2a7b4ea829d2496552e7f592895d00ea11d42;hb=b2a580859249834db1949c5654ec824ad408bdab;hpb=7c350f939f682f4c4d87518e86b21a79c5b96ead

diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja
index 23e2a7b..930a2f9 100644
--- a/elasticsearch/map.jinja
+++ b/elasticsearch/map.jinja
@@ -4,7 +4,7 @@ Debian:
   - elasticsearch
   - default-jre-headless
   curator_pkgs:
-  - python-elasticsearch-curator
+  - elasticsearch-curator
   - cron
   service: elasticsearch
   version: '1.4.4'
@@ -12,12 +12,14 @@ RedHat:
   pkgs:
   - elasticsearch
   curator_pkgs:
-  - python-elasticsearch-curator
+  - elasticsearch-curator
   service: elasticsearch
   version: '1.4.4'
+default:
+  version: 5
 {%- 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:
@@ -26,12 +28,23 @@ Debian:
   server:
     host: 127.0.0.1
     port: 9200
+    binary_port: 9300
 RedHat:
   pkgs:
   - python-elasticsearch
   server:
     host: 127.0.0.1
     port: 9200
+    binary_port: 9300
 {%- endload %}
 
 {%- set client = salt['grains.filter_by'](client_defaults, merge=salt['pillar.get']('elasticsearch:client')) %}
+
+{% set monitoring = salt['grains.filter_by']({
+    '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')) %}