diff --git a/apps/terminal/backends/__init__.py b/apps/terminal/backends/__init__.py index 12b85b7e3..1aec6b3be 100644 --- a/apps/terminal/backends/__init__.py +++ b/apps/terminal/backends/__init__.py @@ -6,6 +6,7 @@ from common import utils TYPE_ENGINE_MAPPING = { 'elasticsearch': 'terminal.backends.command.es', + 'es': 'terminal.backends.command.es', } diff --git a/apps/terminal/backends/command/es.py b/apps/terminal/backends/command/es.py index dde8e1e95..5aa16dfbf 100644 --- a/apps/terminal/backends/command/es.py +++ b/apps/terminal/backends/command/es.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # +from datetime import datetime from jms_storage.es import ESStorage from .base import CommandBase from .models import AbstractSessionCommand @@ -14,6 +15,13 @@ class CommandStore(ESStorage, CommandBase): user=None, asset=None, system_user=None, input=None, session=None): + if date_from is not None: + if isinstance(date_from, float): + date_from = datetime.fromtimestamp(date_from) + if date_to is not None: + if isinstance(date_to, float): + date_to = datetime.fromtimestamp(date_to) + data = super().filter(date_from=date_from, date_to=date_to, user=user, asset=asset, system_user=system_user, input=input, session=session)