Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
e1ab4537
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e1ab4537
编写于
6月 10, 2020
作者:
baltery
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
上级
1a6597b5
86552295
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
1 deletion
+38
-1
apps/ops/api/adhoc.py
apps/ops/api/adhoc.py
+6
-1
apps/ops/models/adhoc.py
apps/ops/models/adhoc.py
+18
-0
apps/ops/serializers/adhoc.py
apps/ops/serializers/adhoc.py
+14
-0
未找到文件。
apps/ops/api/adhoc.py
浏览文件 @
e1ab4537
...
...
@@ -11,7 +11,7 @@ from common.serializers import CeleryTaskSerializer
from
orgs.utils
import
current_org
from
..models
import
Task
,
AdHoc
,
AdHocExecution
from
..serializers
import
TaskSerializer
,
AdHocSerializer
,
\
AdHocExecutionSerializer
AdHocExecutionSerializer
,
TaskDetailSerializer
from
..tasks
import
run_ansible_task
__all__
=
[
...
...
@@ -26,6 +26,11 @@ class TaskViewSet(viewsets.ModelViewSet):
serializer_class
=
TaskSerializer
permission_classes
=
(
IsOrgAdmin
,)
def
get_serializer_class
(
self
):
if
self
.
action
==
'retrieve'
:
return
TaskDetailSerializer
return
super
().
get_serializer_class
()
def
get_queryset
(
self
):
queryset
=
super
().
get_queryset
()
queryset
=
queryset
.
select_related
(
'latest_execution'
)
...
...
apps/ops/models/adhoc.py
浏览文件 @
e1ab4537
...
...
@@ -118,6 +118,24 @@ class Task(PeriodTaskModelMixin, OrgModelMixin):
kwargs
=
{
"callback"
:
self
.
callback
}
return
name
,
task
,
args
,
kwargs
@
lazyproperty
def
last_success
(
self
):
return
self
.
_last_adhocexecution
(
True
,
'contacted'
)
@
lazyproperty
def
last_failure
(
self
):
return
self
.
_last_adhocexecution
(
False
,
'dark'
)
def
_last_adhocexecution
(
self
,
is_success
,
key
):
obj
=
AdHocExecution
.
objects
.
filter
(
task_id
=
self
.
id
,
is_success
=
is_success
).
order_by
(
'-date_finished'
).
first
()
body
=
obj
.
summary
.
get
(
key
)
if
body
:
asset
,
body
=
body
.
popitem
()
action
,
body
=
body
.
popitem
()
return
asset
,
action
,
body
.
get
(
'msg'
,
''
)
else
:
return
''
,
''
,
''
def
__str__
(
self
):
return
self
.
name
+
'@'
+
str
(
self
.
org_id
)
...
...
apps/ops/serializers/adhoc.py
浏览文件 @
e1ab4537
...
...
@@ -59,6 +59,20 @@ class TaskSerializer(serializers.ModelSerializer):
]
class
TaskDetailSerializer
(
TaskSerializer
):
last_success
=
serializers
.
SerializerMethodField
()
last_failure
=
serializers
.
SerializerMethodField
()
def
get_last_success
(
self
,
obj
):
return
obj
.
last_success
[
0
],
''
def
get_last_failure
(
self
,
obj
):
return
obj
.
last_failure
[
0
],
' => '
.
join
(
obj
.
last_failure
[
1
:])
class
Meta
(
TaskSerializer
.
Meta
):
fields
=
TaskSerializer
.
Meta
.
fields
+
[
'last_success'
,
'last_failure'
]
class
AdHocSerializer
(
serializers
.
ModelSerializer
):
become_display
=
serializers
.
ReadOnlyField
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录