From 032373187cc577f721d2b8b95b426da6a98fc00a Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Fri, 15 Oct 2021 16:02:53 +0000 Subject: [PATCH 1/2] Allow setting ES index patterns for SOC in pillar --- salt/soc/files/soc/soc.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/soc/files/soc/soc.json b/salt/soc/files/soc/soc.json index e33ea406b..02128fd3c 100644 --- a/salt/soc/files/soc/soc.json +++ b/salt/soc/files/soc/soc.json @@ -26,7 +26,7 @@ {%- set ES_USER = '' %} {%- set ES_PASS = '' %} {%- endif %} - +{%- set ES_INDEX_PATTERNS = salt['pillar.get']('soc:es_index_patterns', '*:so-*') %} { "logFilename": "/opt/sensoroni/logs/sensoroni-server.log", "server": { @@ -57,6 +57,7 @@ {%- endif %} "username": "{{ ES_USER }}", "password": "{{ ES_PASS }}", + "index": "{{ ES_INDEX_PATTERNS }}", "cacheMs": {{ ES_FIELDCAPS_CACHE }}, "verifyCert": false, "timeoutMs": {{ API_TIMEOUT }} From 8feeff97b5869397ad902736c7768087d3474537 Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Fri, 15 Oct 2021 16:19:19 +0000 Subject: [PATCH 2/2] Add EG index pattern during setup (if enabled) --- setup/so-functions | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/so-functions b/setup/so-functions index af66896c6..3f6a2b136 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1645,6 +1645,7 @@ manager_pillar() { printf '%s\n'\ "soc:"\ " endgamehost: '$ENDGAMEHOST'"\ + " es_index_patterns: '*:so-*, *:endgame-*'"\ "" >> "$pillar_file" fi }