From 7eb42fa6bdb386562a03970fb94bb20ed316f822 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 28 Oct 2021 08:43:03 -0400
Subject: [PATCH] change boolean

---
 salt/telegraf/etc/telegraf.conf | 12 ++++++------
 salt/zeek/map.jinja             |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf
index 92fcb4106..fa7dabe09 100644
--- a/salt/telegraf/etc/telegraf.conf
+++ b/salt/telegraf/etc/telegraf.conf
@@ -20,7 +20,7 @@
 {%- set HELIX_API_KEY = salt['pillar.get']('fireeye:helix:api_key', '') %}
 {%- set UNIQUEID = salt['pillar.get']('sensor:uniqueid', '') %}
 {%- set TRUE_CLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False)  %}
-{%- set ZEEK_ENABLED = salt['pillar.get']('zeek:enabled', 'True') %}
+{%- set ZEEK_ENABLED = salt['pillar.get']('zeek:enabled', True) %}
 {%- set MDENGINE = salt['pillar.get']('global:mdengine', 'ZEEK') %}
 
 
@@ -743,7 +743,7 @@
       "/scripts/stenoloss.sh",
       "/scripts/suriloss.sh",
       "/scripts/checkfiles.sh",
-  {%- if MDENGINE == 'ZEEK' and ZEEK_ENABLED is sameas true %}
+  {%- if MDENGINE == 'ZEEK' and ZEEK_ENABLED %}
       "/scripts/zeekloss.sh",
       "/scripts/zeekcaptureloss.sh",
   {%- endif %}
@@ -760,7 +760,7 @@
       "/scripts/stenoloss.sh",
       "/scripts/suriloss.sh",
       "/scripts/checkfiles.sh",
-  {%- if MDENGINE == 'ZEEK' and ZEEK_ENABLED is sameas true %}
+  {%- if MDENGINE == 'ZEEK' and ZEEK_ENABLED %}
       "/scripts/zeekloss.sh",
       "/scripts/zeekcaptureloss.sh",
   {%- endif %}
@@ -779,7 +779,7 @@
       "/scripts/stenoloss.sh",
       "/scripts/suriloss.sh",
       "/scripts/checkfiles.sh",
-  {%- if MDENGINE == 'ZEEK' and ZEEK_ENABLED is sameas true %}
+  {%- if MDENGINE == 'ZEEK' and ZEEK_ENABLED %}
       "/scripts/zeekloss.sh",
       "/scripts/zeekcaptureloss.sh",
   {%- endif %}
@@ -797,7 +797,7 @@
       "/scripts/stenoloss.sh",
       "/scripts/suriloss.sh",
       "/scripts/checkfiles.sh",
-  {%- if MDENGINE == 'ZEEK' and ZEEK_ENABLED is sameas true %}
+  {%- if MDENGINE == 'ZEEK' and ZEEK_ENABLED %}
       "/scripts/zeekloss.sh",
       "/scripts/zeekcaptureloss.sh",
   {%- endif %}
@@ -814,7 +814,7 @@
     "/scripts/stenoloss.sh",
     "/scripts/suriloss.sh",
     "/scripts/checkfiles.sh",
-  {%- if MDENGINE == 'ZEEK' and ZEEK_ENABLED is sameas true %}
+  {%- if MDENGINE == 'ZEEK' and ZEEK_ENABLED %}
     "/scripts/zeekloss.sh",
     "/scripts/zeekcaptureloss.sh",
   {%- endif %}
diff --git a/salt/zeek/map.jinja b/salt/zeek/map.jinja
index 5ae8894bc..a0f92463e 100644
--- a/salt/zeek/map.jinja
+++ b/salt/zeek/map.jinja
@@ -1,8 +1,8 @@
 {% set ZEEKOPTIONS = {} %}
-{% set ENABLED = salt['pillar.get']('zeek:enabled', 'True') %}
+{% set ENABLED = salt['pillar.get']('zeek:enabled', True) %}
 
 # don't start the docker container if it is an import node or disabled via pillar
-{% if grains.id.split('_')|last == 'import' or ENABLED is sameas false %}
+{% if grains.id.split('_')|last == 'import' or not ENABLED %}
   {% do ZEEKOPTIONS.update({'start': False}) %}
   {% do ZEEKOPTIONS.update({'pl_cron_state': 'absent'}) %}
 {% else %}
@@ -10,7 +10,7 @@
   {% do ZEEKOPTIONS.update({'pl_cron_state': 'present'}) %}
 {% endif %}
 
-{% if ENABLED is sameas false %}
+{% if not ENABLED %}
   {% do ZEEKOPTIONS.update({'status': 'absent'}) %}
 {% else %}
   {% do ZEEKOPTIONS.update({'status': 'running'}) %}