Commit Graph

118 Commits

Author SHA1 Message Date
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
Jeff
6dd8622136 fix update router bug 2019-05-12 17:59:25 +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
Zhuxiaoyang
2857071bdd Dev (#9)
* add tag & add webhook api

Signed-off-by: soulseen <sunzhu@yunify.com>
2019-05-06 17:46:23 +08:00
Zhuxiaoyang
daab932e9f update jenkins api
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-05-06 17:46:23 +08:00
runzexia
b416aa27bb fmt code 2019-05-06 17:37:24 +08:00
runzexia
21c2e4920f delete user in devops 2019-05-06 17:37:24 +08:00
huanggze
7748ad8f3c update resource quota metrics
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-05-06 17:36:02 +08:00
huanggze
1239ed23ac bug fix: workload monitoring
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-05-06 17:36:02 +08:00
hongming
8e2acfa7f6 add extra annotations
Signed-off-by: hongming <talonwan@yunify.com>
2019-05-05 23:02:21 +08:00
huanggze
3e8035dc2b update pod metrics
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-05-05 09:11:05 +08:00
runzexia
3931912f8d fix typo 2019-04-30 00:55:36 +08:00
hongming
ed5e1c53e9 fix: workspace manage permission
Signed-off-by: hongming <talonwan@yunify.com>
2019-04-30 00:54:45 +08:00
runzexia
8268c969ba request devops api with auth info 2019-04-29 12:26:39 +08:00
hongming
57f3eed28c fix: wrong file path
Signed-off-by: hongming <talonwan@yunify.com>
2019-04-29 10:46:59 +08:00
huanggze
20a4525d58 refactor monitoring modules
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-04-28 21:08:27 +08:00