From af7830c2be7e7c7cd7e11cd089702211e5632094 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 9 Nov 2021 13:52:47 -0500
Subject: [PATCH] remove reference to saved_objects in defaults

---
 salt/kibana/config.map.jinja |  1 -
 salt/kibana/defaults.yaml    | 21 +--------------------
 salt/kibana/init.sls         |  1 -
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/salt/kibana/config.map.jinja b/salt/kibana/config.map.jinja
index 80e83a268..c34dbfbb8 100644
--- a/salt/kibana/config.map.jinja
+++ b/salt/kibana/config.map.jinja
@@ -6,5 +6,4 @@
   {% do KIBANACONFIG.kibana.config.update({'xpack': {'security': {'authc': {'providers': {'anonymous': {'anonymous1': {'order': 0, 'credentials': 'elasticsearch_anonymous_user'}}}}}}}) %}
 {% endif %}
 
-{% set SAVED_OBJECTS = salt['pillar.get']('kibana:saved_objects', default=KIBANACONFIG.kibana.saved_objects, merge=True) %}
 {% set KIBANACONFIG = salt['pillar.get']('kibana:config', default=KIBANACONFIG.kibana.config, merge=True) %}
diff --git a/salt/kibana/defaults.yaml b/salt/kibana/defaults.yaml
index 62ee380f3..55409ae2f 100644
--- a/salt/kibana/defaults.yaml
+++ b/salt/kibana/defaults.yaml
@@ -1,25 +1,5 @@
 kibana:
   enabled: True
-  saved_objects:
-    discover:
-      sampleSize: 100
-    theme:
-      darkMode: True
-    timepicker:
-      timeDefaults:
-        from: now-24h
-        to: now
-    securitySolution:
-      defaultIndex:
-        - apm-*-transaction*
-        - traces-apm*
-        - auditbeat-*
-        - endgame-*
-        - filebeat-*
-        - logs-*
-        - packetbeat-*
-        - winlogbeat-*
-        - so-*
   config:
     server:
       name: kibana
@@ -50,3 +30,4 @@ kibana:
     xpack:
       ml:
         enabled: False
+
diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index 82c2c6036..9960f67dd 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -10,7 +10,6 @@
 {% 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 SAVED_OBJECTS with context %}
 
 # Add ES Group
 kibanasearchgroup: