From 27cc899a44f4120c9674fc0ae68b7c621d95be5d Mon Sep 17 00:00:00 2001 From: Joey Bratton Date: Tue, 19 Feb 2019 23:25:44 -0500 Subject: [PATCH 1/3] Add envoy metrics service configuration to ProxyConfig Similar to the statsd sink config, this change is in preparation for adding support for the envoy metrics service API. --- mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 8 + mesh/v1alpha1/proxy.pb.go | 162 +++++++++++++------- mesh/v1alpha1/proxy.proto | 3 + python/istio_api/mesh/v1alpha1/proxy_pb2.py | 19 ++- 4 files changed, 131 insertions(+), 61 deletions(-) diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index da9c8d856c7..173185f40dc 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -964,6 +964,14 @@

ProxyConfig

Tracing configuration to be used by the proxy.

+ + + +metricsServiceAddress +string + +

Address of the Envoy Metrics Service implementation (e.g. metrics-service:15000).

+ diff --git a/mesh/v1alpha1/proxy.pb.go b/mesh/v1alpha1/proxy.pb.go index e5689b9b772..0d0ea10de47 100644 --- a/mesh/v1alpha1/proxy.pb.go +++ b/mesh/v1alpha1/proxy.pb.go @@ -331,6 +331,8 @@ type ProxyConfig struct { InterceptionMode ProxyConfig_InboundInterceptionMode `protobuf:"varint,18,opt,name=interception_mode,json=interceptionMode,proto3,enum=istio.mesh.v1alpha1.ProxyConfig_InboundInterceptionMode" json:"interception_mode,omitempty"` // Tracing configuration to be used by the proxy. Tracing *Tracing `protobuf:"bytes,19,opt,name=tracing" json:"tracing,omitempty"` + // Address of the Envoy Metrics Service implementation (e.g. metrics-service:15000). + MetricsServiceAddress string `protobuf:"bytes,20,opt,name=metrics_service_address,json=metricsServiceAddress,proto3" json:"metrics_service_address,omitempty"` } func (m *ProxyConfig) Reset() { *m = ProxyConfig{} } @@ -471,6 +473,13 @@ func (m *ProxyConfig) GetTracing() *Tracing { return nil } +func (m *ProxyConfig) GetMetricsServiceAddress() string { + if m != nil { + return m.MetricsServiceAddress + } + return "" +} + func init() { proto.RegisterType((*Tracing)(nil), "istio.mesh.v1alpha1.Tracing") proto.RegisterType((*Tracing_Zipkin)(nil), "istio.mesh.v1alpha1.Tracing.Zipkin") @@ -754,6 +763,14 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) { } i += n8 } + if len(m.MetricsServiceAddress) > 0 { + dAtA[i] = 0xa2 + i++ + dAtA[i] = 0x1 + i++ + i = encodeVarintProxy(dAtA, i, uint64(len(m.MetricsServiceAddress))) + i += copy(dAtA[i:], m.MetricsServiceAddress) + } return i, nil } @@ -898,6 +915,10 @@ func (m *ProxyConfig) Size() (n int) { l = m.Tracing.Size() n += 2 + l + sovProxy(uint64(l)) } + l = len(m.MetricsServiceAddress) + if l > 0 { + n += 2 + l + sovProxy(uint64(l)) + } return n } @@ -1814,6 +1835,35 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 20: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MetricsServiceAddress", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProxy + } + 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 ErrInvalidLengthProxy + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.MetricsServiceAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipProxy(dAtA[iNdEx:]) @@ -1943,59 +1993,61 @@ var ( func init() { proto.RegisterFile("mesh/v1alpha1/proxy.proto", fileDescriptorProxy) } var fileDescriptorProxy = []byte{ - // 862 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x5d, 0x6f, 0xe3, 0x44, - 0x14, 0xad, 0x97, 0xdd, 0x7c, 0xdc, 0xb4, 0xa9, 0x3b, 0x0b, 0x5d, 0x37, 0x82, 0x12, 0x8a, 0x04, - 0x59, 0x40, 0x8e, 0xb6, 0x2b, 0x21, 0x5e, 0x40, 0x24, 0x6d, 0x57, 0x8d, 0xd4, 0xed, 0x46, 0xae, - 0x2b, 0x41, 0x5f, 0x46, 0x13, 0xfb, 0x36, 0x1e, 0xad, 0x33, 0x63, 0x8d, 0xc7, 0x85, 0xec, 0x1b, - 0xfc, 0x34, 0x9e, 0x78, 0xe4, 0x27, 0xa0, 0x3e, 0xf1, 0x33, 0x90, 0x67, 0xec, 0x6c, 0x40, 0xdd, - 0xed, 0x5b, 0xe6, 0xcc, 0x39, 0x77, 0xce, 0x99, 0x3b, 0xd7, 0x81, 0xbd, 0x05, 0xe6, 0xc9, 0xf0, - 0xe6, 0x19, 0x4b, 0xb3, 0x84, 0x3d, 0x1b, 0x66, 0x4a, 0xfe, 0xba, 0xf4, 0x33, 0x25, 0xb5, 0x24, - 0x8f, 0x79, 0xae, 0xb9, 0xf4, 0x4b, 0x82, 0x5f, 0x13, 0x7a, 0xfb, 0x73, 0x29, 0xe7, 0x29, 0x0e, - 0x0d, 0x65, 0x56, 0x5c, 0x0f, 0xe3, 0x42, 0x31, 0xcd, 0xa5, 0xb0, 0xa2, 0x83, 0x3f, 0x1e, 0x40, - 0x33, 0x54, 0x2c, 0xe2, 0x62, 0x4e, 0xbe, 0x87, 0xc6, 0x1b, 0x9e, 0xbd, 0xe6, 0xc2, 0x73, 0xfa, - 0xce, 0xa0, 0x73, 0xf8, 0xb9, 0x7f, 0x47, 0x45, 0xbf, 0x62, 0xfb, 0x57, 0x86, 0x7a, 0xba, 0x11, - 0x54, 0x22, 0xf2, 0x02, 0xda, 0x29, 0x9f, 0x27, 0x3a, 0xd7, 0x98, 0x79, 0x0f, 0x4c, 0x85, 0x2f, - 0xde, 0x5b, 0xe1, 0xac, 0x66, 0x9f, 0x6e, 0x04, 0x6f, 0xa5, 0xbd, 0x03, 0x68, 0xd8, 0xda, 0xc4, - 0x83, 0x26, 0x8b, 0x63, 0x85, 0x79, 0x6e, 0x1c, 0xb5, 0x83, 0x7a, 0xd9, 0xfb, 0xcd, 0x81, 0xf6, - 0x4a, 0xfe, 0x6e, 0x1e, 0xf9, 0x0c, 0x36, 0x59, 0x14, 0x61, 0x9e, 0x53, 0x2d, 0x5f, 0xa3, 0x30, - 0xb6, 0xda, 0x41, 0xc7, 0x62, 0x61, 0x09, 0x91, 0x5d, 0x68, 0xe4, 0x18, 0x15, 0x0a, 0xbd, 0x0f, - 0xfa, 0xce, 0xa0, 0x15, 0x54, 0x2b, 0xf2, 0x29, 0x74, 0x22, 0x16, 0xa1, 0xd2, 0x34, 0x63, 0x3a, - 0xf1, 0x1e, 0x1a, 0x25, 0x58, 0x68, 0xca, 0x74, 0x32, 0x6e, 0x41, 0x43, 0xab, 0x72, 0x79, 0xf0, - 0x7b, 0x1b, 0x3a, 0xd3, 0xb2, 0x13, 0x47, 0x52, 0x5c, 0xf3, 0xb9, 0x91, 0x9a, 0x5f, 0x56, 0xea, - 0x54, 0x52, 0x03, 0x95, 0xd2, 0x92, 0x30, 0xe3, 0x82, 0xa9, 0xa5, 0x25, 0x58, 0x57, 0x60, 0x21, - 0x43, 0xf8, 0x12, 0xb6, 0x73, 0x54, 0x37, 0x3c, 0x42, 0x1a, 0xa5, 0x45, 0xae, 0x51, 0x19, 0x77, - 0xed, 0xa0, 0x5b, 0xc1, 0x47, 0x16, 0x25, 0x3f, 0x42, 0x37, 0x56, 0x8c, 0x0b, 0x5a, 0xf7, 0xd5, - 0x18, 0xed, 0x1c, 0xee, 0xf9, 0xb6, 0xf1, 0x7e, 0xdd, 0x78, 0xff, 0xb8, 0x22, 0x04, 0x5b, 0x46, - 0x50, 0x2f, 0xc9, 0x05, 0x78, 0x19, 0x53, 0x28, 0x34, 0xcd, 0x93, 0x42, 0xc7, 0xf2, 0x97, 0xb5, - 0x5a, 0x8f, 0xee, 0xab, 0xb5, 0x6b, 0xa5, 0x17, 0x95, 0x72, 0x55, 0xf4, 0x6b, 0xd8, 0x89, 0x79, - 0x1e, 0xc9, 0x1b, 0x54, 0x4b, 0x5a, 0xf7, 0xa6, 0x61, 0x12, 0xb8, 0xab, 0x8d, 0x51, 0xd5, 0xa4, - 0x4b, 0x78, 0xf2, 0x96, 0xac, 0xf0, 0x5a, 0x61, 0x9e, 0xd0, 0x18, 0x53, 0xb6, 0xf4, 0x9a, 0xf7, - 0x18, 0x18, 0x3f, 0xf0, 0x9c, 0xe0, 0xa3, 0x95, 0x3a, 0xb0, 0xe2, 0xe3, 0x52, 0x4b, 0x9e, 0x42, - 0xd7, 0xbe, 0xcc, 0x95, 0x81, 0x56, 0x69, 0xc0, 0x48, 0xb6, 0xec, 0x4e, 0xed, 0x60, 0x0c, 0xdb, - 0x91, 0x14, 0x02, 0x23, 0x4d, 0x35, 0x5f, 0xa0, 0x2c, 0xb4, 0xd7, 0xbe, 0x2f, 0x7a, 0xb7, 0x52, - 0x84, 0x56, 0x40, 0xbe, 0x01, 0x92, 0x6b, 0xa6, 0xf3, 0x98, 0x16, 0x71, 0xb6, 0x3a, 0x12, 0x6c, - 0x66, 0xbb, 0x73, 0x19, 0x67, 0xf5, 0x89, 0x03, 0x70, 0xcd, 0xec, 0x52, 0x16, 0x2f, 0xb8, 0xa0, - 0x99, 0x54, 0xda, 0xeb, 0xf4, 0x9d, 0xc1, 0xa3, 0xa0, 0x6b, 0xf0, 0x51, 0x09, 0x4f, 0xa5, 0xd2, - 0x64, 0x08, 0x3b, 0xec, 0x86, 0xf1, 0x94, 0xcd, 0x78, 0xca, 0xf5, 0x92, 0xbe, 0x91, 0x02, 0xbd, - 0xcd, 0x55, 0x12, 0x77, 0x7d, 0xf3, 0x4a, 0x0a, 0x24, 0x31, 0xec, 0x45, 0x52, 0x68, 0x25, 0x53, - 0x9a, 0xa5, 0x4c, 0x20, 0x65, 0x85, 0x4e, 0x68, 0x26, 0x53, 0x1e, 0x2d, 0xbd, 0xad, 0xbe, 0x33, - 0xe8, 0x1e, 0x3e, 0xbd, 0x73, 0x2e, 0x47, 0x85, 0x4e, 0x50, 0x68, 0x1e, 0x99, 0x80, 0x53, 0x23, - 0x08, 0x76, 0xab, 0x5a, 0xd3, 0xb2, 0x54, 0xc9, 0xb0, 0x78, 0x19, 0x37, 0x2a, 0x72, 0x2d, 0x17, - 0xb4, 0x7a, 0xea, 0xd7, 0x3c, 0x45, 0xaf, 0x6b, 0xe3, 0xda, 0x1d, 0x3b, 0x0d, 0x2f, 0x78, 0x8a, - 0x65, 0xdc, 0xf2, 0x0a, 0xa8, 0x60, 0x0b, 0xa4, 0x29, 0x8a, 0xb9, 0x4e, 0xbc, 0x6d, 0x1b, 0xb7, - 0xc4, 0xcf, 0xd9, 0x02, 0xcf, 0x0c, 0x4a, 0xfa, 0x66, 0x76, 0xa2, 0x42, 0x29, 0x14, 0xd1, 0xd2, - 0x73, 0x0d, 0x69, 0x1d, 0x22, 0x23, 0xf8, 0xc4, 0x5e, 0xdd, 0x4c, 0x4a, 0x9d, 0x6b, 0xc5, 0x32, - 0xaa, 0x71, 0x91, 0xa5, 0x4c, 0xa3, 0x1d, 0xa7, 0x1d, 0x63, 0xa2, 0x67, 0x48, 0xe3, 0x9a, 0x13, - 0x56, 0x14, 0x33, 0x5e, 0x08, 0x3b, 0x5c, 0x68, 0x54, 0x11, 0x66, 0x65, 0x54, 0xba, 0x90, 0x31, - 0x7a, 0xc4, 0x5c, 0xcd, 0x77, 0x77, 0x5e, 0xcd, 0xda, 0x74, 0xfb, 0x13, 0x31, 0x93, 0x85, 0x88, - 0x27, 0x6b, 0x05, 0x5e, 0xca, 0x18, 0x03, 0x97, 0xff, 0x0f, 0x21, 0xdf, 0x42, 0x53, 0xdb, 0x6f, - 0x9d, 0xf7, 0xd8, 0x3c, 0xa7, 0x8f, 0xdf, 0xf7, 0x3d, 0x0c, 0x6a, 0xf2, 0xc1, 0x73, 0x78, 0xf2, - 0x8e, 0x43, 0xc8, 0x26, 0xb4, 0x82, 0x93, 0xe3, 0x49, 0x70, 0x72, 0x14, 0xba, 0x1b, 0x04, 0xa0, - 0x11, 0x4e, 0x83, 0x57, 0x3f, 0xfd, 0xec, 0x3a, 0x5f, 0xfd, 0x00, 0x1f, 0xde, 0xd5, 0x40, 0xd2, - 0x82, 0x87, 0xe7, 0xaf, 0xce, 0x4f, 0xdc, 0x0d, 0xd2, 0x05, 0x78, 0x79, 0x19, 0x5e, 0x8e, 0xce, - 0x68, 0x78, 0x76, 0xe1, 0x3a, 0x64, 0x13, 0x9a, 0x93, 0xf3, 0xd3, 0x93, 0x60, 0x12, 0xba, 0xff, - 0x34, 0xc7, 0x83, 0x3f, 0x6f, 0xf7, 0x9d, 0xbf, 0x6e, 0xf7, 0x9d, 0xbf, 0x6f, 0xf7, 0x9d, 0xab, - 0x9e, 0x35, 0xca, 0xe5, 0x90, 0x65, 0x7c, 0xf8, 0x9f, 0x3f, 0x9d, 0x59, 0xc3, 0x0c, 0xc3, 0xf3, - 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x65, 0xf7, 0xfe, 0xe0, 0x8c, 0x06, 0x00, 0x00, + // 887 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x4d, 0x6f, 0xdb, 0x46, + 0x10, 0x35, 0xdd, 0x44, 0x1f, 0x23, 0x5b, 0xa6, 0x37, 0x89, 0x4d, 0x0b, 0xad, 0xab, 0xba, 0x40, + 0xab, 0xb4, 0x05, 0x85, 0x38, 0x40, 0xd0, 0x4b, 0x8b, 0x4a, 0xb6, 0x03, 0x0b, 0x70, 0x1c, 0x81, + 0x96, 0x81, 0xd6, 0x97, 0xc5, 0x8a, 0x1c, 0x8b, 0x8b, 0x50, 0xbb, 0xc4, 0x72, 0xe9, 0x56, 0xb9, + 0xf5, 0x6f, 0xf5, 0xd8, 0x53, 0x8f, 0xfd, 0x09, 0x85, 0x4f, 0xfd, 0x19, 0x05, 0x77, 0x49, 0x45, + 0x0d, 0x9c, 0xf8, 0xa6, 0x7d, 0xf3, 0xde, 0x70, 0xde, 0xce, 0xcc, 0x0a, 0xf6, 0xe6, 0x98, 0xc5, + 0xfd, 0x9b, 0x67, 0x2c, 0x49, 0x63, 0xf6, 0xac, 0x9f, 0x2a, 0xf9, 0xdb, 0xc2, 0x4f, 0x95, 0xd4, + 0x92, 0x3c, 0xe2, 0x99, 0xe6, 0xd2, 0x2f, 0x08, 0x7e, 0x45, 0xe8, 0xec, 0xcf, 0xa4, 0x9c, 0x25, + 0xd8, 0x37, 0x94, 0x69, 0x7e, 0xdd, 0x8f, 0x72, 0xc5, 0x34, 0x97, 0xc2, 0x8a, 0x0e, 0xfe, 0x5c, + 0x87, 0xfa, 0x44, 0xb1, 0x90, 0x8b, 0x19, 0xf9, 0x01, 0x6a, 0x6f, 0x79, 0xfa, 0x86, 0x0b, 0xcf, + 0xe9, 0x3a, 0xbd, 0xd6, 0xe1, 0x97, 0xfe, 0x1d, 0x19, 0xfd, 0x92, 0xed, 0x5f, 0x19, 0xea, 0xe9, + 0x5a, 0x50, 0x8a, 0xc8, 0x4b, 0x68, 0x26, 0x7c, 0x16, 0xeb, 0x4c, 0x63, 0xea, 0xad, 0x9b, 0x0c, + 0x5f, 0x7d, 0x34, 0xc3, 0x59, 0xc5, 0x3e, 0x5d, 0x0b, 0xde, 0x49, 0x3b, 0x07, 0x50, 0xb3, 0xb9, + 0x89, 0x07, 0x75, 0x16, 0x45, 0x0a, 0xb3, 0xcc, 0x54, 0xd4, 0x0c, 0xaa, 0x63, 0xe7, 0x77, 0x07, + 0x9a, 0x4b, 0xf9, 0x87, 0x79, 0xe4, 0x0b, 0xd8, 0x60, 0x61, 0x88, 0x59, 0x46, 0xb5, 0x7c, 0x83, + 0xc2, 0x94, 0xd5, 0x0c, 0x5a, 0x16, 0x9b, 0x14, 0x10, 0xd9, 0x81, 0x5a, 0x86, 0x61, 0xae, 0xd0, + 0xfb, 0xa4, 0xeb, 0xf4, 0x1a, 0x41, 0x79, 0x22, 0x9f, 0x43, 0x2b, 0x64, 0x21, 0x2a, 0x4d, 0x53, + 0xa6, 0x63, 0xef, 0x81, 0x51, 0x82, 0x85, 0xc6, 0x4c, 0xc7, 0xc3, 0x06, 0xd4, 0xb4, 0x2a, 0x8e, + 0x07, 0x7f, 0x34, 0xa1, 0x35, 0x2e, 0x3a, 0x71, 0x24, 0xc5, 0x35, 0x9f, 0x19, 0xa9, 0xf9, 0x65, + 0xa5, 0x4e, 0x29, 0x35, 0x50, 0x21, 0x2d, 0x08, 0x53, 0x2e, 0x98, 0x5a, 0x58, 0x82, 0xad, 0x0a, + 0x2c, 0x64, 0x08, 0x5f, 0xc3, 0x56, 0x86, 0xea, 0x86, 0x87, 0x48, 0xc3, 0x24, 0xcf, 0x34, 0x2a, + 0x53, 0x5d, 0x33, 0x68, 0x97, 0xf0, 0x91, 0x45, 0xc9, 0x4f, 0xd0, 0x8e, 0x14, 0xe3, 0x82, 0x56, + 0x7d, 0x35, 0x85, 0xb6, 0x0e, 0xf7, 0x7c, 0xdb, 0x78, 0xbf, 0x6a, 0xbc, 0x7f, 0x5c, 0x12, 0x82, + 0x4d, 0x23, 0xa8, 0x8e, 0xe4, 0x02, 0xbc, 0x94, 0x29, 0x14, 0x9a, 0x66, 0x71, 0xae, 0x23, 0xf9, + 0xeb, 0x4a, 0xae, 0x87, 0xf7, 0xe5, 0xda, 0xb1, 0xd2, 0x8b, 0x52, 0xb9, 0x4c, 0xfa, 0x2d, 0x6c, + 0x47, 0x3c, 0x0b, 0xe5, 0x0d, 0xaa, 0x05, 0xad, 0x7a, 0x53, 0x33, 0x0e, 0xdc, 0x65, 0x60, 0x50, + 0x36, 0xe9, 0x12, 0x76, 0xdf, 0x91, 0x15, 0x5e, 0x2b, 0xcc, 0x62, 0x1a, 0x61, 0xc2, 0x16, 0x5e, + 0xfd, 0x9e, 0x02, 0x86, 0xeb, 0x9e, 0x13, 0x3c, 0x59, 0xaa, 0x03, 0x2b, 0x3e, 0x2e, 0xb4, 0xe4, + 0x29, 0xb4, 0xed, 0x64, 0x2e, 0x0b, 0x68, 0x14, 0x05, 0x18, 0xc9, 0xa6, 0x8d, 0x54, 0x15, 0x0c, + 0x61, 0x2b, 0x94, 0x42, 0x60, 0xa8, 0xa9, 0xe6, 0x73, 0x94, 0xb9, 0xf6, 0x9a, 0xf7, 0x59, 0x6f, + 0x97, 0x8a, 0x89, 0x15, 0x90, 0xef, 0x80, 0x64, 0x9a, 0xe9, 0x2c, 0xa2, 0x79, 0x94, 0x2e, 0x3f, + 0x09, 0xd6, 0xb3, 0x8d, 0x5c, 0x46, 0x69, 0xf5, 0xc5, 0x1e, 0xb8, 0x66, 0x77, 0x29, 0x8b, 0xe6, + 0x5c, 0xd0, 0x54, 0x2a, 0xed, 0xb5, 0xba, 0x4e, 0xef, 0x61, 0xd0, 0x36, 0xf8, 0xa0, 0x80, 0xc7, + 0x52, 0x69, 0xd2, 0x87, 0x6d, 0x76, 0xc3, 0x78, 0xc2, 0xa6, 0x3c, 0xe1, 0x7a, 0x41, 0xdf, 0x4a, + 0x81, 0xde, 0xc6, 0xd2, 0x89, 0xbb, 0x1a, 0xbc, 0x92, 0x02, 0x49, 0x04, 0x7b, 0xa1, 0x14, 0x5a, + 0xc9, 0x84, 0xa6, 0x09, 0x13, 0x48, 0x59, 0xae, 0x63, 0x9a, 0xca, 0x84, 0x87, 0x0b, 0x6f, 0xb3, + 0xeb, 0xf4, 0xda, 0x87, 0x4f, 0xef, 0xdc, 0xcb, 0x41, 0xae, 0x63, 0x14, 0x9a, 0x87, 0xc6, 0xe0, + 0xd8, 0x08, 0x82, 0x9d, 0x32, 0xd7, 0xb8, 0x48, 0x55, 0x30, 0x2c, 0x5e, 0xd8, 0x0d, 0xf3, 0x4c, + 0xcb, 0x39, 0x2d, 0x47, 0xfd, 0x9a, 0x27, 0xe8, 0xb5, 0xad, 0x5d, 0x1b, 0xb1, 0xdb, 0xf0, 0x92, + 0x27, 0x58, 0xd8, 0x2d, 0xae, 0x80, 0x0a, 0x36, 0x47, 0x9a, 0xa0, 0x98, 0xe9, 0xd8, 0xdb, 0xb2, + 0x76, 0x0b, 0xfc, 0x9c, 0xcd, 0xf1, 0xcc, 0xa0, 0xa4, 0x6b, 0x76, 0x27, 0xcc, 0x95, 0x42, 0x11, + 0x2e, 0x3c, 0xd7, 0x90, 0x56, 0x21, 0x32, 0x80, 0xcf, 0xec, 0xd5, 0x4d, 0xa5, 0xd4, 0x99, 0x56, + 0x2c, 0xa5, 0x1a, 0xe7, 0x69, 0xc2, 0x34, 0xda, 0x75, 0xda, 0x36, 0x45, 0x74, 0x0c, 0x69, 0x58, + 0x71, 0x26, 0x25, 0xc5, 0xac, 0x17, 0xc2, 0x36, 0x17, 0x1a, 0x55, 0x88, 0x69, 0x61, 0x95, 0xce, + 0x65, 0x84, 0x1e, 0x31, 0x57, 0xf3, 0xfd, 0x9d, 0x57, 0xb3, 0xb2, 0xdd, 0xfe, 0x48, 0x4c, 0x65, + 0x2e, 0xa2, 0xd1, 0x4a, 0x82, 0x57, 0x32, 0xc2, 0xc0, 0xe5, 0xef, 0x21, 0xe4, 0x05, 0xd4, 0xb5, + 0x7d, 0xeb, 0xbc, 0x47, 0x66, 0x9c, 0x3e, 0xfd, 0xd8, 0x7b, 0x18, 0x54, 0x64, 0xf2, 0x02, 0x76, + 0xe7, 0xa8, 0x15, 0x0f, 0x33, 0x5a, 0xbd, 0x02, 0xd5, 0x3c, 0x3d, 0x36, 0xde, 0x9e, 0x94, 0xe1, + 0x0b, 0x1b, 0x2d, 0x87, 0xea, 0xe0, 0x39, 0xec, 0x7e, 0xa0, 0x38, 0xb2, 0x01, 0x8d, 0xe0, 0xe4, + 0x78, 0x14, 0x9c, 0x1c, 0x4d, 0xdc, 0x35, 0x02, 0x50, 0x9b, 0x8c, 0x83, 0xd7, 0x3f, 0xff, 0xe2, + 0x3a, 0xdf, 0xfc, 0x08, 0x8f, 0xef, 0x6a, 0x3c, 0x69, 0xc0, 0x83, 0xf3, 0xd7, 0xe7, 0x27, 0xee, + 0x1a, 0x69, 0x03, 0xbc, 0xba, 0x9c, 0x5c, 0x0e, 0xce, 0xe8, 0xe4, 0xec, 0xc2, 0x75, 0xc8, 0x06, + 0xd4, 0x47, 0xe7, 0xa7, 0x27, 0xc1, 0x68, 0xe2, 0xfe, 0x5b, 0x1f, 0xf6, 0xfe, 0xba, 0xdd, 0x77, + 0xfe, 0xbe, 0xdd, 0x77, 0xfe, 0xb9, 0xdd, 0x77, 0xae, 0x3a, 0xd6, 0x20, 0x97, 0x7d, 0x96, 0xf2, + 0xfe, 0xff, 0xfe, 0xac, 0xa6, 0x35, 0xb3, 0x44, 0xcf, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x16, + 0x7e, 0xb4, 0xcf, 0xc4, 0x06, 0x00, 0x00, } diff --git a/mesh/v1alpha1/proxy.proto b/mesh/v1alpha1/proxy.proto index fcdd14defcc..3c45887118e 100644 --- a/mesh/v1alpha1/proxy.proto +++ b/mesh/v1alpha1/proxy.proto @@ -164,4 +164,7 @@ message ProxyConfig { // Tracing configuration to be used by the proxy. Tracing tracing = 19; + + // Address of the Envoy Metrics Service implementation (e.g. metrics-service:15000). + string metrics_service_address = 20; } diff --git a/python/istio_api/mesh/v1alpha1/proxy_pb2.py b/python/istio_api/mesh/v1alpha1/proxy_pb2.py index faff41274d0..e3c3e31a54b 100644 --- a/python/istio_api/mesh/v1alpha1/proxy_pb2.py +++ b/python/istio_api/mesh/v1alpha1/proxy_pb2.py @@ -21,7 +21,7 @@ name='mesh/v1alpha1/proxy.proto', package='istio.mesh.v1alpha1', syntax='proto3', - serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\"\xfb\x01\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1aW\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x12\x0e\n\x06secure\x18\x03 \x01(\x08\x12\x13\n\x0b\x63\x61\x63\x65rt_path\x18\x04 \x01(\tB\x08\n\x06tracer\"\xb9\x06\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x32\n\x0f\x63onnect_timeout\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x13\n\x0b\x63oncurrency\x18\x10 \x01(\x05\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') + serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\"\xfb\x01\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1aW\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x12\x0e\n\x06secure\x18\x03 \x01(\x08\x12\x13\n\x0b\x63\x61\x63\x65rt_path\x18\x04 \x01(\tB\x08\n\x06tracer\"\xda\x06\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x32\n\x0f\x63onnect_timeout\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x13\n\x0b\x63oncurrency\x18\x10 \x01(\x05\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\x12\x1f\n\x17metrics_service_address\x18\x14 \x01(\t\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,]) @@ -46,8 +46,8 @@ ], containing_type=None, options=None, - serialized_start=1164, - serialized_end=1226, + serialized_start=1197, + serialized_end=1259, ) _sym_db.RegisterEnumDescriptor(_AUTHENTICATIONPOLICY) @@ -74,8 +74,8 @@ ], containing_type=None, options=None, - serialized_start=1111, - serialized_end=1162, + serialized_start=1144, + serialized_end=1195, ) _sym_db.RegisterEnumDescriptor(_PROXYCONFIG_INBOUNDINTERCEPTIONMODE) @@ -342,6 +342,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='metrics_service_address', full_name='istio.mesh.v1alpha1.ProxyConfig.metrics_service_address', index=19, + number=20, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -356,7 +363,7 @@ oneofs=[ ], serialized_start=337, - serialized_end=1162, + serialized_end=1195, ) _TRACING_ZIPKIN.containing_type = _TRACING From 5d461956226070f890cb827067ce0d4895ba187d Mon Sep 17 00:00:00 2001 From: Joey Bratton Date: Tue, 19 Feb 2019 23:32:56 -0500 Subject: [PATCH 2/3] Update proto.lock --- proto.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proto.lock b/proto.lock index f4c207dcf90..6c0983e4dea 100644 --- a/proto.lock +++ b/proto.lock @@ -1355,6 +1355,11 @@ "id": 19, "name": "tracing", "type": "Tracing" + }, + { + "id": 20, + "name": "metrics_service_address", + "type": "string" } ] } From b34d8a2ee0eafee4a46bb61d707e54b5355880fe Mon Sep 17 00:00:00 2001 From: Joey Bratton Date: Wed, 20 Feb 2019 14:51:20 -0500 Subject: [PATCH 3/3] Reorder metrics_service_address just after statsd_udp_address --- mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 16 +++++----- mesh/v1alpha1/proxy.pb.go | 18 +++++------ mesh/v1alpha1/proxy.proto | 6 ++-- proto.lock | 10 +++--- python/istio_api/mesh/v1alpha1/proxy_pb2.py | 34 ++++++++++----------- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index 173185f40dc..6e878900bd5 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -894,6 +894,14 @@

ProxyConfig

IP Address and Port of a statsd UDP listener (e.g. 10.75.241.127:9125).

+ + + +metricsServiceAddress +string + +

Address of the Envoy Metrics Service implementation (e.g. metrics-service:15000).

+ @@ -964,14 +972,6 @@

ProxyConfig

Tracing configuration to be used by the proxy.

- - - -metricsServiceAddress -string - -

Address of the Envoy Metrics Service implementation (e.g. metrics-service:15000).

- diff --git a/mesh/v1alpha1/proxy.pb.go b/mesh/v1alpha1/proxy.pb.go index 0d0ea10de47..4832ae50a59 100644 --- a/mesh/v1alpha1/proxy.pb.go +++ b/mesh/v1alpha1/proxy.pb.go @@ -307,6 +307,8 @@ type ProxyConfig struct { ConnectTimeout *google_protobuf.Duration `protobuf:"bytes,9,opt,name=connect_timeout,json=connectTimeout" json:"connect_timeout,omitempty"` // IP Address and Port of a statsd UDP listener (e.g. _10.75.241.127:9125_). StatsdUdpAddress string `protobuf:"bytes,10,opt,name=statsd_udp_address,json=statsdUdpAddress,proto3" json:"statsd_udp_address,omitempty"` + // Address of the Envoy Metrics Service implementation (e.g. metrics-service:15000). + MetricsServiceAddress string `protobuf:"bytes,20,opt,name=metrics_service_address,json=metricsServiceAddress,proto3" json:"metrics_service_address,omitempty"` // Port on which Envoy should listen for administrative commands. ProxyAdminPort int32 `protobuf:"varint,11,opt,name=proxy_admin_port,json=proxyAdminPort,proto3" json:"proxy_admin_port,omitempty"` // $hide_from_docs @@ -331,8 +333,6 @@ type ProxyConfig struct { InterceptionMode ProxyConfig_InboundInterceptionMode `protobuf:"varint,18,opt,name=interception_mode,json=interceptionMode,proto3,enum=istio.mesh.v1alpha1.ProxyConfig_InboundInterceptionMode" json:"interception_mode,omitempty"` // Tracing configuration to be used by the proxy. Tracing *Tracing `protobuf:"bytes,19,opt,name=tracing" json:"tracing,omitempty"` - // Address of the Envoy Metrics Service implementation (e.g. metrics-service:15000). - MetricsServiceAddress string `protobuf:"bytes,20,opt,name=metrics_service_address,json=metricsServiceAddress,proto3" json:"metrics_service_address,omitempty"` } func (m *ProxyConfig) Reset() { *m = ProxyConfig{} } @@ -410,6 +410,13 @@ func (m *ProxyConfig) GetStatsdUdpAddress() string { return "" } +func (m *ProxyConfig) GetMetricsServiceAddress() string { + if m != nil { + return m.MetricsServiceAddress + } + return "" +} + func (m *ProxyConfig) GetProxyAdminPort() int32 { if m != nil { return m.ProxyAdminPort @@ -473,13 +480,6 @@ func (m *ProxyConfig) GetTracing() *Tracing { return nil } -func (m *ProxyConfig) GetMetricsServiceAddress() string { - if m != nil { - return m.MetricsServiceAddress - } - return "" -} - func init() { proto.RegisterType((*Tracing)(nil), "istio.mesh.v1alpha1.Tracing") proto.RegisterType((*Tracing_Zipkin)(nil), "istio.mesh.v1alpha1.Tracing.Zipkin") diff --git a/mesh/v1alpha1/proxy.proto b/mesh/v1alpha1/proxy.proto index 3c45887118e..d1e4d22c8e4 100644 --- a/mesh/v1alpha1/proxy.proto +++ b/mesh/v1alpha1/proxy.proto @@ -119,6 +119,9 @@ message ProxyConfig { // IP Address and Port of a statsd UDP listener (e.g. _10.75.241.127:9125_). string statsd_udp_address = 10; + // Address of the Envoy Metrics Service implementation (e.g. metrics-service:15000). + string metrics_service_address = 20; + // Port on which Envoy should listen for administrative commands. int32 proxy_admin_port = 11; @@ -164,7 +167,4 @@ message ProxyConfig { // Tracing configuration to be used by the proxy. Tracing tracing = 19; - - // Address of the Envoy Metrics Service implementation (e.g. metrics-service:15000). - string metrics_service_address = 20; } diff --git a/proto.lock b/proto.lock index 6c0983e4dea..c48ead92d37 100644 --- a/proto.lock +++ b/proto.lock @@ -1311,6 +1311,11 @@ "name": "statsd_udp_address", "type": "string" }, + { + "id": 20, + "name": "metrics_service_address", + "type": "string" + }, { "id": 11, "name": "proxy_admin_port", @@ -1355,11 +1360,6 @@ "id": 19, "name": "tracing", "type": "Tracing" - }, - { - "id": 20, - "name": "metrics_service_address", - "type": "string" } ] } diff --git a/python/istio_api/mesh/v1alpha1/proxy_pb2.py b/python/istio_api/mesh/v1alpha1/proxy_pb2.py index e3c3e31a54b..dfd3b34a77f 100644 --- a/python/istio_api/mesh/v1alpha1/proxy_pb2.py +++ b/python/istio_api/mesh/v1alpha1/proxy_pb2.py @@ -21,7 +21,7 @@ name='mesh/v1alpha1/proxy.proto', package='istio.mesh.v1alpha1', syntax='proto3', - serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\"\xfb\x01\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1aW\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x12\x0e\n\x06secure\x18\x03 \x01(\x08\x12\x13\n\x0b\x63\x61\x63\x65rt_path\x18\x04 \x01(\tB\x08\n\x06tracer\"\xda\x06\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x32\n\x0f\x63onnect_timeout\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x13\n\x0b\x63oncurrency\x18\x10 \x01(\x05\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\x12\x1f\n\x17metrics_service_address\x18\x14 \x01(\t\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') + serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\"\xfb\x01\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1aW\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x12\x0e\n\x06secure\x18\x03 \x01(\x08\x12\x13\n\x0b\x63\x61\x63\x65rt_path\x18\x04 \x01(\tB\x08\n\x06tracer\"\xda\x06\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x32\n\x0f\x63onnect_timeout\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12\x1f\n\x17metrics_service_address\x18\x14 \x01(\t\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x13\n\x0b\x63oncurrency\x18\x10 \x01(\x05\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,]) @@ -280,75 +280,75 @@ is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='proxy_admin_port', full_name='istio.mesh.v1alpha1.ProxyConfig.proxy_admin_port', index=10, + name='metrics_service_address', full_name='istio.mesh.v1alpha1.ProxyConfig.metrics_service_address', index=10, + number=20, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='proxy_admin_port', full_name='istio.mesh.v1alpha1.ProxyConfig.proxy_admin_port', index=11, number=11, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='availability_zone', full_name='istio.mesh.v1alpha1.ProxyConfig.availability_zone', index=11, + name='availability_zone', full_name='istio.mesh.v1alpha1.ProxyConfig.availability_zone', index=12, number=12, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='control_plane_auth_policy', full_name='istio.mesh.v1alpha1.ProxyConfig.control_plane_auth_policy', index=12, + name='control_plane_auth_policy', full_name='istio.mesh.v1alpha1.ProxyConfig.control_plane_auth_policy', index=13, number=13, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='custom_config_file', full_name='istio.mesh.v1alpha1.ProxyConfig.custom_config_file', index=13, + name='custom_config_file', full_name='istio.mesh.v1alpha1.ProxyConfig.custom_config_file', index=14, number=14, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='stat_name_length', full_name='istio.mesh.v1alpha1.ProxyConfig.stat_name_length', index=14, + name='stat_name_length', full_name='istio.mesh.v1alpha1.ProxyConfig.stat_name_length', index=15, number=15, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='concurrency', full_name='istio.mesh.v1alpha1.ProxyConfig.concurrency', index=15, + name='concurrency', full_name='istio.mesh.v1alpha1.ProxyConfig.concurrency', index=16, number=16, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='proxy_bootstrap_template_path', full_name='istio.mesh.v1alpha1.ProxyConfig.proxy_bootstrap_template_path', index=16, + name='proxy_bootstrap_template_path', full_name='istio.mesh.v1alpha1.ProxyConfig.proxy_bootstrap_template_path', index=17, number=17, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='interception_mode', full_name='istio.mesh.v1alpha1.ProxyConfig.interception_mode', index=17, + name='interception_mode', full_name='istio.mesh.v1alpha1.ProxyConfig.interception_mode', index=18, number=18, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='tracing', full_name='istio.mesh.v1alpha1.ProxyConfig.tracing', index=18, + name='tracing', full_name='istio.mesh.v1alpha1.ProxyConfig.tracing', index=19, number=19, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='metrics_service_address', full_name='istio.mesh.v1alpha1.ProxyConfig.metrics_service_address', index=19, - number=20, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), ], extensions=[ ],