CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

more changes for healthcheck - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/90

Browse Source
This commit is contained in:
m0duspwnens
2020-03-26 15:45:19 -04:00
parent 22127a3d58
commit c14f32fcc9
4 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
salt/_modules/healthcheck.py
View File

@@ -7,14 +7,20 @@ allowed_functions = ['zeek']
states_to_apply = []
def apply_states():
def apply_states(states=''):
if states_to_apply:
calling_func = sys._getframe().f_back.f_code.co_name
logging.debug('healthcheck module: apply_states function caller: %s' % calling_func)
if not states:
states = ','.join(states_to_apply)
if states:
logging.info('healthcheck module: apply_states states: %s' % str(states))
__salt__['state.apply'](states)
def docker_restart(container, state):
def docker_restart(container):
try:
stopdocker = __salt__['docker.rm'](container, 'stop=True')
@@ -22,27 +28,40 @@ def docker_restart(container, state):
logging.error('healthcheck module: %s' % e)
def run(checks):
def run(checks=''):
retval = []
calling_func = sys._getframe().f_back.f_code.co_name
logging.debug('healthcheck module: run function caller: %s' % calling_func)
if checks:
checks = checks.split(',')
else:
checks = __salt__['pillar.get']('healthcheck:checks', {})
logging.debug('healthcheck module: run checks to be run: %s' % str(checks))
for check in checks:
if check in allowed_functions:
retval.append(check)
check = getattr(sys.modules[__name__], check)
check()
else:
logging.warning('healthcheck module: attempted to run function %s' % check)
# If you want to apply states at the end of the run,
# be sure to append the state name to states_to_apply[]
apply_states()
return checks
return retval
def zeek():
calling_func = sys._getframe().f_back.f_code.co_name
logging.debug('healthcheck module: zeek function caller: %s' % calling_func)
retcode = __salt__['zeekctl.status'](verbose=False)
logging.info('zeekctl.status retcode: %i' % retcode)
logging.debug('zeekctl.status retcode: %i' % retcode)
if retcode:
docker_restart('so-zeek')
states_to_apply.append('zeek')
@@ -50,7 +69,8 @@ def zeek():
else:
zeek_restarted = False
if calling_func == 'execute':
apply_states()
__salt__['telegraf.send']('healthcheck zeek_restarted=%s' % str(zeek_restarted))
return 'zeek_restarted: %s' % str(zeek_restarted)
apply_states()