Commit Graph

360 Commits

Author SHA1 Message Date
zryfish
4bedf56ce7 Merge pull request #280 from zryfish/change_travis
change registry address
2019-01-21 20:47:08 +08:00
zryfish
9ed6038058 Merge branch 'master' into change_travis 2019-01-21 20:39:38 +08:00
Jeff
da8ffc9474 change registry address 2019-01-21 20:37:25 +08:00
zryfish
c2adbd2a71 Merge pull request #279 from zryfish/change_travis
change dockerhub address
2019-01-21 20:13:08 +08:00
Jeff
948527290c change dockerhub address 2019-01-21 19:59:30 +08:00
zryfish
feecd35b04 Merge pull request #278 from zryfish/change_travis
change travis.yml
2019-01-21 17:49:54 +08:00
Jeff
f97f8a59f9 change travis.yml 2019-01-21 17:37:33 +08:00
zryfish
c81ff737e2 Merge pull request #277 from zryfish/change_dockerhub_repo
change dockerhub repo
2019-01-21 15:27:19 +08:00
jeff
9c23a68128 change dockerhub repo 2019-01-21 15:25:04 +08:00
zryfish
e5d2b72e19 Merge pull request #274 from leoendless/hotfix/applications
fix: Fix application list api
2019-01-21 10:59:27 +08:00
zryfish
21af31b210 Merge pull request #276 from zryfish/change_dockerhub_repo
change dockerhub repo
2019-01-21 10:58:15 +08:00
jeff
5fc6aa52e7 change dockerhub repo 2019-01-21 10:47:34 +08:00
leoendless
f8f960d73b fix: Fix application list api
show deleting and deleted clusters, hide ceased clusters
2019-01-17 16:24:11 +08:00
zryfish
7e72365d86 Merge pull request #270 from zryfish/stale_bot_conf
add stale bot
2019-01-08 15:32:34 +08:00
jeff
b908e97d42 add stale bot 2019-01-08 15:15:43 +08:00
zryfish
7f4bfd4c03 Merge pull request #266 from zryfish/issus_template
add issue template
2019-01-07 12:39:05 +08:00
jeff
bbec5e008d add issue template 2019-01-07 11:42:00 +08:00
zryfish
870fc29309 Merge pull request #238 from wansir/master
fix: data is cleared
advanced-1.0.0
2018-12-10 19:49:21 +08:00
hongming
e0dfc10010 fix: data is cleared
Signed-off-by: hongming <talonwan@yunify.com>
2018-12-10 18:50:30 +08:00
zryfish
492bf08de0 Merge pull request #237 from carmanzhang/monitor
Bug fix: cluster_pod_count metrics
2018-12-10 15:14:20 +08:00
Carman Zhang
86c7ca0362 Bug fix: cluster_pod_count metrics 2018-12-10 14:58:43 +08:00
zryfish
5d7d6755c0 Merge pull request #234 from carmanzhang/monitor
Bug fix: pod count metrics
2018-12-09 16:32:02 +08:00
Carman Zhang
e775421672 Bug fix: pod count metrics 2018-12-08 19:36:37 +08:00
zryfish
17727188f4 Merge pull request #232 from zryfish/fix_service_type_bug
fix service type
2018-12-06 23:29:45 +08:00
zryfish
e06c241555 Merge pull request #230 from wansir/master
fix: data error
2018-12-06 23:24:25 +08:00
zryfish
75ba702e6e Merge pull request #231 from carmanzhang/monitor
changed default prometheus query timeout to 10 seconds
2018-12-06 23:20:34 +08:00
jeff
3a4c4c10c2 fix service type
Signed-off-by: jeff <jeffzhang@yunify.com>
2018-12-06 23:19:37 +08:00
Carman Zhang
bf022a19fe changed default prometheus query timeout to 10 seconds 2018-12-06 21:54:37 +08:00
hongming
7b1cbabb4f fix: data error
Signed-off-by: hongming <talonwan@yunify.com>
2018-12-06 21:35:48 +08:00
zryfish
e40833c2a7 Merge pull request #229 from wansir/master
fix: miscount
2018-12-06 00:28:44 +08:00
hongming
1055111b5e fix: miscount
Signed-off-by: hongming <talonwan@yunify.com>
2018-12-05 21:30:44 +08:00
zryfish
341795f406 Merge pull request #228 from carmanzhang/monitor
changed nic related rules
2018-12-05 21:24:48 +08:00
Carman Zhang
3e13811ab6 changed nic related rules 2018-12-05 21:03:35 +08:00
zryfish
cde7415b7a Merge pull request #226 from wansir/master
support workspace member search
2018-12-05 19:36:37 +08:00
hongming
f25ae2d571 support workspace member search
Signed-off-by: hongming <talonwan@yunify.com>
2018-12-05 17:44:03 +08:00
zryfish
742ab06e75 Merge pull request #227 from zryfish/add_node_status
refactor component status
2018-12-04 11:25:50 +08:00
jeff
9122ed7b25 refactor component status
Signed-off-by: jeff <jeffzhang@yunify.com>
2018-12-04 01:21:38 +08:00
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