diff --git a/internal/common/metrics/scheduler_metrics.go b/internal/common/metrics/scheduler_metrics.go
index 063a80b5738..80403bf412e 100644
--- a/internal/common/metrics/scheduler_metrics.go
+++ b/internal/common/metrics/scheduler_metrics.go
@@ -174,7 +174,7 @@ var ClusterAvailableCapacityDesc = prometheus.NewDesc(
 var ClusterCordonedStatusDesc = prometheus.NewDesc(
 	MetricPrefix+"cluster_cordoned_status",
 	"Cluster cordoned status",
-	[]string{"cluster", "reason"},
+	[]string{"cluster", "reason", "setByUser"},
 	nil,
 )
 
@@ -382,8 +382,8 @@ func NewClusterTotalCapacity(value float64, cluster string, pool string, resourc
 	return prometheus.MustNewConstMetric(ClusterCapacityDesc, prometheus.GaugeValue, value, cluster, pool, resource, nodeType)
 }
 
-func NewClusterCordonedStatus(value float64, cluster string, reason string) prometheus.Metric {
-	return prometheus.MustNewConstMetric(ClusterCordonedStatusDesc, prometheus.GaugeValue, value, cluster, reason)
+func NewClusterCordonedStatus(value float64, cluster string, reason string, setByUser string) prometheus.Metric {
+	return prometheus.MustNewConstMetric(ClusterCordonedStatusDesc, prometheus.GaugeValue, value, cluster, reason, setByUser)
 }
 
 func NewQueueAllocated(value float64, queue string, cluster string, pool string, priorityClass string, resource string, nodeType string) prometheus.Metric {
diff --git a/internal/scheduler/database/executor_repository.go b/internal/scheduler/database/executor_repository.go
index ac45b083647..4b02c93a37d 100644
--- a/internal/scheduler/database/executor_repository.go
+++ b/internal/scheduler/database/executor_repository.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/armadaproject/armada/internal/common/armadacontext"
 	"github.com/armadaproject/armada/internal/common/compress"
+	protoutil "github.com/armadaproject/armada/internal/common/proto"
 	"github.com/armadaproject/armada/internal/scheduler/schedulerobjects"
 )
 
@@ -109,6 +110,8 @@ func (r *PostgresExecutorRepository) GetExecutorSettings(ctx *armadacontext.Cont
 			ExecutorId:   result.ExecutorId,
 			Cordoned:     result.Cordoned,
 			CordonReason: result.CordonReason,
+			SetByUser:    result.SetByUser,
+			SetAtTime:    protoutil.ToTimestamp(result.SetAtTime),
 		}
 		executorSettings[i] = settings
 	}
diff --git a/internal/scheduler/database/migrations/016_add_user_and_timestamp_executor_settings.sql b/internal/scheduler/database/migrations/016_add_user_and_timestamp_executor_settings.sql
new file mode 100644
index 00000000000..2e13633fa78
--- /dev/null
+++ b/internal/scheduler/database/migrations/016_add_user_and_timestamp_executor_settings.sql
@@ -0,0 +1,2 @@
+ALTER TABLE executor_settings ADD COLUMN set_by_user text;
+ALTER TABLE executor_settings ADD COLUMN set_at_time timestamptz;
diff --git a/internal/scheduler/database/models.go b/internal/scheduler/database/models.go
index 355b6705a14..6e752700812 100644
--- a/internal/scheduler/database/models.go
+++ b/internal/scheduler/database/models.go
@@ -85,4 +85,6 @@ type ExecutorSettings struct {
 	ExecutorId string `db:"executor_id"`
 	Cordoned bool `db:"cordoned"`
 	CordonReason string `db:"cordon_reason"`
+	SetByUser string `db:"set_by_user"`
+	SetAtTime time.Time `db:"set_at_time"`
 }
diff --git a/internal/scheduler/database/query.sql.go b/internal/scheduler/database/query.sql.go
index d672c271204..af77c1716c6 100644
--- a/internal/scheduler/database/query.sql.go
+++ b/internal/scheduler/database/query.sql.go
@@ -763,18 +763,20 @@ func (q *Queries) UpsertExecutor(ctx context.Context, arg UpsertExecutorParams)
 }
 
 const upsertExecutorSettings = `-- name: UpsertExecutorSettings :exec
-INSERT INTO executor_settings (executor_id, cordoned, cordon_reason)
-VALUES($1::text, $2::boolean, $3::text)
-ON CONFLICT (executor_id) DO UPDATE SET (cordoned, cordon_reason) = (excluded.cordoned, excluded.cordon_reason)`
+INSERT INTO executor_settings (executor_id, cordoned, cordon_reason, set_by_user, set_at_time)
+VALUES($1::text, $2::boolean, $3::text, $4::text, $5::timestamptz)
+ON CONFLICT (executor_id) DO UPDATE SET (cordoned, cordon_reason, set_by_user, set_at_time) = (excluded.cordoned, excluded.cordon_reason, excluded.set_by_user, excluded.set_at_time)`
 
 type UpsertExecutorSettingsParams struct {
 	ExecutorID  string    `db:"executor_id"`
 	Cordoned bool    `db:"cordoned"`
 	CordonReason  string `db:"cordon_reason"`
+	SetByUser string `db:"set_by_user"`
+	SetAtTime time.Time `db:"set_at_time"`
 }
 
 func (q *Queries) UpsertExecutorSettings(ctx context.Context, arg UpsertExecutorSettingsParams) error {
-	_, err := q.db.Exec(ctx, upsertExecutorSettings, arg.ExecutorID, arg.Cordoned, arg.CordonReason)
+	_, err := q.db.Exec(ctx, upsertExecutorSettings, arg.ExecutorID, arg.Cordoned, arg.CordonReason, arg.SetByUser, arg.SetAtTime)
 	return err
 }
 
@@ -792,7 +794,7 @@ func (q *Queries) DeleteExecutorSettings(ctx context.Context, arg DeleteExecutor
 }
 
 const selectAllExecutorSettings = `-- name: SelectAllExecutorSettings :many
