webapp: add per scale set job queue view

database/common/store.go

@@ -166,7 +166,7 @@ type ScaleSetsStore interface {
 	GetScaleSetByID(ctx context.Context, scaleSet uint) (params.ScaleSet, error)
 	DeleteScaleSetByID(ctx context.Context, scaleSetID uint) (err error)
 	SetScaleSetLastMessageID(ctx context.Context, scaleSetID uint, lastMessageID int64) error
-	SetScaleSetDesiredRunnerCount(ctx context.Context, scaleSetID uint, desiredRunnerCount int) error
+	SetScaleSetRunnerStatistics(ctx context.Context, scaleSetID uint, stats params.RunnerScaleSetStatistic) error
 }
 
 type ScaleSetInstanceStore interface {

database/sql/jobs.go

@@ -72,6 +72,10 @@ func sqlWorkflowJobToParamsJob(job WorkflowJob) (params.Job, error) {
 		jobParam.RunnerName = job.Instance.Name
 	}
 
+	if job.ScaleSetFkID != nil {
+		jobParam.ScaleSetID = *job.ScaleSetFkID
+	}
+
 	return jobParam, nil
 }
 
@@ -104,6 +108,11 @@ func (s *sqlDatabase) paramsJobToWorkflowJob(ctx context.Context, conn *gorm.DB,
 		LockedBy:        job.LockedBy,
 	}
 
