From 2d9e24918060307bda927c6f9fb47a846f38f641 Mon Sep 17 00:00:00 2001 From: Shriram Rajagopalan Date: Mon, 5 Feb 2018 16:38:26 -0500 Subject: [PATCH 1/2] cluster configuration --- mixer/v1/config/client/client_config.pb.go | 199 +++++++++++++----- mixer/v1/config/client/client_config.proto | 11 + .../istio.mixer.v1.config.client.pb.html | 21 ++ 3 files changed, 177 insertions(+), 54 deletions(-) diff --git a/mixer/v1/config/client/client_config.pb.go b/mixer/v1/config/client/client_config.pb.go index d8ea6a3332..d312eed805 100644 --- a/mixer/v1/config/client/client_config.pb.go +++ b/mixer/v1/config/client/client_config.pb.go @@ -79,6 +79,15 @@ type TransportConfig struct { // Specify refresh interval to write mixer client statistics to Envoy share // memory. If not specified, the interval is 10 seconds. StatsUpdateInterval *google_protobuf1.Duration `protobuf:"bytes,5,opt,name=stats_update_interval,json=statsUpdateInterval" json:"stats_update_interval,omitempty"` + // Name of the cluster that will forward check calls to a pool of mixer + // servers. Defaults to "mixer_server". + CheckCluster string `protobuf:"bytes,6,opt,name=check_cluster,json=checkCluster,proto3" json:"check_cluster,omitempty"` + // Name of the cluster that will forward report calls to a pool of mixer + // servers. Defaults to "mixer_server". By using different names for + // checkCluster and reportCluster, it is possible to have one set of + // mixer servers handle check calls, while another set of mixer servers + // handle report calls. + ReportCluster string `protobuf:"bytes,7,opt,name=report_cluster,json=reportCluster,proto3" json:"report_cluster,omitempty"` } func (m *TransportConfig) Reset() { *m = TransportConfig{} } @@ -290,6 +299,18 @@ func (m *TransportConfig) MarshalTo(dAtA []byte) (int, error) { } i += n3 } + if len(m.CheckCluster) > 0 { + dAtA[i] = 0x32 + i++ + i = encodeVarintClientConfig(dAtA, i, uint64(len(m.CheckCluster))) + i += copy(dAtA[i:], m.CheckCluster) + } + if len(m.ReportCluster) > 0 { + dAtA[i] = 0x3a + i++ + i = encodeVarintClientConfig(dAtA, i, uint64(len(m.ReportCluster))) + i += copy(dAtA[i:], m.ReportCluster) + } return i, nil } @@ -513,6 +534,14 @@ func (m *TransportConfig) Size() (n int) { l = m.StatsUpdateInterval.Size() n += 1 + l + sovClientConfig(uint64(l)) } + l = len(m.CheckCluster) + if l > 0 { + n += 1 + l + sovClientConfig(uint64(l)) + } + l = len(m.ReportCluster) + if l > 0 { + n += 1 + l + sovClientConfig(uint64(l)) + } return n } @@ -617,6 +646,8 @@ func (this *TransportConfig) String() string { `DisableReportBatch:` + fmt.Sprintf("%v", this.DisableReportBatch) + `,`, `NetworkFailPolicy:` + fmt.Sprintf("%v", this.NetworkFailPolicy) + `,`, `StatsUpdateInterval:` + strings.Replace(fmt.Sprintf("%v", this.StatsUpdateInterval), "Duration", "google_protobuf1.Duration", 1) + `,`, + `CheckCluster:` + fmt.Sprintf("%v", this.CheckCluster) + `,`, + `ReportCluster:` + fmt.Sprintf("%v", this.ReportCluster) + `,`, `}`, }, "") return s @@ -1027,6 +1058,64 @@ func (m *TransportConfig) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CheckCluster", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowClientConfig + } + 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 ErrInvalidLengthClientConfig + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.CheckCluster = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ReportCluster", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowClientConfig + } + 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 ErrInvalidLengthClientConfig + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ReportCluster = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipClientConfig(dAtA[iNdEx:]) @@ -1681,58 +1770,60 @@ func init() { } var fileDescriptorClientConfig = []byte{ - // 836 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4f, 0x8f, 0x22, 0x45, - 0x14, 0xef, 0x1e, 0x98, 0x89, 0x14, 0x99, 0x01, 0x8a, 0xdd, 0x84, 0x41, 0xd3, 0x41, 0x8c, 0x11, - 0x35, 0x36, 0x2e, 0x5e, 0x8c, 0x89, 0x1a, 0x60, 0x99, 0x2c, 0x71, 0xff, 0x60, 0xcf, 0xcc, 0x45, - 0x0f, 0x9d, 0xa2, 0xba, 0xa0, 0x2b, 0xb4, 0x55, 0xbd, 0xdd, 0xd5, 0xac, 0x73, 0xf3, 0x13, 0x18, - 0x6f, 0x7e, 0x85, 0xfd, 0x12, 0xde, 0xf7, 0xb8, 0x47, 0x8f, 0x82, 0x17, 0x8f, 0xfb, 0x11, 0x4c, - 0x57, 0x15, 0xb0, 0x30, 0xc0, 0x84, 0xc3, 0x9e, 0xa0, 0xdf, 0xfb, 0xfd, 0x7e, 0x55, 0xef, 0xbd, - 0xfa, 0x55, 0x81, 0xcf, 0x7e, 0xa1, 0xbf, 0x92, 0xa8, 0x39, 0x7d, 0xd0, 0xc4, 0x9c, 0x8d, 0xe8, - 0xb8, 0x89, 0x03, 0x4a, 0x98, 0xd0, 0x3f, 0xae, 0x0a, 0xda, 0x61, 0xc4, 0x05, 0x87, 0x1f, 0xd0, - 0x58, 0x50, 0x6e, 0x4b, 0x86, 0x3d, 0x7d, 0x60, 0xeb, 0xa4, 0x82, 0x56, 0xef, 0x8d, 0xf9, 0x98, - 0x4b, 0x60, 0x33, 0xfd, 0xa7, 0x38, 0x55, 0x6b, 0xcc, 0xf9, 0x38, 0x20, 0x4d, 0xf9, 0x35, 0x4c, - 0x46, 0x4d, 0x2f, 0x89, 0x90, 0xa0, 0x9c, 0xe9, 0xfc, 0xf9, 0x72, 0x7d, 0x24, 0x44, 0x44, 0x87, - 0x89, 0x20, 0xb1, 0x4e, 0x7d, 0xbc, 0x63, 0x6b, 0x28, 0xa4, 0x6e, 0x1c, 0x12, 0xac, 0x61, 0xf5, - 0x1d, 0xb0, 0xe7, 0x09, 0x17, 0x48, 0x63, 0x3e, 0xdc, 0x25, 0x95, 0x08, 0x5f, 0x41, 0xea, 0x7f, - 0x65, 0xc0, 0xe9, 0x25, 0x89, 0xa6, 0x14, 0x93, 0xae, 0xc4, 0x40, 0x1b, 0x94, 0x3d, 0x1a, 0xa3, - 0x61, 0x40, 0x5c, 0xec, 0x13, 0x3c, 0x71, 0x31, 0x0a, 0x82, 0xb8, 0x62, 0xd6, 0xcc, 0xc6, 0x7b, - 0x4e, 0x49, 0xa7, 0xba, 0x69, 0xa6, 0x9b, 0x26, 0xe0, 0x97, 0xe0, 0xde, 0x02, 0x1f, 0x91, 0x90, - 0x47, 0x42, 0x13, 0x8e, 0x24, 0x01, 0xea, 0x9c, 0x23, 0x53, 0x8a, 0xd1, 0x03, 0x45, 0xb9, 0x31, - 0x77, 0x55, 0x7b, 0x25, 0x53, 0x33, 0x1b, 0xf9, 0x56, 0xd5, 0xde, 0xe8, 0x75, 0x7b, 0x89, 0x70, - 0x0a, 0x32, 0xb8, 0x0a, 0xc0, 0x27, 0xe0, 0xd4, 0x17, 0x22, 0x74, 0x17, 0x8d, 0xa9, 0x64, 0x6b, - 0x99, 0x46, 0xbe, 0xf5, 0xa9, 0xbd, 0x6f, 0x5e, 0xf6, 0xa3, 0xab, 0xab, 0x41, 0x7b, 0xd0, 0xbf, - 0x0c, 0x09, 0x76, 0xf2, 0x29, 0xbf, 0x1d, 0xd2, 0xf4, 0x03, 0x5e, 0x00, 0x20, 0x7b, 0xa7, 0xb4, - 0x8e, 0xa5, 0xd6, 0x27, 0xfb, 0xb5, 0x7e, 0x4c, 0xf1, 0x52, 0x29, 0xf7, 0x7c, 0xf1, 0x17, 0x06, - 0xa0, 0x4c, 0x98, 0xe7, 0x26, 0x71, 0x5a, 0x60, 0x22, 0x7c, 0xa6, 0x04, 0x4f, 0x64, 0x81, 0xdf, - 0xee, 0x17, 0xec, 0x31, 0xef, 0x3a, 0x26, 0x51, 0x3b, 0x11, 0x3e, 0x61, 0x82, 0x62, 0x79, 0x64, - 0x06, 0x3c, 0xa0, 0xf8, 0x46, 0x2e, 0x53, 0x24, 0x2b, 0x00, 0x4b, 0x23, 0xf5, 0x3f, 0x33, 0xa0, - 0x70, 0x15, 0x21, 0x16, 0xcb, 0xf6, 0xee, 0x9c, 0x20, 0xf6, 0xc9, 0xf6, 0x09, 0x62, 0x9f, 0xbc, - 0x8d, 0x57, 0x1d, 0x50, 0xf8, 0xa3, 0x35, 0xbc, 0xac, 0x55, 0xe1, 0x6f, 0x4f, 0x7c, 0x88, 0x04, - 0xf6, 0xe5, 0x0c, 0x37, 0x27, 0xde, 0x49, 0x33, 0x90, 0x83, 0x32, 0x23, 0xe2, 0x05, 0x8f, 0x26, - 0xee, 0x08, 0xd1, 0xc0, 0x0d, 0x65, 0x49, 0x95, 0x6c, 0xcd, 0x6c, 0x9c, 0xb5, 0xbe, 0xdf, 0xdf, - 0x93, 0x8d, 0xea, 0xec, 0xa7, 0x4a, 0xe8, 0x02, 0xd1, 0x40, 0x75, 0xc6, 0x29, 0xb1, 0xcd, 0x10, - 0x7c, 0x02, 0xee, 0xc7, 0x02, 0x89, 0xd8, 0x4d, 0x42, 0x0f, 0x09, 0xe2, 0x52, 0x26, 0x48, 0x34, - 0x45, 0x41, 0xe5, 0x58, 0x8e, 0xe1, 0xdc, 0x56, 0xfe, 0xb4, 0x17, 0xfe, 0xb4, 0x1f, 0x6a, 0x7f, - 0x3a, 0x65, 0xc9, 0xbb, 0x96, 0xb4, 0xbe, 0x66, 0xd5, 0x5b, 0xa0, 0x74, 0x6b, 0x59, 0x78, 0x0a, - 0x72, 0x17, 0xed, 0xfe, 0x63, 0xf7, 0xd9, 0xa0, 0xf7, 0xb4, 0x68, 0xc0, 0x33, 0x00, 0xe4, 0x67, - 0xf7, 0xf1, 0xb3, 0xcb, 0x5e, 0xd1, 0xac, 0xff, 0x9e, 0x05, 0xc5, 0x47, 0x42, 0x84, 0x5d, 0x59, - 0x86, 0x1e, 0xcd, 0x0f, 0x20, 0x27, 0x16, 0xf5, 0xc8, 0x81, 0xe4, 0x5b, 0x5f, 0x1c, 0x54, 0xbe, - 0xb3, 0xe2, 0xc3, 0x09, 0x28, 0xc4, 0xca, 0xba, 0xfa, 0xc2, 0x4a, 0x4d, 0x97, 0x1e, 0xdb, 0xce, - 0x1d, 0x16, 0xd8, 0xd8, 0x95, 0xbd, 0x76, 0x01, 0xc4, 0x3d, 0x26, 0xa2, 0x1b, 0xe7, 0x2c, 0x5e, - 0x0b, 0xc2, 0xef, 0xc0, 0xfb, 0x1e, 0x19, 0xa1, 0x24, 0x10, 0xae, 0x47, 0x62, 0x41, 0x99, 0x6c, - 0x97, 0xab, 0x51, 0x72, 0xf6, 0x39, 0xe7, 0x5c, 0x43, 0x1e, 0xae, 0x10, 0x5a, 0x7b, 0xab, 0xe9, - 0xb3, 0x87, 0x9b, 0xbe, 0x0f, 0xe0, 0x88, 0x47, 0x2f, 0x50, 0xe4, 0xbd, 0x2d, 0x74, 0x7c, 0xa7, - 0x50, 0x49, 0xb3, 0x56, 0xa1, 0x2a, 0x03, 0xe5, 0x2d, 0x85, 0xc3, 0x22, 0xc8, 0x4c, 0xc8, 0x8d, - 0x1c, 0x4e, 0xce, 0x49, 0xff, 0xc2, 0x36, 0x38, 0x9e, 0xa2, 0x20, 0x51, 0x8e, 0xc8, 0xb7, 0x3e, - 0xdf, 0xdf, 0xdd, 0x35, 0x4d, 0x47, 0x31, 0xbf, 0x39, 0xfa, 0xda, 0xac, 0xbf, 0x4c, 0xad, 0x8a, - 0xdf, 0xe1, 0x79, 0xd8, 0xd6, 0xe2, 0xa3, 0xc3, 0x5b, 0xbc, 0xe3, 0x01, 0xc8, 0x1c, 0xfa, 0x00, - 0x64, 0x77, 0x3e, 0x00, 0x3f, 0x83, 0xfb, 0x98, 0x33, 0x46, 0xb0, 0x3c, 0x42, 0x6b, 0xb7, 0xae, - 0x79, 0xc8, 0xad, 0x5b, 0x5e, 0xa9, 0x2c, 0x83, 0xb0, 0x03, 0x0a, 0x7a, 0x1b, 0x4b, 0xd3, 0x9f, - 0xdc, 0x65, 0xfa, 0x33, 0xc5, 0x58, 0xf8, 0xbd, 0x73, 0xfd, 0x6a, 0x66, 0x19, 0xaf, 0x67, 0x96, - 0xf1, 0xf7, 0xcc, 0x32, 0xde, 0xcc, 0x2c, 0xe3, 0xb7, 0xb9, 0x65, 0xbe, 0x9c, 0x5b, 0xc6, 0xab, - 0xb9, 0x65, 0xbe, 0x9e, 0x5b, 0xe6, 0x3f, 0x73, 0xcb, 0xfc, 0x6f, 0x6e, 0x19, 0x6f, 0xe6, 0x96, - 0xf9, 0xc7, 0xbf, 0x96, 0xf1, 0xd3, 0x47, 0x6a, 0xcb, 0x94, 0xa7, 0xef, 0x74, 0x73, 0xfb, 0xbb, - 0x3b, 0x3c, 0x91, 0x2b, 0x7f, 0xf5, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x3b, 0xea, 0xc9, - 0x7e, 0x08, 0x00, 0x00, + // 869 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0xdf, 0x8d, 0x9d, 0x80, 0xc7, 0x38, 0x71, 0xc6, 0xad, 0xe4, 0x04, 0xb4, 0x0a, 0xae, 0x2a, + 0x02, 0x88, 0x35, 0x35, 0x17, 0x84, 0x04, 0xc8, 0x71, 0x1d, 0x35, 0xa2, 0x7f, 0xc2, 0x26, 0xb9, + 0xc0, 0x61, 0x35, 0x9e, 0x1d, 0x7b, 0x47, 0x59, 0x66, 0xb6, 0xbb, 0xb3, 0x2e, 0xb9, 0xf1, 0x09, + 0x10, 0x1f, 0xa3, 0x5f, 0x82, 0x7b, 0x8f, 0x3d, 0x72, 0x24, 0xee, 0x85, 0x63, 0x3f, 0x02, 0xda, + 0x37, 0x63, 0xbb, 0x76, 0x6c, 0x47, 0x3e, 0xf4, 0xb4, 0x3b, 0xef, 0xfd, 0xde, 0x6f, 0xe6, 0xfd, + 0xde, 0xbc, 0x37, 0xe8, 0x8b, 0xdf, 0xf8, 0xef, 0x2c, 0x69, 0x0e, 0x1f, 0x34, 0xa9, 0x14, 0x7d, + 0x3e, 0x68, 0xd2, 0x88, 0x33, 0xa1, 0xcc, 0xc7, 0xd7, 0x46, 0x37, 0x4e, 0xa4, 0x92, 0xf8, 0x13, + 0x9e, 0x2a, 0x2e, 0x5d, 0x88, 0x70, 0x87, 0x0f, 0x5c, 0xe3, 0xd4, 0xd0, 0xfd, 0x3b, 0x03, 0x39, + 0x90, 0x00, 0x6c, 0xe6, 0x7f, 0x3a, 0x66, 0xdf, 0x19, 0x48, 0x39, 0x88, 0x58, 0x13, 0x56, 0xbd, + 0xac, 0xdf, 0x0c, 0xb2, 0x84, 0x28, 0x2e, 0x85, 0xf1, 0xef, 0x4d, 0xf6, 0x27, 0x4a, 0x25, 0xbc, + 0x97, 0x29, 0x96, 0x1a, 0xd7, 0xfd, 0x25, 0x47, 0x23, 0x31, 0xf7, 0xd3, 0x98, 0x51, 0x03, 0x6b, + 0x2c, 0x81, 0x3d, 0xcf, 0xa4, 0x22, 0x06, 0xf3, 0xe9, 0x32, 0xaa, 0x4c, 0x85, 0x1a, 0xd2, 0xf8, + 0xbb, 0x80, 0x2a, 0x67, 0x2c, 0x19, 0x72, 0xca, 0x3a, 0x80, 0xc1, 0x2e, 0xaa, 0x05, 0x3c, 0x25, + 0xbd, 0x88, 0xf9, 0x34, 0x64, 0xf4, 0xd2, 0xa7, 0x24, 0x8a, 0xd2, 0xba, 0x7d, 0x60, 0x1f, 0x7e, + 0xe8, 0xed, 0x1a, 0x57, 0x27, 0xf7, 0x74, 0x72, 0x07, 0xfe, 0x1a, 0xdd, 0x19, 0xe3, 0x13, 0x16, + 0xcb, 0x44, 0x99, 0x80, 0x0d, 0x08, 0xc0, 0xc6, 0xe7, 0x81, 0x4b, 0x47, 0x74, 0x51, 0x15, 0x0e, + 0xe6, 0x4f, 0x73, 0xaf, 0x17, 0x0e, 0xec, 0xc3, 0x72, 0x6b, 0xdf, 0x9d, 0xd3, 0xba, 0x3d, 0x41, + 0x78, 0x3b, 0x60, 0x9c, 0x1a, 0xf0, 0x13, 0x54, 0x09, 0x95, 0x8a, 0xfd, 0xb1, 0x30, 0xf5, 0xe2, + 0x41, 0xe1, 0xb0, 0xdc, 0xfa, 0xdc, 0x5d, 0x55, 0x2f, 0xf7, 0xd1, 0xf9, 0xf9, 0x69, 0xfb, 0xf4, + 0xe4, 0x2c, 0x66, 0xd4, 0x2b, 0xe7, 0xf1, 0xed, 0x98, 0xe7, 0x0b, 0x7c, 0x8c, 0x10, 0x68, 0xa7, + 0xb9, 0x36, 0x81, 0xeb, 0xb3, 0xd5, 0x5c, 0x3f, 0xe7, 0x78, 0x60, 0x2a, 0x3d, 0x1f, 0xff, 0xe2, + 0x08, 0xd5, 0x98, 0x08, 0xfc, 0x2c, 0xcd, 0x13, 0xcc, 0x54, 0x28, 0x34, 0xe1, 0x16, 0x24, 0xf8, + 0xfd, 0x6a, 0xc2, 0xae, 0x08, 0x2e, 0x52, 0x96, 0xb4, 0x33, 0x15, 0x32, 0xa1, 0x38, 0x85, 0x2b, + 0x73, 0x2a, 0x23, 0x4e, 0xaf, 0x60, 0x9b, 0x2a, 0x9b, 0x02, 0x44, 0x6e, 0x69, 0xbc, 0x29, 0xa0, + 0x9d, 0xf3, 0x84, 0x88, 0x14, 0xe4, 0x5d, 0x5a, 0x41, 0x1a, 0xb2, 0xc5, 0x15, 0xa4, 0x21, 0x7b, + 0x17, 0xaf, 0x15, 0xd0, 0xf8, 0x8d, 0x19, 0x3c, 0xe4, 0xaa, 0xf1, 0x37, 0x2b, 0xde, 0x23, 0x8a, + 0x86, 0x50, 0xc3, 0xf9, 0x8a, 0x1f, 0xe5, 0x1e, 0x2c, 0x51, 0x4d, 0x30, 0xf5, 0x42, 0x26, 0x97, + 0x7e, 0x9f, 0xf0, 0xc8, 0x8f, 0x21, 0xa5, 0x7a, 0xf1, 0xc0, 0x3e, 0xdc, 0x6e, 0xfd, 0xb8, 0x5a, + 0x93, 0xb9, 0xec, 0xdc, 0xa7, 0x9a, 0xe8, 0x98, 0xf0, 0x48, 0x2b, 0xe3, 0xed, 0x8a, 0x79, 0x13, + 0x7e, 0x82, 0xee, 0xa6, 0x8a, 0xa8, 0xd4, 0xcf, 0xe2, 0x80, 0x28, 0xe6, 0x73, 0xa1, 0x58, 0x32, + 0x24, 0x51, 0x7d, 0x13, 0xca, 0xb0, 0xe7, 0xea, 0xfe, 0x74, 0xc7, 0xfd, 0xe9, 0x3e, 0x34, 0xfd, + 0xe9, 0xd5, 0x20, 0xee, 0x02, 0xc2, 0x4e, 0x4c, 0x14, 0xbe, 0x87, 0x2a, 0x46, 0xc9, 0x28, 0x4b, + 0x15, 0x4b, 0xa0, 0x9a, 0x25, 0xef, 0x23, 0x30, 0x76, 0xb4, 0x0d, 0xdf, 0x47, 0xdb, 0xe3, 0x06, + 0x30, 0xa8, 0x0f, 0x00, 0x55, 0xd1, 0x56, 0x03, 0x6b, 0xb4, 0xd0, 0xee, 0x8d, 0x14, 0x70, 0x05, + 0x95, 0x8e, 0xdb, 0x27, 0x8f, 0xfd, 0x67, 0xa7, 0xdd, 0xa7, 0x55, 0x0b, 0x6f, 0x23, 0x04, 0xcb, + 0xce, 0xe3, 0x67, 0x67, 0xdd, 0xaa, 0xdd, 0xf8, 0xb3, 0x88, 0xaa, 0x8f, 0x94, 0x8a, 0x3b, 0x20, + 0x89, 0x29, 0xf3, 0x4f, 0xa8, 0xa4, 0xc6, 0xda, 0x40, 0x71, 0xcb, 0xad, 0xaf, 0xd6, 0x92, 0xd2, + 0x9b, 0xc6, 0xe3, 0x4b, 0xb4, 0x93, 0xea, 0x31, 0x60, 0x86, 0x5f, 0xde, 0xc0, 0x79, 0x0b, 0x1c, + 0xdd, 0xd2, 0x4e, 0x73, 0xa7, 0x72, 0x67, 0x86, 0x49, 0xda, 0x15, 0x2a, 0xb9, 0xf2, 0xb6, 0xd3, + 0x19, 0x23, 0xfe, 0x01, 0x7d, 0x1c, 0xb0, 0x3e, 0xc9, 0x22, 0xe5, 0x07, 0x2c, 0x55, 0x5c, 0x80, + 0xf4, 0xbe, 0x41, 0xc1, 0x3d, 0x2a, 0x79, 0x7b, 0x06, 0xf2, 0x70, 0x8a, 0x30, 0xdc, 0x0b, 0x07, + 0x48, 0x71, 0xfd, 0x01, 0x72, 0x82, 0x70, 0x5f, 0x26, 0x2f, 0x48, 0x12, 0xbc, 0x4b, 0xb4, 0x79, + 0x2b, 0xd1, 0xae, 0x89, 0x9a, 0x9a, 0xf6, 0x05, 0xaa, 0x2d, 0x48, 0x1c, 0x57, 0x51, 0xe1, 0x92, + 0x5d, 0x41, 0x71, 0x4a, 0x5e, 0xfe, 0x8b, 0xdb, 0x68, 0x73, 0x48, 0xa2, 0x4c, 0x77, 0x57, 0xb9, + 0xf5, 0xe5, 0x6a, 0x75, 0x67, 0x38, 0x3d, 0x1d, 0xf9, 0xdd, 0xc6, 0xb7, 0x76, 0xe3, 0x65, 0xde, + 0xf6, 0xf4, 0x3d, 0xde, 0x87, 0x45, 0x12, 0x6f, 0xac, 0x2f, 0xf1, 0x92, 0xc7, 0xa4, 0xb0, 0xee, + 0x63, 0x52, 0x5c, 0xfa, 0x98, 0xfc, 0x8a, 0xee, 0x52, 0x29, 0x04, 0xa3, 0x70, 0x85, 0x66, 0x26, + 0xb8, 0xbd, 0xce, 0x04, 0xaf, 0x4d, 0x59, 0x26, 0x46, 0x7c, 0x84, 0x76, 0xcc, 0x31, 0x26, 0x03, + 0x64, 0xeb, 0xb6, 0x01, 0x62, 0x86, 0xc0, 0x78, 0x76, 0x1c, 0x5d, 0xbc, 0xba, 0x76, 0xac, 0xd7, + 0xd7, 0x8e, 0xf5, 0xcf, 0xb5, 0x63, 0xbd, 0xbd, 0x76, 0xac, 0x3f, 0x46, 0x8e, 0xfd, 0x72, 0xe4, + 0x58, 0xaf, 0x46, 0x8e, 0xfd, 0x7a, 0xe4, 0xd8, 0xff, 0x8e, 0x1c, 0xfb, 0xbf, 0x91, 0x63, 0xbd, + 0x1d, 0x39, 0xf6, 0x5f, 0x6f, 0x1c, 0xeb, 0x97, 0x7b, 0xfa, 0xc8, 0x5c, 0xe6, 0x6f, 0x7e, 0x73, + 0xf1, 0x1b, 0xde, 0xdb, 0x82, 0x9d, 0xbf, 0xf9, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x99, 0xf1, + 0xbe, 0xca, 0x08, 0x00, 0x00, } diff --git a/mixer/v1/config/client/client_config.proto b/mixer/v1/config/client/client_config.proto index f5dd514506..5e06b65823 100644 --- a/mixer/v1/config/client/client_config.proto +++ b/mixer/v1/config/client/client_config.proto @@ -79,6 +79,17 @@ message TransportConfig { // Specify refresh interval to write mixer client statistics to Envoy share // memory. If not specified, the interval is 10 seconds. google.protobuf.Duration stats_update_interval = 5; + + // Name of the cluster that will forward check calls to a pool of mixer + // servers. Defaults to "mixer_server". + string check_cluster = 6; + + // Name of the cluster that will forward report calls to a pool of mixer + // servers. Defaults to "mixer_server". By using different names for + // checkCluster and reportCluster, it is possible to have one set of + // mixer servers handle check calls, while another set of mixer servers + // handle report calls. + string report_cluster = 7; } // Defines the client config for HTTP. diff --git a/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html b/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html index 97310d08e4..103753ecbc 100644 --- a/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html +++ b/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html @@ -1150,6 +1150,27 @@

TransportConfig

Specify refresh interval to write mixer client statistics to Envoy share memory. If not specified, the interval is 10 seconds.

+ + + +checkCluster +string + +

Name of the cluster that will forward check calls to a pool of mixer +servers. Defaults to “mixer_server”.

+ + + + +reportCluster +string + +

Name of the cluster that will forward report calls to a pool of mixer +servers. Defaults to “mixer_server”. By using different names for +checkCluster and reportCluster, it is possible to have one set of +mixer servers handle check calls, while another set of mixer servers +handle report calls.

+ From fbbae367254b175aa9965401c429e7f3b22b6780 Mon Sep 17 00:00:00 2001 From: Shriram Rajagopalan Date: Mon, 5 Feb 2018 18:31:40 -0500 Subject: [PATCH 2/2] nits --- mixer/v1/config/client/client_config.pb.go | 11 ++++++++++- mixer/v1/config/client/client_config.proto | 11 ++++++++++- .../client/istio.mixer.v1.config.client.pb.html | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/mixer/v1/config/client/client_config.pb.go b/mixer/v1/config/client/client_config.pb.go index d312eed805..68cdb50db4 100644 --- a/mixer/v1/config/client/client_config.pb.go +++ b/mixer/v1/config/client/client_config.pb.go @@ -80,13 +80,22 @@ type TransportConfig struct { // memory. If not specified, the interval is 10 seconds. StatsUpdateInterval *google_protobuf1.Duration `protobuf:"bytes,5,opt,name=stats_update_interval,json=statsUpdateInterval" json:"stats_update_interval,omitempty"` // Name of the cluster that will forward check calls to a pool of mixer - // servers. Defaults to "mixer_server". + // servers. Defaults to "mixer_server". By using different names for + // checkCluster and reportCluster, it is possible to have one set of + // mixer servers handle check calls, while another set of mixer servers + // handle report calls. + // + // NOTE: Any value other than the default "mixer_server" will require the + // Istio Grafana dashboards to be reconfigured to use the new name. CheckCluster string `protobuf:"bytes,6,opt,name=check_cluster,json=checkCluster,proto3" json:"check_cluster,omitempty"` // Name of the cluster that will forward report calls to a pool of mixer // servers. Defaults to "mixer_server". By using different names for // checkCluster and reportCluster, it is possible to have one set of // mixer servers handle check calls, while another set of mixer servers // handle report calls. + // + // NOTE: Any value other than the default "mixer_server" will require the + // Istio Grafana dashboards to be reconfigured to use the new name. ReportCluster string `protobuf:"bytes,7,opt,name=report_cluster,json=reportCluster,proto3" json:"report_cluster,omitempty"` } diff --git a/mixer/v1/config/client/client_config.proto b/mixer/v1/config/client/client_config.proto index 5e06b65823..da43b782f0 100644 --- a/mixer/v1/config/client/client_config.proto +++ b/mixer/v1/config/client/client_config.proto @@ -81,7 +81,13 @@ message TransportConfig { google.protobuf.Duration stats_update_interval = 5; // Name of the cluster that will forward check calls to a pool of mixer - // servers. Defaults to "mixer_server". + // servers. Defaults to "mixer_server". By using different names for + // checkCluster and reportCluster, it is possible to have one set of + // mixer servers handle check calls, while another set of mixer servers + // handle report calls. + // + // NOTE: Any value other than the default "mixer_server" will require the + // Istio Grafana dashboards to be reconfigured to use the new name. string check_cluster = 6; // Name of the cluster that will forward report calls to a pool of mixer @@ -89,6 +95,9 @@ message TransportConfig { // checkCluster and reportCluster, it is possible to have one set of // mixer servers handle check calls, while another set of mixer servers // handle report calls. + // + // NOTE: Any value other than the default "mixer_server" will require the + // Istio Grafana dashboards to be reconfigured to use the new name. string report_cluster = 7; } diff --git a/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html b/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html index 103753ecbc..02ba599608 100644 --- a/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html +++ b/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html @@ -1157,7 +1157,13 @@

TransportConfig

string

Name of the cluster that will forward check calls to a pool of mixer -servers. Defaults to “mixer_server”.

+servers. Defaults to “mixer_server”. By using different names for +checkCluster and reportCluster, it is possible to have one set of +mixer servers handle check calls, while another set of mixer servers +handle report calls.

+ +

NOTE: Any value other than the default “mixer_server” will require the +Istio Grafana dashboards to be reconfigured to use the new name.

@@ -1171,6 +1177,9 @@

TransportConfig

mixer servers handle check calls, while another set of mixer servers handle report calls.

+

NOTE: Any value other than the default “mixer_server” will require the +Istio Grafana dashboards to be reconfigured to use the new name.

+