Skip to content

Update mailer.py with some improvements #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update mailer.py with some improvements #415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cdcb8c
Update mailer.py with some improvements
ShadowJonathan Jun 23, 2025
23058af
Update mailer.py with more changes
ShadowJonathan Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions integrations/mailer/mailer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ def on_message(self, body, message):
pass
message.ack()
else:

on_hold[alertid] = (alert, time.time() + HOLD_TIME)
message.ack()
else:
Expand All @@ -170,7 +171,6 @@ def __init__(self):
self._subject_template = jinja2.Template(OPTIONS['mail_subject'])
self._template_env = jinja2.Environment(
loader=jinja2.FileSystemLoader(self._template_dir),
extensions=['jinja2.ext.autoescape'],
autoescape=True
)
if OPTIONS['mail_template_html']:
Expand All @@ -185,6 +185,7 @@ def run(self):
keep_alive = 0

while not self.should_stop:
LOG.debug("running mailsender loop")
for alertid in list(on_hold.keys()):
try:
(alert, hold_time) = on_hold[alertid]
Expand All @@ -196,6 +197,8 @@ def run(self):
del on_hold[alertid]
except KeyError:
continue
else:
LOG.info(f"not sending {alert.get_id()} due to hold time (expires in {hold_time - time.time()} seconds)")

if keep_alive >= 10:
try:
Expand All @@ -214,16 +217,16 @@ def _rule_matches(self, regex, value):
its provided value considering its type
'''
if isinstance(value, list):
LOG.debug('%s is a list, at least one item must match %s',
LOG.debug('%r is a list, at least one item must match %r',
value, regex)
for item in value:
if re.match(regex, item) is not None:
LOG.debug('Regex %s matches item %s', regex, item)
LOG.debug('Regex %r matches item %r', regex, item)
return True
LOG.debug('Regex %s matches nothing', regex)
LOG.debug('Regex %r matches nothing', regex)
return False
elif isinstance(value, str): # pylint: disable=undefined-variable
LOG.debug('Trying to match %s to %s',
LOG.debug('Trying to match %r to %r',
value, regex)
return re.search(regex, value) is not None
LOG.warning('Field type is not supported')
Expand All @@ -249,24 +252,30 @@ def send_email(self, alert):
field['field'])
break
if self._rule_matches(field['regex'], value):
LOG.debug("rule %r matches", field)
is_matching = True
else:
LOG.debug("rule %r does not match", field)
is_matching = False
break
if is_matching:
# Add up any new contacts
new_contacts = [x.strip() for x in rule['contacts']
rule_contacts = [x.strip() for x in rule['contacts']]
new_contacts = [c for c in rule_contacts
if x.strip() not in contacts]
if len(new_contacts) > 0:
if not rule.get('exclude', False):

exclude = rule.get('exclude', False)
if not exclude:
if len(new_contacts) > 0:
LOG.debug('Extending contact to include %s' % (
new_contacts))
contacts.extend(new_contacts)
else:
LOG.info('Clearing initial list of contacts and'
' adding for this rule only')
del contacts[:]
contacts.extend(new_contacts)
else:
LOG.info('Clearing initial list of contacts and'
' adding for this rule only')
del contacts[:]
contacts.extend(rule_contacts)
break

# Don't loose time (and try to send an email) if there is no contact...
if not contacts:
Expand Down Expand Up @@ -518,14 +527,18 @@ def main():
# Registering action for SIGTERM signal handling
signal.signal(signal.SIGTERM, on_sigterm)

def re_raise(args):
import traceback
traceback.print_exception(args.exc_value, tb=args.exc_traceback)
sys.exit(1)

threading.excepthook = re_raise

try:
mailer = MailSender()
mailer.start()
except (SystemExit, KeyboardInterrupt):
sys.exit(0)
except Exception as e:
print(str(e))
sys.exit(1)

from kombu.utils.debug import setup_logging
loginfo = 'DEBUG' if OPTIONS['debug'] else 'INFO'
Expand All @@ -539,9 +552,6 @@ def main():
mailer.should_stop = True
mailer.join()
sys.exit(0)
except Exception as e:
print(str(e))
sys.exit(1)


if __name__ == '__main__':
Expand Down