Merge pull request #12497 from Security-Onion-Solutions/jppsensoroni

fix sensoroni for non sensor
Security-Onion-Solutions · Mar 5, 2024 · 781f96a · 781f96a
2 parents 58d2222 + c0d19e1
commit 781f96a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/salt/sensoroni/files/sensoroni.json b/salt/sensoroni/files/sensoroni.json
@@ -1,7 +1,5 @@
-{%- from 'vars/globals.map.jinja' import GLOBALS %}
-{%- from 'sensoroni/map.jinja' import SENSORONIMERGED %}
-{%- from 'pcap/config.map.jinja' import PCAPMERGED %}
-{%- from 'suricata/map.jinja' import SURICATAMERGED %}
+{%  from 'vars/globals.map.jinja' import GLOBALS %}
+{%- from 'sensoroni/map.jinja' import SENSORONIMERGED -%}
 {
   "logFilename": "/opt/sensoroni/logs/sensoroni.log",
   "logLevel":"info",
@@ -24,22 +22,26 @@
       "importer": {},
       "statickeyauth": {
         "apiKey": "{{ GLOBALS.sensoroni_key }}"
-{#- if PCAPMERGED.enabled is true then we know that steno is the pcap engine #}
-{#- if it is false, then user has steno disabled in ui or has selected suricata for pcap engine #}
-{%- if PCAPMERGED.enabled %}
+{%  if GLOBALS.is_sensor %}
+{%    from 'pcap/config.map.jinja' import PCAPMERGED %}
+{%    from 'suricata/map.jinja' import SURICATAMERGED %}
+{#    if PCAPMERGED.enabled is true then we know that steno is the pcap engine #}
+{#    if it is false, then user has steno disabled in ui or has selected suricata for pcap engine #}
+{%-   if PCAPMERGED.enabled %}
       },     
       "stenoquery": {
         "executablePath": "/opt/sensoroni/scripts/stenoquery.sh",
         "pcapInputPath": "/nsm/pcap",
         "pcapOutputPath": "/nsm/pcapout"
       }
-{%- elif GLOBALS.pcap_engine == "SURICATA" and SURICATAMERGED.enabled %}
+{%-   elif GLOBALS.pcap_engine == "SURICATA" and SURICATAMERGED.enabled %}
       },     
       "suriquery": {
         "executablePath": "/opt/sensoroni/scripts/suriquery.sh",
         "pcapInputPath": "/nsm/suripcap",
         "pcapOutputPath": "/nsm/pcapout"
       }
+{%    endif %}
 {%- else %}
       }
 {%- endif %}

diff --git a/salt/vars/globals.map.jinja b/salt/vars/globals.map.jinja
@@ -8,6 +8,7 @@
   set GLOBALS = {
     'hostname': INIT.GRAINS.nodename,
     'is_manager': false,
+    'is_sensor': false,
     'manager': INIT.GRAINS.master,
     'minion_id': INIT.GRAINS.id,
     'main_interface': INIT.PILLAR.host.mainint,
@@ -63,5 +64,8 @@
 {%   do GLOBALS.update({'is_manager': true}) %}
 {% endif %}
 
+{% if GLOBALS.role in GLOBALS.sensor_roles %}
+{%   do GLOBALS.update({'is_sensor': true}) %}
+{% endif %}
 
 {% do salt['defaults.merge'](GLOBALS, ROLE_GLOBALS, merge_lists=False, in_place=True) %}