+	if job.ScaleSetID != 0 {
+		scaleSetID := job.ScaleSetID
+		workflofJob.ScaleSetFkID = &scaleSetID
+	}
+
 	if job.RunnerName != "" {
 		instance, err := s.getInstance(s.ctx, conn, job.RunnerName)
 		if err != nil {
@@ -360,6 +369,11 @@ func (s *sqlDatabase) CreateOrUpdateJob(ctx context.Context, job params.Job) (pa
 			if job.ForgeInstanceID != nil {
 				workflowJob.ForgeInstanceID = job.ForgeInstanceID
 			}
+
+			if job.ScaleSetID != 0 {
+				scaleSetID := job.ScaleSetID
+				workflowJob.ScaleSetFkID = &scaleSetID
+			}
 			if err := tx.Save(&workflowJob).Error; err != nil {
 				return fmt.Errorf("error saving job: %w", err)
 			}

database/sql/models.go

@@ -219,6 +219,10 @@ type ScaleSet struct {
 	Enabled                bool
 	LastMessageID          int64
 	DesiredRunnerCount     int
+	// RunnerStatistics is the last RunnerScaleSetStatistic received from
+	// GitHub on the message session (busy/idle/assigned counts as GitHub
+	// sees them).
+	RunnerStatistics datatypes.JSON
 	// ExtraSpecs is an opaque json that gets sent to the provider
 	// as part of the bootstrap params for instances. It can contain
 	// any kind of data needed by providers.
@@ -474,6 +478,11 @@ type WorkflowJob struct {
 	// ScaleSetJobID is the job ID for a scaleset job.
 	ScaleSetJobID string `gorm:"index:scaleset_job_id_idx"`
 
+	// ScaleSetFkID is the ID of the scale set that this job was assigned to,
+	// if the job came in through a scale set listener.
+	ScaleSetFkID *uint    `gorm:"index"`
+	ScaleSet     ScaleSet `gorm:"foreignKey:ScaleSetFkID"`
+
 	// RunID is the ID of the workflow run. A run may have multiple jobs.
 	RunID int64
 	// Action is the specific activity that triggered the event.

database/sql/scalesets.go

@@ -16,6 +16,7 @@ package sql
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 
@@ -525,7 +526,7 @@ func (s *sqlDatabase) SetScaleSetLastMessageID(_ context.Context, scaleSetID uin
 	return nil
 }
 
-func (s *sqlDatabase) SetScaleSetDesiredRunnerCount(_ context.Context, scaleSetID uint, desiredRunnerCount int) (err error) {
+func (s *sqlDatabase) SetScaleSetRunnerStatistics(_ context.Context, scaleSetID uint, stats params.RunnerScaleSetStatistic) (err error) {
 	var scaleSet params.ScaleSet
 	var rowsAffected int64
 	defer func() {
@@ -538,8 +539,13 @@ func (s *sqlDatabase) SetScaleSetDesiredRunnerCount(_ context.Context, scaleSetI
 		if err != nil {
 			return fmt.Errorf("error fetching scale set: %w", err)
 		}
+		asJSON, err := json.Marshal(stats)
+		if err != nil {
+			return fmt.Errorf("error marshaling runner statistics: %w", err)
+		}
 		result := tx.Model(&dbSet).Updates(map[string]interface{}{
-			"desired_runner_count": desiredRunnerCount,
+			"desired_runner_count": stats.TotalAssignedJobs,
+			"runner_statistics":    datatypes.JSON(asJSON),
 		})
 		if result.Error != nil {
 			return fmt.Errorf("error saving database entry: %w", result.Error)

database/sql/scalesets_test.go

@@ -257,7 +257,7 @@ func (s *ScaleSetsTestSuite) TestScaleSetOperations() {
 	s.T().Run("Set scale set last message ID and desired count", func(_ *testing.T) {
 		err = s.Store.SetScaleSetLastMessageID(s.adminCtx, orgScaleSet.ID, 20)
 		s.Require().NoError(err)
-		err = s.Store.SetScaleSetDesiredRunnerCount(s.adminCtx, orgScaleSet.ID, 5)
+		err = s.Store.SetScaleSetRunnerStatistics(s.adminCtx, orgScaleSet.ID, params.RunnerScaleSetStatistic{TotalAssignedJobs: 5})
 		s.Require().NoError(err)
 		orgScaleSetByID, err := s.Store.GetScaleSetByID(s.adminCtx, orgScaleSet.ID)
 		s.Require().NoError(err)

database/sql/util.go

@@ -489,6 +489,14 @@ func (s *sqlDatabase) sqlToCommonScaleSet(scaleSet ScaleSet) (params.ScaleSet, e
 		ret.ProxyName = scaleSet.Proxy.Name
 	}
 
+	if len(scaleSet.RunnerStatistics) > 0 {
+		var stats params.RunnerScaleSetStatistic
+		if err := json.Unmarshal(scaleSet.RunnerStatistics, &stats); err != nil {
+			return params.ScaleSet{}, fmt.Errorf("error unmarshaling runner statistics: %w", err)
+		}
+		ret.Statistics = &stats
+	}
+
 	var ep GithubEndpoint
 	if scaleSet.RepoID != nil {
 		ret.RepoID = scaleSet.RepoID.String()

database/watcher/watcher_store_test.go

@@ -582,7 +582,7 @@ func (s *WatcherStoreTestSuite) TestScaleSetWatcher() {
 		s.T().Fatal("expected payload not received")
 	}
 
-	err = s.store.SetScaleSetDesiredRunnerCount(s.ctx, updatedScaleSet.ID, 5)
+	err = s.store.SetScaleSetRunnerStatistics(s.ctx, updatedScaleSet.ID, params.RunnerScaleSetStatistic{TotalAssignedJobs: 5})
 	s.Require().NoError(err)
 
 	select {
@@ -600,8 +600,9 @@ func (s *WatcherStoreTestSuite) TestScaleSetWatcher() {
 
 	select {
 	case event := <-consumer.Watch():
-		// We updated last message ID and desired runner count above.
+		// We updated last message ID and runner statistics above.
 		updatedScaleSet.DesiredRunnerCount = 5
+		updatedScaleSet.Statistics = &params.RunnerScaleSetStatistic{TotalAssignedJobs: 5}
 		updatedScaleSet.LastMessageID = 99
 		payloadFromEvent, ok := event.Payload.(params.ScaleSet)
 		s.Require().True(ok)

params/params.go

@@ -719,7 +719,10 @@ type ScaleSet struct {
 	Enabled            bool                `json:"enabled,omitempty"`
 	Instances          []Instance          `json:"instances,omitempty"`
 	DesiredRunnerCount int                 `json:"desired_runner_count,omitempty"`
-	EnableShell        bool                `json:"enable_shell"`
+	// Statistics is the last runner scale set statistic received from GitHub
+	// on the message session (busy/idle/assigned counts as GitHub sees them).
+	Statistics  *RunnerScaleSetStatistic `json:"statistics,omitempty"`
+	EnableShell bool                     `json:"enable_shell"`
 
 	// Generation holds the numeric generation of the scaleset. This number
 	// will be incremented, every time certain settings of the scaleset, which
@@ -1418,6 +1421,9 @@ type Job struct {
 	WorkflowJobID int64 `json:"workflow_job_id,omitempty"`
 	// ScaleSetJobID is the job ID when generated for a scale set.
 	ScaleSetJobID string `json:"scaleset_job_id,omitempty"`
+	// ScaleSetID is the garm ID of the scale set this job was assigned to,
+	// if it came in through a scale set listener.
+	ScaleSetID uint `json:"scale_set_id,omitempty"`
 	// RunID is the ID of the workflow run. A run may have multiple jobs.
 	RunID int64 `json:"run_id,omitempty"`
 	// Action is the specific activity that triggered the event.

webapp/src/lib/api/generated-client.ts

@@ -21,7 +21,9 @@ import {
   ProxiesApi,
   ObjectsApi,
   ToolsApi,
+  JobsApi,
   type GARMAgentRelease,
+  type Job,
   type Repository,
   type Organization,
   type Enterprise,
@@ -152,6 +154,7 @@ export class GeneratedGarmApiClient {
   private proxiesApi: ProxiesApi;
   private objectsApi: ObjectsApi;
   private toolsApi: ToolsApi;
+  private jobsApi: JobsApi;
 
   constructor(baseUrl: string = '') {
     this.baseUrl = baseUrl || window.location.origin;
@@ -188,6 +191,7 @@ export class GeneratedGarmApiClient {
     this.proxiesApi = new ProxiesApi(this.config);
     this.objectsApi = new ObjectsApi(this.config);
     this.toolsApi = new ToolsApi(this.config);
+    this.jobsApi = new JobsApi(this.config);
   }
 
   // Set authentication token
@@ -222,6 +226,7 @@ export class GeneratedGarmApiClient {
     this.providersApi = new ProvidersApi(this.config);
     this.firstRunApi = new FirstRunApi(this.config);
     this.hooksApi = new HooksApi(this.config);
+    this.jobsApi = new JobsApi(this.config);
   }
 
   // Authentication
@@ -644,6 +649,12 @@ export class GeneratedGarmApiClient {
     await this.scaleSetsApi.deleteScaleSet(id.toString());
   }
 
+  // Jobs
+  async listJobs(): Promise<Job[]> {
+    const response = await this.jobsApi.listJobs();
+    return response.data || [];
+  }
+
   // Instances
   async listInstances(): Promise<Instance[]> {
     const response = await this.instancesApi.listInstances();

webapp/src/lib/api/generated/api.ts

@@ -2325,6 +2325,12 @@ export interface Job {
      * @memberof Job
      */
     'runner_name'?: string;
+    /**
+     * ScaleSetID is the garm ID of the scale set this job was assigned to, if it came in through a scale set listener.
+     * @type {number}
+     * @memberof Job
+     */
+    'scale_set_id'?: number;
     /**
      * ScaleSetJobID is the job ID when generated for a scale set.
      * @type {string}
@@ -3003,6 +3009,20 @@ export interface RunnerPrefix {
  * @export
  * @interface ScaleSet
  */
+/**
+ * RunnerScaleSetStatistic is the last runner scale set statistic received from GitHub on the message session.
+ * @export
+ * @interface RunnerScaleSetStatistic
+ */
+export interface RunnerScaleSetStatistic {
+    'totalAvailableJobs'?: number;
+    'totalAcquiredJobs'?: number;
+    'totalAssignedJobs'?: number;
+    'totalRunningJobs'?: number;
+    'totalRegisteredRunners'?: number;
+    'totalBusyRunners'?: number;
+    'totalIdleRunners'?: number;
+}
 export interface ScaleSet {
     /**
      * 
@@ -3160,6 +3180,12 @@ export interface ScaleSet {
      * @memberof ScaleSet
      */
     'proxy_name'?: string;
+    /**
+     * Statistics is the last runner scale set statistic received from GitHub on the message session.
+     * @type {RunnerScaleSetStatistic}
+     * @memberof ScaleSet
+     */
+    'statistics'?: RunnerScaleSetStatistic;
     /**
      * 
      * @type {string}