Merge branch 'v2-notifications-conditions' into v2

This commit is contained in:
JonnyWong16 2017-07-07 18:09:34 -07:00
commit 8348424758
11 changed files with 669 additions and 1023 deletions

View file

@ -529,6 +529,8 @@ def set_notifier_config(notifier_id=None, agent_id=None, **kwargs):
'agent_label': agent['label'],
'friendly_name': kwargs.get('friendly_name', ''),
'notifier_config': json.dumps(notifier_config),
'custom_conditions': kwargs.get('custom_conditions', ''),
'custom_conditions_logic': kwargs.get('custom_conditions_logic', ''),
}
values.update(actions)
values.update(subject_text)