m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,014 Commits 1 Branch 0 Tags 4.4 MiB
Commit Graph

547 Commits

Author SHA1 Message Date
zhuyj17 78ef75b75f Fix a billing bug that avemem is not correct. 2016-10-31 10:45:33 +08:00
zhuyj17 a55a2db6e1 Fix the billing this hour bug 2016-10-30 17:29:23 +08:00
zhuyj17 2b5383dd76 Fix billing this hour bug. 2016-10-30 17:05:16 +08:00
zhuyj17 ae5d9b9fd5 Fix a bug that reason can't input a new line. 2016-10-30 16:53:23 +08:00
zhuyj17 950d533036 Billing this hour will display 0 when container is stopped. 2016-10-30 15:54:22 +08:00
zhongyehong c41771e0b7 Merge remote-tracking branch 'upstream/master' into external_login 2016-10-29 17:47:02 +08:00
zhongyehong ae3453ee39 Merge remote-tracking branch 'upstream/master' 2016-10-29 17:43:36 +08:00
zhuyj17 f1db20c8ee Add billing this hour. 2016-10-23 23:42:29 +08:00
zhuyj17 ed6d0d6486 Modify some error message. 2016-10-23 22:36:02 +08:00
zhuyj17 48424e7bf5 Modify billing parameters and let docklet send email to remind users of their beans. 2016-10-23 17:47:08 +08:00
Firmlyzhu eec5310c6a Fix the bug of stop all cluster. 2016-10-15 17:38:39 +08:00
Peidong Liu 299d98850c Merge branch 'scripts-operation' 2016-10-10 01:48:36 +08:00
Peidong Liu 563f5620ae add chpassword in /user/info 
toggle some test codes
 2016-10-10 01:32:50 +08:00
Peidong Liu 89786e4b8d script operation test 2016-10-09 14:45:04 +08:00
zhuyj17 b03e6efe28 Fix a bug. 2016-10-07 00:06:09 +08:00
zhuyj17 b03018374a Fix a bug in monitor.py 2016-10-06 15:23:59 +08:00
zhuyj17 dcb85ef739 Fix little bugs. 2016-09-26 09:33:12 +08:00
zhuyj17 fad3beecfc Fix little bugs. 2016-09-26 09:31:23 +08:00
zhuyj17 ea4ba5c1cf Fix some little bugs. 2016-09-26 09:28:05 +08:00
zhuyj17 f24f38ead4 Add approval robot. 2016-09-25 21:06:46 +08:00
zhuyj17 8dfe21acd4 Add submission time to applymsg. 2016-09-25 17:17:34 +08:00
zhongyehong becb8306ee Merge branch 'master' of https://github.com/zhongyehong/docklet 2016-09-23 17:21:05 +08:00
zhongyehong a3c04cb5bd Merge remote-tracking branch 'upstream/master' 2016-09-23 17:14:00 +08:00
zhongyehong e1f9c24b15 change the image from directory to an archive 2016-09-23 17:11:37 +08:00
zhongyehong 95177efb19 Merge remote-tracking branch 'upstream/master' 2016-09-23 16:20:28 +08:00
Bao Li b6792f6632 Merge pull request #188 from PedroLiu/master 
Now chpassword is a independent button
 2016-09-19 09:47:32 +08:00
