Commit Graph

402 Commits

Author SHA1 Message Date
jeff
4ac20ffc2b add service mesh controller
add service mesh metrics

remove unused circle yaml

fix travis misconfiguration

fix travis misconfiguration

fix travis misconfiguration
2019-03-17 17:28:52 +08:00
zryfish
858facd4b2 Merge pull request #291 from wansir/advanced-2.0-dev
upgrade go version to 1.12
2019-03-15 19:48:26 +08:00
zryfish
2a2451ac05 Merge branch 'master' into advanced-2.0-dev 2019-03-15 19:40:18 +08:00
hongming
4144404b0b use go 1.12
Signed-off-by: hongming <talonwan@yunify.com>
2019-03-15 18:24:00 +08:00
zryfish
66ceb714d6 Merge pull request #288 from wansir/advanced-2.0-dev
add ks-iam and ks-apigateway
2019-03-11 23:43:16 +08:00
hongming
b59c244ca2 add ks-iam and ks-apigateway
Signed-off-by: hongming <talonwan@yunify.com>
2019-03-11 21:21:06 +08:00
jeff
f579e97f6b change travis.yaml 2019-03-07 19:39:01 +08:00
jeff
6b6c690f6d remove unused directory 2019-03-07 17:17:23 +08:00
jeff
47bf8820f4 Initial commit 2019-03-07 17:08:54 +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
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