7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
933 Commits 14 Branches 38 Tags 93 MiB
Commit Graph

307 Commits

Author SHA1 Message Date
simontigers edde467c87
fix(api): common_data delele (#282) 2023-11-30 13:03:09 +08:00
pycook d525e1ec54
feat(api): only the role cmdb_admin can modify the CIType group (#280) 2023-11-29 17:40:12 +08:00
pycook 91c49b690f fix(api): get relation history 2023-11-28 20:37:36 +08:00
pycook 5fe27f8678
feat(api): issue #212 (#279) 2023-11-24 10:26:48 +08:00
loveiwei 837aabfe77
fix: Solving the timezone issue in Redis, as well as the problem of MySQL logs always being in UTC timezone. (#268) 2023-11-15 20:48:52 +08:00
pycook 01fcd7f80e
Dev api 231108 (#264) 
* perf(api): commands add-user

* feat(api): add commands cmdb-agent-init
 2023-11-09 11:32:54 +08:00
pycook c711c3d3fd
feat(api): encrypting webhook configurations (#255) 2023-11-07 17:15:24 +08:00
pycook 2ae4aeee67 fix(api): Code scanning alerts (#254) 2023-11-06 14:27:30 +08:00
pycook 46238b8b51 Dev api 1103 (#252) 
feat(api): update requirements
 2023-11-06 13:24:08 +08:00
pycook 8ef4edb7d2 fix(api): search sort misses cache (#251) 2023-11-03 12:01:44 +08:00
pycook 0172206c7c fix(api commands): cmdb-password-data-migrate (#249) 2023-11-02 20:43:39 +08:00
simontigers 9d5bdf1b0d style(common-setting): clean warning (#246) 2023-10-30 17:35:34 +08:00
pycook c0726b228d fix(api): secrets 2023-10-30 17:23:42 +08:00
pycook 5b314aa907 feat: add inner password storage and optimize flask command about inner cmdb (#248) 
Co-authored-by: fxiang21 <fxiang21@126.com>
 2023-10-30 16:48:53 +08:00
pycook 2db41dd992 Dev api password (#244) 
* fix: delete CI password data

* fix(api): update CI password to flush cache
 2023-10-29 11:42:07 +08:00
pycook 89e492c1f3 fix: delete CI password data (#243) 2023-10-29 10:53:29 +08:00
pycook d5c479f7e5 feat(cmdb-api): ci password 2023-10-28 16:55:02 +08:00
pycook b342258e75 feat(cmdb-api): CI password data store (#242) 
* add secrets,for test

* feat: vault SDK (#238)

* feat: vault SDK

* docs: i18n

* perf(vault): format code

* feat(secrets): support vault

* feat: add inner password storage

* feat: secrets

* feat: add inner password storage

* feat: add secrets feature

* perf(secrets): review

---------

Co-authored-by: fxiang21 <fxiang21@126.com>
Co-authored-by: Mimo <osatmnzn@gmail.com>
 2023-10-28 16:19:00 +08:00
pycook a30826827a fix(api): add ci (#230) 2023-10-25 13:51:29 +08:00
kdyq007 55ca2d5eb5 关闭前端密码加密；加强 ldap 用户验证 (#216) 
* [更新] python-ldap 更新到 ldap3

* [更新] 关闭前端密码加密；加强 ldap 用户验证

* Update app.js

---------

Co-authored-by: sherlock <sherlock@gmail.com>
Co-authored-by: pycook <pycook@126.com>
 2023-10-24 19:47:46 +08:00
pycook 779cd1ea9e feat: Predefined values support executing scripts (#227) 2023-10-24 19:32:43 +08:00
simontigers 7d53180a2f fix: add_employee_from_acl (#225) 2023-10-24 14:20:40 +08:00
pycook 7556dfe56b feat: add cryptography to requirements 2023-10-23 14:37:01 +08:00
pycook 44b6f2b2ad fix: acl cache 2023-10-23 13:57:06 +08:00
Evan Sung f5607d96f3 fix(common): fix 'ACLManager' object has no attribute 'create_app' (#217) 2023-10-21 11:38:19 +08:00
Evan Sung 2e85a9971b fix(ci_cache): ci cache async args (#215) 2023-10-20 12:05:19 +08:00
kdyq007 8d177266dc feat: python-ldap 更新到 ldap3 (#214) 
Co-authored-by: sherlock <sherlock@gmail.com>
 2023-10-20 09:36:38 +08:00
pycook 42d870ea4e Dev api 20231019 (#210) 
* fix(acl): get resources

* fix(celery worker): db server has gone away
 2023-10-19 11:51:34 +08:00
pycook 430308a679 fix: ci relation statistics 2023-10-18 13:35:01 +08:00
Evan Sung 3d05cef7cd feat(db): support flask migrate (#201) 
Co-authored-by: s01249 <songbing@smyfinancial.com>
 2023-10-13 15:55:26 +08:00
simontigers 30477f736e fix: common perms (#200) 2023-10-12 16:02:35 +08:00
pycook 59d9f2c79a docs: update (#194) 2023-10-10 16:53:30 +08:00
pycook 40b9bec122 feat: get messenger url from common setting 2023-10-09 20:25:27 +08:00
simontigers dd8f66a3fa fix: init company structure resource (#191) 
* fix: init company structure resource

* fix: notice_info null
 2023-10-09 19:25:49 +08:00
simontigers 8c6389b4f8 feat: notice_config access messenger (#190) 2023-10-09 17:32:20 +08:00
pycook 63ed73fa14 fix: delete user role 2023-10-09 15:40:18 +08:00
pycook ef90506916 feat: The definition of attribute choice values supports webhook and other model attribute values. 2023-10-09 15:33:18 +08:00
pycook 388134b38c release 2.3.4 2023-09-27 11:37:18 +08:00
simontigers f57d640c5d feat: add api get_notice_by_ids (#184) 2023-09-27 09:54:30 +08:00
pycook 373346e71e feat: ci triggers 2023-09-26 21:18:34 +08:00
simontigers 8e6ce05c04 feat: common notice config (#180) 2023-09-26 19:44:20 +08:00
pycook dca8781a03 fix: ci_cache 2023-09-25 15:46:07 +08:00
pycook deabebb922 refactor: CI triggers 2023-09-22 17:39:54 +08:00
simontigers cd451060e3 fix: icon svg support (#177) 2023-09-20 15:56:57 +08:00
pycook 82d4c4f961 fix date search 2023-09-18 18:15:02 +08:00
pycook 79f5dac661 fix dashboard compute 2023-09-18 13:04:50 +08:00
pycook 1a7c3fcd21 release v2.3.3 2023-09-15 17:57:39 +08:00
simontigers 7f66f7688b feat: init resource for backend (#176) 2023-09-15 15:30:30 +08:00
pycook 25ad2192fd enhance dashboard 2023-09-15 15:26:20 +08:00
pycook 881b8cc1fa cmdb-api/api/lib/resp_format.py 2023-09-12 20:01:30 +08:00
pycook 68905281f2 Detect circular dependencies when adding CIType relationships 2023-09-12 20:00:56 +08:00
pycook ebce839eaa fix upload template and add /api/v0.1/attributes/<int:attr_id>/calc_computed_attribute 2023-09-11 19:15:31 +08:00
pycook 1660139b27 Add CI relationship when creating CI, the text value removes the escape 2023-09-07 10:12:42 +08:00
pycook d82356444a move Dockerfile to docs 2023-09-05 14:49:34 +08:00
pycook 3664994cc5 import format 2023-09-02 12:09:41 +08:00
pycook 366311e59b format 2023-09-01 18:07:44 +08:00
pycook 03f2ff912d fix delete choice values 2023-08-31 16:02:24 +08:00
pycook ff9af51465 fix delete choice values 2023-08-31 15:18:15 +08:00
hu.sima d1af0eba79 feat: add cmdb custom icon manage 2023-08-31 10:49:56 +08:00
pycook 63562007df fix update attribute 2023-08-30 13:34:10 +08:00
pycook a99ecb9ea5 Merge branch 'master' of github.com:veops/cmdb 2023-08-29 14:49:21 +08:00
pycook 08f9bd9071 The default value of USE_ACL is set to True 2023-08-29 14:49:09 +08:00
pycook 17c851f354 Merge pull request #161 from simontigers/common_setting_format 
fix: company info create
 2023-08-29 11:01:25 +08:00
hu.sima 3382195a25 fix: company info create 2023-08-29 10:56:48 +08:00
pycook cd70b16eb3 Merge branch 'master' of github.com:veops/cmdb 2023-08-25 11:01:24 +08:00
pycook 2a98c00d97 update ad_ci when deleting ci 2023-08-25 10:59:38 +08:00
EvanSung ceacc0ab15 perf(ad_ci_relation): optimize ad_ci relation 2023-08-24 14:16:12 +08:00
pycook dd1c783919 add config CACHE_REDIS_PASSWORD and fix delete ci_type 2023-08-23 18:05:28 +08:00
pycook 8296e9a552 fix update ci 2023-08-22 11:34:40 +08:00
pycook 590565bdf0 Register api and commands with absolute paths 2023-08-21 20:08:23 +08:00
pycook 9e2bf3d1f0 fix merge conflict 2023-08-21 11:55:49 +08:00
pycook 7547b67805 fix g.user 2023-08-21 11:54:33 +08:00
EvanSung b16bfdfa03 fix(acl): g user issue 2023-08-17 18:40:45 +08:00
pycook ece24080d5 fix MyJSONEncoder 2023-08-16 21:28:27 +08:00
pycook d8e09d449e Merge branch 'master' of github.com:veops/cmdb 2023-08-16 13:00:44 +08:00
pycook 44c99e0f2e Delete user without soft delete 2023-08-16 13:00:30 +08:00
pycook 29ed4dd708 Merge pull request #154 from simontigers/common_setting_format 
fix: init-import-user-from-acl
 2023-08-15 20:47:36 +08:00
hu.sima dbcbe33ba0 fix: init-import-user-from-acl 2023-08-15 20:45:28 +08:00
pycook ed340a1c33 Merge pull request #153 from simontigers/common_setting_format 
fix: import_user_from_acl
 2023-08-15 20:25:09 +08:00
hu.sima 17ee7622b4 fix: import_user_from_acl 2023-08-15 20:19:45 +08:00
pycook 1de8b492ea [update] delete roles, users, attributes 2023-08-15 19:47:59 +08:00
hu.sima 9ca2d38307 fix: default arg value 2023-08-10 19:05:56 +08:00
hu.sima 88960c3082 fix: remove useless 2023-08-10 18:55:32 +08:00
hu.sima d4f5713e0a fix: remove unused column 2023-08-10 16:29:52 +08:00
hu.sima 790204ea28 style: format common setting 2023-08-10 15:30:01 +08:00
EvanSung bf92b89a5f optimize(auth): auth request json 2023-08-10 10:43:59 +08:00
pycook 7ddaa143da fix celery config 2023-08-08 16:33:24 +08:00
pycook dcf768376a upgrade celery 2023-08-08 13:16:07 +08:00
pycook 934d00e87d upgrade flask to 2.3.2 and replace g.user with current_user 2023-08-06 21:54:18 +08:00
pycook 9d421993a0 Merge pull request #138 from lovvvve/fix_ldap 
fix ldap login
 2023-08-04 11:31:58 +08:00
songbing01249 33e63c762f fix(trigger): session invalid issue 2023-08-02 18:22:42 +08:00
lovvvve 53b2a228ae fix ldap login 2023-08-01 11:27:29 +00:00
pycook c687e7ad9b Merge pull request #134 from veops/dependabot/pip/cmdb-api/pillow-9.3.0 
Bump pillow from 9.2.0 to 9.3.0 in /cmdb-api
 2023-08-01 15:57:02 +08:00
hu.sima 1ebe74d966 fix: remove pandas 2023-08-01 15:32:44 +08:00
dependabot[bot] 1f935d25a2 Bump pillow from 9.2.0 to 9.3.0 in /cmdb-api 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.2.0 to 9.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.2.0...9.3.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-01 05:51:16 +00:00
pycook 14e4dbacac Merge branch 'master' of github.com:veops/cmdb 2023-08-01 13:47:34 +08:00
pycook f7a9257e16 fix dependabot alerts 2023-08-01 13:47:11 +08:00
pycook 99562df6cd fix dependabot alerts 2023-08-01 13:46:47 +08:00
pycook 630013cb85 Merge pull request #130 from veops/dependabot/pip/cmdb-api/certifi-2023.7.22 
Bump certifi from 2023.5.7 to 2023.7.22 in /cmdb-api
 2023-08-01 13:14:25 +08:00
pycook a26c9ff542 fix delete ci_type 2023-07-31 18:39:33 +08:00
dependabot[bot] 5016464016 Bump certifi from 2023.5.7 to 2023.7.22 in /cmdb-api 
Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.5.7 to 2023.7.22.
- [Commits](https://github.com/certifi/python-certifi/compare/2023.05.07...2023.07.22)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-25 23:35:30 +00:00
pycook 5140c0a58f add command cmdb-index-table-upgrade 2023-07-25 10:31:30 +08:00
pycook 83e9172722 废弃3个表: c_value_datetime c_value_floats c_value_integers, time类型属性值增加写入校验 2023-07-24 21:55:00 +08:00
pycook 341e687987 禁止删除唯一标识的属性 2023-07-21 15:58:41 +08:00
songbing01249 49d612d8db fix(ci_type_group_manager): fix resources issues 2023-07-20 11:01:25 +08:00
pycook abc83db77b PyJWT==2.4.0 2023-07-13 17:07:33 +08:00
lovvvve c6e150a3df Update click_cmdb.py 
add-user remove --is_admin
 2023-07-13 15:49:35 +08:00
lovvvve 7c83f9dca7 Update click_cmdb.py 
add-user  remove --is_admin
 2023-07-13 15:18:47 +08:00
pycook 1861d24593 update requirements 2023-07-12 15:32:46 +08:00
pycook 4495f006c0 docker-compose is ok 2023-07-11 18:22:17 +08:00
pycook 6c56757a9d docker-compose is ok 2023-07-11 18:12:22 +08:00
pycook 109d4f1a2e 前后端全面升级 2023-07-10 20:13:39 +08:00
pycook db5ff60aff 前后端全面升级 2023-07-10 20:07:20 +08:00
lovvvve 98c7f97274 fix: 🐛 db search 
Escape ":" character in SQLAlchemy
 2021-11-10 18:56:42 +08:00
x-7 7936b9cb09 Update ci.py 
cmdb-api:add attr check in ci_manager update method
 2021-04-21 19:17:05 +08:00
lovvvve 3c6cc7f91b Update value.py 
value type 是 int 或 float 时 value 值等于 0 是会删除 的 BUG
 2021-01-28 16:57:20 +08:00
lovvvve 8a5dadcaa4 Update ci.py 
兼容 py2
 2021-01-28 16:56:04 +08:00
lovvvve 08fcac6a12 Update value.py 2021-01-28 16:46:19 +08:00
lovvvve 103596238e Update value.py 
feat(AttributeValueManager.create_or_update_attr_value()): AttributeValue update skip The same value
 2021-01-28 16:32:53 +08:00
lovvvve 889d9155bc Update value.py 
feat(AttributeValueManager.create_or_update_attr_value()): AttributeValue update skip The same value
 2021-01-28 16:30:17 +08:00
lovvvve e6d3c34f75 Update ci.py 
feat(CiManager.add()): Check the attribute is in the ci_type attributes list
 2021-01-28 16:27:56 +08:00
pycook 6f7b0a3b76 add command: add-user | del-user 2020-06-11 21:37:41 +08:00
pycook 91647767ed Fix: spelling mistakes 2020-05-28 20:28:49 +08:00
pycook 66476ed254 Fix the judgment of app admin 2020-04-07 18:02:26 +08:00
pycook ba2a6a65b5 auth with ldap 2020-04-01 20:30:44 +08:00
pycook 486fcac138 UI: batch update relation 2020-04-01 11:09:41 +08:00
pycook 84b7b53a73 fix: delete attribute 2020-03-23 15:49:33 +08:00
pycook 8ea0379a0d Fix: permission management 2020-03-13 10:30:21 +08:00
what a9aff714d1 Change Pipfile 2020-03-07 21:51:37 +08:00
what 040986df20 Change the requirements to support python3.8 2020-03-07 21:20:46 +08:00
pycook 9ef6d3e955 fix case sensitive of ES search 2020-02-28 14:32:51 +08:00
pycook 28888a04ee Merge branch 'develop' of https://github.com/pycook/cmdb into develop 2020-02-23 23:13:59 +08:00
pycook e7c004fa19 alter table c_preference_relation_views column name varchar(64) 2020-02-23 23:13:22 +08:00
pycook 93c0eefe3c Merge pull request #36 from OhBonsai/develop 
test: add ci and ci relation crud test cases
 2020-02-23 23:12:36 +08:00
pycook 9c47d9c733 add library future 2020-02-21 23:29:20 +08:00
penzai 91c844ba63 test: add ci and ci relation crud test cases 2020-02-18 22:05:13 +08:00
penzai b798d5e2cc test: add some test cases 2020-02-16 18:03:33 +08:00
penzai 7b3f95b41d model: allow origin and ticket_id nullable in OperationRecord 2020-02-16 18:03:08 +08:00
penzai 82c921bb88 auth: add user in flask.g when auth by jwt 2020-02-16 18:02:24 +08:00
penzai d2f3589154 fix: recycle import by celery task 2020-02-16 09:39:33 +08:00
pycook 87deba2e46 fix jwt decode 2020-02-06 09:59:24 +08:00
Bonsai 90a97402ef Merge pull request #2 from pycook/master 
merge from main repo
 2020-02-04 10:56:03 +08:00
penzai 362122952b test: add ci_type test cases 2020-02-04 10:54:16 +08:00
penzai 00f4eeb90d fix: update attribute group without name params will fail. #tests/test_cmdb_ci_type.py::test_update_attribute_group_ci_type 2020-02-04 10:53:07 +08:00
pycook 356cf58135 /ci_types/<int:type_id>/attributes/transfer and /ci_types/<int:type_id>/attribute_groups/transfer 2020-01-19 17:59:32 +08:00
penzai bb9d7da435 Merge remote-tracking branch 'origin/master' 2020-01-17 15:10:16 +08:00
penzai 1fa9bf8880 test: add basic test code and attribute create api test case 2020-01-17 15:08:46 +08:00
pycook 5931e9879b [fix] cycle import 2020-01-15 11:52:33 +08:00
pycook d82dc10451 flush cache when delete attribute 2020-01-15 09:06:31 +08:00
pycook 705f4916b9 [fix] delete CIType's attribute 2020-01-14 20:52:36 +08:00
pycook d8d48e6d13 api docs update 2020-01-06 21:54:33 +08:00
pycook 4e7e853173 [fix] validate attribute is required 2019-12-24 20:37:32 +08:00
pycook 317a16aa21 support JSON type 2019-12-23 18:51:33 +08:00
pycook 92183423df Modify code organization 2019-12-18 23:33:22 +09:00
pycook 5f6ce54875 rm 2016-01-01 09:41:15 +08:00
pycook 7fc9e2eb05 config update 2015-12-29 10:39:29 +08:00
pycook a91f409525 first commit to github 2015-12-29 10:35:10 +08:00