zhuyj17 6853d39055 Administrator can agree or reject beans applications on user list page. 2016-09-17 17:50:09 +08:00
zhuyj17 051a2126f6 Prevent user from applying beans when his/her beans are not less than 1000. 2016-09-17 15:25:10 +08:00
zhuyj17 41d3db3c0e Add beans application page. 2016-09-15 18:04:12 +08:00
Firmlyzhu f39b8467e9 Add a page to display beans applications information. 2016-09-12 16:56:45 +08:00
Firmlyzhu 6712a4ad44 Add a column on User List page to display user's beans. 2016-09-12 16:15:25 +08:00
zhongyehong 316f6bb864 change the worker heartbeat ttl from 60s to 2s 2016-09-12 15:01:50 +08:00
zhuyj17 2bbca0b9d8 Add application database and some functions. 2016-09-11 17:06:52 +08:00
zhuyj17 5c61b4c6b7 Add information of current billing on history page and shrink the beans icon. 2016-09-11 11:23:38 +08:00
zhongyehong 947eea0482 Merge remote-tracking branch 'upstream/master' 2016-09-05 10:17:24 +08:00
PedroLiu 390077535a Now chpassword is a independent button 2016-09-02 23:38:02 +08:00
zhongyehong e33cd5fac1 add a button to update base image in admin page 2016-08-26 18:10:41 +08:00
zhongyehong bb8614ab65 Merge remote-tracking branch 'upstream/master' 2016-08-24 17:07:03 +08:00
zhuyj17 b8f2635e3b Fix a bug in billing_increment 2016-08-21 17:41:26 +08:00
zhuyj17 7cbf2021e3 Complete work. 2016-08-21 17:30:33 +08:00
zhuyj17 cfa40f96f6 Add update-UserTable.sh 2016-08-21 17:18:56 +08:00
zhuyj17 dcb0b91302 System will prevent user from creating,starting and scaleouting when beans are less than or equal to zero. 2016-08-18 18:09:05 +08:00
zhuyj17 522ffb81f3 Add stopall url to httprest and system will stop a user's all clusters when his beans are less than or equal to zero. 2016-08-18 17:48:59 +08:00
zhuyj17 4656b1866e Fetch data of beans from server and display it on the page. 2016-08-10 17:16:45 +08:00
zhuyj17 1230abdd4a Merge branch 'master' of https://github.com/unias/docklet into billing 2016-08-10 14:33:10 +08:00
Yujian Zhu 2f65abfba6 Merge pull request #184 from FirmlyReality/history 
Add a history page and user can query all history of created vnodes.
 2016-08-10 14:27:10 +08:00
zhuyj17 50a24d4f95 Add history page and user can query all history of created vnodes. 2016-08-07 17:10:18 +08:00
zhong yehong ab442bb14f Merge pull request #182 from iteratorlee/test1 
fix bugs on the view of notification numbers(by LiYan)
 2016-08-07 15:01:41 +08:00
Peidong Liu 2b81f1963e Add a new button to activate user quickly 
Remove password changing to avoid errors caused by auto-filling
Change the time record to current time other than UTC time
 2016-08-04 22:00:01 +08:00
root fc4139b852 Fix notification 2016-08-02 16:30:17 +08:00
zhongyehong f2e209cb42 fix bug that docklet don't create generated_password file 2016-08-01 17:24:43 +08:00
zhuyj17 c1454e14d7 Add beans to User table 2016-07-31 15:39:04 +08:00
zhuyj17 538d9642a8 Add a classmethod for billing and compute the billing value when deleting a container. 2016-07-25 00:59:18 +08:00
zhuyj17 8e9765965e Add 'Recover' action to history. 2016-07-24 23:48:12 +08:00
zhuyj17 63a2d387bd Add button to history page on status page. 2016-07-24 18:23:27 +08:00
zhuyj17 1b3c12d936 Use database to restore the cputime,runnint time and billing. 2016-07-24 17:56:12 +08:00
zhuyj17 d0ab069657 Add history in web. 2016-07-24 13:51:01 +08:00
zhuyj17 381295a59d To log when to create,start,stop and delete the container in container.py 2016-07-24 10:09:41 +08:00
Firmlyzhu 35af1df339 Add History database. 2016-07-22 17:40:40 +08:00
zhongyehong ebaceb52b9 Merge remote-tracking branch 'upstream/master' into customSetting 2016-07-21 20:51:24 +08:00
zhongyehong 8291643929 default container cpu, memory and disk can be modify in admin page 2016-07-21 19:19:53 +08:00
zhongyehong 64c228ea88 init usage info when start docklet with init mode 2016-07-21 17:43:26 +08:00
Donggang Cao 755a7a7a59 add starting of ssh service 2016-07-18 04:27:57 -04:00
zhuyj17 f73aeaf9ec To Compute cpu percent of a container on a host and display the result on webpage. 2016-07-17 10:18:30 +08:00
zhuyj17 2ab95f51da Merge branch 'master' of https://github.com/unias/docklet into hostconcpupercent 2016-07-17 08:45:00 +08:00
zhongyehong 2a03269133 give user a total quota, let themselves decide how to use quota 2016-07-15 23:35:47 +08:00
zhuyj17 ddbb2b9562 Add collection for cpu percents of containers on hosts in monitor.py. 2016-07-15 17:32:01 +08:00
zhongyehong b9ea18dc9f add update base image button in admin page 2016-07-11 15:19:23 +08:00
zhongyehong 97a90d9c89 add send email checkbox when creating notification, change the style of email checkbox 2016-07-02 17:14:19 +08:00
zhongyehong 304355dfab fix some bug in mail module 2016-07-02 17:01:25 +08:00
Thinginitself aefd2a7498 checkbox sendmail 2016-06-29 21:28:41 +08:00
zhuyj17 585420c768 Add billing to monitor and status page. 2016-06-26 21:42:25 +08:00
zhuyj17 0f00f854ac Add billing in monitor. 2016-06-26 21:30:57 +08:00
zhong yehong 066969c012 Revert "Revert "some modifications"" 2016-06-21 19:07:24 +08:00
zhong yehong f690c320e5 Revert "Revert "Add notification module"" 2016-06-21 19:05:45 +08:00
zhong yehong 652c5bb5e1 Revert "Add notification module" 2016-06-21 17:56:27 +08:00
zhong yehong 0535bcd244 Revert "some modifications" 2016-06-21 17:55:36 +08:00
zhongyehong fb28184e3b 1.add udba parameter for aufs 
2.change the icon of admin page
3.fix a display error when create cluster
 2016-06-21 17:31:44 +08:00