-SELECT executor_id, cordoned, cordon_reason FROM executor_settings
+SELECT executor_id, cordoned, cordon_reason, set_by_user, set_at_time FROM executor_settings
 `
 
 func (q *Queries) SelectAllExecutorSettings(ctx context.Context) ([]ExecutorSettings, error) {
@@ -804,7 +806,7 @@ func (q *Queries) SelectAllExecutorSettings(ctx context.Context) ([]ExecutorSett
 	var items []ExecutorSettings
 	for rows.Next() {
 		var i ExecutorSettings
-		if err := rows.Scan(&i.ExecutorId, &i.Cordoned, &i.CordonReason); err != nil {
+		if err := rows.Scan(&i.ExecutorId, &i.Cordoned, &i.CordonReason, &i.SetByUser, &i.SetAtTime); err != nil {
 			return nil, err
 		}
 		items = append(items, i)
diff --git a/internal/scheduler/metrics.go b/internal/scheduler/metrics.go
index 78e22da11a2..43d9bbe21b2 100644
--- a/internal/scheduler/metrics.go
+++ b/internal/scheduler/metrics.go
@@ -256,8 +256,9 @@ type clusterMetricKey struct {
 }
 
 type clusterCordonedStatus struct {
-	status float64
-	reason string
+	status    float64
+	reason    string
+	setByUser string
 }
 
 func (c *MetricsCollector) updateClusterMetrics(ctx *armadacontext.Context) ([]prometheus.Metric, error) {
@@ -290,8 +291,9 @@ func (c *MetricsCollector) updateClusterMetrics(ctx *armadacontext.Context) ([]p
 	for _, executor := range executors {
 		// We may not have executorSettings for all known executors, but we still want a cordon status metric for them.
 		cordonedStatusByCluster[executor.Id] = &clusterCordonedStatus{
-			status: 0.0,
-			reason: "",
+			status:    0.0,
+			reason:    "",
+			setByUser: "",
 		}
 		for _, node := range executor.Nodes {
 			nodePool := node.GetPool()
@@ -387,11 +389,13 @@ func (c *MetricsCollector) updateClusterMetrics(ctx *armadacontext.Context) ([]p
 			if cordonedValue, ok := cordonedStatusByCluster[executorSetting.ExecutorId]; ok {
 				cordonedValue.status = 1.0
 				cordonedValue.reason = executorSetting.CordonReason
+				cordonedValue.setByUser = executorSetting.SetByUser
 			} else {
 				// We may have settings for executors that don't exist in the repository.
 				cordonedStatusByCluster[executorSetting.ExecutorId] = &clusterCordonedStatus{
-					status: 1.0,
-					reason: executorSetting.CordonReason,
+					status:    1.0,
+					reason:    executorSetting.CordonReason,
+					setByUser: executorSetting.SetByUser,
 				}
 			}
 		}
@@ -439,7 +443,7 @@ func (c *MetricsCollector) updateClusterMetrics(ctx *armadacontext.Context) ([]p
 		clusterMetrics = append(clusterMetrics, commonmetrics.NewClusterTotalCapacity(float64(v), k.cluster, k.pool, "nodes", k.nodeType))
 	}
 	for cluster, v := range cordonedStatusByCluster {
-		clusterMetrics = append(clusterMetrics, commonmetrics.NewClusterCordonedStatus(v.status, cluster, v.reason))
+		clusterMetrics = append(clusterMetrics, commonmetrics.NewClusterCordonedStatus(v.status, cluster, v.reason, v.setByUser))
 	}
 	return clusterMetrics, nil
 }
diff --git a/internal/scheduler/metrics_test.go b/internal/scheduler/metrics_test.go
index 50b0627fbd0..d576713618f 100644
--- a/internal/scheduler/metrics_test.go
+++ b/internal/scheduler/metrics_test.go
@@ -220,7 +220,7 @@ func TestMetricsCollector_TestCollect_ClusterMetrics(t *testing.T) {
 				commonmetrics.NewClusterTotalCapacity(64, "cluster-1", testfixtures.TestPool, "cpu", "type-1"),
 				commonmetrics.NewClusterTotalCapacity(512*1024*1024*1024, "cluster-1", testfixtures.TestPool, "memory", "type-1"),
 				commonmetrics.NewClusterTotalCapacity(2, "cluster-1", testfixtures.TestPool, "nodes", "type-1"),
-				commonmetrics.NewClusterCordonedStatus(0.0, "cluster-1", ""),
+				commonmetrics.NewClusterCordonedStatus(0.0, "cluster-1", "", ""),
 			},
 			expectedExecutorSettings: []*schedulerobjects.ExecutorSettings{},
 		},
@@ -240,7 +240,7 @@ func TestMetricsCollector_TestCollect_ClusterMetrics(t *testing.T) {
 				commonmetrics.NewClusterTotalCapacity(32, "cluster-1", testfixtures.TestPool, "cpu", "type-2"),
 				commonmetrics.NewClusterTotalCapacity(256*1024*1024*1024, "cluster-1", testfixtures.TestPool, "memory", "type-2"),
 				commonmetrics.NewClusterTotalCapacity(1, "cluster-1", testfixtures.TestPool, "nodes", "type-2"),
-				commonmetrics.NewClusterCordonedStatus(0.0, "cluster-1", ""),
+				commonmetrics.NewClusterCordonedStatus(0.0, "cluster-1", "", ""),
 			},
 			expectedExecutorSettings: []*schedulerobjects.ExecutorSettings{},
 		},
@@ -254,7 +254,7 @@ func TestMetricsCollector_TestCollect_ClusterMetrics(t *testing.T) {
 				commonmetrics.NewClusterTotalCapacity(64, "cluster-1", testfixtures.TestPool, "cpu", "type-1"),
 				commonmetrics.NewClusterTotalCapacity(512*1024*1024*1024, "cluster-1", testfixtures.TestPool, "memory", "type-1"),
 				commonmetrics.NewClusterTotalCapacity(2, "cluster-1", testfixtures.TestPool, "nodes", "type-1"),
-				commonmetrics.NewClusterCordonedStatus(0.0, "cluster-1", ""),
+				commonmetrics.NewClusterCordonedStatus(0.0, "cluster-1", "", ""),
 			},
 			expectedExecutorSettings: []*schedulerobjects.ExecutorSettings{},
 		},
@@ -274,7 +274,7 @@ func TestMetricsCollector_TestCollect_ClusterMetrics(t *testing.T) {
 				commonmetrics.NewClusterTotalCapacity(32, "cluster-1", testfixtures.TestPool, "cpu", "type-1"),
 				commonmetrics.NewClusterTotalCapacity(256*1024*1024*1024, "cluster-1", testfixtures.TestPool, "memory", "type-1"),
 				commonmetrics.NewClusterTotalCapacity(1, "cluster-1", testfixtures.TestPool, "nodes", "type-1"),
-				commonmetrics.NewClusterCordonedStatus(0.0, "cluster-1", ""),
+				commonmetrics.NewClusterCordonedStatus(0.0, "cluster-1", "", ""),
 			},
 			expectedExecutorSettings: []*schedulerobjects.ExecutorSettings{},
 		},
@@ -290,7 +290,7 @@ func TestMetricsCollector_TestCollect_ClusterMetrics(t *testing.T) {
 				commonmetrics.NewClusterTotalCapacity(32, "cluster-1", testfixtures.TestPool, "cpu", "type-1"),
 				commonmetrics.NewClusterTotalCapacity(256*1024*1024*1024, "cluster-1", testfixtures.TestPool, "memory", "type-1"),
 				commonmetrics.NewClusterTotalCapacity(1, "cluster-1", testfixtures.TestPool, "nodes", "type-1"),
-				commonmetrics.NewClusterCordonedStatus(0.0, "cluster-1", ""),
+				commonmetrics.NewClusterCordonedStatus(0.0, "cluster-1", "", ""),
 			},
 			expectedExecutorSettings: []*schedulerobjects.ExecutorSettings{},
 		},
@@ -314,7 +314,7 @@ func TestMetricsCollector_TestCollect_ClusterMetrics(t *testing.T) {
 				commonmetrics.NewClusterTotalCapacity(64, "cluster-1", testfixtures.TestPool, "cpu", "type-1"),
 				commonmetrics.NewClusterTotalCapacity(512*1024*1024*1024, "cluster-1", testfixtures.TestPool, "memory", "type-1"),
 				commonmetrics.NewClusterTotalCapacity(2, "cluster-1", testfixtures.TestPool, "nodes", "type-1"),
-				commonmetrics.NewClusterCordonedStatus(1.0, "cluster-1", "bad executor"),
+				commonmetrics.NewClusterCordonedStatus(1.0, "cluster-1", "bad executor", ""),
 			},
 			expectedExecutorSettings: []*schedulerobjects.ExecutorSettings{
 				{
diff --git a/internal/scheduler/schedulerobjects/schedulerobjects.pb.go b/internal/scheduler/schedulerobjects/schedulerobjects.pb.go
index 037f4bbfc3e..fce7b391122 100644
--- a/internal/scheduler/schedulerobjects/schedulerobjects.pb.go
+++ b/internal/scheduler/schedulerobjects/schedulerobjects.pb.go
@@ -12,8 +12,8 @@ import (
 
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
-	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
+	types "github.com/gogo/protobuf/types"
 	v1 "k8s.io/api/core/v1"
 	resource "k8s.io/apimachinery/pkg/api/resource"
 )
@@ -689,9 +689,11 @@ func (m *PodRequirements) GetResourceRequirements() v1.ResourceRequirements {
 }
 
 type ExecutorSettings struct {
-	ExecutorId   string `protobuf:"bytes,1,opt,name=executorId,proto3" json:"executorId,omitempty"`
-	Cordoned     bool   `protobuf:"varint,2,opt,name=cordoned,proto3" json:"cordoned,omitempty"`
-	CordonReason string `protobuf:"bytes,3,opt,name=cordonReason,proto3" json:"cordonReason,omitempty"`
+	ExecutorId   string           `protobuf:"bytes,1,opt,name=executorId,proto3" json:"executorId,omitempty"`
+	Cordoned     bool             `protobuf:"varint,2,opt,name=cordoned,proto3" json:"cordoned,omitempty"`
+	CordonReason string           `protobuf:"bytes,3,opt,name=cordonReason,proto3" json:"cordonReason,omitempty"`
+	SetByUser    string           `protobuf:"bytes,4,opt,name=setByUser,proto3" json:"setByUser,omitempty"`
+	SetAtTime    *types.Timestamp `protobuf:"bytes,5,opt,name=setAtTime,proto3" json:"setAtTime,omitempty"`
 }
 
 func (m *ExecutorSettings) Reset()         { *m = ExecutorSettings{} }
@@ -748,6 +750,20 @@ func (m *ExecutorSettings) GetCordonReason() string {
 	return ""
 }
 
+func (m *ExecutorSettings) GetSetByUser() string {
+	if m != nil {
+		return m.SetByUser
+	}
+	return ""
+}
+
+func (m *ExecutorSettings) GetSetAtTime() *types.Timestamp {
+	if m != nil {
+		return m.SetAtTime
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterEnum("schedulerobjects.JobRunState", JobRunState_name, JobRunState_value)
 	proto.RegisterType((*Executor)(nil), "schedulerobjects.Executor")
@@ -772,114 +788,116 @@ func init() {
 }
 
 var fileDescriptor_97dadc5fbd620721 = []byte{
-	// 1697 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x8f, 0xe3, 0x48,
-	0x15, 0x6f, 0xf7, 0x67, 0x52, 0xe9, 0x8f, 0xa4, 0xba, 0x77, 0xc6, 0x93, 0x99, 0x8d, 0x43, 0x76,
-	0x17, 0xf5, 0x00, 0xeb, 0x68, 0x7b, 0x39, 0x8c, 0x06, 0x84, 0x14, 0xcf, 0x34, 0x4c, 0x0f, 0xb3,
-	0xe9, 0x5e, 0xf7, 0xb4, 0x10, 0x48, 0xac, 0x55, 0xb1, 0x2b, 0x19, 0x6f, 0x3b, 0x55, 0x5e, 0xbb,
-	0x3c, 0x10, 0xee, 0x1c, 0x10, 0x97, 0x05, 0x2d, 0x12, 0x12, 0x27, 0xfe, 0x09, 0x6e, 0x08, 0x8e,
-	0x73, 0xdc, 0x23, 0x27, 0x83, 0x66, 0x6e, 0xfe, 0x0f, 0xb8, 0xa1, 0x2a, 0xdb, 0x71, 0x25, 0x4e,
-	0x26, 0x7d, 0x59, 0x71, 0xea, 0xae, 0xdf, 0xfb, 0xac, 0x57, 0xbf, 0x7a, 0xf5, 0x1c, 0xf0, 0xd0,
-	0x25, 0x0c, 0x07, 0x04, 0x79, 0xdd, 0xd0, 0x7e, 0x81, 0x9d, 0xc8, 0xc3, 0x41, 0xf1, 0x1f, 0x1d,
-	0x7c, 0x8e, 0x6d, 0x16, 0x96, 0x00, 0xdd, 0x0f, 0x28, 0xa3, 0xb0, 0x3e, 0x8f, 0x37, 0xb5, 0x11,
-	0xa5, 0x23, 0x0f, 0x77, 0x85, 0x7c, 0x10, 0x0d, 0xbb, 0xcc, 0x1d, 0xe3, 0x90, 0xa1, 0xb1, 0x9f,
-	0x9a, 0x34, 0x3b, 0xd7, 0x0f, 0x42, 0xdd, 0xa5, 0x5d, 0xe4, 0xbb, 0x5d, 0x9b, 0x06, 0xb8, 0xfb,
-	0xf2, 0xa3, 0xee, 0x08, 0x13, 0x1c, 0x20, 0x86, 0x9d, 0x4c, 0xe7, 0xfb, 0x85, 0xce, 0x18, 0xd9,
-	0x2f, 0x5c, 0x82, 0x83, 0x49, 0xd7, 0xbf, 0x1e, 0x09, 0xa3, 0x00, 0x87, 0x34, 0x0a, 0x6c, 0x5c,
-	0xb2, 0xfa, 0x70, 0xe4, 0xb2, 0x17, 0xd1, 0x40, 0xb7, 0xe9, 0xb8, 0x3b, 0xa2, 0x23, 0x5a, 0xe4,
-	0xc0, 0x57, 0x62, 0x21, 0xfe, 0x4b, 0xd5, 0x3b, 0xaf, 0xd6, 0x41, 0xe5, 0xf4, 0xd7, 0xd8, 0x8e,
-	0x18, 0x0d, 0x60, 0x1b, 0xac, 0xbb, 0x8e, 0xaa, 0xb4, 0x95, 0xe3, 0xaa, 0x51, 0x4f, 0x62, 0x6d,
-	0xd7, 0x75, 0xbe, 0x47, 0xc7, 0x2e, 0xc3, 0x63, 0x9f, 0x4d, 0xcc, 0x75, 0xd7, 0x81, 0xdf, 0x06,
-	0x9b, 0x3e, 0xa5, 0x9e, 0xba, 0x2e, 0x74, 0x60, 0x12, 0x6b, 0xfb, 0x7c, 0x2d, 0x69, 0x09, 0x39,
-	0xec, 0x81, 0x2d, 0x42, 0x1d, 0x1c, 0xaa, 0x1b, 0xed, 0x8d, 0xe3, 0xda, 0xc9, 0x2d, 0xbd, 0x54,
-	0xba, 0x3e, 0x75, 0xb0, 0x71, 0x98, 0xc4, 0xda, 0x81, 0x50, 0x94, 0x3c, 0xa4, 0x96, 0xf0, 0x33,
-	0xb0, 0xef, 0xa1, 0x90, 0x5d, 0xf9, 0x0e, 0x62, 0xf8, 0xb9, 0x3b, 0xc6, 0xea, 0x56, 0x5b, 0x39,
-	0xae, 0x9d, 0x34, 0xf5, 0xb4, 0xb8, 0x7a, 0xbe, 0x31, 0xfd, 0x79, 0x5e, 0x5c, 0xa3, 0xf9, 0x2a,
-	0xd6, 0xd6, 0x78, 0x52, 0xb3, 0x96, 0x5f, 0xfe, 0x5b, 0x53, 0xcc, 0x39, 0x0c, 0x9e, 0x83, 0xc3,
-	0x88, 0xa0, 0x30, 0x74, 0x47, 0x04, 0x3b, 0xd6, 0xe7, 0x74, 0x60, 0x05, 0x11, 0x09, 0xd5, 0x6a,
-	0x7b, 0xe3, 0xb8, 0x6a, 0x68, 0x49, 0xac, 0xdd, 0x2d, 0xc4, 0x4f, 0xe9, 0xc0, 0x8c, 0x88, 0x9c,
-	0x64, 0xa3, 0x24, 0xec, 0xfc, 0x77, 0x0f, 0x6c, 0xf2, 0x5d, 0xdd, 0xac, 0x8c, 0x04, 0x8d, 0xb1,
-	0xba, 0x5b, 0x94, 0x91, 0xaf, 0xe5, 0x32, 0xf2, 0x35, 0x3c, 0x01, 0x15, 0x9c, 0x1d, 0x8e, 0x7a,
-	0x28, 0x74, 0x6f, 0x25, 0xb1, 0x06, 0x73, 0x4c, 0xd2, 0x9f, 0xea, 0xc1, 0x4f, 0x40, 0x95, 0xef,
-	0xd4, 0x0a, 0x31, 0x26, 0xe2, 0x9c, 0xde, 0x5e, 0xb2, 0xa3, 0xac, 0x64, 0x15, 0x6e, 0x74, 0x89,
-	0x31, 0x11, 0xc5, 0x9a, 0xae, 0x60, 0x0f, 0x6c, 0x33, 0xe4, 0x12, 0x16, 0xaa, 0x5b, 0xe2, 0x28,
-	0xef, 0xe8, 0x29, 0x2d, 0x75, 0xe4, 0xbb, 0x3a, 0xa7, 0xae, 0xfe, 0xf2, 0x23, 0xfd, 0x39, 0xd7,
-	0x30, 0xf6, 0x33, 0x57, 0x99, 0x81, 0x99, 0xfd, 0x85, 0x17, 0x60, 0xdb, 0x43, 0x03, 0xec, 0x85,
-	0xea, 0xb6, 0x70, 0xd1, 0x59, 0xcc, 0x06, 0xfd, 0x99, 0x50, 0x3a, 0x25, 0x2c, 0x98, 0x18, 0x47,
-	0x49, 0xac, 0xd5, 0x53, 0x2b, 0x69, 0x97, 0x99, 0x1f, 0x68, 0x81, 0x03, 0x46, 0x19, 0xf2, 0xac,
-	0xfc, 0x1a, 0x84, 0xea, 0x8e, 0xd8, 0x69, 0xab, 0xec, 0xda, 0xcc, 0x54, 0x9e, 0xb9, 0x21, 0x33,
-	0x6e, 0xe5, 0x04, 0x11, 0xe6, 0xb9, 0x28, 0x34, 0xe7, 0xd6, 0xf0, 0x6f, 0x0a, 0x78, 0x1f, 0x79,
-	0x1e, 0xb5, 0x11, 0x43, 0x03, 0x0f, 0x5b, 0x83, 0x89, 0xe5, 0x07, 0x2e, 0x0d, 0x5c, 0x36, 0xb1,
-	0x10, 0x71, 0xa6, 0x71, 0xd5, 0x8a, 0xd8, 0xd1, 0x0f, 0x97, 0xec, 0xa8, 0x57, 0xb8, 0x30, 0x26,
-	0x17, 0x99, 0x83, 0x1e, 0x71, 0xf2, 0x40, 0xe9, 0x5e, 0x8f, 0xb3, 0xa4, 0xda, 0x68, 0x85, 0xba,
-	0xb9, 0x52, 0x03, 0x06, 0xe0, 0x30, 0x64, 0x88, 0x89, 0x8c, 0x33, 0x4e, 0x5b, 0xae, 0x23, 0x58,
-	0x5d, 0x3b, 0xf9, 0xee, 0x92, 0x34, 0x2f, 0xb9, 0x85, 0x31, 0x49, 0x89, 0x7c, 0xe6, 0xa4, 0x59,
-	0xdd, 0xce, 0xb2, 0x3a, 0x08, 0x67, 0xa5, 0xe6, 0x3c, 0x00, 0x7f, 0xaf, 0x80, 0xdb, 0x11, 0x91,
-	0xcb, 0x55, 0x1c, 0xcb, 0x9e, 0x08, 0x7c, 0xb2, 0x24, 0xf0, 0x95, 0x6c, 0x35, 0xad, 0x7e, 0x1a,
-	0xbf, 0x95, 0xc5, 0xbf, 0x15, 0x2d, 0x54, 0x32, 0x97, 0xe0, 0xb0, 0x07, 0xf6, 0x22, 0x92, 0x85,
-	0xe3, 0x12, 0xf5, 0xa0, 0xad, 0x1c, 0x57, 0x8c, 0xbb, 0x49, 0xac, 0xdd, 0x9e, 0x11, 0x48, 0xbc,
-	0x9a, 0xb5, 0xe0, 0xad, 0x21, 0xc0, 0x3e, 0x0d, 0x98, 0x4b, 0x46, 0x16, 0xef, 0x46, 0x16, 0x9b,
-	0xf8, 0x58, 0x6d, 0x88, 0x1b, 0x28, 0x5a, 0xc3, 0x54, 0xcc, 0xb7, 0xf1, 0x7c, 0xe2, 0xcb, 0xce,
-	0x1a, 0x25, 0xe1, 0xb4, 0x6d, 0xc2, 0x15, 0x6d, 0xf3, 0x4f, 0x0a, 0x68, 0xe7, 0xb5, 0xb3, 0xa2,
-	0x10, 0x8d, 0xc4, 0x39, 0x7e, 0x11, 0xe1, 0x08, 0x0b, 0xda, 0x09, 0x27, 0x47, 0xa2, 0xa4, 0xef,
-	0x95, 0x4b, 0x7a, 0x41, 0xa9, 0xf7, 0x29, 0xd7, 0xcd, 0x8b, 0x61, 0xdc, 0x4f, 0x62, 0xed, 0x83,
-	0xdc, 0xe1, 0x15, 0xf7, 0x67, 0x4c, 0x84, 0x46, 0x8f, 0x38, 0x17, 0xb3, 0x09, 0xdc, 0x7d, 0x8b,
-	0x5a, 0x13, 0x81, 0x9a, 0x74, 0x39, 0xe1, 0x7b, 0x60, 0xe3, 0x1a, 0x4f, 0xb2, 0x0e, 0xd7, 0x48,
-	0x62, 0x6d, 0xef, 0x1a, 0x4f, 0x24, 0x5f, 0x5c, 0x0a, 0xef, 0x83, 0xad, 0x97, 0xc8, 0x8b, 0x70,
-	0xf6, 0x56, 0x88, 0x56, 0x2f, 0x00, 0xb9, 0xd5, 0x0b, 0xe0, 0xe1, 0xfa, 0x03, 0xa5, 0xf9, 0x17,
-	0x05, 0x7c, 0x70, 0xa3, 0xeb, 0x22, 0x47, 0xdf, 0x5a, 0x1a, 0xfd, 0x4c, 0x8e, 0xbe, 0xba, 0x2f,
-	0xac, 0xca, 0xee, 0x77, 0x0a, 0x38, 0x5a, 0x74, 0x4b, 0x6e, 0x56, 0x8a, 0x27, 0x72, 0x32, 0xfb,
-	0x27, 0xef, 0x96, 0x93, 0x49, 0x9d, 0xa6, 0x11, 0x56, 0xe5, 0xf2, 0x07, 0x05, 0xdc, 0x7d, 0xcb,
-	0xc5, 0xf9, 0x7f, 0xd4, 0xa7, 0xf3, 0x77, 0x05, 0x34, 0x4a, 0xf4, 0x9b, 0xd2, 0x5e, 0x59, 0x41,
-	0xfb, 0xfb, 0x60, 0x4b, 0x70, 0x5c, 0xa6, 0x8a, 0x00, 0xe4, 0x60, 0x02, 0x80, 0x57, 0xa0, 0x5a,
-	0x34, 0x97, 0x8d, 0x1b, 0xe5, 0x7e, 0x3b, 0x89, 0xb5, 0xc3, 0xa9, 0x91, 0xe4, 0xb2, 0xf0, 0xd4,
-	0xf9, 0xed, 0x3a, 0xd8, 0x95, 0x8d, 0xe0, 0x67, 0x72, 0x1c, 0x45, 0xdc, 0xb8, 0x0f, 0xdf, 0x1e,
-	0x47, 0x9f, 0xeb, 0x5f, 0x8d, 0xac, 0x7f, 0x15, 0x7e, 0xa4, 0x80, 0xcd, 0xaf, 0x14, 0xb0, 0xbf,
-	0xfc, 0xdc, 0x96, 0x53, 0xe9, 0xe7, 0xb3, 0xe7, 0xa6, 0x4b, 0xaf, 0xf1, 0x74, 0x48, 0xd4, 0xfd,
-	0xeb, 0x91, 0x78, 0x9e, 0xf3, 0x70, 0xfa, 0xa7, 0x11, 0x22, 0xcc, 0x65, 0x93, 0x95, 0xe7, 0xf8,
-	0xd5, 0x16, 0x68, 0x3c, 0xa5, 0x83, 0xcb, 0x74, 0xa3, 0x2e, 0x19, 0x9d, 0x91, 0x21, 0xe5, 0x63,
-	0x88, 0xe7, 0x0e, 0x31, 0x1f, 0x62, 0x45, 0x7a, 0x7b, 0xe9, 0x18, 0x92, 0x63, 0xf2, 0x18, 0x92,
-	0x63, 0xf0, 0x21, 0xd8, 0x45, 0xcc, 0x1a, 0xd3, 0x90, 0x59, 0x94, 0xd8, 0x69, 0xbe, 0x15, 0x43,
-	0x4d, 0x62, 0xed, 0x08, 0xb1, 0x4f, 0x68, 0xc8, 0xce, 0x89, 0x2d, 0x5b, 0x82, 0x02, 0x85, 0x3f,
-	0x00, 0x35, 0x3f, 0xc0, 0x1c, 0x77, 0x79, 0x03, 0xdf, 0x10, 0xa6, 0x77, 0x92, 0x58, 0x7b, 0x47,
-	0x82, 0x25, 0x5b, 0x59, 0x1b, 0x3e, 0x01, 0x75, 0x9b, 0x12, 0x3b, 0x0a, 0x02, 0x4c, 0xec, 0x89,
-	0x15, 0xa2, 0x21, 0x56, 0x37, 0x85, 0x87, 0x77, 0x93, 0x58, 0xbb, 0x23, 0xc9, 0x2e, 0xd1, 0x50,
-	0xf6, 0x72, 0x30, 0x27, 0xe2, 0xcf, 0xc0, 0xf4, 0xd1, 0xb7, 0x3d, 0x14, 0x86, 0x96, 0x18, 0xda,
-	0xb6, 0x8b, 0x67, 0x20, 0x17, 0x3f, 0xe2, 0xd2, 0xfe, 0xec, 0x04, 0xd7, 0x28, 0x09, 0xe1, 0x25,
-	0xa8, 0x85, 0xd1, 0x60, 0xec, 0x32, 0x4b, 0x94, 0x72, 0x67, 0xe5, 0x70, 0x96, 0x8f, 0x2b, 0x20,
-	0x35, 0x9b, 0xce, 0xb2, 0xd2, 0x9a, 0x1f, 0x4e, 0x1e, 0x49, 0xad, 0x14, 0x87, 0x93, 0x63, 0xf2,
-	0xe1, 0xe4, 0x18, 0xfc, 0x15, 0x38, 0x4c, 0x29, 0x6c, 0x05, 0xf8, 0x8b, 0xc8, 0x0d, 0xf0, 0x18,
-	0x17, 0x13, 0xde, 0xfb, 0x65, 0x9e, 0x9f, 0x8b, 0xbf, 0xa6, 0xa4, 0x6b, 0xb4, 0x93, 0x58, 0xbb,
-	0x47, 0x4b, 0xb8, 0x14, 0x0e, 0x96, 0xa5, 0xb0, 0x0b, 0x76, 0x5e, 0xe2, 0x20, 0x74, 0x29, 0x51,
-	0xab, 0x22, 0xd7, 0x77, 0x92, 0x58, 0x6b, 0x64, 0x90, 0x64, 0x9b, 0x6b, 0x3d, 0xdc, 0xfc, 0xf3,
-	0x5f, 0x35, 0xa5, 0xf3, 0x47, 0x05, 0xc0, 0x72, 0x0e, 0xd0, 0x03, 0x07, 0x3e, 0x75, 0x64, 0x48,
-	0xd0, 0xb3, 0x76, 0xf2, 0xad, 0x45, 0x8f, 0xe3, 0x8c, 0x62, 0x4a, 0x86, 0x39, 0xeb, 0x22, 0x81,
-	0x27, 0x6b, 0xe6, 0xbc, 0x6b, 0x63, 0x1f, 0xec, 0xca, 0xd5, 0xea, 0xfc, 0x63, 0x1b, 0x1c, 0xcc,
-	0x79, 0x85, 0x21, 0xd8, 0xe5, 0xf3, 0xc2, 0x25, 0xf6, 0xb0, 0xcd, 0x87, 0xf6, 0xb4, 0x73, 0x7c,
-	0xbc, 0x32, 0x1d, 0x31, 0x0e, 0xe5, 0x56, 0x69, 0xff, 0x68, 0xf2, 0xd9, 0x47, 0x76, 0x26, 0x95,
-	0x67, 0x26, 0x08, 0xbc, 0x00, 0x15, 0x34, 0x1c, 0xba, 0x84, 0x33, 0x20, 0x6d, 0x0b, 0xf7, 0x16,
-	0x0d, 0xe9, 0xbd, 0x4c, 0x27, 0xe5, 0x47, 0x6e, 0x21, 0xf3, 0x23, 0xc7, 0xe0, 0x15, 0xa8, 0x31,
-	0xea, 0xf1, 0xef, 0x4a, 0x97, 0x92, 0xfc, 0x23, 0xae, 0xb5, 0x70, 0xf2, 0x9f, 0xaa, 0x19, 0x87,
-	0x19, 0x59, 0x65, 0x53, 0x53, 0x5e, 0x40, 0x0a, 0x6a, 0x88, 0x10, 0xca, 0x32, 0xb7, 0x3b, 0xcb,
-	0x66, 0xc3, 0xf9, 0xe2, 0xf4, 0x0a, 0xa3, 0xb4, 0x36, 0xa2, 0x17, 0x48, 0xae, 0xe4, 0x5e, 0x20,
-	0xc1, 0xf0, 0x29, 0xa8, 0xe7, 0xad, 0x81, 0x92, 0x0b, 0xea, 0xb9, 0xf6, 0x44, 0x7c, 0x45, 0x56,
-	0x8d, 0x56, 0x12, 0x6b, 0xcd, 0x79, 0x99, 0xe4, 0xa6, 0x64, 0x07, 0x7f, 0x03, 0x8e, 0xf2, 0x7e,
-	0x3a, 0xc3, 0xb8, 0x6d, 0x51, 0xf1, 0xe3, 0x45, 0xc5, 0x31, 0x17, 0xe8, 0x1b, 0xf7, 0xb2, 0x32,
-	0x2d, 0xf4, 0x66, 0x2e, 0x44, 0x9b, 0x23, 0xd0, 0x28, 0x11, 0xe4, 0x1b, 0x99, 0xc2, 0x86, 0xa0,
-	0x3e, 0x5f, 0xec, 0x6f, 0x22, 0xce, 0xd3, 0xcd, 0x4a, 0xa5, 0x5e, 0xed, 0xfc, 0x53, 0x01, 0xf5,
-	0xfc, 0xc7, 0x87, 0x4b, 0xcc, 0xf8, 0xc8, 0x1c, 0xc2, 0x07, 0x00, 0xe4, 0xdf, 0xb2, 0x67, 0xf9,
-	0x57, 0xb4, 0x78, 0x36, 0x0a, 0x54, 0x7e, 0x36, 0x0a, 0x94, 0x77, 0x42, 0x9b, 0x06, 0x0e, 0x25,
-	0xd8, 0xc9, 0x9e, 0x1b, 0xc1, 0xf4, 0x1c, 0x93, 0x99, 0x9e, 0x63, 0xf0, 0x47, 0x60, 0x37, 0xfd,
-	0xdf, 0xc4, 0x28, 0xa4, 0x44, 0xbc, 0x35, 0xd5, 0xf4, 0xee, 0xc9, 0xb8, 0x7c, 0xf7, 0x64, 0xfc,
-	0x3b, 0xe7, 0xa0, 0x26, 0xcd, 0x6e, 0xb0, 0x06, 0x76, 0xae, 0xfa, 0x3f, 0xed, 0x9f, 0xff, 0xac,
-	0x5f, 0x5f, 0xe3, 0x8b, 0x8b, 0xd3, 0xfe, 0xe3, 0xb3, 0xfe, 0x4f, 0xea, 0x0a, 0x5f, 0x98, 0x57,
-	0xfd, 0x3e, 0x5f, 0xac, 0xc3, 0x3d, 0x50, 0xbd, 0xbc, 0x7a, 0xf4, 0xe8, 0xf4, 0xf4, 0xf1, 0xe9,
-	0xe3, 0xfa, 0x06, 0x04, 0x60, 0xfb, 0xc7, 0xbd, 0xb3, 0x67, 0xa7, 0x8f, 0xeb, 0x9b, 0xc6, 0x2f,
-	0x5f, 0xbd, 0x6e, 0x29, 0x5f, 0xbf, 0x6e, 0x29, 0xff, 0x79, 0xdd, 0x52, 0xbe, 0x7c, 0xd3, 0x5a,
-	0xfb, 0xfa, 0x4d, 0x6b, 0xed, 0x5f, 0x6f, 0x5a, 0x6b, 0xbf, 0x78, 0x24, 0xfd, 0xb2, 0x83, 0x82,
-	0x31, 0x72, 0x90, 0x1f, 0x50, 0x7e, 0x61, 0xb2, 0x55, 0xf7, 0x06, 0x3f, 0x61, 0x0d, 0xb6, 0xc5,
-	0x2b, 0xf3, 0xf1, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe8, 0xee, 0x59, 0x58, 0xf0, 0x12, 0x00,
-	0x00,
+	// 1735 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x6f, 0xdb, 0xc8,
+	0x15, 0x37, 0xfd, 0x29, 0x8d, 0xfc, 0x21, 0x8d, 0xbd, 0x09, 0xa3, 0x64, 0x45, 0x55, 0xbb, 0x5b,
+	0x38, 0x6d, 0x97, 0xc2, 0x7a, 0x5b, 0x20, 0x48, 0x8b, 0x02, 0x62, 0xe2, 0x36, 0x4e, 0xb3, 0xb2,
+	0x23, 0x47, 0x28, 0x5a, 0xa0, 0x4b, 0x8c, 0xc8, 0xb1, 0xc2, 0x35, 0x35, 0xc3, 0x25, 0x87, 0x69,
+	0xd9, 0x7b, 0x0f, 0x45, 0x2f, 0xdb, 0x62, 0x0b, 0x14, 0xe8, 0xa9, 0xff, 0x44, 0x6f, 0x45, 0xaf,
+	0x41, 0x4f, 0x7b, 0xec, 0x89, 0x2d, 0x92, 0x1b, 0xff, 0x83, 0xde, 0x8a, 0x19, 0x92, 0xe2, 0x48,
+	0x94, 0x2d, 0x5f, 0x16, 0x7b, 0xb2, 0xe7, 0xf7, 0x3e, 0xe7, 0xcd, 0x6f, 0xde, 0x3c, 0x0a, 0x3c,
+	0x74, 0x08, 0xc3, 0x3e, 0x41, 0x6e, 0x37, 0xb0, 0x5e, 0x62, 0x3b, 0x74, 0xb1, 0x5f, 0xfc, 0x47,
+	0x47, 0x9f, 0x61, 0x8b, 0x05, 0x25, 0x40, 0xf7, 0x7c, 0xca, 0x28, 0xac, 0xcf, 0xe3, 0x4d, 0x6d,
+	0x4c, 0xe9, 0xd8, 0xc5, 0x5d, 0x21, 0x1f, 0x85, 0x17, 0x5d, 0xe6, 0x4c, 0x70, 0xc0, 0xd0, 0xc4,
+	0x4b, 0x4d, 0x9a, 0x9d, 0xcb, 0x07, 0x81, 0xee, 0xd0, 0x2e, 0xf2, 0x9c, 0xae, 0x45, 0x7d, 0xdc,
+	0x7d, 0xf5, 0x51, 0x77, 0x8c, 0x09, 0xf6, 0x11, 0xc3, 0x76, 0xa6, 0xf3, 0xfd, 0x42, 0x67, 0x82,
+	0xac, 0x97, 0x0e, 0xc1, 0x7e, 0xd4, 0xf5, 0x2e, 0xc7, 0xc2, 0xc8, 0xc7, 0x01, 0x0d, 0x7d, 0x0b,
+	0x97, 0xac, 0x3e, 0x1c, 0x3b, 0xec, 0x65, 0x38, 0xd2, 0x2d, 0x3a, 0xe9, 0x8e, 0xe9, 0x98, 0x16,
+	0x39, 0xf0, 0x95, 0x58, 0x88, 0xff, 0x52, 0xf5, 0xce, 0xeb, 0x55, 0x50, 0x39, 0xfe, 0x0d, 0xb6,
+	0x42, 0x46, 0x7d, 0xd8, 0x06, 0xab, 0x8e, 0xad, 0x2a, 0x6d, 0xe5, 0xb0, 0x6a, 0xd4, 0x93, 0x58,
+	0xdb, 0x76, 0xec, 0xef, 0xd1, 0x89, 0xc3, 0xf0, 0xc4, 0x63, 0xd1, 0x60, 0xd5, 0xb1, 0xe1, 0xb7,
+	0xc1, 0xba, 0x47, 0xa9, 0xab, 0xae, 0x0a, 0x1d, 0x98, 0xc4, 0xda, 0x2e, 0x5f, 0x4b, 0x5a, 0x42,
+	0x0e, 0x7b, 0x60, 0x83, 0x50, 0x1b, 0x07, 0xea, 0x5a, 0x7b, 0xed, 0xb0, 0x76, 0x74, 0x4b, 0x2f,
+	0x95, 0xae, 0x4f, 0x6d, 0x6c, 0xec, 0x27, 0xb1, 0xb6, 0x27, 0x14, 0x25, 0x0f, 0xa9, 0x25, 0xfc,
+	0x14, 0xec, 0xba, 0x28, 0x60, 0x43, 0xcf, 0x46, 0x0c, 0xbf, 0x70, 0x26, 0x58, 0xdd, 0x68, 0x2b,
+	0x87, 0xb5, 0xa3, 0xa6, 0x9e, 0x16, 0x57, 0xcf, 0x37, 0xa6, 0xbf, 0xc8, 0x8b, 0x6b, 0x34, 0x5f,
+	0xc7, 0xda, 0x0a, 0x4f, 0x6a, 0xd6, 0xf2, 0x8b, 0xff, 0x68, 0xca, 0x60, 0x0e, 0x83, 0xa7, 0x60,
+	0x3f, 0x24, 0x28, 0x08, 0x9c, 0x31, 0xc1, 0xb6, 0xf9, 0x19, 0x1d, 0x99, 0x7e, 0x48, 0x02, 0xb5,
+	0xda, 0x5e, 0x3b, 0xac, 0x1a, 0x5a, 0x12, 0x6b, 0x77, 0x0b, 0xf1, 0x53, 0x3a, 0x1a, 0x84, 0x44,
+	0x4e, 0xb2, 0x51, 0x12, 0x76, 0xfe, 0xb7, 0x03, 0xd6, 0xf9, 0xae, 0x6e, 0x56, 0x46, 0x82, 0x26,
+	0x58, 0xdd, 0x2e, 0xca, 0xc8, 0xd7, 0x72, 0x19, 0xf9, 0x1a, 0x1e, 0x81, 0x0a, 0xce, 0x0e, 0x47,
+	0xdd, 0x17, 0xba, 0xb7, 0x92, 0x58, 0x83, 0x39, 0x26, 0xe9, 0x4f, 0xf5, 0xe0, 0x27, 0xa0, 0xca,
+	0x77, 0x6a, 0x06, 0x18, 0x13, 0x71, 0x4e, 0xd7, 0x97, 0xec, 0x20, 0x2b, 0x59, 0x85, 0x1b, 0x9d,
+	0x63, 0x4c, 0x44, 0xb1, 0xa6, 0x2b, 0xd8, 0x03, 0x9b, 0x0c, 0x39, 0x84, 0x05, 0xea, 0x86, 0x38,
+	0xca, 0x3b, 0x7a, 0x4a, 0x4b, 0x1d, 0x79, 0x8e, 0xce, 0xa9, 0xab, 0xbf, 0xfa, 0x48, 0x7f, 0xc1,
+	0x35, 0x8c, 0xdd, 0xcc, 0x55, 0x66, 0x30, 0xc8, 0xfe, 0xc2, 0x33, 0xb0, 0xe9, 0xa2, 0x11, 0x76,
+	0x03, 0x75, 0x53, 0xb8, 0xe8, 0x2c, 0x66, 0x83, 0xfe, 0x4c, 0x28, 0x1d, 0x13, 0xe6, 0x47, 0xc6,
+	0x41, 0x12, 0x6b, 0xf5, 0xd4, 0x4a, 0xda, 0x65, 0xe6, 0x07, 0x9a, 0x60, 0x8f, 0x51, 0x86, 0x5c,
+	0x33, 0xbf, 0x06, 0x81, 0xba, 0x25, 0x76, 0xda, 0x2a, 0xbb, 0x1e, 0x64, 0x2a, 0xcf, 0x9c, 0x80,
+	0x19, 0xb7, 0x72, 0x82, 0x08, 0xf3, 0x5c, 0x14, 0x0c, 0xe6, 0xd6, 0xf0, 0xef, 0x0a, 0x78, 0x1f,
+	0xb9, 0x2e, 0xb5, 0x10, 0x43, 0x23, 0x17, 0x9b, 0xa3, 0xc8, 0xf4, 0x7c, 0x87, 0xfa, 0x0e, 0x8b,
+	0x4c, 0x44, 0xec, 0x69, 0x5c, 0xb5, 0x22, 0x76, 0xf4, 0xa3, 0x2b, 0x76, 0xd4, 0x2b, 0x5c, 0x18,
+	0xd1, 0x59, 0xe6, 0xa0, 0x47, 0xec, 0x3c, 0x50, 0xba, 0xd7, 0xc3, 0x2c, 0xa9, 0x36, 0x5a, 0xa2,
+	0x3e, 0x58, 0xaa, 0x01, 0x7d, 0xb0, 0x1f, 0x30, 0xc4, 0x44, 0xc6, 0x19, 0xa7, 0x4d, 0xc7, 0x16,
+	0xac, 0xae, 0x1d, 0x7d, 0xf7, 0x8a, 0x34, 0xcf, 0xb9, 0x85, 0x11, 0xa5, 0x44, 0x3e, 0xb1, 0xd3,
+	0xac, 0x6e, 0x67, 0x59, 0xed, 0x05, 0xb3, 0xd2, 0xc1, 0x3c, 0x00, 0xff, 0xa0, 0x80, 0xdb, 0x21,
+	0x91, 0xcb, 0x55, 0x1c, 0xcb, 0x8e, 0x08, 0x7c, 0x74, 0x45, 0xe0, 0xa1, 0x6c, 0x35, 0xad, 0x7e,
+	0x1a, 0xbf, 0x95, 0xc5, 0xbf, 0x15, 0x2e, 0x54, 0x1a, 0x5c, 0x81, 0xc3, 0x1e, 0xd8, 0x09, 0x49,
+	0x16, 0x8e, 0x4b, 0xd4, 0xbd, 0xb6, 0x72, 0x58, 0x31, 0xee, 0x26, 0xb1, 0x76, 0x7b, 0x46, 0x20,
+	0xf1, 0x6a, 0xd6, 0x82, 0xb7, 0x06, 0x1f, 0x7b, 0xd4, 0x67, 0x0e, 0x19, 0x9b, 0xbc, 0x1b, 0x99,
+	0x2c, 0xf2, 0xb0, 0xda, 0x10, 0x37, 0x50, 0xb4, 0x86, 0xa9, 0x98, 0x6f, 0xe3, 0x45, 0xe4, 0xc9,
+	0xce, 0x1a, 0x25, 0xe1, 0xb4, 0x6d, 0xc2, 0x25, 0x6d, 0xf3, 0xcf, 0x0a, 0x68, 0xe7, 0xb5, 0x33,
+	0xc3, 0x00, 0x8d, 0xc5, 0x39, 0x7e, 0x1e, 0xe2, 0x10, 0x0b, 0xda, 0x09, 0x27, 0x07, 0xa2, 0xa4,
+	0xef, 0x95, 0x4b, 0x7a, 0x46, 0xa9, 0xfb, 0x9c, 0xeb, 0xe6, 0xc5, 0x30, 0xee, 0x27, 0xb1, 0xf6,
+	0x41, 0xee, 0x70, 0xc8, 0xfd, 0x19, 0x91, 0xd0, 0xe8, 0x11, 0xfb, 0x6c, 0x36, 0x81, 0xbb, 0xd7,
+	0xa8, 0x35, 0x11, 0xa8, 0x49, 0x97, 0x13, 0xbe, 0x07, 0xd6, 0x2e, 0x71, 0x94, 0x75, 0xb8, 0x46,
+	0x12, 0x6b, 0x3b, 0x97, 0x38, 0x92, 0x7c, 0x71, 0x29, 0xbc, 0x0f, 0x36, 0x5e, 0x21, 0x37, 0xc4,
+	0xd9, 0x5b, 0x21, 0x5a, 0xbd, 0x00, 0xe4, 0x56, 0x2f, 0x80, 0x87, 0xab, 0x0f, 0x94, 0xe6, 0x5f,
+	0x15, 0xf0, 0xc1, 0x8d, 0xae, 0x8b, 0x1c, 0x7d, 0xe3, 0xca, 0xe8, 0x27, 0x72, 0xf4, 0xe5, 0x7d,
+	0x61, 0x59, 0x76, 0xbf, 0x57, 0xc0, 0xc1, 0xa2, 0x5b, 0x72, 0xb3, 0x52, 0x3c, 0x91, 0x93, 0xd9,
+	0x3d, 0x7a, 0xb7, 0x9c, 0x4c, 0xea, 0x34, 0x8d, 0xb0, 0x2c, 0x97, 0x3f, 0x2a, 0xe0, 0xee, 0x35,
+	0x17, 0xe7, 0x9b, 0xa8, 0x4f, 0xe7, 0x1f, 0x0a, 0x68, 0x94, 0xe8, 0x37, 0xa5, 0xbd, 0xb2, 0x84,
+	0xf6, 0xf7, 0xc1, 0x86, 0xe0, 0xb8, 0x4c, 0x15, 0x01, 0xc8, 0xc1, 0x04, 0x00, 0x87, 0xa0, 0x5a,
+	0x34, 0x97, 0xb5, 0x1b, 0xe5, 0x7e, 0x3b, 0x89, 0xb5, 0xfd, 0xa9, 0x91, 0xe4, 0xb2, 0xf0, 0xd4,
+	0xf9, 0xdd, 0x2a, 0xd8, 0x96, 0x8d, 0xe0, 0xa7, 0x72, 0x1c, 0x45, 0xdc, 0xb8, 0x0f, 0xaf, 0x8f,
+	0xa3, 0xcf, 0xf5, 0xaf, 0x46, 0xd6, 0xbf, 0x0a, 0x3f, 0x52, 0xc0, 0xe6, 0x97, 0x0a, 0xd8, 0xbd,
+	0xfa, 0xdc, 0xae, 0xa6, 0xd2, 0x2f, 0x66, 0xcf, 0x4d, 0x97, 0x5e, 0xe3, 0xe9, 0x90, 0xa8, 0x7b,
+	0x97, 0x63, 0xf1, 0x3c, 0xe7, 0xe1, 0xf4, 0xe7, 0x21, 0x22, 0xcc, 0x61, 0xd1, 0xd2, 0x73, 0xfc,
+	0x72, 0x03, 0x34, 0x9e, 0xd2, 0xd1, 0x79, 0xba, 0x51, 0x87, 0x8c, 0x4f, 0xc8, 0x05, 0xe5, 0x63,
+	0x88, 0xeb, 0x5c, 0x60, 0x3e, 0xc4, 0x8a, 0xf4, 0x76, 0xd2, 0x31, 0x24, 0xc7, 0xe4, 0x31, 0x24,
+	0xc7, 0xe0, 0x43, 0xb0, 0x8d, 0x98, 0x39, 0xa1, 0x01, 0x33, 0x29, 0xb1, 0xd2, 0x7c, 0x2b, 0x86,
+	0x9a, 0xc4, 0xda, 0x01, 0x62, 0x9f, 0xd0, 0x80, 0x9d, 0x12, 0x4b, 0xb6, 0x04, 0x05, 0x0a, 0x7f,
+	0x08, 0x6a, 0x9e, 0x8f, 0x39, 0xee, 0xf0, 0x06, 0xbe, 0x26, 0x4c, 0xef, 0x24, 0xb1, 0xf6, 0x8e,
+	0x04, 0x4b, 0xb6, 0xb2, 0x36, 0x7c, 0x02, 0xea, 0x16, 0x25, 0x56, 0xe8, 0xfb, 0x98, 0x58, 0x91,
+	0x19, 0xa0, 0x0b, 0xac, 0xae, 0x0b, 0x0f, 0xef, 0x26, 0xb1, 0x76, 0x47, 0x92, 0x9d, 0xa3, 0x0b,
+	0xd9, 0xcb, 0xde, 0x9c, 0x88, 0x3f, 0x03, 0xd3, 0x47, 0xdf, 0x72, 0x51, 0x10, 0x98, 0x62, 0x68,
+	0xdb, 0x2c, 0x9e, 0x81, 0x5c, 0xfc, 0x88, 0x4b, 0xfb, 0xb3, 0x13, 0x5c, 0xa3, 0x24, 0x84, 0xe7,
+	0xa0, 0x16, 0x84, 0xa3, 0x89, 0xc3, 0x4c, 0x51, 0xca, 0xad, 0xa5, 0xc3, 0x59, 0x3e, 0xae, 0x80,
+	0xd4, 0x6c, 0x3a, 0xcb, 0x4a, 0x6b, 0x7e, 0x38, 0x79, 0x24, 0xb5, 0x52, 0x1c, 0x4e, 0x8e, 0xc9,
+	0x87, 0x93, 0x63, 0xf0, 0xd7, 0x60, 0x3f, 0xa5, 0xb0, 0xe9, 0xe3, 0xcf, 0x43, 0xc7, 0xc7, 0x13,
+	0x5c, 0x4c, 0x78, 0xef, 0x97, 0x79, 0x7e, 0x2a, 0xfe, 0x0e, 0x24, 0x5d, 0xa3, 0x9d, 0xc4, 0xda,
+	0x3d, 0x5a, 0xc2, 0xa5, 0x70, 0xb0, 0x2c, 0x85, 0x5d, 0xb0, 0xf5, 0x0a, 0xfb, 0x81, 0x43, 0x89,
+	0x5a, 0x15, 0xb9, 0xbe, 0x93, 0xc4, 0x5a, 0x23, 0x83, 0x24, 0xdb, 0x5c, 0xeb, 0xe1, 0xfa, 0x5f,
+	0xfe, 0xa6, 0x29, 0x9d, 0x3f, 0x29, 0x00, 0x96, 0x73, 0x80, 0x2e, 0xd8, 0xf3, 0xa8, 0x2d, 0x43,
+	0x82, 0x9e, 0xb5, 0xa3, 0x6f, 0x2d, 0x7a, 0x1c, 0x67, 0x14, 0x53, 0x32, 0xcc, 0x59, 0x17, 0x09,
+	0x3c, 0x59, 0x19, 0xcc, 0xbb, 0x36, 0x76, 0xc1, 0xb6, 0x5c, 0xad, 0xce, 0x3f, 0x37, 0xc1, 0xde,
+	0x9c, 0x57, 0x18, 0x80, 0x6d, 0x3e, 0x2f, 0x9c, 0x63, 0x17, 0x5b, 0x7c, 0x68, 0x4f, 0x3b, 0xc7,
+	0xc7, 0x4b, 0xd3, 0x11, 0xe3, 0x50, 0x6e, 0x95, 0xf6, 0x8f, 0x26, 0x9f, 0x7d, 0x64, 0x67, 0x52,
+	0x79, 0x66, 0x82, 0xc0, 0x33, 0x50, 0x41, 0x17, 0x17, 0x0e, 0xe1, 0x0c, 0x48, 0xdb, 0xc2, 0xbd,
+	0x45, 0x43, 0x7a, 0x2f, 0xd3, 0x49, 0xf9, 0x91, 0x5b, 0xc8, 0xfc, 0xc8, 0x31, 0x38, 0x04, 0x35,
+	0x46, 0x5d, 0xfe, 0x5d, 0xe9, 0x50, 0x92, 0x7f, 0xc4, 0xb5, 0x16, 0x4e, 0xfe, 0x53, 0x35, 0x63,
+	0x3f, 0x23, 0xab, 0x6c, 0x3a, 0x90, 0x17, 0x90, 0x82, 0x1a, 0x22, 0x84, 0xb2, 0xcc, 0xed, 0xd6,
+	0x55, 0xb3, 0xe1, 0x7c, 0x71, 0x7a, 0x85, 0x51, 0x5a, 0x1b, 0xd1, 0x0b, 0x24, 0x57, 0x72, 0x2f,
+	0x90, 0x60, 0xf8, 0x14, 0xd4, 0xf3, 0xd6, 0x40, 0xc9, 0x19, 0x75, 0x1d, 0x2b, 0x12, 0x5f, 0x91,
+	0x55, 0xa3, 0x95, 0xc4, 0x5a, 0x73, 0x5e, 0x26, 0xb9, 0x29, 0xd9, 0xc1, 0xdf, 0x82, 0x83, 0xbc,
+	0x9f, 0xce, 0x30, 0x6e, 0x53, 0x54, 0xfc, 0x70, 0x51, 0x71, 0x06, 0x0b, 0xf4, 0x8d, 0x7b, 0x59,
+	0x99, 0x16, 0x7a, 0x1b, 0x2c, 0x44, 0x9b, 0x63, 0xd0, 0x28, 0x11, 0xe4, 0x6b, 0x99, 0xc2, 0x2e,
+	0x40, 0x7d, 0xbe, 0xd8, 0x5f, 0x47, 0x9c, 0xa7, 0xeb, 0x95, 0x4a, 0xbd, 0xda, 0xf9, 0xd7, 0x2a,
+	0xa8, 0xe7, 0x3f, 0x3e, 0x9c, 0x63, 0xc6, 0x47, 0xe6, 0x00, 0x3e, 0x00, 0x20, 0xff, 0x96, 0x3d,
+	0xc9, 0xbf, 0xa2, 0xc5, 0xb3, 0x51, 0xa0, 0xf2, 0xb3, 0x51, 0xa0, 0xbc, 0x13, 0x5a, 0xd4, 0xb7,
+	0x29, 0xc1, 0x76, 0xf6, 0xdc, 0x08, 0xa6, 0xe7, 0x98, 0xcc, 0xf4, 0x1c, 0x83, 0x3f, 0x06, 0xdb,
+	0xe9, 0xff, 0x03, 0x8c, 0x02, 0x4a, 0xc4, 0x5b, 0x53, 0x4d, 0xef, 0x9e, 0x8c, 0xcb, 0x77, 0x4f,
+	0xc6, 0xe1, 0x0f, 0x40, 0x35, 0xc0, 0xcc, 0x88, 0x86, 0x01, 0xf6, 0xc5, 0x33, 0x53, 0x4d, 0xe7,
+	0x8d, 0x29, 0x28, 0xcf, 0x1b, 0x53, 0x10, 0x3e, 0x17, 0x66, 0x3d, 0x76, 0xc3, 0xdf, 0x35, 0x72,
+	0x97, 0xa9, 0xc1, 0x9c, 0xcb, 0x14, 0xfc, 0xce, 0x29, 0xa8, 0x49, 0x53, 0x24, 0xac, 0x81, 0xad,
+	0x61, 0xff, 0x67, 0xfd, 0xd3, 0x9f, 0xf7, 0xeb, 0x2b, 0x7c, 0x71, 0x76, 0xdc, 0x7f, 0x7c, 0xd2,
+	0xff, 0x69, 0x5d, 0xe1, 0x8b, 0xc1, 0xb0, 0xdf, 0xe7, 0x8b, 0x55, 0xb8, 0x03, 0xaa, 0xe7, 0xc3,
+	0x47, 0x8f, 0x8e, 0x8f, 0x1f, 0x1f, 0x3f, 0xae, 0xaf, 0x41, 0x00, 0x36, 0x7f, 0xd2, 0x3b, 0x79,
+	0x76, 0xfc, 0xb8, 0xbe, 0x6e, 0xfc, 0xea, 0xf5, 0x9b, 0x96, 0xf2, 0xd5, 0x9b, 0x96, 0xf2, 0xdf,
+	0x37, 0x2d, 0xe5, 0x8b, 0xb7, 0xad, 0x95, 0xaf, 0xde, 0xb6, 0x56, 0xfe, 0xfd, 0xb6, 0xb5, 0xf2,
+	0xcb, 0x47, 0xd2, 0x6f, 0x4c, 0xc8, 0x9f, 0x20, 0x1b, 0x79, 0x3e, 0xe5, 0x57, 0x37, 0x5b, 0x75,
+	0x6f, 0xf0, 0x63, 0xda, 0x68, 0x53, 0xec, 0xf3, 0xe3, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x4f,
+	0xef, 0xf8, 0x20, 0x7a, 0x13, 0x00, 0x00,
 }
 
 func (m *Executor) Marshal() (dAtA []byte, err error) {
@@ -1522,6 +1540,25 @@ func (m *ExecutorSettings) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if m.SetAtTime != nil {
+		{
+			size, err := m.SetAtTime.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintSchedulerobjects(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x2a
+	}
+	if len(m.SetByUser) > 0 {
+		i -= len(m.SetByUser)
+		copy(dAtA[i:], m.SetByUser)
+		i = encodeVarintSchedulerobjects(dAtA, i, uint64(len(m.SetByUser)))
+		i--
+		dAtA[i] = 0x22
+	}
 	if len(m.CordonReason) > 0 {
 		i -= len(m.CordonReason)
 		copy(dAtA[i:], m.CordonReason)
@@ -1833,6 +1870,14 @@ func (m *ExecutorSettings) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovSchedulerobjects(uint64(l))
 	}
+	l = len(m.SetByUser)
+	if l > 0 {
+		n += 1 + l + sovSchedulerobjects(uint64(l))
+	}
+	if m.SetAtTime != nil {
+		l = m.SetAtTime.Size()
+		n += 1 + l + sovSchedulerobjects(uint64(l))
+	}
 	return n
 }
 
@@ -4121,6 +4166,74 @@ func (m *ExecutorSettings) Unmarshal(dAtA []byte) error {
 			}
 			m.CordonReason = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field SetByUser", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSchedulerobjects
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthSchedulerobjects
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSchedulerobjects
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.SetByUser = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field SetAtTime", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSchedulerobjects
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSchedulerobjects
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSchedulerobjects
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.SetAtTime == nil {
+				m.SetAtTime = &types.Timestamp{}
+			}
+			if err := m.SetAtTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipSchedulerobjects(dAtA[iNdEx:])
diff --git a/internal/scheduler/schedulerobjects/schedulerobjects.proto b/internal/scheduler/schedulerobjects/schedulerobjects.proto
index 042f6623db3..c93cfcd6762 100644
--- a/internal/scheduler/schedulerobjects/schedulerobjects.proto
+++ b/internal/scheduler/schedulerobjects/schedulerobjects.proto
@@ -121,4 +121,6 @@ message ExecutorSettings {
   string executorId = 1;
   bool cordoned = 2;
   string cordonReason = 3;
+  string setByUser = 4;
+  google.protobuf.Timestamp setAtTime = 5;
 }
diff --git a/internal/scheduleringester/dbops.go b/internal/scheduleringester/dbops.go
index c0f4f7346c5..4ac250d9931 100644
--- a/internal/scheduleringester/dbops.go
+++ b/internal/scheduleringester/dbops.go
@@ -67,6 +67,8 @@ type ExecutorSettingsUpsert struct {
 	ExecutorID   string
 	Cordoned     bool
 	CordonReason string
+	SetByUser    string
+	SetAtTime    time.Time
 }
 
 type ExecutorSettingsDelete struct {
diff --git a/internal/scheduleringester/instructions.go b/internal/scheduleringester/instructions.go
index f565488f485..9834f25be71 100644
--- a/internal/scheduleringester/instructions.go
+++ b/internal/scheduleringester/instructions.go
@@ -406,7 +406,8 @@ func (c *ControlPlaneEventsInstructionConverter) dbOperationFromControlPlaneEven
 
 	switch ev := event.Event.(type) {
 	case *controlplaneevents.Event_ExecutorSettingsUpsert:
-		operations, err = c.handleExecutorSettingsUpsert(event.GetExecutorSettingsUpsert())
+		eventTime := protoutil.ToStdTime(event.Created)
+		operations, err = c.handleExecutorSettingsUpsert(event.GetExecutorSettingsUpsert(), eventTime)
 	case *controlplaneevents.Event_ExecutorSettingsDelete:
 		operations, err = c.handleExecutorSettingsDelete(event.GetExecutorSettingsDelete())
 	default:
@@ -420,13 +421,15 @@ func (c *ControlPlaneEventsInstructionConverter) dbOperationFromControlPlaneEven
 	return operations
 }
 
-func (c *ControlPlaneEventsInstructionConverter) handleExecutorSettingsUpsert(upsert *controlplaneevents.ExecutorSettingsUpsert) ([]DbOperation, error) {
+func (c *ControlPlaneEventsInstructionConverter) handleExecutorSettingsUpsert(upsert *controlplaneevents.ExecutorSettingsUpsert, setAtTime time.Time) ([]DbOperation, error) {
 	return []DbOperation{
 		UpsertExecutorSettings{
 			upsert.Name: &ExecutorSettingsUpsert{
 				ExecutorID:   upsert.Name,
 				Cordoned:     upsert.Cordoned,
 				CordonReason: upsert.CordonReason,
+				SetByUser:    upsert.SetByUser,
+				SetAtTime:    setAtTime,
 			},
 		},
 	}, nil
diff --git a/internal/scheduleringester/schedulerdb.go b/internal/scheduleringester/schedulerdb.go
index 380c8d5a677..5b99b1f22a2 100644
--- a/internal/scheduleringester/schedulerdb.go
+++ b/internal/scheduleringester/schedulerdb.go
@@ -360,6 +360,8 @@ func (s *SchedulerDb) WriteDbOp(ctx *armadacontext.Context, tx pgx.Tx, op DbOper
 				ExecutorID:   settingsUpsert.ExecutorID,
 				Cordoned:     settingsUpsert.Cordoned,
 				CordonReason: settingsUpsert.CordonReason,
+				SetByUser:    settingsUpsert.SetByUser,
+				SetAtTime:    settingsUpsert.SetAtTime,
 			})
 			if err != nil {
 				return errors.Wrapf(err, "error upserting executor settings for %s", settingsUpsert.ExecutorID)
diff --git a/internal/server/executor/executor.go b/internal/server/executor/executor.go
index 373617633ac..fff09bf7ef9 100644
--- a/internal/server/executor/executor.go
+++ b/internal/server/executor/executor.go
@@ -53,6 +53,8 @@ func (s *Server) UpsertExecutorSettings(grpcCtx context.Context, req *api.Execut
 		return nil, fmt.Errorf("cordon reason must be specified if cordoning")
 	}
 
+	requestingPrincipal := auth.GetPrincipal(ctx)
+
 	es := &controlplaneevents.Event{
 		Created: protoutil.ToTimestamp(s.clock.Now().UTC()),
 		Event: &controlplaneevents.Event_ExecutorSettingsUpsert{
@@ -60,6 +62,7 @@ func (s *Server) UpsertExecutorSettings(grpcCtx context.Context, req *api.Execut
 				Name:         req.Name,
 				Cordoned:     req.Cordoned,
 				CordonReason: req.CordonReason,
+				SetByUser:    requestingPrincipal.GetName(),
 			},
 		},
 	}
diff --git a/pkg/controlplaneevents/events.pb.go b/pkg/controlplaneevents/events.pb.go
index 5eebbd67d90..45e2e1b0bd3 100644
--- a/pkg/controlplaneevents/events.pb.go
+++ b/pkg/controlplaneevents/events.pb.go
@@ -121,6 +121,7 @@ type ExecutorSettingsUpsert struct {
 	Name         string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	Cordoned     bool   `protobuf:"varint,2,opt,name=cordoned,proto3" json:"cordoned,omitempty"`
 	CordonReason string `protobuf:"bytes,3,opt,name=cordonReason,proto3" json:"cordonReason,omitempty"`
+	SetByUser    string `protobuf:"bytes,4,opt,name=setByUser,proto3" json:"setByUser,omitempty"`
 }
 
 func (m *ExecutorSettingsUpsert) Reset()         { *m = ExecutorSettingsUpsert{} }
@@ -177,6 +178,13 @@ func (m *ExecutorSettingsUpsert) GetCordonReason() string {
 	return ""
 }
 
+func (m *ExecutorSettingsUpsert) GetSetByUser() string {
+	if m != nil {
+		return m.SetByUser
+	}
+	return ""
+}
+
 type ExecutorSettingsDelete struct {
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 }
@@ -232,33 +240,34 @@ func init() {
 }
 
 var fileDescriptor_2ccee8bdbf348752 = []byte{
-	// 410 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xc1, 0x6a, 0xdb, 0x40,
-	0x10, 0x86, 0x25, 0xb7, 0xae, 0xed, 0x6d, 0x29, 0x74, 0xa1, 0xc2, 0xf8, 0x20, 0x19, 0xbb, 0x94,
-	0x52, 0xca, 0x0a, 0x5c, 0xe8, 0xb1, 0xb4, 0x6a, 0x0d, 0x2d, 0xb9, 0x18, 0x27, 0xb9, 0xe4, 0xb6,
-	0x96, 0x26, 0x8a, 0x12, 0x49, 0x2b, 0x56, 0x6b, 0x93, 0xbc, 0x42, 0x4e, 0x79, 0x8e, 0x9c, 0xf3,
-	0x10, 0x39, 0xfa, 0x98, 0x93, 0x08, 0xf6, 0x4d, 0x2f, 0x90, 0x6b, 0xf0, 0xae, 0x95, 0x28, 0x58,
-	0x09, 0x3e, 0x49, 0xbb, 0xf3, 0xfd, 0x33, 0xff, 0x8c, 0x46, 0xa8, 0x9f, 0x9c, 0xf8, 0xb6, 0xcb,
-	0x62, 0xc1, 0x59, 0x98, 0x84, 0x34, 0x06, 0x98, 0x41, 0x2c, 0x52, 0x5b, 0x3d, 0x48, 0xc2, 0x99,
-	0x60, 0x18, 0x6f, 0x02, 0x1d, 0xcb, 0x67, 0xcc, 0x0f, 0xc1, 0x96, 0xc4, 0x64, 0x7a, 0x68, 0x8b,
-	0x20, 0x82, 0x54, 0xd0, 0x28, 0x51, 0xa2, 0xde, 0x5d, 0x0d, 0xd5, 0x87, 0x2b, 0x16, 0xef, 0xa0,
-	0x86, 0xcb, 0x81, 0x0a, 0xf0, 0xda, 0x7a, 0x57, 0xff, 0xf2, 0x76, 0xd0, 0x21, 0x4a, 0x4c, 0x0a,
-	0x31, 0xd9, 0x2b, 0xc4, 0xce, 0xc7, 0x3c, 0xb3, 0x3e, 0xac, 0xf1, 0x6f, 0x2c, 0x0a, 0x04, 0x44,
-	0x89, 0x38, 0x1b, 0x17, 0x19, 0xf0, 0xb9, 0x8e, 0x0c, 0x38, 0x05, 0x77, 0x2a, 0x18, 0xdf, 0x05,
-	0x21, 0x82, 0xd8, 0x4f, 0xf7, 0x93, 0x14, 0xb8, 0x68, 0xd7, 0x64, 0xf2, 0xaf, 0x64, 0xd3, 0x2d,
-	0x19, 0x56, 0x2a, 0x9c, 0x4f, 0x79, 0x66, 0x75, 0xab, 0xb3, 0x3d, 0xd6, 0xfe, 0xa7, 0x8d, 0x9f,
-	0xa9, 0x58, 0x69, 0xe6, 0x2f, 0x84, 0x20, 0xa0, 0xfd, 0x6a, 0x7b, 0x33, 0x4a, 0x51, 0x6d, 0x46,
-	0xc5, 0x5e, 0x36, 0xb3, 0xd6, 0x37, 0x50, 0x5d, 0x16, 0xe8, 0x5d, 0xe9, 0xc8, 0xa8, 0x6e, 0x18,
-	0x7f, 0x46, 0xaf, 0x63, 0x1a, 0x81, 0xfc, 0x0e, 0x2d, 0x07, 0xe7, 0x99, 0xf5, 0x7e, 0x75, 0x2e,
-	0x0d, 0x5a, 0xc6, 0xf1, 0x00, 0x35, 0x5d, 0xc6, 0x3d, 0x16, 0x83, 0x27, 0xc7, 0xda, 0x74, 0x8c,
-	0x3c, 0xb3, 0x70, 0x71, 0x57, 0xe2, 0x1f, 0x38, 0xfc, 0x13, 0xbd, 0x53, 0xef, 0x63, 0xa0, 0x29,
-	0x8b, 0xe5, 0x04, 0x5a, 0x4e, 0x27, 0xcf, 0x2c, 0xa3, 0x7c, 0x5f, 0xd2, 0x3e, 0xe1, 0x7b, 0xbf,
-	0x36, 0x5d, 0xab, 0xce, 0xb6, 0x75, 0xed, 0xcc, 0xae, 0x17, 0xa6, 0x3e, 0x5f, 0x98, 0xfa, 0xed,
-	0xc2, 0xd4, 0x2f, 0x96, 0xa6, 0x36, 0x5f, 0x9a, 0xda, 0xcd, 0xd2, 0xd4, 0x0e, 0x7e, 0xf8, 0x81,
-	0x38, 0x9a, 0x4e, 0x88, 0xcb, 0x22, 0x9b, 0xf2, 0x88, 0x7a, 0x34, 0xe1, 0xec, 0x18, 0x5c, 0xb1,
-	0x3e, 0xd9, 0xd5, 0xbf, 0xc1, 0x65, 0xad, 0xff, 0x5b, 0xc6, 0x47, 0x8a, 0x26, 0xff, 0x19, 0xf9,
-	0xa3, 0xa8, 0xd1, 0x8a, 0x92, 0xfb, 0x9d, 0x4e, 0xde, 0xc8, 0x3d, 0xfe, 0x7e, 0x1f, 0x00, 0x00,
-	0xff, 0xff, 0x34, 0x77, 0x66, 0x52, 0x4d, 0x03, 0x00, 0x00,
+	// 431 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xb1, 0x8e, 0xd3, 0x40,
+	0x10, 0x86, 0xed, 0x70, 0xc7, 0x5d, 0x16, 0x84, 0xc4, 0x22, 0x8c, 0x95, 0xc2, 0x3e, 0xe5, 0x10,
+	0x42, 0x08, 0xad, 0xa5, 0x43, 0x50, 0x22, 0x30, 0x9c, 0x04, 0xa2, 0x39, 0x05, 0xae, 0xa1, 0xdb,
+	0xd8, 0x83, 0x31, 0xd8, 0x5e, 0x6b, 0x77, 0x72, 0x22, 0xaf, 0x40, 0xc5, 0x73, 0xf0, 0x24, 0x94,
+	0x29, 0xa9, 0x2c, 0x94, 0x74, 0xe6, 0x01, 0x68, 0x51, 0x76, 0xe3, 0xc4, 0x28, 0xe6, 0x94, 0xca,
+	0xde, 0x99, 0xef, 0x9f, 0xf9, 0x67, 0xec, 0x25, 0xc7, 0xe5, 0xe7, 0x24, 0x88, 0x44, 0x81, 0x52,
+	0x64, 0x65, 0xc6, 0x0b, 0x80, 0x0b, 0x28, 0x50, 0x05, 0xe6, 0xc1, 0x4a, 0x29, 0x50, 0x50, 0xba,
+	0x0d, 0x0c, 0xfc, 0x44, 0x88, 0x24, 0x83, 0x40, 0x13, 0xe3, 0xc9, 0x87, 0x00, 0xd3, 0x1c, 0x14,
+	0xf2, 0xbc, 0x34, 0xa2, 0xe1, 0x9f, 0x1e, 0xd9, 0x3f, 0x5d, 0xb2, 0xf4, 0x0d, 0x39, 0x88, 0x24,
+	0x70, 0x84, 0xd8, 0xb5, 0x8f, 0xec, 0xfb, 0xd7, 0x4e, 0x06, 0xcc, 0x88, 0x59, 0x23, 0x66, 0xef,
+	0x1a, 0x71, 0x78, 0xbb, 0xae, 0xfc, 0x9b, 0x2b, 0xfc, 0xa1, 0xc8, 0x53, 0x84, 0xbc, 0xc4, 0xe9,
+	0xa8, 0xa9, 0x40, 0xbf, 0xda, 0xc4, 0x81, 0x2f, 0x10, 0x4d, 0x50, 0xc8, 0xb7, 0x80, 0x98, 0x16,
+	0x89, 0x3a, 0x2f, 0x15, 0x48, 0x74, 0x7b, 0xba, 0xf8, 0x03, 0xb6, 0xed, 0x96, 0x9d, 0x76, 0x2a,
+	0xc2, 0xbb, 0x75, 0xe5, 0x1f, 0x75, 0x57, 0xdb, 0xf4, 0x7e, 0x65, 0x8d, 0xfe, 0xd3, 0xb1, 0xd3,
+	0xcc, 0x4b, 0xc8, 0x00, 0xc1, 0xbd, 0xb2, 0xbb, 0x19, 0xa3, 0xe8, 0x36, 0x63, 0x72, 0x97, 0x9b,
+	0x59, 0xe9, 0x0f, 0xc8, 0xbe, 0x6e, 0x30, 0xfc, 0x6d, 0x13, 0xa7, 0x7b, 0x60, 0x7a, 0x8f, 0xec,
+	0x15, 0x3c, 0x07, 0xfd, 0x1d, 0xfa, 0x21, 0xad, 0x2b, 0xff, 0xc6, 0xf2, 0xdc, 0x5a, 0xb4, 0xce,
+	0xd3, 0x13, 0x72, 0x18, 0x09, 0x19, 0x8b, 0x02, 0x62, 0xbd, 0xd6, 0xc3, 0xd0, 0xa9, 0x2b, 0x9f,
+	0x36, 0xb1, 0x16, 0xbf, 0xe6, 0xe8, 0x53, 0x72, 0xdd, 0xbc, 0x8f, 0x80, 0x2b, 0x51, 0xe8, 0x0d,
+	0xf4, 0xc3, 0x41, 0x5d, 0xf9, 0x4e, 0x3b, 0xde, 0xd2, 0xfe, 0xc3, 0xd3, 0xc7, 0xa4, 0xaf, 0x00,
+	0xc3, 0xe9, 0xb9, 0x02, 0xe9, 0xee, 0x69, 0xf1, 0x9d, 0xba, 0xf2, 0x6f, 0xad, 0x83, 0x2d, 0xe5,
+	0x86, 0x1c, 0x3e, 0xdb, 0x1e, 0xd6, 0x2c, 0x64, 0xd7, 0x61, 0xc3, 0x8b, 0x1f, 0x73, 0xcf, 0x9e,
+	0xcd, 0x3d, 0xfb, 0xd7, 0xdc, 0xb3, 0xbf, 0x2d, 0x3c, 0x6b, 0xb6, 0xf0, 0xac, 0x9f, 0x0b, 0xcf,
+	0x7a, 0xff, 0x24, 0x49, 0xf1, 0xe3, 0x64, 0xcc, 0x22, 0x91, 0x07, 0x5c, 0xe6, 0x3c, 0xe6, 0xa5,
+	0x14, 0x9f, 0x20, 0xc2, 0xd5, 0x29, 0xe8, 0xbe, 0x3d, 0xdf, 0x7b, 0xc7, 0xcf, 0x75, 0xfe, 0xcc,
+	0xd0, 0xec, 0xb5, 0x60, 0x2f, 0x0c, 0x75, 0xb6, 0xa4, 0xf4, 0xb5, 0x50, 0xe3, 0xab, 0xfa, 0xf7,
+	0x7f, 0xf4, 0x37, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xdc, 0xc1, 0xeb, 0x84, 0x03, 0x00, 0x00,
 }
 
 func (m *Event) Marshal() (dAtA []byte, err error) {
@@ -367,6 +376,13 @@ func (m *ExecutorSettingsUpsert) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	_ = i
 	var l int
 	_ = l
+	if len(m.SetByUser) > 0 {
+		i -= len(m.SetByUser)
+		copy(dAtA[i:], m.SetByUser)
+		i = encodeVarintEvents(dAtA, i, uint64(len(m.SetByUser)))
+		i--
+		dAtA[i] = 0x22
+	}
 	if len(m.CordonReason) > 0 {
 		i -= len(m.CordonReason)
 		copy(dAtA[i:], m.CordonReason)
@@ -492,6 +508,10 @@ func (m *ExecutorSettingsUpsert) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovEvents(uint64(l))
 	}
+	l = len(m.SetByUser)
+	if l > 0 {
+		n += 1 + l + sovEvents(uint64(l))
+	}
 	return n
 }
 
@@ -783,6 +803,38 @@ func (m *ExecutorSettingsUpsert) Unmarshal(dAtA []byte) error {
 			}
 			m.CordonReason = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field SetByUser", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvents
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvents
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvents
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.SetByUser = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipEvents(dAtA[iNdEx:])
diff --git a/pkg/controlplaneevents/events.proto b/pkg/controlplaneevents/events.proto
index 44dea1dabba..7241f56763d 100644
--- a/pkg/controlplaneevents/events.proto
+++ b/pkg/controlplaneevents/events.proto
@@ -18,6 +18,7 @@ message ExecutorSettingsUpsert {
   string name = 1;
   bool cordoned = 2;
   string cordonReason = 3;
+  string setByUser = 4;
 }
 
 message ExecutorSettingsDelete {