Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
236 commits
Select commit Hold shift + click to select a range
52e654f
update readme
pycook Jul 20, 2023
08dc343
update readme
pycook Jul 20, 2023
7c769a5
更新架构图
pycook Jul 20, 2023
e98160b
fix currentValueType
wang-liang0615 Jul 20, 2023
04b9a3c
Merge pull request #127 from veops/dev_ui
pycook Jul 20, 2023
f3d42cb
fix docker-compose
pycook Jul 20, 2023
93d9804
Merge branch 'master' of github.com:veops/cmdb
pycook Jul 20, 2023
341e687
禁止删除唯一标识的属性
pycook Jul 21, 2023
83e9172
废弃3个表: c_value_datetime c_value_floats c_value_integers, time类型属性值增…
pycook Jul 24, 2023
ee97582
style 新建属性行错乱
wang-liang0615 Jul 25, 2023
5140c0a
add command cmdb-index-table-upgrade
pycook Jul 25, 2023
c316803
授权高亮提示
wang-liang0615 Jul 25, 2023
11f69d8
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Jul 25, 2023
b787bd9
Merge pull request #129 from veops/dev_ui
pycook Jul 25, 2023
5016464
Bump certifi from 2023.5.7 to 2023.7.22 in /cmdb-api
dependabot[bot] Jul 25, 2023
6ccb2e7
fix acl change page size
wang-liang0615 Jul 27, 2023
0283af8
acl
wang-liang0615 Jul 27, 2023
928149f
common-setting
wang-liang0615 Jul 27, 2023
252003f
Merge pull request #131 from veops/dev_ui
pycook Jul 28, 2023
a26c9ff
fix delete ci_type
pycook Jul 31, 2023
3e67bb9
Merge branch 'master' of github.com:veops/cmdb
pycook Jul 31, 2023
2d96048
删除角色相关
wang-liang0615 Jul 31, 2023
6351d3a
Merge pull request #132 from veops/dev_ui
pycook Jul 31, 2023
630013c
Merge pull request #130 from veops/dependabot/pip/cmdb-api/certifi-20…
pycook Aug 1, 2023
99562df
fix dependabot alerts
pycook Aug 1, 2023
f7a9257
fix dependabot alerts
pycook Aug 1, 2023
14e4dba
Merge branch 'master' of github.com:veops/cmdb
pycook Aug 1, 2023
1f935d2
Bump pillow from 9.2.0 to 9.3.0 in /cmdb-api
dependabot[bot] Aug 1, 2023
1ebe74d
fix: remove pandas
Aug 1, 2023
ea3cdbd
Merge pull request #135 from simontigers/remove_pandas
pycook Aug 1, 2023
c687e7a
Merge pull request #134 from veops/dependabot/pip/cmdb-api/pillow-9.3.0
pycook Aug 1, 2023
53b2a22
fix ldap login
lovvvve Aug 1, 2023
33e63c7
fix(trigger): session invalid issue
Aug 2, 2023
ab0a539
Merge pull request #139 from EvanSung/fix-post-acltrigger-session-inv…
pycook Aug 2, 2023
ec3a6e0
ci 批量更新和删除的异步处理
wang-liang0615 Aug 3, 2023
c420a21
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Aug 3, 2023
6751f67
Merge pull request #142 from veops/dev_ui
pycook Aug 4, 2023
9d42199
Merge pull request #138 from lovvvve/fix_ldap
pycook Aug 4, 2023
934d00e
upgrade flask to 2.3.2 and replace g.user with current_user
pycook Aug 6, 2023
bd13f6b
fix preferenceList=>attrList
wang-liang0615 Aug 8, 2023
8b10c5c
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Aug 8, 2023
e339ad2
Merge pull request #144 from veops/dev_ui
pycook Aug 8, 2023
dcf7683
upgrade celery
pycook Aug 8, 2023
157361c
Merge branch 'master' of github.com:veops/cmdb
pycook Aug 8, 2023
7ddaa14
fix celery config
pycook Aug 8, 2023
bf92b89
optimize(auth): auth request json
EvanSung Aug 10, 2023
927ed39
Merge pull request #145 from EvanSung/optimize_20230810_auth_require
pycook Aug 10, 2023
790204e
style: format common setting
simontigers Aug 10, 2023
d4f5713
fix: remove unused column
simontigers Aug 10, 2023
0aa4338
Merge pull request #146 from simontigers/common_setting_format
pycook Aug 10, 2023
88960c3
fix: remove useless
simontigers Aug 10, 2023
e61bbdb
Merge pull request #147 from simontigers/common_setting_format
pycook Aug 10, 2023
9ca2d38
fix: default arg value
simontigers Aug 10, 2023
8130dd9
增加密码明文传输
wang-liang0615 Aug 10, 2023
7272880
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Aug 10, 2023
c99790b
refactor(fe): reduce the width of resource mgt table
EvanSung Aug 10, 2023
45b82aa
Merge pull request #149 from veops/dev_ui
pycook Aug 10, 2023
3ba8382
Merge pull request #148 from simontigers/common_setting_format
pycook Aug 10, 2023
5b84a70
Merge pull request #150 from EvanSung/optimize_20230810_acl_resource_fe
wang-liang0615 Aug 10, 2023
ff061d4
update gitattributes
pycook Aug 15, 2023
522991e
后台管理-模型关联 关系删除&&筛选
wang-liang0615 Aug 15, 2023
56ef0a0
属性库
wang-liang0615 Aug 15, 2023
e22f45f
属性库
wang-liang0615 Aug 15, 2023
37d0dac
属性库
wang-liang0615 Aug 15, 2023
92bff08
属性库
wang-liang0615 Aug 15, 2023
1fe38c4
Merge pull request #152 from veops/dev_ui
wang-liang0615 Aug 15, 2023
1de8b49
[update] delete roles, users, attributes
pycook Aug 15, 2023
5187777
Merge branch 'master' of github.com:veops/cmdb
pycook Aug 15, 2023
17ee762
fix: import_user_from_acl
simontigers Aug 15, 2023
ed340a1
Merge pull request #153 from simontigers/common_setting_format
pycook Aug 15, 2023
dbcbe33
fix: init-import-user-from-acl
simontigers Aug 15, 2023
29ed4dd
Merge pull request #154 from simontigers/common_setting_format
pycook Aug 15, 2023
3989859
delete user
wang-liang0615 Aug 16, 2023
7110b4b
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Aug 16, 2023
44c99e0
Delete user without soft delete
pycook Aug 16, 2023
d8e09d4
Merge branch 'master' of github.com:veops/cmdb
pycook Aug 16, 2023
a0ea8a1
Merge pull request #155 from veops/dev_ui
pycook Aug 16, 2023
ece2408
fix MyJSONEncoder
pycook Aug 16, 2023
b16bfdf
fix(acl): g user issue
EvanSung Aug 17, 2023
4cc2e47
Merge pull request #157 from EvanSung/fix_20230817_guser_issue
pycook Aug 17, 2023
0ebd52f
lint
pycook Aug 19, 2023
4abe4d7
version: 2.3.1
pycook Aug 19, 2023
7547b67
fix g.user
pycook Aug 21, 2023
9e2bf3d
fix merge conflict
pycook Aug 21, 2023
590565b
Register api and commands with absolute paths
pycook Aug 21, 2023
8296e9a
fix update ci
pycook Aug 22, 2023
dd1c783
add config CACHE_REDIS_PASSWORD and fix delete ci_type
pycook Aug 23, 2023
23fd56c
vxe-table-plugin-export-xlsx==2.0.0
pycook Aug 24, 2023
cb3a9d9
docker-compose add flask db-setup
pycook Aug 24, 2023
ceacc0a
perf(ad_ci_relation): optimize ad_ci relation
EvanSung Aug 24, 2023
093466e
Merge pull request #158 from EvanSung/perf_20230824_optimize_ad_ci_re…
pycook Aug 24, 2023
95d3b02
fix 新增类型回车键发送两次请求
wang-liang0615 Aug 25, 2023
320dc07
fix 新增类型回车键发送两次请求
wang-liang0615 Aug 25, 2023
5044af5
Merge pull request #160 from veops/dev_ui
wang-liang0615 Aug 25, 2023
2a98c00
update ad_ci when deleting ci
pycook Aug 25, 2023
cd70b16
Merge branch 'master' of github.com:veops/cmdb
pycook Aug 25, 2023
3382195
fix: company info create
simontigers Aug 29, 2023
17c851f
Merge pull request #161 from simontigers/common_setting_format
pycook Aug 29, 2023
08f9bd9
The default value of USE_ACL is set to True
pycook Aug 29, 2023
a99ecb9
Merge branch 'master' of github.com:veops/cmdb
pycook Aug 29, 2023
6356200
fix update attribute
pycook Aug 30, 2023
f41873d
支持上传自定义图标
wang-liang0615 Aug 31, 2023
d1af0eb
feat: add cmdb custom icon manage
simontigers Aug 31, 2023
b1cfb88
Merge pull request #163 from veops/dev_ui
pycook Aug 31, 2023
3e6955f
Merge pull request #162 from simontigers/cmdb_icon_manage
pycook Aug 31, 2023
f215e88
proxy
wang-liang0615 Aug 31, 2023
04fc588
Merge pull request #165 from veops/dev_ui
wang-liang0615 Aug 31, 2023
ff9af51
fix delete choice values
pycook Aug 31, 2023
03f2ff9
fix delete choice values
pycook Aug 31, 2023
366311e
format
pycook Sep 1, 2023
3664994
import format
pycook Sep 2, 2023
ec9b5a0
sidebar
wang-liang0615 Sep 4, 2023
61e8c61
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Sep 4, 2023
6594863
Merge pull request #166 from veops/dev_ui
wang-liang0615 Sep 4, 2023
78c542e
sub menu color
wang-liang0615 Sep 4, 2023
b8fa68e
Merge pull request #167 from veops/dev_ui
wang-liang0615 Sep 4, 2023
d823564
move Dockerfile to docs
pycook Sep 5, 2023
0fa95ae
Merge branch 'master' of github.com:veops/cmdb
pycook Sep 5, 2023
d8646f8
模型关联 展示反向关系
wang-liang0615 Sep 5, 2023
6758b99
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Sep 5, 2023
f0467c3
Merge pull request #168 from veops/dev_ui
wang-liang0615 Sep 5, 2023
9e5c926
feat: support docker deploy mysql and redis
ronething Sep 5, 2023
00fbe15
add document link
ivonGwy Sep 5, 2023
33313b6
Merge pull request #169 from veops/doc
ivonGwy Sep 5, 2023
c3b55c2
Merge pull request #170 from ronething/feat/xx
pycook Sep 5, 2023
b826de4
optimize: makefile help
ronething Sep 5, 2023
eb9c20a
fix: review
ronething Sep 5, 2023
32227d3
fix: review
ronething Sep 5, 2023
c0c05bc
fix: review
ronething Sep 5, 2023
0155eb9
Merge pull request #171 from ronething/fix/makefile
pycook Sep 5, 2023
1660139
Add CI relationship when creating CI, the text value removes the escape
pycook Sep 7, 2023
198ecad
Merge branch 'master' of github.com:veops/cmdb
pycook Sep 7, 2023
6d50a13
新建ci及批量导入时,新建关系
wang-liang0615 Sep 7, 2023
0585855
Merge pull request #172 from veops/dev_ui
pycook Sep 7, 2023
99e5a93
release 2.3.2
pycook Sep 7, 2023
976cac6
计算属性 触发计算
wang-liang0615 Sep 11, 2023
3170048
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Sep 11, 2023
ebce839
fix upload template and add /api/v0.1/attributes/<int:attr_id>/calc_c…
pycook Sep 11, 2023
3cb78f3
计算属性 触发计算 (#174)
wang-liang0615 Sep 11, 2023
6890528
Detect circular dependencies when adding CIType relationships
pycook Sep 12, 2023
881b8cc
cmdb-api/api/lib/resp_format.py
pycook Sep 12, 2023
25ad219
enhance dashboard
pycook Sep 15, 2023
7f66f76
feat: init resource for backend (#176)
simontigers Sep 15, 2023
606be7f
dashboard ui update
pycook Sep 15, 2023
1a7c3fc
release v2.3.3
pycook Sep 15, 2023
79f5dac
fix dashboard compute
pycook Sep 18, 2023
82d4c4f
fix date search
pycook Sep 18, 2023
cd45106
fix: icon svg support (#177)
simontigers Sep 20, 2023
deabebb
refactor: CI triggers
pycook Sep 22, 2023
2420631
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Sep 25, 2023
b1d0bdb
pref:仪表盘优化
wang-liang0615 Sep 25, 2023
43c5d74
Merge pull request #178 from veops/dev_ui
wang-liang0615 Sep 25, 2023
dca8781
fix: ci_cache
pycook Sep 25, 2023
ff1626f
feat:新增api&适配
wang-liang0615 Sep 26, 2023
7181f28
feat:触发器
wang-liang0615 Sep 26, 2023
e0a0113
add packages & 注释代码
wang-liang0615 Sep 26, 2023
968ef93
feat: webhook tips
wang-liang0615 Sep 26, 2023
b8d93bc
feat: UI更新 触发器 (#179)
wang-liang0615 Sep 26, 2023
8e6ce05
feat: common notice config (#180)
simontigers Sep 26, 2023
b58230f
delete:删除getwx
wang-liang0615 Sep 26, 2023
9f5979c
feat:wangeditor 注册自定义组件
wang-liang0615 Sep 26, 2023
9bb787d
fix:topo图相同节点出现两次的bug
wang-liang0615 Sep 26, 2023
2b1b033
Merge branch 'master' into dev_ui
wang-liang0615 Sep 26, 2023
718fca5
Merge pull request #181 from veops/dev_ui
wang-liang0615 Sep 26, 2023
983cb40
fix:add package (#182)
wang-liang0615 Sep 26, 2023
373346e
feat: ci triggers
pycook Sep 26, 2023
42c506d
前端更新 (#183)
wang-liang0615 Sep 27, 2023
f57d640
feat: add api get_notice_by_ids (#184)
simontigers Sep 27, 2023
388134b
release 2.3.4
pycook Sep 27, 2023
c0541b7
Dev UI (#186)
wang-liang0615 Sep 28, 2023
ef90506
feat: The definition of attribute choice values supports webhook and …
pycook Oct 9, 2023
63ed73f
fix: delete user role
pycook Oct 9, 2023
8c6389b
feat: notice_config access messenger (#190)
simontigers Oct 9, 2023
d501436
前端更新 (#189)
wang-liang0615 Oct 9, 2023
dd8f66a
fix: init company structure resource (#191)
simontigers Oct 9, 2023
17b27d4
前端更新 (#192)
wang-liang0615 Oct 9, 2023
40b9bec
feat: get messenger url from common setting
pycook Oct 9, 2023
4cbf70e
release: v2.3.5
pycook Oct 9, 2023
f629558
pref:用户密钥非必填 (#193)
wang-liang0615 Oct 10, 2023
59d9f2c
docs: update (#194)
pycook Oct 10, 2023
f9ee895
Dev UI 231009 (#195)
wang-liang0615 Oct 11, 2023
c8a68bd
Dev api (#196)
pycook Oct 11, 2023
ea13432
change wechat pic
ivonGwy Oct 11, 2023
b269ef8
change wechat pic size
ivonGwy Oct 11, 2023
4fcddd1
Merge pull request #197 from veops/doc
ivonGwy Oct 11, 2023
0cd5c02
pref:批量上传&资源管理小优化 (#199)
wang-liang0615 Oct 12, 2023
30477f7
fix: common perms (#200)
simontigers Oct 12, 2023
3d05cef
feat(db): support flask migrate (#201)
EvanSung Oct 13, 2023
f8fee77
Feature db migrate 20231013 (#202)
EvanSung Oct 13, 2023
413c0df
feat:webhook body 支持非json (#203)
wang-liang0615 Oct 17, 2023
cc7570a
docs: api doc
pycook Oct 17, 2023
430308a
fix: ci relation statistics
pycook Oct 18, 2023
424cad2
fix:ci relation add type filter (#208)
wang-liang0615 Oct 18, 2023
42d870e
Dev api 20231019 (#210)
pycook Oct 19, 2023
8d17726
feat: python-ldap 更新到 ldap3 (#214)
kdyq007 Oct 20, 2023
2e85a99
fix(ci_cache): ci cache async args (#215)
EvanSung Oct 20, 2023
f5607d9
fix(common): fix 'ACLManager' object has no attribute 'create_app' (#…
EvanSung Oct 21, 2023
44b6f2b
fix: acl cache
pycook Oct 23, 2023
7556dfe
feat: add cryptography to requirements
pycook Oct 23, 2023
fff5679
fix:acl新增用户展示异常问题 (#223)
wang-liang0615 Oct 23, 2023
b6c41c0
fix:关系视图删除关系接口传参修改 (#224)
wang-liang0615 Oct 23, 2023
7d53180
fix: add_employee_from_acl (#225)
simontigers Oct 24, 2023
779cd1e
feat: Predefined values support executing scripts (#227)
pycook Oct 24, 2023
55ca2d5
关闭前端密码加密;加强 ldap 用户验证 (#216)
kdyq007 Oct 24, 2023
691b50a
Doc (#229)
ivonGwy Oct 25, 2023
a308268
fix(api): add ci (#230)
pycook Oct 25, 2023
9b050fa
Update issue templates
ivonGwy Oct 25, 2023
8ad98f4
Update issue templates
ivonGwy Oct 25, 2023
fc27dc6
Doc (#231)
ivonGwy Oct 25, 2023
321372f
Update issue templates
ivonGwy Oct 25, 2023
363b890
Doc (#232)
ivonGwy Oct 25, 2023
142b8c9
Doc (#234)
ivonGwy Oct 25, 2023
9791a18
Doc (#235)
ivonGwy Oct 25, 2023
3d716ef
feat:预定义值支持脚本&&密码存储&&一些bugfix (#239)
wang-liang0615 Oct 27, 2023
b342258
feat(cmdb-api): CI password data store (#242)
pycook Oct 28, 2023
d5c479f
feat(cmdb-api): ci password
pycook Oct 28, 2023
b090a88
release: v2.3.6
pycook Oct 28, 2023
1aeb9a2
fix(cmdb-ui): CI update password
pycook Oct 28, 2023
89e492c
fix: delete CI password data (#243)
pycook Oct 29, 2023
2db41dd
Dev api password (#244)
pycook Oct 29, 2023
c9f0de9
Dev UI 231030 (#247)
wang-liang0615 Oct 30, 2023
5b314aa
feat: add inner password storage and optimize flask command about inn…
pycook Oct 30, 2023
c0726b2
fix(api): secrets
pycook Oct 30, 2023
9d5bdf1
style(common-setting): clean warning (#246)
simontigers Oct 30, 2023
0172206
fix(api commands): cmdb-password-data-migrate (#249)
pycook Nov 2, 2023
8ef4edb
fix(api): search sort misses cache (#251)
pycook Nov 3, 2023
b1528ec
build(deps): bump browserify-sign from 4.2.1 to 4.2.2 in /cmdb-ui (#241)
dependabot[bot] Nov 6, 2023
46238b8
Dev api 1103 (#252)
pycook Nov 6, 2023
2ae4aee
fix(api): Code scanning alerts (#254)
pycook Nov 6, 2023
c711c3d
feat(api): encrypting webhook configurations (#255)
pycook Nov 7, 2023
45d3f57
Dev UI 231108 (#256)
wang-liang0615 Nov 8, 2023
c2c11b3
Revert "Dev UI 231108 (#256)" (#260)
wang-liang0615 Nov 8, 2023
422e89c
ui package update (#261)
wang-liang0615 Nov 8, 2023
af254dd
Dev api 1107 (#263)
pycook Nov 8, 2023
01fcd7f
Dev api 231108 (#264)
pycook Nov 9, 2023
249e955
build(deps): bump axios from 0.18.0 to 1.6.0 in /cmdb-ui
dependabot[bot] Nov 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.vue linguist-language=python
60 changes: 60 additions & 0 deletions .github/ISSUE_TEMPLATE/1bug.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Bug Report
description: File a bug report
title: "[Bug]: "
labels: ["☢️ bug"]
assignees:
- Selina316
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: input
id: contact
attributes:
label: Contact Details
description: How can we get in touch with you if we need more info?
placeholder: ex. email@example.com
validations:
required: false
- type: dropdown
id: aspects
attributes:
label: This bug is related to UI or API?
multiple: true
options:
- UI
- API
- type: textarea
id: happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you see!
value: "A bug happened!"
validations:
required: true
- type: input
id: version
attributes:
label: Version
description: What version of our software are you running?
value: "newest"
validations:
required: true
- type: dropdown
id: browsers
attributes:
label: What browsers are you seeing the problem on?
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
44 changes: 44 additions & 0 deletions .github/ISSUE_TEMPLATE/2feature.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Feature wanted
description: A new feature would be good
title: "[Feature]: "
labels: ["✏️ feature"]
assignees:
- pycook
body:
- type: markdown
attributes:
value: |
Thank you for your feature suggestion; we will evaluate it carefully!
- type: input
id: contact
attributes:
label: Contact Details
description: How can we get in touch with you if we need more info?
placeholder: ex. email@example.com
validations:
required: false
- type: dropdown
id: aspects
attributes:
label: feature is related to UI or API aspects?
multiple: true
options:
- UI
- API
- type: textarea
id: feature
attributes:
label: What is your advice?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you want!
value: "everyone wants this feature!"
validations:
required: true
- type: input
id: version
attributes:
label: Version
description: What version of our software are you running?
value: "newest"
validations:
required: true
36 changes: 36 additions & 0 deletions .github/ISSUE_TEMPLATE/3consultation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Help wanted
description: I have a question
title: "[help wanted]: "
labels: ["help wanted"]
assignees:
- ivonGwy
body:
- type: markdown
attributes:
value: |
Please tell us what's you need!
- type: input
id: contact
attributes:
label: Contact Details
description: How can we get in touch with you if we need more info?
placeholder: ex. email@example.com
validations:
required: false
- type: textarea
id: question
attributes:
label: What is your question?
description: Also tell us, how can we help?
placeholder: Tell us what you need!
value: "i have a question!"
validations:
required: true
- type: input
id: version
attributes:
label: Version
description: What version of our software are you running?
value: "newest"
validations:
required: true
60 changes: 60 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Bug Report
description: File a bug report
title: "[Bug]: "
labels: ["bug"]
assignees:
- pycook
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: input
id: contact
attributes:
label: Contact Details
description: How can we get in touch with you if we need more info?
placeholder: ex. email@example.com
validations:
required: false
- type: dropdown
id: type
attributes:
label: bug is related to UI or API aspects?
multiple: true
options:
- UI
- API
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you see!
value: "A bug happened!"
validations:
required: true
- type: textarea
id: version
attributes:
label: Version
description: What version of our software are you running?
default: 2.3.5
validations:
required: true
- type: dropdown
id: browsers
attributes:
label: What browsers are you seeing the problem on?
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
blank_issues_enabled: false
contact_links:
- name: veops official website
url: https://veops.cn/#hero
about: you can contact us here.

File renamed without changes.
44 changes: 44 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Feature wanted
description: A new feature would be good
title: "[Feature]: "
labels: ["feature"]
assignees:
- pycook
body:
- type: markdown
attributes:
value: |
Thank you for your feature suggestion; we will evaluate it carefully!
- type: input
id: contact
attributes:
label: Contact Details
description: How can we get in touch with you if we need more info?
placeholder: ex. email@example.com
validations:
required: false
- type: dropdown
id: type
attributes:
label: feature is related to UI or API aspects?
multiple: true
options:
- UI
- API
- type: textarea
id: describe the feature
attributes:
label: What is your advice?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you want!
value: "everyone wants this feature!"
validations:
required: true
- type: textarea
id: version
attributes:
label: Version
description: What version of our software are you running?
default: 2.3.5
validations:
required: true
Empty file added .github/config.yml
Empty file.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ pip-log.txt
nosetests.xml
.pytest_cache
cmdb-api/test-output
cmdb-api/api/uploaded_files
cmdb-api/migrations/versions

# Translations
*.mo
Expand Down Expand Up @@ -68,6 +70,7 @@ settings.py
# UI
cmdb-ui/node_modules
cmdb-ui/dist
cmdb-ui/yarn.lock

# Log files
cmdb-ui/npm-debug.log*
Expand Down
55 changes: 35 additions & 20 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,37 +1,52 @@
.PHONY: env clean api ui worker

help:
@echo " env create a development environment using pipenv"
@echo " deps install dependencies using pip"
@echo " clean remove unwanted files like .pyc's"
@echo " lint check style with flake8"
@echo " api start api server"
@echo " ui start ui server"
@echo " worker start async tasks worker"

env:
MYSQL_ROOT_PASSWORD ?= root
MYSQL_PORT ?= 3306
REDIS_PORT ?= 6379

default: help
help: ## display this help
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
.PHONY: help

env: ## create a development environment using pipenv
sudo easy_install pip && \
pip install pipenv -i https://pypi.douban.com/simple && \
pip install pipenv -i https://repo.huaweicloud.com/repository/pypi/simple && \
npm install yarn && \
make deps
.PHONY: env

docker-mysql: ## deploy MySQL use docker
@docker run --name mysql -p ${MYSQL_PORT}:3306 -e MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} -d mysql:latest
.PHONY: docker-mysql

docker-redis: ## deploy Redis use docker
@docker run --name redis -p ${REDIS_PORT}:6379 -d redis:latest
.PHONY: docker-redis

deps:
deps: ## install dependencies using pip
cd cmdb-api && \
pipenv install --dev && \
pipenv run flask db-setup && \
pipenv run flask cmdb-init-cache && \
cd .. && \
cd cmdb-ui && yarn install && cd ..
.PHONY: deps

api:
api: ## start api server
cd cmdb-api && pipenv run flask run -h 0.0.0.0
.PHONY: api

worker:
cd cmdb-api && pipenv run celery worker -A celery_worker.celery -E -Q one_cmdb_async --concurrency=1 -D && pipenv run celery worker -A celery_worker.celery -E -Q acl_async --concurrency=1 -D
worker: ## start async tasks worker
cd cmdb-api && pipenv run celery -A celery_worker.celery worker -E -Q one_cmdb_async --autoscale=5,2 --logfile=one_cmdb_async.log -D && pipenv run celery -A celery_worker.celery worker -E -Q acl_async --autoscale=2,1 --logfile=one_acl_async.log -D
.PHONY: worker

ui:
ui: ## start ui server
cd cmdb-ui && yarn run serve
.PHONY: ui

clean:
clean: ## remove unwanted files like .pyc's
pipenv run flask clean
.PHONY: clean

lint:
lint: ## check style with flake8
flake8 --exclude=env .
.PHONY: lint
Loading