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

1022 Commits

Author SHA1 Message Date
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 7d883432ac Display error message when failing to start cluster. 2016-08-21 15:30:59 +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 64c16c6c3f Add a icon of bean on page. 2016-08-10 16:45:46 +08:00
zhuyj17 e3bb1e1974 Edit alterUserTable.py 2016-08-10 15:39:32 +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
PedroLiu 1db12812eb Merge pull request #183 from PedroLiu/master 
Finished 3 issues
 2016-08-04 22:09:23 +08:00
Peidong Liu 925634cfcd Merge branch 'master' of https://github.com/PedroLiu/docklet 2016-08-04 22:04:24 +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
Peidong Liu 2054182cbf 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 21:58:08 +08:00
root fc4139b852 Fix notification 2016-08-02 16:30:17 +08:00
zhong yehong 4ba7d3c2da Merge pull request #181 from zhongyehong/customSetting 
fix bug that docklet don't create generated_password file
 2016-08-01 17:26:29 +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
zhong yehong b7fadb3489 Merge pull request #179 from zhongyehong/customSetting 
update CHANGES and VERSION
 2016-07-28 12:03:43 +08:00
zhongyehong 2da24f9176 update date 2016-07-28 12:01:53 +08:00
zhongyehong b26bb6b274 update CHANGES and VERSION 2016-07-28 12:01:11 +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
Yujian Zhu 54f9c3e084 Merge pull request #177 from FirmlyReality/history 
History
 2016-07-24 23:53:02 +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
zhong yehong eca0fe949c Merge pull request #175 from zhongyehong/customSetting 
Custom setting
 2016-07-21 20:55:48 +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
Cao, Donggang b9594f3a16 Merge pull request #173 from caodg/master 
add starting of ssh service
 2016-07-18 16:30:40 +08:00
Donggang Cao 755a7a7a59 add starting of ssh service 2016-07-18 04:27:57 -04:00
Yujian Zhu d60e79f32b Merge pull request #171 from FirmlyReality/hostconcpupercent 
Cpu percent of containers on hosts.
 2016-07-17 15:24:05 +08:00
zhuyj17 3a608caa7c Change the interval to update the info on webpage. 2016-07-17 10:22:59 +08: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
zhong yehong 82d1f93b73 Merge pull request #170 from zhongyehong/customSetting 
give user a total quota, let themselves decide how to use quota
 2016-07-16 17:28:45 +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 6397636135 add warning for update base image 2016-07-14 13:35:11 +08:00
zhongyehong b9ea18dc9f add update base image button in admin page 2016-07-11 15:19:23 +08:00
zhong yehong 4e32b718e4 Merge pull request #169 from zhongyehong/master 
mail module
 2016-07-02 17:23:48 +08:00
zhongyehong cf358de156 Merge branch 'Thinginitself-checkbox' 2016-07-02 17:16:30 +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