X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=elasticsearch%2Fmap.jinja;h=b69b3698f78c7a68b4083472e66f8b612a339f12;hp=3c0378572b0ff1893be54c255211e161b0e64e61;hb=25d7a3bfa4f441fa0c1cac00784d9c0af5fa1bc1;hpb=5163dfb7b145991603a877b6e862c877ac0f3962

diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja
index 3c03785..b69b369 100644
--- a/elasticsearch/map.jinja
+++ b/elasticsearch/map.jinja
@@ -1,13 +1,48 @@
+{%- load_yaml as base_defaults %}
+Debian:
+  pkgs:
+  - elasticsearch
+  - default-jre-headless
+  curator_pkgs:
+  - python-elasticsearch-curator
+  - cron
+  service: elasticsearch
+  version: '1.4.4'
+RedHat:
+  pkgs:
+  - elasticsearch
+  curator_pkgs:
+  - python-elasticsearch-curator
+  service: elasticsearch
+  version: '1.4.4'
+default:
+  version: 2
+{%- endload %}
 
-{% set server = salt['grains.filter_by']({
-    'Debian': {
-        'pkgs': ['elasticsearch'],
-        'service': 'elasticsearch',
-        'version': '1.4.4',
-     },
-    'RedHat': {
-        'pkgs': ['elasticsearch'],
-        'service': 'elasticsearch',
-        'version': '1.4.4',
+{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server'), base='default') %}
+
+{%- load_yaml as client_defaults %}
+Debian:
+  pkgs:
+  - python-elasticsearch
+  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,
     },
-}, merge=salt['pillar.get']('elasticsearch:server')) %}
+}, grain='os_family', merge=salt['pillar.get']('elasticsearch:monitoring')) %}