Commit Graph
13119 Commits
Author SHA1 Message Date
Zexi Li b7901c2834 Merge pull request #9763 from wanyaoqi/automated-cherry-pick-of-#9762-upstream-release-3.7
Automated cherry pick of #9762: feat(region): stop guest before freeze
2021-01-05 18:32:42 +08:00
Zexi Li 0e272e57d2 Merge pull request #9761 from lvyangyang/automated-cherry-pick-of-#9760-upstream-release-3.7
Automated cherry pick of #9760: fix(region): replace cloud tags
2021-01-05 18:31:24 +08:00
wanyaoqi 3c7f2ff16d feat(region): stop guest before freeze 2021-01-05 15:15:40 +08:00
lvyangyang 499f4624b4 fix(region): replace cloud tags 2021-01-05 14:48:46 +08:00
Zexi Li 857c9f2278 Merge pull request #9759 from zhaoxiangchun/automated-cherry-pick-of-#9757-upstream-release-3.7
Automated cherry pick of #9757: fix(monitor): modify totalrecord query
2021-01-04 15:57:13 +08:00
zhaoxiangchun 5e054a25ad fix(monitor): modify totalrecord query
1. influxdb 增加abs function
2. 调整total报警记录接口query
2021-01-04 15:41:26 +08:00
7e60397c15 Automated cherry pick of #9752: feature(region): sync cloud tags to local user tags (#9753)
* refact(region): sync cloud tags to user tags

* fix(region): sync exttags to user tags

