changes to top and allow_states for enable/disable elasticsearch in ui

This commit is contained in:
m0duspwnens
2023-05-09 10:01:30 -04:00
parent 328b714306
commit 7bd9a84aa1
2 changed files with 2 additions and 18 deletions

View File

@@ -3,7 +3,6 @@
# https://securityonion.net/license; you may not use this file except in compliance with the # https://securityonion.net/license; you may not use this file except in compliance with the
# Elastic License 2.0. # Elastic License 2.0.
{% set ELASTICSEARCH = salt['pillar.get']('elasticsearch:enabled', True) %}
{% set KIBANA = salt['pillar.get']('kibana:enabled', True) %} {% set KIBANA = salt['pillar.get']('kibana:enabled', True) %}
{% set LOGSTASH = salt['pillar.get']('logstash:enabled', True) %} {% set LOGSTASH = salt['pillar.get']('logstash:enabled', True) %}
{% set CURATOR = salt['pillar.get']('curator:enabled', True) %} {% set CURATOR = salt['pillar.get']('curator:enabled', True) %}
@@ -225,11 +224,11 @@
{% do allowed_states.append('strelka') %} {% do allowed_states.append('strelka') %}
{% endif %} {% 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') %} {% do allowed_states.append('elasticsearch') %}
{% endif %} {% 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') %} {% do allowed_states.append('elasticsearch.auth') %}
{% endif %} {% endif %}

View File

@@ -3,7 +3,6 @@
# https://securityonion.net/license; you may not use this file except in compliance with the # https://securityonion.net/license; you may not use this file except in compliance with the
# Elastic License 2.0. # Elastic License 2.0.
{% set ELASTICSEARCH = salt['pillar.get']('elasticsearch:enabled', True) %}
{% set KIBANA = salt['pillar.get']('kibana:enabled', True) %} {% set KIBANA = salt['pillar.get']('kibana:enabled', True) %}
{% set LOGSTASH = salt['pillar.get']('logstash:enabled', True) %} {% set LOGSTASH = salt['pillar.get']('logstash:enabled', True) %}
{% set REDIS = salt['pillar.get']('redis:enabled', True) %} {% set REDIS = salt['pillar.get']('redis:enabled', True) %}
@@ -74,9 +73,7 @@ base:
- suricata.manager - suricata.manager
- healthcheck - healthcheck
- mysql - mysql
{%- if ELASTICSEARCH %}
- elasticsearch - elasticsearch
{%- endif %}
{%- if KIBANA %} {%- if KIBANA %}
- elastic-fleet-package-registry - elastic-fleet-package-registry
- kibana.so_savedobjects_defaults - kibana.so_savedobjects_defaults
@@ -116,9 +113,7 @@ base:
- idstools - idstools
- suricata.manager - suricata.manager
- mysql - mysql
{%- if ELASTICSEARCH %}
- elasticsearch - elasticsearch
{%- endif %}
{%- if LOGSTASH %} {%- if LOGSTASH %}
- logstash - logstash
{%- endif %} {%- endif %}
@@ -156,9 +151,7 @@ base:
- suricata.manager - suricata.manager
- healthcheck - healthcheck
- mysql - mysql
{%- if ELASTICSEARCH %}
- elasticsearch - elasticsearch
{%- endif %}
{%- if LOGSTASH %} {%- if LOGSTASH %}
- logstash - logstash
{%- endif %} {%- endif %}
@@ -190,9 +183,7 @@ base:
- nginx - nginx
- telegraf - telegraf
- firewall - firewall
{%- if ELASTICSEARCH %}
- elasticsearch - elasticsearch
{%- endif %}
{%- if LOGSTASH %} {%- if LOGSTASH %}
- logstash - logstash
{%- endif %} {%- endif %}
@@ -217,9 +208,7 @@ base:
- idstools - idstools
- suricata.manager - suricata.manager
- mysql - mysql
{%- if ELASTICSEARCH %}
- elasticsearch - elasticsearch
{%- endif %}
{%- if LOGSTASH %} {%- if LOGSTASH %}
- logstash - logstash
{%- endif %} {%- endif %}
@@ -245,9 +234,7 @@ base:
- nginx - nginx
- telegraf - telegraf
- firewall - firewall
{%- if ELASTICSEARCH %}
- elasticsearch - elasticsearch
{%- endif %}
{%- if LOGSTASH %} {%- if LOGSTASH %}
- logstash - logstash
{%- endif %} {%- endif %}
@@ -281,9 +268,7 @@ base:
- idstools - idstools
- suricata.manager - suricata.manager
- pcap - pcap
{%- if ELASTICSEARCH %}
- elasticsearch - elasticsearch
{%- endif %}
{%- if KIBANA %} {%- if KIBANA %}
- elastic-fleet-package-registry - elastic-fleet-package-registry
- kibana.so_savedobjects_defaults - kibana.so_savedobjects_defaults