CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-08 18:22:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge and defaults passed

Browse Source
This commit is contained in:
m0duspwnens
2021-07-28 09:58:38 -04:00
parent 9a429230fe
commit ead9ae8cb5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/kibana/init.sls
View File

@@ -7,7 +7,7 @@
{% from 'elasticsearch/auth.map.jinja' import ELASTICAUTH with context %} {% from 'elasticsearch/auth.map.jinja' import ELASTICAUTH with context %}
{% import_yaml 'kibana/defaults.yaml' as default_settings %} {% import_yaml 'kibana/defaults.yaml' as default_settings %}
{% set KIBANA_SETTINGS = salt['pillar.get']('kibana', default=default_settings, merge=True) %} {% set KIBANA_SETTINGS = salt['grains.filter_by'](default_settings, default='kibana', merge=salt['pillar.get']('kibana', {})) %}
# Add ES Group # Add ES Group
kibanasearchgroup: kibanasearchgroup:
@@ -102,7 +102,7 @@ kibanadashtemplate:
- group: 939 - group: 939
- template: jinja - template: jinja
- defaults: - defaults:
DASHBOARD: {{ KIBANA_SETTINGS.kibana.dashboard }} DASHBOARD: {{ KIBANA_SETTINGS.dashboard }}
so-kibana-config-load: so-kibana-config-load:
cmd.run: cmd.run: