Feature: Allow default max jobs per server to be set at the group level (individual servers can override).

Author: jhuckaby

docs/api.md

@@ -1620,6 +1620,7 @@ Parameters (required fields):
 |---------------|------|-------------|
 | `title` | String | **(Required)** Visual name for the group. |
 | `hostname_match` | String | **(Required)** A regular expression string used to auto-match servers to the group. |
+| (Other) | Various | Any other [Group](data.md#group) fields (e.g. `title`, `hostname_match`, `icon`, `notes`, `alert_actions`). |
 
 Example request:
 
@@ -3983,6 +3984,7 @@ Parameters:
 | `icon` | String | Optional icon ID for the server, displayed in the UI. Icons are sourced from [Material Design Icons](https://materialdesignicons.com/).
 | `groups` | Array | Optional set of [Group.id](data.md#group-id)s for the server.  Only applicable if `autoGroup` is `false`. |
 | `autoGroup` | Boolean | Optionally set the auto-group flag for the server (see below).
+| `maxJobs` | Integer | Optionally limit the number of concurrent jobs allowed to run on the server. |
 | (Other) | Various | Any other updatable [Server](data.md#server) fields. |
 
 Special behavior:

docs/data.md

@@ -574,6 +574,10 @@ An internal revision number for the group, incremented with each change.
 
 An integer value representing the sort order of the group.  Lower values are sorted first.
 
+### Group.max_jobs_per_server
+
+An optional default job concurrency limit to place on each server in the group.  Set to `0` for infinite.  Individual servers may override this via [Server.maxJobs](#server-maxjobs).
+
 ## Job
 
 A job is a running (or previously ran) instance of an event.  The job structure has nearly all the same properties as [Event](#event) with these differences:

htdocs/js/pages/admin/Groups.class.js

@@ -471,6 +471,19 @@ Page.Groups = class Groups extends Page.ServerUtils {
 			caption: 'Optionally enter a regular expression match to auto-include hostnames in the group.<br/>To match <b>all servers</b>, set this to <code>.+</code>'
 		});
 
+		// max jobs per server
+		html += this.getFormRow({
+			label: 'Max Server Jobs:',
+			content: this.getFormText({
+				id: 'fe_eg_max_jobs_per_server',
+				type: 'number',
+				min: '0',
+				step: '1',
+				value: group.max_jobs_per_server || '0'
+			}),
+			caption: 'Optionally set a default for max concurrent jobs allowed to run on each server in the group.  Set to `0` for unlimited.  Note that individual servers may override this.'
+		});
+		
 		// actions
 		// (requires this.actions to be populated)
 		html += this.getFormRow({
@@ -500,6 +513,7 @@ Page.Groups = class Groups extends Page.ServerUtils {
 		group.title = $('#fe_eg_title').val().trim();
 		group.icon = $('#fe_eg_icon').val();
 		group.hostname_match = $('#fe_eg_match').val();
+		group.max_jobs_per_server = parseInt( $('#fe_eg_max_jobs_per_server').val() ) || 0;
 		group.notes = $('#fe_eg_notes').val();
 
 		if (!group.title.length) {

lib/job.js

@@ -813,11 +813,18 @@ class Jobs {
 
 	filterServerByMaxJobs(server_id) {
 		// filter server out of available set by optional maxJobs setting
+		var self = this;
 		var server = this.servers[server_id];
-		if (!server.maxJobs) return true;
+		var max_jobs = server.maxJobs || 0;
+		
+		if (!max_jobs) (server.groups || []).forEach( function(group_id) {
+			var group = Tools.findObject( self.groups, { id: group_id } );
+			if (group && group.max_jobs_per_server && (!max_jobs || (group.max_jobs_per_server < max_jobs))) max_jobs = group.max_jobs_per_server;
+		} );
+		if (!max_jobs) return true;
 
 		var jobs = this.findActiveJobs({ server: server_id });
-		return jobs.length < server.maxJobs;
+		return jobs.length < max_jobs;
 	}
 
 	checkAvailableJobServer(job) {