Commit Graph

10832 Commits

Author SHA1 Message Date
Qiu Jian 182c96a160 update vendor 2020-07-03 16:15:23 +08:00
Qiu Jian 2183490a53 feature: keystone add support for OpenID Connection idp 2020-07-03 16:15:23 +08:00
Zexi Li f2db44c153 Merge pull request #6961 from ioito/hotfix/qx-sku-sync
fix: 优化sku同步逻辑
2020-07-03 11:40:04 +08:00
Zexi Li 9ab1caee86 Merge pull request #7017 from ioito/hotfix/qx-cloudid-sync
fix: 修复cloudid同步问题
2020-07-03 11:39:00 +08:00
Qu Xuan 02bf5b76d7 fix: 公有云子账号加域属性 2020-07-03 11:11:37 +08:00
Zexi Li 9067fb7cd3 Merge pull request #7018 from zexi/feature/suggest-alert-ignore
monitor: suggestsysalert add ignore action
2020-07-03 00:25:20 +08:00
Zexi Li 7aa3c9ddec monitor: suggestsysalert add ignore action 2020-07-02 21:19:14 +08:00
Qu Xuan 88e5119fdd fix: 修复cloudid同步问题 2020-07-02 20:45:49 +08:00
yunion-ci-robot ba950198b8 Merge pull request #7000 from tb365/bugfix/tb-lb-create-cluster-id-input-fix
cluster_id required->optional
2020-07-02 20:28:26 +08:00
Zexi Li df5e61ee7b Merge pull request #6998 from ioito/hotfix/qx-filter-by-external-id
fix: manager_id资源隔离获取
2020-07-02 20:20:00 +08:00
Zexi Li c748244555 Merge pull request #7012 from zexi/hotfix/monitor-reduce-subscription-usage
monitor: reduce subscription mysql usage
2020-07-02 20:19:16 +08:00
Zexi Li 3fc67b466d Merge pull request #7006 from wanyaoqi/bugfix/wyq/bind-mount-nfs-storage
bugfix : bind mount nfs storage path
2020-07-02 17:35:19 +08:00
Zexi Li cdf33052c1 monitor: reduce subscription mysql usage 2020-07-02 17:30:52 +08:00
wanyaoqi 322117f6d9 bind mount nfs storage path 2020-07-02 14:32:32 +08:00
tangbin 63babfed85 cluster_d required->optional 2020-07-02 11:51:45 +08:00
Zexi Li 6018058d6c Merge pull request #6981 from zexi/feature/monitor-suggest-snapshot
monitor: support suggest rule alert config
2020-07-02 10:56:34 +08:00
Zexi Li dd9ba9ede1 Merge pull request #6999 from zexi/feature/update-architecture
README: update architecture picture
2020-07-02 10:56:00 +08:00
Zexi Li bb540ff10c README: update architecture picture 2020-07-02 10:54:56 +08:00
Zexi Li fa2ce04517 Merge pull request #6994 from rainzm/fix/scalinggroup_guest
fix: Override Master and Slave for scalinggroup_guest
2020-07-02 10:34:44 +08:00
Zexi Li d902523fed Merge pull request #6988 from rainzm/vendor/jsonutils
update jsonutils
2020-07-02 10:34:11 +08:00
Zexi Li cb34ec62cd Merge pull request #6996 from tb365/feature/tb-copyright-add-license
copyright api update
2020-07-02 10:24:13 +08:00
Qu Xuan 9bb4eb5d44 fix: manager_id资源隔离获取 2020-07-02 10:17:38 +08:00
Zexi Li 7a9662c6f5 monitor: support suggest rule alert config and add snapshot_unused
driver
2020-07-01 19:31:50 +08:00
Zexi Li 9a19c2809f Merge pull request #6913 from lvyangyang/feature/openstack-migrate
add: region/openstack 迁移接入
2020-07-01 19:29:49 +08:00
Zexi Li 562db29994 Merge pull request #6990 from rainzm/fix/notify_#6643
fix the bug introduced in #6643
2020-07-01 19:26:16 +08:00
rainzm ba2b1d9bd2 fix: Override Master and Slave for scalinggroup_guest 2020-07-01 17:18:11 +08:00
rainzm 17721c4d59 fix the bug introduced in #6643 2020-07-01 16:49:54 +08:00
Zexi Li 5e363dc748 Merge pull request #6903 from ioito/hotfix/qx-project-sync
fix: 修正项目映射同步
2020-07-01 16:29:34 +08:00
rainzm ae3827f9a1 update jsonutils 2020-07-01 16:28:57 +08:00
lvyangyang 41a4188bbd add: region/openstack 迁移接入 2020-07-01 16:27:56 +08:00
tangbin 60c8c25c02 copyright api update 2020-07-01 15:00:59 +08:00
Zexi Li af19ce06c9 Merge pull request #6982 from ioito/hotfix/qx-capability-cloudid
fix: capability for cloudid
2020-07-01 14:36:49 +08:00
Qu Xuan 0b4a562f0d fix: capability for cloudid 2020-07-01 11:09:53 +08:00
yunion-ci-robot 37abaa4abd Merge pull request #6929 from wanyaoqi/feature/wyq/report-host-error-info
feature: report host error info
2020-06-30 23:24:48 +08:00
Zexi Li d76dd9171b Merge pull request #6972 from ioito/bugfix/qx-cloudid
fix: 修复cloudid问题
2020-06-30 23:07:45 +08:00
Zexi Li 1563e8bf89 Merge pull request #6975 from wanyaoqi/bugfix/wyq/fix-deploy-backup-server
bugfix: fix deploy backup server order
2020-06-30 23:07:17 +08:00
wanyaoqi 1d59ceb5d9 fix deploy backup server order 2020-06-30 22:00:34 +08:00
Qu Xuan 835261e9ea fix: 避免未本地缓存usercache 2020-06-30 21:08:50 +08:00
Qu Xuan 642af06ba9 fix: 修复cloudid问题 2020-06-30 15:07:22 +08:00
Zexi Li cc65e9c5da Merge pull request #6942 from yousong/bugfix/yousong-log
Bugfix/yousong log
2020-06-30 12:10:07 +08:00
Zexi Li 0810f6f6c7 Merge pull request #6954 from wanyaoqi/bugfix/wyq/include-system-usage
feature: usage handler include system resource
2020-06-30 12:07:47 +08:00
Zexi Li b203fbe061 Merge pull request #6962 from ioito/hotfix/qx-cloudid-sync-cloudaccount
fix: 避免同步不到其他域的云账号
2020-06-30 12:06:34 +08:00
Zexi Li ca1cb29e1f Merge pull request #6966 from ioito/hotfix/qx-cloudid-policy-sync
fix: 修复权限组权限同步异常问题
2020-06-30 12:03:30 +08:00
Zexi Li 03d1a0f6d1 Merge pull request #6964 from swordqiu/hotfix/qj-totp-verification-overhead
fix: reduce totp verification overhead
2020-06-30 12:01:30 +08:00
Zexi Li 911f7e99d7 Merge pull request #6960 from yousong/bugfix/yousong-ci
Bugfix/yousong ci
2020-06-30 12:00:50 +08:00
Zexi Li 581c397df9 Merge pull request #6970 from yousong/bugfix/yousong-informer
cloudcommon: taskman: fix table insert
2020-06-30 11:59:49 +08:00
Yousong Zhou de1e1b1008 cloudcommon: taskman: fix table insert
Fix the following error

	run error: reflect: NumField of non-struct type *taskman.STask

Fixes 08cd41b60d ("cloudcommon: taskman: SetModelManager")

Reported-by: Qu Xuan <quxuan@yunionyun.com>
2020-06-30 11:54:41 +08:00
Qu Xuan ea518358c7 fix: 优化sku同步逻辑 2020-06-30 11:04:21 +08:00
wanyaoqi dae606d289 keep input mem and cpu on create from instance snapshot 2020-06-30 11:03:24 +08:00
yunion-ci-robot 26b1d225ac Merge pull request #6917 from swordqiu/feature/qj-keystone-saml-sp
feature: 1. idp as domain resource 2. keystone support SAML IDP
2020-06-30 10:55:41 +08:00