Merge pull request #614 from acepace/bugfix/leak_info_when_sending_telem

Brute force fix for #613

monkey/infection_monkey/telemetry/base_telem.py

@@ -17,12 +17,16 @@ class BaseTelem(object, metaclass=abc.ABCMeta):
     def __init__(self):
         pass
 
-    def send(self):
+    def send(self, log_data=True):
         """
         Sends telemetry to island
         """
         data = self.get_data()
-        logger.debug("Sending {} telemetry. Data: {}".format(self.telem_category, json.dumps(data)))
+        if log_data:
+            data_to_log = json.dumps(data)
+        else:
+            data_to_log = 'redacted'
+        logger.debug("Sending {} telemetry. Data: {}".format(self.telem_category, data_to_log))
         ControlClient.send_telemetry(self.telem_category, data)
 
     @property

monkey/infection_monkey/telemetry/system_info_telem.py

@@ -17,3 +17,6 @@ class SystemInfoTelem(BaseTelem):
 
     def get_data(self):
         return self.system_info
+
+    def send(self, log_data=False):
+        super(SystemInfoTelem, self).send(log_data)