Merge remote-tracking branch 'upstream/develop' into attack_report

monkey/infection_monkey/post_breach/pba.py

@@ -1,5 +1,6 @@
 import logging
 import subprocess
+import socket
 from infection_monkey.control import ControlClient
 from infection_monkey.utils import is_windows_os
 from infection_monkey.config import WormConfiguration
@@ -44,9 +45,12 @@ class PBA(object):
         """
         exec_funct = self._execute_default
         result = exec_funct()
+        hostname = socket.gethostname()
         ControlClient.send_telemetry('post_breach', {'command': self.command,
                                                      'result': result,
-                                                     'name': self.name})
+                                                     'name': self.name,
+                                                     'hostname': hostname,
+                                                     'ip': socket.gethostbyname(hostname)})
 
     def _execute_default(self):
         """