Zhuxiaoyang
|
0838ceb585
|
Merge branch 'master' into master
|
2019-05-14 19:33:23 +08:00 |
|
soulseen
|
5b0fd59788
|
Merge branch 'master' of github.com:soulseen/kubesphere
|
2019-05-14 19:30:57 +08:00 |
|
soulseen
|
c8de1d6487
|
fix typo
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-14 19:30:10 +08:00 |
|
huanggze
|
6784865207
|
logging: record errors
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-14 19:29:11 +08:00 |
|
runzexia
|
0f290a1d41
|
Merge branch 'master' into master
|
2019-05-14 17:28:52 +08:00 |
|
soulseen
|
ff45220411
|
update api description
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-14 17:16:10 +08:00 |
|
runzexia
|
5e4b50061c
|
fix ci
|
2019-05-14 17:15:46 +08:00 |
|
runzexia
|
11a9d166ee
|
fix
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-14 16:31:42 +08:00 |
|
runzexia
|
a6f46bc84a
|
fix sonarStatus api NEP, return [] if could not get last run
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-14 16:29:54 +08:00 |
|
Benjamin Huo
|
f84e58b0db
|
Merge branch 'master' into monitoring
|
2019-05-14 11:22:56 +08:00 |
|
Jeff
|
48cf27095b
|
update workload
|
2019-05-13 23:24:12 +08:00 |
|
Jeff
|
049b3dd11d
|
update router workload
|
2019-05-13 23:24:12 +08:00 |
|
Jeff
|
89f54da60a
|
fix router update bug
|
2019-05-13 14:02:32 +08:00 |
|
Jeff
|
5462f51e65
|
fix application bug
|
2019-05-13 11:28:20 +08:00 |
|
runzexia
|
996d6fe4c5
|
update
|
2019-05-13 11:27:10 +08:00 |
|
zryfish
|
bfb0a83364
|
Merge branch 'master' into monitoring
|
2019-05-12 18:11:04 +08:00 |
|
Jeff
|
6dd8622136
|
fix update router bug
|
2019-05-12 17:59:25 +08:00 |
|
huanggze
|
d9cc03408c
|
fix: filter out old namespace data from workspace cpu and memory metrics
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-11 20:42:01 +08:00 |
|
huanggze
|
e575a217f3
|
update: change an argument
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-11 16:12:33 +08:00 |
|
Zhuxiaoyang
|
a2c5b27703
|
Merge branch 'master' into master
|
2019-05-11 13:38:56 +08:00 |
|
Benjamin Huo
|
8381bba4ca
|
Merge branch 'master' into monitoring
|
2019-05-11 13:26:10 +08:00 |
|
soulseen
|
ecfcad9ea8
|
fix init jenkins
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-11 13:01:45 +08:00 |
|
runzexia
|
c8c66c1d6c
|
fix typo
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-11 12:18:40 +08:00 |
|
runzexia
|
21b663de50
|
jenkins client NPE check
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-11 12:09:03 +08:00 |
|
huanggze
|
1a9b17f98d
|
fix: ensure old namespce data to be filterred out correctly in metrics
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-11 12:00:15 +08:00 |
|
huanggze
|
3d36b254b0
|
fix: ensure namespces to be filterred correctly in workspace metrics
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-10 23:37:28 +08:00 |
|
soulseen
|
a472c311dc
|
fix typo & remove repeat api
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-10 13:36:22 +08:00 |
|
runzexia
|
002b54a1f8
|
Merge branch 'master' into refactor-credential-create
|
2019-05-09 18:14:32 +08:00 |
|
runzexia
|
c9abd0052b
|
do not need get id
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-09 18:13:54 +08:00 |
|
不羁
|
d27c5b96cf
|
add missing api group (#400)
Signed-off-by: hongming <talonwan@yunify.com>
|
2019-05-09 18:10:20 +08:00 |
|
runzexia
|
96f2641e8b
|
do not find description
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-09 18:09:48 +08:00 |
|
runzexia
|
8bf5ae0910
|
refactor credential api
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-09 17:53:33 +08:00 |
|
Zhuxiaoyang
|
52b63f5ebc
|
update post run pipeline
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-08 21:01:45 +08:00 |
|
runzexia
|
70977f0d8a
|
return nil
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-08 17:00:49 +08:00 |
|
Guangzhe Huang
|
260ffe90f9
|
Merge branch 'master' into logging-dev
|
2019-05-08 15:42:30 +08:00 |
|
Guangzhe Huang
|
750c3f1eb5
|
Merge branch 'master' into logging-dev
|
2019-05-08 15:34:15 +08:00 |
|
huanggze
|
5523725421
|
fix: log query starttime must be greater than the namespace creation time
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-08 15:30:56 +08:00 |
|
不羁
|
0e50a93e26
|
Merge branch 'master' into master
|
2019-05-08 15:14:59 +08:00 |
|
runzexia
|
e0f84ab5b4
|
Merge branch 'master' into reinit-jenkins-
|
2019-05-08 14:53:11 +08:00 |
|
Zhuxiaoyang
|
a5cd5bee82
|
add jenkins branch api
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-08 14:44:53 +08:00 |
|
runzexia
|
b7889e4172
|
jenkins init
Signed-off-by: runzexia <runzexia@yunify.com>
|
2019-05-08 14:41:55 +08:00 |
|
不羁
|
dbb02bd081
|
Merge branch 'master' into master
|
2019-05-08 13:22:23 +08:00 |
|
hongming
|
0083a48e01
|
add pvc filter
Signed-off-by: hongming <talonwan@yunify.com>
|
2019-05-08 13:21:05 +08:00 |
|
huanggze
|
ac96101142
|
fix: namespace resourcequota of pod count
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-07 23:17:19 +08:00 |
|
huanggze
|
0b55a064e8
|
add flag description of prometheus client
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-07 23:17:19 +08:00 |
|
Zhuxiaoyang
|
daac30bfae
|
update post run url
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-07 11:37:42 +08:00 |
|
huanggze
|
85836e2e1a
|
log: remove redudant wrapper
Signed-off-by: huanggze <loganhuang@yunify.com>
|
2019-05-07 10:27:55 +08:00 |
|
hongming
|
e115feeb8a
|
fix: duplicate namespace
Signed-off-by: hongming <talonwan@yunify.com>
|
2019-05-06 17:54:51 +08:00 |
|
soulseen
|
9f24801eeb
|
update jenkins pre-check
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-06 17:46:23 +08:00 |
|
soulseen
|
a57947fd45
|
add jenkins pre-check & fix jenkins flag
Signed-off-by: soulseen <sunzhu@yunify.com>
|
2019-05-06 17:46:23 +08:00 |
|