Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
水淹萌龙
kubesphere
提交
742ab06e
K
kubesphere
项目概览
水淹萌龙
/
kubesphere
与 Fork 源项目一致
Fork自
KubeSphere / kubesphere
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kubesphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
未验证
提交
742ab06e
编写于
12月 04, 2018
作者:
Z
zryfish
提交者:
GitHub
12月 04, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #227 from zryfish/add_node_status
refactor component status
上级
9e7db667
9122ed7b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
94 addition
and
2 deletion
+94
-2
pkg/apis/v1alpha/components/components_handler.go
pkg/apis/v1alpha/components/components_handler.go
+27
-2
pkg/models/components.go
pkg/models/components.go
+67
-0
未找到文件。
pkg/apis/v1alpha/components/components_handler.go
浏览文件 @
742ab06e
...
...
@@ -19,6 +19,8 @@ package components
import
(
"net/http"
"github.com/golang/glog"
"github.com/emicklei/go-restful"
"kubesphere.io/kubesphere/pkg/constants"
...
...
@@ -34,6 +36,24 @@ func Register(ws *restful.WebService, subPath string) {
Filter
(
route
.
RouteLogging
))
.
Consumes
(
restful
.
MIME_JSON
,
restful
.
MIME_XML
)
.
Produces
(
restful
.
MIME_JSON
)
ws
.
Route
(
ws
.
GET
(
"/health"
)
.
To
(
handleGetSystemHealthStatus
)
.
Filter
(
route
.
RouteLogging
))
.
Consumes
(
restful
.
MIME_JSON
,
restful
.
MIME_XML
)
.
Produces
(
restful
.
MIME_JSON
)
}
func
handleGetSystemHealthStatus
(
request
*
restful
.
Request
,
response
*
restful
.
Response
)
{
if
status
,
err
:=
models
.
GetSystemHealthStatus
();
err
!=
nil
{
err
=
response
.
WriteHeaderAndEntity
(
http
.
StatusInternalServerError
,
constants
.
MessageResponse
{
Message
:
err
.
Error
()})
if
err
!=
nil
{
glog
.
Errorln
(
err
)
}
}
else
{
err
=
response
.
WriteAsJson
(
status
)
if
err
!=
nil
{
glog
.
Errorln
(
err
)
}
}
}
// get a specific component status
...
...
@@ -42,9 +62,14 @@ func handleGetComponentStatus(request *restful.Request, response *restful.Respon
componentName
:=
request
.
PathParameter
(
"componentName"
)
if
component
,
err
:=
models
.
GetComponentStatus
(
namespace
,
componentName
);
err
!=
nil
{
response
.
WriteHeaderAndEntity
(
http
.
StatusInternalServerError
,
constants
.
MessageResponse
{
Message
:
err
.
Error
()})
err
=
response
.
WriteHeaderAndEntity
(
http
.
StatusInternalServerError
,
constants
.
MessageResponse
{
Message
:
err
.
Error
()})
if
err
!=
nil
{
glog
.
Errorln
(
err
)
}
}
else
{
response
.
WriteAsJson
(
component
)
if
err
=
response
.
WriteAsJson
(
component
);
err
!=
nil
{
glog
.
Errorln
(
err
)
}
}
}
...
...
pkg/models/components.go
浏览文件 @
742ab06e
...
...
@@ -19,6 +19,11 @@ package models
import
(
"time"
v13
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1"
"kubesphere.io/kubesphere/pkg/client"
v12
"k8s.io/client-go/listers/core/v1"
"kubesphere.io/kubesphere/pkg/models/controllers"
...
...
@@ -98,6 +103,68 @@ func GetComponentStatus(namespace string, componentName string) (interface{}, er
}
func
GetSystemHealthStatus
()
(
map
[
string
]
interface
{},
error
)
{
status
:=
make
(
map
[
string
]
interface
{})
k8sClient
:=
client
.
NewK8sClient
()
csList
,
err
:=
k8sClient
.
Core
()
.
ComponentStatuses
()
.
List
(
v1
.
ListOptions
{})
if
err
!=
nil
{
glog
.
Errorln
(
err
)
return
nil
,
err
}
for
_
,
cs
:=
range
csList
.
Items
{
status
[
cs
.
Name
]
=
cs
.
Conditions
[
0
]
}
// get kubesphere-system components
systemComponentStatus
,
err
:=
GetAllComponentsStatus
()
if
err
!=
nil
{
glog
.
Errorln
(
err
)
}
for
k
,
v
:=
range
systemComponentStatus
{
status
[
k
]
=
v
}
// get node status
lister
,
err
:=
controllers
.
GetLister
(
controllers
.
Nodes
)
if
err
!=
nil
{
glog
.
Errorln
(
err
)
return
status
,
nil
}
nodeLister
:=
lister
.
(
v12
.
NodeLister
)
nodes
,
err
:=
nodeLister
.
List
(
labels
.
Everything
())
if
err
!=
nil
{
glog
.
Errorln
(
err
)
return
status
,
nil
}
nodeStatus
:=
make
(
map
[
string
]
int
)
totalNodes
:=
0
healthyNodes
:=
0
for
_
,
nodes
:=
range
nodes
{
totalNodes
++
for
_
,
condition
:=
range
nodes
.
Status
.
Conditions
{
if
condition
.
Type
==
v13
.
NodeReady
&&
condition
.
Status
==
v13
.
ConditionTrue
{
healthyNodes
++
}
}
}
nodeStatus
[
"totalNodes"
]
=
totalNodes
nodeStatus
[
"healthyNodes"
]
=
healthyNodes
status
[
"nodes"
]
=
nodeStatus
return
status
,
nil
}
func
GetAllComponentsStatus
()
(
map
[
string
]
interface
{},
error
)
{
status
:=
make
(
map
[
string
]
interface
{})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录