邱剑
5ce6eafb4e
Merge pull request #380 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-migrate to release/2.3.0
...
* commit '24c08ed178bd8b7411a0defc92dc7ab74ffc52fd':
server migrate all some bugfix
2018-11-01 21:19:18 +08:00
Zexi Li
f1fc6cfbb2
Merge branch 'release/2.2.0' of ssh://git.yunion.io/~lizexi/onecloud into hotfix/lzx-resolve-conflict-2.3.0-20181101
2018-11-01 17:11:40 +08:00
Zexi Li
dfe8d26da5
fix: region disk specs
2018-11-01 17:04:34 +08:00
Yousong Zhou
03e2db7002
loadbalancerlistenerrules: return 409 on rule uniqueness check error
2018-10-31 12:16:41 +00:00
Yousong Zhou
aefa36bd86
loadbalancerlistenerrules: fix listing with --listener
...
internal error: getting model manager for "listener" failed"
2018-10-31 12:12:53 +00:00
邱剑
4bae3769ca
Merge pull request #394 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/snapshot-add-logevent to release/2.3.0
...
* commit '3bfc2951fea69dfe3f5eda8baad9f1933cf15d5e':
snapshot log event for billing
2018-10-31 19:51:37 +08:00
邱剑
918f047cff
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit '557d28244c144ac079fa3b5e12b2822c8988069a':
support export filter
2018-10-31 19:50:31 +08:00
邱剑
557d28244c
Merge pull request #397 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/support-get-export-keys to release/2.2.0
...
* commit '3151e782e990bdc9a815e64e26613982c72b931b':
support export filter
2018-10-31 19:50:30 +08:00
wanyaoqi
3151e782e9
support export filter
2018-10-31 19:48:10 +08:00
邱剑
13078eefc6
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'e1095c58433b9b8ec5ff62415c7fe0999bd82c50':
修复同步rule规则时未处理好port内容
2018-10-31 19:38:37 +08:00
邱剑
33863514be
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit '13078eefc6b2775f21c5e7262c4d44dd1ebf62dc':
修复同步rule规则时未处理好port内容
2018-10-31 19:38:37 +08:00
邱剑
e1095c5843
Merge pull request #395 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-sync-rules to release/2.1.0
...
* commit 'c8b52b0850f0aacee6cae5e55993d14e792a196c':
修复同步rule规则时未处理好port内容
2018-10-31 19:38:36 +08:00
屈轩
c8b52b0850
修复同步rule规则时未处理好port内容
2018-10-31 18:13:02 +08:00
wanyaoqi
3bfc2951fe
snapshot log event for billing
2018-10-31 17:42:28 +08:00
wanyaoqi
24c08ed178
server migrate all
...
some bugfix
2018-10-31 12:25:40 +08:00
李泽玺
d3dd39f88f
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit '4f0c608935b696dadc69abad67d593646c659d10':
region: usage support filter by project
2018-10-31 12:11:39 +08:00
李泽玺
4f0c608935
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '75f61cf9c86a0433b7f644d6ee1ac7e3ad79a889':
region: usage support filter by project
2018-10-31 12:11:38 +08:00
Zexi Li
7c04773c72
Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into hotfix/lzx-resolve-conflict-2.1.0-20181031
2018-10-31 12:10:39 +08:00
邱剑
788861b402
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit 'c20a18dea762a30ceae5a1d754ec62361a1b268f':
使用未更改前的bw作为old bw
2018-10-31 11:32:06 +08:00
邱剑
099449efa3
Merge pull request #377 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0
...
* commit '264e9dea6d61c33a82f640d585c19f7fb8b49a1e':
loadbalancers: show backend group name on detailed list
lbagent: add symlink to generated telegraf.conf
lbagent: remove requirement on nmap-ncap
2018-10-31 11:26:50 +08:00
Zexi Li
25c712e213
region: usage support filter by project
2018-10-30 21:39:50 +08:00
屈轩
5fe5c3c25b
使用未更改前的bw作为old bw
2018-10-30 20:06:27 +08:00
wanyaoqi
2874b808d8
fix perform action call allowfunc
2018-10-30 16:17:22 +08:00
李泽玺
2d8ab8722e
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit '3a14eeb8426f14da5ceda0cd13b4df552b80ac1c':
fix get qemu 2.12.1 vnc port error
2018-10-30 15:24:20 +08:00
wanyaoqi
6959ae4da3
fix get qemu 2.12.1 vnc port error
2018-10-30 12:08:38 +08:00
Qiu Jian
33f546aafd
重构代码，将policy从db中分离出来，代码更干净一些
2018-10-30 00:12:19 +08:00
邱剑
926fc3a3dd
Merge pull request #369 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-rbac-support to release/2.3.0
...
* commit '5a8bd4848509782e3ce953e9faae864ee09a0d8b':
改进：rpc支持
make fmt
remove slice nil check
fix quota check rbac check logic
增加 usages get 和 quotas get/update 的RBAC检查
JointModel support
改进：model资源支持rbac认证，需要打开enable_rbac选项，默认关闭。非model资源还不支持
2018-10-29 22:22:31 +08:00
邱剑
88db5a8901
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit 'bf744d8429dfed9e905ad2b862e73e408f45e1f4':
snapshot fixs
2018-10-29 19:54:32 +08:00
wanyaoqi
724169ef44
snapshot fixs
2018-10-29 19:41:43 +08:00
Yousong Zhou
264e9dea6d
loadbalancers: show backend group name on detailed list
2018-10-29 07:09:37 +00:00
Qiu Jian
740d6800ef
make fmt
2018-10-29 14:54:01 +08:00
屈轩
2197d918e6
解决冲突
2018-10-29 14:01:10 +08:00
邱剑
b32efafe17
Merge pull request #367 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-rewrite-azure to release/2.2.0
...
* commit 'e2b4f45dca1a6ec21295adb44962840476da31c1':
避免异步任务一直不返回
删除不必要的代码
rebase release/2.2.0
减少API调用次数
重写Azure
2018-10-29 11:00:12 +08:00
邱剑
eddeccc9e5
Merge pull request #371 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0
...
* commit '719a4686cef3e6a35d8ca97f79dca33825e2c26c':
lbagent: add telegraf support
2018-10-27 19:34:12 +08:00
邱剑
35a8c7a5af
Merge pull request #372 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-increase-default-quota to release/2.3.0
...
* commit 'b938ad0383237a8ef71fd4822b4a4d29b4f31985':
region: increase default quota
2018-10-27 17:46:08 +08:00
Zexi Li
b938ad0383
region: increase default quota
2018-10-27 17:41:54 +08:00
Yousong Zhou
719a4686ce
lbagent: add telegraf support
2018-10-27 09:40:38 +00:00
Qiu Jian
d069a2a469
增加 usages get 和 quotas get/update 的RBAC检查
2018-10-27 17:29:07 +08:00
李泽玺
61ddbf921f
Merge pull request #368 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-list-customize-filters to release/2.3.0
...
* commit '2cbf21655d8d298347d0b7159ffb7bda1bc2cae1':
region: make CustomizeFilterList logically
2018-10-27 15:39:15 +08:00
屈轩
0962456647
删除不必要的代码
2018-10-27 15:19:16 +08:00
Qiu Jian
d0fef591f1
改进：model资源支持rbac认证，需要打开enable_rbac选项，默认关闭。非model资源还不支持
2018-10-27 14:34:09 +08:00
Zexi Li
2cbf21655d
region: make CustomizeFilterList logically
2018-10-27 14:29:08 +08:00
Zexi Li
4e082c6bc3
usage: all.disk.attached and all.disks.detached
2018-10-26 17:02:05 +08:00
Yousong Zhou
0069e3cdce
loadbalancers: check address availablility before creation
2018-10-26 08:10:35 +00:00
Yousong Zhou
a8445e395b
loadbalancers: use managers directly
2018-10-26 07:52:01 +00:00
Yousong Zhou
a8e95e8d92
loadbalancers: clear requested address on allocation failure
2018-10-26 07:51:15 +00:00
Yousong Zhou
953513c30c
loadbalanceragents: fix hb_timeout validation
2018-10-26 06:35:58 +00:00
Yousong Zhou
d9821460f7
loadbalancers: log error content on network allocation failure
2018-10-26 06:35:58 +00:00
Yousong Zhou
5271cfb224
loadbalancers: validate loadbalancer update backend_group_id
2018-10-26 06:35:58 +00:00
Yousong Zhou
5c4945d21d
tasks: fix govet complaints
2018-10-26 06:30:43 +00:00
邱剑