Commit Graph

12201 Commits

Author SHA1 Message Date
Zexi Li 728c576ea7 Merge pull request #8654 from swordqiu/hotfix/qj-sso-status-in-cookie
fix: save sso login status in cookie
2020-11-05 13:10:51 +08:00
Zexi Li 93b4b7008c Merge pull request #8664 from swordqiu/hotfix/qj-update-vendor-jsonutils-20201104
update vendor for jsonutils
2020-11-05 13:10:22 +08:00
Qiu Jian ca0e79effb update vendor for jsonutils 2020-11-05 11:28:37 +08:00
Zexi Li 97682f1716 Merge pull request #8661 from zexi/hotfix/scheduler-forecast-with-candidates
scheduler: forecast api with candidates result
2020-11-05 00:39:17 +08:00
Zexi Li b60e19b1b0 Merge pull request #8662 from swordqiu/hotfix/qj-server-name-historically-unique
server generate name should be historically unique
2020-11-05 00:38:08 +08:00
Qiu Jian 4431acde83 fix:
1. server generate name should be historically unique
2. ipaddr of a batch of server is in the same order as generated name
2020-11-05 00:21:12 +08:00
Zexi Li 543770694c Merge branch 'master' into hotfix/scheduler-forecast-with-candidates 2020-11-04 23:02:20 +08:00
Zexi Li 56cf88ec76 Merge pull request #8659 from zhaoxiangchun/bugfix/zxc-commonalert
commonalert bugfix
2020-11-04 23:01:44 +08:00
yunion-ci-robot 64bebb97e8 Merge pull request #8652 from yousong/feature/yousong-bgptype
Feature/yousong filter by bgptype
2020-11-04 21:11:10 +08:00
Zexi Li 0ed41b09e1 scheduler: forecast api with candidates result 2020-11-04 21:10:07 +08:00
yunion-ci-robot d96f0486a0 Merge pull request #8658 from lshmouse/typo
Fix a typo: ProviderFactor -> ProviderFactory
2020-11-04 20:54:12 +08:00
yunion-ci-robot d67ecae75e Merge pull request #8655 from lvyangyang/lyy/dns_record_name_validate
fix:域名正则校验dnsrecord name,同步中文域名取punycode
2020-11-04 18:41:09 +08:00
zhaoxiangchun 97ed340387 commonalert bugfix 2020-11-04 18:17:26 +08:00
Shaohui Liu 47d358ecb1 Fix a typo: ProviderFactor -> ProviderFactory 2020-11-04 18:10:03 +08:00
lvyangyang 73d750e1c7 fix:域名正则校验dnsrecord name,同步中文域名取punycode 2020-11-04 17:16:11 +08:00
Yousong Zhou 6464597c97 climc: network-list with multiple --bgp-type args 2020-11-04 16:48:22 +08:00
Yousong Zhou 51dafd29e7 networks: make filter by bgp types available 2020-11-04 16:48:22 +08:00
Yousong Zhou d4469ffde4 networks: list: make bgp_type available 2020-11-04 16:48:22 +08:00
Qiu Jian ae327021db fix: save sso login status in cookie 2020-11-04 16:40:57 +08:00
Zexi Li 45d8281e6e Merge pull request #8553 from swordqiu/feature/qj-keystone-sso-create-domain
feature: auto create domain for sso idp
2020-11-04 16:31:56 +08:00
Zexi Li 93d05ebd77 Merge pull request #8627 from lvyangyang/lyy/add_route
vpcPeeringConnection  add route
2020-11-04 16:26:20 +08:00
Zexi Li 5b334bfbe4 Merge pull request #8651 from swordqiu/hotfix/qj-policy-permission-data-incorrect
fix: auth permission result incorrect
2020-11-04 16:13:12 +08:00
lvyangyang 321e3c2f7c add route 2020-11-04 15:40:04 +08:00
Qiu Jian 4349cc7f98 fix: auth permission result incorrect 2020-11-04 12:04:45 +08:00
Zexi Li e3a87410c5 Merge pull request #8647 from ioito/hotfix/qx-qcloud-rds-status-and-expired-time
fix: add rds status and expired time
2020-11-04 11:22:40 +08:00
Zexi Li 8631ca1a97 Merge pull request #8637 from tb365/bugfix/tb-qcloud-redis-bugfix-20201103
Bugfix/tb qcloud redis bugfix 20201103
2020-11-04 11:21:28 +08:00
Zexi Li ab9e0ba184 Merge pull request #8633 from tb365/bugfix/tb-bugfix-20110201
Bugfix/tb bugfix 20110201
2020-11-04 11:19:42 +08:00
Zexi Li 37ee7fcf4e Merge pull request #8631 from zhaoxiangchun/bugfix/zxc-commonalert
modify monitor querycondition:
2020-11-04 11:07:50 +08:00
Zexi Li 5f163f64db Merge pull request #8628 from swordqiu/hotfix/qj-scoped-policy-filter-at-scope-project
fix: scopedpolicybindings filter by scope project
2020-11-04 10:59:27 +08:00
Zexi Li b398ad99fc Merge pull request #8640 from rainzm/verify/template
fix(notify): customize the title of the verification email based on the copyright
2020-11-04 10:58:18 +08:00
yunion-ci-robot acff2f6a09 Merge pull request #8643 from swordqiu/hotfix/qj-elasticcache-quota
fix: elasticcache quota not take effect
2020-11-04 10:54:46 +08:00
Qu Xuan f47f2c51e4 fix: add rds status and expired time 2020-11-04 10:46:55 +08:00
zhaoxiangchun d45c096390 modify monitor querycondition:
1.对于策略可以返回多个field value。供策略进行使用
2. 对于1种情况需要在commonalert种设置metadata属性
3. 修改alertresource get driver的判断逻辑
4. 针对host 相关的measurement 默认增加res_type 过滤filter
2020-11-04 10:43:47 +08:00
TangBin c5a88b80b5 add option PrepaidDeleteExpireCheck 2020-11-04 09:57:30 +08:00
Qiu Jian 9f122f7452 fix: elasticcache quota not take effect 2020-11-04 00:56:28 +08:00
Qiu Jian 32fe10b001 fix: scopedpolicybindings filter by scope project 2020-11-03 23:12:30 +08:00
Zexi Li 6269097b3b Merge pull request #8636 from ioito/hotfix/qx-qcloud-sku-storage
fix: add qcloud hssd
2020-11-03 20:41:45 +08:00
rainzm d3aae00092 fix(notify): customize the title of the verification email based on the copyright 2020-11-03 20:24:00 +08:00
Qu Xuan 5b4efddec6 fix: add qcloud hssd 2020-11-03 19:57:19 +08:00
TangBin bbe362be2f qcloud delete prepaid redis bugfix 2020-11-03 19:33:41 +08:00
TangBin 4be09cfc0d qcloud create prepaid redis bugfix 2020-11-03 19:12:31 +08:00
TangBin 2f7781d152 lbcert cache delete bugfix 2020-11-03 17:55:43 +08:00
TangBin 0bf274f125 aws create bugfix 2020-11-03 17:55:43 +08:00
Yousong Zhou f127253e3f Merge pull request #8629 from zhaoxiangchun/feature/zxc-commonalert-dashboard
modify go test error
2020-11-03 17:00:20 +08:00
yunion-ci-robot 4c3a251dd3 Merge pull request #8532 from zexi/feature/cloudresources-schedtag
feature: support cloudprovider, cloudregion and zone schedtag
2020-11-03 16:54:46 +08:00
zhaoxiangchun 72b9f2ec77 modify go test error 2020-11-03 15:22:26 +08:00
yunion-ci-robot aa1a511c0f Merge pull request #8586 from zhaoxiangchun/feature/zxc-commonalert-dashboard
modify monitor dashboard save:
2020-11-03 14:28:46 +08:00
Zexi Li 3a29fda075 Merge pull request #8621 from rainzm/webhook/domain
NotifyWebhook for domain
2020-11-03 11:49:41 +08:00
Zexi Li 8f3cb2de67 Merge pull request #8625 from ioito/hotfix/qx-qcloud-rds-ro
fix: avoid not found cdbro- mysql instance
2020-11-03 11:48:54 +08:00
Qu Xuan dc59a08721 fix: avoid not found cdbro- mysql instance 2020-11-03 11:05:50 +08:00