admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
323 Commits 13 Branches 51 Tags
9e7db667803158c333f789f219e03b6048b65e84
Commit Graph

323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zryfish
9e7db66780 Merge pull request #225 from carmanzhang/monitor 
refactor monitoring apis for high performance testing
 2018-12-03 15:35:46 +08:00
Carman Zhang
c503efaa3b refactor monitoring apis for high performance testing 2018-12-03 15:15:53 +08:00
zryfish
fa30f68102 Merge pull request #222 from wansir/master 
load data from lister
 2018-12-03 14:02:16 +08:00
hongming
1df7185112 load data from lister 
Signed-off-by: hongming <talonwan@yunify.com>
 2018-12-03 12:01:47 +08:00
zryfish
3041d90e22 Merge pull request #224 from zryfish/refactor_component_status 
refactor component status
 2018-12-03 02:17:42 +08:00
jeff
cc5e0ec301 refactor component status 
Signed-off-by: jeff <jeffzhang@yunify.com>
 2018-12-03 02:07:05 +08:00
zryfish
030e4aaed2 Merge pull request #223 from zryfish/refactor_component_status 
refactor component status
 2018-12-03 01:42:53 +08:00
jeff
7f688317f3 Signed-off-by: jeff <jeffzhang@yunify.com> 
refactor component status

Signed-off-by: jeff <jeffzhang@yunify.com>
 2018-12-03 01:34:50 +08:00
zryfish
744516d944 Merge pull request #221 from zryfish/refactor_component_status 
remove kubesphere-monitoring-system
 2018-12-02 19:57:32 +08:00
jeff
b78bff7138 remove kubesphere-monitoring-system 2018-12-02 19:56:50 +08:00
zryfish
0dd78409e8 Merge pull request #220 from zryfish/refactor_resource_interface 
refactor resource interface
 2018-11-30 19:36:12 +08:00
jeff
f54dd2cf61 refactor resource interface 
Signed-off-by: jeff <jeffzhang@yunify.com>
 2018-11-30 19:03:14 +08:00
zryfish
92427183ff Merge pull request #219 from wansir/master 
fix: sync devops rolebindings
 2018-11-30 17:39:40 +08:00
hongming
b90a84b99b fix: sync devops rolebindings 
Signed-off-by: hongming <talonwan@yunify.com>
 2018-11-30 17:28:30 +08:00
zryfish
8857212695 Merge pull request #217 from zryfish/add_app_description 
add app description
 2018-11-29 15:31:28 +08:00
jeff
6ba1e0a468 add app description 2018-11-29 15:05:41 +08:00
zryfish
bb8a793e26 Merge pull request #216 from zryfish/pods_paging 
query workload pods in a graceful way, which supports paging
 2018-11-29 14:59:38 +08:00
jeff
58a58a2984 query workload pods in a graceful way, which supports paging 2018-11-29 14:46:09 +08:00
zryfish
dadea738a9 Merge pull request #214 from carmanzhang/monitor 
change workload metrics, add node-pod-container metrics api
 2018-11-28 21:10:00 +08:00
Carman Zhang
cb1c03961b change workload metrics, add node-pod-container metrics api 2018-11-28 20:28:17 +08:00
zryfish
0a3dfcc536 Merge pull request #215 from zryfish/add_monitoring_to_system_components 
add kubesphere-monitoring-system to system monitoring component
 2018-11-28 14:39:55 +08:00
jeff
106c2aad0b add kubesphere-monitoring-system to system monitoring component 2018-11-28 14:31:45 +08:00
zryfish
347bfef1b5 Merge pull request #213 from carmanzhang/monitor 
support node-pod/namespace-workload sorting and paging
 2018-11-23 16:16:16 +08:00
zryfish
56f7dabb67 Merge pull request #211 from wansir/master 
fix bug: rolebinding cannot delete
 2018-11-23 14:37:54 +08:00
hongming
a908757cfb fix bug: rolebinding cannot delete 2018-11-23 14:03:15 +08:00
Carman Zhang
9a6880bc9c support node-pod/namespace-workload sorting and paging 2018-11-23 11:41:56 +08:00
zryfish
c7a1011e0c Merge pull request #212 from zryfish/node_roles 
fix node role bug
 2018-11-22 22:51:57 +08:00
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