Skip to content

Changes for APM support #5179

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

Merged
joachimmetz merged 1 commit into from
Jul 20, 2026
Merged

Changes for APM support #5179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion config/dpkg/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ plaso (20260720-1) unstable; urgency=low

* Auto-generated

-- Log2Timeline maintainers <log2timeline-maintainers@googlegroups.com> Mon, 20 Jul 2026 05:58:31 +0200
-- Log2Timeline maintainers <log2timeline-maintainers@googlegroups.com> Mon, 20 Jul 2026 09:23:43 +0200
6 changes: 2 additions & 4 deletions plaso/cli/helpers/opensearch_ts_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def AddArguments(cls, argument_group):
default=cls._DEFAULT_TIMELINE_IDENTIFIER,
action="store",
metavar="IDENTIFIER",
help=("The identifier of the timeline in Timesketch."),
help="The identifier of the timeline in Timesketch.",
)

@classmethod
Expand All @@ -56,19 +56,17 @@ def ParseOptions(cls, options, output_module): # pylint: disable=arguments-rena
output_module, opensearch_ts.OpenSearchTimesketchOutputModule
):
raise errors.BadConfigObject(
"Output module is not an instance of OpenSearchsearchOutputModule"
"Output module is not an instance of OpenSearchTimesketchOutputModule"
)

opensearch_output.OpenSearchOutputArgumentsHelper.ParseOptions(
options, output_module
)

timeline_identifier = cls._ParseNumericOption(
options,
"timeline_identifier",
default_value=cls._DEFAULT_TIMELINE_IDENTIFIER,
)

if timeline_identifier:
output_module.SetTimelineIdentifier(timeline_identifier)

Expand Down
1 change: 1 addition & 0 deletions plaso/cli/storage_media_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ def _ScanVolumeSystemRoot(self, scan_context, scan_node, options, base_path_spec
volume_identifiers = self._GetVolumeIdentifiers(volume_system, options)

elif scan_node.type_indicator in (
dfvfs_definitions.TYPE_INDICATOR_APM,
dfvfs_definitions.TYPE_INDICATOR_GPT,
dfvfs_definitions.TYPE_INDICATOR_TSK_PARTITION,
):
Expand Down
4 changes: 2 additions & 2 deletions plaso/formatters/msiecf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def FormatEventValues(self, output_mediator, event_values):
event_values["cached_file_path"] = cached_file_path


class MSIECFHTTPHeadersventFormatterHelper(interface.CustomEventFormatterHelper):
class MSIECFHTTPHeadersEventFormatterHelper(interface.CustomEventFormatterHelper):
"""MSIE cache file HTTP headers formatter helper."""

IDENTIFIER = "msiecf_http_headers"
Expand All @@ -42,5 +42,5 @@ def FormatEventValues(self, output_mediator, event_values):


manager.FormattersManager.RegisterEventFormatterHelpers(
[MSIECFCachedPathFormatterHelper, MSIECFHTTPHeadersventFormatterHelper]
[MSIECFCachedPathFormatterHelper, MSIECFHTTPHeadersEventFormatterHelper]
)
4 changes: 2 additions & 2 deletions tests/formatters/msiecf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ def testFormatEventValues(self):
self.assertNotIn("cached_file_path", event_values)


class MSIECFHTTPHeadersventFormatterHelperTest(test_lib.EventFormatterTestCase):
class MSIECFHTTPHeadersEventFormatterHelperTest(test_lib.EventFormatterTestCase):
"""Tests for the MSIE cache file HTTP headers formatter helper."""

def testFormatEventValues(self):
"""Tests the FormatEventValues function."""
formatter_helper = msiecf.MSIECFHTTPHeadersventFormatterHelper()
formatter_helper = msiecf.MSIECFHTTPHeadersEventFormatterHelper()

output_mediator = self._CreateOutputMediator()

Expand Down
Loading