Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
31280a38
Commit
31280a38
authored
Oct 15, 2019
by
ibuler
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
parents
70a4f137
ad3524f9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
__init__.py
apps/terminal/backends/__init__.py
+1
-0
es.py
apps/terminal/backends/command/es.py
+8
-0
No files found.
apps/terminal/backends/__init__.py
View file @
31280a38
...
...
@@ -6,6 +6,7 @@ from common import utils
TYPE_ENGINE_MAPPING
=
{
'elasticsearch'
:
'terminal.backends.command.es'
,
'es'
:
'terminal.backends.command.es'
,
}
...
...
apps/terminal/backends/command/es.py
View file @
31280a38
# -*- 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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment