From 26681ac98a285811d1b216f11a9bda5101bc035d Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 5 Oct 2021 12:46:21 -0400
Subject: [PATCH] var for dash saved objevs

---
 salt/kibana/config.map.jinja | 1 +
 salt/kibana/init.sls         | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/salt/kibana/config.map.jinja b/salt/kibana/config.map.jinja
index de412770e..033093667 100644
--- a/salt/kibana/config.map.jinja
+++ b/salt/kibana/config.map.jinja
@@ -6,4 +6,5 @@
   {% do KIBANACONFIG.kibana.config.update({'xpack': {'security': {'authc': {'providers': {'anonymous': {'anonymous1': {'order': 0, 'credentials': 'elasticsearch_anonymous_user'}}}}}}}) %}
 {% endif %}
 
+{% set KIBANADASH = salt['pillar.get']('kibana:dashboard', default=KIBANACONFIG.kibana.dashboard, merge=True) %}
 {% set KIBANACONFIG = salt['pillar.get']('kibana:config', default=KIBANACONFIG.kibana.config, merge=True) %}
diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index 6762cd2be..5a71663e0 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -10,6 +10,7 @@
 {% set KIBANA_SETTINGS = salt['grains.filter_by'](default_settings, default='kibana', merge=salt['pillar.get']('kibana', {})) %}
 
 {% from 'kibana/config.map.jinja' import KIBANACONFIG with context %}
+{% from 'kibana/config.map.jinja' import KIBANADASH with context %}
 
 # Add ES Group
 kibanasearchgroup:
@@ -106,7 +107,7 @@ kibanadashtemplate:
     - group: 939
     - template: jinja
     - defaults:
-        DASHBOARD: {{ KIBANA_SETTINGS.dashboard }}
+        DASHBOARD: {{ KIBANADASH }}
 
 so-kibana-dashboard-load:
   cmd.run: