diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go index b277a4bc83..8bfc44c33c 100644 --- a/mesh/v1alpha1/config.pb.go +++ b/mesh/v1alpha1/config.pb.go @@ -116,6 +116,9 @@ type MeshConfig struct { // File address for the proxy access log (e.g. /dev/stdout). // Empty value disables access logging. AccessLogFile string `protobuf:"bytes,13,opt,name=access_log_file,json=accessLogFile,proto3" json:"access_log_file,omitempty"` + // Format for the proxy access log (text or json). + // Default value is text. + AccessLogFormat string `protobuf:"bytes,24,opt,name=access_log_format,json=accessLogFormat,proto3" json:"access_log_format,omitempty"` // Default proxy config used by the proxy injection mechanism operating in the mesh // (e.g. Kubernetes admission controller) // In case of Kubernetes, the proxy config is applied once during the injection process, @@ -219,6 +222,13 @@ func (m *MeshConfig) GetAccessLogFile() string { return "" } +func (m *MeshConfig) GetAccessLogFormat() string { + if m != nil { + return m.AccessLogFormat + } + return "" +} + func (m *MeshConfig) GetDefaultConfig() *ProxyConfig { if m != nil { return m.DefaultConfig @@ -398,6 +408,14 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { } i++ } + if len(m.AccessLogFormat) > 0 { + dAtA[i] = 0xc2 + i++ + dAtA[i] = 0x1 + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.AccessLogFormat))) + i += copy(dAtA[i:], m.AccessLogFormat) + } return i, nil } @@ -470,6 +488,10 @@ func (m *MeshConfig) Size() (n int) { if m.EnableSdsTokenMount { n += 3 } + l = len(m.AccessLogFormat) + if l > 0 { + n += 2 + l + sovConfig(uint64(l)) + } return n } @@ -921,6 +943,35 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } } m.EnableSdsTokenMount = bool(v != 0) + case 24: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AccessLogFormat", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + 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 ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AccessLogFormat = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipConfig(dAtA[iNdEx:]) @@ -1050,47 +1101,47 @@ var ( func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptorConfig) } var fileDescriptorConfig = []byte{ - // 657 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x5f, 0x4f, 0xdb, 0x3e, - 0x14, 0xfd, 0x05, 0x02, 0x0d, 0xee, 0xbf, 0xd4, 0xfd, 0x15, 0x4c, 0x7f, 0x52, 0x7f, 0x11, 0xd3, - 0xb6, 0x6a, 0x9a, 0x52, 0x01, 0xda, 0xc3, 0x1e, 0xa1, 0xac, 0x1b, 0x11, 0x68, 0x55, 0x5a, 0x5e, - 0xf6, 0x62, 0x85, 0xd8, 0x4d, 0x2c, 0xdc, 0x38, 0x8a, 0x5d, 0x04, 0xdf, 0x6b, 0x1f, 0x62, 0x8f, - 0xfb, 0x08, 0x13, 0x9f, 0x64, 0x8a, 0x9d, 0xb2, 0x21, 0xf5, 0xf5, 0x9c, 0x73, 0xef, 0x3d, 0x3e, - 0xf7, 0x1a, 0xf4, 0x97, 0x54, 0xa6, 0xa3, 0xfb, 0xe3, 0x88, 0xe7, 0x69, 0x74, 0x3c, 0x8a, 0x45, - 0xb6, 0x60, 0x89, 0x9f, 0x17, 0x42, 0x09, 0xd8, 0x65, 0x52, 0x31, 0xe1, 0x97, 0x0a, 0x7f, 0xad, - 0xe8, 0x0f, 0x12, 0x21, 0x12, 0x4e, 0x47, 0x5a, 0x72, 0xbb, 0x5a, 0x8c, 0xc8, 0xaa, 0x88, 0x14, - 0x13, 0x99, 0x29, 0xea, 0x1f, 0xbe, 0x6c, 0x98, 0x17, 0xe2, 0xe1, 0xd1, 0x50, 0x47, 0xdf, 0x6b, - 0x00, 0x5c, 0x53, 0x99, 0x8e, 0xf5, 0x10, 0xf8, 0x1e, 0xc0, 0x25, 0x7b, 0xa0, 0x05, 0x8e, 0x53, - 0x1a, 0xdf, 0x61, 0x49, 0x8b, 0x7b, 0x5a, 0x20, 0xcb, 0xb3, 0x86, 0x7b, 0xa1, 0xab, 0x99, 0x71, - 0x49, 0xcc, 0x34, 0x0e, 0x7d, 0xd0, 0x35, 0xea, 0x82, 0xe6, 0xa2, 0x50, 0x6b, 0xf9, 0x96, 0x96, - 0x77, 0x34, 0x15, 0x6a, 0xa6, 0xd2, 0x9f, 0x80, 0x1e, 0x61, 0x32, 0xba, 0xe5, 0x14, 0xe7, 0x82, - 0xb3, 0xf8, 0xd1, 0x8c, 0x91, 0x68, 0xdb, 0xb3, 0x86, 0x4e, 0xd8, 0xad, 0xc8, 0xa9, 0xe6, 0xf4, - 0x20, 0x09, 0xdf, 0x81, 0x8e, 0xf6, 0x8b, 0x39, 0x93, 0x8a, 0x66, 0xb8, 0x6c, 0x87, 0x6c, 0xcf, - 0x1a, 0xee, 0x84, 0x6d, 0x4d, 0x5c, 0x69, 0x7c, 0x2a, 0x0a, 0x05, 0xdf, 0x00, 0x03, 0xe1, 0x54, - 0xa9, 0xdc, 0x28, 0x77, 0xb4, 0xb2, 0xa9, 0xe1, 0x2f, 0x4a, 0xe5, 0x5a, 0x77, 0x0e, 0xda, 0xb1, - 0xc8, 0x32, 0x1a, 0x2b, 0xac, 0xd8, 0x92, 0x8a, 0x95, 0x42, 0xbb, 0x9e, 0x35, 0xac, 0x9f, 0x1c, - 0xfa, 0x26, 0x49, 0x7f, 0x9d, 0xa4, 0x7f, 0x51, 0x25, 0x19, 0xb6, 0xaa, 0x8a, 0xb9, 0x29, 0x80, - 0xaf, 0x40, 0x93, 0x65, 0x49, 0x41, 0xa5, 0xc4, 0x31, 0x8f, 0xa4, 0x44, 0x35, 0xfd, 0xea, 0x46, - 0x05, 0x8e, 0x4b, 0x0c, 0xbe, 0x05, 0xed, 0xb5, 0xa8, 0xcc, 0x86, 0xc5, 0x14, 0x39, 0x5a, 0xd6, - 0xaa, 0xe0, 0x99, 0x41, 0xe1, 0x12, 0x1c, 0x3c, 0x77, 0x13, 0x99, 0x2a, 0x04, 0xe7, 0xb4, 0xc0, - 0x4b, 0x41, 0x28, 0xda, 0xf3, 0xac, 0x61, 0xeb, 0xe4, 0x83, 0xbf, 0x61, 0xf1, 0xfe, 0x9f, 0xcd, - 0xf9, 0x97, 0xd5, 0xdc, 0xe7, 0xea, 0x6b, 0x41, 0x68, 0xd8, 0x63, 0x9b, 0x60, 0xf8, 0x1a, 0xb4, - 0x68, 0xa6, 0xf7, 0xa0, 0x8a, 0x28, 0x66, 0x59, 0x82, 0x1a, 0x7a, 0x03, 0x4d, 0x83, 0xce, 0x0d, - 0x58, 0xe6, 0x19, 0xc5, 0x71, 0x69, 0x8a, 0x8b, 0x04, 0x2f, 0x18, 0xa7, 0xa8, 0xa9, 0xed, 0x37, - 0x0d, 0x7c, 0x25, 0x92, 0x09, 0xe3, 0x14, 0x7e, 0x06, 0x2d, 0x42, 0x17, 0xd1, 0x8a, 0x2b, 0x6c, - 0x8e, 0x15, 0xb5, 0x74, 0x9c, 0xde, 0x46, 0xd3, 0xd3, 0x72, 0x17, 0xc6, 0x75, 0xd8, 0xac, 0xea, - 0xaa, 0xf3, 0xbb, 0x00, 0xff, 0x57, 0xbe, 0x62, 0xce, 0x68, 0xa6, 0xb0, 0x64, 0xe4, 0xe5, 0xad, - 0xa0, 0xae, 0x36, 0xfa, 0x9f, 0x91, 0x8d, 0xb5, 0x6a, 0xc6, 0xc8, 0xdf, 0x37, 0x03, 0x3d, 0xd0, - 0x90, 0x44, 0xe2, 0x15, 0x91, 0x38, 0x8f, 0x54, 0x8a, 0xfe, 0xd5, 0x9e, 0x81, 0x24, 0xf2, 0x86, - 0xc8, 0x69, 0xa4, 0xd2, 0xf2, 0xfd, 0x49, 0xc4, 0x39, 0x7d, 0xc4, 0x11, 0x21, 0x65, 0x3e, 0x68, - 0xdf, 0xbc, 0xcb, 0xa0, 0x67, 0x06, 0x84, 0xa7, 0x60, 0xbf, 0xb2, 0x53, 0xf6, 0x53, 0xe2, 0x8e, - 0x66, 0x78, 0x29, 0x56, 0x99, 0x42, 0x07, 0xe6, 0x60, 0x0d, 0x3b, 0x23, 0x72, 0x5e, 0x72, 0xd7, - 0x25, 0x75, 0xf4, 0x11, 0xf4, 0x36, 0xee, 0x02, 0xd6, 0xc0, 0xf6, 0xd7, 0xc9, 0xc4, 0xfd, 0x07, - 0xd6, 0x41, 0xed, 0xe2, 0xd3, 0xe4, 0xec, 0xe6, 0x6a, 0xee, 0x5a, 0x10, 0x80, 0xdd, 0xd9, 0x3c, - 0xbc, 0x1c, 0xcf, 0xdd, 0xad, 0xc0, 0x76, 0x80, 0x5b, 0x0f, 0x6c, 0xa7, 0xee, 0x36, 0x02, 0xdb, - 0x69, 0xbb, 0x6e, 0x60, 0x3b, 0xae, 0xdb, 0x09, 0x6c, 0xa7, 0xe3, 0xc2, 0xc0, 0x76, 0xa0, 0xdb, - 0x0d, 0x6c, 0xa7, 0xe7, 0xee, 0x9f, 0x0f, 0x7f, 0x3c, 0x0d, 0xac, 0x9f, 0x4f, 0x03, 0xeb, 0xd7, - 0xd3, 0xc0, 0xfa, 0xd6, 0x37, 0x31, 0x33, 0x31, 0x8a, 0x72, 0x36, 0x7a, 0xf1, 0xd9, 0x6f, 0x77, - 0xf5, 0x29, 0x9f, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xee, 0xef, 0xfc, 0x55, 0x04, 0x00, - 0x00, + // 669 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0x5d, 0x4f, 0xdb, 0x30, + 0x14, 0x5d, 0x20, 0xd0, 0xe0, 0x7e, 0xa5, 0xee, 0x0a, 0xa6, 0x93, 0xba, 0x8a, 0x69, 0x5b, 0x35, + 0x4d, 0xa9, 0x00, 0xed, 0x61, 0x8f, 0x50, 0xd6, 0x8d, 0x0a, 0xb4, 0x2a, 0x2d, 0x2f, 0x7b, 0xb1, + 0x42, 0xe2, 0xa6, 0x16, 0x6e, 0x1c, 0xd9, 0x2e, 0x82, 0x7f, 0xb8, 0xc7, 0xfd, 0x04, 0xc4, 0x2f, + 0x99, 0x6c, 0xa7, 0x7c, 0x48, 0x7d, 0x3d, 0xe7, 0xdc, 0x7b, 0x8f, 0xcf, 0xbd, 0x32, 0x68, 0x2f, + 0x88, 0x9c, 0xf7, 0x6f, 0x0f, 0x23, 0x96, 0xcf, 0xa3, 0xc3, 0x7e, 0xcc, 0xb3, 0x19, 0x4d, 0x83, + 0x5c, 0x70, 0xc5, 0x61, 0x93, 0x4a, 0x45, 0x79, 0xa0, 0x15, 0xc1, 0x4a, 0xd1, 0xee, 0xa4, 0x9c, + 0xa7, 0x8c, 0xf4, 0x8d, 0xe4, 0x7a, 0x39, 0xeb, 0x27, 0x4b, 0x11, 0x29, 0xca, 0x33, 0x5b, 0xd4, + 0xde, 0x7f, 0xdd, 0x30, 0x17, 0xfc, 0xee, 0xde, 0x52, 0x07, 0x0f, 0x25, 0x00, 0x2e, 0x89, 0x9c, + 0x0f, 0xcc, 0x10, 0xf8, 0x15, 0xc0, 0x05, 0xbd, 0x23, 0x02, 0xc7, 0x73, 0x12, 0xdf, 0x60, 0x49, + 0xc4, 0x2d, 0x11, 0xc8, 0xe9, 0x3a, 0xbd, 0x9d, 0xd0, 0x37, 0xcc, 0x40, 0x13, 0x13, 0x83, 0xc3, + 0x00, 0x34, 0xad, 0x5a, 0x90, 0x9c, 0x0b, 0xb5, 0x92, 0x6f, 0x18, 0x79, 0xc3, 0x50, 0xa1, 0x61, + 0x0a, 0xfd, 0x11, 0x68, 0x25, 0x54, 0x46, 0xd7, 0x8c, 0xe0, 0x9c, 0x33, 0x1a, 0xdf, 0xdb, 0x31, + 0x12, 0x6d, 0x76, 0x9d, 0x9e, 0x17, 0x36, 0x0b, 0x72, 0x6c, 0x38, 0x33, 0x48, 0xc2, 0x2f, 0xa0, + 0x61, 0xfc, 0x62, 0x46, 0xa5, 0x22, 0x19, 0xd6, 0xed, 0x90, 0xdb, 0x75, 0x7a, 0x5b, 0x61, 0xdd, + 0x10, 0x17, 0x06, 0x1f, 0x73, 0xa1, 0xe0, 0x27, 0x60, 0x21, 0x3c, 0x57, 0x2a, 0xb7, 0xca, 0x2d, + 0xa3, 0xac, 0x1a, 0xf8, 0x97, 0x52, 0xb9, 0xd1, 0x9d, 0x82, 0x7a, 0xcc, 0xb3, 0x8c, 0xc4, 0x0a, + 0x2b, 0xba, 0x20, 0x7c, 0xa9, 0xd0, 0x76, 0xd7, 0xe9, 0x95, 0x8f, 0xf6, 0x03, 0x9b, 0x64, 0xb0, + 0x4a, 0x32, 0x38, 0x2b, 0x92, 0x0c, 0x6b, 0x45, 0xc5, 0xd4, 0x16, 0xc0, 0x0f, 0xa0, 0x4a, 0xb3, + 0x54, 0x10, 0x29, 0x71, 0xcc, 0x22, 0x29, 0x51, 0xc9, 0xbc, 0xba, 0x52, 0x80, 0x03, 0x8d, 0xc1, + 0xcf, 0xa0, 0xbe, 0x12, 0xe9, 0x6c, 0x68, 0x4c, 0x90, 0x67, 0x64, 0xb5, 0x02, 0x9e, 0x58, 0x14, + 0x2e, 0xc0, 0xde, 0x53, 0x37, 0x9e, 0x29, 0xc1, 0x19, 0x23, 0x02, 0x2f, 0x78, 0x42, 0xd0, 0x4e, + 0xd7, 0xe9, 0xd5, 0x8e, 0xbe, 0x05, 0x6b, 0x16, 0x1f, 0x3c, 0x6f, 0x2e, 0x38, 0x2f, 0xe6, 0x3e, + 0x55, 0x5f, 0xf2, 0x84, 0x84, 0x2d, 0xba, 0x0e, 0x86, 0x1f, 0x41, 0x8d, 0x64, 0x66, 0x0f, 0x4a, + 0x44, 0x31, 0xcd, 0x52, 0x54, 0x31, 0x1b, 0xa8, 0x5a, 0x74, 0x6a, 0x41, 0x9d, 0x67, 0x14, 0xc7, + 0xda, 0x14, 0xe3, 0x29, 0x9e, 0x51, 0x46, 0x50, 0xd5, 0xd8, 0xaf, 0x5a, 0xf8, 0x82, 0xa7, 0x43, + 0xca, 0x08, 0xfc, 0x09, 0x6a, 0x09, 0x99, 0x45, 0x4b, 0xa6, 0xb0, 0x3d, 0x56, 0x54, 0x33, 0x71, + 0x76, 0xd7, 0x9a, 0x1e, 0xeb, 0x5d, 0x58, 0xd7, 0x61, 0xb5, 0xa8, 0x2b, 0xce, 0xef, 0x0c, 0xbc, + 0x2f, 0x7c, 0xc5, 0x8c, 0x92, 0x4c, 0x61, 0x49, 0x93, 0xd7, 0xb7, 0x82, 0x9a, 0xc6, 0xe8, 0x3b, + 0x2b, 0x1b, 0x18, 0xd5, 0x84, 0x26, 0x2f, 0x6f, 0x06, 0x76, 0x41, 0x45, 0x26, 0x12, 0x2f, 0x13, + 0x89, 0xf3, 0x48, 0xcd, 0xd1, 0x5b, 0xe3, 0x19, 0xc8, 0x44, 0x5e, 0x25, 0x72, 0x1c, 0xa9, 0xb9, + 0x7e, 0x7f, 0x1a, 0x31, 0x46, 0xee, 0x71, 0x94, 0x24, 0x3a, 0x1f, 0xb4, 0x6b, 0xdf, 0x65, 0xd1, + 0x13, 0x0b, 0xc2, 0x63, 0xb0, 0x5b, 0xd8, 0xd1, 0xfd, 0x14, 0xbf, 0x21, 0x19, 0x5e, 0xf0, 0x65, + 0xa6, 0xd0, 0x9e, 0x3d, 0x58, 0xcb, 0x4e, 0x12, 0x39, 0xd5, 0xdc, 0xa5, 0xa6, 0xf4, 0xc1, 0xbe, + 0x0c, 0x8d, 0x8b, 0x45, 0xa4, 0x10, 0x32, 0xed, 0xeb, 0xcf, 0xb1, 0x19, 0xf8, 0xe0, 0x3b, 0x68, + 0xad, 0xdd, 0x1b, 0x2c, 0x81, 0xcd, 0xdf, 0xc3, 0xa1, 0xff, 0x06, 0x96, 0x41, 0xe9, 0xec, 0xc7, + 0xf0, 0xe4, 0xea, 0x62, 0xea, 0x3b, 0x10, 0x80, 0xed, 0xc9, 0x34, 0x3c, 0x1f, 0x4c, 0xfd, 0x8d, + 0x91, 0xeb, 0x01, 0xbf, 0x3c, 0x72, 0xbd, 0xb2, 0x5f, 0x19, 0xb9, 0x5e, 0xdd, 0xf7, 0x47, 0xae, + 0xe7, 0xfb, 0x8d, 0x91, 0xeb, 0x35, 0x7c, 0x38, 0x72, 0x3d, 0xe8, 0x37, 0x47, 0xae, 0xd7, 0xf2, + 0x77, 0x4f, 0x7b, 0x7f, 0x1f, 0x3b, 0xce, 0xbf, 0xc7, 0x8e, 0xf3, 0xf0, 0xd8, 0x71, 0xfe, 0xb4, + 0xed, 0x4a, 0x28, 0xef, 0x47, 0x39, 0xed, 0xbf, 0xfa, 0x18, 0xae, 0xb7, 0xcd, 0xd9, 0x1f, 0xff, + 0x0f, 0x00, 0x00, 0xff, 0xff, 0xff, 0x4d, 0xb0, 0x4d, 0x81, 0x04, 0x00, 0x00, } diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto index d68082a4d9..9ee376db6b 100644 --- a/mesh/v1alpha1/config.proto +++ b/mesh/v1alpha1/config.proto @@ -105,6 +105,10 @@ message MeshConfig { // File address for the proxy access log (e.g. /dev/stdout). // Empty value disables access logging. string access_log_file = 13; + + // Format for the proxy access log (text or json). + // Default value is text. + string access_log_format = 24; // Default proxy config used by the proxy injection mechanism operating in the mesh // (e.g. Kubernetes admission controller) @@ -136,4 +140,7 @@ message MeshConfig { // for k8s service account JWT, so that K8s API server mounts k8s service account JWT to envoy container, which // will be used to generate key/cert eventually. This isn't supported for non-k8s case. bool enable_sds_token_mount = 23; + + // $hide_from_docs + // Next available field number: 25 } diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index a80db8b9e8..bb24007b02 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -167,6 +167,15 @@
File address for the proxy access log (e.g. /dev/stdout). Empty value disables access logging.
+ + +accessLogFormatstringFormat for the proxy access log (text or json). +Default value is text.
+