tangshuangpku@hotmail.com 61167b5680 还原调试设置 2016-06-18 14:07:19 +08:00
tangshuangpku@hotmail.com cca4a91726 删除文档 2016-06-18 14:04:48 +08:00
tangshuangpku@hotmail.com d54caef30e 添加新接口 2016-06-07 22:19:31 +08:00
tangshuangpku@hotmail.com afb38fb5e6 添加新接口 2016-06-07 21:55:26 +08:00
tangshuangpku@hotmail.com 2360fa94a2 添加新接口 2016-06-07 21:10:43 +08:00
tangshuangpku@hotmail.com 8344aaa4c4 添加新接口 2016-06-07 19:48:19 +08:00
tangshuangpku@hotmail.com dd4fdbca0d 添加新接口 2016-06-07 18:47:29 +08:00
tangshuangpku@hotmail.com 92c0d9c753 添加新接口 2016-06-07 18:06:55 +08:00
tangshuangpku@hotmail.com ae71f8e695 添加新接口 2016-06-07 16:21:32 +08:00
tangshuangpku@hotmail.com 849575d46f 添加新接口 2016-06-07 02:23:55 +08:00
tangshuangpku@hotmail.com c167444707 添加新接口 2016-06-07 02:06:41 +08:00
tangshuangpku@hotmail.com 7d2de3f3a8 添加新接口 2016-06-07 01:10:12 +08:00
tangshuangpku@hotmail.com d283701ddf 添加新接口 2016-06-07 01:05:55 +08:00
tangshuangpku@hotmail.com 40520d4046 添加新接口 2016-06-07 01:05:17 +08:00
tangshuangpku@hotmail.com e5f2202104 添加新接口 2016-06-07 00:01:02 +08:00
tangshuangpku@hotmail.com 1bf6534c6d 添加新接口 2016-06-06 23:14:20 +08:00
tangshuangpku@hotmail.com 56a801ee34 添加新接口 2016-06-06 23:07:58 +08:00
tangshuangpku@hotmail.com 2758156e0b 添加新接口 2016-06-06 22:52:34 +08:00
tangshuangpku@hotmail.com a0cb1b9687 添加新接口 2016-06-06 21:58:58 +08:00
tangshuangpku@hotmail.com 1d6e86856d 添加新接口 2016-06-06 21:35:28 +08:00
tangshuangpku@hotmail.com 662f3ed89a 添加新接口 2016-06-06 19:44:45 +08:00
tangshuangpku@hotmail.com c3e9fcbb22 添加新接口 2016-06-06 19:08:30 +08:00
tangshuangpku@hotmail.com 974d8e2ad5 添加新接口 2016-06-06 19:06:59 +08:00
tangshuangpku@hotmail.com 59ab207f92 添加新接口 2016-06-06 18:55:45 +08:00
tangshuangpku@hotmail.com 3717a9f46f 添加新接口 2016-06-06 18:19:35 +08:00
tangshuangpku@hotmail.com c467568b98 添加模型层 2016-06-06 15:40:58 +08:00
zhong yehong f674fc9783 Merge pull request #115 from fanshibear/master 
Limit privileges one can get via the admin page
 2016-05-30 15:45:10 +08:00
