From 1afbe3dea51758a71936a55a51bdd80c7af0f1f1 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Tue, 28 Apr 2020 16:50:01 +0300
Subject: [PATCH 01/15] Improved ZT event aggregation performance

---
 .../monkey_island/cc/models/zero_trust/aggregate_finding.py   | 4 ++--
 monkey/monkey_island/cc/models/zero_trust/finding.py          | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/monkey/monkey_island/cc/models/zero_trust/aggregate_finding.py b/monkey/monkey_island/cc/models/zero_trust/aggregate_finding.py
index 38b551047..ff3c4e4d9 100644
--- a/monkey/monkey_island/cc/models/zero_trust/aggregate_finding.py
+++ b/monkey/monkey_island/cc/models/zero_trust/aggregate_finding.py
@@ -12,7 +12,7 @@ class AggregateFinding(Finding):
         :raises: Assertion error if this is used when there's more then one finding which fits the query - this is not
         when this function should be used.
         """
-        existing_findings = Finding.objects(test=test, status=status)
+        existing_findings = Finding.objects(test=test, status=status).exclude('events')
         assert (len(existing_findings) < 2), "More than one finding exists for {}:{}".format(test, status)
 
         if len(existing_findings) == 0:
@@ -20,7 +20,7 @@ class AggregateFinding(Finding):
         else:
             # Now we know for sure this is the only one
             orig_finding = existing_findings[0]
-            orig_finding.add_events(events)
+            orig_finding.update(push_all__events=events)
             orig_finding.save()
 
 
diff --git a/monkey/monkey_island/cc/models/zero_trust/finding.py b/monkey/monkey_island/cc/models/zero_trust/finding.py
index 90c9e1dc3..ae1114655 100644
--- a/monkey/monkey_island/cc/models/zero_trust/finding.py
+++ b/monkey/monkey_island/cc/models/zero_trust/finding.py
@@ -54,7 +54,3 @@ class Finding(Document):
         finding.save()
 
         return finding
-
-    def add_events(self, events):
-        # type: (list) -> None
-        self.events.extend(events)

From f73beac3a7ac3c85baf26237cf49f61587e7491e Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Thu, 30 Apr 2020 16:12:58 +0300
Subject: [PATCH 02/15] Implemented map/report generation tests which are based
 on telemetries rather than real exploitation

---
 envs/monkey_zoo/blackbox/test_blackbox.py     | 17 ++++++---
 .../map_generation_from_telemetries.py        | 31 ++++++++++++++++
 .../performance/performance_test_workflow.py  |  2 ++
 .../report_generation_from_telemetries.py     | 35 +++++++++++++++++++
 .../telemetry_performance_test_workflow.py    | 21 +++++++++++
 5 files changed, 102 insertions(+), 4 deletions(-)
 create mode 100644 envs/monkey_zoo/blackbox/tests/performance/map_generation_from_telemetries.py
 create mode 100644 envs/monkey_zoo/blackbox/tests/performance/report_generation_from_telemetries.py
 create mode 100644 envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test_workflow.py

diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py
index c0a7caf3d..35db89eb4 100644
--- a/envs/monkey_zoo/blackbox/test_blackbox.py
+++ b/envs/monkey_zoo/blackbox/test_blackbox.py
@@ -10,7 +10,10 @@ from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIs
 from envs.monkey_zoo.blackbox.log_handlers.test_logs_handler import TestLogsHandler
 from envs.monkey_zoo.blackbox.tests.exploitation import ExploitationTest
 from envs.monkey_zoo.blackbox.tests.performance.map_generation import MapGenerationTest
+from envs.monkey_zoo.blackbox.tests.performance.map_generation_from_telemetries import MapGenerationFromTelemetryTest
 from envs.monkey_zoo.blackbox.tests.performance.report_generation import ReportGenerationTest
+from envs.monkey_zoo.blackbox.tests.performance.report_generation_from_telemetries import \
+    ReportGenerationFromTelemetryTest
 from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test import TelemetryPerformanceTest
 from envs.monkey_zoo.blackbox.utils import gcp_machine_handlers
 
@@ -26,11 +29,11 @@ LOGGER = logging.getLogger(__name__)
 @pytest.fixture(autouse=True, scope='session')
 def GCPHandler(request):
     GCPHandler = gcp_machine_handlers.GCPHandler()
-    GCPHandler.start_machines(" ".join(GCP_TEST_MACHINE_LIST))
-    wait_machine_bootup()
+    #GCPHandler.start_machines(" ".join(GCP_TEST_MACHINE_LIST))
+    #wait_machine_bootup()
 
     def fin():
-        GCPHandler.stop_machines(" ".join(GCP_TEST_MACHINE_LIST))
+        #GCPHandler.stop_machines(" ".join(GCP_TEST_MACHINE_LIST))
         pass
 
     request.addfinalizer(fin)
@@ -49,7 +52,7 @@ def wait_machine_bootup():
 @pytest.fixture(scope='class')
 def island_client(island):
     island_client_object = MonkeyIslandClient(island)
-    island_client_object.reset_env()
+    # island_client_object.reset_env()
     yield island_client_object
 
 
@@ -147,5 +150,11 @@ class TestMonkeyBlackbox(object):
                                                 "PERFORMANCE.conf",
                                                 timeout_in_seconds=10*60)
 
+    def test_report_generation_from_fake_telemetries(self, island_client):
+        ReportGenerationFromTelemetryTest(island_client).run()
+
+    def test_map_generation_from_fake_telemetries(self, island_client):
+        MapGenerationFromTelemetryTest(island_client).run()
+
     def test_telem_performance(self, island_client):
         TelemetryPerformanceTest(island_client).test_telemetry_performance()
diff --git a/envs/monkey_zoo/blackbox/tests/performance/map_generation_from_telemetries.py b/envs/monkey_zoo/blackbox/tests/performance/map_generation_from_telemetries.py
new file mode 100644
index 000000000..c5344d8f7
--- /dev/null
+++ b/envs/monkey_zoo/blackbox/tests/performance/map_generation_from_telemetries.py
@@ -0,0 +1,31 @@
+from datetime import timedelta
+
+from envs.monkey_zoo.blackbox.tests.performance.performance_test import PerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test_workflow import \
+    TelemetryPerformanceTestWorkflow
+
+MAX_ALLOWED_SINGLE_PAGE_TIME = timedelta(seconds=2)
+MAX_ALLOWED_TOTAL_TIME = timedelta(seconds=5)
+
+MAP_RESOURCES = [
+    "api/netmap",
+]
+
+
+class MapGenerationFromTelemetryTest(PerformanceTest):
+
+    TEST_NAME = "Map generation from fake telemetries test"
+
+    def __init__(self, island_client, break_on_timeout=False):
+        self.island_client = island_client
+        performance_config = PerformanceTestConfig(max_allowed_single_page_time=MAX_ALLOWED_SINGLE_PAGE_TIME,
+                                                   max_allowed_total_time=MAX_ALLOWED_TOTAL_TIME,
+                                                   endpoints_to_test=MAP_RESOURCES,
+                                                   break_on_timeout=break_on_timeout)
+        self.performance_test_workflow = TelemetryPerformanceTestWorkflow(MapGenerationFromTelemetryTest.TEST_NAME,
+                                                                          self.island_client,
+                                                                          performance_config)
+
+    def run(self):
+        self.performance_test_workflow.run()
diff --git a/envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py b/envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py
index f6cd1dada..cdb4f08ac 100644
--- a/envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py
+++ b/envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py
@@ -25,6 +25,8 @@ class PerformanceTestWorkflow(BasicTest):
             self.exploitation_test.wait_for_monkey_process_to_finish()
         performance_test = EndpointPerformanceTest(self.name, self.performance_config, self.island_client)
         try:
+            if not self.island_client.is_all_monkeys_dead():
+                raise RuntimeError("Can't test report times since not all Monkeys have died.")
             assert performance_test.run()
         finally:
             self.exploitation_test.parse_logs()
diff --git a/envs/monkey_zoo/blackbox/tests/performance/report_generation_from_telemetries.py b/envs/monkey_zoo/blackbox/tests/performance/report_generation_from_telemetries.py
new file mode 100644
index 000000000..a08bbda70
--- /dev/null
+++ b/envs/monkey_zoo/blackbox/tests/performance/report_generation_from_telemetries.py
@@ -0,0 +1,35 @@
+from datetime import timedelta
+
+from envs.monkey_zoo.blackbox.tests.performance.performance_test import PerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test_workflow import \
+    TelemetryPerformanceTestWorkflow
+
+MAX_ALLOWED_SINGLE_PAGE_TIME = timedelta(seconds=2)
+MAX_ALLOWED_TOTAL_TIME = timedelta(seconds=5)
+
+REPORT_RESOURCES = [
+    "api/report/security",
+    "api/attack/report",
+    "api/report/zero_trust/findings",
+    "api/report/zero_trust/principles",
+    "api/report/zero_trust/pillars"
+]
+
+
+class ReportGenerationFromTelemetryTest(PerformanceTest):
+
+    TEST_NAME = "Map generation from fake telemetries test"
+
+    def __init__(self, island_client, break_on_timeout=False):
+        self.island_client = island_client
+        performance_config = PerformanceTestConfig(max_allowed_single_page_time=MAX_ALLOWED_SINGLE_PAGE_TIME,
+                                                   max_allowed_total_time=MAX_ALLOWED_TOTAL_TIME,
+                                                   endpoints_to_test=REPORT_RESOURCES,
+                                                   break_on_timeout=break_on_timeout)
+        self.performance_test_workflow = TelemetryPerformanceTestWorkflow(ReportGenerationFromTelemetryTest.TEST_NAME,
+                                                                          self.island_client,
+                                                                          performance_config)
+
+    def run(self):
+        self.performance_test_workflow.run()
diff --git a/envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test_workflow.py b/envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test_workflow.py
new file mode 100644
index 000000000..320973d97
--- /dev/null
+++ b/envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test_workflow.py
@@ -0,0 +1,21 @@
+from envs.monkey_zoo.blackbox.tests.basic_test import BasicTest
+from envs.monkey_zoo.blackbox.tests.performance.endpoint_performance_test import EndpointPerformanceTest
+from envs.monkey_zoo.blackbox.tests.performance.performance_test_config import PerformanceTestConfig
+from envs.monkey_zoo.blackbox.tests.performance.telemetry_performance_test import TelemetryPerformanceTest
+
+
+class TelemetryPerformanceTestWorkflow(BasicTest):
+
+    def __init__(self, name, island_client, performance_config: PerformanceTestConfig):
+        self.name = name
+        self.island_client = island_client
+        self.performance_config = performance_config
+
+    def run(self):
+        try:
+            # TelemetryPerformanceTest(island_client=self.island_client).test_telemetry_performance()
+            performance_test = EndpointPerformanceTest(self.name, self.performance_config, self.island_client)
+            assert performance_test.run()
+        finally:
+            pass
+            # self.island_client.reset_env()

From 8603d1887958015d39daeb3d02bd9b0271773beb Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Thu, 30 Apr 2020 16:14:31 +0300
Subject: [PATCH 03/15] Added a profiling decorator, that can be used on
 methods to get their performance info

---
 .../cc/testing/profiler_decorator.py          | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 monkey/monkey_island/cc/testing/profiler_decorator.py

diff --git a/monkey/monkey_island/cc/testing/profiler_decorator.py b/monkey/monkey_island/cc/testing/profiler_decorator.py
new file mode 100644
index 000000000..403548add
--- /dev/null
+++ b/monkey/monkey_island/cc/testing/profiler_decorator.py
@@ -0,0 +1,25 @@
+from cProfile import Profile
+import pstats
+
+
+def profile(sort_args=['cumulative'], print_args=[100]):
+    profiler = Profile()
+
+    def decorator(fn):
+        def inner(*args, **kwargs):
+            result = None
+            try:
+                result = profiler.runcall(fn, *args, **kwargs)
+            finally:
+                filename = _get_filename_for_function(fn)
+                with open(filename, 'w') as stream:
+                    stats = pstats.Stats(profiler, stream=stream)
+                    stats.strip_dirs().sort_stats(*sort_args).print_stats(*print_args)
+            return result
+        return inner
+    return decorator
+
+
+def _get_filename_for_function(fn):
+    function_name = fn.__module__ + "." + fn.__name__
+    return function_name.replace(".", "_")

From 4dcae80a648bd8249e4f72822156b2600b9f6e64 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Thu, 30 Apr 2020 16:17:54 +0300
Subject: [PATCH 04/15] Improved ZT report generation performance.

---
 .../cc/services/reporting/zero_trust_service.py          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
index dd6fad1bc..594aba703 100644
--- a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
+++ b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
@@ -9,13 +9,13 @@ class ZeroTrustService(object):
     @staticmethod
     def get_pillars_grades():
         pillars_grades = []
+        all_findings = Finding.objects().exclude('events')
         for pillar in zero_trust_consts.PILLARS:
-            pillars_grades.append(ZeroTrustService.__get_pillar_grade(pillar))
+            pillars_grades.append(ZeroTrustService.__get_pillar_grade(pillar, all_findings))
         return pillars_grades
 
     @staticmethod
-    def __get_pillar_grade(pillar):
-        all_findings = Finding.objects()
+    def __get_pillar_grade(pillar, all_findings):
         pillar_grade = {
             "pillar": pillar,
             zero_trust_consts.STATUS_FAILED: 0,
@@ -147,7 +147,8 @@ class ZeroTrustService(object):
 
     @staticmethod
     def __get_status_of_single_pillar(pillar):
-        grade = ZeroTrustService.__get_pillar_grade(pillar)
+        all_findings = Finding.objects().exclude('events')
+        grade = ZeroTrustService.__get_pillar_grade(pillar, all_findings)
         for status in zero_trust_consts.ORDERED_TEST_STATUSES:
             if grade[status] > 0:
                 return status

From 9be8d4af1bcd7bc3a047ffd6505c9a0fe2e7107b Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Thu, 30 Apr 2020 16:28:46 +0300
Subject: [PATCH 05/15] Fixed log paths for profiling decorator

---
 monkey/monkey_island/cc/testing/profiler_decorator.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/monkey/monkey_island/cc/testing/profiler_decorator.py b/monkey/monkey_island/cc/testing/profiler_decorator.py
index 403548add..dd08eec2e 100644
--- a/monkey/monkey_island/cc/testing/profiler_decorator.py
+++ b/monkey/monkey_island/cc/testing/profiler_decorator.py
@@ -1,6 +1,9 @@
 from cProfile import Profile
+import os
 import pstats
 
+PROFILER_LOG_DIR = "./profiler_logs/"
+
 
 def profile(sort_args=['cumulative'], print_args=[100]):
     profiler = Profile()
@@ -11,7 +14,11 @@ def profile(sort_args=['cumulative'], print_args=[100]):
             try:
                 result = profiler.runcall(fn, *args, **kwargs)
             finally:
-                filename = _get_filename_for_function(fn)
+                try:
+                    os.mkdir(PROFILER_LOG_DIR)
+                except os.error:
+                    pass
+                filename = PROFILER_LOG_DIR + _get_filename_for_function(fn)
                 with open(filename, 'w') as stream:
                     stats = pstats.Stats(profiler, stream=stream)
                     stats.strip_dirs().sort_stats(*sort_args).print_stats(*print_args)

From 7a13e71588be682c5147570572013dd88c58859d Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Thu, 30 Apr 2020 17:45:16 +0300
Subject: [PATCH 06/15] More simple ZT performance improvements and profiler
 decorator bugfix

---
 .../monkey_island/cc/services/reporting/zero_trust_service.py | 4 ++--
 monkey/monkey_island/cc/testing/profiler_decorator.py         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
index 594aba703..5a2045da5 100644
--- a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
+++ b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
@@ -65,7 +65,7 @@ class ZeroTrustService(object):
         worst_status = zero_trust_consts.STATUS_UNEXECUTED
         all_statuses = set()
         for test in principle_tests:
-            all_statuses |= set(Finding.objects(test=test).distinct("status"))
+            all_statuses |= set(Finding.objects(test=test).exclude('events').distinct("status"))
 
         for status in all_statuses:
             if zero_trust_consts.ORDERED_TEST_STATUSES.index(status) \
@@ -78,7 +78,7 @@ class ZeroTrustService(object):
     def __get_tests_status(principle_tests):
         results = []
         for test in principle_tests:
-            test_findings = Finding.objects(test=test)
+            test_findings = Finding.objects(test=test).exclude('events')
             results.append(
                 {
                     "test": zero_trust_consts.TESTS_MAP[test][zero_trust_consts.TEST_EXPLANATION_KEY],
diff --git a/monkey/monkey_island/cc/testing/profiler_decorator.py b/monkey/monkey_island/cc/testing/profiler_decorator.py
index dd08eec2e..997ef91ae 100644
--- a/monkey/monkey_island/cc/testing/profiler_decorator.py
+++ b/monkey/monkey_island/cc/testing/profiler_decorator.py
@@ -6,12 +6,12 @@ PROFILER_LOG_DIR = "./profiler_logs/"
 
 
 def profile(sort_args=['cumulative'], print_args=[100]):
-    profiler = Profile()
 
     def decorator(fn):
         def inner(*args, **kwargs):
             result = None
             try:
+                profiler = Profile()
                 result = profiler.runcall(fn, *args, **kwargs)
             finally:
                 try:

From 8a385eca9367dfc0b2c6aed6bdde527b2261fcb1 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Mon, 4 May 2020 16:47:17 +0300
Subject: [PATCH 07/15] Style fix for modal window and report tabs

---
 monkey/monkey_island/cc/ui/src/styles/report/ReportPage.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monkey/monkey_island/cc/ui/src/styles/report/ReportPage.scss b/monkey/monkey_island/cc/ui/src/styles/report/ReportPage.scss
index 4b1bd60c9..4429b4b6a 100644
--- a/monkey/monkey_island/cc/ui/src/styles/report/ReportPage.scss
+++ b/monkey/monkey_island/cc/ui/src/styles/report/ReportPage.scss
@@ -2,7 +2,7 @@
   margin-bottom: 2em !important;
   position: sticky;
   top: 0;
-  z-index: 1000000;
+  z-index: 1000;
   background-color: #ffffff;
   font-size: large;
 }

From 4073e2f41f1be98dfc92b43e18905f1a2bbf05c8 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Wed, 6 May 2020 16:50:17 +0300
Subject: [PATCH 08/15] Fixed zero trust bug where all events had the same
 timestamp

---
 monkey/monkey_island/cc/models/zero_trust/event.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/monkey/monkey_island/cc/models/zero_trust/event.py b/monkey/monkey_island/cc/models/zero_trust/event.py
index 89b581fa0..5ba909f28 100644
--- a/monkey/monkey_island/cc/models/zero_trust/event.py
+++ b/monkey/monkey_island/cc/models/zero_trust/event.py
@@ -23,7 +23,9 @@ class Event(EmbeddedDocument):
 
     # LOGIC
     @staticmethod
-    def create_event(title, message, event_type, timestamp=datetime.now()):
+    def create_event(title, message, event_type, timestamp=None):
+        if not timestamp:
+            timestamp = datetime.now()
         event = Event(
             timestamp=timestamp,
             title=title,

From 571682fff9cea192bd37cde04d63e3adb577cb43 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Wed, 6 May 2020 16:52:50 +0300
Subject: [PATCH 09/15] Refactored ZT events sending and display on report to
 improve performance and UX

---
 monkey/monkey_island/cc/app.py                |  2 +
 .../cc/resources/reporting/report.py          |  2 +
 .../cc/resources/zero_trust/finding_event.py  | 14 +++++
 .../reporting/test_zero_trust_service.py      |  7 +++
 .../services/reporting/zero_trust_service.py  | 59 ++++++++++++++-----
 .../zerotrust/EventsButton.js                 | 13 +++-
 .../zerotrust/EventsModal.js                  | 44 ++++++++++----
 .../zerotrust/EventsTimeline.js               |  2 +-
 .../zerotrust/FindingsTable.js                |  6 +-
 .../zerotrust/SkippedEventsTimeline.js        | 26 ++++++++
 monkey/monkey_island/linux/install_mongo.sh   |  3 -
 11 files changed, 145 insertions(+), 33 deletions(-)
 create mode 100644 monkey/monkey_island/cc/resources/zero_trust/finding_event.py
 create mode 100644 monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SkippedEventsTimeline.js

diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py
index 3a1134930..13aac018a 100644
--- a/monkey/monkey_island/cc/app.py
+++ b/monkey/monkey_island/cc/app.py
@@ -32,6 +32,7 @@ from monkey_island.cc.resources.pba_file_upload import FileUpload
 from monkey_island.cc.resources.attack.attack_config import AttackConfiguration
 from monkey_island.cc.resources.attack.attack_report import AttackReport
 from monkey_island.cc.resources.bootloader import Bootloader
+from monkey_island.cc.resources.zero_trust.finding_event import ZeroTrustFindingEvent
 from monkey_island.cc.services.database import Database
 from monkey_island.cc.services.remote_run_aws import RemoteRunAwsService
 from monkey_island.cc.services.representations import output_json
@@ -107,6 +108,7 @@ def init_api_resources(api):
         Report,
         '/api/report/<string:report_type>',
         '/api/report/<string:report_type>/<string:report_data>')
+    api.add_resource(ZeroTrustFindingEvent, '/api/zero-trust/finding-event/<string:finding_id>')
 
     api.add_resource(TelemetryFeed, '/api/telemetry-feed', '/api/telemetry-feed/')
     api.add_resource(Log, '/api/log', '/api/log/')
diff --git a/monkey/monkey_island/cc/resources/reporting/report.py b/monkey/monkey_island/cc/resources/reporting/report.py
index 961e745a8..6770512e6 100644
--- a/monkey/monkey_island/cc/resources/reporting/report.py
+++ b/monkey/monkey_island/cc/resources/reporting/report.py
@@ -6,6 +6,7 @@ from flask import jsonify
 from monkey_island.cc.auth import jwt_required
 from monkey_island.cc.services.reporting.report import ReportService
 from monkey_island.cc.services.reporting.zero_trust_service import ZeroTrustService
+from monkey_island.cc.testing.profiler_decorator import profile
 
 ZERO_TRUST_REPORT_TYPE = "zero_trust"
 SECURITY_REPORT_TYPE = "security"
@@ -21,6 +22,7 @@ __author__ = ["itay.mizeretz", "shay.nehmad"]
 class Report(flask_restful.Resource):
 
     @jwt_required()
+    @profile()
     def get(self, report_type=SECURITY_REPORT_TYPE, report_data=None):
         if report_type == SECURITY_REPORT_TYPE:
             return ReportService.get_report()
diff --git a/monkey/monkey_island/cc/resources/zero_trust/finding_event.py b/monkey/monkey_island/cc/resources/zero_trust/finding_event.py
new file mode 100644
index 000000000..73cfa7f4c
--- /dev/null
+++ b/monkey/monkey_island/cc/resources/zero_trust/finding_event.py
@@ -0,0 +1,14 @@
+import flask_restful
+import json
+
+from monkey_island.cc.auth import jwt_required
+from monkey_island.cc.services.reporting.zero_trust_service import ZeroTrustService
+from monkey_island.cc.testing.profiler_decorator import profile
+
+
+class ZeroTrustFindingEvent(flask_restful.Resource):
+
+    @jwt_required()
+    @profile()
+    def get(self, finding_id: str):
+        return {'events_json': json.dumps(ZeroTrustService.get_events_by_finding(finding_id), default=str)}
diff --git a/monkey/monkey_island/cc/services/reporting/test_zero_trust_service.py b/monkey/monkey_island/cc/services/reporting/test_zero_trust_service.py
index 328be2e00..403967d8f 100644
--- a/monkey/monkey_island/cc/services/reporting/test_zero_trust_service.py
+++ b/monkey/monkey_island/cc/services/reporting/test_zero_trust_service.py
@@ -1,6 +1,7 @@
 import common.data.zero_trust_consts as zero_trust_consts
 from monkey_island.cc.models.zero_trust.finding import Finding
 from monkey_island.cc.services.reporting.zero_trust_service import ZeroTrustService
+import monkey_island.cc.services.reporting.zero_trust_service
 from monkey_island.cc.testing.IslandTestCase import IslandTestCase
 
 EXPECTED_DICT = {
@@ -316,6 +317,12 @@ class TestZeroTrustService(IslandTestCase):
 
         self.assertEqual(ZeroTrustService.get_pillars_to_statuses(), expected)
 
+    def test_get_events_without_overlap(self):
+        monkey_island.cc.services.reporting.zero_trust_service.EVENT_FETCH_CNT = 5
+        self.assertListEqual([], ZeroTrustService._ZeroTrustService__get_events_without_overlap(5, [1, 2, 3]))
+        self.assertListEqual([3], ZeroTrustService._ZeroTrustService__get_events_without_overlap(6, [1, 2, 3]))
+        self.assertListEqual([1, 2, 3, 4, 5], ZeroTrustService._ZeroTrustService__get_events_without_overlap(10, [1, 2, 3, 4, 5]))
+
 
 def compare_lists_no_order(s, t):
     t = list(t)  # make a mutable copy
diff --git a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
index 5a2045da5..7ecac4e7f 100644
--- a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
+++ b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
@@ -1,9 +1,14 @@
-import json
+from typing import List
 
 import common.data.zero_trust_consts as zero_trust_consts
+from bson.objectid import ObjectId
 
 from monkey_island.cc.models.zero_trust.finding import Finding
 
+# How many events of a single finding to return to UI.
+# 50 will return 50 latest and 50 oldest events from a finding
+EVENT_FETCH_CNT = 50
+
 
 class ZeroTrustService(object):
     @staticmethod
@@ -104,25 +109,43 @@ class ZeroTrustService(object):
 
     @staticmethod
     def get_all_findings():
-        all_findings = Finding.objects()
+        pipeline = [{'$match': {}},
+                    {'$addFields': {'oldest_events': {'$slice': ['$events', EVENT_FETCH_CNT]},
+                                    'latest_events': {'$slice': ['$events', -1*EVENT_FETCH_CNT]},
+                                    'event_count': {'$size': '$events'}}},
+                    {'$unset': ['events']}]
+        all_findings = list(Finding.objects.aggregate(*pipeline))
+        for finding in all_findings:
+            finding['latest_events'] = ZeroTrustService.__get_events_without_overlap(finding['event_count'],
+                                                                                     finding['latest_events'])
+
         enriched_findings = [ZeroTrustService.__get_enriched_finding(f) for f in all_findings]
         return enriched_findings
 
     @staticmethod
-    def __get_enriched_finding(finding):
-        test_info = zero_trust_consts.TESTS_MAP[finding.test]
-        enriched_finding = {
-            "test": test_info[zero_trust_consts.FINDING_EXPLANATION_BY_STATUS_KEY][finding.status],
-            "test_key": finding.test,
-            "pillars": test_info[zero_trust_consts.PILLARS_KEY],
-            "status": finding.status,
-            "events": ZeroTrustService.__get_events_as_dict(finding.events)
-        }
-        return enriched_finding
+    def __get_events_without_overlap(event_count: int, events: List[object]) -> List[object]:
+        overlap_count = event_count - EVENT_FETCH_CNT
+        if overlap_count >= EVENT_FETCH_CNT:
+            return events
+        elif overlap_count <= 0:
+            return []
+        else:
+            return events[ -overlap_count :]
 
     @staticmethod
-    def __get_events_as_dict(events):
-        return [json.loads(event.to_json()) for event in events]
+    def __get_enriched_finding(finding):
+        test_info = zero_trust_consts.TESTS_MAP[finding['test']]
+        enriched_finding = {
+            'finding_id': str(finding['_id']),
+            'test': test_info[zero_trust_consts.FINDING_EXPLANATION_BY_STATUS_KEY][finding['status']],
+            'test_key': finding['test'],
+            'pillars': test_info[zero_trust_consts.PILLARS_KEY],
+            'status': finding['status'],
+            'latest_events': finding['latest_events'],
+            'oldest_events': finding['oldest_events'],
+            'event_count': finding['event_count']
+        }
+        return enriched_finding
 
     @staticmethod
     def get_statuses_to_pillars():
@@ -153,3 +176,11 @@ class ZeroTrustService(object):
             if grade[status] > 0:
                 return status
         return zero_trust_consts.STATUS_UNEXECUTED
+
+    @staticmethod
+    def get_events_by_finding(finding_id: str) -> List[object]:
+        pipeline = [{'$match': {'_id': ObjectId(finding_id)}},
+                    {'$unwind': '$events'},
+                    {'$project': {'events': '$events'}},
+                    {'$replaceRoot': {'newRoot': '$events'}}]
+        return list(Finding.objects.aggregate(*pipeline))
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js
index 08c83babd..94d92b27a 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js
@@ -24,7 +24,12 @@ export default class EventsButton extends Component {
 
   render() {
     return <Fragment>
-      <EventsModal events={this.props.events} showEvents={this.state.isShow} hideCallback={this.hide}
+      <EventsModal finding_id={this.props.finding_id}
+                   latest_events={this.props.latest_events}
+                   oldest_events={this.props.oldest_events}
+                   event_count={this.props.event_count}
+                   showEvents={this.state.isShow}
+                   hideCallback={this.hide}
                    exportFilename={this.props.exportFilename}/>
       <div className="text-center" style={{'display': 'grid'}}>
         <Button className="btn btn-primary btn-lg" onClick={this.show}>
@@ -35,12 +40,14 @@ export default class EventsButton extends Component {
   }
 
   createEventsAmountBadge() {
-    const eventsAmountBadgeContent = this.props.events.length > 9 ? '9+' : this.props.events.length;
+    const eventsAmountBadgeContent = this.props.event_count > 9 ? '9+' : this.props.event_count;
     return <Badge>{eventsAmountBadgeContent}</Badge>;
   }
 }
 
 EventsButton.propTypes = {
-  events: PropTypes.array,
+  latest_events: PropTypes.array,
+  oldest_events: PropTypes.array,
+  event_count: PropTypes.number,
   exportFilename: PropTypes.string
 };
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
index 6ee69c717..4d31816b0 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
@@ -1,13 +1,17 @@
 import React, {Component} from 'react';
-import {Badge, Modal} from 'react-bootstrap';
+import {Modal} from 'react-bootstrap';
 import EventsTimeline from './EventsTimeline';
 import * as PropTypes from 'prop-types';
 import saveJsonToFile from '../../utils/SaveJsonToFile';
 import EventsModalButtons from './EventsModalButtons';
-import Pluralize from 'pluralize'
-import {statusToLabelType} from './StatusLabel';
+import AuthComponent from '../../AuthComponent';
+import Pluralize from 'pluralize';
+import SkippedEventsTimeline from "./SkippedEventsTimeline";
 
-export default class EventsModal extends Component {
+const FINDING_EVENTS_URL = '/api/zero-trust/finding-event/';
+
+
+export default class EventsModal extends AuthComponent {
   constructor(props) {
     super(props);
   }
@@ -22,12 +26,20 @@ export default class EventsModal extends Component {
             </h3>
             <hr/>
             <p>
-              There {Pluralize('is', this.props.events.length)} {<div
-              className={'label label-primary'}>{this.props.events.length}</div>} {Pluralize('event', this.props.events.length)} associated
+              There {Pluralize('is', this.props.event_count)} {<div
+              className={'label label-primary'}>{this.props.event_count}</div>}
+              {Pluralize('event', this.props.event_count)} associated
               with this finding.
+              {<div className={'label label-primary'}>
+                {this.props.latest_events.length + this.props.oldest_events.length}
+              </div>} {Pluralize('is', this.props.event_count)} displayed below.
+              All events can be exported to json.
             </p>
-            {this.props.events.length > 5 ? this.renderButtons() : null}
-            <EventsTimeline events={this.props.events}/>
+            {this.props.event_count > 5 ? this.renderButtons() : null}
+            <EventsTimeline events={this.props.oldest_events}/>
+            {this.props.event_count > this.props.latest_events.length+this.props.oldest_events.length ?
+              this.renderSkippedEventsTimeline() : null}
+            <EventsTimeline events={this.props.latest_events}/>
             {this.renderButtons()}
           </Modal.Body>
         </Modal>
@@ -35,13 +47,23 @@ export default class EventsModal extends Component {
     );
   }
 
+  renderSkippedEventsTimeline(){
+    return <div className={'skipped-events-timeline'}>
+      <SkippedEventsTimeline
+              skipped_count={this.props.event_count - this.props.latest_events.length+this.props.oldest_events.length}/>
+    </div>
+  }
+
   renderButtons() {
     return <EventsModalButtons
       onClickClose={() => this.props.hideCallback()}
       onClickExport={() => {
-        const dataToSave = this.props.events;
-        const filename = this.props.exportFilename;
-        saveJsonToFile(dataToSave, filename);
+        let full_url = FINDING_EVENTS_URL + this.props.finding_id;
+        this.authFetch(full_url).then(res => res.json()).then(res => {
+          const dataToSave = res.events_json;
+          const filename = this.props.exportFilename;
+          saveJsonToFile(dataToSave, filename);
+        });
       }}/>;
   }
 }
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js
index 04b10f333..d6ef04b1b 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js
@@ -17,7 +17,7 @@ export default class EventsTimeline extends Component {
         <Timeline style={{fontSize: '100%'}}>
           {
             this.props.events.map((event, index) => {
-              const event_time = new Date(event.timestamp['$date']).toString();
+              const event_time = new Date(event.timestamp).toString();
               return (<TimelineEvent
                 key={index}
                 createdAt={event_time}
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
index 50a5c2914..3e87e1062 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
@@ -18,7 +18,11 @@ const columns = [
       {
         Header: 'Events', id: 'events',
         accessor: x => {
-          return <EventsButton events={x.events} exportFilename={'Events_' + x.test_key}/>;
+          return <EventsButton finding_id={x.finding_id}
+                               latest_events={x.latest_events}
+                               oldest_events={x.oldest_events}
+                               event_count={x.event_count}
+                               exportFilename={'Events_' + x.test_key}/>;
         },
         maxWidth: EVENTS_COLUMN_MAX_WIDTH
       },
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SkippedEventsTimeline.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SkippedEventsTimeline.js
new file mode 100644
index 000000000..3b38554ef
--- /dev/null
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SkippedEventsTimeline.js
@@ -0,0 +1,26 @@
+import React, {Component} from 'react';
+import {Timeline, TimelineEvent} from 'react-event-timeline';
+import { faArrowsAltV } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import * as PropTypes from 'prop-types';
+
+
+export default class SkippedEventsTimeline extends Component {
+
+  render() {
+    return (
+      <div>
+        <Timeline style={{fontSize: '100%'}}>
+          <TimelineEvent
+            bubbleStyle={{border: '2px solid #ffcc00'}}
+            title='Events in between are not displayed, but can be exported to JSON.'
+            icon={<FontAwesomeIcon className={'timeline-event-icon'} icon={faArrowsAltV}/>} >
+            {this.props.skipped_count} events not displayed.
+          </TimelineEvent>
+        </Timeline>
+      </div>
+    );
+  }
+}
+
+SkippedEventsTimeline.propTypes = {skipped_count: PropTypes.number};
diff --git a/monkey/monkey_island/linux/install_mongo.sh b/monkey/monkey_island/linux/install_mongo.sh
index 36203b298..7435e35b5 100755
--- a/monkey/monkey_island/linux/install_mongo.sh
+++ b/monkey/monkey_island/linux/install_mongo.sh
@@ -17,9 +17,6 @@ elif [[ ${os_version_monkey} == "Ubuntu 18.04"* ]]; then
 elif [[ ${os_version_monkey} == "Ubuntu 19.10"* ]]; then
   echo Detected Ubuntu 19.10
   export tgz_url="https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.2.3.tgz"
-elif [[ ${os_version_monkey} == "Debian GNU/Linux 8"* ]]; then
-  echo Detected Debian 8
-  export tgz_url="https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-debian81-4.0.16.tgz"
 elif [[ ${os_version_monkey} == "Debian GNU/Linux 9"* ]]; then
   echo Detected Debian 9
   export tgz_url="https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-debian92-4.2.3.tgz"

From 9b350b8bf58884b27ff17752056c4a30afd328fa Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Mon, 11 May 2020 17:58:58 +0300
Subject: [PATCH 10/15] Minor fixes and improvements

---
 .../tests/performance/telemetry_performance_test_workflow.py | 5 ++---
 monkey/monkey_island/cc/resources/reporting/report.py        | 2 --
 .../monkey_island/cc/resources/zero_trust/finding_event.py   | 2 --
 .../cc/services/reporting/zero_trust_service.py              | 5 ++---
 .../components/report-components/zerotrust/EventsModal.js    | 4 ++--
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test_workflow.py b/envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test_workflow.py
index 320973d97..b5acf4a9e 100644
--- a/envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test_workflow.py
+++ b/envs/monkey_zoo/blackbox/tests/performance/telemetry_performance_test_workflow.py
@@ -13,9 +13,8 @@ class TelemetryPerformanceTestWorkflow(BasicTest):
 
     def run(self):
         try:
-            # TelemetryPerformanceTest(island_client=self.island_client).test_telemetry_performance()
+            TelemetryPerformanceTest(island_client=self.island_client).test_telemetry_performance()
             performance_test = EndpointPerformanceTest(self.name, self.performance_config, self.island_client)
             assert performance_test.run()
         finally:
-            pass
-            # self.island_client.reset_env()
+            self.island_client.reset_env()
diff --git a/monkey/monkey_island/cc/resources/reporting/report.py b/monkey/monkey_island/cc/resources/reporting/report.py
index 6770512e6..961e745a8 100644
--- a/monkey/monkey_island/cc/resources/reporting/report.py
+++ b/monkey/monkey_island/cc/resources/reporting/report.py
@@ -6,7 +6,6 @@ from flask import jsonify
 from monkey_island.cc.auth import jwt_required
 from monkey_island.cc.services.reporting.report import ReportService
 from monkey_island.cc.services.reporting.zero_trust_service import ZeroTrustService
-from monkey_island.cc.testing.profiler_decorator import profile
 
 ZERO_TRUST_REPORT_TYPE = "zero_trust"
 SECURITY_REPORT_TYPE = "security"
@@ -22,7 +21,6 @@ __author__ = ["itay.mizeretz", "shay.nehmad"]
 class Report(flask_restful.Resource):
 
     @jwt_required()
-    @profile()
     def get(self, report_type=SECURITY_REPORT_TYPE, report_data=None):
         if report_type == SECURITY_REPORT_TYPE:
             return ReportService.get_report()
diff --git a/monkey/monkey_island/cc/resources/zero_trust/finding_event.py b/monkey/monkey_island/cc/resources/zero_trust/finding_event.py
index 73cfa7f4c..16c545241 100644
--- a/monkey/monkey_island/cc/resources/zero_trust/finding_event.py
+++ b/monkey/monkey_island/cc/resources/zero_trust/finding_event.py
@@ -3,12 +3,10 @@ import json
 
 from monkey_island.cc.auth import jwt_required
 from monkey_island.cc.services.reporting.zero_trust_service import ZeroTrustService
-from monkey_island.cc.testing.profiler_decorator import profile
 
 
 class ZeroTrustFindingEvent(flask_restful.Resource):
 
     @jwt_required()
-    @profile()
     def get(self, finding_id: str):
         return {'events_json': json.dumps(ZeroTrustService.get_events_by_finding(finding_id), default=str)}
diff --git a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
index 7ecac4e7f..821d2104a 100644
--- a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
+++ b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
@@ -109,8 +109,7 @@ class ZeroTrustService(object):
 
     @staticmethod
     def get_all_findings():
-        pipeline = [{'$match': {}},
-                    {'$addFields': {'oldest_events': {'$slice': ['$events', EVENT_FETCH_CNT]},
+        pipeline = [{'$addFields': {'oldest_events': {'$slice': ['$events', EVENT_FETCH_CNT]},
                                     'latest_events': {'$slice': ['$events', -1*EVENT_FETCH_CNT]},
                                     'event_count': {'$size': '$events'}}},
                     {'$unset': ['events']}]
@@ -130,7 +129,7 @@ class ZeroTrustService(object):
         elif overlap_count <= 0:
             return []
         else:
-            return events[ -overlap_count :]
+            return events[-1 * overlap_count:]
 
     @staticmethod
     def __get_enriched_finding(finding):
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
index 4d31816b0..4ddfdf93c 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React from 'react';
 import {Modal} from 'react-bootstrap';
 import EventsTimeline from './EventsTimeline';
 import * as PropTypes from 'prop-types';
@@ -6,7 +6,7 @@ import saveJsonToFile from '../../utils/SaveJsonToFile';
 import EventsModalButtons from './EventsModalButtons';
 import AuthComponent from '../../AuthComponent';
 import Pluralize from 'pluralize';
-import SkippedEventsTimeline from "./SkippedEventsTimeline";
+import SkippedEventsTimeline from './SkippedEventsTimeline';
 
 const FINDING_EVENTS_URL = '/api/zero-trust/finding-event/';
 

From 2debe9805244b5078c0b1e7a48fc2a98b04fe367 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Tue, 12 May 2020 12:43:41 +0300
Subject: [PATCH 11/15] Profiling decorator: added readme and profiler logs
 added to gitignore

---
 .gitignore                                | 3 +++
 monkey/monkey_island/cc/testing/README.md | 9 +++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 monkey/monkey_island/cc/testing/README.md

diff --git a/.gitignore b/.gitignore
index a10127767..3b602d4aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,5 +85,8 @@ MonkeyZoo/*
 # Exported monkey telemetries
 /monkey/telem_sample/
 
+# Profiling logs
+/monkey/profiler_logs/
+
 # vim swap files
 *.swp
diff --git a/monkey/monkey_island/cc/testing/README.md b/monkey/monkey_island/cc/testing/README.md
new file mode 100644
index 000000000..1c1446b2f
--- /dev/null
+++ b/monkey/monkey_island/cc/testing/README.md
@@ -0,0 +1,9 @@
+# Profiling island
+
+To profile specific methods on island a `@profile(sort_args=['cumulative'], print_args=[100])` 
+decorator can be used. 
+Use it as any other decorator. After decorated method is used, a file will appear in a
+directory provided in `profiler_decorator.py`. Filename describes the path of
+the method that was profiled. For example if method `monkey_island/cc/resources/netmap.get`
+was profiled, then the results of this profiling will appear in 
+`monkey_island_cc_resources_netmap_get`.

From ee6b122f0181fa4986031c56b2d86a7833044037 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Tue, 12 May 2020 15:45:51 +0300
Subject: [PATCH 12/15] Minor improvements

---
 .../monkey_island/cc/models/zero_trust/aggregate_finding.py | 3 +--
 monkey/monkey_island/cc/models/zero_trust/finding.py        | 4 ++++
 .../cc/services/reporting/test_zero_trust_service.py        | 6 +++---
 .../cc/services/reporting/zero_trust_service.py             | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/monkey/monkey_island/cc/models/zero_trust/aggregate_finding.py b/monkey/monkey_island/cc/models/zero_trust/aggregate_finding.py
index ff3c4e4d9..c3817313f 100644
--- a/monkey/monkey_island/cc/models/zero_trust/aggregate_finding.py
+++ b/monkey/monkey_island/cc/models/zero_trust/aggregate_finding.py
@@ -20,8 +20,7 @@ class AggregateFinding(Finding):
         else:
             # Now we know for sure this is the only one
             orig_finding = existing_findings[0]
-            orig_finding.update(push_all__events=events)
-            orig_finding.save()
+            orig_finding.add_events(events)
 
 
 def add_malicious_activity_to_timeline(events):
diff --git a/monkey/monkey_island/cc/models/zero_trust/finding.py b/monkey/monkey_island/cc/models/zero_trust/finding.py
index ae1114655..2f3261ec4 100644
--- a/monkey/monkey_island/cc/models/zero_trust/finding.py
+++ b/monkey/monkey_island/cc/models/zero_trust/finding.py
@@ -2,6 +2,7 @@
 """
 Define a Document Schema for Zero Trust findings.
 """
+from typing import List
 
 from mongoengine import Document, StringField, EmbeddedDocumentListField
 
@@ -54,3 +55,6 @@ class Finding(Document):
         finding.save()
 
         return finding
+
+    def add_events(self, events: List) -> None:
+        self.update(push_all__events=events)
diff --git a/monkey/monkey_island/cc/services/reporting/test_zero_trust_service.py b/monkey/monkey_island/cc/services/reporting/test_zero_trust_service.py
index 403967d8f..e40af29f4 100644
--- a/monkey/monkey_island/cc/services/reporting/test_zero_trust_service.py
+++ b/monkey/monkey_island/cc/services/reporting/test_zero_trust_service.py
@@ -319,9 +319,9 @@ class TestZeroTrustService(IslandTestCase):
 
     def test_get_events_without_overlap(self):
         monkey_island.cc.services.reporting.zero_trust_service.EVENT_FETCH_CNT = 5
-        self.assertListEqual([], ZeroTrustService._ZeroTrustService__get_events_without_overlap(5, [1, 2, 3]))
-        self.assertListEqual([3], ZeroTrustService._ZeroTrustService__get_events_without_overlap(6, [1, 2, 3]))
-        self.assertListEqual([1, 2, 3, 4, 5], ZeroTrustService._ZeroTrustService__get_events_without_overlap(10, [1, 2, 3, 4, 5]))
+        self.assertListEqual([], ZeroTrustService._get_events_without_overlap(5, [1, 2, 3]))
+        self.assertListEqual([3], ZeroTrustService._get_events_without_overlap(6, [1, 2, 3]))
+        self.assertListEqual([1, 2, 3, 4, 5], ZeroTrustService._get_events_without_overlap(10, [1, 2, 3, 4, 5]))
 
 
 def compare_lists_no_order(s, t):
diff --git a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
index 821d2104a..ee8fdd8bb 100644
--- a/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
+++ b/monkey/monkey_island/cc/services/reporting/zero_trust_service.py
@@ -115,14 +115,14 @@ class ZeroTrustService(object):
                     {'$unset': ['events']}]
         all_findings = list(Finding.objects.aggregate(*pipeline))
         for finding in all_findings:
-            finding['latest_events'] = ZeroTrustService.__get_events_without_overlap(finding['event_count'],
-                                                                                     finding['latest_events'])
+            finding['latest_events'] = ZeroTrustService._get_events_without_overlap(finding['event_count'],
+                                                                                    finding['latest_events'])
 
         enriched_findings = [ZeroTrustService.__get_enriched_finding(f) for f in all_findings]
         return enriched_findings
 
     @staticmethod
-    def __get_events_without_overlap(event_count: int, events: List[object]) -> List[object]:
+    def _get_events_without_overlap(event_count: int, events: List[object]) -> List[object]:
         overlap_count = event_count - EVENT_FETCH_CNT
         if overlap_count >= EVENT_FETCH_CNT:
             return events

From 0e4242b15a45b8a30b2e1e9355417f93ef5ea3ef Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Tue, 12 May 2020 17:08:26 +0300
Subject: [PATCH 13/15] Gitignore changed to ignore all "profiler_logs" dirs

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3b602d4aa..960e8c67c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,7 +86,7 @@ MonkeyZoo/*
 /monkey/telem_sample/
 
 # Profiling logs
-/monkey/profiler_logs/
+profiler_logs/
 
 # vim swap files
 *.swp

From a8e94a90f9bbdce7d72a53f62634c8d50e987cf2 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Wed, 13 May 2020 11:11:07 +0300
Subject: [PATCH 14/15] Added fixtures to skip tests failing due to mongoengine

---
 .../cc/models/zero_trust/test_aggregate_finding.py     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/monkey/monkey_island/cc/models/zero_trust/test_aggregate_finding.py b/monkey/monkey_island/cc/models/zero_trust/test_aggregate_finding.py
index ce28ad7f7..b817f6e92 100644
--- a/monkey/monkey_island/cc/models/zero_trust/test_aggregate_finding.py
+++ b/monkey/monkey_island/cc/models/zero_trust/test_aggregate_finding.py
@@ -1,3 +1,8 @@
+import unittest
+from packaging import version
+
+import mongomock
+
 import common.data.zero_trust_consts as zero_trust_consts
 from monkey_island.cc.models.zero_trust.aggregate_finding import AggregateFinding
 from monkey_island.cc.models.zero_trust.event import Event
@@ -6,6 +11,9 @@ from monkey_island.cc.testing.IslandTestCase import IslandTestCase
 
 
 class TestAggregateFinding(IslandTestCase):
+
+    @unittest.skipIf(version.parse(mongomock.__version__) <= version.parse("3.19.0"),
+                     "mongomock version doesn't support this test")
     def test_create_or_add_to_existing(self):
         self.fail_if_not_testing_env()
         self.clean_finding_db()
@@ -25,6 +33,8 @@ class TestAggregateFinding(IslandTestCase):
         self.assertEqual(len(Finding.objects(test=test, status=status)), 1)
         self.assertEqual(len(Finding.objects(test=test, status=status)[0].events), 2)
 
+    @unittest.skipIf(version.parse(mongomock.__version__) <= version.parse("3.19.0"),
+                     "mongomock version doesn't support this test")
     def test_create_or_add_to_existing_2_tests_already_exist(self):
         self.fail_if_not_testing_env()
         self.clean_finding_db()

From 44cb87a2c9120a8d578993748224eb75a7a76d92 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Wed, 20 May 2020 13:32:00 +0300
Subject: [PATCH 15/15] Minor js readability improvement

---
 .../src/components/report-components/zerotrust/EventsModal.js  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
index 4ddfdf93c..b7f3f9139 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
@@ -50,7 +50,8 @@ export default class EventsModal extends AuthComponent {
   renderSkippedEventsTimeline(){
     return <div className={'skipped-events-timeline'}>
       <SkippedEventsTimeline
-              skipped_count={this.props.event_count - this.props.latest_events.length+this.props.oldest_events.length}/>
+              skipped_count={this.props.event_count -
+                             this.props.latest_events.length + this.props.oldest_events.length}/>
     </div>
   }