Merge pull request #200 from tableau/development

Merging 2.2.1 changes into master

version_history.txt

@@ -2,6 +2,12 @@
 VERSION HISTORY
 ===============
 
+Version 2.2.1
+=================================
+-Fixed issue where mixed action flag values used with consolidate lines can cause no emails to send (Issue #198)
+-Fixed unsafe yaml.load call (Issue #195)
+=================================
+
 Version 2.2.0
 =================================
 -Refactor for Python 3 (Issue #111)

vizalert/vizalert.py

@@ -1641,8 +1641,16 @@ def get_unique_vizdata(self, action_type):
                     newitem[self.action_field_dict[action_field].field_name] = \
                         item[self.action_field_dict[action_field].field_name]
 
-            # add the new trimmed row to our list
-            preplist.append(newitem)
+            # add the new trimmed row to our list, filtering out inactionable fields
+            if action_type == EMAIL_ACTION_TYPE:
+                email_action_fieldname = self.action_field_dict[EMAIL_ACTION_FIELDKEY].field_name
+                if item[email_action_fieldname] == '1':
+                    preplist.append(newitem)
+
+            if action_type == SMS_ACTION_TYPE:
+                sms_action_fieldname = self.action_field_dict[SMS_ACTION_FIELDKEY].field_name
+                if item[sms_action_fieldname] == '1':
+                    preplist.append(newitem)
 
         log.logger.debug('Removing duplicates')
 

vizalerts.py

@@ -4,7 +4,7 @@
 
 __author__ = 'Matt Coles'
 __credits__ = 'Jonathan Drummey'
-__version__ = '2.2.0'
+__version__ = '2.2.1'
 
 # generic modules
 import logging