leebaok 9041bb09a1 delete some unused code 2016-05-24 16:59:06 +08:00
Peidong Liu a28743c62f fix a activating bug 2016-05-23 10:11:01 +08:00
leebaok 6dad5d9f4d Merge pull request #116 from FirmlyReality/logbug 
Logbug
 2016-05-22 10:05:22 -05:00
ooooo 82be8a8476 add more comments for independent starting of master and workers 2016-05-22 22:48:24 +08:00
zhuyj17 ec5861d67c When container is stopped, running time and disk usage will also be displayed. 2016-05-21 15:48:37 +08:00
zhuyj17 cd43e0889d Let the rpc server not to log the requests. 2016-05-21 15:28:10 +08:00
Fan Shixiong 603662a350 Limit the privileges one can get via the admin page. 2016-05-19 08:59:38 -07:00
Fan Shixiong e9175e08fb Merge branch 'master' of https://github.com/unias/docklet 2016-05-19 06:17:05 -07:00
leebaok 755f135f60 Merge pull request #110 from FirmlyReality/realtime 
Compute running time of containers.
 2016-05-17 04:13:27 -05:00
Fan Shixiong b4342d92cf Label invalid values. Enable long words to be displayed. 2016-05-16 06:24:03 -07:00
zhuyj17 bacd43a5db Compute running time of a container. 2016-05-16 10:12:10 +08:00
zhuyj17 0f03dadc0e Add running time to monitor.py 2016-05-16 00:48:17 +08:00
zhuyj17 d8092fa3f1 Move monitoring information of container to 'monitor_vnodes[owner]'. 2016-05-16 00:07:21 +08:00
Fan Shixiong 4400282343 Add administration features for administrators to configure Docklet 2016-05-15 07:12:06 -07:00
zhongyehong cdea33eb72 remove guest, fix a bug in httprest.py. 2016-05-09 15:09:55 +08:00
zhongyehong 1bdd11ea5a Merge remote-tracking branch 'upstream/master' 2016-05-09 12:49:19 +08:00
leebaok 74957e7123 Merge pull request #100 from FirmlyReality/rpcmonitor 
Use rpc to transfer monitor message.
 2016-05-08 23:13:20 -05:00
zhongyehong c7d3f1e4df change the description of data_quota and data_quota_volume 2016-05-09 12:04:19 +08:00
zhongyehong e72968fda2 fix a name error 2016-05-09 11:56:12 +08:00
zhuyj17 8c01713589 Use rpc to transfer monitor message. 2016-05-09 10:05:31 +08:00
PedroLiu 758f55a7a5 Merge pull request #98 from PedroLiu/master 
Simplify the procedure to change password
 2016-05-08 20:38:41 +08:00
Peidong Liu b8476c30e0 Simplify the procedure to change password 2016-05-08 20:35:50 +08:00
leebaok 0a248edfdb [network] overwrite inrange check of UserPool to replace EnumPool's 
Because UserPool has gateway but EnumPool not has
 2016-05-07 16:56:14 +08:00
leebaok 01084c0ba3 [network] check addr/cidr whether in range of center pool and whether overlaping some addr/cidr in pool when free addr/cidr to center pool (when delete users) 2016-05-06 23:01:13 +08:00
leebaok c919a1e85e Merge remote-tracking branch 'upstream/master' into network-ip-check 2016-05-06 21:48:10 +08:00
zhongyh16 77ec586618 change some argument name in docklet.conf.template 2016-05-06 18:00:49 +08:00
leebaok 5bbbe705b4 Merge branch 'master' into network-ip-check 2016-05-06 16:56:53 +08:00
zhongyh16 acbe31325a make data quota come true 2016-05-06 16:41:11 +08:00
zhongyh16 390da9c41b use get method instead of getvalue 2016-05-06 13:50:46 +08:00
Donggang Cao 4396710c6f fix a bug in worker.py of var not found error 2016-05-05 00:25:25 -04:00
leebaok b22a34882c Merge pull request #82 from FirmlyReality/diskbug 
Fix a bug in monitor.py, which may stop the thread.
 2016-05-04 09:07:23 -05:00
