Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update TimesketchSearchEventCollector to use the new TimesketchEvents container #955

Merged
merged 7 commits into from
Jan 16, 2025
Merged

Update TimesketchSearchEventCollector to use the new TimesketchEvents container #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6d3f14a
Add TimesketchEvents to containers.py
itsmvd Jan 14, 2025
a509f2a
Merge pull request #1 from itsmvd/itsmvd-dfiq-llm
itsmvd Jan 14, 2025
460fd46
Update containers.py
itsmvd Jan 14, 2025
811f025
Update containers.py
itsmvd Jan 14, 2025
9ae52ab
Update containers.py
itsmvd Jan 14, 2025
2990c49
Merge branch 'log2timeline:main' into main
itsmvd Jan 16, 2025
68c1052
Update TimesketchSearchEventCollector to use the new TimesketchEvents…
itsmvd Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions dftimewolf/lib/collectors/timesketch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,13 @@ def _OutputSearchResults(self, data_frame: pd.DataFrame) -> None:

if self.output_format == 'pandas':
self.StoreContainer(
containers.DataFrame(
containers.TimesketchEvents(
name=self.search_name,
description=self.search_description,
data_frame=data_frame))
data_frame=data_frame,
query=self.query_string,
sketch_id=self.sketch_id
))
else:
with tempfile.NamedTemporaryFile(
mode='w',
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/collectors/timesketch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def testProcessPandas(self, mock_get_search_results, _mock_get_api_client):
token_password='test_token')
self._ProcessModule()

state_containers = self._module.GetContainers(containers.DataFrame)
state_containers = self._module.GetContainers(containers.TimesketchEvents)
self.assertEqual(len(state_containers), 1)
pd.testing.assert_frame_equal(
state_containers[0].data_frame, pd.DataFrame([1, 2]))
Expand Down
Loading