ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-12-16 04:06:16 +01:00
Code Issues Packages Releases Activity

Cleanup after merge

Browse Source
This commit is contained in:
Jan Eitzinger
2025-10-16 13:21:22 +02:00
parent f5e1226837
commit eefb6f6265
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/repository/node.go
View File

@@ -244,16 +244,12 @@ func (r *NodeRepository) QueryNodes(
) ([]*schema.Node, error) { ) ([]*schema.Node, error) {
query, qerr := AccessCheck(ctx, query, qerr := AccessCheck(ctx,
sq.Select("node.hostname", "node.cluster", "node.subcluster", "node_state.node_state", sq.Select("node.hostname", "node.cluster", "node.subcluster", "node_state.node_state",
"node_state.health_state", "MAX(node_state.time_stamp)").From("node_state"). "node_state.health_state", "MAX(node_state.time_stamp)").From("node").
Join("node ON nodes_state.node_id = node.id").GroupBy("node_state.node_id")) Join("node_state ON nodes_state.node_id = node.id").GroupBy("node_state.node_id"))
if qerr != nil { if qerr != nil {
return nil, qerr return nil, qerr
} }
// Get latest Info aka closest Timestamp to $now
now := time.Now().Unix()
query = query.Join("node_state ON node_state.node_id = node.id").Where(sq.Gt{"node_state.time_stamp": (now - 60)}) // .Distinct()
for _, f := range filters { for _, f := range filters {
if f.Hostname != nil { if f.Hostname != nil {
query = buildStringCondition("node.hostname", f.Hostname, query) query = buildStringCondition("node.hostname", f.Hostname, query)
@@ -296,11 +292,9 @@ func (r *NodeRepository) QueryNodes(
} }
func (r *NodeRepository) ListNodes(cluster string) ([]*schema.Node, error) { func (r *NodeRepository) ListNodes(cluster string) ([]*schema.Node, error) {
// Get latest Info aka closest Timestamo to $now q := sq.Select("node.hostname", "node.cluster", "node.subcluster", "node_state.node_state",
now := time.Now().Unix() "node_state.health_state", "MAX(node_state.time_stamp)").From("node").
q := sq.Select("hostname", "cluster", "subcluster", "node_state", "health_state"). Join("node_state ON node_state.node_id = node.id").GroupBy("node_state.node_id").
From("node").
Join("node_state ON node_state.node_id = node.id").Where(sq.Gt{"node_state.time_stamp": (now - 60)}).
Where("node.cluster = ?", cluster).OrderBy("node.hostname ASC") Where("node.cluster = ?", cluster).OrderBy("node.hostname ASC")
rows, err := q.RunWith(r.DB).Query() rows, err := q.RunWith(r.DB).Query()