ooooo f4c5126b06 rename variable 2016-05-04 20:15:19 +08:00
ooooo ff7c5b04df fix a bug 2016-05-04 20:08:50 +08:00
ooooo 8fcdd229e3 delete method getnode in etcdlib.py 2016-05-04 11:54:24 +08:00
zhuyj17 8a1056a0bf Fix a bug in monitor.py, which may stop the thread. 2016-05-04 11:54:11 +08:00
Peidong Liu 628c478198 Fix a bug that will occur when user token expires. 
Closed the debug mode in httprest.py and web.py
Now 500 error in web.py will lead to a 500 page
500 error in httprest.py will lead to logout page
 2016-05-03 22:29:32 +08:00
leebaok 44cd289cea Master : disable debug mode of flask in httprest.py 
debug mode of flask will restart the process
	this will make some work before flask lost
 2016-05-03 19:04:58 +08:00
leebaok 6a4dae1d1c [merge] merge flask-rewrite with reuse-vlanid 2016-05-03 17:06:30 +08:00
leebaok f8bce19fa9 Merge branch 'master' of https://github.com/PedroLiu/docklet into merge-flask-rewrite 2016-05-03 16:47:19 +08:00
leebaok 7deb9852b0 Merge branch 'master' into network-ip-check 2016-05-03 16:31:15 +08:00
leebaok 9ebd3673bf Merge pull request #73 from jklj077/master 
vlan ids reusing
 2016-05-03 03:23:58 -05:00
zhuyj17 d4cbf43ed1 Using flask to display monitor info. 2016-05-03 15:31:53 +08:00
Peidong Liu 2fc5a79163 Now backend is flask-styled 
fix a bug that will cause 404 in /login/
 2016-05-03 15:31:53 +08:00
zhongyehong a0ca4e5081 Merge remote-tracking branch 'upstream/master' 2016-04-29 15:43:17 +08:00
zhongyehong 7b96837dfe add upgrade.py to upgrade some configure file 
add data space quota, but it doesn't work now
add default quota group, can change it in admin page
fix a bug when user first time to create image
 2016-04-29 15:40:53 +08:00
jklj077 e8f96133d7 fix bugs related to vlan ids reusing 2016-04-29 13:47:56 +08:00
jklj077 9906f0588f reuse vlanids 2016-04-29 12:58:48 +08:00
ooooo 996d73c3f4 Merge remote-tracking branch 'upstream/master' into separate 2016-04-27 16:37:31 +08:00
ooooo 25ba87423d fix a little bug 2016-04-27 16:36:32 +08:00
zhongyehong 961baf6ae2 add disk quota 2016-04-27 16:31:46 +08:00
ooooo a1c166bb09 use heartbeat package to keep worker alive in order to separate worker and master 2016-04-27 16:21:04 +08:00
zhuyj17 fb2148833b Add truename on Node list page. 2016-04-25 01:00:06 +08:00
zhuyj17 237ce6f26f Display disk usage on status page. 2016-04-23 18:42:04 +08:00
zhuyj17 92c839ff45 Modify the table on status and status realtime pages. 2016-04-23 17:45:49 +08:00
zhuyj17 6075fe54c4 Display owner of container on Node list page. 2016-04-23 16:37:15 +08:00
ooooo 839ea23135 separate master and worker 2016-04-20 14:50:53 +08:00
ooooo 56242920c4 test 2016-04-20 14:17:12 +08:00
leebaok 38379feb62 [network] check whether IP exists and whether IP out of pool range when releasing IP to user pool by deleting vclusters 2016-04-18 20:26:19 +08:00
ooooo cd0df9847f Merge branch 'master' of https://github.com/unias/docklet into separate 2016-04-18 18:18:36 +08:00
ooooo e313f50b5e add some comment 2016-04-18 18:16:19 +08:00
zhongyehong 3fa04c95b9 Merge remote-tracking branch 'upstream/master' into ipdist 2016-04-18 10:54:50 +08:00
zhongyehong 9fd85a54f7 clean nfs when guest restart 2016-04-18 10:54:21 +08:00
zhongyehong e30d912498 init shared_vlanids when start master without this key in etcd 
update R and python demo for basefs
 2016-04-18 10:39:24 +08:00