Co-authored-by: lvyangyang <lvyangyang@yunion.cn>
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2021-01-03 00:18:24 +08:00
Zexi Li 52ad3d961c Merge pull request #9755 from zhaoxiangchun/automated-cherry-pick-of-#9754-upstream-release-3.7
Automated cherry pick of #9754: feat(monitor): get today alerting resource info
2020-12-31 20:23:22 +08:00
zhaoxiangchun 376d18e5eb feat(monitor): get today alerting resource info
1.提供接口获取当前时间发生报警的资源统计
2020-12-31 20:06:01 +08:00
Zexi Li 894835907c Merge pull request #9688 from ioito/automated-cherry-pick-of-#9686-upstream-release-3.7
Automated cherry pick of #9686: fix(region): skip cloud image sync error
2020-12-30 21:44:10 +08:00
Zexi Li 0ffbb8cc6e Merge pull request #9737 from zhaoxiangchun/automated-cherry-pick-of-#9735-upstream-release-3.7
Automated cherry pick of #9735: fix(monitor): modify rds,redis,oss field descriptions
2020-12-30 21:43:11 +08:00
Zexi Li 415b95dc88 Merge pull request #9732 from ioito/automated-cherry-pick-of-#9730-upstream-release-3.7
Automated cherry pick of #9730: fix(cloudevent): cloudevent is domain level resource
2020-12-30 21:42:27 +08:00
Zexi Li 1c8f957152 Merge pull request #9728 from ioito/automated-cherry-pick-of-#9727-upstream-release-3.7
Automated cherry pick of #9727: fix(region): rds list with secgorups info
2020-12-30 21:41:44 +08:00
Zexi Li 1538cf3a02 Merge pull request #9733 from wanyaoqi/automated-cherry-pick-of-#9731-upstream-release-3.7
Automated cherry pick of #9731: fix(region): server start check host memory is enough
2020-12-30 21:39:42 +08:00
Zexi Li 3daa440db9 Merge pull request #9745 from rainzm/automated-cherry-pick-of-#9744-upstream-release-3.7
Automated cherry pick of #9744: fix(esxiagent): nicIndex should be incremented
2020-12-30 21:35:51 +08:00
rainzm 02931f509f fix(esxiagent): nicIndex should be incremented 2020-12-30 19:01:26 +08:00
Zexi Li 7ff4879ee3 Merge pull request #9726 from zhaoxiangchun/automated-cherry-pick-of-#9724-upstream-release-3.7
Automated cherry pick of #9724: feat(suggestion,apigateway): add analysispredict climc
2020-12-30 18:54:48 +08:00
Zexi Li 85de670c3b Merge pull request #9743 from rainzm/automated-cherry-pick-of-#9742-upstream-release-3.7
Automated cherry pick of #9742: fix(region): obtain ProviderFactory correctly
2020-12-30 18:53:38 +08:00
rainzm b7b903ff67 fix(region): obtain ProviderFactory correctly
The provider of the region is not necessarily the same as the resource
2020-12-30 16:29:08 +08:00
zhaoxiangchun d88ec4c39c fix(monitor): modify rds,redis,oss field descriptions
1.修改后端redis,rds,oss desc 信息,和前端索引进行对应
2020-12-30 15:51:09 +08:00
wanyaoqi 678f2b3dd4 fix(region): server start check host memory is enough 2020-12-30 15:48:09 +08:00
Qu Xuan 84b9e1fb00 fix(cloudevent): cloudevent is domain level resource 2020-12-30 15:47:37 +08:00
Qu Xuan 5e736e1838 fix(region): rds list with secgorups info 2020-12-30 14:18:18 +08:00
zhaoxiangchun b0293b11f6 feat(suggestion,apigateway): add analysispredict climc 2020-12-30 14:06:36 +08:00
Zexi Li 7c3b6cd52a Merge pull request #9705 from bistuzx/automated-cherry-pick-of-#9675-upstream-release-3.7
Automated cherry pick of #9675: feat(meter): add meter budget&event module
2020-12-29 23:18:31 +08:00
bistuzx@163.com 66d2820f01 fix reservation columns 2020-12-29 22:47:43 +08:00
bistuzx@163.com fe1e9ff936 add cost&prepaid_cost to reservation 2020-12-29 22:47:43 +08:00
bistuzx@163.com 802f2d9f4d fix budget import format 2020-12-29 22:47:43 +08:00
bistuzx@163.com 2fbe01505d fix reservation import format 2020-12-29 22:47:43 +08:00
bistuzx@163.com 3d82632e96 add meter budget&event&reservation module 2020-12-29 22:47:43 +08:00
Zexi Li 37d1c7f55d Merge pull request #9721 from swordqiu/automated-cherry-pick-of-#9701-upstream-release-3.7
Automated cherry pick of #9701: fix(region): omit vpc quota check if vpc created by owner
2020-12-29 21:34:13 +08:00
Zexi Li 5c2cc0b9ee Merge pull request #9722 from swordqiu/automated-cherry-pick-of-#9719-upstream-release-3.7
Automated cherry pick of #9719: fix(cloudcommon): splitable may not initialize underlying table
2020-12-29 21:17:28 +08:00
Qiu Jian 658c59327a fix(cloudcommon): splitable may not initialize underlying table 2020-12-29 21:02:03 +08:00
Zexi Li 71eb869549 Merge pull request #9715 from wanyaoqi/automated-cherry-pick-of-#9711-upstream-release-3.7
Automated cherry pick of #9711: fix(region,host,host-deployer): sync status chekc block jobs
2020-12-29 20:43:30 +08:00
Zexi Li 5704ae496d Merge pull request #9710 from rainzm/automated-cherry-pick-of-#9693-upstream-release-3.7
Automated cherry pick of #9693: Solve the permission problem of notify to create receiver
2020-12-29 20:40:55 +08:00
Zexi Li 390b78a57c Merge pull request #9707 from rainzm/automated-cherry-pick-of-#9706-upstream-release-3.7
Automated cherry pick of #9706: feat(region): multilingual timer description
2020-12-29 20:39:26 +08:00
Qiu Jian 9081b5dc4f fix(region): omit vpc quota check if vpc created by owner
Vpc quota check is omitted if vpc is create by owner user
2020-12-29 20:28:08 +08:00
wanyaoqi 5bbf364f2b fix(region,host): sync status check block jobs 2020-12-29 15:30:58 +08:00
wanyaoqi 550159af7c fix(host-deployer): add log line on blkid failed 2020-12-29 15:30:58 +08:00
wanyaoqi 447882a003 fix(climc): host add netif add params bridge/interface 2020-12-29 15:30:58 +08:00
rainzm 377177cfd2 feat(region): multilingual timer description 2020-12-29 15:23:05 +08:00
rainzm 167a65cd0e feat(db): progressive inspection when determining the required scope 2020-12-29 15:01:34 +08:00
rainzm ac8f20ca18 fix(notify): inject domain info in ReceiverManager.FetchOwnerId 2020-12-29 15:01:34 +08:00
Zexi Li de6468782e Merge pull request #9699 from zhaoxiangchun/automated-cherry-pick-of-#9698-upstream-release-3.7
Automated cherry pick of #9698: fix(monitor): sore reture info:resourceType,measurement
2020-12-29 09:34:58 +08:00
--global 333c83778f fix(monitor): sore reture info:resourceType,measurement
1.对资源类型和对应的measurement进行排序输出
2020-12-28 21:41:50 +08:00
Zexi Li d293b182f9 Merge pull request #9696 from zhaoxiangchun/automated-cherry-pick-of-#9694-upstream-release-3.7
Automated cherry pick of #9694: fix(monitor): add resType   filter
2020-12-28 21:22:32 +08:00
Zexi Li ce3a8b2872 Merge pull request #9692 from lvyangyang/automated-cherry-pick-of-#9691-upstream-release-3.7
Automated cherry pick of #9691: feat(region): add tags implement
2020-12-28 21:21:16 +08:00
--global ee00fd3196 fix(monitor): add resType filter
1.修复资源类型过滤失效的问题
2020-12-28 18:30:50 +08:00
lvyangyang 66009c3325 feat(region): add tags implement 2020-12-28 16:26:44 +08:00
Zexi Li 51e01d8cae Merge pull request #9685 from ioito/automated-cherry-pick-of-#9108-upstream-release-3.7
Automated cherry pick of #9108: Hotfix/qx guest delete
2020-12-28 16:01:24 +08:00