Monitor update

server/rpc.go

@@ -18,9 +18,12 @@ func (s *server) ListContent(ctx context.Context, _ *connect.Request[homelabv1.L
 	}
 	for i := range s.cfg.Monitor {
 		it := &s.cfg.Monitor[i]
-		val, _ := s.monVals.Load(it.Name)
-		v, _ := val.(string)
-		resp.Monitors = append(resp.Monitors, &homelabv1.Item{Name: it.Name, Data: it.Data, Value: v})
+		m := &homelabv1.Monitor{Name: it.Name}
+		if d, ok := s.monVals.Load(it.Name); ok {
+			md := d.(*monData)
+			m.Percentage, m.Stats = md.percentage, md.stats
+		}
+		resp.Monitors = append(resp.Monitors, m)
 	}
 	for i := range s.cfg.Exec {
 		it := &s.cfg.Exec[i]
@@ -38,7 +41,7 @@ func (s *server) RunScript(_ context.Context, req *connect.Request[homelabv1.Run
 	if len(req.Msg.GetArgs()) != it.Args {
 		return nil, connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("%q takes %d args, got %d", it.Name, it.Args, len(req.Msg.GetArgs())))
 	}
-	out, err := runScript(it, req.Msg.GetArgs()...)
+	out, err := runScript(it.Script, req.Msg.GetArgs()...)
 	if err != nil {
 		log.Printf("script %s args=%v: ERROR %v", it.Name, req.Msg.GetArgs(), err)
 		return nil, connect.NewError(connect.CodeInternal, err)