github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,152 Commits
68 Branches
248 Tags
109 MiB
Commit Graph

1834 Commits (66d368f882550adf29a6ab9ec262f8814ccac64b)

Author SHA1 Message Date
ibuler e5081fd6a9 merge: with dev 2023-02-22 15:17:44 +08:00
ibuler 33f6c5b257 perf: 修改 探测 2023-02-22 15:13:51 +08:00
老广 4b8e2d464f
Merge pull request #9682 from jumpserver/pr@dev@change_platform_migration 
perf: 修复用户平台内置的问题
 2023-02-22 13:17:14 +08:00
ibuler 6f765ebef5 perf: 修复用户平台内置的问题 2023-02-22 13:08:32 +08:00
jiangweidong fd146055f3 fix: 删除空行 2023-02-22 11:46:28 +08:00
jiangweidong cde59f7ae8 perf: 解决冲突 2023-02-22 11:44:46 +08:00
ibuler 0996b1fbf5 merge: with dev 2023-02-22 11:27:53 +08:00
ibuler b5321e497b perf: 修改账号去掉无用的 2023-02-22 11:25:33 +08:00
ibuler fae494d707 perf: 修改 acount 2023-02-22 11:20:57 +08:00
ibuler 4c233cfb69 perf: 优化 account，去掉版本好 2023-02-22 11:18:42 +08:00
fit2bot b9dcce5c51
fix: 资产更新没有账号及自动化任务更新name (#9679) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 11:04:29 +08:00
fit2bot d7946ccb6f
perf: 账号 资产 列表任务 (#9676) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 22:57:31 +08:00
jiangweidong 9c851cbd68 perf: 解决冲突 2023-02-21 20:32:44 +08:00
jiangweidong def5989cdc perf: 支持数据库网域执行Task 2023-02-21 20:27:44 +08:00
fit2bot 0bd674bb9c
perf: ansible enabled false (#9670) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 20:06:45 +08:00
老广 b5d814e9be
Merge pull request #9665 from jumpserver/pr@dev@fix_platform_internal 
perf: 修改 platform 内置创建
 2023-02-21 15:50:58 +08:00
ibuler 771ea17469 perf: 修改 platform 内置创建 2023-02-21 15:49:59 +08:00
fit2bot 4735565cb8
perf: inventory 为空 任务跳过 (#9664) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 15:33:15 +08:00
fit2bot 1caca32a26
perf: merge asset migrate (#9662) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 15:15:26 +08:00
ibuler 82432299b8 merge: with dev 2023-02-21 13:47:08 +08:00
ibuler df9e533b3c perf: 修改 rabc 2023-02-21 13:40:48 +08:00
ibuler 0001ffba1b perf: 优化 rbac 2023-02-21 13:39:28 +08:00
ibuler f4cc03434f perf: 修改 rbac asset nodes 2023-02-21 13:11:56 +08:00
ibuler e67a876513 perf: 优化账号任务 2023-02-21 13:00:04 +08:00
Bai 1888597451 fix: 修改slugfield校验问题 2023-02-20 20:15:47 +08:00
fit2bot 137d69a539
perf: ansible runner logs (#9655) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 20:14:06 +08:00
fit2bot 95eeeb4208
perf: 自动化脱敏 aix (#9652) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 19:12:57 +08:00
ibuler 37c54e976f perf： 优化 tasks 2023-02-20 18:00:29 +08:00
Bai d246b9bb35 fix: 修复资产硬件信息收集失败的问题 2023-02-20 17:25:16 +08:00
jiangweidong c2773351af Fix: 解决资产创建后系统执行Ping及Gather任务失败问题 2023-02-20 14:06:26 +08:00
ibuler bb0bb4e764 perf: domain serializer 2023-02-20 13:40:42 +08:00
ibuler 492dd34cb8 perf: 优化排序 2023-02-20 13:31:56 +08:00
ibuler a1440ee4e0 perf: 优化 asset 创建时 nodes 可能有问题 2023-02-19 15:43:56 +08:00
ibuler 83c844292c perf: 优化 task 参数是 uuid 可能导致的问题 2023-02-19 15:10:10 +08:00
fit2bot 9ed1b8fc86
perf: 修改 swagger 查询 (#9616) 
* perf: 修改 swagger 查询

* perf: 修改 operate log

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-02-17 21:11:06 +08:00
ibuler 98355ce468 perf: 优化一波 migrations 2023-02-17 17:19:18 +08:00
fit2bot 9a62a7aaab
pref: 修改 activity log (#9571) 
* pref: 修改 activity log

* perf: 优化 acitivity

* pref: 修改 activity

* fix: 修复一些运行问题

* fix: app.py 中添加 tasks import

* fix: 添加 activity_callback

* fix: 添加 execute_account_backup_plan activity_callback

* fix: 添加 activity_callback -> gather_asset_accounts

* fix: 对 celery 任务添加 activity_callback 回调

* fix: 修改翻译

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
 2023-02-17 17:14:53 +08:00
Bai 1bfb434651 fix: 修复创建网关时, 没有保存到 Host 列表中的问题; 2023-02-17 13:58:08 +08:00
jiangweidong 3b3355f3f8 perf: 修改PostgreSQL数据库参数为必填 2023-02-16 17:33:03 +08:00
老广 1678eeb915
Merge pull request #9587 from jumpserver/pr@dev@perf_gateway 
perf: 优化 gateway 返回情况
 2023-02-16 17:21:36 +08:00
Bai 22dd81de43 fix: 创建删除节点、资产时，节点资产数量没有刷新的问题，监听的信号不太对，如果是 post_remove 那么获取资产的关联节点是获取不到的 2023-02-16 16:54:24 +08:00
ibuler a63709002d perf: 优化 gateway 返回情况 2023-02-16 16:51:42 +08:00
fit2bot e66168dfa4
perf: account secret 加密 (#9570) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-15 20:16:01 +08:00
Bai cf2089d826 fix: 修复迁移数据库应用账号缺少的问题 2023-02-15 20:09:14 +08:00
fit2bot 4ac214e91d
perf: account task timing not triggered (#9564) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-15 16:48:27 +08:00
Bai e25306608b fix: 修复克隆网关没有克隆账号的问题 2023-02-15 11:18:44 +08:00
fit2bot f20c803356
perf: ansible_enabled false (#9548) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-14 18:34:46 +08:00
Bai 2c13439b8a fix: 添加迁移文件 2023-02-14 16:38:28 +08:00
ibuler 786d96ee6e perf: 修改登录 2023-02-14 16:01:35 +08:00
ibuler 8b0a967306 perf: 优化 audit log 2023-02-14 15:53:08 +08:00
Bai 770e7733e7 fix: 修复添加资产到节点，移除资产从节点，移动资产到节点 API rbac 权限位 2023-02-14 15:35:56 +08:00
ibuler b3244d0215 perf: 优化 redis 平台协议 2023-02-14 13:44:14 +08:00
fit2bot 10d776f7e5
perf: account name required (#9533) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-14 11:37:18 +08:00
老广 99e5ac9aa6
Merge pull request #9530 from jumpserver/pr@dev@perf_delay_run 
perf: 优化 delay run
 2023-02-13 20:06:01 +08:00
ibuler 223b73c5c6 perf: 优化 delay run 2023-02-13 20:04:17 +08:00
fit2bot 269cf6628a
perf: gateway auto (#9529) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-13 19:52:49 +08:00
老广 48fe6b975b
Merge pull request #9526 from jumpserver/pr@dev@perf_merge_delay 
perf: 改造 merge_delay_func
 2023-02-13 19:45:36 +08:00
ibuler bd9b1f1a5b perf: 优化 audit log 2023-02-13 19:42:42 +08:00
Eric 9cd780eb06 perf: 改造 merge_delay_func 2023-02-13 19:14:00 +08:00
ibuler cd866532da perf: 优化测试节点可连接性 2023-02-13 15:04:45 +08:00
fit2bot 64f21a518a
perf: asset gather fact (#9511) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-10 18:50:11 +08:00
老广 aa483a3c6d
Merge pull request #9507 from jumpserver/pr@dev@perf_asset_task 
perf: 优化 task
 2023-02-10 17:43:39 +08:00
ibuler dd15286d27 perf: 优化 task 2023-02-10 17:36:15 +08:00
fit2bot ab132e02d0
perf: k8s tree (#9503) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-10 15:56:34 +08:00
ibuler 136bec94ca perf: merge with dev 2023-02-10 15:38:40 +08:00
ibuler 6a0fbc6ac2 perf: 修改 signals 2023-02-10 14:44:59 +08:00
fit2bot e36506c3b8
perf: ansible log (#9499) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-10 14:37:55 +08:00
fit2bot 0c11a602a8
perf: push account automation (#9497) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-10 14:07:20 +08:00
Bai 4c96d6935a fix: 修复没有 push_now 权限的用户可以在创建资产、创建账号中开启推送 2023-02-10 11:14:05 +08:00
ibuler 37a52c420f perf: 优化并发处理 2023-02-09 20:48:25 +08:00
Bai 4f6a17290a fix: 修复创建资产时账号禁用不生效的问题 2023-02-09 12:30:28 +08:00
fit2bot e3d1474b9b
perf: k8s tree error msg (#9472) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-08 20:14:33 +08:00
fit2bot ab76d8cce0
fix: 修复创建资产资源 dashboard 不变化的问题 (#9471) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-08 19:32:09 +08:00
fit2bot ddff968be1
perf: postgresql ansible (#9469) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-08 18:13:05 +08:00
ibuler eabb41b74c perf: 修改 platform serializer 2023-02-08 13:53:21 +08:00
ibuler 17fce76ac4 perf: 修改 signal handler 2023-02-08 10:14:09 +08:00
老广 bb8ca41149
Merge pull request #9454 from jumpserver/pr@dev@perf_api_sql 
perf: 优化 api sql 查询
 2023-02-07 16:24:45 +08:00
ibuler e7202ac984 perf: 优化 api sql 查询 2023-02-07 16:21:26 +08:00
Bai b41d30dbac fix: 修复导入更新资产时包含labels报错的问题(取消id唯一键校验) 2023-02-07 16:00:36 +08:00
fit2bot 90d5f62327
perf: gathered-accounts api (#9451) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-07 13:27:44 +08:00
fit2bot 8afe28773d
perf: clone plateform charset (#9442) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 15:05:38 +08:00
fit2bot 654cbe7bd0
perf: 创建网关 没有关联网域 (#9441) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 14:54:30 +08:00
fit2bot 500124f485
perf: asset automation filter (#9440) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 13:37:03 +08:00
fit2bot 9a1109e13d
perf: 资产创建添加账号 没有携带密码 (#9436) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 11:00:36 +08:00
Bai 4af80bfcdf fix: 修改中文翻译文件 2023-02-06 10:30:40 +08:00
ibuler 91357b3715 perf: 优化 gateway 设置 2023-02-03 19:46:42 +08:00
fit2bot 20d2efc407
perf: 主机硬件信息 (#9429) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-03 18:23:38 +08:00
ibuler 470d2703f4 perf: 协议端口校验 2023-02-03 16:13:29 +08:00
fit2bot 93932f1904
perf: 优化批量更新 (#9418) 
* perf: 优化批量更新

* perf: 优化代码，减少 80%，依然可用

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-02-02 20:10:48 +08:00
fit2bot 64e48712a5
perf: gateway migrate (#9412) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-02 16:16:38 +08:00
Bai 5fcd83b587 fix: 修复获取 swagger api 时，AssetSerializer category, type 字段手动设置 _choices 属性时报错的问题 2023-02-02 14:40:23 +08:00
feng 0aa681620f perf: asset tree search 2023-02-02 13:56:18 +08:00
jiangweidong 3080771559
fix: 解决没获取到证书的mongodb导致的无法执行自动化任务 (#9399) 2023-02-02 10:32:48 +08:00
老广 f68dde456d
Merge pull request #9397 from jumpserver/pr@dev@perf_code_i18n 
perf: 修改 i18n
 2023-02-02 10:23:17 +08:00
fit2bot 758d6ae81b
perf: gateway print (#9398) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-01 19:02:41 +08:00
ibuler 853f9c422d perf: 修改 i18n 2023-02-01 18:45:51 +08:00
fit2bot 7b95859015
perf: device ansible (#9396) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-01 18:20:56 +08:00
Bai fc34980f20 fix: 修复主机详情显示硬件信息 2023-02-01 17:05:28 +08:00
fit2bot 66c58a2084
perf: 账号 模版创建 (#9386) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-01 14:43:58 +08:00
ibuler 34b740583e perf: 修改 asset info 2023-01-31 19:37:16 +08:00