Commit Graph

145 Commits

Author SHA1 Message Date
runzexia
4c2bd4819c fix ci
Signed-off-by: runzexia <runzexia@yunify.com>
2019-06-23 13:32:01 +08:00
runzexia
ae8ee99da3 update api docs
Signed-off-by: runzexia <runzexia@yunify.com>
2019-06-23 13:32:01 +08:00
huanggze
a8cb551483 api: update descriptions and change path for monitoring apis
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-06-22 18:58:47 +08:00
Benjamin Huo
825d1644bb Merge branch 'master' into monitoring-fix 2019-06-22 12:44:20 +08:00
Zhuxiaoyang
d519a9bbab Merge branch 'master' into master 2019-06-21 22:20:55 +08:00
soulseen
39e8de7de5 update devops api doc & remove not used api
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-06-21 22:07:27 +08:00
huanggze
08e432cb7f fix: filter out loopback devices when calculating disk space metrics
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-06-21 21:03:17 +08:00
hongming
24d13e44f7 update api docs (#490)
* update api docs

Signed-off-by: hongming <talonwan@yunify.com>

* fix: kube-apiserver host in kubeconfig

Signed-off-by: hongming <talonwan@yunify.com>
2019-06-21 11:47:29 +08:00
不羁
72875c7885 fix: get application details failed (#481)
Signed-off-by: hongming <talonwan@yunify.com>
2019-06-21 11:34:05 +08:00
huanggze
ed0b211c2b fix: update metrics for node disk usage and capacity
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-06-21 11:34:05 +08:00
Benjamin Huo
c329a221bf Merge branch 'master' into monitoring-fix 2019-06-21 09:15:50 +08:00
不羁
4283814a68 fix: get application details failed (#481)
Signed-off-by: hongming <talonwan@yunify.com>
2019-06-20 16:23:24 +08:00
soulseen
fbc5a9db03 update devops api doc
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-06-19 21:10:01 +08:00
runzexia
b8ceaad836 fix typo set
Signed-off-by: runzexia <runzexia@yunify.com>
2019-06-19 20:47:11 +08:00
huanggze
48a025b257 fix: update metrics for node disk usage and capacity
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-06-19 20:17:13 +08:00
runzexia
35100c8385 Merge branch 'master' into devops-docs
Signed-off-by: runzexia <runzexia@yunify.com>

# Conflicts:
#	pkg/apis/tenant/v1alpha2/register.go
2019-06-10 10:34:49 +08:00
huanggze
2861865c09 doc: add monitoring and logging api doc
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-06-10 10:21:58 +08:00
hongming
468ef322d1 update api doc
Signed-off-by: hongming <talonwan@yunify.com>
2019-06-10 10:07:43 +08:00
runzexia
a9237a5c72 update docs
Signed-off-by: runzexia <runzexia@yunify.com>
2019-06-06 17:59:17 +08:00
runzexia
d5aa90bbdd Merge branch 'PR-469' into devops-docs 2019-06-06 11:33:37 +08:00
soulseen
8fe88f23b7 update devops api doc
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-06-05 21:55:59 +08:00
soulseen
24ec90376c add description
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-06-05 17:21:58 +08:00
runzexia
1b3e80519d update docs
Signed-off-by: runzexia <runzexia@yunify.com>
2019-06-05 15:47:38 +08:00
runzexia
fd530f4c1e tmp commit
Signed-off-by: runzexia <runzexia@yunify.com>
2019-06-05 14:09:39 +08:00
soulseen
2f02aa55cc format log
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-06-04 16:34:41 +08:00
soulseen
7e1774eb06 fix url format
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-06-04 11:05:08 +08:00
soulseen
01b79df455 add log err
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-05-27 17:25:49 +08:00
Jeff
1a1bcfebd0 fix router nil bug 2019-05-18 09:52:03 +08:00
hongming
ed224612bc fix: runtime release
Signed-off-by: hongming <talonwan@yunify.com>
2019-05-17 15:24:59 +08:00
Benjamin Huo
85a6b69f94 Merge branch 'master' into monitoring 2019-05-17 11:15:44 +08:00
runzexia
3c2aa60a72 fix devops req url
Signed-off-by: runzexia <runzexia@yunify.com>
2019-05-17 10:59:18 +08:00
Jeff
d310e635f2 fix service policy deletion bug 2019-05-17 09:35:05 +08:00
huanggze
41b85a7534 fix: update disk metrics
Signed-off-by: huanggze <loganhuang@yunify.com>
2019-05-16 23:29:52 +08:00
soulseen
8e50b9e31f fix cron check
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-05-16 21:32:05 +08:00
soulseen
35be922922 fix jenkins header
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-05-16 21:32:05 +08:00
runzexia
2259924e17 delete all devops project when delete ws
Signed-off-by: runzexia <runzexia@yunify.com>
2019-05-15 20:56:06 +08:00
Jeff
d9cce21f05 add quota left to namespace quota 2019-05-15 20:56:06 +08:00
soulseen
6b3b0aa4f1 update jenkins log
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-05-15 20:52:33 +08:00
runzexia
3d11687d2a delete all devops project when delete ws
Signed-off-by: runzexia <runzexia@yunify.com>
2019-05-15 17:44:47 +08:00
Jeff
5c32225613 add quota left to namespace quota 2019-05-15 16:46:45 +08:00
soulseen
322ba8be06 update jenkins log
Signed-off-by: soulseen <sunzhu@yunify.com>
2019-05-15 16:10:06 +08:00
hongming
4ae7d3256e fix: application api
Signed-off-by: hongming <talonwan@yunify.com>
2019-05-14 23:50:12 +08:00
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