PedroLiu 1f29075caa Merge pull request #60 from PedroLiu/master 
2 enhancements
 2016-04-18 10:33:07 +08:00
Peidong Liu 9ec437c27a Now token will expires in 3600s 
Now workspace name will be checked, if not correct, flask will raise a 500 error
 2016-04-18 10:28:26 +08:00
zhuyj17 4000d4f9d6 Fix a bug of status page. 2016-04-18 01:36:00 +08:00
zhuyj17 5f5ee95f8c Merge branch 'master' into displayquota 2016-04-15 23:33:35 +08:00
zhongyehong 7cd40a48e0 fix a bug when create guest #49 
add hint for quota #7
 2016-04-14 17:26:30 +08:00
zhongyehong a55fcba862 the user in fundation group share vlanid #51 2016-04-14 16:32:50 +08:00
zhuyj17 9bdd012bd0 Add a table in status page to display user's quotas. 2016-04-14 15:52:44 +08:00
zhongyehong 5511e92ab2 Merge remote-tracking branch 'upstream/master' into quotaadd 2016-04-12 18:12:54 +08:00
zhongyehong be05b079c1 make image quota come true, 
fix display bug of label,
rename some quota,
 2016-04-12 18:11:34 +08:00
zhongyehong fd120f4232 add disk quota, add button on adminpage to add quota #7 
move system data to global/sys #41
 2016-04-12 15:03:00 +08:00
Donggang Cao 6963dd836d add USER/.ssh/config to disable StrictHostKeyChecking 2016-04-11 09:39:25 -04:00
zhongyehong 354ad95d77 mount tmp from host #39 2016-04-11 15:03:09 +08:00
zhongyehong 99a8bcb07f Merge remote-tracking branch 'upstream/master' 2016-04-11 15:00:48 +08:00
zhongyehong c3ecd0d2a0 Merge remote-tracking branch 'upstream/master' 2016-04-11 14:37:42 +08:00
zhuyj17 02cbccdd15 Set quota in etcd and read from etcd for each container. 2016-04-11 12:17:06 +08:00
zhuyj17 5bdf6f1404 Fix minus quota bug 2016-04-11 11:39:58 +08:00
zhuyj17 8e091a5dfc Fix quota bug. Now quota will be read from groupinfo. 2016-04-10 20:12:48 +08:00
zhongyehong bf3eb91c27 fix mismatching of nfs mountpoint #35 2016-04-10 12:52:03 +08:00
zhongyehong 9437ae4447 move sys_run code to try block #18 
use sys_run instead of self.sys_call in imagemgr.py
 2016-04-08 15:41:56 +08:00
leebaok c3134256cf [lxc.custom.conf] support lxc.custom.conf in appending mode 2016-04-07 16:44:27 +08:00
leebaok c4f1a1c041 [bug] use clusterid-containerid as container's veth.pair name 
because lxc config item length limit in 16 bytes
 2016-04-07 15:23:27 +08:00
zhong 32d56db3a6 remove some useless notes 2016-04-06 17:22:06 +08:00
zhong d409d2358e can remove quota group from web page 
can add quota with just one click
 2016-04-06 14:43:16 +08:00
zhong 402fcf8c91 Merge remote-tracking branch 'upstream/master' into adminpage 2016-04-06 13:42:05 +08:00
zhong 6a438d1444 Merge remote-tracking branch 'upstream/master' into stopbug 2016-04-06 10:39:58 +08:00
zhong 4d46f06c73 fix bug of stop container #14 2016-04-06 10:37:50 +08:00
zhuyj17 3aa87cf858 Display quota in Status page. 2016-04-05 17:41:43 +08:00
zhong 08df8532b2 move quota group from database to json file 2016-04-05 17:36:39 +08:00
leebaok 66906a1424 [Init] init repository with Docklet 0.2.6 2016-03-31 16:03:38 +08:00