Commit Graph

703 Commits

Author SHA1 Message Date
barnettZQG
c221724bc6 Merge branch 'V3.7' 2018-10-24 10:20:33 +08:00
zhoujunhao
3f64309cd8 [ADD] Add team resource limits 2018-10-23 18:11:27 +08:00
zhoujunhao
ca491272aa [REV] Optimize api component initialization data flow 2018-10-19 15:33:50 +08:00
zhoujunhao
23bb3e0120 [FIX] Fix api component data initialization problem 2018-10-19 12:15:11 +08:00
barnettZQG
4b8aeb803c [FIX] fix code server type not pass bug in api 2018-10-18 12:38:38 +08:00
barnettZQG
60cabf2b51 [REV] remove O_DIRECT because invalid argument in gfs. 2018-10-15 21:03:39 +08:00
zhoujunhao
d59eb73709 [FIX] Fix the problem of initializing data duplication(fixed #138) 2018-10-15 14:22:59 +08:00
zhoujunhao
ce2e7eb382 Merge branch 'V3.7' of https://github.com/goodrain/rainbond
# Conflicts:
#	api/handler/service.go
2018-10-11 21:53:58 +08:00
zhoujunhao
68d6a78e6e [REV] Optimized upload io 2018-10-11 17:37:24 +08:00
zhoujunhao
adf65edea9 Merge branch 'V3.7' of https://github.com/goodrain/rainbond into V3.7 2018-10-11 17:10:25 +08:00
zhoujunhao
2ea5bae885 [REV] Kubernetes cluster resource cleanup improve(fixed #137) 2018-10-11 17:09:58 +08:00
barnettZQG
edc2aa141c [REV] support set import app local dir by env LOCAL_APP_CACHE_DIR 2018-10-11 17:06:41 +08:00
zhoujunhao
bb80239019 [FIX] Fix adding local storage error when creating app 2018-10-11 12:30:32 +08:00
zhoujunhao
3b421e11a9 [ADD] Add debug log output 2018-10-11 11:34:25 +08:00
zhoujunhao
bf188ed990 [ADD] Add debug log output 2018-10-11 11:25:19 +08:00
zhoujunhao
4efa1529a4 Merge branch 'V3.7' of https://github.com/goodrain/rainbond 2018-10-09 23:44:01 +08:00
zhoujunhao
441b9e5ddc [REV] Optimization start command modification does not take effect on the problem (fixed #133) 2018-10-09 19:00:17 +08:00
barnettZQG
1dc22cc25c [REV] merge branch 3.7 to master 2018-10-08 12:25:05 +08:00
zhoujunhao
b878052820 [DEL] Delete useless routes 2018-09-28 14:30:50 +08:00
zhoujunhao
789609e67f [REV] Optimize the upload file process 2018-09-28 13:09:25 +08:00
zhoujunhao
24b1a2b5cc [REV] When the import record is not found, the return status is uploading 2018-09-28 11:03:33 +08:00
zhoujunhao
fe9722a4ad [REV] Optimize interface return status 2018-09-28 10:34:35 +08:00
zhoujunhao
09d311bdf5 [ADD] add new upload method 2018-09-27 19:24:15 +08:00
zhoujunhao
e541820259 [REV] After the import status is obtained, if the query does not find the eventId, the return status is importing 2018-09-27 14:31:52 +08:00
zhoujunhao
a9ee8a3025 [REV] Specification error code return 2018-09-27 12:38:25 +08:00
barnettZQG
d6ab828fba [REV] remove useless debug log 2018-09-26 22:06:41 +08:00
barnettZQG
66d1a2d8aa [REV] upload api support Access-Control-Allow-Origin 2018-09-26 22:02:02 +08:00
zhoujunhao
8d85d6d6fe [ADD] Add a test upload plan 2018-09-26 16:12:28 +08:00
zhoujunhao
6a077c268b [ADD] add files upload 2018-09-26 14:15:38 +08:00
zhoujunhao
3b7472ef44 [REV] After importing the cleanup directory, change the status to cleaned 2018-09-25 21:55:51 +08:00
zhoujunhao
d75f2eb97d [REV] Create a directory when the directory does not exist 2018-09-25 19:14:08 +08:00
zhoujunhao
23dd96dc13 [REV] Successfully returned when the directory does not exist, the result is empty 2018-09-25 17:46:31 +08:00
zhoujunhao
756a0ed404 [REV] Change the tar file to a zip file 2018-09-25 17:38:47 +08:00
zhoujunhao
c34b443824 [REV] 2018-09-25 16:27:56 +08:00
zhoujunhao
24cc01b43c [ADD] Add upload error log output 2018-09-25 15:41:19 +08:00
zhoujunhao
7d97547ecb [ADD] add CORS 2018-09-25 15:23:36 +08:00
zhoujunhao
e17eca36f4 [ADD] Upload file support options method 2018-09-25 14:42:06 +08:00
barnettZQG
546f6025d4 [REV] change proxy url parse method for golang 1.11 2018-09-20 17:12:56 +08:00
barnettZQG
e20d509a25 Merge branch 'V3.7' 2018-09-19 18:52:10 +08:00
barnettZQG
823d63a736 [FIX] fix share image name failure bug. 2018-09-19 18:51:16 +08:00
zhoujunhao
8462f33ece [ADD] Add abandon import api 2018-09-12 11:42:10 +08:00
Zhang Jiajun
458cac28f9 [REV] Add rest api to websocket group for import application. 2018-09-11 10:48:55 +08:00
barnettZQG
eb0ea49e1d [REV] update import app code 2018-09-10 18:12:08 +08:00
barnettZQG
57fe44460b [REV] merge branch V3.7 to master 2018-09-02 23:17:56 +08:00
zhoujunhao
924b56cf9b [FIX] fix bug 2018-08-31 15:35:34 +08:00
zhoujunhao
2d3ec0c390 [ADD] add apply exception event query 2018-08-31 15:24:25 +08:00
zhoujunhao
de7822f7f6 [ADD] add Application instance memory monitoring 2018-08-31 15:04:21 +08:00
barnettZQG
77ff96fb5c [REV] change event log save to file 2018-08-31 12:19:27 +08:00
zhoujunhao
d850ee8e56 [ADD] Add exception event handling in grctl 2018-08-30 17:49:54 +08:00
zhoujunhao
677f71c8cd [FIX] fix bug 2018-08-29 11:08:27 +08:00
zhoujunhao
88ebfc45b4 [FIX] fix bug 2018-08-29 10:48:23 +08:00
zhoujunhao
7c81ca321b [FIX] fix bug 2018-08-29 10:44:58 +08:00
zhoujunhao
9acde33a92 Merge branch 'V3.7' of https://github.com/goodrain/rainbond
# Conflicts:
#	node/core/service/node_service.go
2018-08-27 12:51:54 +08:00
zhoujunhao
615f7bfac4 [ADD] add installation log download 2018-08-27 12:28:36 +08:00
zhoujunhao
56adf09ca2 Merge branch 'V3.7' of https://github.com/goodrain/rainbond
# Conflicts:
#	api/region/node.go
#	grctl/cmd/node.go
#	node/api/model/model.go
#	node/nodem/client/node.go
2018-08-23 10:36:28 +08:00
zhoujunhao
f44ef3ca5a [REV] Add node resource statistics in grctl 2018-08-22 19:16:54 +08:00
zhoujunhao
cc009f28fa [FIX] fix bug 2018-08-22 17:24:13 +08:00
zhoujunhao
bff2e520e7 [ADD] add display node resources in grctl 2018-08-22 16:06:28 +08:00
zhoujunhao
5c88773b21 [ADD] add display node resources in grctl 2018-08-22 16:00:53 +08:00
zhoujunhao
6663064356 [FMT] Delete extra log prints 2018-08-17 15:44:35 +08:00
zhoujunhao
97f67aeed9 [REV] Grammar optimization 2018-08-17 13:51:17 +08:00
zhoujunhao
84b6864575 [FIX] fix bug 2018-08-17 12:40:14 +08:00
zhoujunhao
5789a7a2ef [ADD] add logs print 2018-08-17 12:01:54 +08:00
zhoujunhao
4d786a8a73 [ADD] Add detailed log output 2018-08-17 11:31:59 +08:00
zhoujunhao
71793a5989 [ADD] Add verbose log output 2018-08-17 11:02:57 +08:00
zhoujunhao
284a8aefd5 [ADD] add Add pod and container memory monitoring 2018-08-16 18:21:06 +08:00
barnettZQG
8661fd2e75 [REV] merge branch v3.7 2018-08-15 10:15:31 +08:00
barnettZQG
c4c20069e5 [REV] change write pem key file type 2018-08-14 16:44:57 +08:00
barnettZQG
43d1015180 [REV] check support image hub user and pass 2018-08-10 18:22:23 +08:00
barnettZQG
130b24897d [REV] update code 2018-08-10 17:25:04 +08:00
zhoujunhao
30c71ea4e5 [REV] 2018-08-09 20:31:22 +08:00
zhoujunhao
c121b05726 [FIX] fix bug 2018-08-09 20:16:00 +08:00
zhoujunhao
0339d51d81 [FMT] 2018-08-09 18:41:29 +08:00
zhoujunhao
bea3f30d2d [FIX] fix bug 2018-08-09 18:39:30 +08:00
zhoujunhao
373cd3e461 [ADD] add fix bug print 2018-08-09 18:31:33 +08:00
zhoujunhao
3a4148bac1 [FIX] fix bug 2018-08-09 18:13:52 +08:00
zhoujunhao
79ba64b531 [ADD] add alertamnager webhooks api 2018-08-08 17:15:10 +08:00
zhoujunhao
dace6adc33 [REV] Optimize the ability to view application exception events in grctl 2018-08-08 12:18:48 +08:00
zhoujunhao
9100046962 [FIX] fix bug 2018-08-07 19:56:25 +08:00
zhoujunhao
db02cb2606 [FIX] Fix the address of the call 2018-08-07 19:23:01 +08:00
zhoujunhao
ecfec9efc9 [FMT] Delete excess output 2018-08-07 19:12:44 +08:00
zhoujunhao
31a1b888b9 [REV] Modify the invoked API interface 2018-08-07 17:57:10 +08:00
zhoujunhao
6d4010ea64 [ADD] Add a new event notification interface 2018-08-07 16:34:31 +08:00
zhoujunhao
0e4a0e5d0a [FIX] fix bug 2018-08-07 15:17:06 +08:00
zhoujunhao
5d7e1de76f [REV] Optimize state display priority 2018-08-07 14:45:37 +08:00
zhoujunhao
b52bd9f55d [ADD] add grctl show notification event 2018-08-07 14:28:15 +08:00
barnettZQG
6258a511b4 [REV] change plugin install check 2018-08-03 20:12:58 +08:00
barnettZQG
1b40ebf255 [FIX] fix get service deploy version bug 2018-08-03 20:06:23 +08:00
barnettZQG
5c53e2b2dc [ADD] add some get deploy version api 2018-08-03 15:17:10 +08:00
zhoujunhao
441da70221 [ADD] add alertmanager config 2018-08-02 16:35:02 +08:00
zhoujunhao
180c86e715 [FIX] fix determine if the file exists bug 2018-08-02 12:29:53 +08:00
barnettZQG
e8b1c44007 Merge branch 'V3.7' of https://github.com/goodrain/rainbond into V3.7 2018-08-02 12:17:07 +08:00
barnettZQG
c69cef862d [ADD] add certutil 2018-08-02 12:16:50 +08:00
zhoujunhao
db83fdebab [REV] Optimize how grctl adds rules 2018-08-02 12:08:15 +08:00
zhoujunhao
965ded02a8 [ADD] add grctl modify rules 2018-08-01 16:22:47 +08:00
Zhang Jiajun
379281e8de [ADD] Support enventlog id automatic discovery. 2018-08-01 15:43:48 +08:00
Zhang Jiajun
b04875fe45 Merge branch 'V3.7' of https://github.com/goodrain/rainbond into V3.7 2018-08-01 15:42:31 +08:00
Zhang Jiajun
6f9e6242c6 [ADD] Support enventlog id automatic discovery. 2018-08-01 15:42:15 +08:00
zhoujunhao
0e952a6275 [ADD] add grctl cmd 2018-08-01 15:40:08 +08:00
zhoujunhao
16ceeb0adf [FIX] fix output format bug 2018-08-01 13:17:42 +08:00
zhoujunhao
7062e7a688 [FIX] fix bug 2018-08-01 13:05:20 +08:00
zhoujunhao
c210cd4371 [ADD] add debug output 2018-08-01 12:56:36 +08:00
zhoujunhao
5325f8eac5 [ADD] add Get alarm rules and modify status display styles in grctl 2018-08-01 12:29:06 +08:00
zhoujunhao
ba12d437ad [ADD] add grctl cluster info 2018-07-27 19:10:15 +08:00
zhoujunhao
ef66a619dc [ADD] Add bug debug output 2018-07-27 17:23:02 +08:00
barnettZQG
cee5f3e1a6 [FIX] fix svn code hash too short bug 2018-07-27 12:53:38 +08:00
zhoujunhao
455736b791 [ADD] add rbd-api service health api 2018-07-20 14:19:35 +08:00
barnettZQG
a89780b7cc [FIX] fix hostuuid file bug and rev grctl cluster command 2018-07-17 17:56:27 +08:00
barnettZQG
881fb3ea7a [REV] add cmd for cluster and change some api client 2018-07-17 16:18:19 +08:00
barnettZQG
66444ba74b [REV] update grctl and api client code 2018-07-16 19:06:57 +08:00
barnettZQG
0390fdf5b2 [REV] update code for grctl tenant get 2018-07-16 16:35:42 +08:00
barnettZQG
7f771d1732 [FIX] fix resource api path error bug 2018-07-16 16:10:16 +08:00
barnettZQG
f130f9c9c4 [REV] update grctl code,add show tenant resource command 2018-07-16 15:30:53 +08:00
zhoujunhao
efc078cc38 [FIX] fix bug 2018-07-12 16:24:11 +08:00
barnettZQG
121f9eee43 [REV] merge branch v3.6 2018-07-03 19:01:25 +08:00
barnettZQG
f091fdd461 [REV] update req kubeapi QPS to 100 2018-07-03 18:06:50 +08:00
zhoujunhao
a3ac641b06 Merge branch 'master-dev' of https://github.com/goodrain/rainbond 2018-07-03 10:54:22 +08:00
zhoujunhao
fcbe6373f4 [ADD] add application quantity and status statistics 2018-06-22 12:44:20 +08:00
barnettZQG
f12b011111 [FIX] fix docker log endpint lb bug 2018-06-22 12:28:44 +08:00
barnettZQG
2ff0813819 [FIX] fix build plugin by market bug 2018-06-21 18:04:02 +08:00
zhoujunhao
740e7ef683 [FIX] fix bug 2018-06-21 14:35:47 +08:00
zhoujunhao
1993829c40 [ADD] add build version manage 2018-06-21 14:30:23 +08:00
zhoujunhao
d3a895268c [ADD] add get version info list 2018-06-21 12:01:40 +08:00
Zhang Jiajun
8551db6ed9 [REV] Fix trim space for export app source dir name. 2018-06-13 19:19:07 +08:00
barnettZQG
2813bc1d70 [REV] support registry multiple proxy discover for one service. 2018-06-09 14:45:50 +08:00
barnettZQG
4735a74f73 [FIX] fix get docker log instance error 2018-06-09 00:35:51 +08:00
barnettZQG
a1e53aa17c [ADD] add support trust parameter in hub info 2018-06-08 10:17:38 +08:00
barnettZQG
3736c69756 [REV] update delete backup 2018-06-07 13:20:11 +08:00
barnettZQG
0a85243857 [ADD] add delete backup api 2018-06-07 13:18:53 +08:00
barnettZQG
8fdd679ad6 [ADD] add change tanent lb port api 2018-06-07 13:02:24 +08:00
barnettZQG
a56fd2aa93 [FIX] fix the restore_mode parameter is missing bug 2018-06-06 10:15:11 +08:00
barnettZQG
350b91d871 [REV] update backupcopy api 2018-06-01 12:25:22 +08:00
barnettZQG
7360474a37 [REV] update delete plugin,change monitor build 2018-06-01 10:51:05 +08:00
barnettZQG
30454ded8b [REV] update share plugin code impl 2018-05-31 18:23:27 +08:00
barnettZQG
eabe8d3f94 [FIX] fix node status bug if is has two identity. 2018-05-31 17:39:43 +08:00
barnettZQG
d6fed5f30b [REV] add discover in eventlog and monitor websocket proxy 2018-05-30 18:47:26 +08:00
barnettZQG
60f782dcac [FIX] fix same plugin version not save deploy version bug 2018-05-30 14:41:27 +08:00
barnettZQG
71225c7cdb [FIX] fix build plugin deploy version error bug. 2018-05-30 14:13:22 +08:00
barnettZQG
1c706c8c4a [REV] init app status where restore complete 2018-05-29 20:54:57 +08:00
barnettZQG
046aa0dbad [REV] update query share result method 2018-05-29 17:59:59 +08:00
barnettZQG
7a1a496c6e [REV] Merge branch 2018-05-29 12:52:22 +08:00
barnettZQG
6d810cd810 [ADD] add plugin share code (#74) 2018-05-29 12:51:10 +08:00
Zhang Jiajun
241c088408 [REV] Skip read metadata file when app import status is not success. 2018-05-29 11:21:38 +08:00
Zhang Jiajun
99f503d9ea [REV] Save apps metadata to file when import app complete. 2018-05-28 21:55:58 +08:00
barnettZQG
dd7df0ed3c [REV] handle docker push&pull&build json message (#73) 2018-05-28 18:19:30 +08:00
barnett
76b9436e2b [REV] update backup id when copy. 2018-05-28 16:25:19 +08:00
barnett
8f745dc177 [ADD] add copy backup api 2018-05-28 16:14:39 +08:00
barnett
93858af7a1 [REV] save restore record before restore 2018-05-28 11:20:51 +08:00
barnett
3cef364204 [ADD] add restore backup api impl (#72) 2018-05-28 11:14:56 +08:00
barnett
43bd88546c [ADD] add restore backup feature code (#72) 2018-05-25 18:24:17 +08:00
barnett
8385c05842 [REV] change ftp namespace name 2018-05-24 12:00:34 +08:00
barnett
ed6b0cffbd [FIX] fix md5 check bug when push file to sftp 2018-05-24 11:42:17 +08:00
barnett
d8dd72f3bc [REV] query tenants resouce only query used tenants 2018-05-24 09:41:47 +08:00
barnett
171886c714 [REV] update quert tenants resource api 2018-05-23 19:55:49 +08:00
barnett
c12448e44d [REV] change tenants resource ranking query api 2018-05-23 18:58:31 +08:00
barnett
19687cd99f [REV] merge code 2018-05-23 16:55:23 +08:00
barnett
31ec69bf3b [ADD] add restore backup api 2018-05-23 16:43:16 +08:00
Zhang Jiajun
840893add9 [REV] Optimize for import multiple applications. 2018-05-23 15:53:12 +08:00
Zhang Jiajun
9fd61b7c60 [REV] Support status for each app for import multiple apps. 2018-05-23 14:26:27 +08:00
barnett
d15da40683 [REV] update some code for backup app feature 2018-05-23 12:17:34 +08:00
barnett
3e129850c3 [REV] update import code 2018-05-23 11:35:48 +08:00
barnett
5e80a0c71e [REV] merge code 2018-05-23 11:13:19 +08:00
barnett
8cd2dc9697 [ADD] add group app backup feature (#72) 2018-05-23 11:08:44 +08:00
Zhang Jiajun
990ba0317e [REV] Optimize restful api for get import directory. 2018-05-22 14:26:12 +08:00
Zhang Jiajun
34bbe34983 [REV] Change restful api to list apps for get import id. 2018-05-22 14:01:12 +08:00
Zhang Jiajun
e75cd2a05f [ADD] Add restful api to import ids for import multiple applications. 2018-05-22 12:42:15 +08:00
Zhang Jiajun
cd0bfe7e7c [ADD] Add restful api to import ids for import multiple applications. 2018-05-22 12:33:26 +08:00
Zhang Jiajun
ccf8df9f1d [REV] Support batch import applications. 2018-05-21 18:21:42 +08:00
Zhang Jiajun
6afb154132 [REV] Add route at api server 6060 port for download export app. 2018-05-21 12:16:25 +08:00
barnett
00e195d124 [REV] update websocket proxy impl 2018-05-19 23:26:44 +08:00
barnett
31a743cbc1 [REV] merge branch master 2018-05-18 11:02:43 +08:00
Zhang Jiajun
bb4fa6eedd [REV] Add new struct for import application, and modify database fields type to text for export/import application. 2018-05-17 16:10:44 +08:00
Zhang Jiajun
8b7489c447 [ADD] Increase import application feature rainbond-app format. 2018-05-17 11:27:04 +08:00
Zhang Jiajun
f1f0e3b189 [REV] Adjust code logic for insert app status record to database; 2018-05-15 15:12:42 +08:00
Zhang Jiajun
e246dea179 [REV] Fix the judgment condition of file is exists. 2018-05-15 12:26:17 +08:00
Zhang Jiajun
77e1a96c13 [REV] Fix get request parameters is nil for download export app api, fix export qualifications for runner image. 2018-05-15 11:30:31 +08:00
Zhang Jiajun
b1409e44b8 [REV] Add rest api to download file for export app in api project. 2018-05-15 11:03:03 +08:00
Zhang Jiajun
2483b97d6a [ADD] Add feature to query status for export app. 2018-05-14 14:30:32 +08:00
barnett
e52785a300 [REV] update discover eventlog server config 2018-05-14 11:53:06 +08:00
barnett
f084824e81 [REV] update get eventlog instance api 2018-05-13 12:23:54 +08:00
barnett
3c91a81cce [REV] update result length 2018-05-11 23:50:54 +08:00
Zhang Jiajun
ab6b71b8fa [REV] Support export rainbond-app and docker-compose format app. 2018-05-11 23:49:02 +08:00
barnett
465b25c188 [REV] update tenants resource api 2018-05-11 23:45:30 +08:00
barnett
8bfecabc2a [REV] update tenants resource api 2018-05-11 22:57:42 +08:00
barnett
22d2413aa5 [FIX] fix install plugin bug 2018-05-11 18:57:31 +08:00
barnett
8f1ef14695 [REV] merge code 2018-05-11 17:20:37 +08:00
barnett
305c5eb92f [REV] update plugin delete api 2018-05-11 15:54:55 +08:00
Zhang Jiajun
e1085e0c02 [REV] Merge export app api for rainbond-app and docker-compose, output detail log by log.debug. 2018-05-11 13:45:07 +08:00
barnett
29236802c2 [ADD] add abnormal information storage and query function. 2018-05-11 13:44:15 +08:00
Zhang Jiajun
374140250f [REV] Fix parse json format for export app struct. 2018-05-10 22:00:28 +08:00
Zhang Jiajun
bda62f34c5 [REV] Support create table automatic if not exist for export app component. 2018-05-10 18:54:32 +08:00
Zhang Jiajun
c3d107953c [REV] Fix parameters error in get json method. 2018-05-10 18:32:14 +08:00
Zhang Jiajun
b857175b05 [ADD] Add new feature to export app with docker-compose format. 2018-05-10 17:45:23 +08:00
barnett
c968268e3a [REV] update code 2018-05-10 16:37:55 +08:00
barnett
f23060048e [FIX] merge V3.6 branch 2018-05-10 16:33:58 +08:00
Zhang Jiajun
597957d4fc [ADD] Add new feature to export rainbond-app. 2018-05-10 11:08:49 +08:00
barnett
057b06182e [REV] update code 2018-05-09 16:06:52 +08:00
barnett
3c4417bb1e [ADD] add get pod by multiple service id 2018-05-09 15:51:04 +08:00
barnett
eff40f32e1 [ADD] add some gif for readme 2018-04-27 16:35:20 +08:00
barnett
df1036ce87 [REV] update api code 2018-04-26 16:08:13 +08:00
barnett
3b5679ec47 [FIX] fix nil pointer dereference bug 2018-04-26 13:04:29 +08:00
barnett
086a497d6c [REV] update query tenant or service resources usage api 2018-04-26 12:46:26 +08:00
barnett
287f8bdc9e [REV] update package api design,remove pkg dir (fixed #57) 2018-04-24 16:44:59 +08:00