X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=elasticsearch%2Fmap.jinja;h=6bfb50d70a84bd495b3992770dfc7cedd6f93f43;hp=930a2f90bbe033828bee5f0425a0d057faf48b2d;hb=refs%2Fheads%2Frelease%2F2019.2.0;hpb=92b11253e83f785e42c5b65dce57c4f29eb1fe9c diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja index 930a2f9..6bfb50d 100644 --- a/elasticsearch/map.jinja +++ b/elasticsearch/map.jinja @@ -2,21 +2,20 @@ Debian: pkgs: - elasticsearch + dependency_pkgs: - default-jre-headless curator_pkgs: - elasticsearch-curator - cron service: elasticsearch - version: '1.4.4' RedHat: pkgs: - elasticsearch + dependency_pkgs: + - java-1.8.0-openjdk-headless curator_pkgs: - 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'), base='default') %} @@ -28,6 +27,7 @@ Debian: server: host: 127.0.0.1 port: 9200 + scheme: http binary_port: 9300 RedHat: pkgs: @@ -35,6 +35,7 @@ RedHat: server: host: 127.0.0.1 port: 9200 + scheme: http binary_port: 9300 {%- endload %} @@ -44,7 +45,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, + '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')) %}