Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:bcs-monitor 支持 cluster-manager节点池数目趋势图 api #3181

Merged
merged 2 commits into from
May 21, 2024

Conversation

LidolLxf
Copy link
Contributor

@LidolLxf LidolLxf commented May 9, 2024

feat:bcs-monitor 支持 cluster-manager节点池数目趋势图 api

@LidolLxf LidolLxf force-pushed the feat_cluster_node_num branch 2 times, most recently from f35edb7 to 34d7e46 Compare May 10, 2024 09:48
@@ -177,6 +177,8 @@ func registerMetricsRoutes(engine *gin.RouterGroup) {
route.GET("/disk_usage", rest.RestHandlerFunc(metrics.ClusterDiskUsage))
route.GET("/diskio_usage", rest.RestHandlerFunc(metrics.ClusterDiskioUsage))
route.GET("/pod_usage", rest.RestHandlerFunc(metrics.ClusterPodUsage))
route.GET("/group/:group/node_num", rest.RestHandlerFunc(metrics.ClusterGroupNodeNum))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里节点池统一命名 nodegroup Nodegroup

end time.Time, step time.Duration) ([]*prompb.TimeSeries, error) {

params := map[string]interface{}{
"clusterID": clusterID,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里 clusterID 要通过配置文件传过来,因为 bkbcs_clustermanager_cluster_group_maxNodeNum metrics 只在bcs 自己所在集群存在,如果查其他集群的节点池 metrics,也要通过 bcs 所在集群去查。

}

params := map[string]interface{}{
"clusterId": c.ClusterId,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里没改

@ifooth ifooth merged commit 576c96f into TencentBlueKing:master May 21, 2024
11 checks passed
wenxinlee2015 added a commit that referenced this pull request May 23, 2024
* github-bk-bcs/master:
  fix: 修复客户端查询标签时输入纯数字报错问题 (#3224)
  refactor: 批量删除配置文件成功提示文案修改 (#3228)
  fix: 处理文件型服务表格滚动 (#3227)
  fix: 客户端查询体验优化 (#3222)
  fix: 新增检测客户端查询名称接口 (#3221)
  fix: 修复客户端统计和查询内存和cpu数据展示问题 (#3213)
  fix: support dualstack ip and multi ip in complex network enviroment (#3220)
  fix: 删除文件后恢复后需定位到刚刚恢复的配置项--bug=124360863 (#3214)
  fix: 文件型配置列表高度需自适应--bug=124373229 (#3219)
  fix: 客户端查询支持拉取时间搜索 (#3211)
  feat:bcs-monitor 支持 cluster-manager节点池数目趋势图 api (#3181)
  fix: 修复客户端下钻以及过滤客户端上报时不完整的数据 (#3206)
  feat: 客户端查询添加配置拉取时间范围查询 (#3212)
  feat: 新增生成swagger文档 (#3173)
  1. 补全标准运维 离线安装和bkrepo操作文档 (#3148)
  feat:bcs-ui 支持自定义注册前置 (#3208)
  feat: bscp supports file multiple match (#3185)
  refactor: 业务选择组件增加虚拟滚动 (#3209)
  fix: 客户端统计体验优化 (#3210)
  fix: 去掉客户端统计饼图和旭日图选中态的黑色边框 (#3207)
  fix: 套餐模板中的配置文件不应该支持添加到键值型服务当中--bug=124182747 (#3205)
  fix: 修复文件型配置表格边框问题 (#3204)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants