diff --git a/annotation/annotations.gen.go b/annotation/annotations.gen.go index adb47adf..829cbe96 100644 --- a/annotation/annotations.gen.go +++ b/annotation/annotations.gen.go @@ -184,6 +184,15 @@ var ( Resources: []ResourceTypes{ Pod, }, } + PrometheusMergeMetrics = Instance { + Name: "prometheus.istio.io/merge-metrics", + Description: "Specifies if application Prometheus metric will be merged "+ + "with Envoy metrics for this workload.", + Hidden: false, + Deprecated: false, + Resources: []ResourceTypes{ Pod, }, + } + SidecarStatusReadinessApplicationPorts = Instance { Name: "readiness.status.sidecar.istio.io/applicationPorts", Description: "Specifies the list of ports exposed by the application "+ @@ -504,6 +513,7 @@ func AllResourceAnnotations() []*Instance { &PolicyCheckMaxRetryWaitTime, &PolicyCheckRetries, &PolicyLang, + &PrometheusMergeMetrics, &SidecarStatusReadinessApplicationPorts, &SidecarStatusReadinessFailureThreshold, &SidecarStatusReadinessInitialDelaySeconds, diff --git a/annotation/annotations.pb.html b/annotation/annotations.pb.html index f27934b8..d87a8b8e 100644 --- a/annotation/annotations.pb.html +++ b/annotation/annotations.pb.html @@ -137,6 +137,16 @@ Istio supports to control its behavior. + + + prometheus.istio.io/merge-metrics + [Pod] + Specifies if application Prometheus metric will be merged with Envoy metrics for this workload. + + + + + readiness.status.sidecar.istio.io/applicationPorts diff --git a/annotation/annotations.yaml b/annotation/annotations.yaml index bea0a0a8..38704e45 100644 --- a/annotation/annotations.yaml +++ b/annotation/annotations.yaml @@ -13,6 +13,14 @@ # limitations under the License. annotations: + - name: prometheus.istio.io/merge-metrics + variableName: PrometheusMergeMetrics + description: Specifies if application Prometheus metric will be merged with Envoy metrics + for this workload. + deprecated: false + hidden: false + resources: + - Pod - name: alpha.istio.io/kubernetes-serviceaccounts variableName: AlphaKubernetesServiceAccounts description: Specifies the Kubernetes service accounts that are allowed to run this diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go index cad622dd..7f500315 100644 --- a/mesh/v1alpha1/config.pb.go +++ b/mesh/v1alpha1/config.pb.go @@ -473,9 +473,19 @@ type MeshConfig struct { // workloads expect to always reach the in-cluster server. By default, the namespace // "kube-system" will be cluster-local. ClusterLocalNamespaces []string `protobuf:"bytes,50,rep,name=cluster_local_namespaces,json=clusterLocalNamespaces,proto3" json:"clusterLocalNamespaces,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // If enabled, Istio agent will merge metrics exposed by the application with metrics from Envoy + // and Istio agent. The sidecar injection will replace `prometheus.io` annotations present on the pod + // and redirect them towards Istio agent, which will then merge metrics of from the application with Istio metrics. + // This relies on the annotations `prometheus.io/scrape`, `prometheus.io/port`, and + // `prometheus.io/path` annotations. + // If you are running a separately managed Envoy with an Istio sidecar, this may cause issues, as the metrics will collide. + // In this case, it is recommended to disable aggregation on that deployment with the + // `prometheus.istio.io/merge-metrics: "false"` annotation. + // If not specified, this will be enabled by default. + EnablePrometheusMerge *types.BoolValue `protobuf:"bytes,51,opt,name=enable_prometheus_merge,json=enablePrometheusMerge,proto3" json:"enablePrometheusMerge,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *MeshConfig) Reset() { *m = MeshConfig{} } @@ -852,6 +862,13 @@ func (m *MeshConfig) GetClusterLocalNamespaces() []string { return nil } +func (m *MeshConfig) GetEnablePrometheusMerge() *types.BoolValue { + if m != nil { + return m.EnablePrometheusMerge + } + return nil +} + type MeshConfig_OutboundTrafficPolicy struct { Mode MeshConfig_OutboundTrafficPolicy_Mode `protobuf:"varint,1,opt,name=mode,proto3,enum=istio.mesh.v1alpha1.MeshConfig_OutboundTrafficPolicy_Mode" json:"mode,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1122,124 +1139,126 @@ func init() { func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptor_b5c7ece76d5d5022) } var fileDescriptor_b5c7ece76d5d5022 = []byte{ - // 1867 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xdd, 0x52, 0x1b, 0xcb, - 0x11, 0xb6, 0x80, 0x63, 0x60, 0xf4, 0xc3, 0x32, 0x80, 0x3d, 0xc6, 0xc7, 0x58, 0xe8, 0xf8, 0x47, - 0x21, 0x8e, 0x38, 0xc6, 0x95, 0xc4, 0x49, 0xae, 0x84, 0x24, 0x6c, 0xb0, 0x40, 0xca, 0x4a, 0xf8, - 0xc4, 0xc9, 0xc5, 0xd4, 0xb0, 0x3b, 0x92, 0x26, 0xac, 0x76, 0x54, 0x33, 0xb3, 0x18, 0x2e, 0xf2, - 0x48, 0xb9, 0xc8, 0x5b, 0xa4, 0x2a, 0x37, 0x79, 0x84, 0x94, 0x9f, 0x24, 0x35, 0x3f, 0x2b, 0x09, - 0x50, 0x1d, 0xa5, 0x72, 0xa7, 0xed, 0xfe, 0xba, 0x7b, 0xa6, 0xe7, 0xeb, 0x1f, 0x81, 0xed, 0x21, - 0x95, 0x83, 0xfd, 0xab, 0xb7, 0x24, 0x1a, 0x0d, 0xc8, 0xdb, 0xfd, 0x80, 0xc7, 0x3d, 0xd6, 0xaf, - 0x8c, 0x04, 0x57, 0x1c, 0x6e, 0x30, 0xa9, 0x18, 0xaf, 0x68, 0x44, 0x25, 0x45, 0x6c, 0xef, 0xf4, - 0x39, 0xef, 0x47, 0x74, 0xdf, 0x40, 0x2e, 0x92, 0xde, 0x7e, 0x98, 0x08, 0xa2, 0x18, 0x8f, 0xad, - 0xd1, 0x7d, 0xfd, 0x57, 0x41, 0x46, 0x23, 0x2a, 0xa4, 0xd3, 0x3f, 0xb9, 0x1d, 0x70, 0x24, 0xf8, - 0xf5, 0x8d, 0x53, 0xed, 0xc5, 0x54, 0x7d, 0xe5, 0xe2, 0x92, 0xc5, 0xfd, 0x14, 0xf0, 0x6e, 0x3f, - 0xa4, 0x52, 0xb1, 0xd8, 0x44, 0xc0, 0x22, 0x89, 0xa8, 0xc5, 0x96, 0xfe, 0xf1, 0x3d, 0x00, 0xa7, - 0x54, 0x0e, 0x6a, 0xe6, 0xc0, 0xf0, 0x0d, 0x80, 0x43, 0x76, 0x4d, 0x05, 0x0e, 0x06, 0x34, 0xb8, - 0xc4, 0x92, 0x8a, 0x2b, 0x2a, 0x50, 0xa6, 0x98, 0x29, 0xaf, 0xfa, 0x9e, 0xd1, 0xd4, 0xb4, 0xa2, - 0x63, 0xe4, 0xb0, 0x02, 0x36, 0x2c, 0x5a, 0xd0, 0x11, 0x17, 0x2a, 0x85, 0x2f, 0x18, 0xf8, 0xba, - 0x51, 0xf9, 0x46, 0xe3, 0xf0, 0x07, 0x60, 0x2b, 0x64, 0x92, 0x5c, 0x44, 0x14, 0x8f, 0x78, 0xc4, - 0x82, 0x1b, 0x1b, 0x46, 0xa2, 0xc5, 0x62, 0xa6, 0xbc, 0xe2, 0x6f, 0x38, 0x65, 0xdb, 0xe8, 0x4c, - 0x20, 0x09, 0xff, 0x00, 0xb6, 0x53, 0x1b, 0x1b, 0x6b, 0xa0, 0xd4, 0xc8, 0x05, 0x94, 0xe8, 0x47, - 0x63, 0xf8, 0xd8, 0x21, 0x4e, 0x35, 0xe0, 0xa3, 0x52, 0x23, 0x1b, 0x55, 0xc2, 0x77, 0xe0, 0xd1, - 0x74, 0x20, 0xdc, 0x23, 0x2c, 0xc2, 0x7c, 0x44, 0x63, 0xf4, 0xc4, 0x46, 0x1c, 0x4d, 0x42, 0x1d, - 0x11, 0x16, 0xb5, 0x46, 0x34, 0x86, 0x6d, 0xf0, 0x52, 0xb2, 0x90, 0x06, 0x44, 0x60, 0xc5, 0xb1, - 0xa2, 0x11, 0x1d, 0x52, 0x25, 0x6e, 0xb0, 0xa4, 0x52, 0xea, 0xec, 0x91, 0x5e, 0x8f, 0xc5, 0x4c, - 0xdd, 0xa0, 0x1d, 0xe3, 0x63, 0xd7, 0x81, 0xbb, 0xbc, 0x9b, 0x42, 0x3b, 0x16, 0x59, 0x75, 0x40, - 0xb8, 0x07, 0xd6, 0xcd, 0xfb, 0xe0, 0x88, 0x49, 0x45, 0x63, 0xac, 0x0f, 0x87, 0x96, 0x8a, 0x99, - 0xf2, 0x77, 0xfe, 0x9a, 0x51, 0x34, 0x8d, 0xbc, 0xcd, 0x85, 0x82, 0xaf, 0x80, 0x15, 0xd9, 0x7b, - 0x1a, 0xe4, 0x77, 0x06, 0x99, 0x37, 0x62, 0x7d, 0x3b, 0x83, 0x3b, 0x04, 0x6b, 0x01, 0x8f, 0x63, - 0x1a, 0x28, 0xac, 0xd8, 0x90, 0xf2, 0x44, 0xa1, 0x87, 0xc5, 0x4c, 0x39, 0x7b, 0xf0, 0xa4, 0x62, - 0x99, 0x53, 0x49, 0x99, 0x53, 0xa9, 0x3b, 0x66, 0xf9, 0x05, 0x67, 0xd1, 0xb5, 0x06, 0xf0, 0x27, - 0xb0, 0x6d, 0x40, 0x01, 0x8f, 0x70, 0x48, 0x15, 0x0d, 0x0c, 0x3b, 0x52, 0x77, 0x7b, 0xf3, 0xdc, - 0xa1, 0xd4, 0xb8, 0x9e, 0xda, 0xa6, 0x8e, 0x39, 0xc8, 0xab, 0x60, 0x84, 0x2f, 0x29, 0x1d, 0x91, - 0x88, 0x5d, 0x51, 0xf4, 0xbd, 0xf1, 0x75, 0x52, 0xb1, 0x95, 0x30, 0xe1, 0x67, 0x5a, 0x0f, 0xef, - 0x2a, 0x35, 0x7b, 0x34, 0xc6, 0xe3, 0x36, 0xe7, 0x51, 0x87, 0x2a, 0xc5, 0xe2, 0xbe, 0xac, 0x74, - 0x6b, 0xed, 0xc9, 0xef, 0x60, 0xf4, 0x29, 0xf5, 0xe8, 0xe7, 0xd4, 0xd4, 0x17, 0xfc, 0x01, 0xe4, - 0x59, 0xdc, 0x17, 0x54, 0x4a, 0x1c, 0x44, 0x44, 0x4a, 0xb4, 0x6c, 0x38, 0x98, 0x73, 0xc2, 0x9a, - 0x96, 0xc1, 0xd7, 0x60, 0x2d, 0x05, 0x69, 0xa6, 0xb2, 0x80, 0xa2, 0x15, 0x03, 0x2b, 0x38, 0x71, - 0xc7, 0x4a, 0xe1, 0x10, 0x3c, 0x1e, 0x7b, 0xe3, 0xb1, 0x12, 0x3c, 0x8a, 0xa8, 0xc0, 0x43, 0x1e, - 0x52, 0xb4, 0x5a, 0xcc, 0x94, 0x0b, 0x07, 0xbf, 0xae, 0xcc, 0x28, 0xe9, 0xca, 0xa4, 0x8e, 0x2a, - 0xc7, 0x2e, 0xee, 0xd8, 0xfa, 0x94, 0x87, 0xd4, 0xdf, 0x62, 0xb3, 0xc4, 0xb0, 0x05, 0xb2, 0x24, - 0x51, 0x03, 0x57, 0x13, 0x08, 0x98, 0x10, 0x7b, 0xf3, 0x42, 0x54, 0x13, 0x35, 0xb0, 0x95, 0x72, - 0xb8, 0x80, 0x32, 0x3e, 0x20, 0xe3, 0x6f, 0x78, 0x0c, 0xd6, 0x45, 0x28, 0xb1, 0xa0, 0x3d, 0x41, - 0xe5, 0x00, 0x87, 0x34, 0x22, 0x37, 0x28, 0x3b, 0xe7, 0x39, 0x8d, 0x97, 0x35, 0x11, 0x4a, 0xdf, - 0x9a, 0xd5, 0xb5, 0x15, 0x7c, 0x09, 0x0a, 0x34, 0x36, 0xd5, 0xa7, 0x04, 0x09, 0x58, 0xdc, 0x47, - 0x39, 0xc3, 0xfa, 0xbc, 0x95, 0x76, 0xad, 0x50, 0xb3, 0x96, 0x04, 0x81, 0x4e, 0x58, 0xc4, 0xfb, - 0xb8, 0xc7, 0x22, 0x8a, 0xf2, 0x26, 0xb5, 0x79, 0x2b, 0x6e, 0xf2, 0xfe, 0x11, 0x8b, 0xa8, 0xae, - 0x84, 0x69, 0x1c, 0x17, 0x43, 0xa2, 0x10, 0x32, 0xc8, 0xb5, 0x09, 0xd2, 0x88, 0x21, 0x01, 0x1b, - 0x53, 0x58, 0x1a, 0x07, 0x3c, 0xd4, 0xf1, 0x9f, 0x9a, 0xf4, 0xbc, 0x9d, 0x9b, 0x9e, 0xd4, 0x5b, - 0xc3, 0x19, 0xfa, 0xeb, 0xe4, 0xae, 0x08, 0xd6, 0xc1, 0x73, 0x77, 0x3b, 0x1a, 0x5f, 0xf1, 0x1b, - 0x3c, 0x15, 0x2f, 0x65, 0x48, 0xd9, 0x5c, 0xf7, 0xa9, 0x85, 0x35, 0x34, 0x6a, 0xec, 0x39, 0xa5, - 0xcb, 0x07, 0x50, 0x08, 0x69, 0x8f, 0x24, 0x91, 0xc2, 0xb6, 0xef, 0xa3, 0x82, 0xc9, 0x75, 0x71, - 0xe6, 0x19, 0xdb, 0xba, 0x8c, 0xed, 0x21, 0xfd, 0xbc, 0xb3, 0x73, 0xdd, 0xf7, 0x35, 0xc8, 0xdb, - 0x1e, 0x47, 0xc2, 0x50, 0xf3, 0x04, 0x79, 0x3a, 0x33, 0xe6, 0x61, 0x72, 0x46, 0x51, 0xb5, 0x72, - 0x4d, 0x50, 0x9e, 0xa8, 0x0b, 0x9e, 0xc4, 0xa1, 0x7e, 0x97, 0x5e, 0x8f, 0x05, 0x29, 0x7b, 0xd6, - 0x4d, 0xe8, 0xb9, 0x04, 0x6d, 0x39, 0xf3, 0xae, 0xb5, 0xb6, 0xc4, 0xf1, 0xb7, 0xf8, 0x2c, 0xf1, - 0x54, 0x9a, 0x82, 0x88, 0xd1, 0x58, 0x61, 0xdd, 0xf2, 0x6e, 0xb5, 0x70, 0xb4, 0x31, 0x9d, 0xa6, - 0x9a, 0x41, 0x75, 0x58, 0x38, 0xdd, 0xca, 0xe1, 0x0b, 0x90, 0x93, 0xa1, 0xc4, 0x49, 0x28, 0xf1, - 0x88, 0xa8, 0x01, 0xda, 0x1c, 0x5f, 0x0e, 0xc8, 0x50, 0x9e, 0x87, 0xb2, 0x4d, 0xd4, 0x40, 0x73, - 0x57, 0xde, 0xe3, 0xee, 0xd6, 0xff, 0xc4, 0x5d, 0x79, 0x87, 0xbb, 0x1f, 0x41, 0xc1, 0xbe, 0x07, - 0x96, 0x3c, 0x11, 0x01, 0x95, 0xe8, 0x51, 0x71, 0xb1, 0x9c, 0x3d, 0xd8, 0x9d, 0x99, 0x1c, 0x9b, - 0x98, 0x8e, 0x41, 0xfa, 0xf9, 0x60, 0xea, 0x4b, 0xc2, 0x3a, 0xf0, 0x5c, 0x02, 0x48, 0xa2, 0x38, - 0x1e, 0xaa, 0x48, 0xa2, 0x5f, 0x9a, 0x33, 0x6d, 0xdf, 0x3b, 0xd3, 0x21, 0xe7, 0xd1, 0x67, 0x12, - 0x25, 0xd4, 0x77, 0x95, 0x53, 0x4d, 0x14, 0x3f, 0x55, 0x91, 0x99, 0x46, 0xce, 0x8b, 0xbe, 0xa1, - 0xe2, 0x97, 0x34, 0xc6, 0x43, 0x9e, 0xc4, 0x0a, 0x3d, 0xb6, 0xd3, 0xc8, 0x6a, 0x3b, 0xa1, 0xec, - 0x6a, 0xdd, 0xa9, 0x56, 0xc1, 0x3d, 0x00, 0x4d, 0xd6, 0x24, 0xc5, 0x97, 0xef, 0x25, 0x96, 0x04, - 0xff, 0xf5, 0xab, 0x42, 0xcf, 0x8c, 0x41, 0x41, 0xe7, 0x4d, 0xd2, 0x4f, 0xef, 0x65, 0x87, 0x9c, - 0x7c, 0x55, 0x70, 0x17, 0xe4, 0x94, 0x48, 0xa4, 0xc2, 0x21, 0x1f, 0x12, 0x16, 0xa3, 0x6d, 0x53, - 0x58, 0x59, 0x23, 0xab, 0x1b, 0x11, 0xfc, 0x11, 0x6c, 0x4e, 0x43, 0x30, 0x89, 0x18, 0x91, 0x54, - 0xa2, 0x4a, 0x71, 0xb1, 0xbc, 0xea, 0xc3, 0x29, 0x68, 0xd5, 0x6a, 0xe0, 0xef, 0xc0, 0x93, 0x94, - 0xdd, 0xae, 0x26, 0x30, 0xbd, 0x36, 0xe3, 0x5e, 0x71, 0xf4, 0xdc, 0x98, 0x3d, 0x72, 0x00, 0x57, - 0x10, 0x0d, 0xa3, 0xee, 0x72, 0xf8, 0x11, 0xec, 0xa6, 0xa6, 0x57, 0x4c, 0xa8, 0x84, 0x44, 0x33, - 0x5c, 0x14, 0x8d, 0x8b, 0x67, 0x0e, 0xf8, 0xd9, 0xe2, 0xee, 0x7a, 0x3a, 0x01, 0xa5, 0xd4, 0xd3, - 0xdd, 0x45, 0x66, 0xca, 0xd5, 0xae, 0x71, 0xb5, 0xe3, 0x90, 0xf5, 0x09, 0xd0, 0x4f, 0xa2, 0x89, - 0xaf, 0x97, 0xa0, 0x20, 0x38, 0x57, 0x38, 0x26, 0x43, 0x2a, 0x47, 0x24, 0xa0, 0xa8, 0x64, 0x5b, - 0x95, 0x96, 0x9e, 0xa5, 0x42, 0xd8, 0x03, 0x1b, 0x11, 0x0f, 0x48, 0xc4, 0xd4, 0x0d, 0x8e, 0x2e, - 0xb0, 0xb4, 0x53, 0x08, 0xfd, 0x60, 0x9e, 0xfd, 0x37, 0x3f, 0x33, 0xc9, 0x9a, 0xce, 0xaa, 0xc9, - 0x49, 0x78, 0x48, 0x22, 0x12, 0x07, 0x54, 0xb8, 0x19, 0xe6, 0xaf, 0xa7, 0x2e, 0x9b, 0x17, 0x4e, - 0x04, 0x6b, 0xc0, 0x0b, 0xe3, 0x09, 0xe1, 0x05, 0x51, 0x14, 0xbd, 0x98, 0x3b, 0xc9, 0xc3, 0x38, - 0xe5, 0xba, 0x4f, 0x14, 0xd5, 0xcf, 0x9a, 0x6e, 0x49, 0x6e, 0x17, 0xbb, 0x20, 0x2a, 0x18, 0xa0, - 0x97, 0x86, 0x27, 0xd0, 0xe9, 0xec, 0x5a, 0x74, 0xa8, 0x35, 0xf0, 0xb7, 0x00, 0x4d, 0x23, 0xf1, - 0x90, 0x5c, 0x63, 0x1a, 0x2b, 0xc1, 0xa8, 0x44, 0xaf, 0x8a, 0x99, 0x72, 0xde, 0xdf, 0x12, 0x13, - 0xf8, 0x29, 0xb9, 0x6e, 0x58, 0x25, 0x6c, 0x82, 0xad, 0x7b, 0x86, 0x7a, 0x65, 0x40, 0xaf, 0xe7, - 0x1d, 0x1a, 0xde, 0x76, 0xa8, 0x97, 0x05, 0xf8, 0x17, 0xb0, 0x3e, 0x38, 0xc0, 0xc9, 0xa8, 0x2f, - 0xc8, 0xb8, 0xa5, 0xa0, 0x5f, 0x98, 0x16, 0xbf, 0x3f, 0xaf, 0x87, 0x7d, 0x3c, 0x38, 0xb7, 0x76, - 0xae, 0x7b, 0xad, 0x0d, 0x6e, 0x0b, 0x34, 0x75, 0x59, 0x6c, 0xbb, 0x64, 0x10, 0x25, 0x52, 0x51, - 0x81, 0xa5, 0x22, 0xf6, 0xe5, 0xd1, 0x1b, 0xf3, 0xe8, 0x8f, 0x1c, 0xa0, 0x66, 0xf5, 0x1d, 0x45, - 0x0c, 0x05, 0xf4, 0xda, 0x39, 0xee, 0xb0, 0xf7, 0x6d, 0x7f, 0x65, 0x6c, 0xc7, 0x3d, 0xf8, 0xae, - 0x71, 0x1d, 0xe4, 0x02, 0x2a, 0x14, 0xeb, 0xb1, 0x80, 0x28, 0x2a, 0xd1, 0xbe, 0x69, 0x3b, 0xb3, - 0xc7, 0x41, 0x6d, 0x02, 0xf4, 0x6f, 0x59, 0xc1, 0x3f, 0x82, 0xbc, 0x1a, 0x08, 0xd6, 0x1b, 0x4f, - 0x95, 0xb7, 0x26, 0xc1, 0x6f, 0xe6, 0xa5, 0xa5, 0x6b, 0x8c, 0xdc, 0x84, 0xc9, 0xa9, 0xa9, 0x2f, - 0xf8, 0x1e, 0xa0, 0xf4, 0x32, 0x86, 0x88, 0x93, 0x1a, 0x90, 0xe8, 0xc0, 0x96, 0xb2, 0xd3, 0x1b, - 0x12, 0x8f, 0x8b, 0x41, 0x6e, 0xff, 0x3d, 0x03, 0xb6, 0x66, 0xce, 0x0c, 0x78, 0x06, 0x96, 0xcc, - 0x66, 0x94, 0x31, 0x8f, 0xf6, 0xfb, 0xff, 0x6b, 0xf0, 0x54, 0xcc, 0x7a, 0x64, 0xfc, 0x94, 0xea, - 0x60, 0xc9, 0x6c, 0x45, 0xeb, 0x20, 0xef, 0x37, 0x3e, 0x1c, 0x77, 0xba, 0xfe, 0x17, 0xdc, 0x3a, - 0x6b, 0x7e, 0xf1, 0x1e, 0xc0, 0x3c, 0x58, 0xad, 0x36, 0x9b, 0xad, 0x9f, 0x70, 0xf5, 0xec, 0x8b, - 0x97, 0x29, 0x2d, 0xad, 0x2c, 0x78, 0x0b, 0x7b, 0x9b, 0x9f, 0x8f, 0xfd, 0xee, 0x79, 0xb5, 0x89, - 0x3b, 0x0d, 0xff, 0xf3, 0x71, 0xad, 0x61, 0xc0, 0xdb, 0x7f, 0x03, 0xb9, 0xe9, 0x3c, 0xc0, 0x17, - 0xa0, 0xa0, 0x2b, 0x0b, 0x47, 0x6c, 0xc8, 0x14, 0x4e, 0x44, 0xe4, 0xfe, 0xd4, 0xe4, 0xb4, 0xb4, - 0xa9, 0x85, 0xe7, 0x22, 0x82, 0x1f, 0x00, 0x9c, 0x42, 0xa5, 0x8b, 0xf0, 0xc2, 0x3c, 0x62, 0x7b, - 0x63, 0x27, 0x6e, 0x01, 0x2e, 0x9d, 0x80, 0xad, 0x99, 0x2b, 0x20, 0x5c, 0x03, 0xd9, 0xf3, 0xb3, - 0x4e, 0xbb, 0x51, 0x3b, 0x3e, 0x3a, 0x6e, 0xd4, 0xbd, 0x07, 0x70, 0x19, 0x2c, 0xb6, 0x8e, 0x8e, - 0xbc, 0x0c, 0xcc, 0x82, 0xe5, 0x7a, 0xe3, 0xa8, 0x7a, 0xde, 0xec, 0x7a, 0x0b, 0x10, 0x80, 0x87, - 0x9d, 0xae, 0x7f, 0x5c, 0xeb, 0x7a, 0x8b, 0xa5, 0x57, 0x00, 0x4c, 0x76, 0x3d, 0xb8, 0x02, 0x96, - 0xce, 0x5a, 0x67, 0x0d, 0xef, 0x01, 0x2c, 0x00, 0x70, 0x7a, 0x6e, 0x6e, 0xde, 0x6d, 0x76, 0xbc, - 0x4c, 0xe9, 0x35, 0x58, 0xbf, 0xb7, 0xf4, 0x68, 0x78, 0xb7, 0xf1, 0xa7, 0xae, 0xf7, 0x40, 0xff, - 0x3a, 0xe9, 0xb4, 0xce, 0xbc, 0x4c, 0xe9, 0x00, 0xac, 0xdd, 0x29, 0x1d, 0x08, 0x41, 0xa1, 0xde, - 0xc2, 0x67, 0xad, 0x2e, 0x3e, 0x6f, 0x7f, 0xf0, 0xab, 0x75, 0xed, 0x3f, 0x0b, 0x96, 0xd3, 0x8f, - 0xcc, 0xc9, 0xd2, 0xca, 0x9a, 0xe7, 0x9d, 0x2c, 0xad, 0x40, 0x6f, 0xa3, 0xf4, 0xaf, 0x0c, 0xc8, - 0x4d, 0x4f, 0x4b, 0x88, 0xc0, 0x72, 0xba, 0xb1, 0xd8, 0xac, 0xa6, 0x9f, 0xb0, 0x05, 0x72, 0x2a, - 0x92, 0x69, 0xf3, 0x94, 0x2e, 0x95, 0x6f, 0x7e, 0xee, 0x7f, 0x80, 0xd9, 0x1d, 0xba, 0xcd, 0x4e, - 0xba, 0xf6, 0xfb, 0x59, 0x15, 0xc9, 0xf4, 0x03, 0xb6, 0xc1, 0xa6, 0x4c, 0x2e, 0x64, 0x20, 0xd8, - 0x05, 0x0d, 0xb1, 0xa0, 0xe9, 0x64, 0x5f, 0x2c, 0x2e, 0x96, 0x0b, 0x07, 0xcf, 0x66, 0xb2, 0xcf, - 0x77, 0x28, 0x7f, 0x63, 0x62, 0x9a, 0xca, 0x64, 0xe9, 0x13, 0xc8, 0x4e, 0xd5, 0x20, 0x7c, 0x0e, - 0xb2, 0x92, 0x06, 0x82, 0xba, 0x4a, 0xb7, 0xf7, 0x01, 0x56, 0x64, 0x8a, 0xfb, 0x29, 0x58, 0xd5, - 0xfd, 0xda, 0x54, 0x0e, 0x5a, 0x30, 0x45, 0xb3, 0x12, 0xc6, 0xd2, 0xd4, 0xca, 0x5e, 0x11, 0xac, - 0xa4, 0x9e, 0xe1, 0x26, 0xf0, 0x52, 0x4a, 0xa6, 0x44, 0xf6, 0x1e, 0x1c, 0x96, 0xff, 0xf9, 0x6d, - 0x27, 0xf3, 0xef, 0x6f, 0x3b, 0x99, 0xff, 0x7c, 0xdb, 0xc9, 0xfc, 0x79, 0xdb, 0x9e, 0x97, 0xf1, - 0x7d, 0x32, 0x62, 0xfb, 0xb7, 0xfe, 0xd2, 0x5f, 0x3c, 0x34, 0x44, 0x7b, 0xf7, 0xdf, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xe1, 0x28, 0x41, 0xeb, 0x5b, 0x10, 0x00, 0x00, + // 1898 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xdd, 0x52, 0x1b, 0xcb, + 0x11, 0xb6, 0x80, 0x63, 0xe3, 0xd1, 0x0f, 0xcb, 0x60, 0xec, 0x31, 0x8e, 0xb1, 0xac, 0xe3, 0x1f, + 0x85, 0x38, 0xe2, 0x18, 0x57, 0x12, 0x27, 0xb9, 0x12, 0x92, 0xb0, 0xc1, 0x02, 0x29, 0x2b, 0xe1, + 0x13, 0x27, 0x17, 0x53, 0xc3, 0xee, 0x48, 0x9a, 0xb0, 0xda, 0xd9, 0x9a, 0x99, 0xc5, 0x70, 0x91, + 0xcb, 0x3c, 0x4e, 0xde, 0x23, 0x55, 0xb9, 0xc9, 0x23, 0xa4, 0xfc, 0x24, 0xa9, 0xf9, 0x59, 0x49, + 0x80, 0xea, 0x28, 0x75, 0xee, 0xd8, 0xee, 0xaf, 0xbb, 0x67, 0x7a, 0xbe, 0xfe, 0x11, 0x60, 0x6b, + 0x4c, 0xe5, 0x68, 0xf7, 0xe2, 0x2d, 0x89, 0x92, 0x11, 0x79, 0xbb, 0x1b, 0xf0, 0x78, 0xc0, 0x86, + 0xb5, 0x44, 0x70, 0xc5, 0xe1, 0x06, 0x93, 0x8a, 0xf1, 0x9a, 0x46, 0xd4, 0x32, 0xc4, 0xd6, 0xf6, + 0x90, 0xf3, 0x61, 0x44, 0x77, 0x0d, 0xe4, 0x2c, 0x1d, 0xec, 0x86, 0xa9, 0x20, 0x8a, 0xf1, 0xd8, + 0x1a, 0xdd, 0xd6, 0x7f, 0x15, 0x24, 0x49, 0xa8, 0x90, 0x4e, 0xff, 0xf8, 0x7a, 0xc0, 0x44, 0xf0, + 0xcb, 0x2b, 0xa7, 0xda, 0x89, 0xa9, 0xfa, 0xca, 0xc5, 0x39, 0x8b, 0x87, 0x19, 0xe0, 0xdd, 0x6e, + 0x48, 0xa5, 0x62, 0xb1, 0x89, 0x80, 0x45, 0x1a, 0x51, 0x8b, 0xad, 0xfc, 0xe3, 0x29, 0x00, 0xc7, + 0x54, 0x8e, 0x1a, 0xe6, 0xc0, 0xf0, 0x0d, 0x80, 0x63, 0x76, 0x49, 0x05, 0x0e, 0x46, 0x34, 0x38, + 0xc7, 0x92, 0x8a, 0x0b, 0x2a, 0x50, 0xae, 0x9c, 0xab, 0xde, 0xf7, 0x3d, 0xa3, 0x69, 0x68, 0x45, + 0xcf, 0xc8, 0x61, 0x0d, 0x6c, 0x58, 0xb4, 0xa0, 0x09, 0x17, 0x2a, 0x83, 0x2f, 0x19, 0xf8, 0xba, + 0x51, 0xf9, 0x46, 0xe3, 0xf0, 0x7b, 0x60, 0x33, 0x64, 0x92, 0x9c, 0x45, 0x14, 0x27, 0x3c, 0x62, + 0xc1, 0x95, 0x0d, 0x23, 0xd1, 0x72, 0x39, 0x57, 0x5d, 0xf5, 0x37, 0x9c, 0xb2, 0x6b, 0x74, 0x26, + 0x90, 0x84, 0x7f, 0x04, 0x5b, 0x99, 0x8d, 0x8d, 0x35, 0x52, 0x2a, 0x71, 0x01, 0x25, 0xfa, 0xc1, + 0x18, 0x3e, 0x72, 0x88, 0x63, 0x0d, 0xf8, 0xa8, 0x54, 0x62, 0xa3, 0x4a, 0xf8, 0x0e, 0x3c, 0x9c, + 0x0d, 0x84, 0x07, 0x84, 0x45, 0x98, 0x27, 0x34, 0x46, 0x8f, 0x6d, 0xc4, 0x64, 0x1a, 0xea, 0x80, + 0xb0, 0xa8, 0x93, 0xd0, 0x18, 0x76, 0xc1, 0x4b, 0xc9, 0x42, 0x1a, 0x10, 0x81, 0x15, 0xc7, 0x8a, + 0x46, 0x74, 0x4c, 0x95, 0xb8, 0xc2, 0x92, 0x4a, 0xa9, 0xb3, 0x47, 0x06, 0x03, 0x16, 0x33, 0x75, + 0x85, 0xb6, 0x8d, 0x8f, 0xe7, 0x0e, 0xdc, 0xe7, 0xfd, 0x0c, 0xda, 0xb3, 0xc8, 0xba, 0x03, 0xc2, + 0x1d, 0xb0, 0x6e, 0xde, 0x07, 0x47, 0x4c, 0x2a, 0x1a, 0x63, 0x7d, 0x38, 0xb4, 0x52, 0xce, 0x55, + 0xbf, 0xf3, 0xd7, 0x8c, 0xa2, 0x6d, 0xe4, 0x5d, 0x2e, 0x14, 0x7c, 0x05, 0xac, 0xc8, 0xde, 0xd3, + 0x20, 0xbf, 0x33, 0xc8, 0xa2, 0x11, 0xeb, 0xdb, 0x19, 0xdc, 0x3e, 0x58, 0x0b, 0x78, 0x1c, 0xd3, + 0x40, 0x61, 0xc5, 0xc6, 0x94, 0xa7, 0x0a, 0xdd, 0x2d, 0xe7, 0xaa, 0xf9, 0xbd, 0xc7, 0x35, 0xcb, + 0x9c, 0x5a, 0xc6, 0x9c, 0x5a, 0xd3, 0x31, 0xcb, 0x2f, 0x39, 0x8b, 0xbe, 0x35, 0x80, 0x3f, 0x82, + 0x2d, 0x03, 0x0a, 0x78, 0x84, 0x43, 0xaa, 0x68, 0x60, 0xd8, 0x91, 0xb9, 0xdb, 0x59, 0xe4, 0x0e, + 0x65, 0xc6, 0xcd, 0xcc, 0x36, 0x73, 0xcc, 0x41, 0x51, 0x05, 0x09, 0x3e, 0xa7, 0x34, 0x21, 0x11, + 0xbb, 0xa0, 0xe8, 0x17, 0xc6, 0xd7, 0x51, 0xcd, 0x56, 0xc2, 0x94, 0x9f, 0x59, 0x3d, 0xbc, 0xab, + 0x35, 0xec, 0xd1, 0x18, 0x8f, 0xbb, 0x9c, 0x47, 0x3d, 0xaa, 0x14, 0x8b, 0x87, 0xb2, 0xd6, 0x6f, + 0x74, 0xa7, 0x7f, 0x07, 0xc9, 0xa7, 0xcc, 0xa3, 0x5f, 0x50, 0x33, 0x5f, 0xf0, 0x7b, 0x50, 0x64, + 0xf1, 0x50, 0x50, 0x29, 0x71, 0x10, 0x11, 0x29, 0xd1, 0x3d, 0xc3, 0xc1, 0x82, 0x13, 0x36, 0xb4, + 0x0c, 0xbe, 0x06, 0x6b, 0x19, 0x48, 0x33, 0x95, 0x05, 0x14, 0xad, 0x1a, 0x58, 0xc9, 0x89, 0x7b, + 0x56, 0x0a, 0xc7, 0xe0, 0xd1, 0xc4, 0x1b, 0x8f, 0x95, 0xe0, 0x51, 0x44, 0x05, 0x1e, 0xf3, 0x90, + 0xa2, 0xfb, 0xe5, 0x5c, 0xb5, 0xb4, 0xf7, 0x9b, 0xda, 0x9c, 0x92, 0xae, 0x4d, 0xeb, 0xa8, 0x76, + 0xe8, 0xe2, 0x4e, 0xac, 0x8f, 0x79, 0x48, 0xfd, 0x4d, 0x36, 0x4f, 0x0c, 0x3b, 0x20, 0x4f, 0x52, + 0x35, 0x72, 0x35, 0x81, 0x80, 0x09, 0xb1, 0xb3, 0x28, 0x44, 0x3d, 0x55, 0x23, 0x5b, 0x29, 0xfb, + 0x4b, 0x28, 0xe7, 0x03, 0x32, 0xf9, 0x86, 0x87, 0x60, 0x5d, 0x84, 0x12, 0x0b, 0x3a, 0x10, 0x54, + 0x8e, 0x70, 0x48, 0x23, 0x72, 0x85, 0xf2, 0x0b, 0x9e, 0xd3, 0x78, 0x59, 0x13, 0xa1, 0xf4, 0xad, + 0x59, 0x53, 0x5b, 0xc1, 0x97, 0xa0, 0x44, 0x63, 0x53, 0x7d, 0x4a, 0x90, 0x80, 0xc5, 0x43, 0x54, + 0x30, 0xac, 0x2f, 0x5a, 0x69, 0xdf, 0x0a, 0x35, 0x6b, 0x49, 0x10, 0xe8, 0x84, 0x45, 0x7c, 0x88, + 0x07, 0x2c, 0xa2, 0xa8, 0x68, 0x52, 0x5b, 0xb4, 0xe2, 0x36, 0x1f, 0x1e, 0xb0, 0x88, 0xea, 0x4a, + 0x98, 0xc5, 0x71, 0x31, 0x26, 0x0a, 0x21, 0x83, 0x5c, 0x9b, 0x22, 0x8d, 0x18, 0x12, 0xb0, 0x31, + 0x83, 0xa5, 0x71, 0xc0, 0x43, 0x1d, 0xff, 0x89, 0x49, 0xcf, 0xdb, 0x85, 0xe9, 0xc9, 0xbc, 0xb5, + 0x9c, 0xa1, 0xbf, 0x4e, 0x6e, 0x8a, 0x60, 0x13, 0x3c, 0x73, 0xb7, 0xa3, 0xf1, 0x05, 0xbf, 0xc2, + 0x33, 0xf1, 0x32, 0x86, 0x54, 0xcd, 0x75, 0x9f, 0x58, 0x58, 0x4b, 0xa3, 0x26, 0x9e, 0x33, 0xba, + 0x7c, 0x00, 0xa5, 0x90, 0x0e, 0x48, 0x1a, 0x29, 0x6c, 0xfb, 0x3e, 0x2a, 0x99, 0x5c, 0x97, 0xe7, + 0x9e, 0xb1, 0xab, 0xcb, 0xd8, 0x1e, 0xd2, 0x2f, 0x3a, 0x3b, 0xd7, 0x7d, 0x5f, 0x83, 0xa2, 0xed, + 0x71, 0x24, 0x0c, 0x35, 0x4f, 0x90, 0xa7, 0x33, 0x63, 0x1e, 0xa6, 0x60, 0x14, 0x75, 0x2b, 0xd7, + 0x04, 0xe5, 0xa9, 0x3a, 0xe3, 0x69, 0x1c, 0xea, 0x77, 0x19, 0x0c, 0x58, 0x90, 0xb1, 0x67, 0xdd, + 0x84, 0x5e, 0x48, 0xd0, 0x8e, 0x33, 0xef, 0x5b, 0x6b, 0x4b, 0x1c, 0x7f, 0x93, 0xcf, 0x13, 0xcf, + 0xa4, 0x29, 0x88, 0x18, 0x8d, 0x15, 0xd6, 0x2d, 0xef, 0x5a, 0x0b, 0x47, 0x1b, 0xb3, 0x69, 0x6a, + 0x18, 0x54, 0x8f, 0x85, 0xb3, 0xad, 0x1c, 0xbe, 0x00, 0x05, 0x19, 0x4a, 0x9c, 0x86, 0x12, 0x27, + 0x44, 0x8d, 0xd0, 0x83, 0xc9, 0xe5, 0x80, 0x0c, 0xe5, 0x69, 0x28, 0xbb, 0x44, 0x8d, 0x34, 0x77, + 0xe5, 0x2d, 0xee, 0x6e, 0xfe, 0x5f, 0xdc, 0x95, 0x37, 0xb8, 0xfb, 0x11, 0x94, 0xec, 0x7b, 0x60, + 0xc9, 0x53, 0x11, 0x50, 0x89, 0x1e, 0x96, 0x97, 0xab, 0xf9, 0xbd, 0xe7, 0x73, 0x93, 0x63, 0x13, + 0xd3, 0x33, 0x48, 0xbf, 0x18, 0xcc, 0x7c, 0x49, 0xd8, 0x04, 0x9e, 0x4b, 0x00, 0x49, 0x15, 0xc7, + 0x63, 0x15, 0x49, 0xf4, 0x2b, 0x73, 0xa6, 0xad, 0x5b, 0x67, 0xda, 0xe7, 0x3c, 0xfa, 0x4c, 0xa2, + 0x94, 0xfa, 0xae, 0x72, 0xea, 0xa9, 0xe2, 0xc7, 0x2a, 0x32, 0xd3, 0xc8, 0x79, 0xd1, 0x37, 0x54, + 0xfc, 0x9c, 0xc6, 0x78, 0xcc, 0xd3, 0x58, 0xa1, 0x47, 0x76, 0x1a, 0x59, 0x6d, 0x2f, 0x94, 0x7d, + 0xad, 0x3b, 0xd6, 0x2a, 0xb8, 0x03, 0xa0, 0xc9, 0x9a, 0xa4, 0xf8, 0xfc, 0xbd, 0xc4, 0x92, 0xe0, + 0xbf, 0x7d, 0x55, 0xe8, 0xa9, 0x31, 0x28, 0xe9, 0xbc, 0x49, 0xfa, 0xe9, 0xbd, 0xec, 0x91, 0xa3, + 0xaf, 0x0a, 0x3e, 0x07, 0x05, 0x25, 0x52, 0xa9, 0x70, 0xc8, 0xc7, 0x84, 0xc5, 0x68, 0xcb, 0x14, + 0x56, 0xde, 0xc8, 0x9a, 0x46, 0x04, 0x7f, 0x00, 0x0f, 0x66, 0x21, 0x98, 0x44, 0x8c, 0x48, 0x2a, + 0x51, 0xad, 0xbc, 0x5c, 0xbd, 0xef, 0xc3, 0x19, 0x68, 0xdd, 0x6a, 0xe0, 0xef, 0xc1, 0xe3, 0x8c, + 0xdd, 0xae, 0x26, 0x30, 0xbd, 0x34, 0xe3, 0x5e, 0x71, 0xf4, 0xcc, 0x98, 0x3d, 0x74, 0x00, 0x57, + 0x10, 0x2d, 0xa3, 0xee, 0x73, 0xf8, 0x11, 0x3c, 0xcf, 0x4c, 0x2f, 0x98, 0x50, 0x29, 0x89, 0xe6, + 0xb8, 0x28, 0x1b, 0x17, 0x4f, 0x1d, 0xf0, 0xb3, 0xc5, 0xdd, 0xf4, 0x74, 0x04, 0x2a, 0x99, 0xa7, + 0x9b, 0x8b, 0xcc, 0x8c, 0xab, 0xe7, 0xc6, 0xd5, 0xb6, 0x43, 0x36, 0xa7, 0x40, 0x3f, 0x8d, 0xa6, + 0xbe, 0x5e, 0x82, 0x92, 0xe0, 0x5c, 0xe1, 0x98, 0x8c, 0xa9, 0x4c, 0x48, 0x40, 0x51, 0xc5, 0xb6, + 0x2a, 0x2d, 0x3d, 0xc9, 0x84, 0x70, 0x00, 0x36, 0x22, 0x1e, 0x90, 0x88, 0xa9, 0x2b, 0x1c, 0x9d, + 0x61, 0x69, 0xa7, 0x10, 0xfa, 0xde, 0x3c, 0xfb, 0x6f, 0x7f, 0x62, 0x92, 0xb5, 0x9d, 0x55, 0x9b, + 0x93, 0x70, 0x9f, 0x44, 0x24, 0x0e, 0xa8, 0x70, 0x33, 0xcc, 0x5f, 0xcf, 0x5c, 0xb6, 0xcf, 0x9c, + 0x08, 0x36, 0x80, 0x17, 0xc6, 0x53, 0xc2, 0x0b, 0xa2, 0x28, 0x7a, 0xb1, 0x70, 0x92, 0x87, 0x71, + 0xc6, 0x75, 0x9f, 0x28, 0xaa, 0x9f, 0x35, 0xdb, 0x92, 0xdc, 0x2e, 0x76, 0x46, 0x54, 0x30, 0x42, + 0x2f, 0x0d, 0x4f, 0xa0, 0xd3, 0xd9, 0xb5, 0x68, 0x5f, 0x6b, 0xe0, 0xef, 0x00, 0x9a, 0x45, 0xe2, + 0x31, 0xb9, 0xc4, 0x34, 0x56, 0x82, 0x51, 0x89, 0x5e, 0x95, 0x73, 0xd5, 0xa2, 0xbf, 0x29, 0xa6, + 0xf0, 0x63, 0x72, 0xd9, 0xb2, 0x4a, 0xd8, 0x06, 0x9b, 0xb7, 0x0c, 0xf5, 0xca, 0x80, 0x5e, 0x2f, + 0x3a, 0x34, 0xbc, 0xee, 0x50, 0x2f, 0x0b, 0xf0, 0xaf, 0x60, 0x7d, 0xb4, 0x87, 0xd3, 0x64, 0x28, + 0xc8, 0xa4, 0xa5, 0xa0, 0x5f, 0x9a, 0x16, 0xbf, 0xbb, 0xa8, 0x87, 0x7d, 0xdc, 0x3b, 0xb5, 0x76, + 0xae, 0x7b, 0xad, 0x8d, 0xae, 0x0b, 0x34, 0x75, 0x59, 0x6c, 0xbb, 0x64, 0x10, 0xa5, 0x52, 0x51, + 0x81, 0xa5, 0x22, 0xf6, 0xe5, 0xd1, 0x1b, 0xf3, 0xe8, 0x0f, 0x1d, 0xa0, 0x61, 0xf5, 0x3d, 0x45, + 0x0c, 0x05, 0xf4, 0xda, 0x39, 0xe9, 0xb0, 0xb7, 0x6d, 0x7f, 0x6d, 0x6c, 0x27, 0x3d, 0xf8, 0xa6, + 0x71, 0x13, 0x14, 0x02, 0x2a, 0x14, 0x1b, 0xb0, 0x80, 0x28, 0x2a, 0xd1, 0xae, 0x69, 0x3b, 0xf3, + 0xc7, 0x41, 0x63, 0x0a, 0xf4, 0xaf, 0x59, 0xc1, 0x3f, 0x81, 0xa2, 0x1a, 0x09, 0x36, 0x98, 0x4c, + 0x95, 0xb7, 0x26, 0xc1, 0x6f, 0x16, 0xa5, 0xa5, 0x6f, 0x8c, 0xdc, 0x84, 0x29, 0xa8, 0x99, 0x2f, + 0xf8, 0x1e, 0xa0, 0xec, 0x32, 0x86, 0x88, 0xd3, 0x1a, 0x90, 0x68, 0xcf, 0x96, 0xb2, 0xd3, 0x1b, + 0x12, 0x4f, 0x8a, 0x41, 0x42, 0x1f, 0x3c, 0x72, 0xbd, 0x2b, 0x11, 0x7c, 0x4c, 0xd5, 0x88, 0xa6, + 0x12, 0x8f, 0xa9, 0x18, 0x52, 0xf4, 0x6e, 0x61, 0x23, 0xdc, 0xb4, 0xa6, 0xdd, 0x89, 0xe5, 0xb1, + 0x36, 0xdc, 0xfa, 0x67, 0x0e, 0x6c, 0xce, 0x9d, 0x43, 0xf0, 0x04, 0xac, 0x98, 0x6d, 0x2b, 0x67, + 0x88, 0xf0, 0x87, 0x9f, 0x35, 0xcc, 0x6a, 0x66, 0xe5, 0x32, 0x7e, 0x2a, 0x4d, 0xb0, 0x62, 0x36, + 0xad, 0x75, 0x50, 0xf4, 0x5b, 0x1f, 0x0e, 0x7b, 0x7d, 0xff, 0x0b, 0xee, 0x9c, 0xb4, 0xbf, 0x78, + 0x77, 0x60, 0x11, 0xdc, 0xaf, 0xb7, 0xdb, 0x9d, 0x1f, 0x71, 0xfd, 0xe4, 0x8b, 0x97, 0xab, 0xac, + 0xac, 0x2e, 0x79, 0x4b, 0x3b, 0x0f, 0x3e, 0x1f, 0xfa, 0xfd, 0xd3, 0x7a, 0x1b, 0xf7, 0x5a, 0xfe, + 0xe7, 0xc3, 0x46, 0xcb, 0x80, 0xb7, 0xfe, 0x0e, 0x0a, 0xb3, 0xb9, 0x85, 0x2f, 0x40, 0x49, 0x57, + 0x2b, 0x8e, 0xd8, 0x98, 0x29, 0x9c, 0x8a, 0xc8, 0xfd, 0x50, 0x2a, 0x68, 0x69, 0x5b, 0x0b, 0x4f, + 0x45, 0x04, 0x3f, 0x00, 0x38, 0x83, 0xca, 0x96, 0xeb, 0xa5, 0x45, 0xc5, 0xe2, 0x4d, 0x9c, 0xb8, + 0xa5, 0xba, 0x72, 0x04, 0x36, 0xe7, 0xae, 0x95, 0x70, 0x0d, 0xe4, 0x4f, 0x4f, 0x7a, 0xdd, 0x56, + 0xe3, 0xf0, 0xe0, 0xb0, 0xd5, 0xf4, 0xee, 0xc0, 0x7b, 0x60, 0xb9, 0x73, 0x70, 0xe0, 0xe5, 0x60, + 0x1e, 0xdc, 0x6b, 0xb6, 0x0e, 0xea, 0xa7, 0xed, 0xbe, 0xb7, 0x04, 0x01, 0xb8, 0xdb, 0xeb, 0xfb, + 0x87, 0x8d, 0xbe, 0xb7, 0x5c, 0x79, 0x05, 0xc0, 0x74, 0x7f, 0x84, 0xab, 0x60, 0xe5, 0xa4, 0x73, + 0xd2, 0xf2, 0xee, 0xc0, 0x12, 0x00, 0xc7, 0xa7, 0xe6, 0xe6, 0xfd, 0x76, 0xcf, 0xcb, 0x55, 0x5e, + 0x83, 0xf5, 0x5b, 0x8b, 0x94, 0x86, 0xf7, 0x5b, 0x7f, 0xee, 0x7b, 0x77, 0xf4, 0x5f, 0x47, 0xbd, + 0xce, 0x89, 0x97, 0xab, 0xec, 0x81, 0xb5, 0x1b, 0xe5, 0x08, 0x21, 0x28, 0x35, 0x3b, 0xf8, 0xa4, + 0xd3, 0xc7, 0xa7, 0xdd, 0x0f, 0x7e, 0xbd, 0xa9, 0xfd, 0xe7, 0xc1, 0xbd, 0xec, 0x23, 0x77, 0xb4, + 0xb2, 0xba, 0xe6, 0x79, 0x47, 0x2b, 0xab, 0xd0, 0xdb, 0xa8, 0xfc, 0x3b, 0x07, 0x0a, 0xb3, 0x13, + 0x18, 0x22, 0x70, 0x2f, 0xdb, 0x82, 0x6c, 0x56, 0xb3, 0x4f, 0xd8, 0x01, 0x05, 0x15, 0xc9, 0xac, + 0x21, 0x4b, 0x97, 0xca, 0x37, 0x3f, 0xf5, 0xdb, 0xc2, 0xec, 0x23, 0xfd, 0x76, 0x2f, 0xfb, 0x29, + 0xe1, 0xe7, 0x55, 0x24, 0xb3, 0x0f, 0xd8, 0x05, 0x0f, 0x64, 0x7a, 0x26, 0x03, 0xc1, 0xce, 0x68, + 0x88, 0x05, 0xcd, 0xb6, 0x85, 0xe5, 0xf2, 0x72, 0xb5, 0xb4, 0xf7, 0x74, 0x2e, 0xfb, 0x7c, 0x87, + 0xf2, 0x37, 0xa6, 0xa6, 0x99, 0x4c, 0x56, 0x3e, 0x81, 0xfc, 0x4c, 0x5d, 0xc3, 0x67, 0x20, 0x2f, + 0x69, 0x20, 0xa8, 0xeb, 0x1e, 0xf6, 0x3e, 0xc0, 0x8a, 0x4c, 0xc3, 0x78, 0x02, 0xee, 0xeb, 0x19, + 0x60, 0xaa, 0x11, 0x2d, 0x99, 0x42, 0x5c, 0x0d, 0x63, 0x69, 0xea, 0x6f, 0xa7, 0x0c, 0x56, 0x33, + 0xcf, 0xf0, 0x01, 0xf0, 0x32, 0x4a, 0x66, 0x44, 0xf6, 0xee, 0xec, 0x57, 0xff, 0xf5, 0x6d, 0x3b, + 0xf7, 0x9f, 0x6f, 0xdb, 0xb9, 0xff, 0x7e, 0xdb, 0xce, 0xfd, 0x65, 0xcb, 0x9e, 0x97, 0xf1, 0x5d, + 0x92, 0xb0, 0xdd, 0x6b, 0xff, 0x26, 0x38, 0xbb, 0x6b, 0x88, 0xf6, 0xee, 0x7f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x1a, 0xce, 0xc2, 0xc1, 0xaf, 0x10, 0x00, 0x00, } func (m *MeshConfig) Marshal() (dAtA []byte, err error) { @@ -1266,6 +1285,20 @@ func (m *MeshConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.EnablePrometheusMerge != nil { + { + size, err := m.EnablePrometheusMerge.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintConfig(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3 + i-- + dAtA[i] = 0x9a + } if len(m.ClusterLocalNamespaces) > 0 { for iNdEx := len(m.ClusterLocalNamespaces) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.ClusterLocalNamespaces[iNdEx]) @@ -1876,20 +1909,20 @@ func (m *ConfigSource) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.XXX_unrecognized) } if len(m.SubscribedResources) > 0 { - dAtA15 := make([]byte, len(m.SubscribedResources)*10) - var j14 int + dAtA16 := make([]byte, len(m.SubscribedResources)*10) + var j15 int for _, num := range m.SubscribedResources { for num >= 1<<7 { - dAtA15[j14] = uint8(uint64(num)&0x7f | 0x80) + dAtA16[j15] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j14++ + j15++ } - dAtA15[j14] = uint8(num) - j14++ + dAtA16[j15] = uint8(num) + j15++ } - i -= j14 - copy(dAtA[i:], dAtA15[:j14]) - i = encodeVarintConfig(dAtA, i, uint64(j14)) + i -= j15 + copy(dAtA[i:], dAtA16[:j15]) + i = encodeVarintConfig(dAtA, i, uint64(j15)) i-- dAtA[i] = 0x1a } @@ -2164,6 +2197,10 @@ func (m *MeshConfig) Size() (n int) { n += 2 + l + sovConfig(uint64(l)) } } + if m.EnablePrometheusMerge != nil { + l = m.EnablePrometheusMerge.Size() + n += 2 + l + sovConfig(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -3666,6 +3703,42 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } m.ClusterLocalNamespaces = append(m.ClusterLocalNamespaces, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 51: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EnablePrometheusMerge", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.EnablePrometheusMerge == nil { + m.EnablePrometheusMerge = &types.BoolValue{} + } + if err := m.EnablePrometheusMerge.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipConfig(dAtA[iNdEx:]) diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto index 55b5059b..72c1915f 100644 --- a/mesh/v1alpha1/config.proto +++ b/mesh/v1alpha1/config.proto @@ -417,8 +417,19 @@ message MeshConfig { // "kube-system" will be cluster-local. repeated string cluster_local_namespaces = 50; + // If enabled, Istio agent will merge metrics exposed by the application with metrics from Envoy + // and Istio agent. The sidecar injection will replace `prometheus.io` annotations present on the pod + // and redirect them towards Istio agent, which will then merge metrics of from the application with Istio metrics. + // This relies on the annotations `prometheus.io/scrape`, `prometheus.io/port`, and + // `prometheus.io/path` annotations. + // If you are running a separately managed Envoy with an Istio sidecar, this may cause issues, as the metrics will collide. + // In this case, it is recommended to disable aggregation on that deployment with the + // `prometheus.istio.io/merge-metrics: "false"` annotation. + // If not specified, this will be enabled by default. + google.protobuf.BoolValue enable_prometheus_merge = 51; + // $hide_from_docs - // Next available field number: 51 + // Next available field number: 52 } // Resource describes the source of configuration diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json b/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json index ca993234..baa0b2f7 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.gen.json @@ -235,6 +235,11 @@ "type": "string", "format": "string" } + }, + "enablePrometheusMerge": { + "description": "If enabled, Istio agent will merge metrics exposed by the application with metrics from Envoy and Istio agent. The sidecar injection will replace `prometheus.io` annotations present on the pod and redirect them towards Istio agent, which will then merge metrics of from the application with Istio metrics. This relies on the annotations `prometheus.io/scrape`, `prometheus.io/port`, and `prometheus.io/path` annotations. If you are running a separately managed Envoy with an Istio sidecar, this may cause issues, as the metrics will collide. In this case, it is recommended to disable aggregation on that deployment with the `prometheus.istio.io/merge-metrics: \"false\"` annotation. If not specified, this will be enabled by default.", + "type": "boolean", + "nullable": true } } }, diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index 55444760..f09c0d0b 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -1163,6 +1163,25 @@ No

Set configuration for Thrift protocol

+ + +No + + + +enablePrometheusMerge +BoolValue + +

If enabled, Istio agent will merge metrics exposed by the application with metrics from Envoy +and Istio agent. The sidecar injection will replace prometheus.io annotations present on the pod +and redirect them towards Istio agent, which will then merge metrics of from the application with Istio metrics. +This relies on the annotations prometheus.io/scrape, prometheus.io/port, and +prometheus.io/path annotations. +If you are running a separately managed Envoy with an Istio sidecar, this may cause issues, as the metrics will collide. +In this case, it is recommended to disable aggregation on that deployment with the +prometheus.istio.io/merge-metrics: "false" annotation. +If not specified, this will be enabled by default.

+ No diff --git a/python/istio_api/mesh/v1alpha1/config_pb2.py b/python/istio_api/mesh/v1alpha1/config_pb2.py index ac7f3ef6..e6ee1384 100644 --- a/python/istio_api/mesh/v1alpha1/config_pb2.py +++ b/python/istio_api/mesh/v1alpha1/config_pb2.py @@ -25,7 +25,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( package='istio.mesh.v1alpha1', syntax='proto3', serialized_options=_b('Z\032istio.io/api/mesh/v1alpha1'), - serialized_pb=_b('\n\x1amesh/v1alpha1/config.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a\x19mesh/v1alpha1/proxy.proto\x1a*networking/v1alpha3/destination_rule.proto\"\xe6\x14\n\nMeshConfig\x12\x1a\n\x12mixer_check_server\x18\x01 \x01(\t\x12\x1b\n\x13mixer_report_server\x18\x02 \x01(\t\x12\x1d\n\x15\x64isable_policy_checks\x18\x03 \x01(\x08\x12\"\n\x1a\x64isable_mixer_http_reports\x18\x30 \x01(\x08\x12\x1e\n\x16policy_check_fail_open\x18\x19 \x01(\x08\x12-\n%sidecar_to_telemetry_session_affinity\x18\x1e \x01(\x08\x12\x19\n\x11proxy_listen_port\x18\x04 \x01(\x05\x12\x17\n\x0fproxy_http_port\x18\x05 \x01(\x05\x12\x32\n\x0f\x63onnect_timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12=\n\x1aprotocol_detection_timeout\x18* \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x61\n\rtcp_keepalive\x18\x1c \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive\x12\x15\n\ringress_class\x18\x07 \x01(\t\x12\x17\n\x0fingress_service\x18\x08 \x01(\t\x12V\n\x17ingress_controller_mode\x18\t \x01(\x0e\x32\x35.istio.mesh.v1alpha1.MeshConfig.IngressControllerMode\x12\x43\n\x0b\x61uth_policy\x18\n \x01(\x0e\x32*.istio.mesh.v1alpha1.MeshConfig.AuthPolicyB\x02\x18\x01\x12\x38\n\x11rds_refresh_delay\x18\x0b \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x16\n\x0e\x65nable_tracing\x18\x0c \x01(\x08\x12\x17\n\x0f\x61\x63\x63\x65ss_log_file\x18\r \x01(\t\x12\x19\n\x11\x61\x63\x63\x65ss_log_format\x18\x18 \x01(\t\x12N\n\x13\x61\x63\x63\x65ss_log_encoding\x18\x1b \x01(\x0e\x32\x31.istio.mesh.v1alpha1.MeshConfig.AccessLogEncoding\x12\'\n\x1f\x65nable_envoy_access_log_service\x18( \x01(\x08\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\x19\n\rmixer_address\x18\x10 \x01(\tB\x02\x18\x01\x12V\n\x17outbound_traffic_policy\x18\x11 \x01(\x0b\x32\x35.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x18\n\x0csds_uds_path\x18\x14 \x01(\tB\x02\x18\x01\x12\x38\n\x11sds_refresh_delay\x18\x15 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x39\n\x0e\x63onfig_sources\x18\x16 \x03(\x0b\x32!.istio.mesh.v1alpha1.ConfigSource\x12\x34\n\x10\x65nable_auto_mtls\x18+ \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\x12\x1a\n\x12sds_use_k8s_sa_jwt\x18\x1d \x01(\x08\x12\x14\n\x0ctrust_domain\x18\x1a \x01(\t\x12\x1c\n\x14trust_domain_aliases\x18. \x03(\t\x12!\n\x19\x64\x65\x66\x61ult_service_export_to\x18\x1f \x03(\t\x12)\n!default_virtual_service_export_to\x18 \x03(\t\x12*\n\"default_destination_rule_export_to\x18! \x03(\t\x12\x16\n\x0eroot_namespace\x18\" \x01(\t\x12S\n\x13locality_lb_setting\x18# \x01(\x0b\x32\x36.istio.networking.v1alpha3.LocalityLoadBalancerSetting\x12\x33\n\x10\x64ns_refresh_rate\x18$ \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1c\n\x14\x64isable_report_batch\x18% \x01(\x08\x12 \n\x18report_batch_max_entries\x18& \x01(\r\x12\x38\n\x15report_batch_max_time\x18\' \x01(\x0b\x32\x19.google.protobuf.Duration\x12J\n\x11h2_upgrade_policy\x18) \x01(\x0e\x32/.istio.mesh.v1alpha1.MeshConfig.H2UpgradePolicy\x12!\n\x19inbound_cluster_stat_name\x18, \x01(\t\x12\"\n\x1aoutbound_cluster_stat_name\x18- \x01(\t\x12\x36\n\x0c\x63\x65rtificates\x18/ \x03(\x0b\x32 .istio.mesh.v1alpha1.Certificate\x12\x43\n\rthrift_config\x18\x31 \x01(\x0b\x32,.istio.mesh.v1alpha1.MeshConfig.ThriftConfig\x12 \n\x18\x63luster_local_namespaces\x18\x32 \x03(\t\x1a\xa7\x01\n\x15OutboundTrafficPolicy\x12H\n\x04mode\x18\x01 \x01(\x0e\x32:.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.Mode\"D\n\x04Mode\x12\x11\n\rREGISTRY_ONLY\x10\x00\x12\r\n\tALLOW_ANY\x10\x01\"\x04\x08\x02\x10\x02*\x14VIRTUAL_SERVICE_ONLY\x1a]\n\x0cThriftConfig\x12\x16\n\x0erate_limit_url\x18\x01 \x01(\t\x12\x35\n\x12rate_limit_timeout\x18\x02 \x01(\x0b\x32\x19.google.protobuf.Duration\"J\n\x15IngressControllerMode\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x07\n\x03OFF\x10\x01\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x02\x12\n\n\x06STRICT\x10\x03\"&\n\nAuthPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\"\'\n\x11\x41\x63\x63\x65ssLogEncoding\x12\x08\n\x04TEXT\x10\x00\x12\x08\n\x04JSON\x10\x01\"2\n\x0fH2UpgradePolicy\x12\x12\n\x0e\x44O_NOT_UPGRADE\x10\x00\x12\x0b\n\x07UPGRADE\x10\x01J\x04\x08\x0f\x10\x10J\x04\x08\x12\x10\x13\"\xa0\x01\n\x0c\x43onfigSource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x42\n\x0ctls_settings\x18\x02 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettings\x12;\n\x14subscribed_resources\x18\x03 \x03(\x0e\x32\x1d.istio.mesh.v1alpha1.Resource\"5\n\x0b\x43\x65rtificate\x12\x13\n\x0bsecret_name\x18\x01 \x01(\t\x12\x11\n\tdns_names\x18\x02 \x03(\t* \n\x08Resource\x12\x14\n\x10SERVICE_REGISTRY\x10\x00\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') + serialized_pb=_b('\n\x1amesh/v1alpha1/config.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a\x19mesh/v1alpha1/proxy.proto\x1a*networking/v1alpha3/destination_rule.proto\"\xa3\x15\n\nMeshConfig\x12\x1a\n\x12mixer_check_server\x18\x01 \x01(\t\x12\x1b\n\x13mixer_report_server\x18\x02 \x01(\t\x12\x1d\n\x15\x64isable_policy_checks\x18\x03 \x01(\x08\x12\"\n\x1a\x64isable_mixer_http_reports\x18\x30 \x01(\x08\x12\x1e\n\x16policy_check_fail_open\x18\x19 \x01(\x08\x12-\n%sidecar_to_telemetry_session_affinity\x18\x1e \x01(\x08\x12\x19\n\x11proxy_listen_port\x18\x04 \x01(\x05\x12\x17\n\x0fproxy_http_port\x18\x05 \x01(\x05\x12\x32\n\x0f\x63onnect_timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12=\n\x1aprotocol_detection_timeout\x18* \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x61\n\rtcp_keepalive\x18\x1c \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive\x12\x15\n\ringress_class\x18\x07 \x01(\t\x12\x17\n\x0fingress_service\x18\x08 \x01(\t\x12V\n\x17ingress_controller_mode\x18\t \x01(\x0e\x32\x35.istio.mesh.v1alpha1.MeshConfig.IngressControllerMode\x12\x43\n\x0b\x61uth_policy\x18\n \x01(\x0e\x32*.istio.mesh.v1alpha1.MeshConfig.AuthPolicyB\x02\x18\x01\x12\x38\n\x11rds_refresh_delay\x18\x0b \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x16\n\x0e\x65nable_tracing\x18\x0c \x01(\x08\x12\x17\n\x0f\x61\x63\x63\x65ss_log_file\x18\r \x01(\t\x12\x19\n\x11\x61\x63\x63\x65ss_log_format\x18\x18 \x01(\t\x12N\n\x13\x61\x63\x63\x65ss_log_encoding\x18\x1b \x01(\x0e\x32\x31.istio.mesh.v1alpha1.MeshConfig.AccessLogEncoding\x12\'\n\x1f\x65nable_envoy_access_log_service\x18( \x01(\x08\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\x19\n\rmixer_address\x18\x10 \x01(\tB\x02\x18\x01\x12V\n\x17outbound_traffic_policy\x18\x11 \x01(\x0b\x32\x35.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x18\n\x0csds_uds_path\x18\x14 \x01(\tB\x02\x18\x01\x12\x38\n\x11sds_refresh_delay\x18\x15 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x39\n\x0e\x63onfig_sources\x18\x16 \x03(\x0b\x32!.istio.mesh.v1alpha1.ConfigSource\x12\x34\n\x10\x65nable_auto_mtls\x18+ \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\x12\x1a\n\x12sds_use_k8s_sa_jwt\x18\x1d \x01(\x08\x12\x14\n\x0ctrust_domain\x18\x1a \x01(\t\x12\x1c\n\x14trust_domain_aliases\x18. \x03(\t\x12!\n\x19\x64\x65\x66\x61ult_service_export_to\x18\x1f \x03(\t\x12)\n!default_virtual_service_export_to\x18 \x03(\t\x12*\n\"default_destination_rule_export_to\x18! \x03(\t\x12\x16\n\x0eroot_namespace\x18\" \x01(\t\x12S\n\x13locality_lb_setting\x18# \x01(\x0b\x32\x36.istio.networking.v1alpha3.LocalityLoadBalancerSetting\x12\x33\n\x10\x64ns_refresh_rate\x18$ \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1c\n\x14\x64isable_report_batch\x18% \x01(\x08\x12 \n\x18report_batch_max_entries\x18& \x01(\r\x12\x38\n\x15report_batch_max_time\x18\' \x01(\x0b\x32\x19.google.protobuf.Duration\x12J\n\x11h2_upgrade_policy\x18) \x01(\x0e\x32/.istio.mesh.v1alpha1.MeshConfig.H2UpgradePolicy\x12!\n\x19inbound_cluster_stat_name\x18, \x01(\t\x12\"\n\x1aoutbound_cluster_stat_name\x18- \x01(\t\x12\x36\n\x0c\x63\x65rtificates\x18/ \x03(\x0b\x32 .istio.mesh.v1alpha1.Certificate\x12\x43\n\rthrift_config\x18\x31 \x01(\x0b\x32,.istio.mesh.v1alpha1.MeshConfig.ThriftConfig\x12 \n\x18\x63luster_local_namespaces\x18\x32 \x03(\t\x12;\n\x17\x65nable_prometheus_merge\x18\x33 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x1a\xa7\x01\n\x15OutboundTrafficPolicy\x12H\n\x04mode\x18\x01 \x01(\x0e\x32:.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.Mode\"D\n\x04Mode\x12\x11\n\rREGISTRY_ONLY\x10\x00\x12\r\n\tALLOW_ANY\x10\x01\"\x04\x08\x02\x10\x02*\x14VIRTUAL_SERVICE_ONLY\x1a]\n\x0cThriftConfig\x12\x16\n\x0erate_limit_url\x18\x01 \x01(\t\x12\x35\n\x12rate_limit_timeout\x18\x02 \x01(\x0b\x32\x19.google.protobuf.Duration\"J\n\x15IngressControllerMode\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x07\n\x03OFF\x10\x01\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x02\x12\n\n\x06STRICT\x10\x03\"&\n\nAuthPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\"\'\n\x11\x41\x63\x63\x65ssLogEncoding\x12\x08\n\x04TEXT\x10\x00\x12\x08\n\x04JSON\x10\x01\"2\n\x0fH2UpgradePolicy\x12\x12\n\x0e\x44O_NOT_UPGRADE\x10\x00\x12\x0b\n\x07UPGRADE\x10\x01J\x04\x08\x0f\x10\x10J\x04\x08\x12\x10\x13\"\xa0\x01\n\x0c\x43onfigSource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x42\n\x0ctls_settings\x18\x02 \x01(\x0b\x32,.istio.networking.v1alpha3.ClientTLSSettings\x12;\n\x14subscribed_resources\x18\x03 \x03(\x0e\x32\x1d.istio.mesh.v1alpha1.Resource\"5\n\x0b\x43\x65rtificate\x12\x13\n\x0bsecret_name\x18\x01 \x01(\t\x12\x11\n\tdns_names\x18\x02 \x03(\t* \n\x08Resource\x12\x14\n\x10SERVICE_REGISTRY\x10\x00\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,mesh_dot_v1alpha1_dot_proxy__pb2.DESCRIPTOR,networking_dot_v1alpha3_dot_destination__rule__pb2.DESCRIPTOR,]) @@ -42,8 +42,8 @@ _RESOURCE = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=3069, - serialized_end=3101, + serialized_start=3130, + serialized_end=3162, ) _sym_db.RegisterEnumDescriptor(_RESOURCE) @@ -68,8 +68,8 @@ _MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=2465, - serialized_end=2533, + serialized_start=2526, + serialized_end=2594, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE) @@ -98,8 +98,8 @@ _MESHCONFIG_INGRESSCONTROLLERMODE = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=2630, - serialized_end=2704, + serialized_start=2691, + serialized_end=2765, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_INGRESSCONTROLLERMODE) @@ -120,8 +120,8 @@ _MESHCONFIG_AUTHPOLICY = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=2706, - serialized_end=2744, + serialized_start=2767, + serialized_end=2805, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_AUTHPOLICY) @@ -142,8 +142,8 @@ _MESHCONFIG_ACCESSLOGENCODING = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=2746, - serialized_end=2785, + serialized_start=2807, + serialized_end=2846, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_ACCESSLOGENCODING) @@ -164,8 +164,8 @@ _MESHCONFIG_H2UPGRADEPOLICY = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=2787, - serialized_end=2837, + serialized_start=2848, + serialized_end=2898, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_H2UPGRADEPOLICY) @@ -197,8 +197,8 @@ _MESHCONFIG_OUTBOUNDTRAFFICPOLICY = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2366, - serialized_end=2533, + serialized_start=2427, + serialized_end=2594, ) _MESHCONFIG_THRIFTCONFIG = _descriptor.Descriptor( @@ -234,8 +234,8 @@ _MESHCONFIG_THRIFTCONFIG = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2535, - serialized_end=2628, + serialized_start=2596, + serialized_end=2689, ) _MESHCONFIG = _descriptor.Descriptor( @@ -581,6 +581,13 @@ _MESHCONFIG = _descriptor.Descriptor( message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='enable_prometheus_merge', full_name='istio.mesh.v1alpha1.MeshConfig.enable_prometheus_merge', index=48, + number=51, 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, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -598,7 +605,7 @@ _MESHCONFIG = _descriptor.Descriptor( oneofs=[ ], serialized_start=187, - serialized_end=2849, + serialized_end=2910, ) @@ -642,8 +649,8 @@ _CONFIGSOURCE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2852, - serialized_end=3012, + serialized_start=2913, + serialized_end=3073, ) @@ -680,8 +687,8 @@ _CERTIFICATE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=3014, - serialized_end=3067, + serialized_start=3075, + serialized_end=3128, ) _MESHCONFIG_OUTBOUNDTRAFFICPOLICY.fields_by_name['mode'].enum_type = _MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE @@ -707,6 +714,7 @@ _MESHCONFIG.fields_by_name['report_batch_max_time'].message_type = google_dot_pr _MESHCONFIG.fields_by_name['h2_upgrade_policy'].enum_type = _MESHCONFIG_H2UPGRADEPOLICY _MESHCONFIG.fields_by_name['certificates'].message_type = _CERTIFICATE _MESHCONFIG.fields_by_name['thrift_config'].message_type = _MESHCONFIG_THRIFTCONFIG +_MESHCONFIG.fields_by_name['enable_prometheus_merge'].message_type = google_dot_protobuf_dot_wrappers__pb2._BOOLVALUE _MESHCONFIG_INGRESSCONTROLLERMODE.containing_type = _MESHCONFIG _MESHCONFIG_AUTHPOLICY.containing_type = _MESHCONFIG _MESHCONFIG_ACCESSLOGENCODING.containing_type = _MESHCONFIG