github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3337 from jumpserver/dev_cmds_es 

[Bugfix] 修复命令记录从 es 中获取失败（原因：时间日期格式不匹配）
pull/3344/head
BaiJiangJie 2019-10-14 16:02:35 +08:00 committed by GitHub
parent 13822cbf6d 1a1f20920d
commit ad3524f942
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/terminal/backends/__init__.py
View File

@ -6,6 +6,7 @@ from common import utils
TYPE_ENGINE_MAPPING = { TYPE_ENGINE_MAPPING = {
'elasticsearch': 'terminal.backends.command.es', 'elasticsearch': 'terminal.backends.command.es',
'es': 'terminal.backends.command.es',
} }

8
apps/terminal/backends/command/es.py
View File

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
from datetime import datetime
from jms_storage.es import ESStorage from jms_storage.es import ESStorage
from .base import CommandBase from .base import CommandBase
from .models import AbstractSessionCommand from .models import AbstractSessionCommand
@ -14,6 +15,13 @@ class CommandStore(ESStorage, CommandBase):
user=None, asset=None, system_user=None, user=None, asset=None, system_user=None,
input=None, session=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, data = super().filter(date_from=date_from, date_to=date_to,
user=user, asset=asset, system_user=system_user, user=user, asset=asset, system_user=system_user,
input=input, session=session) input=input, session=session)