14525 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Zexi Li	45c96f3837	Merge pull request #11663 from rainzm/hostdeployer/checkOrAddUser ... feat(hostdeployer): change UserAdd to CheckOrAddUser	2021-07-20 18:54:12 +08:00
Zexi Li	6ca9ef3e45	Merge pull request #11645 from zhaoxiangchun/feature/zxc-cloudmon-master ... feat(cloudmon): add cloudmon component	2021-07-20 10:01:51 +08:00
Zexi Li	c6c7ff2c30	Merge pull request #11679 from zexi/automated-cherry-pick-of-#11678-upstream-master ... Automated cherry pick of #11678: fix(build): baremetal arm64 build	2021-07-19 20:22:27 +08:00
Zexi Li	9617ca4379	fix(build): baremetal arm64 build	2021-07-19 20:21:25 +08:00
Zexi Li	8fb3c9c342	Merge pull request #11674 from ioito/hotfix/qx-rds-network-sync ... fix(region): rds network sync	2021-07-19 18:50:03 +08:00
Qu Xuan	155b036524	fix(region): return rds networks info	2021-07-19 17:28:36 +08:00
Qu Xuan	b8c443263b	fix(region): rds network sync	2021-07-19 17:15:09 +08:00
Zexi Li	4b5e36af87	Merge pull request #11671 from ioito/hotfix/qx-kafka-usage ... fix(region): kafka usage	2021-07-19 15:48:18 +08:00
Qu Xuan	ca7989c76d	fix(region): kafka usage	2021-07-19 15:38:07 +08:00
Zexi Li	bd3cb27061	Merge pull request #11646 from ioito/feat/qx-kafka ... Feat/qx kafka	2021-07-19 15:02:37 +08:00
Qu Xuan	d725cf0597	feat(region): add kafka sync	2021-07-19 14:40:45 +08:00
Zexi Li	53583e101d	Merge pull request #11667 from ioito/hotfix/qx-id-sql ... fix(keystone): avoid sql error	2021-07-19 14:21:56 +08:00
Zexi Li	8f73468124	Merge pull request #11664 from ioito/hotfix/qx-waf-sync-id ... fix(region): avoid aws waf sync lost id	2021-07-19 14:19:28 +08:00
Qu Xuan	4fe0e8e5be	fix(keystone): avoid sql error	2021-07-19 14:03:29 +08:00
rainzm	941b6df117	feat(hostdeployer): change UserAdd to CheckOrAddUser ... If the user already exists, use the existing user and its information; otherwise, create a new user	2021-07-19 11:15:30 +08:00
Qu Xuan	d881abf9a0	fix(region): avoid aws waf sync lost id	2021-07-19 10:57:09 +08:00
zhaoxiangchun	8fa4e577dd	feat(cloudmon): add cloudmon component	2021-07-16 12:20:52 +08:00
Zexi Li	b611779d6e	Merge pull request #11658 from ioito/hotfix/qx-azure-subscription-state ... fix(region): sync auzre subscription health status	2021-07-16 11:24:08 +08:00
Zexi Li	27ba9f4616	Merge pull request #11661 from ioito/hotfix/qx-climc-fix ... fix(climc): json tag	2021-07-16 11:13:44 +08:00
Qu Xuan	4bb922eb08	fix(climc): json tag	2021-07-16 11:06:43 +08:00
Qu Xuan	75f7188bc6	fix(region): sync auzre subscription health status	2021-07-16 10:53:16 +08:00
Zexi Li	9157bd7ba0	Merge pull request #11643 from zhaoxiangchun/feature/zxc-monitor_sheild_master ... feat(monitor): monitor alertRecord support set shield	2021-07-16 10:24:07 +08:00
Zexi Li	a351d9bcaf	Merge pull request #11641 from swordqiu/feature/qj-server-migrate-network ... feature: allow server switch network without service interruption	2021-07-15 19:17:19 +08:00
yunion-ci-robot	112f96f3c6	Merge pull request #11647 from zexi/fix/megaraid-sn-empty ... fix(baremetal): compatible with SN empty of MegaRaid	2021-07-15 18:27:04 +08:00
Zexi Li	f4c56684de	Merge pull request #11634 from rainzm/notify/get_types ... Fix for Notify Config and Robot	2021-07-15 18:26:45 +08:00
Zexi Li	e9a71b803f	Merge pull request #11657 from ioito/hotfix/qx-aws-waf-label ... fix(region): support aws waf label	2021-07-15 18:24:53 +08:00
Zexi Li	5c7bbd0131	Merge pull request #11644 from tb365/bugfix/tb-bugfix-0701401 ... azure lb sync listener frontip fix	2021-07-15 18:24:08 +08:00
Qu Xuan	144ffbf593	fix(region): support aws waf label	2021-07-15 16:42:20 +08:00
Zexi Li	625d1451f4	fix(baremetal): compatible with SN empty of MegaRaid	2021-07-15 10:29:06 +08:00
Zexi Li	7555235dc1	Merge pull request #11642 from ioito/hotfix/qx-waf-sync ... fix(region): aws waf sync	2021-07-15 09:44:12 +08:00
Zexi Li	5d22442439	Merge pull request #11637 from ioito/feat/qx-tdsql ... fix(region): add qcloud tdsql	2021-07-15 09:44:00 +08:00
Qiu Jian	d3da7426f2	fix: migrate interface before commit desc	2021-07-14 21:05:31 +08:00
Zexi Li	7cfdc7f04f	Merge pull request #11650 from bistuzx/master ... feat(meter): add meter cost conversion	2021-07-14 18:52:16 +08:00
bistuzx@163.com	afd560c6f9	add meter cost conversion	2021-07-14 18:05:59 +08:00
Qiu Jian	fe1dd1daa1	minor fixes	2021-07-14 16:53:07 +08:00
Qiu Jian	58313432f1	fix: add codes to switch bridge of ovs port	2021-07-14 16:31:22 +08:00
Qiu Jian	0d3cfac329	feature: allow server switch network without service interruption	2021-07-14 16:31:22 +08:00
zhaoxiangchun	805c80370e	feat(monitor): support monitor shield ... 1.报警屏蔽功能： 1）以报警资源为基础需求中报警数据中拆分的要求	2021-07-14 12:20:11 +08:00
tb365	05729f87ff	azure health check fix	2021-07-14 11:49:18 +08:00
Zexi Li	1490260d19	Merge pull request #11626 from swordqiu/hotfix/qj-support-bfq-io-scheduler ... fix: compatible with new io scheduler(bfq/mq-deadline) of new Linux kernel	2021-07-14 11:07:08 +08:00
tb365	9d0f27f734	azure lb sync listener frontip fix	2021-07-14 10:03:25 +08:00
Qiu Jian	0529327e13	fix: compatible with new io scheduler(bfq/mq-deadline) of new Linux kernel ... 1. support bfq/mq-deadline multiqueue io scheduler 2. add delay for link setup	2021-07-14 02:18:05 +08:00
zhaoxiangchun	0a7c587117	feat(monitor): monitor alertRecord support set shield ... 1.报警记录支持设置屏蔽时间 2.报警记录展示重构 3.报警通知中过滤已经设置屏蔽的资源	2021-07-13 20:14:39 +08:00
Zexi Li	ac13da6bb8	Merge pull request #11638 from ioito/hotfix/qx-remove-debug-info ... fix(region): remove debug info	2021-07-13 20:10:51 +08:00
Qu Xuan	809448134d	fix(region): add qcloud tdsql	2021-07-13 19:48:10 +08:00
Qu Xuan	53825d5362	fix(region): aws waf sync	2021-07-13 18:59:08 +08:00
Qu Xuan	20b151fbc2	fix(region): remove debug info	2021-07-13 17:25:58 +08:00
rainzm	8b0b4bdf30	fix(notify): init config name	2021-07-13 15:36:48 +08:00
rainzm	cd8529556d	fix(notify): init robot correctly from old data	2021-07-13 15:36:48 +08:00
rainzm	f591013358	feat(notify): Gets the available notification types for the receiver	2021-07-13 15:36:45 +08:00