improve function for resources monitoring

coder · defelmnq · Feb 14, 2025 · Feb 4, 2025 · Feb 10, 2025 · Feb 10, 2025
commit 7b2d19e95d02d2f9a12a5c6e45e34e9015a0404d
diff --git a/agent/agent.go b/agent/agent.go
@@ -785,6 +785,8 @@
 	// metadata reporting can cease as soon as we start gracefully shutting down
 	connMan.startAgentAPI("report metadata", gracefulShutdownBehaviorStop, a.reportMetadata)
 
+	connMan.startAgentAPI("resources monitor", gracefulShutdownBehaviorStop, a.pushResourcesMonitoring)
+
 	// channels to sync goroutines below
 	//  handle manifest
 	//       |

@@ -310,16 +310,19 @@ message GetResourcesMonitoringConfigurationResponse {
 
 message PushResourcesMonitoringUsageRequest {
 	message Datapoint {
+		message MemoryUsage {
+			int64 used = 1;
+			int64 total = 2;
+		}
 		message VolumeUsage {
 			string volume = 1;
-			int32 space_used = 2;
-			int32 space_total = 3;
+			int64 used = 2;
+			int64 total = 3;
 		}
 
 		google.protobuf.Timestamp collected_at = 1;
-		int32 memory_used = 2;
-		int32 memory_total =3;
-		repeated VolumeUsage volumes = 4;
+		MemoryUsage memory = 2;
+		repeated VolumeUsage volumes = 3;
 
 	}
 	repeated Datapoint datapoints = 1;

@@ -43,4 +43,6 @@ type DRPCAgentClient23 interface {
 
 type DRPCAgentClient24 interface {
 	DRPCAgentClient23
+	GetResourcesMonitoringConfiguration(ctx context.Context, in *GetResourcesMonitoringConfigurationRequest) (*GetResourcesMonitoringConfigurationResponse, error)
+	PushResourcesMonitoringUsage(ctx context.Context, in *PushResourcesMonitoringUsageRequest) (*PushResourcesMonitoringUsageResponse, error)
 }
diff --git a/coderd/agentapi/api.go b/coderd/agentapi/api.go
@@ -103,7 +103,11 @@ func New(opts Options) *API {
 		appearanceFetcher: opts.AppearanceFetcher,
 	}
 
-	api.ResourcesMonitoringAPI = &ResourcesMonitoringAPI{}
+	api.ResourcesMonitoringAPI = &ResourcesMonitoringAPI{
+		Log:      opts.Log,
+		AgentFn:  api.agent,
+		Database: opts.Database,
+	}
 
 	api.StatsAPI = &StatsAPI{
 		AgentFn:                   api.agent,

diff --git a/coderd/agentapi/resources_monitoring.go b/coderd/agentapi/resources_monitoring.go
@@ -2,19 +2,54 @@ package agentapi
 
 import (
 	"context"
+	"database/sql"
+	"errors"
 
-	"golang.org/x/xerrors"
-
+	"cdr.dev/slog"
 	"github.com/coder/coder/v2/agent/proto"
+	"github.com/coder/coder/v2/coderd/database"
 )
 
 type ResourcesMonitoringAPI struct {
+	AgentFn  func(context.Context) (database.WorkspaceAgent, error)
+	Database database.Store
+	Log      slog.Logger
 }
 
 func (a *ResourcesMonitoringAPI) GetResourcesMonitoringConfiguration(ctx context.Context, _ *proto.GetResourcesMonitoringConfigurationRequest) (*proto.GetResourcesMonitoringConfigurationResponse, error) {
-	return nil, xerrors.Errorf("GetResourcesMonitoringConfiguration is not implemented")
+	agent, err := a.AgentFn(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = a.Database.FetchMemoryResourceMonitorsByAgentID(ctx, agent.ID)
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return nil, err
+	}
+
+	volumeMonitors, err := a.Database.FetchVolumesResourceMonitorsByAgentID(ctx, agent.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	volumes := make([]string, 0, len(volumeMonitors))
+	for _, monitor := range volumeMonitors {
+		volumes = append(volumes, monitor.Path)
+	}
+
+	return &proto.GetResourcesMonitoringConfigurationResponse{
+		Enabled: false,
+		Config: &proto.GetResourcesMonitoringConfigurationResponse_Config{
+			TickInterval:  10,
+			NumDatapoints: 20,
+		},
+		MonitoredVolumes: volumes,
+	}, nil
 }
 
-func (a *ResourcesMonitoringAPI) PushResourcesMonitoringUsage(ctx context.Context, _ *proto.PushResourcesMonitoringUsageRequest) (*proto.PushResourcesMonitoringUsageResponse, error) {
-	return nil, xerrors.Errorf("PushResourcesMonitoringUsage is not implemented")
+func (a *ResourcesMonitoringAPI) PushResourcesMonitoringUsage(ctx context.Context, req *proto.PushResourcesMonitoringUsageRequest) (*proto.PushResourcesMonitoringUsageResponse, error) {
+	a.Log.Info(ctx, "resources monitoring usage received",
+		slog.F("request", req))
+
+	return &proto.PushResourcesMonitoringUsageResponse{}, nil
 }
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -1392,9 +1392,9 @@ func (q *querier) FavoriteWorkspace(ctx context.Context, id uuid.UUID) error {
 }
 
 func (q *querier) FetchMemoryResourceMonitorsByAgentID(ctx context.Context, agentID uuid.UUID) (database.WorkspaceAgentMemoryResourceMonitor, error) {
-	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
-		return database.WorkspaceAgentMemoryResourceMonitor{}, err
-	}
+	// if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
+	// 	return database.WorkspaceAgentMemoryResourceMonitor{}, err
+	// }
 
 	return q.db.FetchMemoryResourceMonitorsByAgentID(ctx, agentID)
 }
@@ -1407,9 +1407,9 @@ func (q *querier) FetchNewMessageMetadata(ctx context.Context, arg database.Fetc
 }
 
 func (q *querier) FetchVolumesResourceMonitorsByAgentID(ctx context.Context, agentID uuid.UUID) ([]database.WorkspaceAgentVolumeResourceMonitor, error) {
-	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
-		return nil, err
-	}
+	// if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
+	// 	return nil, err
+	// }
 
 	return q.db.FetchVolumesResourceMonitorsByAgentID(ctx, agentID)
 }
@@ -3020,9 +3020,9 @@ func (q *querier) InsertLicense(ctx context.Context, arg database.InsertLicenseP
 }
 
 func (q *querier) InsertMemoryResourceMonitor(ctx context.Context, arg database.InsertMemoryResourceMonitorParams) (database.WorkspaceAgentMemoryResourceMonitor, error) {
-	if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
-		return database.WorkspaceAgentMemoryResourceMonitor{}, err
-	}
+	// if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
+	// 	return database.WorkspaceAgentMemoryResourceMonitor{}, err
+	// }
 
 	return q.db.InsertMemoryResourceMonitor(ctx, arg)
 }
@@ -3220,9 +3220,9 @@ func (q *querier) InsertUserLink(ctx context.Context, arg database.InsertUserLin
 }
 
 func (q *querier) InsertVolumeResourceMonitor(ctx context.Context, arg database.InsertVolumeResourceMonitorParams) (database.WorkspaceAgentVolumeResourceMonitor, error) {
-	if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
-		return database.WorkspaceAgentVolumeResourceMonitor{}, err
-	}
+	// if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
+	// 	return database.WorkspaceAgentVolumeResourceMonitor{}, err
+	// }
 
 	return q.db.InsertVolumeResourceMonitor(ctx, arg)
 }

diff --git a/coderd/database/modelmethods.go b/coderd/database/modelmethods.go
@@ -327,6 +327,14 @@ func (c OAuth2ProviderAppCode) RBACObject() rbac.Object {
 	return rbac.ResourceOauth2AppCodeToken.WithOwner(c.UserID.String())
 }
 
+func (c WorkspaceAgentMemoryResourceMonitor) RBACObject() rbac.Object {
+	return rbac.ResourceWorkspaceAgentResourceMonitor.RBACObject()
+}
+
+func (c WorkspaceAgentVolumeResourceMonitor) RBACObject() rbac.Object {
+	return rbac.ResourceWorkspaceAgentResourceMonitor.RBACObject()
+}
+
 func (OAuth2ProviderAppSecret) RBACObject() rbac.Object {
 	return rbac.ResourceOauth2AppSecret
 }

diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -2041,7 +2041,7 @@ func requireGetManifest(ctx context.Context, t testing.TB, aAPI agentproto.DRPCA
 }
 
 func postStartup(ctx context.Context, t testing.TB, client agent.Client, startup *agentproto.Startup) error {
-	aAPI, _, err := client.ConnectRPC23(ctx)
+	aAPI, _, err := client.ConnectRPC24(ctx)
 	require.NoError(t, err)
 	defer func() {
 		cErr := aAPI.DRPCConn().Close()