From 7bd9a84aa1b1c80de40bb7712db07839d94a12bb Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 9 May 2023 10:01:30 -0400
Subject: [PATCH] changes to top and allow_states for enable/disable
 elasticsearch in ui

---
 salt/allowed_states.map.jinja |  5 ++---
 salt/top.sls                  | 15 ---------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/salt/allowed_states.map.jinja b/salt/allowed_states.map.jinja
index d5eaa5599..8470a379c 100644
--- a/salt/allowed_states.map.jinja
+++ b/salt/allowed_states.map.jinja
@@ -3,7 +3,6 @@
 # https://securityonion.net/license; you may not use this file except in compliance with the
 # Elastic License 2.0.
 
-{% set ELASTICSEARCH = salt['pillar.get']('elasticsearch:enabled', True) %}
 {% set KIBANA = salt['pillar.get']('kibana:enabled', True) %}
 {% set LOGSTASH = salt['pillar.get']('logstash:enabled', True) %}
 {% set CURATOR = salt['pillar.get']('curator:enabled', True) %}
@@ -225,11 +224,11 @@
     {% do allowed_states.append('strelka') %}
   {% endif %}
 
-  {% if ELASTICSEARCH and grains.role in ['so-eval', 'so-manager', 'so-standalone', 'so-searchnode', 'so-managersearch', 'so-heavynode', 'so-import'] %}
+  {% if grains.role in ['so-eval', 'so-manager', 'so-standalone', 'so-searchnode', 'so-managersearch', 'so-heavynode', 'so-import'] %}
     {% do allowed_states.append('elasticsearch') %}
   {% endif %}
 
-  {% if ELASTICSEARCH and grains.role in ['so-eval', 'so-manager', 'so-standalone', 'so-managersearch', 'so-import'] %}
+  {% if grains.role in ['so-eval', 'so-manager', 'so-standalone', 'so-managersearch', 'so-import'] %}
     {% do allowed_states.append('elasticsearch.auth') %}
   {% endif %}
 
diff --git a/salt/top.sls b/salt/top.sls
index c108236b9..f30de8763 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -3,7 +3,6 @@
 # https://securityonion.net/license; you may not use this file except in compliance with the
 # Elastic License 2.0.
 
-{% set ELASTICSEARCH = salt['pillar.get']('elasticsearch:enabled', True) %}
 {% set KIBANA = salt['pillar.get']('kibana:enabled', True) %}
 {% set LOGSTASH = salt['pillar.get']('logstash:enabled', True) %}
 {% set REDIS = salt['pillar.get']('redis:enabled', True) %}
@@ -74,9 +73,7 @@ base:
     - suricata.manager
     - healthcheck
     - mysql
-    {%- if ELASTICSEARCH %}
     - elasticsearch
-    {%- endif %}
     {%- if KIBANA %}
     - elastic-fleet-package-registry
     - kibana.so_savedobjects_defaults
@@ -116,9 +113,7 @@ base:
     - idstools
     - suricata.manager
     - mysql
-    {%- if ELASTICSEARCH %}
     - elasticsearch
-    {%- endif %}
     {%- if LOGSTASH %}
     - logstash
     {%- endif %}
@@ -156,9 +151,7 @@ base:
     - suricata.manager    
     - healthcheck
     - mysql
-    {%- if ELASTICSEARCH %}
     - elasticsearch
-    {%- endif %} 
     {%- if LOGSTASH %}
     - logstash
     {%- endif %}
@@ -190,9 +183,7 @@ base:
     - nginx
     - telegraf
     - firewall
-    {%- if ELASTICSEARCH %}
     - elasticsearch
-    {%- endif %}
     {%- if LOGSTASH %}
     - logstash
     {%- endif %}
@@ -217,9 +208,7 @@ base:
     - idstools
     - suricata.manager
     - mysql
-    {%- if ELASTICSEARCH %}
     - elasticsearch
-    {%- endif %}
     {%- if LOGSTASH %}
     - logstash
     {%- endif %}
@@ -245,9 +234,7 @@ base:
     - nginx
     - telegraf
     - firewall
-    {%- if ELASTICSEARCH %}
     - elasticsearch
-    {%- endif %}
     {%- if LOGSTASH %}
     - logstash
     {%- endif %}
@@ -281,9 +268,7 @@ base:
     - idstools
     - suricata.manager
     - pcap
-    {%- if ELASTICSEARCH %}
     - elasticsearch
-    {%- endif %}
     {%- if KIBANA %}
     - elastic-fleet-package-registry
     - kibana.so_savedobjects_defaults