-
Notifications
You must be signed in to change notification settings - Fork 31
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.
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
datastream: add basic OS logging #82
base: master
Are you sure you want to change the base?
Changes from 5 commits
dd5b5a3
8f0e0e0
53cd057
ed10668
f2b670f
6181104
a11e1f0
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# This file is part of Invenio. | ||
# Copyright (C) 2025 CERN. | ||
# | ||
# Invenio is free software; you can redistribute it and/or modify it | ||
# under the terms of the MIT License; see LICENSE file for more details. | ||
|
||
"""Invenio OpenSearch Datastream Logging module.""" | ||
|
||
from __future__ import absolute_import, print_function | ||
|
||
from importlib_metadata import entry_points | ||
|
||
from .datastreams.managers import LogManager | ||
from .ext import InvenioLoggingBase | ||
from .resources import LogsResource, LogsResourceConfig | ||
|
||
|
||
class InvenioLoggingDatastreams(InvenioLoggingBase): | ||
"""Invenio-Logging extension for OpenSearch Datastreams.""" | ||
|
||
def init_app(self, app): | ||
"""Initialize app. | ||
|
||
:param app: An instance of :class:`~flask.Flask`. | ||
""" | ||
self.init_manager() | ||
self.init_resources(app) | ||
self.load_builders() | ||
app.extensions["invenio-logging-datastreams"] = self | ||
|
||
def init_manager(self): | ||
"""Initialize the logging manager.""" | ||
manager = LogManager() | ||
self.manager = manager | ||
|
||
def load_builders(self): | ||
"""Load log builders from entry points.""" | ||
for ep in entry_points(group="invenio_logging.datastreams.builders"): | ||
builder_class = ep.load() | ||
self.manager.register_builder(ep.name, builder_class) | ||
|
||
def init_resources(self, app): | ||
"""Init resources.""" | ||
self.resource = LogsResource( | ||
config=LogsResourceConfig.build(app), | ||
manager=self.manager, | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# This file is part of Invenio. | ||
# Copyright (C) 2025 CERN. | ||
# | ||
# Invenio is free software; you can redistribute it and/or modify it | ||
# under the terms of the MIT License; see LICENSE file for more details. | ||
|
||
"""Invenio module for datastream logging management.""" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# This file is part of Invenio. | ||
# Copyright (C) 2025 CERN. | ||
# | ||
# Invenio is free software; you can redistribute it and/or modify it | ||
# under the terms of the MIT License; see LICENSE file for more details. | ||
|
||
"""Invenio module for audit-logs management.""" | ||
|
||
from .backends import SearchAuditLogBackend | ||
from .builders import AuditLogBuilder | ||
|
||
__all__ = ( | ||
"SearchAuditLogBackend", | ||
"AuditLogBuilder", | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# This file is part of Invenio. | ||
# Copyright (C) 2025 CERN. | ||
# | ||
# Invenio is free software; you can redistribute it and/or modify it | ||
# under the terms of the MIT License; see LICENSE file for more details. | ||
|
||
"""Invenio module for datastream logging management.""" | ||
|
||
from invenio_logging.datastreams.backends import SearchBackend | ||
|
||
|
||
class SearchAuditLogBackend(SearchBackend): | ||
"""Backend for storing audit logs in datastreams.""" | ||
|
||
def __init__(self): | ||
"""Initialize backend for audit logs.""" | ||
super().__init__(log_type="audit") |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# This file is part of Invenio. | ||
# Copyright (C) 2025 CERN. | ||
# | ||
# Invenio is free software; you can redistribute it and/or modify it | ||
# under the terms of the MIT License; see LICENSE file for more details. | ||
|
||
"""Datastream Logging Builder module.""" | ||
|
||
from invenio_logging.datastreams.builders import LogBuilder | ||
|
||
from .backends import SearchAuditLogBackend | ||
|
||
|
||
class AuditLogBuilder(LogBuilder): | ||
"""Builder for structured audit logs.""" | ||
|
||
type = "audit" | ||
|
||
backend_cls = SearchAuditLogBackend | ||
|
||
@classmethod | ||
def build(cls, log_event): | ||
"""Build an audit log event context.""" | ||
return cls.validate(log_event) | ||
|
||
@classmethod | ||
def send(cls, log_event): | ||
"""Send log event using the backend.""" | ||
cls.backend_cls().send(log_event) | ||
|
||
@classmethod | ||
def search(cls, query): | ||
"""Search logs.""" | ||
results = cls.backend_cls().search(query) | ||
return cls.schema.dump(results, many=True) | ||
|
||
@classmethod | ||
def list(cls): | ||
"""List audit logs.""" | ||
results = cls.backend_cls().list() | ||
return cls.schema.dump(results, many=True) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,121 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# This file is part of Invenio. | ||
# Copyright (C) 2025 CERN. | ||
# | ||
# Invenio is free software; you can redistribute it and/or modify it | ||
# under the terms of the MIT License; see LICENSE file for more details. | ||
|
||
"""Invenio module for datastream backends.""" | ||
|
||
|
||
from abc import ABC, abstractmethod | ||
|
||
from flask import current_app | ||
from invenio_search import current_search_client | ||
|
||
|
||
class LogBackend(ABC): | ||
"""Abstract base class for log backends.""" | ||
|
||
@abstractmethod | ||
def send(self, log_type, log_event): | ||
"""Send a log event to the backend.""" | ||
raise NotImplementedError() | ||
|
||
|
||
class SearchBackend(LogBackend): | ||
"""Generic backend for storing logs in datastreams index.""" | ||
|
||
def __init__(self, log_type): | ||
""" | ||
Initialize SearchBackend. | ||
|
||
:param log_type: Type of log (e.g., "audit", "task", "system"). | ||
""" | ||
self.client = current_search_client | ||
self.log_type = log_type | ||
self.template_name = "datastream-log-v1.0.0" | ||
self.index_name = f"logs-{log_type}" | ||
self.search_fields = [ | ||
"message", | ||
"event.action", | ||
"user.id", | ||
"user.email", | ||
"resource.id", | ||
"resource.parent.id", | ||
] | ||
|
||
self._ensure_template_exists() | ||
|
||
def _ensure_template_exists(self): | ||
"""Check if required template exists, enforce if missing.""" | ||
index_prefix = current_app.config.get("SEARCH_INDEX_PREFIX", "") | ||
full_template_name = f"{index_prefix}{self.template_name}" | ||
if not self.client.indices.exists_index_template(name=full_template_name): | ||
raise RuntimeError( | ||
f"Required template '{self.template_name}' is missing. " | ||
"Ensure it is created before logging events." | ||
) | ||
|
||
def send(self, log_event): | ||
"""Send the log event to Search engine.""" | ||
try: | ||
index_prefix = current_app.config.get("SEARCH_INDEX_PREFIX", "") | ||
full_index_name = f"{index_prefix}{self.index_name}" | ||
self.client.index(index=full_index_name, body=log_event) | ||
|
||
except Exception as e: | ||
current_app.logger.error(f"Failed to send log Search engine: {e}") | ||
raise e | ||
|
||
def search(self, query=None, size=10): | ||
""" | ||
Search log events. | ||
|
||
:param size: Number of results to return. | ||
:return: List of log events that match the search query. | ||
""" | ||
try: | ||
index_prefix = current_app.config.get("SEARCH_INDEX_PREFIX", "") | ||
full_index_name = f"{index_prefix}{self.index_name}" | ||
|
||
search_query = { | ||
"size": size, | ||
"query": { | ||
"multi_match": { | ||
"query": query, | ||
"fields": self.search_fields, | ||
"operator": "and", | ||
} | ||
}, | ||
"sort": [{"@timestamp": {"order": "desc"}}], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this whole method should be in a log dedicated service class |
||
} | ||
# TODO: add pagination? | ||
response = self.client.search(index=full_index_name, body=search_query) | ||
return [hit["_source"] for hit in response.get("hits", {}).get("hits", [])] | ||
|
||
except Exception as e: | ||
current_app.logger.error(f"Failed to search logs: {e}") | ||
raise e | ||
|
||
def list(self, size=10): | ||
""" | ||
List log events. | ||
|
||
:param size: Number of results to return. | ||
:return: List of log events. | ||
""" | ||
try: | ||
index_prefix = current_app.config.get("SEARCH_INDEX_PREFIX", "") | ||
full_index_name = f"{index_prefix}{self.index_name}" | ||
|
||
response = self.client.search( | ||
index=full_index_name, | ||
body={"size": size, "sort": [{"@timestamp": {"order": "desc"}}]}, | ||
) | ||
return [hit["_source"] for hit in response.get("hits", {}).get("hits", [])] | ||
|
||
except Exception as e: | ||
current_app.logger.error(f"Failed to search logs: {e}") | ||
raise e |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# This file is part of Invenio. | ||
# Copyright (C) 2025 CERN. | ||
# | ||
# Invenio is free software; you can redistribute it and/or modify it | ||
# under the terms of the MIT License; see LICENSE file for more details. | ||
|
||
"""Datastream Logging Builder module.""" | ||
|
||
from abc import ABC, abstractmethod | ||
|
||
from marshmallow import ValidationError | ||
|
||
from .schema import LogEventSchema | ||
|
||
|
||
class LogBuilder(ABC): | ||
"""Base log builder for structured logging.""" | ||
|
||
context_generators = [] | ||
"""List of ContextGenerator to update log event context.""" | ||
|
||
type = "generic" | ||
"""Type of log event.""" | ||
|
||
schema = LogEventSchema() | ||
"""Schema for validating log events.""" | ||
|
||
@classmethod | ||
def validate(cls, log_event): | ||
"""Validate the log event against the schema.""" | ||
try: | ||
return cls.schema.load(log_event) | ||
except ValidationError as err: | ||
raise ValueError(f"Invalid log data: {err.messages}") | ||
|
||
@classmethod | ||
@abstractmethod | ||
def build(cls, **kwargs): | ||
"""Build log event context based on log type and additional context.""" | ||
raise NotImplementedError() | ||
|
||
@classmethod | ||
def resolve_context(cls, log_event): | ||
"""Resolve all references in the log context.""" | ||
for ctx_func in cls.context_generators: | ||
ctx_func(log_event) | ||
return log_event | ||
|
||
@classmethod | ||
def send(cls, log_event): | ||
"""Send log event to the log backend.""" | ||
raise NotImplementedError() | ||
|
||
def search(self, query): | ||
"""Search logs.""" | ||
raise NotImplementedError() |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# This file is part of Invenio. | ||
# Copyright (C) 2025 CERN. | ||
# | ||
# Invenio is free software; you can redistribute it and/or modify it | ||
# under the terms of the MIT License; see LICENSE file for more details. | ||
|
||
"""Invenio module for datastream component templates.""" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# This file is part of Invenio. | ||
# Copyright (C) 2025 CERN. | ||
# | ||
# Invenio is free software; you can redistribute it and/or modify it | ||
# under the terms of the MIT License; see LICENSE file for more details. | ||
|
||
"""Datastreams Logs OpenSearch component templates.""" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
{ | ||
"template": { | ||
"mappings": { | ||
"dynamic": "strict", | ||
"properties": { | ||
"timestamp": { "type": "date" }, | ||
"event": { | ||
"properties": { | ||
"action": { "type": "keyword" }, | ||
"description": { "type": "text" } | ||
} | ||
}, | ||
"message": { "type": "text" }, | ||
"user": { | ||
"properties": { | ||
"id": { "type": "keyword" }, | ||
"email": { "type": "keyword" }, | ||
"roles": { "type": "keyword" } | ||
} | ||
}, | ||
"resource": { | ||
"properties": { | ||
"type": { "type": "keyword" }, | ||
"id": { "type": "keyword" }, | ||
"metadata": { "type": "object", "enabled": false }, | ||
"parent": { | ||
"properties": { | ||
"type": { "type": "keyword" }, | ||
"id": { "type": "keyword" }, | ||
"metadata": { "type": "object", "enabled": false } | ||
} | ||
} | ||
} | ||
}, | ||
"extra": { "type": "object", "enabled": false } | ||
} | ||
} | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how is list different from search?