bot_scaling: Add lookback_hours for BotPolicy
Add a field to set the lookback number of hours for querying Swarming
stats. This will allow the ability to set the size of the lookback
window when determining the start time for tasks. Swarming querying
will only return tasks that have started within the lookback window,
therefore we need to support longer windows than the currently default
24 hours.
Bug: chromium:1027593
Change-Id: I631384d840bd88ea81bc1a15c1142ca4c1838d3c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2146094
Commit-Queue: Mike Nichols <mikenichols@chromium.org>
Tested-by: Mike Nichols <mikenichols@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
diff --git a/go/chromiumos/bot_scaling.pb.go b/go/chromiumos/bot_scaling.pb.go
index 732d972..83edba9 100644
--- a/go/chromiumos/bot_scaling.pb.go
+++ b/go/chromiumos/bot_scaling.pb.go
@@ -193,10 +193,12 @@
// A set of dimensions used to validate current Swarming allocations.
SwarmingDimensions []*SwarmingDimension `protobuf:"bytes,5,rep,name=swarming_dimensions,json=swarmingDimensions,proto3" json:"swarming_dimensions,omitempty"`
// Set whether a bot group should be configured or only monitored.
- PolicyMode BotPolicy_Mode `protobuf:"varint,6,opt,name=policy_mode,json=policyMode,proto3,enum=chromiumos.BotPolicy_Mode" json:"policy_mode,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ PolicyMode BotPolicy_Mode `protobuf:"varint,6,opt,name=policy_mode,json=policyMode,proto3,enum=chromiumos.BotPolicy_Mode" json:"policy_mode,omitempty"`
+ // Number of hours to lookback for Swarming stats.
+ LookbackHours int32 `protobuf:"zigzag32,7,opt,name=lookback_hours,json=lookbackHours,proto3" json:"lookback_hours,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *BotPolicy) Reset() { *m = BotPolicy{} }
@@ -266,6 +268,13 @@
return BotPolicy_UNKNOWN_MODE
}
+func (m *BotPolicy) GetLookbackHours() int32 {
+ if m != nil {
+ return m.LookbackHours
+ }
+ return 0
+}
+
// Scaling restriction specifies the limits on how the group can be
// expanded or reduced.
type BotPolicy_ScalingRestriction struct {
@@ -642,51 +651,53 @@
func init() { proto.RegisterFile("chromiumos/bot_scaling.proto", fileDescriptor_dbe70eabfd64e7ef) }
var fileDescriptor_dbe70eabfd64e7ef = []byte{
- // 733 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5d, 0x6f, 0xeb, 0x44,
- 0x10, 0xbd, 0xce, 0x27, 0x99, 0x34, 0x69, 0xee, 0x06, 0x90, 0x6f, 0x00, 0x11, 0x2c, 0x10, 0x79,
- 0x72, 0xa4, 0x80, 0x00, 0x09, 0xf1, 0x70, 0xf3, 0xd1, 0xdb, 0x08, 0xd5, 0x89, 0x36, 0xad, 0xa0,
- 0xf0, 0x60, 0xd9, 0xc9, 0xc6, 0x5d, 0x61, 0x7b, 0xcd, 0xae, 0x43, 0x69, 0xff, 0x13, 0xcf, 0xfc,
- 0x1d, 0x7e, 0x0a, 0xda, 0x8f, 0x34, 0x49, 0x93, 0x3e, 0x20, 0xf1, 0xe6, 0x39, 0x3b, 0x73, 0x76,
- 0x66, 0xce, 0xb1, 0x0d, 0x1f, 0x2f, 0xef, 0x38, 0x4b, 0xe8, 0x26, 0x61, 0xa2, 0x1f, 0xb2, 0xdc,
- 0x17, 0xcb, 0x20, 0xa6, 0x69, 0xe4, 0x66, 0x9c, 0xe5, 0x0c, 0xc1, 0xee, 0xd4, 0xb9, 0x84, 0xea,
- 0x90, 0xe5, 0xd7, 0x0f, 0x19, 0x41, 0x6f, 0xe0, 0x3d, 0x95, 0x4b, 0x1f, 0x89, 0x6d, 0x75, 0xad,
- 0x5e, 0x0d, 0x57, 0x43, 0x96, 0x2f, 0xe8, 0x23, 0x41, 0x0e, 0x34, 0x96, 0x8c, 0x13, 0xe1, 0x67,
- 0x84, 0xfb, 0x21, 0xcb, 0xed, 0x42, 0xd7, 0xea, 0x95, 0x71, 0x5d, 0x81, 0x73, 0xc2, 0x87, 0x2c,
- 0x77, 0x7e, 0x80, 0xd7, 0x8b, 0xfb, 0x80, 0x27, 0x34, 0x8d, 0xc6, 0x34, 0x21, 0xa9, 0xa0, 0x2c,
- 0x45, 0x08, 0x4a, 0x69, 0x90, 0x6c, 0xf9, 0xd4, 0x33, 0x7a, 0x1f, 0xca, 0x7f, 0x04, 0xf1, 0x86,
- 0x28, 0x92, 0x1a, 0xd6, 0x81, 0xf3, 0x4f, 0x19, 0x6a, 0x43, 0x96, 0xcf, 0x59, 0x4c, 0x97, 0x0f,
- 0xe8, 0x23, 0xa8, 0xc9, 0x5e, 0x22, 0xce, 0x36, 0x99, 0x29, 0x96, 0xcd, 0xbd, 0x93, 0x31, 0x72,
- 0x75, 0xa3, 0xf9, 0x43, 0xa6, 0x39, 0xea, 0x83, 0xb6, 0xbb, 0x1b, 0xc9, 0x35, 0xf3, 0xa8, 0xee,
- 0xd5, 0x60, 0xb7, 0xd0, 0x36, 0x0b, 0xf0, 0x39, 0x11, 0x39, 0xa7, 0xcb, 0x9c, 0xb2, 0xd4, 0x2e,
- 0xaa, 0xd2, 0xde, 0xb3, 0x52, 0xdd, 0x80, 0xbb, 0xd0, 0x05, 0x78, 0x97, 0x8f, 0x91, 0x38, 0xc2,
- 0xd0, 0xcf, 0xd0, 0xe6, 0x24, 0xa2, 0x2c, 0xdd, 0x67, 0x16, 0x76, 0xa9, 0x5b, 0xec, 0xd5, 0x07,
- 0x5f, 0x9e, 0xa6, 0xc6, 0xaa, 0xe0, 0x80, 0x99, 0x3f, 0x87, 0x04, 0xf2, 0xa0, 0x2d, 0xcc, 0x3a,
- 0xfd, 0xd5, 0x76, 0x9f, 0xc2, 0x2e, 0x2b, 0xe6, 0x4f, 0xf6, 0x99, 0x8f, 0xb6, 0x8e, 0x91, 0x78,
- 0x0e, 0x09, 0xf4, 0x3d, 0xd4, 0x33, 0x75, 0xbf, 0x9f, 0xb0, 0x15, 0xb1, 0x2b, 0x5d, 0xab, 0xd7,
- 0x1c, 0x74, 0x4e, 0x77, 0x78, 0xc5, 0x56, 0x04, 0x83, 0x4e, 0x97, 0xcf, 0x9d, 0xbf, 0x2c, 0x40,
- 0xc7, 0x1b, 0x41, 0x9f, 0x42, 0x5d, 0x0a, 0xb1, 0x24, 0x54, 0x9e, 0x28, 0x9d, 0xca, 0x18, 0x42,
- 0x96, 0x8f, 0x34, 0xb2, 0x95, 0x71, 0x1d, 0x33, 0xc6, 0x8d, 0x67, 0xa4, 0x74, 0x17, 0x32, 0x96,
- 0x7e, 0x4b, 0x68, 0xea, 0xd3, 0x55, 0x4c, 0x94, 0x16, 0x65, 0x5c, 0x4d, 0x68, 0x3a, 0x5d, 0xc5,
- 0x44, 0xd6, 0x89, 0x9c, 0x64, 0xda, 0x8b, 0x25, 0x5d, 0x27, 0x01, 0x65, 0xc6, 0xcf, 0xe0, 0x4c,
- 0x91, 0x06, 0x71, 0x1c, 0x06, 0xcb, 0xdf, 0xec, 0xb2, 0xf6, 0xa2, 0xe4, 0x35, 0x50, 0xe7, 0x57,
- 0x78, 0x7d, 0xb4, 0x65, 0xf4, 0x21, 0x54, 0xf4, 0x9e, 0x8d, 0xa1, 0x4c, 0x24, 0xf1, 0x8c, 0x93,
- 0x35, 0xfd, 0xd3, 0x18, 0xd2, 0x44, 0x12, 0xbf, 0x27, 0x34, 0xba, 0xcb, 0x55, 0x77, 0x05, 0x6c,
- 0x22, 0xe7, 0x5b, 0x28, 0xc9, 0xa5, 0xa0, 0x16, 0x9c, 0xdd, 0x78, 0x3f, 0x7a, 0xb3, 0x9f, 0x3c,
- 0xff, 0x6a, 0x36, 0x9e, 0xb4, 0x5e, 0xa1, 0x06, 0xd4, 0xae, 0x66, 0xde, 0xf4, 0x7a, 0x86, 0x27,
- 0xe3, 0x96, 0x85, 0x9a, 0x00, 0xa3, 0x99, 0x77, 0x31, 0x7d, 0x77, 0x23, 0xe3, 0x82, 0x73, 0x09,
- 0x67, 0x4f, 0x3b, 0x1e, 0xad, 0x23, 0xf4, 0x9d, 0x1e, 0x44, 0xed, 0x99, 0x12, 0x61, 0x5b, 0x4a,
- 0xdb, 0x0f, 0x4e, 0x6a, 0xa2, 0xe6, 0x9b, 0x9b, 0x4c, 0xe7, 0xef, 0x22, 0x34, 0x8c, 0x1e, 0x6f,
- 0xf5, 0x70, 0xff, 0xeb, 0x0b, 0x33, 0x06, 0x08, 0x14, 0x6d, 0x10, 0x1a, 0x6d, 0x9a, 0x83, 0xcf,
- 0x0f, 0x2c, 0xb7, 0x7f, 0xb7, 0xfb, 0xf6, 0x29, 0x17, 0xef, 0xd5, 0xa1, 0x2f, 0xa0, 0x19, 0xb2,
- 0x5c, 0xf8, 0x9c, 0xfc, 0xbe, 0x21, 0x22, 0x27, 0x2b, 0xa3, 0x64, 0x43, 0xa2, 0x78, 0x0b, 0xa2,
- 0x05, 0xb4, 0xb4, 0x10, 0x41, 0xec, 0x07, 0xe6, 0xfd, 0xd1, 0x2e, 0xef, 0xbd, 0x7c, 0x25, 0x36,
- 0x15, 0x3a, 0xc4, 0xe7, 0xfc, 0x20, 0x16, 0x9d, 0x08, 0x9a, 0x87, 0x29, 0xff, 0x59, 0xfd, 0xe3,
- 0xee, 0x8b, 0x27, 0xba, 0x77, 0x5c, 0x80, 0xdd, 0xf8, 0xe8, 0x1c, 0xea, 0x37, 0xde, 0x62, 0x3e,
- 0x19, 0x4d, 0x2f, 0xa6, 0x93, 0x71, 0xeb, 0x15, 0xaa, 0x42, 0xf1, 0x76, 0xb2, 0x68, 0x59, 0xa8,
- 0x02, 0x05, 0x6f, 0xd6, 0x2a, 0x38, 0xd7, 0xd0, 0xc4, 0x2c, 0x64, 0x23, 0xce, 0x32, 0xd3, 0xd8,
- 0x10, 0xce, 0xb7, 0x5f, 0xa7, 0xed, 0xf8, 0xda, 0x08, 0x6f, 0x5e, 0x1c, 0x1f, 0x37, 0xc5, 0x7e,
- 0x28, 0x86, 0xdf, 0xfc, 0xf2, 0x75, 0xc4, 0x9e, 0xd2, 0x5d, 0xc6, 0xa3, 0xfe, 0xde, 0x1f, 0x80,
- 0xa6, 0x6b, 0x1e, 0xf4, 0xd5, 0xb7, 0xbf, 0x1f, 0xb1, 0xbd, 0x93, 0xb0, 0xa2, 0xc0, 0xaf, 0xfe,
- 0x0d, 0x00, 0x00, 0xff, 0xff, 0x10, 0x08, 0x15, 0x6b, 0x30, 0x06, 0x00, 0x00,
+ // 756 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5d, 0x8f, 0x22, 0x45,
+ 0x14, 0xdd, 0xe6, 0x53, 0x2e, 0x03, 0xc3, 0x14, 0x6a, 0x7a, 0x51, 0x23, 0x76, 0x34, 0xf2, 0xd4,
+ 0x24, 0x68, 0xd4, 0xc4, 0xf8, 0xb0, 0x7c, 0xcc, 0x0e, 0x31, 0xd3, 0x90, 0x62, 0x26, 0xba, 0xfa,
+ 0xd0, 0xe9, 0x86, 0xa2, 0xa7, 0xb2, 0xdd, 0x5d, 0x6d, 0x55, 0xe3, 0x3a, 0xf3, 0x07, 0xfc, 0x35,
+ 0x3e, 0xfb, 0xf7, 0x4c, 0x7d, 0x30, 0xc0, 0xc0, 0x3c, 0x98, 0xec, 0x1b, 0xf7, 0xd4, 0xbd, 0xb7,
+ 0xce, 0xbd, 0xe7, 0x14, 0x0d, 0x9f, 0x2e, 0xef, 0x38, 0x4b, 0xe8, 0x26, 0x61, 0xa2, 0x1f, 0xb2,
+ 0xdc, 0x17, 0xcb, 0x20, 0xa6, 0x69, 0xe4, 0x66, 0x9c, 0xe5, 0x0c, 0xc1, 0xee, 0xd4, 0xb9, 0x82,
+ 0xea, 0x90, 0xe5, 0x37, 0xf7, 0x19, 0x41, 0x2f, 0xe1, 0x03, 0x95, 0x4b, 0x1f, 0x88, 0x6d, 0x75,
+ 0xad, 0x5e, 0x0d, 0x57, 0x43, 0x96, 0x2f, 0xe8, 0x03, 0x41, 0x0e, 0x34, 0x96, 0x8c, 0x13, 0xe1,
+ 0x67, 0x84, 0xfb, 0x21, 0xcb, 0xed, 0x42, 0xd7, 0xea, 0x95, 0x71, 0x5d, 0x81, 0x73, 0xc2, 0x87,
+ 0x2c, 0x77, 0x7e, 0x82, 0x8b, 0xc5, 0xbb, 0x80, 0x27, 0x34, 0x8d, 0xc6, 0x34, 0x21, 0xa9, 0xa0,
+ 0x2c, 0x45, 0x08, 0x4a, 0x69, 0x90, 0x6c, 0xfb, 0xa9, 0xdf, 0xe8, 0x43, 0x28, 0xff, 0x19, 0xc4,
+ 0x1b, 0xa2, 0x9a, 0xd4, 0xb0, 0x0e, 0x9c, 0xbf, 0x2b, 0x50, 0x1b, 0xb2, 0x7c, 0xce, 0x62, 0xba,
+ 0xbc, 0x47, 0x9f, 0x40, 0x4d, 0x72, 0x89, 0x38, 0xdb, 0x64, 0xa6, 0x58, 0x92, 0x7b, 0x2d, 0x63,
+ 0xe4, 0x6a, 0xa2, 0xf9, 0x7d, 0xa6, 0x7b, 0xd4, 0x07, 0x6d, 0x77, 0x37, 0x92, 0x6b, 0xe6, 0x51,
+ 0xec, 0xd5, 0x60, 0x6f, 0xa0, 0x6d, 0x16, 0xe0, 0x73, 0x22, 0x72, 0x4e, 0x97, 0x39, 0x65, 0xa9,
+ 0x5d, 0x54, 0xa5, 0xbd, 0x27, 0xa5, 0x9a, 0x80, 0xbb, 0xd0, 0x05, 0x78, 0x97, 0x8f, 0x91, 0x38,
+ 0xc2, 0xd0, 0xaf, 0xd0, 0xe6, 0x24, 0xa2, 0x2c, 0xdd, 0xef, 0x2c, 0xec, 0x52, 0xb7, 0xd8, 0xab,
+ 0x0f, 0xbe, 0x3e, 0xdd, 0x1a, 0xab, 0x82, 0x83, 0xce, 0xfc, 0x29, 0x24, 0x90, 0x07, 0x6d, 0x61,
+ 0xd6, 0xe9, 0xaf, 0xb6, 0xfb, 0x14, 0x76, 0x59, 0x75, 0xfe, 0x6c, 0xbf, 0xf3, 0xd1, 0xd6, 0x31,
+ 0x12, 0x4f, 0x21, 0x81, 0x7e, 0x84, 0x7a, 0xa6, 0xee, 0xf7, 0x13, 0xb6, 0x22, 0x76, 0xa5, 0x6b,
+ 0xf5, 0x9a, 0x83, 0xce, 0x69, 0x86, 0xd7, 0x6c, 0x45, 0x30, 0xe8, 0x74, 0xf9, 0x1b, 0x7d, 0x05,
+ 0xcd, 0x98, 0xb1, 0xb7, 0x61, 0xb0, 0x7c, 0xeb, 0xdf, 0xb1, 0x0d, 0x17, 0x76, 0xb5, 0x6b, 0xf5,
+ 0x2e, 0x70, 0x63, 0x8b, 0x5e, 0x49, 0xb0, 0xf3, 0x8f, 0x05, 0xe8, 0x78, 0x71, 0xe8, 0x73, 0xa8,
+ 0x4b, 0xbd, 0x96, 0x84, 0xca, 0x13, 0x25, 0x67, 0x19, 0x43, 0xc8, 0xf2, 0x91, 0x46, 0xb6, 0x6a,
+ 0xaf, 0x63, 0xc6, 0xb8, 0xb1, 0x96, 0x54, 0xf8, 0x52, 0xc6, 0xd2, 0x96, 0x09, 0x4d, 0x7d, 0xba,
+ 0x8a, 0x89, 0x92, 0xac, 0x8c, 0xab, 0x09, 0x4d, 0xa7, 0xab, 0x98, 0xc8, 0x3a, 0x91, 0x93, 0x4c,
+ 0x5b, 0xb6, 0xa4, 0xeb, 0x24, 0xa0, 0x3c, 0xfb, 0x05, 0x9c, 0xa9, 0xa6, 0x41, 0x1c, 0x4b, 0x86,
+ 0x76, 0x59, 0x5b, 0x56, 0xf6, 0x35, 0x50, 0xe7, 0x77, 0xb8, 0x38, 0x12, 0x03, 0x7d, 0x0c, 0x15,
+ 0x2d, 0x87, 0xf1, 0x9d, 0x89, 0x24, 0x9e, 0x71, 0xb2, 0xa6, 0x7f, 0x19, 0xdf, 0x9a, 0x48, 0xe2,
+ 0xef, 0x08, 0x8d, 0xee, 0x72, 0xc5, 0xae, 0x80, 0x4d, 0xe4, 0x7c, 0x0f, 0x25, 0xb5, 0xbb, 0x16,
+ 0x9c, 0xdd, 0x7a, 0x3f, 0x7b, 0xb3, 0x5f, 0x3c, 0xff, 0x7a, 0x36, 0x9e, 0xb4, 0x5e, 0xa0, 0x06,
+ 0xd4, 0xae, 0x67, 0xde, 0xf4, 0x66, 0x86, 0x27, 0xe3, 0x96, 0x85, 0x9a, 0x00, 0xa3, 0x99, 0x77,
+ 0x39, 0x7d, 0x7d, 0x2b, 0xe3, 0x82, 0x73, 0x05, 0x67, 0x8f, 0x52, 0x8c, 0xd6, 0x11, 0xfa, 0x41,
+ 0x0f, 0xa2, 0xe4, 0xa0, 0x44, 0xd8, 0x96, 0xb2, 0xc0, 0x47, 0x27, 0xa5, 0x53, 0xf3, 0xcd, 0x4d,
+ 0xa6, 0xf3, 0x6f, 0x11, 0x1a, 0x46, 0x8f, 0x57, 0x7a, 0xb8, 0xf7, 0xfa, 0xae, 0xc6, 0x00, 0x81,
+ 0x6a, 0x1b, 0x84, 0x46, 0x9b, 0xe6, 0xe0, 0xcb, 0x03, 0x67, 0xee, 0xdf, 0xed, 0xbe, 0x7a, 0xcc,
+ 0xc5, 0x7b, 0x75, 0xd2, 0x5b, 0x21, 0xcb, 0x85, 0xcf, 0xc9, 0x1f, 0x1b, 0x22, 0x72, 0xb2, 0x32,
+ 0x4a, 0x36, 0x24, 0x8a, 0xb7, 0x20, 0x5a, 0x40, 0x4b, 0x0b, 0x11, 0xc4, 0x7e, 0x60, 0x9e, 0x99,
+ 0x7e, 0x0c, 0xbd, 0xe7, 0xaf, 0xc4, 0xa6, 0x42, 0x87, 0xf8, 0x9c, 0x1f, 0xc4, 0xa2, 0x13, 0x41,
+ 0xf3, 0x30, 0xe5, 0x7f, 0xab, 0x7f, 0xcc, 0xbe, 0x78, 0x82, 0xbd, 0xe3, 0x02, 0xec, 0xc6, 0x47,
+ 0xe7, 0x50, 0xbf, 0xf5, 0x16, 0xf3, 0xc9, 0x68, 0x7a, 0x39, 0x9d, 0x8c, 0x5b, 0x2f, 0x50, 0x15,
+ 0x8a, 0x6f, 0x26, 0x8b, 0x96, 0x85, 0x2a, 0x50, 0xf0, 0x66, 0xad, 0x82, 0x73, 0x03, 0x4d, 0xcc,
+ 0x42, 0x36, 0xe2, 0x2c, 0x33, 0xc4, 0x86, 0x70, 0xbe, 0xfd, 0x13, 0xdb, 0x8e, 0xaf, 0x8d, 0xf0,
+ 0xf2, 0xd9, 0xf1, 0x71, 0x53, 0xec, 0x87, 0x62, 0xf8, 0xdd, 0x6f, 0xdf, 0x46, 0xec, 0x31, 0xdd,
+ 0x65, 0x3c, 0xea, 0xef, 0x7d, 0x28, 0x68, 0xba, 0xe6, 0x41, 0x5f, 0x7d, 0x22, 0xfa, 0x11, 0xdb,
+ 0x3b, 0x09, 0x2b, 0x0a, 0xfc, 0xe6, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, 0xb0, 0x4f, 0x03,
+ 0x57, 0x06, 0x00, 0x00,
}
diff --git a/src/chromiumos/bot_scaling.proto b/src/chromiumos/bot_scaling.proto
index 848d264..99a340f 100644
--- a/src/chromiumos/bot_scaling.proto
+++ b/src/chromiumos/bot_scaling.proto
@@ -76,6 +76,8 @@
// Set whether a bot group should be configured or only monitored.
Mode policy_mode = 6;
+ // Number of hours to lookback for Swarming stats.
+ sint32 lookback_hours = 7;
}
// Configures the root message.
