diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls index a7de1160e..ffdb8148a 100644 --- a/salt/elasticsearch/init.sls +++ b/salt/elasticsearch/init.sls @@ -24,6 +24,7 @@ include: {% set NODEIP = salt['pillar.get']('elasticsearch:mainip', '') -%} {% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %} {% set MANAGERIP = salt['pillar.get']('global:managerip') %} +{% set ESMOUNT = salt ['pillar.get']('elasticsearch:extramount')%} {% if grains['role'] in ['so-eval','so-managersearch', 'so-manager', 'so-standalone', 'so-import'] %} {% set esclustername = salt['pillar.get']('manager:esclustername') %} @@ -288,6 +289,9 @@ so-elasticsearch: - /opt/so/conf/elasticsearch/users_roles:/usr/share/elasticsearch/config/users_roles:ro - /opt/so/conf/elasticsearch/users:/usr/share/elasticsearch/config/users:ro {% endif %} + {% if ESMOUNT %} + - {{ ESMOUNT }}:/snapshots:rw + {% endif %} - watch: - file: cacertz - file: esyml diff --git a/salt/elasticsearch/templates/so/so-common-template.json.jinja b/salt/elasticsearch/templates/so/so-common-template.json.jinja index 11871bfc6..b61f3764d 100644 --- a/salt/elasticsearch/templates/so/so-common-template.json.jinja +++ b/salt/elasticsearch/templates/so/so-common-template.json.jinja @@ -291,6 +291,14 @@ }, "event": { "properties": { + "acknowledged": { + "type": "boolean", + "fields": { + "keyword": { + "type": "keyword" + } + } + }, "action": { "ignore_above": 1024, "type": "keyword" @@ -331,6 +339,14 @@ "end": { "type": "date" }, + "escalated": { + "type": "boolean", + "fields": { + "keyword": { + "type": "keyword" + } + } + }, "hash": { "ignore_above": 1024, "type": "keyword" @@ -397,7 +413,7 @@ }, "severity_label": { "ignore_above": 1024, - "type": "keyword". + "type": "keyword", "fields": { "keyword": { "type": "keyword"