Commit Graph

589 Commits (02fc9a730b7e237381563af637c92c7f106860d5)

Author SHA1 Message Date
ibuler 084dcc7b44 pref: 修改 inventory
2 years ago
Aaron3S 53b0041b09 feat: celery task api
2 years ago
Aaron3S da911651aa feat: celery task api
2 years ago
feng 2355d1af83 perf: gather accounts
2 years ago
ibuler 8f88b898d0 pref: 修改 migrations
2 years ago
ibuler 651228795e pref: 修改 migrations
2 years ago
Aaron3S c10d7f554e Merge remote-tracking branch 'origin/v3' into v3
2 years ago
Aaron3S e7a114a31d feat: celery 任务api
2 years ago
Jiangjie.Bai 901270e6ad Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai 6ed946541d merge: local
2 years ago
feng 4dd4c29e12 perf: gather facts
2 years ago
Aaron3S 2509b801c6 Merge remote-tracking branch 'origin/v3' into v3
2 years ago
feng f743dea1fd perf: mysql postgresql
2 years ago
Aaron3S 64e03a4412 feat: 增加异步任务api
2 years ago
ibuler 1372d6322d perf: 合并代码
2 years ago
ibuler 943b130035 feat: 添加远程应用
2 years ago
feng 64daacce63 fix: 修复自动化修改密码bug
2 years ago
feng 091bffa626 perf: automation change secret linux
2 years ago
feng 7255cf68a9 perf: automation change secret linux
2 years ago
feng 26278cc9e0 perf: change secret automation
2 years ago
Jiangjie.Bai 4711813af8 fix: 修复创建目录时指定权限为 755
2 years ago
feng 1b795791de fix: swagger 500
2 years ago
ibuler 6a33129349 pref: 完成收集资产信息任务
2 years ago
ibuler 4e2aebde6c perf: 修改改密
2 years ago
ibuler 8c91cd7eb6 perf: 修改改密
2 years ago
“huailei000” 3bd7410ab8 perf: update jquery
2 years ago
ibuler 85a6f29a0a perf: 修改 playbook 任务执行
2 years ago
ibuler 9198c93fcf perf: 修改 ansible change password
2 years ago
ibuler 1d757ec19a pref: 修改改密
2 years ago
ibuler 9a0bae5bfd perf: 修改 ansible 执行
2 years ago
ibuler 4e5a7a0a25 perf: 修改改密
2 years ago
ibuler f921f12171 perf: 修改 adhoc
2 years ago
ibuler a543a2ee37 perf: 基本完成 adhoc runner
2 years ago
ibuler 0fb4b52232 perf: 修改 ansible 表结构
2 years ago
ibuler df5e63b3be perf: 修改 ansible 逻辑
2 years ago
ibuler 41589c5305 perf: 修改 ansible
2 years ago
ibuler 72b0fb4274 perf: 修改 platform 支持设置 ansible
2 years ago
ibuler cc859f302a perf: 优化 asset migrations
2 years ago
ibuler 1b0195cb82 perf: 修改 asset 结构
2 years ago
ibuler 1d1b252e58 perf: 解决冲突
2 years ago
feng626 139540fafe perf: 修改change password linux ansible yaml
2 years ago
ibuler 37bbf75f66 perf: 修改数据库迁移文件
2 years ago
ibuler 25bded69ab perf: 修改平台和资产
2 years ago
feng626 b910180a12 自动化策略 表
2 years ago
feng626 ca3d2271a8 merge v3
2 years ago
feng626 fe4df4b179 fix: 修复swagger
2 years ago
ibuler 05f913ab18 perf: 修改 platform
2 years ago
ibuler 8282a6869a perf: remove system users
2 years ago
ibuler 3f47e63080 perf: remove system user
2 years ago
ibuler d402ba5d92 perf: 修改资产名称
2 years ago
ibuler ca5f6f3c6f perf: 修改 windows ansible shell
2 years ago
fit2bot 001e5d857f
pref: debug toolbar 太费时间 先禁用 (#8528)
2 years ago
ibuler f1a22575d3 perf: 优化登录页面
2 years ago
fit2bot 031077c298
perf: password 等使用 rsa 加密传输 (#8188)
3 years ago
feng626 2cb08b4785 fix: user is common user
3 years ago
Jiangjie.Bai cddff9fd19 feat: 改密计划支持su切换用户执行
3 years ago
ibuler a3cddd5d34 fix: 修复批量命令的bug
3 years ago
Jiangjie.Bai 8233c69038 fix: 修复adhoc权限
3 years ago
Jiangjie.Bai b25ec559bb fix: 修复翻译/权限设置
3 years ago
Jiangjie.Bai 72247d1df3 fix: 修复批量命令权限
3 years ago
fit2bot dafc416783
Fix rbac (#7728)
3 years ago
fit2bot 534cbf1281 perf: 修改依赖版本 (#7666)
3 years ago
Jiangjie.Bai 83ff8dbf26
fix: rbac 合并 (#7658)
3 years ago
ibuler db050e405d fix: 修改 migrations
3 years ago
fit2bot e259d2a9e9
fix: fix rbac to dev (#7636)
3 years ago
xinwen c7f8ebb613 fix: 站内信 ServerPerformanceCheck redis 订阅报错
3 years ago
feng626 9e47bf6ec5 fix: 批量命令bug
3 years ago
feng626 83c5344307 fix: 获取命令规则过滤不准
3 years ago
fit2bot 0b16d70c0c
fix: 修改翻译 (#7526)
3 years ago
ibuler 451e61bb61 perf: 优化 celery 任务中的数据库连接问题
3 years ago
ibuler 145c7952c9 perf: 优化 ops 任务,支持 i18n
3 years ago
xinwen 93d77b2312 fix: 执行 ansible 任务日志记录错误
3 years ago
fit2bot d2df8acd84
fix: 修复数据库连接没有关闭问题 (#7227)
3 years ago
ibuler d484885762 perf: 修复ansible stdout 中非utf8的问题
3 years ago
fit2bot c244cf5f43
pref: 修改使用的消息内容 (#7061)
3 years ago
fit2bot 00d434ceea
perf: 优化消息通知 (#7024)
3 years ago
xinwen a452f3307f fix: 组件监控的消息
3 years ago
Michael Bai b7a6287925 fix: 修改磁盘使用等key值
3 years ago
Michael Bai 7939ef34b0 fix: 修复服务告警主题替换<br>
3 years ago
xinwen b1fceca8a6 feat: 添加短信服务和用户消息通知
3 years ago
fit2bot 07179a4d22
feat: 页面配置serializer版 (#6750)
3 years ago
Bai bf6fcc9020 fix: 修改翻译信息;添加水印配置项到页面
3 years ago
fit2bot 39ce60c93a
feat: 系统监控添加 Core/Celery Terminal; 修改检测终端状态逻辑; (#6570)
3 years ago
fit2bot 66b0173e20
feat: 服务性能告警指标包含:Core服务和各组件状态;指标包括:cpu/disk/memory/is_alive (#6564)
3 years ago
Bai d7f587216d fix: 修复测试系统用户可连接性问题
3 years ago
ibuler 10f8b9f130 perf: 优化ansible执行命令
3 years ago
Z000000 c532c361c0
批量命令支持更广泛的设备如思科等网络设备,docker等 (#6356)
3 years ago
fit2bot ec8dca90d6
refactor: 整合系统用户和管理用户 (#6236)
3 years ago
xinwen 0fd5ab02e9 fix: 修复 interval 周期任务不执行问题
3 years ago
xinwen 732f0b55dc refactor: 更改系统消息初始化策略
3 years ago
fit2bot 4ef3b2630a
feat: 站内信 (#6183)
4 years ago
Bai ba35f5906b fix: 修复收集用户interval等字段的校验
4 years ago
xinwen c16319ec48 feat: 添加企业微信,钉钉扫码登录
4 years ago
fghbng@qq.com 9a92e24e50 serializer优化&&授权导入优化
4 years ago
xinwen 7e4f20f443 refactor: 移动 PermissionsMixin 位置
4 years ago
xinwen 31982c6547 fix: 改密计划关掉周期执行再打开,任务不再执行
4 years ago
ibuler 50c89431df perf: 修复ansible summary显示两遍的问题
4 years ago
xinwen 98c6a93658 fix: 任务应该分组织
4 years ago
xinwen ff9e470ce2 fix: 命令执行 500
4 years ago
Bai 296bb88834 fix: 修改celery健康检测worker数量
4 years ago
ibuler 88d8a3326f perf(ops): 优化定期检查磁盘,添加开关控制
4 years ago
ibuler 8f7dcd512a perf(ops): ansible 增加 summary 汇总
4 years ago
fit2bot 351d4d8123
refactor(celery): 重构celery,使用 threads 模型,避免 占用太多内存 (#5525)
4 years ago
xinwen f63f8d085d fix: Web页面-> 命令执行 高危命令没有告警
4 years ago
fit2bot 0842553f8a
fix: 修复 celery 等日志文件的访问漏洞 (#5469)
4 years ago
ibuler f04e2fa090 fix: bug
4 years ago
ibuler e7a3c5a822 perf(api): filter_fields被filterset_fields取代
4 years ago
xinwen f5fd40978e fix: 修复多个 AdHocExecution 在一个 celery task 执行时日志错误
4 years ago
fit2bot cef93abb2f
feat: 抽象View Mapping Serializer架构设计; 重构工单View、Serializer模块 (#5371)
4 years ago
xinwen bf308e24b6 fix: 推送系统用户时 AdHocExecution id 重复
4 years ago
ibuler b9717eece3 fix: 修改访问swagger会产生的错误
4 years ago
ibuler 80b03e73f6 feat(celery): 添加celery的health check接口
4 years ago
xinwen a7c704bea3 perf(celery-task): 优化检查节点资产数量的 Celery 任务
4 years ago
ibuler 40c0aac5a9 fix(ops): 修复run as 可能引起的返回多个asset user
4 years ago
ibuler 83099dcd16 fix(ops): 修复task run as的问题
4 years ago
Bai 732b8cc0b8 fix(ops): 修复AdHocExecution字段task_display长度问题
4 years ago
Bai cf1fbabca1 fix(command): 修复批量命令执行可能获取到host为None的问题
4 years ago
ibuler cbcefe8bd3 fix(ops): 修复因为更改controlmaster引起的连接不服用维内托
4 years ago
xinwen 2b4f8bd11c feat(ops): Task 支持批量操作
4 years ago
ibuler dd793a4eca perf: 优化日志保存策略
4 years ago
ibuler 2190db1bb5 fix(ops): 修复任务schedule属性的bug
4 years ago
fit2bot d3be16ffe8
fix (#4680)
4 years ago
xinwen 28da819735 perf(assets): 优化节点树
4 years ago
xinwen b331730422 fix(users): 替换旧有角色常量
4 years ago
老广 5d08438dad
feat(ops): 项目启动时,清除指定的celery定时任务;添加获取celery定时任务的函数 (#4378)
4 years ago
xinwen c5a9a85818
[Update] 完善 作业中心/任务列表 (#4105)
5 years ago
xinwen 787cdbcadf [Fix] ops.models.adhoc (#4096)
5 years ago
xinwen b14ca14120
[Fix] ops.models.adhoc (#4096)
5 years ago
xinwen 865522953a
[Feature] 作业中心/任务列表/任务详情 最后运行成功或失败的主机 (#4090)
5 years ago
ibuler 9c6f118dbd feat: 添加批量命令的relation
5 years ago
Bai 420f3c0c4c [Update] 添加celery task log view
5 years ago
ibuler 8efc0331de feat: 删掉所有view, templates, forms
5 years ago
xinwen 3a79bfd5f6
[Update] 添加一些 i18n (#4052)
5 years ago
Bai 7afff5e392 [Update] merge from dev to lina
5 years ago
Bai 96afd82341 [Update] 修复任务列表,执行历史中stat汇总数据显示问题
5 years ago
xinwen c6e0e9a79a [Update] 重建 ops 0018 迁移脚本
5 years ago
xinwen 3ee051303a [Update] audits 模块为一些 models 字段添加 verbose 信息
5 years ago
Bai 63519ec076 [Update] 修改命令记录/操作/改密日志搜索字段没清空的问题
5 years ago
Michael Bai 55c7e06185 [Update] 修改任务执行日期显示本地时间
5 years ago
ibuler 064cb16d25 [Update] 禁用ansible连接复用
5 years ago
ibuler d0fac3f838 [Bugfix] 修复task 列表、
5 years ago
Bai 91c42e8530 [Update] 修改执行task时切换root组织2
5 years ago
Bai 00d9f71384 [Update] 修改执行task时切换root组织
5 years ago
ibuler 672b82c3d6 [Bugfix] 修复可能无法找到command execution的bug
5 years ago
ibuler 00b3c7c945 [Bugfix] 修复动态系统用户执行批量命令的bug
5 years ago
ibuler 2f9598ba49 [Update] 修复ops task中任务某版本任务的bug
5 years ago
ibuler 3138abb00c [Bugfix] 修复ops列表任务无法删除的bug
5 years ago
老广 1fd2e782f8
1.5.7 Merge to dev (#3766)
5 years ago
Bai 2827a64095 [Update] 更新命令批量执行资产树(将没有ssh协议的资产设置为nocheck)
5 years ago
Bai 7d855e5ad8 [Update] 批量命令执行开放rdp系统用户
5 years ago
Bai 79b5618756 [Update] 修改作业中心批量命令资产树收藏夹循环现实的问题
5 years ago
BaiJiangJie f063832bc6 [Update] 支持Windows批量命令2
5 years ago
BaiJiangJie 1d30c1900d [Update] 支持Windows批量命令
5 years ago
BaiJiangJie e978308335 [Update] 修改Adhoc字段become可以为空
5 years ago
老广 55c95c58f6 Add new model to operate log (#3546)
5 years ago
老广 e1919d0a62
Asset meta (#3539)
5 years ago
老广 4944ac8e75 Config (#3502)
5 years ago
BaiJiangJie 330c078597 [Update] Merge dev
5 years ago
jym503558564 fedf50f9dc [Update] 修复任务列表页面无法搜索问题
5 years ago
ibuler 2ef487a92f [Update] 修改收集用户
5 years ago
ibuler fa02e3fb75 [Update] Merge with bugfix
5 years ago
BaiJiangJie 4f7ab69508 [Bugfix] 修复执行任务,没有保存 history 的问题
5 years ago
ibuler 9bb7c1adc1 [Update] 更改命令执行超时提示
5 years ago
ibuler f802fb645d [Update] Add debug message
5 years ago
ibuler c995050ed7 [Update] 修改ws read celery log file
5 years ago
ibuler 0dbf2ab2e5 [Update] 修改websocket读取日志
5 years ago
ibuler 6b8b0f4a0b [Update] 修改terminal字体
5 years ago
ibuler b3502a9291 [Update] 修改terminal字体
5 years ago
ibuler 87deb18791 [Update] 修改command 批量执行左侧选择系统用户
5 years ago
ibuler 82a6369568 [Update] 修改term大小
5 years ago
ibuler 6ebe8e16bd [Update] 修改读取日志时可能解码失败
5 years ago
ibuler 74b4ff4993 [Update] 修改celery log
5 years ago
ibuler ce530e417c [Update] 修改cmd filter rules pattern
5 years ago
ibuler 6b377ec5ef [Update] 修改启动脚本
5 years ago
ibuler 44f8b978f9 [Update] 添加failover ws
5 years ago
老广 cff009e758
Support ws (#3291)
5 years ago
老广 d3d72f85fd
[Update] 修改启动的参数,修改inventory参数名称 (#3276)
5 years ago
ibuler 89fa0658e1 [Update] 修改任务执行
5 years ago
ibuler b7021b5ecb [Update] 支持收集资产上的用户
5 years ago
ibuler 5464c884db [Update] 修改swagger
5 years ago
ibuler 0db3e41bde [Update] 拆分asset tasks
5 years ago
老广 1457281b73
Bugfix (#3232)
5 years ago
八千流 a2376d3afd 超级管理员可创建超级审计员并可设置审计员为组织审计员 (#3141)
5 years ago
ibuler a8ac99f642 [Update] 修改asset modal table
5 years ago
ibuler 8ddda8e5af [Update] 修复页面bug和popover的问题
5 years ago
老广 164f48e131
Dev beta (#3048)
5 years ago
BaiJiangJie 4254775149
Bugfix (#3065)
5 years ago
老广 5db704f793
Bugfix (#3007)
5 years ago
BaiJiangJie 63c2343d2c [Update] 修改列表日期
5 years ago
八千流 ea11aa4abb [Bugfix] 修改排序,去掉标签 (#2982)
5 years ago
老广 55b049c86a
Bugfix (#2938)
5 years ago
老广 f3b5823cce
Bugfix (#2903)
5 years ago
八千流 4c34246750 [Bugfix] 修复批量执行命令没有选择资产bug (#2894)
5 years ago
ibuler 3c825440f0 [Update] 优化协议
5 years ago
老广 58875d9a95
Bugfix (#2831)
5 years ago
ibuler 1472f0437f [update] 修改一些性能问题
5 years ago
八千流 6273e6be9b [Bugfix] 修复用户批量命令View的bug (#2864)
5 years ago
八千流 768cfc7561 [Bugfix] 修复用户无权限执行批量命令却可直接访问批量执行页面的bug (#2857)
5 years ago
ibuler 1a0ff422fe [Update] 优化树结构
6 years ago
ibuler 2cd092af42 [Update] 修改资产创建格式
6 years ago
BaiJiangJie 9cd75390bf [Update] Auth Info (#2806)
6 years ago
八千流 8adaf629b4 [Update] 增加审计员权限控制 (#2792)
6 years ago
老广 ddafd7ba26 Dev ansible windows 2 (#2783)
6 years ago
老广 44d33f70e4 [Update] 修改授权树显示策略 (#2784)
6 years ago
老广 3855fecc69
Password message (#2702)
6 years ago
BaiJiangJie b7ad6cfe62 [Update] 防止 XSS (#2633)
6 years ago
ibuler 6e7446f530 [Update] 增加task最大允许事件,并设置命令最大运行时间为60s
6 years ago
ibuler afe9471aa2 [Update] 更新缓存机制
6 years ago
BaiJiangJie 612d5efd1b [Update] 抽象Inventory,更新翻译 (#2530)
6 years ago
ibuler 15179d2450 [Update] 修改批量命令的翻译
6 years ago
ibuler c82044f6bc [Update] 修改一些bug
6 years ago
老广 311538dcf8
Bugfix (#2513)
6 years ago
老广 324cf2469f
Bugfix (#2506)
6 years ago
ibuler 01745ead1f [Update] 添加migrations
6 years ago
BaiJiangJie 4e705a52eb [Feature] 添加资产用户管理器 (#2489)
6 years ago
ibuler 58c4a46f6e [Update] 用户权限增加cache
6 years ago
ibuler e76392a169 Merge branch 'stable' into dev
6 years ago
ibuler c84e984eae [Update] 任务列表去掉日期
6 years ago
jokimina adf8b1f7aa [Bugfix] operation on closed file. (#2438)
6 years ago
jokimina 599e8a7e37
[Bugfix] crontab task timezone issue
6 years ago
ibuler 866e5d2011 [Update] 修改ldap test密码为空
6 years ago
ibuler 4fd9957bec [Update] 修改celery日志显示
6 years ago
ibuler 5cd809b48a [Update] 修改导入
6 years ago
ibuler 5a1b894138 [Update] gunicorn的日志
6 years ago
ibuler 49404f763d [Update] 修改terminal字体
6 years ago
ibuler 4051225ecb [Bugfix] 修复命令执行bug,修复修改日志级别后无法查看日志
6 years ago
BaiJiangJie 9d53ba22e1 [Update] 取消ceph录像存储,添加命令执行翻译 (#2365)
6 years ago
ibuler 0d0cf04543 [Update] 修改日志查看
6 years ago
ibuler 178055eb57 [Update] 修改任务小写
6 years ago
老广 176052e8e9
[Update] 权限页面增加过滤规则 (#2349)
6 years ago
老广 d026b31c9f
Bugfix (#2346)
6 years ago
xiaomao 4bf0dfcf7b [bugfix] 解决日志中文报错以及各种utf8问题 (#2328)
6 years ago
老广 49a166552e
Bugfix (#2327)
6 years ago
老广 560df5027a
[Update] 禁用其他认证方式修改密码 (#2286)
6 years ago
老广 08945f0a19
[Bugfix] 修复adhoc 日志查看的bug, 修改config example (#2230)
6 years ago
ibuler a1b80f5f0b [Update] 清理task adhoc和history
6 years ago
ibuler 7773c30240 [Update] 增加索引
6 years ago
jokimina 231c907c64 [Update] ops adhoc date_created index (#2223)
6 years ago
老广 a609f17078
[Update] Stash it (#2197)
6 years ago
老广 985bd6fc82
Bugfix2 (#2183)
6 years ago
ibuler 55ff82545a [Bugfix] 修复任务执行args为空的bug
6 years ago
ibuler a99d5609fa [Bugfix] 修复运行测试硬件等报错的bug
6 years ago
ibuler 33b1de0d85 [Update] 优化一下
6 years ago
ibuler bcfe82f162 [Update] 优化错误颜色
6 years ago
ibuler 2fedeb9834 [Update] 修改命令错误输出
6 years ago
老广 9c0f00f625
[Update] 修改命令执行 (#2148)
6 years ago
老广 6a23983331
Command (#2142)
6 years ago
老广 31356e825f
[Update] 修改运行命令名称 (#2140)
6 years ago
ibuler 52e5487e7d [Update] 修改执行命令
6 years ago
老广 3d13f3a17d
Command (#2134)
6 years ago