diff --git a/pkg/rule/api/v1_test.go b/pkg/rule/api/v1_test.go index 58d2c3d3c4..759f052474 100644 --- a/pkg/rule/api/v1_test.go +++ b/pkg/rule/api/v1_test.go @@ -272,7 +272,7 @@ func testEndpoints(t *testing.T, api *API) { testutil.Ok(t, err) got, err := json.Marshal(test.response) testutil.Ok(t, err) - testutil.Equals(t, exp, got) + testutil.Equals(t, string(exp), string(got)) }) } } diff --git a/pkg/store/storepb/rules.pb.go b/pkg/store/storepb/rules.pb.go index 9bebd503e2..4519bea32b 100644 --- a/pkg/store/storepb/rules.pb.go +++ b/pkg/store/storepb/rules.pb.go @@ -336,7 +336,7 @@ var xxx_messageInfo_Alert proto.InternalMessageInfo type RecordingRule struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name"` Query string `protobuf:"bytes,2,opt,name=query,proto3" json:"query"` - Labels *PromLabels `protobuf:"bytes,3,opt,name=labels,proto3" json:"labels,omitempty"` + Labels *PromLabels `protobuf:"bytes,3,opt,name=labels,proto3" json:"labels"` Health string `protobuf:"bytes,4,opt,name=health,proto3" json:"health"` LastError string `protobuf:"bytes,5,opt,name=last_error,json=lastError,proto3" json:"lastError,omitempty"` EvaluationDurationSeconds float64 `protobuf:"fixed64,6,opt,name=evaluation_duration_seconds,json=evaluationDurationSeconds,proto3" json:"evaluationTime"` @@ -427,63 +427,62 @@ func init() { func init() { proto.RegisterFile("rules.proto", fileDescriptor_8e722d3e922f0937) } var fileDescriptor_8e722d3e922f0937 = []byte{ - // 893 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x16, 0x2d, 0x91, 0x12, 0x87, 0x76, 0xec, 0x6e, 0x13, 0x98, 0x71, 0x5a, 0x51, 0x15, 0x10, - 0x40, 0xe8, 0x8f, 0x0c, 0xc8, 0x48, 0x8a, 0xdc, 0x6a, 0xc6, 0x6e, 0x22, 0xa0, 0x30, 0x82, 0xb5, - 0xd1, 0x43, 0x2f, 0xc2, 0x5a, 0xda, 0xc8, 0x04, 0x28, 0x2e, 0xbb, 0xbb, 0x32, 0xe0, 0x77, 0xe8, - 0x21, 0xaf, 0xd0, 0x47, 0xe8, 0x5b, 0xf8, 0x98, 0x63, 0x0f, 0x05, 0xdb, 0xda, 0x37, 0xbe, 0x44, - 0x0b, 0xee, 0xf2, 0x47, 0x4e, 0xad, 0x3a, 0x6d, 0xd5, 0x8b, 0x66, 0x77, 0xe6, 0x1b, 0xcd, 0xee, - 0xcc, 0xb7, 0x1f, 0xc1, 0xe1, 0xf3, 0x90, 0x8a, 0x7e, 0xcc, 0x99, 0x64, 0xc8, 0x92, 0x67, 0x24, - 0x62, 0x62, 0xc7, 0x91, 0x17, 0x71, 0xe1, 0xdc, 0xb9, 0x3f, 0x65, 0x53, 0xa6, 0x96, 0xbb, 0xd9, - 0x2a, 0xf7, 0x7a, 0x53, 0xc6, 0xa6, 0x21, 0xdd, 0x55, 0xbb, 0xd3, 0xf9, 0xeb, 0x5d, 0x19, 0xcc, - 0xa8, 0x90, 0x64, 0x16, 0x6b, 0x40, 0xf7, 0x39, 0x00, 0x9e, 0x87, 0xf4, 0x05, 0x67, 0xf3, 0x58, - 0xa0, 0x27, 0x60, 0x4d, 0xd5, 0xca, 0x35, 0x3a, 0xf5, 0x9e, 0x33, 0xf8, 0xa0, 0xaf, 0x4b, 0xf5, - 0x4b, 0x8c, 0x0f, 0x69, 0xe2, 0xe5, 0x20, 0x9c, 0xdb, 0xee, 0x2f, 0x0d, 0xb0, 0x4b, 0x04, 0xfa, - 0x08, 0x1a, 0x11, 0x99, 0x51, 0xd7, 0xe8, 0x18, 0x3d, 0xdb, 0x6f, 0xa5, 0x89, 0xa7, 0xf6, 0x58, - 0xfd, 0x66, 0xd1, 0xd7, 0x41, 0x48, 0xdd, 0xb5, 0x2a, 0x9a, 0xed, 0xb1, 0xfa, 0x45, 0x5f, 0x80, - 0xa9, 0x6e, 0xea, 0xd6, 0x55, 0xfd, 0xf5, 0xc5, 0xfa, 0xbe, 0x9d, 0x26, 0x9e, 0x0e, 0x63, 0x6d, - 0x50, 0x0f, 0x5a, 0x41, 0x24, 0x29, 0x3f, 0x27, 0xa1, 0xdb, 0xe8, 0x18, 0x3d, 0xc3, 0x5f, 0x4f, - 0x13, 0xaf, 0xf4, 0xe1, 0x72, 0x85, 0x30, 0x3c, 0xa2, 0xe7, 0x24, 0x9c, 0x13, 0x19, 0xb0, 0x68, - 0x34, 0x99, 0x73, 0xbd, 0x10, 0x74, 0xcc, 0xa2, 0x89, 0x70, 0x4d, 0x95, 0x8c, 0xd2, 0xc4, 0xbb, - 0x57, 0xc1, 0x4e, 0x82, 0x19, 0xc5, 0x0f, 0xab, 0xfd, 0x41, 0x9e, 0x75, 0xac, 0x93, 0xd0, 0x08, - 0x36, 0x43, 0x22, 0xe4, 0xa8, 0x42, 0xb8, 0x56, 0xc7, 0xe8, 0x39, 0x83, 0x9d, 0xbe, 0x6e, 0x7b, - 0xbf, 0x68, 0x7b, 0xff, 0xa4, 0x68, 0xbb, 0xbf, 0x73, 0x99, 0x78, 0xb5, 0xac, 0x4e, 0x96, 0x7a, - 0x58, 0x66, 0xbe, 0xf9, 0xd5, 0x33, 0xf0, 0x3b, 0x3e, 0xf4, 0x83, 0x01, 0x9f, 0x1c, 0xd0, 0x98, - 0xd3, 0x31, 0x91, 0x74, 0xf2, 0x8a, 0x70, 0x19, 0x90, 0x10, 0x53, 0x11, 0xb3, 0x48, 0xd0, 0x63, - 0xc9, 0x89, 0xa4, 0xd3, 0x0b, 0xb7, 0xd9, 0x31, 0x7a, 0xf7, 0x06, 0x5e, 0xd1, 0xaa, 0x25, 0x30, - 0xff, 0xe3, 0x34, 0xf1, 0x1e, 0xc6, 0x3a, 0x38, 0xe2, 0x79, 0x74, 0x24, 0xf2, 0x30, 0xbe, 0xbb, - 0x10, 0x3a, 0x87, 0xed, 0x65, 0x67, 0x68, 0xbd, 0xdf, 0x19, 0x1e, 0xa5, 0x89, 0xb7, 0x1d, 0xdf, - 0x1e, 0xc4, 0xcb, 0xfe, 0xbc, 0x1b, 0x41, 0x23, 0x9b, 0x3f, 0x7a, 0x02, 0x36, 0xa7, 0x63, 0xc6, - 0x27, 0x41, 0x34, 0x55, 0xec, 0x72, 0x06, 0x0f, 0x4a, 0x82, 0x14, 0x81, 0x0c, 0xf9, 0xb2, 0x86, - 0x2b, 0x24, 0x7a, 0x0c, 0x26, 0x09, 0x29, 0x97, 0x8a, 0x72, 0xce, 0x60, 0xa3, 0x48, 0xd9, 0xcf, - 0x9c, 0x2f, 0x6b, 0x58, 0x47, 0xfd, 0x16, 0x58, 0x9c, 0x8a, 0x79, 0x28, 0xbb, 0x3f, 0xd5, 0x61, - 0x43, 0x05, 0x87, 0x91, 0x90, 0x24, 0x1a, 0x53, 0xf4, 0x14, 0xac, 0x90, 0x9c, 0xd2, 0x50, 0xe4, - 0x65, 0x51, 0x79, 0x51, 0xce, 0x66, 0xdf, 0xa8, 0x88, 0x7e, 0x18, 0x1a, 0x85, 0x73, 0x8b, 0x0e, - 0xc1, 0x21, 0x51, 0xc4, 0xa4, 0x1a, 0xa7, 0xc8, 0x0f, 0x70, 0x5b, 0xf2, 0x66, 0x9a, 0x78, 0x8b, - 0x50, 0xbc, 0xb8, 0x41, 0x7b, 0x60, 0x0a, 0x49, 0x24, 0x75, 0xeb, 0xaa, 0xcd, 0xe8, 0xc6, 0x0d, - 0x8e, 0xb3, 0x88, 0x7e, 0x1b, 0x0a, 0x84, 0xb5, 0x41, 0xc7, 0x60, 0x93, 0xb1, 0x0c, 0xce, 0xe9, - 0x88, 0x48, 0xf5, 0x38, 0xee, 0xe0, 0x65, 0x9a, 0x78, 0x48, 0x27, 0xec, 0xcb, 0xcf, 0xd9, 0x2c, - 0x90, 0x74, 0x16, 0xcb, 0x0b, 0xc5, 0xcb, 0x56, 0xe1, 0x47, 0x1e, 0x98, 0x19, 0x3d, 0xa9, 0x7a, - 0x30, 0xb6, 0xae, 0xaa, 0x1c, 0x58, 0x9b, 0xbf, 0xe3, 0x88, 0xf5, 0x7f, 0x72, 0xe4, 0x8f, 0x06, - 0x98, 0xaa, 0x1d, 0x55, 0xb3, 0x8c, 0x7f, 0xd0, 0xac, 0x42, 0xb3, 0xd6, 0x6e, 0xd5, 0x2c, 0x0f, - 0xcc, 0xef, 0xe7, 0x94, 0x5f, 0xa8, 0xfe, 0xe7, 0xb7, 0x56, 0x0e, 0xac, 0x0d, 0xfa, 0x12, 0xb6, - 0xfe, 0x22, 0x29, 0x0b, 0x7a, 0x54, 0xc4, 0xf0, 0xe6, 0xe4, 0x1d, 0x09, 0xa9, 0x88, 0x65, 0xfe, - 0x17, 0x62, 0x59, 0xff, 0x92, 0x58, 0xcf, 0xc0, 0x52, 0xe4, 0x17, 0x6e, 0x53, 0xe9, 0xed, 0x83, - 0x1b, 0xcd, 0x2a, 0xe8, 0xaf, 0x4f, 0xa0, 0x81, 0x38, 0xb7, 0xa8, 0x0b, 0xd6, 0x19, 0x25, 0xa1, - 0x3c, 0x53, 0x6f, 0xdf, 0xd6, 0x18, 0xed, 0xc1, 0xb9, 0x45, 0x4f, 0x01, 0xb4, 0x40, 0x72, 0xce, - 0xb8, 0x6b, 0x2b, 0xdc, 0x76, 0x9a, 0x78, 0x1f, 0x2a, 0x9d, 0xcb, 0x9c, 0x15, 0xd1, 0xb0, 0x5d, - 0x3a, 0xef, 0x12, 0x6b, 0x58, 0x91, 0x58, 0x3b, 0xab, 0x14, 0xeb, 0xee, 0x8f, 0x75, 0xd8, 0xb8, - 0xa1, 0x42, 0x77, 0x7c, 0x08, 0x4b, 0x52, 0xad, 0x2d, 0x21, 0xd5, 0x57, 0x25, 0x37, 0xea, 0x4b, - 0xc7, 0x7b, 0x3f, 0x4d, 0xbc, 0x2d, 0x8d, 0x5a, 0x68, 0x65, 0xc1, 0x92, 0x6a, 0x46, 0x8d, 0xf7, - 0x9c, 0x91, 0xb9, 0xaa, 0x19, 0x59, 0x2b, 0x9a, 0x51, 0x73, 0xa5, 0x33, 0x7a, 0x06, 0x50, 0x35, - 0x0f, 0x7d, 0xb6, 0xa0, 0xea, 0xf5, 0xc5, 0x2f, 0x83, 0x8a, 0xfb, 0x8d, 0xec, 0x8f, 0x8b, 0x5e, - 0x7e, 0xba, 0x07, 0x50, 0x29, 0x08, 0x5a, 0x87, 0xd6, 0xf0, 0x68, 0xff, 0xf9, 0xc9, 0xf0, 0xdb, - 0xc3, 0xad, 0x1a, 0x72, 0xa0, 0xf9, 0xea, 0xf0, 0xe8, 0x60, 0x78, 0xf4, 0x62, 0xcb, 0x40, 0x00, - 0xd6, 0xd7, 0x43, 0x9c, 0xad, 0xd7, 0xfc, 0xc7, 0x97, 0xbf, 0xb7, 0x6b, 0x97, 0x57, 0x6d, 0xe3, - 0xed, 0x55, 0xdb, 0xf8, 0xed, 0xaa, 0x6d, 0xbc, 0xb9, 0x6e, 0xd7, 0xde, 0x5e, 0xb7, 0x6b, 0x3f, - 0x5f, 0xb7, 0x6b, 0xdf, 0x35, 0x85, 0x64, 0x9c, 0xc6, 0xa7, 0xa7, 0x96, 0xba, 0xd6, 0xde, 0x9f, - 0x01, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x16, 0x80, 0x9f, 0xe6, 0x09, 0x00, 0x00, + // 880 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xdb, 0x36, + 0x18, 0xb6, 0x62, 0x4b, 0xb6, 0x5e, 0x25, 0x4d, 0xc6, 0xad, 0x88, 0x9a, 0x6e, 0x96, 0x67, 0xa0, + 0x80, 0xb1, 0x0f, 0x07, 0x70, 0xd0, 0x0e, 0x3d, 0x46, 0x4d, 0xd6, 0x1a, 0x18, 0x82, 0x82, 0x09, + 0x76, 0xd8, 0xc5, 0x60, 0x6c, 0xd6, 0x11, 0x20, 0x8b, 0x1a, 0x49, 0x07, 0xc8, 0x7f, 0xd8, 0xa1, + 0xb7, 0xfd, 0x8e, 0xfd, 0x8b, 0x1c, 0x7b, 0xdc, 0x61, 0xd0, 0xb6, 0xe4, 0xa6, 0x3f, 0xb1, 0x41, + 0xa4, 0x3e, 0x9c, 0x2e, 0x99, 0xdb, 0xcd, 0xbd, 0xf8, 0x25, 0xdf, 0xe7, 0x79, 0x4d, 0xf2, 0xe5, + 0xc3, 0x47, 0xe0, 0xf0, 0x79, 0x48, 0x45, 0x3f, 0xe6, 0x4c, 0x32, 0x64, 0xc9, 0x33, 0x12, 0x31, + 0xb1, 0xe3, 0xc8, 0x8b, 0xb8, 0x48, 0xee, 0x7c, 0x32, 0x65, 0x53, 0xa6, 0x86, 0xbb, 0xd9, 0x28, + 0xcf, 0x7a, 0x53, 0xc6, 0xa6, 0x21, 0xdd, 0x55, 0xb3, 0xd3, 0xf9, 0xab, 0x5d, 0x19, 0xcc, 0xa8, + 0x90, 0x64, 0x16, 0x6b, 0x42, 0xf7, 0x19, 0x00, 0x9e, 0x87, 0xf4, 0x39, 0x67, 0xf3, 0x58, 0xa0, + 0xc7, 0x60, 0x4d, 0xd5, 0xc8, 0x35, 0x3a, 0xf5, 0x9e, 0x33, 0xf8, 0xa8, 0xaf, 0x97, 0xea, 0x97, + 0x1c, 0x1f, 0xd2, 0xc4, 0xcb, 0x49, 0x38, 0x8f, 0xdd, 0xdf, 0x1a, 0x60, 0x97, 0x0c, 0xf4, 0x29, + 0x34, 0x22, 0x32, 0xa3, 0xae, 0xd1, 0x31, 0x7a, 0xb6, 0xdf, 0x4a, 0x13, 0x4f, 0xcd, 0xb1, 0xfa, + 0xcd, 0xd0, 0x57, 0x41, 0x48, 0xdd, 0xb5, 0x0a, 0xcd, 0xe6, 0x58, 0xfd, 0xa2, 0xaf, 0xc1, 0x54, + 0x27, 0x75, 0xeb, 0x6a, 0xfd, 0xf5, 0xc5, 0xf5, 0x7d, 0x3b, 0x4d, 0x3c, 0x0d, 0x63, 0x1d, 0x50, + 0x0f, 0x5a, 0x41, 0x24, 0x29, 0x3f, 0x27, 0xa1, 0xdb, 0xe8, 0x18, 0x3d, 0xc3, 0x5f, 0x4f, 0x13, + 0xaf, 0xcc, 0xe1, 0x72, 0x84, 0x30, 0x3c, 0xa4, 0xe7, 0x24, 0x9c, 0x13, 0x19, 0xb0, 0x68, 0x34, + 0x99, 0x73, 0x3d, 0x10, 0x74, 0xcc, 0xa2, 0x89, 0x70, 0x4d, 0x55, 0x8c, 0xd2, 0xc4, 0xbb, 0x57, + 0xd1, 0x4e, 0x82, 0x19, 0xc5, 0x0f, 0xaa, 0xf9, 0x41, 0x5e, 0x75, 0xac, 0x8b, 0xd0, 0x08, 0x36, + 0x43, 0x22, 0xe4, 0xa8, 0x62, 0xb8, 0x56, 0xc7, 0xe8, 0x39, 0x83, 0x9d, 0xbe, 0x6e, 0x7b, 0xbf, + 0x68, 0x7b, 0xff, 0xa4, 0x68, 0xbb, 0xbf, 0x73, 0x99, 0x78, 0xb5, 0x6c, 0x9d, 0xac, 0xf4, 0xb0, + 0xac, 0x7c, 0xfd, 0xbb, 0x67, 0xe0, 0xb7, 0x72, 0xe8, 0x27, 0x03, 0x3e, 0x3f, 0xa0, 0x31, 0xa7, + 0x63, 0x22, 0xe9, 0xe4, 0x25, 0xe1, 0x32, 0x20, 0x21, 0xa6, 0x22, 0x66, 0x91, 0xa0, 0xc7, 0x92, + 0x13, 0x49, 0xa7, 0x17, 0x6e, 0xb3, 0x63, 0xf4, 0xee, 0x0d, 0xbc, 0xa2, 0x55, 0x77, 0xd0, 0xfc, + 0xcf, 0xd2, 0xc4, 0x7b, 0x10, 0x6b, 0x70, 0xc4, 0x73, 0x74, 0x24, 0x72, 0x18, 0x2f, 0x5f, 0x08, + 0x9d, 0xc3, 0xf6, 0x5d, 0x7b, 0x68, 0xbd, 0xdb, 0x1e, 0x1e, 0xa6, 0x89, 0xb7, 0x1d, 0xdf, 0x0e, + 0xe2, 0xbb, 0xfe, 0xbc, 0x1b, 0x41, 0x23, 0xbb, 0x7f, 0xf4, 0x18, 0x6c, 0x4e, 0xc7, 0x8c, 0x4f, + 0x82, 0x68, 0xaa, 0xd4, 0xe5, 0x0c, 0xee, 0x97, 0x02, 0x29, 0x80, 0x8c, 0xf9, 0xa2, 0x86, 0x2b, + 0x26, 0x7a, 0x04, 0x26, 0x09, 0x29, 0x97, 0x4a, 0x72, 0xce, 0x60, 0xa3, 0x28, 0xd9, 0xcf, 0x92, + 0x2f, 0x6a, 0x58, 0xa3, 0x7e, 0x0b, 0x2c, 0x4e, 0xc5, 0x3c, 0x94, 0xdd, 0x5f, 0xea, 0xb0, 0xa1, + 0xc0, 0x61, 0x24, 0x24, 0x89, 0xc6, 0x14, 0x3d, 0x01, 0x2b, 0x24, 0xa7, 0x34, 0x14, 0xf9, 0xb2, + 0xa8, 0x3c, 0x28, 0x67, 0xb3, 0xef, 0x14, 0xa2, 0x1f, 0x86, 0x66, 0xe1, 0x3c, 0xa2, 0x43, 0x70, + 0x48, 0x14, 0x31, 0xa9, 0xae, 0x53, 0xe4, 0x1b, 0xb8, 0xad, 0x78, 0x33, 0x4d, 0xbc, 0x45, 0x2a, + 0x5e, 0x9c, 0xa0, 0x3d, 0x30, 0x85, 0x24, 0x92, 0xba, 0x75, 0xd5, 0x66, 0x74, 0xe3, 0x04, 0xc7, + 0x19, 0xa2, 0xdf, 0x86, 0x22, 0x61, 0x1d, 0xd0, 0x31, 0xd8, 0x64, 0x2c, 0x83, 0x73, 0x3a, 0x22, + 0x52, 0x3d, 0x8e, 0x25, 0xba, 0x4c, 0x13, 0x0f, 0xe9, 0x82, 0x7d, 0xf9, 0x15, 0x9b, 0x05, 0x92, + 0xce, 0x62, 0x79, 0xa1, 0x74, 0xd9, 0x2a, 0xf2, 0xc8, 0x03, 0x33, 0x93, 0x27, 0x55, 0x0f, 0xc6, + 0xd6, 0xab, 0xaa, 0x04, 0xd6, 0xe1, 0xdf, 0x34, 0x62, 0x7d, 0x48, 0x8d, 0xfc, 0xd5, 0x00, 0x53, + 0xb5, 0xa3, 0x6a, 0x96, 0xf1, 0x1e, 0xcd, 0x2a, 0x3c, 0x6b, 0xed, 0x56, 0xcf, 0xf2, 0xc0, 0xfc, + 0x71, 0x4e, 0xf9, 0x85, 0xea, 0x7f, 0x7e, 0x6a, 0x95, 0xc0, 0x3a, 0xa0, 0x6f, 0x60, 0xeb, 0x1f, + 0x96, 0xb2, 0xe0, 0x47, 0x05, 0x86, 0x37, 0x27, 0x6f, 0x59, 0x48, 0x25, 0x2c, 0xf3, 0xff, 0x08, + 0xcb, 0xfa, 0x8f, 0xc2, 0x7a, 0x0a, 0x96, 0x12, 0xbf, 0x70, 0x9b, 0xca, 0x6f, 0xef, 0xdf, 0x68, + 0x56, 0x21, 0x7f, 0xbd, 0x03, 0x4d, 0xc4, 0x79, 0x44, 0x5d, 0xb0, 0xce, 0x28, 0x09, 0xe5, 0x99, + 0x7a, 0xfb, 0xb6, 0xe6, 0xe8, 0x0c, 0xce, 0x23, 0x7a, 0x02, 0xa0, 0x0d, 0x92, 0x73, 0xc6, 0x5d, + 0x5b, 0xf1, 0xb6, 0xd3, 0xc4, 0xfb, 0x58, 0xf9, 0x5c, 0x96, 0xac, 0x84, 0x86, 0xed, 0x32, 0xb9, + 0xcc, 0xac, 0x61, 0x45, 0x66, 0xed, 0xac, 0xd2, 0xac, 0xbb, 0x3f, 0xd7, 0x61, 0xe3, 0x86, 0x0b, + 0x2d, 0xf9, 0x10, 0x96, 0xa2, 0x5a, 0xbb, 0x43, 0x54, 0x95, 0x36, 0xea, 0xef, 0xa5, 0x8d, 0xea, + 0x66, 0x1a, 0xef, 0x78, 0x33, 0xe6, 0xaa, 0x6e, 0xc6, 0x5a, 0xd1, 0xcd, 0x34, 0x57, 0x7a, 0x33, + 0x4f, 0x01, 0xaa, 0x96, 0xa1, 0x2f, 0x17, 0xbc, 0xbc, 0xbe, 0xf8, 0x3d, 0x50, 0xb8, 0xdf, 0xc8, + 0xfe, 0xb8, 0xe8, 0xe5, 0x17, 0x7b, 0x00, 0x95, 0x6f, 0xa0, 0x75, 0x68, 0x0d, 0x8f, 0xf6, 0x9f, + 0x9d, 0x0c, 0xbf, 0x3f, 0xdc, 0xaa, 0x21, 0x07, 0x9a, 0x2f, 0x0f, 0x8f, 0x0e, 0x86, 0x47, 0xcf, + 0xb7, 0x0c, 0x04, 0x60, 0x7d, 0x3b, 0xc4, 0xd9, 0x78, 0xcd, 0x7f, 0x74, 0xf9, 0x67, 0xbb, 0x76, + 0x79, 0xd5, 0x36, 0xde, 0x5c, 0xb5, 0x8d, 0x3f, 0xae, 0xda, 0xc6, 0xeb, 0xeb, 0x76, 0xed, 0xcd, + 0x75, 0xbb, 0xf6, 0xeb, 0x75, 0xbb, 0xf6, 0x43, 0x53, 0x48, 0xc6, 0x69, 0x7c, 0x7a, 0x6a, 0xa9, + 0x63, 0xed, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x7e, 0x9e, 0x97, 0xda, 0xdc, 0x09, 0x00, 0x00, } func (m *RuleGroups) Marshal() (dAtA []byte, err error) { diff --git a/pkg/store/storepb/rules.proto b/pkg/store/storepb/rules.proto index e4512ba330..b3000062a0 100644 --- a/pkg/store/storepb/rules.proto +++ b/pkg/store/storepb/rules.proto @@ -98,7 +98,7 @@ message Alert { message RecordingRule { string name = 1 [(gogoproto.jsontag) = "name" ]; string query = 2 [(gogoproto.jsontag) = "query" ]; - PromLabels labels = 3 [(gogoproto.jsontag) = "labels,omitempty" ]; + PromLabels labels = 3 [(gogoproto.jsontag) = "labels" ]; string health = 4 [(gogoproto.jsontag) = "health" ]; string last_error = 5 [(gogoproto.jsontag) = "lastError,omitempty" ]; double evaluation_duration_seconds = 6 [(gogoproto.jsontag) = "evaluationTime" ]; diff --git a/pkg/testutil/testpromcompatibility/api_compatibility.go b/pkg/testutil/testpromcompatibility/api_compatibility.go index fb9c5339e8..a42b28dda5 100644 --- a/pkg/testutil/testpromcompatibility/api_compatibility.go +++ b/pkg/testutil/testpromcompatibility/api_compatibility.go @@ -64,7 +64,7 @@ type AlertingRule struct { type RecordingRule struct { Name string `json:"name"` Query string `json:"query"` - Labels labels.Labels `json:"labels,omitempty"` + Labels labels.Labels `json:"labels"` Health rules.RuleHealth `json:"health"` LastError string `json:"lastError,omitempty"` EvaluationTime float64 `json:"evaluationTime"`