Commit Graph

730 Commits

Author SHA1 Message Date
CuiZhicheng 0e0cd8110b
Merge pull request #289 from CuiZhicheng/master
fix a type error in web/web.py
2018-03-01 15:16:48 +08:00
CuiZhicheng 730a6888b8 fix a type error in web/web.py 2018-03-01 15:14:53 +08:00
Yujian Zhu d848afc523
Merge pull request #288 from FirmlyReality/master
add users' locks to port_mapping
2018-01-21 22:59:01 +08:00
zhuyj17 63d5f01d8c add users' locks to port_mapping 2018-01-21 22:57:29 +08:00
Yujian Zhu 5877440f3a
Merge pull request #287 from FirmlyReality/threading
Threading
2018-01-21 18:46:27 +08:00
Firmlyzhu b768de1345 fix a bug that it will display wrong messages when scale in the clusters. 2018-01-21 18:43:01 +08:00
Firmlyzhu 113218b2c0 add locks to operations of clusters and acquiring ids and acquiring ip addresses and port mappings 2018-01-21 18:36:42 +08:00
Yujian Zhu dfa1512296
Merge pull request #285 from FirmlyReality/master
Fix a bug of port control & a bug of update_v0.3.2.py
2018-01-07 14:23:51 +08:00
zhuyj17 61ff425f04 Fix a bug of port control & a bug of update_v0.3.2.py 2018-01-07 14:22:25 +08:00
zhong yehong bb3412014f
Merge pull request #284 from zhongyehong/master
fix a bug of update base image
2018-01-06 14:20:07 +08:00
zhongyehong 52d1e8fb82 fix a bug of update base image
prepare base image in prepare.sh
add a packagefs layer
2018-01-06 14:05:12 +08:00
Yujian Zhu 7e64c90d4f
Update CHANGES 2017-12-11 15:37:25 +08:00
Yujian Zhu 2b0979a2a7
Merge pull request #283 from FirmlyReality/master
update version and docklet.conf
2017-12-11 15:18:52 +08:00
Firmlyzhu 835a7aeaec update version and docklet.conf 2017-12-11 15:12:55 +08:00
Yujian Zhu 6f64eb6c87
Merge pull request #282 from FirmlyReality/master
update url of docklet on home.template
2017-12-11 10:39:08 +08:00
zhuyj17 e06d86ffc4 update url of docklet on home.template 2017-12-11 10:34:30 +08:00
Yujian Zhu b2fe032f6f
Merge pull request #281 from FirmlyReality/optimize_monitoring
Fix some bugs on qos
2017-12-08 17:29:47 +08:00
Firmlyzhu 8382be2837 Set 0 to unlimit the input rate limit 2017-12-08 17:27:43 +08:00
Firmlyzhu 50f1f5aa32 fix a bug on status.html when gateways are not set up 2017-12-08 16:58:32 +08:00
Yujian Zhu 3838a99c93
Merge pull request #280 from FirmlyReality/networkbillings
Networkbillings
2017-12-05 17:54:19 +08:00
Firmlyzhu 0853ec5f25 fix some bugs on billing_history 2017-12-05 17:47:06 +08:00
Firmlyzhu 8e63b80ed2 add rate graph 2017-12-05 17:04:50 +08:00
Firmlyzhu 911e7b2f6e Merge branch 'master' of https://github.com/unias/docklet into networkbillings 2017-12-05 15:54:01 +08:00
zhuyj17 51ae3d88b7 add rate graph 2017-12-05 15:50:32 +08:00
GallenShao 3247764a17
Merge pull request #279 from GallenShao/master
add billing detail and billing history detail
2017-12-04 12:05:41 +08:00
GallenShao 22745d2f04 merge branch 'beans' into master 2017-12-04 12:03:25 +08:00
GallenShao 8dc8cc2cb6 add billing detail and billing history detail 2017-12-04 11:52:45 +08:00
zhuyj17 8cd49f4c84 add network billings 2017-12-04 02:10:25 +08:00
zhuyj17 0637d81304 add monitoring of gateways 2017-12-04 01:40:04 +08:00
Yujian Zhu e7684e955b
Merge pull request #278 from FirmlyReality/networkbilling
Network Monitoring
2017-11-26 16:19:34 +08:00
Firmlyzhu db6aeda16f add hyperlink to billings document besides beans 2017-11-26 15:56:15 +08:00
zhuyj17 e1d141bc20 add update_v0.3.2.py 2017-11-26 14:53:17 +08:00
zhuyj17 0fca69aec6 add network stats to monitoring 2017-11-26 14:15:58 +08:00
zhuyj17 914431b278 add network io collector 2017-11-26 11:54:05 +08:00
zhuyj17 47b28e12e8 add description into quota editing. 2017-11-24 15:13:26 +08:00
zhuyj17 8571498063 limit quota of vnode to 2^n -3 2017-11-24 15:01:33 +08:00
zhuyj17 1dcaf5863a add ip limit 2017-11-24 11:08:29 +08:00
GallenShao cfa073a85f
Merge pull request #276 from GallenShao/master
add multiple port mapping and quota
2017-11-20 09:19:26 +08:00
GallenShao 0060cf6fab
Merge branch 'master' into master 2017-11-20 09:10:35 +08:00
Yujian Zhu 4759e29d3a
Merge pull request #274 from FirmlyReality/qos_rate_limiting
Qos rate limiting
2017-11-20 01:01:11 +08:00
zhuyj17 7ccae98b23 update status quota 2017-11-20 00:40:27 +08:00
zhuyj17 5589e8feaa fix some bugs 2017-11-19 23:25:21 +08:00
GallenShao 4ab4e5b4ca add multiple port mapping and quota 2017-11-19 22:15:07 +08:00
zhuyj17 c52b6d692c add qos of ingress rate limit and egress rate limit 2017-11-19 16:58:34 +08:00
zhong yehong 1ccf86ade9
Merge pull request #273 from zhongyehong/master
add npm registry
2017-10-29 21:21:30 +08:00
zhongyehong 0200ccc3db add npm registry 2017-10-29 21:20:37 +08:00
Junming Ma 162d86e75f Update prepare.sh 2017-10-24 18:36:29 +08:00
Junming Ma a8cb80550f Update prepare.sh 2017-10-24 18:35:30 +08:00
zhong yehong 72144aa09f Merge pull request #272 from GallenShao/master
replace lxc-info with lxc.Container.get_cgroup_item()
2017-10-20 15:52:27 +08:00
GallenShao 05498fb5ec replace lxc-info with lxc.Container.get_cgroup_item() 2017-10-16 12:12:47 +08:00