This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 18aece27 [horus] Fix node data missing get metrics (#429)
18aece27 is described below
commit 18aece2794e889a84283822ec2c536a811b4a698
Author: mfordjody <[email protected]>
AuthorDate: Sat Oct 5 12:39:06 2024 +0800
[horus] Fix node data missing get metrics (#429)
---
app/horus/base/db/db.go | 15 +++++++++++++++
app/horus/core/horuser/metrics.go | 21 +++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/app/horus/base/db/db.go b/app/horus/base/db/db.go
index 16c8c96c..e7844c38 100644
--- a/app/horus/base/db/db.go
+++ b/app/horus/base/db/db.go
@@ -193,6 +193,21 @@ func (n *NodeDataInfo) RestartMarker() (bool, error) {
return n.Update()
}
+func GetNode() ([]NodeDataInfo, error) {
+ var ndi []NodeDataInfo
+ session := db.Where(fmt.Sprintf("id>%d", 0))
+ err := session.Find(&ndi)
+ return ndi, err
+}
+
+func GetNodeByName(nodeName, moduleName string) (*NodeDataInfo, error) {
+ ndi := NodeDataInfo{
+ NodeName: nodeName,
+ ModuleName: moduleName,
+ }
+ return ndi.Get()
+}
+
func GetPod() ([]PodDataInfo, error) {
var pdi []PodDataInfo
session := db.Where(fmt.Sprintf("id>%d", 0))
diff --git a/app/horus/core/horuser/metrics.go
b/app/horus/core/horuser/metrics.go
index b5e666f1..62c71883 100644
--- a/app/horus/core/horuser/metrics.go
+++ b/app/horus/core/horuser/metrics.go
@@ -40,6 +40,27 @@ var (
"prometheus_multiple_address",
},
nil)
+
+ NodeInfo = prometheus.NewDesc(
+ "horus_node_info",
+ "horus_node_info",
+ []string{
+ "node_name",
+ "node_ip",
+ "sn",
+ "cluster_name",
+ "module_name",
+ "reason",
+ "restart",
+ "repair",
+ "repair_ticket_url",
+ "first_date",
+ "create_time",
+ "update_time",
+ "recovery_ql",
+ "recovery_mark",
+ },
+ nil)
)
func (h *Horuser) Collect(ch chan<- prometheus.Metric) {
