Commit Graph

813 Commits

Author SHA1 Message Date
pujielan
6c4c1ba9de [REV] Add disk usage statistics 2018-01-12 17:37:37 +08:00
pujielan
7c9294d1a6 [REV] Add disk usage statistics 2018-01-12 17:33:34 +08:00
pujielan
c19740724f [REV] Add disk usage statistics 2018-01-12 17:29:43 +08:00
pujielan
13fb2e4c12 [REV] Add v2 builder uri controller 2018-01-12 17:02:57 +08:00
goodrain
04321e1d49 [FIX] remove debug log 2018-01-12 10:01:56 +08:00
goodrain
01334134e2 [FIX] resolve new monitor message sub chan don't cache bug 2018-01-12 09:55:55 +08:00
goodrain
d83f7b4cfe [FIX] new monitor message topic remove port 2018-01-12 09:44:04 +08:00
goodrain
af94d2bf27 [FIX] Resolve a stateful Service to store a BUG. 2018-01-11 22:23:20 +08:00
goodrain
268d1f45f2 [FIX] Solve the problem in running with the application instance 0. 2018-01-11 17:47:42 +08:00
goodrain
21160626c5 Merge branch 'master' of https://github.com/goodrain/rainbond 2018-01-11 13:58:38 +08:00
goodrain
0d1126fc89 [ADD] api add proxy for prometheus 2018-01-11 13:58:24 +08:00
pujielan
7dd2ba8253 Merge branch 'master' into plugin 2018-01-11 12:40:12 +08:00
goodrain
5aef23e50f [FIX] handle nil bug when etcd config error 2018-01-11 11:33:25 +08:00
pujielan
19d828b03b [FIX] Fix plugin memory limit 2018-01-11 10:17:46 +08:00
goodrain
17e5a1c132 Merge branch 'support-statsd’,support for application performance analysis plug-ins. 2018-01-10 18:50:52 +08:00
goodrain
1d19f75476 [FIX] Merge master code to handle conflicts.
Prepare to incorporate performance analysis capabilities into the trunk.
2018-01-10 18:49:17 +08:00
goodrain
47975be8a3 [ADD] node discover event server 2018-01-10 17:35:07 +08:00
pujielan
2c15d441cf [REV] Update plugin add rebuild 2018-01-10 17:20:32 +08:00
goodrain
06f92a78c6 [ADD] add docker run parser and image handle 2018-01-10 13:35:05 +08:00
pujielan
d4ddf5dcc8 [FIX] Fix git pull permission bug 2018-01-10 11:00:37 +08:00
pujielan
eb93ed90e4 [REV] Https support cert ca and key 2018-01-09 10:42:42 +08:00
pujielan
eed84776fd [REV] Update logger level 2018-01-08 17:32:29 +08:00
pujielan
b7c8ee5b87 Merge branch 'master' into cuib-local-master 2018-01-08 15:55:49 +08:00
pujielan
eba6fc346e [REV] Update logger level 2018-01-08 15:41:13 +08:00
pujielan
5537611b59 [ADD] Add entrance plugin HTTPS support and certificate configuration 2018-01-08 14:50:17 +08:00
pujielan
11c9eee3be [REV] Update logger level 2018-01-08 10:45:10 +08:00
pujielan
5aab5c749a [REV] Optimizing building log 2018-01-08 10:30:55 +08:00
goodrain
2a4b99223e [FIX] solved the MQ memory leak problem 2018-01-06 12:49:20 +08:00
goodrain
02a77bc182 [FIX] update etcdclient to release 3.2.0 and fix the bug that service regist 2018-01-05 18:04:35 +08:00
goodrain
ae8efecd54 [FIX] support receive new monitor message 2018-01-05 16:49:03 +08:00
pujielan
471964bc2d [REV] Update logger level 2018-01-05 15:50:26 +08:00
pujielan
24e8210640 [REV] Optimizing building log 2018-01-05 15:42:31 +08:00
pujielan
a1b1484fcc [REV] Optimizing building log 2018-01-05 15:23:42 +08:00
pujielan
289ffd3959 [REV] Optimizing building log 2018-01-05 15:18:54 +08:00
pujielan
ea578fdb0c [REV] Optimizing building log 2018-01-05 15:12:11 +08:00
pujielan
fa9515fc9a [FIX] Fix uri permission bug 2018-01-05 14:17:45 +08:00
pujielan
3df840379e [FIX] Fix uri permission bug 2018-01-05 12:02:10 +08:00
pujielan
1e7e809928 [REV] Optimizing the build process 2018-01-05 11:21:34 +08:00
pujielan
1ad58cbdd1 [REV] Optimizing the build process 2018-01-05 11:15:12 +08:00
pujielan
5583bdc76c [REV] Optimizing the build process 2018-01-05 11:07:53 +08:00
pujielan
b6b3e2c717 [REV] Update chaos set user rain with root permission 2018-01-05 11:00:00 +08:00
pujielan
1116dcb75a [REV] Update chaos set user rain with root permission 2018-01-05 10:54:27 +08:00
pujielan
0a5282913e Merge branch 'master' into cuib-local-master
# Conflicts:
#	hack/contrib/docker/chaos/Dockerfile
#	pkg/api/handler/tenant.go
#	pkg/db/mysql/mysql.go
2018-01-05 10:45:04 +08:00
pujielan
69125f3dd4 [REV] Update chaos set user rain with root permission 2018-01-05 10:40:21 +08:00
pujielan
c962d2b60a [ADD] Add token verification logs 2018-01-05 10:02:21 +08:00
Bay
8edc7ad7cd Merge remote-tracking branch 'github/master' into for_install_3.4.1 2018-01-04 18:41:25 +08:00
Bay
cd50cd3bbc [REV] optimize update node status in node query 2018-01-04 18:41:15 +08:00
pujielan
d1d552d321 Merge branch 'master' of github.com:goodrain/rainbond
[REV] Update plugin sys support rebuild and envs batch update
2018-01-04 18:36:50 +08:00
Bay
c8a950bc59 [REV] optimize check node's task seq 2018-01-04 18:33:14 +08:00
pujielan
8be1ce0a27 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 18:32:55 +08:00
Bay
b96fea8aee [REV] deleay node install ,leave time for check task 2018-01-04 18:29:03 +08:00
pujielan
40b12f3f0b [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 18:20:18 +08:00
pujielan
6dac5a79d2 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 18:18:51 +08:00
Bay
d33701ebc5 [REV] Optimize node error status judge strategy 2018-01-04 18:16:16 +08:00
pujielan
43d47c3af6 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 14:06:57 +08:00
pujielan
d34b69f9dd no message 2018-01-04 14:04:16 +08:00
pujielan
f61eed20a7 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 13:51:35 +08:00
pujielan
1f47277ec2 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 13:25:23 +08:00
pujielan
29529ab1c3 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 13:17:08 +08:00
pujielan
c5672d4cc5 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 13:15:31 +08:00
pujielan
0a28a4c098 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 12:43:33 +08:00
pujielan
b786390adc [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 12:29:55 +08:00
pujielan
ad9d8d6f63 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 12:10:31 +08:00
pujielan
ee3cfb573b [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 12:01:52 +08:00
Bay
a6328c13f4 [REV] Optimize node status,add error status and install/init status;change some logic from controller to service 2018-01-04 11:54:30 +08:00
pujielan
9e945cdcfa [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 11:42:34 +08:00
pujielan
4ac8ba9c16 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 11:31:56 +08:00
pujielan
67c6ebf8e1 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 11:14:37 +08:00
pujielan
14417d3a3a [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 10:58:20 +08:00
Bay
997cae6e1b [REV] Optimize region full res ,get node only scheduable 2018-01-04 10:09:25 +08:00
Bay
e8c2f8ff88 Merge branch 'master' of https://github.com/goodrain/rainbond into for_install_3.4.1 2018-01-03 19:12:36 +08:00
Bay
5094aba6fe [REV] optimize node check api,fix master node get memory info can't get float value 2018-01-03 18:37:20 +08:00
pujielan
4e46a15960 [ADD] Add HTTPS support and certificate configuration 2018-01-03 17:02:50 +08:00
pujielan
9a445f132f [ADD] Add HTTPS support and certificate configuration 2018-01-03 16:56:22 +08:00
pujielan
2da0f6d4a0 [REV] Update https support 2018-01-03 15:37:47 +08:00
pujielan
b24366d397 [REV] Update https support 2018-01-03 15:07:39 +08:00
Bay
71f3c1bbd5 [REV] optimize install task status with describe 2018-01-03 11:40:15 +08:00
Bay
1b5915818e [REV] optimize init status api 2018-01-03 10:49:04 +08:00
Bay
05e6787549 [REV] use shell script version 3.4.1 2018-01-03 09:48:28 +08:00
pujielan
695f189bcf [ADD] Add region support protocol list 2018-01-02 18:04:51 +08:00
pujielan
28c5c9bff0 [ADD] Add region support protocol list 2018-01-02 18:02:08 +08:00
Bay
fb9da87fac [REV] add get task error details when get failed 2018-01-02 12:27:41 +08:00
pujielan
0cb1baef60 Merge branch 'master' into cuib-local-master 2018-01-02 12:05:49 +08:00
pujielan
d21a55696a [REV] Compatible service restart operation 2018-01-02 12:04:36 +08:00
Bay
1b5799bf19 [REV] add get task error details when get failed 2018-01-02 11:36:10 +08:00
Bay
5aa5eed6b5 [FIX] add recover to event log when monite prometheus get msg error 2017-12-29 15:50:48 +08:00
pujielan
3ae051a00e [REV] Service can be restart in close status 2017-12-29 15:50:16 +08:00
Bay
2a4e830d48 [FIX] add recover to event log when monite prometheus get msg error 2017-12-29 15:27:19 +08:00
Bay
87ca1b0397 Merge branch 'release-3.4.1' of https://github.com/goodrain/rainbond into release-3.4.1 2017-12-29 14:24:37 +08:00
Bay
8f69543861 [REV] merge from local;add prometheus api,node init/install api and status query api 2017-12-29 14:06:42 +08:00
Bay
e96fd9aadb Merge branch 'master' of https://github.com/goodrain/rainbond into githubmaster 2017-12-29 13:43:38 +08:00
pujielan
cf386cb87a [REV] Update node discover 2017-12-29 12:20:29 +08:00
pujielan
f3dd17b4d5 [REV] Update node discover 2017-12-29 12:11:17 +08:00
Bay
3d2a7a04b6 [REV] optimize node status when running ;optimize node cpu resource 2017-12-29 11:46:41 +08:00
Bay
071b4132e1 [REV] merge from local,add prometheus api;add node init/install and query api 2017-12-29 11:24:11 +08:00
pujielan
d1a1f8cf9e [FIX] Fix bug #14 Domian canot be deleted which created by user 2017-12-28 18:24:28 +08:00
pujielan
176891ba04 [FIX] Fix bug domian canot be deleted which created by user 2017-12-28 18:14:02 +08:00
pujielan
0f217b0201 [FIX] Fix bug domian canot be deleted which created by user 2017-12-28 17:59:56 +08:00
pujielan
000d577e8c [REV] Add service resources delete 2017-12-28 14:45:33 +08:00
pujielan
b695bbd54d [FIX] Fix add env attr bug 2017-12-28 14:40:32 +08:00
pujielan
f15c0b376a [REV] Add service resources delete 2017-12-28 14:27:00 +08:00
pujielan
5aa9a31ebd [REV] Add service resources delete 2017-12-28 13:44:31 +08:00
pujielan
1fdbbcbfc0 [FIX] Fix bug service port canot be deleted properly 2017-12-28 12:07:50 +08:00
pujielan
5dc3bc10d1 [FIX] Fix bug service port canot be deleted properly 2017-12-28 12:07:13 +08:00
Bay
31d03f70d8 Merge remote-tracking branch 'github/master' into githubmaster 2017-12-28 11:03:58 +08:00
Bay
d4f8512a7d [FIX] fix save in codecheck and event;merge from release to fix some error 2017-12-28 10:18:52 +08:00
Bay
2f877cac6a [FIX] fix save in codecheck and event 2017-12-28 10:16:09 +08:00
Bay
f026d1f396 [REV] optimize grctl output when error occured 2017-12-27 18:20:52 +08:00
pujielan
a1670a00d1 [FIX]Fix get mysql record bug 2017-12-27 17:58:17 +08:00
Bay
f5231e3fc7 [REV] remove error details when resp code is not 200 2017-12-27 15:10:48 +08:00
Bay
77a80c1602 [REV] optimize node ready column 2017-12-27 14:15:40 +08:00
Bay
2edd975bea [REV] optimize master res 2017-12-27 13:34:49 +08:00
Bay
8a5e0e1549 [REV] optimize master res 2017-12-27 13:30:59 +08:00
Bay
bafafc9eff Merge remote-tracking branch 'github/release-3.4.1' into release-3.4.1 2017-12-27 12:36:27 +08:00
Bay
833cdc92d2 [FIX] fix grctl up command failed,caused by master nodestatus is not null 2017-12-27 12:36:15 +08:00
Bay
01b9bbef76 [REV] optimize node reg to hosts,and optimize collect system info for master 2017-12-27 12:24:05 +08:00
pujielan
fdd40a499a [FIX]Fix nginx plugin high availability bug 2017-12-26 17:52:51 +08:00
pujielan
de466ae98e [REV] Update entrance log 2017-12-26 17:45:40 +08:00
pujielan
c74e6e1f0b [FIX]Fix nginx plugin high availability bug 2017-12-26 17:15:21 +08:00
pujielan
97a3d4d4dd [ADD] Set debugger log 2017-12-26 15:44:16 +08:00
Bay
0bee99c65a Merge branch 'master' of https://github.com/goodrain/rainbond into githubmaster 2017-12-26 15:02:24 +08:00
Bay
163a1f2be9 [REV] optimize task exec command error handle 2017-12-26 14:54:09 +08:00
Bay
38edb98196 [REV] optimize task exec command error handle 2017-12-26 14:48:58 +08:00
ysicing
88eeba8087 [REV] Adjust the installation script 2017-12-26 11:58:52 +08:00
pujielan
74d0d97800 Merge branch 'master' into cuib-local-master 2017-12-26 10:44:40 +08:00
pujielan
025bfae524 [REV] Update plugin condition 2017-12-26 10:41:52 +08:00
goodrain
aaae305bf4 Merge branch 'master' of https://github.com/goodrain/rainbond 2017-12-26 09:50:07 +08:00
goodrain
988987a707 [FIX] remove dev shell url 2017-12-26 09:49:55 +08:00
Bay
ef002a1c48 [FIX] domain cmd in grctl build error 2017-12-26 00:06:51 +08:00
goodrain
373cdff5f9 [FIX] fix bug after merge branch 2017-12-25 19:59:35 +08:00
goodrain
9058e1e763 [FIX] Merge branches taskengin 2017-12-25 19:49:57 +08:00
goodrain
7f8a51517e [FIX] Merge branches taskengin 2017-12-25 19:49:32 +08:00
goodrain
439ad48434 [FIX] add config type []interface{} 2017-12-25 19:33:27 +08:00
pujielan
16f9457f81 [REV] Update last after building 2017-12-25 16:03:51 +08:00
pujielan
4405799435 [REV] Update “success” after building 2017-12-25 15:55:21 +08:00
pujielan
5761c32e30 Merge branch 'master' into cuib-local-master 2017-12-25 14:40:33 +08:00
Bay
aea7b87a52 [ADD] add reg node to hosts file to this branch 2017-12-25 11:21:31 +08:00
pujielan
3de2ae57fe [REV] Add complex envs delete 2017-12-25 11:14:02 +08:00
goodrain
b8cdc72731 [FIX] fix set hostname bug 2017-12-25 10:20:18 +08:00
Bay
0d73d42dcd [ADD] add reg node to hosts file to this branch 2017-12-25 00:19:28 +08:00
Bay
e9e10b8805 [REV] optimize add node logic 2017-12-25 00:13:03 +08:00
Bay
8021c955fd [REV] optimize add node logic 2017-12-25 00:06:21 +08:00
Bay
ec5b22141a [REV] optimize add node logic 2017-12-24 23:19:42 +08:00
goodrain
84a10e0785 Merge branch 'master' 2017-12-24 22:58:51 +08:00
goodrain
24e1163035 [ADD] support set container hostname use env HOSTNAME 2017-12-24 22:57:11 +08:00
pujielan
ac2262bf75 [REV] Optimize function result code and msg 2017-12-24 22:40:15 +08:00
pujielan
8088fada79 [FIX]Fix etcd connection in define resource 2017-12-24 21:26:21 +08:00
goodrain
0b6bb81b3a [FIX] remove empty value in array 2017-12-24 18:38:07 +08:00
goodrain
512987256e Merge branch 'taskengin' of code.goodrain.com:goodrain/rainbond into taskengin 2017-12-24 00:46:34 +08:00
goodrain
1e551089e7 [FIX] array split sep change | to , 2017-12-24 00:46:24 +08:00