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

Jump to bottom

Updated Timesketch output module to work with upcoming version of Timesketch #3005

Merged
merged 4 commits into from
Jun 5, 2020
Merged

Updated Timesketch output module to work with upcoming version of Timesketch #3005

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8707f4
Minor bug fix in the TS output module.
kiddinn Jun 5, 2020
b25a3a0
Changing the approach
kiddinn Jun 5, 2020
97fb0a2
Comment change
kiddinn Jun 5, 2020
0e5c597
Forgot a :
kiddinn Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion plaso/output/timesketch_out.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@

try:
from flask import current_app
import timesketch
# TODO: Added for backwards compatibility with Timesketch installations.
# Remove once no longer needed.
try:
import timesketch.app as timesketch
except ImportError:
import timesketch
from timesketch.models import db_session as timesketch_db_session
from timesketch.models import sketch as timesketch_sketch
from timesketch.models import user as timesketch_user
Expand Down