Commit Graph

296 Commits

Author SHA1 Message Date
jeff
c07611cbed fix node role bug 2018-11-22 21:39:47 +08:00
zryfish
ba92091561 Merge pull request #209 from wansir/master
fix bug:db init failed,clusterrolebinding sync error
2018-11-21 14:27:10 +08:00
zryfish
f79ae414bc Merge pull request #210 from carmanzhang/monitor
changed promqls and fixed several monitoring bugs
2018-11-21 14:25:33 +08:00
hongming
49d40f48f7 fix bug:db init failed,clusterrolebinding sync error 2018-11-21 10:01:01 +08:00
Carman Zhang
982c4ac30e changed promqls and fixed several monitoring bugs 2018-11-20 19:14:21 +08:00
zryfish
7f780bd3fb Merge pull request #206 from wansir/master
refactor workspace api
2018-11-16 20:59:17 +08:00
zryfish
6156b6dac7 Merge pull request #208 from carmanzhang/monitor
fixed monitor bugs
2018-11-16 20:58:41 +08:00
hongming
bce25036a2 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	pkg/models/workspaces/workspaces.go
2018-11-16 18:37:56 +08:00
jeff
e9038e94d7 refactor workspace api 2018-11-16 18:35:21 +08:00
Carman Zhang
df31cab343 add load average metrics, change prometheus apiserver svc 2018-11-16 17:41:17 +08:00
Carman Zhang
16eac8ce3c fixed rank 2018-11-16 13:51:09 +08:00
Carman Zhang
c5d9da99a1 fixed component and cluster metrics 2018-11-16 11:04:42 +08:00
zryfish
066f36b81f Merge pull request #204 from carmanzhang/monitor
fixed deployment-pods metrics
2018-11-15 11:24:56 +08:00
Carman Zhang
beb7efdac0 fixed deployment-pods metrics 2018-11-14 16:04:24 +08:00
zryfish
fbf053306b Merge pull request #201 from carmanzhang/monitor
Refactor monitor module
2018-11-11 17:58:53 +08:00
Carman Zhang
f9057a0705 reformat monitoring apis 2018-11-11 13:13:39 +08:00
zryfish
02124c2a12 Merge pull request #202 from zryfish/fix_component_status_bug
component status
2018-11-08 11:38:31 +08:00
jeff
3a38a83dd2 component status 2018-11-08 11:29:42 +08:00
zryfish
1b15e5e774 Merge pull request #200 from zryfish/component_status
component status
2018-11-07 17:13:19 +08:00
jeff
a38bb3784d component status 2018-11-06 17:31:40 +08:00
不羁
c5b11300a1 Merge pull request #199 from wansir/master
refactor workspace api
2018-11-06 10:49:57 +08:00
hongming
e8a4a8685c Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	pkg/apis/v1alpha/monitoring/monitor_handler.go
#	pkg/models/metrics/metricscollector.go
#	pkg/models/metrics/metricsconst.go
2018-11-01 12:26:14 +08:00
hongming
70065d430d refactor workspace api 2018-11-01 12:20:26 +08:00
zryfish
313ebea12c Merge pull request #194 from wansir/master
add workspace api
2018-10-29 11:28:48 +08:00
richardxz
a9cd961236 Merge pull request #197 from richardxz/master
add "Terminating" status in pvc's lifecycle
2018-10-26 18:36:45 +08:00
richardxz
03a37e70a1 add "Terminating" status in pvc's lifecycle 2018-10-25 03:00:56 -04:00
richardxz
920d09042d Merge pull request #196 from richardxz/master
ignore the role/clusterrole which don't have "creator" annotation
2018-10-24 15:29:38 +08:00
richardxz
33dd9fb2dd ignore the role/clusterrole which don't have "creator" annotation 2018-10-24 00:03:43 -04:00
zryfish
59d26c2809 Merge pull request #195 from richardxz/master
fix err in service type's judgment
2018-10-23 14:10:51 +08:00
richardxz
75d8787f64 fix err in service type 2018-10-23 00:20:22 -04:00
hongming
a8d5f552a0 add workspace api 2018-10-22 17:18:20 +08:00
zryfish
5fb551e8d4 Merge pull request #192 from carmanzhang/master
add cluster/workspace level multiple metrics in dashboard
2018-10-17 16:39:59 +08:00
Carman Zhang
c65ecddbef add cluster level multiple metrics in dashboard 2018-10-17 16:31:43 +08:00
richardxz
d368a791e0 Merge pull request #193 from richardxz/master
update job's "rerun" function
2018-10-17 10:21:29 +08:00
richardxz
b982f133aa update job's "rerun" function 2018-10-16 21:55:21 -04:00
zryfish
5a51bb68af Merge pull request #190 from wansir/master
add openpitrix proxy token
2018-10-12 09:58:22 +08:00
richardxz
5a71eaf75c Merge pull request #191 from richardxz/master
avoid incorrect result when list resource with search conditions
2018-10-11 14:58:40 +08:00
richardxz
0b6480328d avoid incorrect result when list resource with search conditions 2018-10-11 02:34:44 -04:00
richardxz
f7f59c0264 Merge pull request #189 from richardxz/master
support image search
2018-10-11 14:31:42 +08:00
hongming
85b3da3dcd add openpitrix proxy token 2018-10-09 19:55:45 +08:00
richardxz
48966ce7d9 support image search 2018-10-09 04:32:34 -04:00
richardxz
adc77fcd58 Merge pull request #188 from richardxz/master
support configmaps and secrets' paging
2018-10-09 14:51:08 +08:00
richardxz
6658177967 support configmaps and secrets' paging 2018-10-07 22:44:21 -04:00
Wiley Wang
8ada5d2b45 Merge pull request #186 from wnxn/master
update Gopkg.lock
2018-09-28 11:03:24 +08:00
wileywang
4dc68a2e41 update Gopkg.lock 2018-09-28 10:29:57 +08:00
carmanzhang
b360c0abd6 Merge pull request #183 from carmanzhang/master
add monitoring apis
2018-09-27 11:53:16 -05:00
Carman Zhang
53dd54b163 add monitoring apis 2018-09-27 17:50:26 +08:00
richardxz
df21cabbdd Merge pull request #180 from richardxz/master
add hpa api
2018-09-27 11:06:58 +08:00
richardxz
f1c1c9e6e4 add hpa api 2018-09-26 22:22:38 -04:00
Wiley Wang
639b94385e Merge pull request #175 from wnxn/master
get k8s version through k8s client at master branch
2018-09-26 13:46:10 +08:00