From 5aa5337c901402a8bb81733cbb24dd4ddb6bec03 Mon Sep 17 00:00:00 2001
From: Shriram Rajagopalan <shriram@us.ibm.com>
Date: Wed, 7 Feb 2018 10:13:36 -0500
Subject: [PATCH 1/5] separate check and report clusters

---
 mesh/v1alpha1/config.pb.go                | 158 ++++++++++++----------
 mesh/v1alpha1/config.proto                |  32 ++++-
 mesh/v1alpha1/istio.mesh.v1alpha1.pb.html |  34 ++++-
 3 files changed, 142 insertions(+), 82 deletions(-)

diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go
index 291c818adb..a234f5afa2 100644
--- a/mesh/v1alpha1/config.pb.go
+++ b/mesh/v1alpha1/config.pb.go
@@ -302,11 +302,31 @@ func (m *ProxyConfig) GetConcurrency() int32 {
 // MeshConfig defines mesh-wide variables shared by all Envoy instances in the
 // Istio service mesh.
 type MeshConfig struct {
-	// Address of the egress Envoy service (e.g. _istio-egress:80_).
-	EgressProxyAddress string `protobuf:"bytes,1,opt,name=egress_proxy_address,json=egressProxyAddress" json:"egress_proxy_address,omitempty"`
-	// Address of the mixer service (e.g. _istio-mixer:15004_).
-	// Empty value disables Mixer checks and telemetry.
-	MixerAddress string `protobuf:"bytes,2,opt,name=mixer_address,json=mixerAddress" json:"mixer_address,omitempty"`
+	// Address of the server that will be used by the proxies for policy
+	// check calls (e.g. _istio-mixer:15004_). By using different names for
+	// policyCheckServer and telemetryServer, it is possible to have one set
+	// of mixer servers handle policy check calls, while another set of mixer
+	// servers handle telemetry calls.
+	//
+	// NOTE: The out-of-box istio configuration assumes the same server for
+	// both policy checks and telemetry (e.g., _istio-mixer:15004_). If
+	// policyCheckServer and telemetryServer have different values, the
+	// default Istio Grafana Dashboards will have to be reconfigured
+	// appropriately.
+	PolicyCheckServer string `protobuf:"bytes,1,opt,name=policy_check_server,json=policyCheckServer" json:"policy_check_server,omitempty"`
+	// Address of the server that will be used by the proxies as an Istio
+	// telemetry sink (access logs, API/connection metrics)
+	// (e.g. _istio-mixer:15004_). By using different names for
+	// policyCheckServer and telemetryServer, it is possible to have one set
+	// of mixer servers handle policy check calls, while another set of mixer
+	// servers handle telemetry calls.
+	//
+	// NOTE: The out-of-box istio configuration assumes the same server for
+	// both policy checks and telemetry (e.g., _istio-mixer:15004_). If
+	// policyCheckServer and telemetryServer have different values, the
+	// default Istio Grafana Dashboards will have to be reconfigured
+	// appropriately.
+	TelemetryServer string `protobuf:"bytes,2,opt,name=telemetry_server,json=telemetryServer" json:"telemetry_server,omitempty"`
 	// Disable policy checks by the mixer service. Metrics will still be
 	// reported to the mixer for HTTP requests and TCP connections. Default
 	// is false, i.e. mixer policy check is enabled by default.
@@ -358,16 +378,16 @@ func (m *MeshConfig) String() string            { return proto.CompactTextString
 func (*MeshConfig) ProtoMessage()               {}
 func (*MeshConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
-func (m *MeshConfig) GetEgressProxyAddress() string {
+func (m *MeshConfig) GetPolicyCheckServer() string {
 	if m != nil {
-		return m.EgressProxyAddress
+		return m.PolicyCheckServer
 	}
 	return ""
 }
 
-func (m *MeshConfig) GetMixerAddress() string {
+func (m *MeshConfig) GetTelemetryServer() string {
 	if m != nil {
-		return m.MixerAddress
+		return m.TelemetryServer
 	}
 	return ""
 }
@@ -474,64 +494,64 @@ func init() {
 func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 941 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4d, 0x6f, 0xe3, 0x36,
-	0x13, 0x5e, 0xe7, 0xcb, 0xc9, 0x38, 0x96, 0x1d, 0x6d, 0x92, 0xd5, 0x06, 0x2f, 0xde, 0x1a, 0x59,
-	0x74, 0xeb, 0xa6, 0x85, 0xdd, 0x4d, 0xdb, 0x43, 0x2f, 0x45, 0xf3, 0xd9, 0x0d, 0xe0, 0x24, 0xae,
-	0xe2, 0x5c, 0xf6, 0x42, 0x30, 0x12, 0x63, 0x11, 0x4b, 0x93, 0x02, 0x49, 0xa5, 0xf1, 0xfe, 0xaf,
-	0xfe, 0x9e, 0x5e, 0xfb, 0x33, 0x0a, 0x71, 0x28, 0xc7, 0x5d, 0xb8, 0x08, 0x7a, 0xd4, 0x33, 0xcf,
-	0xcc, 0x70, 0x3e, 0x9e, 0x11, 0xec, 0x4d, 0x98, 0xc9, 0xfa, 0x0f, 0xef, 0xa8, 0xc8, 0x33, 0xfa,
-	0xae, 0x9f, 0x28, 0x79, 0xcf, 0xc7, 0xbd, 0x5c, 0x2b, 0xab, 0xc2, 0x97, 0xdc, 0x58, 0xae, 0x7a,
-	0x25, 0xa3, 0x57, 0x31, 0xf6, 0xfe, 0x3f, 0x56, 0x6a, 0x2c, 0x58, 0xdf, 0x51, 0xee, 0x8a, 0xfb,
-	0x7e, 0x5a, 0x68, 0x6a, 0xb9, 0x92, 0xe8, 0xb4, 0xff, 0xe7, 0x1a, 0x34, 0x86, 0x5a, 0x3d, 0x4e,
-	0x4f, 0x5c, 0xa8, 0xf0, 0x0b, 0x68, 0x60, 0x50, 0x92, 0x53, 0x9b, 0x45, 0xb5, 0x4e, 0xad, 0xbb,
-	0x11, 0x03, 0x42, 0x43, 0x6a, 0xb3, 0x92, 0x70, 0xc7, 0x25, 0xd5, 0x53, 0x24, 0x2c, 0x21, 0x01,
-	0x21, 0x47, 0xf8, 0x0a, 0x5a, 0x86, 0xe9, 0x07, 0x9e, 0x30, 0x92, 0x88, 0xc2, 0x58, 0xa6, 0xa3,
-	0x65, 0x47, 0x0a, 0x3c, 0x7c, 0x82, 0x68, 0xf8, 0x0b, 0x04, 0xa9, 0xa6, 0x5c, 0x92, 0xea, 0x49,
-	0xd1, 0x4a, 0xa7, 0xd6, 0x6d, 0x1c, 0xbe, 0xee, 0xe1, 0x9b, 0x7b, 0xd5, 0x9b, 0x7b, 0xa7, 0x9e,
-	0x10, 0x37, 0x9d, 0x43, 0xf5, 0x19, 0xde, 0x40, 0x94, 0x53, 0xcd, 0xa4, 0x25, 0x26, 0x2b, 0x6c,
-	0xaa, 0x7e, 0x9f, 0x8b, 0xb5, 0xfa, 0x5c, 0xac, 0x5d, 0x74, 0xbd, 0xf1, 0x9e, 0xb3, 0xa0, 0xdf,
-	0xc0, 0x56, 0xca, 0x4d, 0xa2, 0x1e, 0x98, 0x9e, 0x12, 0x9a, 0xa6, 0x9a, 0x19, 0x13, 0xad, 0xb9,
-	0x0a, 0xda, 0x33, 0xc3, 0x11, 0xe2, 0xe1, 0x6f, 0xf0, 0xea, 0x89, 0xac, 0xd9, 0xbd, 0x66, 0x26,
-	0x23, 0x29, 0x13, 0x74, 0x1a, 0xd5, 0x9f, 0x7b, 0xc0, 0xce, 0xcc, 0x33, 0x46, 0xc7, 0xd3, 0xd2,
-	0x2f, 0xfc, 0x12, 0x82, 0x4f, 0x3c, 0xff, 0xc8, 0xe5, 0x2c, 0xf9, 0xba, 0x4b, 0xde, 0x44, 0xb4,
-	0xca, 0x7c, 0x0c, 0xad, 0x44, 0x49, 0xc9, 0x12, 0x4b, 0x2c, 0x9f, 0x30, 0x55, 0xd8, 0x68, 0xe3,
-	0xb9, 0x8c, 0x81, 0xf7, 0x18, 0xa1, 0x43, 0xf8, 0x2d, 0x84, 0xc6, 0x52, 0x6b, 0x52, 0x52, 0xa4,
-	0xf9, 0x2c, 0x1d, 0x60, 0xad, 0x68, 0xb9, 0x4d, 0xf3, 0x2a, 0x63, 0x17, 0xda, 0x79, 0xb9, 0x29,
-	0x84, 0xa6, 0x13, 0x2e, 0x49, 0xae, 0xb4, 0x8d, 0x1a, 0x9d, 0x5a, 0x77, 0x35, 0x0e, 0x1c, 0x7e,
-	0x54, 0xc2, 0x43, 0xa5, 0x6d, 0xd9, 0x42, 0xfa, 0x40, 0xb9, 0xa0, 0x77, 0x5c, 0x70, 0x3b, 0x25,
-	0x9f, 0x94, 0x64, 0xd1, 0x26, 0x86, 0x9d, 0x37, 0x7c, 0x50, 0x92, 0x85, 0x29, 0xbc, 0x4e, 0x94,
-	0xb4, 0x5a, 0x09, 0x92, 0x0b, 0x2a, 0x19, 0xa1, 0x85, 0xcd, 0x48, 0xae, 0x04, 0x4f, 0xa6, 0x51,
-	0xb3, 0x53, 0xeb, 0x06, 0x87, 0x5f, 0xf7, 0x16, 0xac, 0x76, 0xef, 0xa8, 0xb0, 0x19, 0x93, 0x96,
-	0x27, 0xae, 0xb8, 0xa1, 0x73, 0x88, 0x77, 0x7d, 0xac, 0x61, 0x19, 0xaa, 0x64, 0x20, 0x5e, 0x96,
-	0x9a, 0x14, 0xc6, 0xaa, 0x09, 0xf1, 0xeb, 0x7d, 0xcf, 0x05, 0x8b, 0x02, 0x7c, 0x13, 0x5a, 0x50,
-	0x01, 0xe7, 0x5c, 0xb0, 0xb2, 0xd4, 0xb2, 0x7c, 0x22, 0xe9, 0x84, 0x11, 0xc1, 0xe4, 0xd8, 0x66,
-	0x51, 0x0b, 0x4b, 0x2d, 0xf1, 0x2b, 0x3a, 0x61, 0x03, 0x87, 0x86, 0x1d, 0xa7, 0x97, 0xa4, 0xd0,
-	0x9a, 0xc9, 0x64, 0x1a, 0xb5, 0x1d, 0x69, 0x1e, 0xda, 0xff, 0xa3, 0x0e, 0x70, 0xc9, 0x4c, 0xe6,
-	0x05, 0xf6, 0x1d, 0x6c, 0xb3, 0x71, 0xd9, 0x4f, 0x52, 0x35, 0x13, 0xbb, 0x8e, 0x4a, 0x0b, 0xd1,
-	0x36, 0xc4, 0x7e, 0x62, 0xdf, 0xdf, 0x40, 0x73, 0xc2, 0x1f, 0x99, 0x9e, 0x51, 0x51, 0x73, 0x9b,
-	0x0e, 0xac, 0x48, 0x87, 0x50, 0xae, 0x13, 0xbd, 0x13, 0xcc, 0xb7, 0x8e, 0x24, 0x19, 0x4b, 0x3e,
-	0x1a, 0xa7, 0xbd, 0xf5, 0xf8, 0xa5, 0x37, 0x62, 0x37, 0x4e, 0x9c, 0x29, 0x3c, 0x80, 0x2d, 0x7c,
-	0x83, 0xe0, 0xc6, 0x32, 0x3f, 0xd1, 0x15, 0x57, 0x41, 0xcb, 0x19, 0x06, 0x0e, 0x77, 0x23, 0x7d,
-	0x0b, 0x08, 0x91, 0xcc, 0xda, 0x1c, 0x99, 0xab, 0x8e, 0xd9, 0x74, 0xf0, 0x7b, 0x6b, 0x73, 0xc7,
-	0x5b, 0xb0, 0x96, 0x6b, 0xff, 0x75, 0x2d, 0xdf, 0x40, 0x93, 0x4b, 0xec, 0x51, 0x22, 0xa8, 0x31,
-	0x4e, 0x4a, 0x1b, 0xf1, 0xa6, 0x07, 0x4f, 0x4a, 0xac, 0x3c, 0x33, 0x15, 0xc9, 0xdf, 0x15, 0xaf,
-	0x93, 0xc0, 0xc3, 0x37, 0x88, 0x86, 0x13, 0x78, 0x35, 0x8b, 0x86, 0xbb, 0x21, 0x98, 0x26, 0x13,
-	0x95, 0x32, 0x27, 0x98, 0xe0, 0xf0, 0xc7, 0x85, 0xdb, 0xf5, 0x34, 0xb2, 0xde, 0x85, 0xcf, 0x3b,
-	0xf3, 0xbe, 0x54, 0x29, 0x8b, 0x77, 0xf8, 0x22, 0x38, 0xbc, 0x86, 0xc6, 0xfc, 0x02, 0x83, 0x4b,
-	0x71, 0xf0, 0x5c, 0x8a, 0xa7, 0x4d, 0x3d, 0x5e, 0x8a, 0x6a, 0x31, 0xd0, 0xa7, 0xcd, 0x3d, 0x83,
-	0x2d, 0x9d, 0x9a, 0xcf, 0x8e, 0x4b, 0xe3, 0xb9, 0x9e, 0xb6, 0x74, 0x6a, 0x3e, 0x3f, 0x2b, 0x4c,
-	0xba, 0xfd, 0xb0, 0x9a, 0x26, 0x5c, 0x8e, 0x9d, 0x20, 0xd7, 0xe3, 0x26, 0xa2, 0x23, 0x04, 0xcb,
-	0x39, 0xd3, 0x24, 0x29, 0x9b, 0x25, 0x94, 0x17, 0x49, 0x13, 0xcf, 0x0f, 0xc2, 0x03, 0x85, 0x0a,
-	0xf9, 0x15, 0x82, 0x94, 0xdd, 0xd3, 0x42, 0x58, 0x2f, 0x28, 0xa7, 0xa5, 0xc6, 0x61, 0x67, 0x61,
-	0xa5, 0x73, 0x7f, 0x98, 0xb8, 0xe9, 0xfd, 0xbc, 0x1e, 0x7e, 0x80, 0xdd, 0x89, 0x15, 0x86, 0xb0,
-	0xc7, 0x44, 0x14, 0x29, 0x4b, 0xab, 0x69, 0x9a, 0xa8, 0xd5, 0x59, 0xee, 0x6e, 0xc4, 0xdb, 0xa5,
-	0xf5, 0xcc, 0x1b, 0xfd, 0x4c, 0xcd, 0xfe, 0x4f, 0xb0, 0xb3, 0x70, 0x2a, 0x61, 0x1d, 0x96, 0xaf,
-	0xcf, 0xcf, 0xdb, 0x2f, 0xc2, 0x06, 0xd4, 0x4f, 0xcf, 0xce, 0x8f, 0x6e, 0x07, 0xa3, 0x76, 0x2d,
-	0x04, 0x58, 0xbb, 0x19, 0xc5, 0x17, 0x27, 0xa3, 0xf6, 0xd2, 0xfe, 0x5b, 0x80, 0xb9, 0xbb, 0xb0,
-	0x0e, 0x2b, 0x57, 0xd7, 0x57, 0x67, 0xed, 0x17, 0x61, 0x00, 0x70, 0x79, 0x3b, 0xba, 0x3d, 0x1a,
-	0x90, 0xd1, 0xe0, 0xa6, 0x5d, 0x3b, 0xf8, 0x19, 0xb6, 0x17, 0x5d, 0x98, 0x7f, 0xf7, 0x08, 0x37,
-	0xa1, 0x7e, 0x71, 0xf5, 0xfe, 0x2c, 0xbe, 0x18, 0xb5, 0xff, 0xaa, 0x1f, 0xff, 0xef, 0xc3, 0x1e,
-	0xb6, 0x82, 0xab, 0x3e, 0xcd, 0x79, 0xff, 0x1f, 0x7f, 0xee, 0xbb, 0x35, 0x37, 0xb2, 0xef, 0xff,
-	0x0e, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xbd, 0xe4, 0xe0, 0xd1, 0x07, 0x00, 0x00,
+	// 942 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4d, 0x6f, 0xdb, 0x46,
+	0x10, 0x8d, 0xe2, 0x0f, 0xd9, 0x23, 0x8b, 0xa2, 0xe9, 0xd8, 0x61, 0x8c, 0xa2, 0x15, 0x5c, 0x34,
+	0x55, 0xdc, 0x82, 0x42, 0xdc, 0xf6, 0xd0, 0x4b, 0x51, 0x7f, 0x36, 0x06, 0x64, 0x5b, 0xa5, 0xe4,
+	0x4b, 0x2e, 0x8b, 0x35, 0xb9, 0x16, 0x17, 0x59, 0xee, 0x12, 0xbb, 0x4b, 0x37, 0xca, 0x3f, 0xeb,
+	0xaf, 0xe9, 0xb5, 0x3f, 0xa3, 0xd8, 0x0f, 0xc9, 0x6a, 0xa0, 0xc2, 0xe8, 0x51, 0x6f, 0xde, 0xcc,
+	0xec, 0x70, 0xde, 0x1b, 0xc1, 0x7e, 0x49, 0x54, 0xd1, 0x7f, 0x78, 0x8b, 0x59, 0x55, 0xe0, 0xb7,
+	0xfd, 0x4c, 0xf0, 0x7b, 0x3a, 0x49, 0x2a, 0x29, 0xb4, 0x88, 0x76, 0xa8, 0xd2, 0x54, 0x24, 0x86,
+	0x91, 0xcc, 0x18, 0xfb, 0x5f, 0x4e, 0x84, 0x98, 0x30, 0xd2, 0xb7, 0x94, 0xbb, 0xfa, 0xbe, 0x9f,
+	0xd7, 0x12, 0x6b, 0x2a, 0xb8, 0x4b, 0x3a, 0xf8, 0x6b, 0x1d, 0x5a, 0x43, 0x29, 0x3e, 0x4e, 0x4f,
+	0x6d, 0xa9, 0xe8, 0x2b, 0x68, 0xb9, 0xa2, 0xa8, 0xc2, 0xba, 0x88, 0x1b, 0xdd, 0x46, 0x6f, 0x33,
+	0x05, 0x07, 0x0d, 0xb1, 0x2e, 0x0c, 0xe1, 0x8e, 0x72, 0x2c, 0xa7, 0x8e, 0xf0, 0xdc, 0x11, 0x1c,
+	0x64, 0x09, 0xdf, 0x42, 0x47, 0x11, 0xf9, 0x40, 0x33, 0x82, 0x32, 0x56, 0x2b, 0x4d, 0x64, 0xbc,
+	0x62, 0x49, 0x81, 0x87, 0x4f, 0x1d, 0x1a, 0xfd, 0x0a, 0x41, 0x2e, 0x31, 0xe5, 0x68, 0xf6, 0xa4,
+	0x78, 0xb5, 0xdb, 0xe8, 0xb5, 0x8e, 0x5e, 0x25, 0xee, 0xcd, 0xc9, 0xec, 0xcd, 0xc9, 0x99, 0x27,
+	0xa4, 0x6d, 0x9b, 0x30, 0xfb, 0x19, 0x8d, 0x20, 0xae, 0xb0, 0x24, 0x5c, 0x23, 0x55, 0xd4, 0x3a,
+	0x17, 0x7f, 0x2c, 0xd4, 0x5a, 0x7b, 0xaa, 0xd6, 0x9e, 0x4b, 0x1d, 0xf9, 0xcc, 0x79, 0xd1, 0xef,
+	0x60, 0x3b, 0xa7, 0x2a, 0x13, 0x0f, 0x44, 0x4e, 0x11, 0xce, 0x73, 0x49, 0x94, 0x8a, 0xd7, 0xed,
+	0x04, 0xe1, 0x3c, 0x70, 0xec, 0xf0, 0xe8, 0x77, 0x78, 0xf9, 0x48, 0x96, 0xe4, 0x5e, 0x12, 0x55,
+	0xa0, 0x9c, 0x30, 0x3c, 0x8d, 0x9b, 0x4f, 0x3d, 0x60, 0x77, 0x9e, 0x99, 0xba, 0xc4, 0x33, 0x93,
+	0x17, 0x7d, 0x03, 0xc1, 0x27, 0x5a, 0x7d, 0xa0, 0x7c, 0xde, 0x7c, 0xc3, 0x36, 0x6f, 0x3b, 0x74,
+	0xd6, 0xf9, 0x04, 0x3a, 0x99, 0xe0, 0x9c, 0x64, 0x1a, 0x69, 0x5a, 0x12, 0x51, 0xeb, 0x78, 0xf3,
+	0xa9, 0x8e, 0x81, 0xcf, 0x18, 0xbb, 0x84, 0xe8, 0x7b, 0x88, 0x94, 0xc6, 0x5a, 0xe5, 0xa8, 0xce,
+	0xab, 0x79, 0x3b, 0x70, 0xb3, 0xba, 0xc8, 0x6d, 0x5e, 0xcd, 0x3a, 0xf6, 0x20, 0xac, 0x8c, 0x52,
+	0x10, 0xce, 0x4b, 0xca, 0x51, 0x25, 0xa4, 0x8e, 0x5b, 0xdd, 0x46, 0x6f, 0x2d, 0x0d, 0x2c, 0x7e,
+	0x6c, 0xe0, 0xa1, 0x90, 0xda, 0x7c, 0x42, 0xfc, 0x80, 0x29, 0xc3, 0x77, 0x94, 0x51, 0x3d, 0x45,
+	0x9f, 0x04, 0x27, 0xf1, 0x96, 0x2b, 0xbb, 0x18, 0x78, 0x2f, 0x38, 0x89, 0x72, 0x78, 0x95, 0x09,
+	0xae, 0xa5, 0x60, 0xa8, 0x62, 0x98, 0x13, 0x84, 0x6b, 0x5d, 0xa0, 0x4a, 0x30, 0x9a, 0x4d, 0xe3,
+	0x76, 0xb7, 0xd1, 0x0b, 0x8e, 0xde, 0x24, 0x4b, 0xa4, 0x9d, 0x1c, 0xd7, 0xba, 0x20, 0x5c, 0xd3,
+	0xcc, 0x0e, 0x37, 0xb4, 0x09, 0xe9, 0x9e, 0xaf, 0x35, 0x34, 0xa5, 0x0c, 0xc3, 0xe1, 0x66, 0xd4,
+	0xac, 0x56, 0x5a, 0x94, 0xc8, 0xcb, 0xfb, 0x9e, 0x32, 0x12, 0x07, 0xee, 0x4d, 0x2e, 0xe2, 0x1c,
+	0x70, 0x41, 0x19, 0x31, 0xa3, 0x9a, 0xf1, 0x11, 0xc7, 0x25, 0x41, 0x8c, 0xf0, 0x89, 0x2e, 0xe2,
+	0x8e, 0x1b, 0xd5, 0xe0, 0xd7, 0xb8, 0x24, 0x03, 0x8b, 0x46, 0x5d, 0xeb, 0x97, 0xac, 0x96, 0x92,
+	0xf0, 0x6c, 0x1a, 0x87, 0x96, 0xb4, 0x08, 0x1d, 0xfc, 0xd9, 0x04, 0xb8, 0x22, 0xaa, 0xf0, 0x06,
+	0x4b, 0x60, 0xc7, 0xcd, 0x86, 0xb2, 0x82, 0x64, 0x1f, 0x90, 0x31, 0x05, 0x91, 0xde, 0x68, 0xdb,
+	0x2e, 0x74, 0x6a, 0x22, 0x23, 0x1b, 0x88, 0xde, 0x40, 0xa8, 0x09, 0x23, 0x25, 0xd1, 0x72, 0x3a,
+	0x23, 0x3b, 0xd3, 0x75, 0xe6, 0xb8, 0xa7, 0x1e, 0x81, 0x91, 0x14, 0xbe, 0x63, 0x04, 0x2d, 0xb6,
+	0x50, 0xd6, 0x7f, 0x1b, 0xe9, 0x8e, 0x0f, 0x0e, 0x1f, 0x7b, 0xa8, 0xe8, 0x10, 0xb6, 0xdd, 0x52,
+	0x19, 0x55, 0x9a, 0xf8, 0xad, 0xae, 0xda, 0x29, 0x3a, 0x36, 0x30, 0xb0, 0xb8, 0x5d, 0xeb, 0x6b,
+	0x70, 0x10, 0x2a, 0xb4, 0xae, 0x1c, 0x73, 0xcd, 0x32, 0xdb, 0x16, 0x7e, 0xa7, 0x75, 0x65, 0x79,
+	0x4b, 0xa4, 0xb9, 0xfe, 0x7f, 0xa5, 0xf9, 0x35, 0xb4, 0x29, 0x9f, 0x18, 0xdd, 0xa1, 0x8c, 0x61,
+	0xa5, 0xac, 0x9d, 0x36, 0xd3, 0x2d, 0x0f, 0x9e, 0x1a, 0xcc, 0x9c, 0x9a, 0x19, 0xc9, 0xdf, 0x16,
+	0xef, 0x95, 0xc0, 0xc3, 0x23, 0x87, 0x46, 0x25, 0xbc, 0x9c, 0x57, 0x73, 0xfa, 0x60, 0x44, 0xa2,
+	0x52, 0xe4, 0xc4, 0x9a, 0x26, 0x38, 0xfa, 0x69, 0xa9, 0xc2, 0x1e, 0xd7, 0x96, 0x5c, 0xfa, 0xbe,
+	0xf3, 0xec, 0x2b, 0x91, 0x93, 0x74, 0x97, 0x2e, 0x83, 0xa3, 0x1b, 0x68, 0x2d, 0x8a, 0x18, 0x6c,
+	0x8b, 0xc3, 0xa7, 0x5a, 0x3c, 0xaa, 0xf5, 0xe4, 0x79, 0xdc, 0x48, 0x01, 0x3f, 0xaa, 0xf7, 0x1c,
+	0xb6, 0x65, 0xae, 0x3e, 0x3b, 0x30, 0xad, 0xa7, 0xbe, 0x69, 0x47, 0xe6, 0xea, 0xf3, 0xd3, 0x42,
+	0xb8, 0xd5, 0x87, 0x96, 0x38, 0xa3, 0x7c, 0x62, 0x4d, 0xb9, 0x91, 0xb6, 0x1d, 0x3a, 0x76, 0xa0,
+	0xd9, 0x33, 0xce, 0x32, 0xf3, 0xb1, 0x98, 0xf0, 0x46, 0x69, 0xbb, 0x13, 0xe4, 0xe0, 0x81, 0x70,
+	0x2e, 0xf9, 0x0d, 0x82, 0x9c, 0xdc, 0xe3, 0x9a, 0x69, 0x6f, 0x2a, 0xeb, 0xa7, 0xd6, 0x51, 0x77,
+	0xe9, 0xa4, 0x0b, 0xff, 0x32, 0x69, 0xdb, 0xe7, 0x79, 0x4f, 0xfc, 0x08, 0x7b, 0xa5, 0x66, 0x0a,
+	0x91, 0x8f, 0x19, 0xab, 0x73, 0x92, 0xcf, 0xb6, 0xa9, 0xe2, 0x4e, 0x77, 0xa5, 0xb7, 0x99, 0xbe,
+	0x30, 0xd1, 0x73, 0x1f, 0xf4, 0x3b, 0x55, 0x07, 0x3f, 0xc3, 0xee, 0xd2, 0xad, 0x44, 0x4d, 0x58,
+	0xb9, 0xb9, 0xb8, 0x08, 0x9f, 0x45, 0x2d, 0x68, 0x9e, 0x9d, 0x5f, 0x1c, 0xdf, 0x0e, 0xc6, 0x61,
+	0x23, 0x02, 0x58, 0x1f, 0x8d, 0xd3, 0xcb, 0xd3, 0x71, 0xf8, 0xfc, 0xe0, 0x35, 0xc0, 0xc2, 0x6d,
+	0xd8, 0x80, 0xd5, 0xeb, 0x9b, 0xeb, 0xf3, 0xf0, 0x59, 0x14, 0x00, 0x5c, 0xdd, 0x8e, 0x6f, 0x8f,
+	0x07, 0x68, 0x3c, 0x18, 0x85, 0x8d, 0xc3, 0x5f, 0xe0, 0xc5, 0xb2, 0x2b, 0xf3, 0xdf, 0x19, 0xd1,
+	0x16, 0x34, 0x2f, 0xaf, 0xdf, 0x9d, 0xa7, 0x97, 0xe3, 0xf0, 0xef, 0xe6, 0xc9, 0x17, 0xef, 0xf7,
+	0xdd, 0xa7, 0xa0, 0xa2, 0x8f, 0x2b, 0xda, 0xff, 0xd7, 0xbf, 0xf7, 0xdd, 0xba, 0x5d, 0xd9, 0x0f,
+	0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x30, 0x39, 0xa5, 0xd5, 0x07, 0x00, 0x00,
 }
diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto
index 1c79ef32ba..00e57acf08 100644
--- a/mesh/v1alpha1/config.proto
+++ b/mesh/v1alpha1/config.proto
@@ -117,12 +117,32 @@ message ProxyConfig {
 // MeshConfig defines mesh-wide variables shared by all Envoy instances in the
 // Istio service mesh.
 message MeshConfig {
-  // Address of the egress Envoy service (e.g. _istio-egress:80_).
-  string egress_proxy_address = 1;
-
-  // Address of the mixer service (e.g. _istio-mixer:15004_).
-  // Empty value disables Mixer checks and telemetry.
-  string mixer_address = 2;
+  // Address of the server that will be used by the proxies for policy
+  // check calls (e.g. _istio-mixer:15004_). By using different names for
+  // policyCheckServer and telemetryServer, it is possible to have one set
+  // of mixer servers handle policy check calls, while another set of mixer
+  // servers handle telemetry calls.
+  //
+  // NOTE: The out-of-box istio configuration assumes the same server for
+  // both policy checks and telemetry (e.g., _istio-mixer:15004_). If
+  // policyCheckServer and telemetryServer have different values, the
+  // default Istio Grafana Dashboards will have to be reconfigured
+  // appropriately.
+  string policy_check_server = 1;
+
+  // Address of the server that will be used by the proxies as an Istio
+  // telemetry sink (access logs, API/connection metrics)
+  // (e.g. _istio-mixer:15004_). By using different names for
+  // policyCheckServer and telemetryServer, it is possible to have one set
+  // of mixer servers handle policy check calls, while another set of mixer
+  // servers handle telemetry calls.
+  //
+  // NOTE: The out-of-box istio configuration assumes the same server for
+  // both policy checks and telemetry (e.g., _istio-mixer:15004_). If
+  // policyCheckServer and telemetryServer have different values, the
+  // default Istio Grafana Dashboards will have to be reconfigured
+  // appropriately.
+  string telemetry_server = 2;
 
   // Disable policy checks by the mixer service. Metrics will still be
   // reported to the mixer for HTTP requests and TCP connections. Default
diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
index 75ae2c6a7d..d2445cb1ea 100644
--- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
+++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
@@ -60,20 +60,40 @@ <h2 id="MeshConfig">MeshConfig</h2>
 </tr>
 </thead>
 <tbody>
-<tr id="MeshConfig.egress_proxy_address">
-<td><code>egressProxyAddress</code></td>
+<tr id="MeshConfig.policy_check_server">
+<td><code>policyCheckServer</code></td>
 <td><code>string</code></td>
 <td>
-<p>Address of the egress Envoy service (e.g. <em>istio-egress:80</em>).</p>
+<p>Address of the server that will be used by the proxies for policy
+check calls (e.g. <em>istio-mixer:15004</em>). By using different names for
+policyCheckServer and telemetryServer, it is possible to have one set
+of mixer servers handle policy check calls, while another set of mixer
+servers handle telemetry calls.</p>
+
+<p>NOTE: The out-of-box istio configuration assumes the same server for
+both policy checks and telemetry (e.g., <em>istio-mixer:15004</em>). If
+policyCheckServer and telemetryServer have different values, the
+default Istio Grafana Dashboards will have to be reconfigured
+appropriately.</p>
 
 </td>
 </tr>
-<tr id="MeshConfig.mixer_address">
-<td><code>mixerAddress</code></td>
+<tr id="MeshConfig.telemetry_server">
+<td><code>telemetryServer</code></td>
 <td><code>string</code></td>
 <td>
-<p>Address of the mixer service (e.g. <em>istio-mixer:15004</em>).
-Empty value disables Mixer checks and telemetry.</p>
+<p>Address of the server that will be used by the proxies as an Istio
+telemetry sink (access logs, API/connection metrics)
+(e.g. <em>istio-mixer:15004</em>). By using different names for
+policyCheckServer and telemetryServer, it is possible to have one set
+of mixer servers handle policy check calls, while another set of mixer
+servers handle telemetry calls.</p>
+
+<p>NOTE: The out-of-box istio configuration assumes the same server for
+both policy checks and telemetry (e.g., <em>istio-mixer:15004</em>). If
+policyCheckServer and telemetryServer have different values, the
+default Istio Grafana Dashboards will have to be reconfigured
+appropriately.</p>
 
 </td>
 </tr>

From 2cf2ac3e9b0bc6c9c6cbfcf1d6c7d9db60997c61 Mon Sep 17 00:00:00 2001
From: Shriram Rajagopalan <shriram@us.ibm.com>
Date: Wed, 7 Feb 2018 10:39:07 -0500
Subject: [PATCH 2/5] fix

---
 mesh/v1alpha1/config.pb.go                | 16 +++-------------
 mesh/v1alpha1/config.proto                | 16 +++-------------
 mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 16 +++-------------
 3 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go
index a234f5afa2..0615a089ca 100644
--- a/mesh/v1alpha1/config.pb.go
+++ b/mesh/v1alpha1/config.pb.go
@@ -308,11 +308,8 @@ type MeshConfig struct {
 	// of mixer servers handle policy check calls, while another set of mixer
 	// servers handle telemetry calls.
 	//
-	// NOTE: The out-of-box istio configuration assumes the same server for
-	// both policy checks and telemetry (e.g., _istio-mixer:15004_). If
-	// policyCheckServer and telemetryServer have different values, the
-	// default Istio Grafana Dashboards will have to be reconfigured
-	// appropriately.
+	// NOTE: Omitting policyCheckServer while specifying telemetryServer is
+	// equivalent to setting disablePolicyChecks to true.
 	PolicyCheckServer string `protobuf:"bytes,1,opt,name=policy_check_server,json=policyCheckServer" json:"policy_check_server,omitempty"`
 	// Address of the server that will be used by the proxies as an Istio
 	// telemetry sink (access logs, API/connection metrics)
@@ -320,15 +317,8 @@ type MeshConfig struct {
 	// policyCheckServer and telemetryServer, it is possible to have one set
 	// of mixer servers handle policy check calls, while another set of mixer
 	// servers handle telemetry calls.
-	//
-	// NOTE: The out-of-box istio configuration assumes the same server for
-	// both policy checks and telemetry (e.g., _istio-mixer:15004_). If
-	// policyCheckServer and telemetryServer have different values, the
-	// default Istio Grafana Dashboards will have to be reconfigured
-	// appropriately.
 	TelemetryServer string `protobuf:"bytes,2,opt,name=telemetry_server,json=telemetryServer" json:"telemetry_server,omitempty"`
-	// Disable policy checks by the mixer service. Metrics will still be
-	// reported to the mixer for HTTP requests and TCP connections. Default
+	// Disable policy checks by the mixer service. Default
 	// is false, i.e. mixer policy check is enabled by default.
 	DisablePolicyChecks bool `protobuf:"varint,3,opt,name=disable_policy_checks,json=disablePolicyChecks" json:"disable_policy_checks,omitempty"`
 	// Port on which Envoy should listen for incoming connections from
diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto
index 00e57acf08..adf2a2d0d3 100644
--- a/mesh/v1alpha1/config.proto
+++ b/mesh/v1alpha1/config.proto
@@ -123,11 +123,8 @@ message MeshConfig {
   // of mixer servers handle policy check calls, while another set of mixer
   // servers handle telemetry calls.
   //
-  // NOTE: The out-of-box istio configuration assumes the same server for
-  // both policy checks and telemetry (e.g., _istio-mixer:15004_). If
-  // policyCheckServer and telemetryServer have different values, the
-  // default Istio Grafana Dashboards will have to be reconfigured
-  // appropriately.
+  // NOTE: Omitting policyCheckServer while specifying telemetryServer is
+  // equivalent to setting disablePolicyChecks to true.
   string policy_check_server = 1;
 
   // Address of the server that will be used by the proxies as an Istio
@@ -136,16 +133,9 @@ message MeshConfig {
   // policyCheckServer and telemetryServer, it is possible to have one set
   // of mixer servers handle policy check calls, while another set of mixer
   // servers handle telemetry calls.
-  //
-  // NOTE: The out-of-box istio configuration assumes the same server for
-  // both policy checks and telemetry (e.g., _istio-mixer:15004_). If
-  // policyCheckServer and telemetryServer have different values, the
-  // default Istio Grafana Dashboards will have to be reconfigured
-  // appropriately.
   string telemetry_server = 2;
 
-  // Disable policy checks by the mixer service. Metrics will still be
-  // reported to the mixer for HTTP requests and TCP connections. Default
+  // Disable policy checks by the mixer service. Default
   // is false, i.e. mixer policy check is enabled by default.
   bool disable_policy_checks = 3;
 
diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
index d2445cb1ea..547d3ab7e9 100644
--- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
+++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
@@ -70,11 +70,8 @@ <h2 id="MeshConfig">MeshConfig</h2>
 of mixer servers handle policy check calls, while another set of mixer
 servers handle telemetry calls.</p>
 
-<p>NOTE: The out-of-box istio configuration assumes the same server for
-both policy checks and telemetry (e.g., <em>istio-mixer:15004</em>). If
-policyCheckServer and telemetryServer have different values, the
-default Istio Grafana Dashboards will have to be reconfigured
-appropriately.</p>
+<p>NOTE: Omitting policyCheckServer while specifying telemetryServer is
+equivalent to setting disablePolicyChecks to true.</p>
 
 </td>
 </tr>
@@ -89,20 +86,13 @@ <h2 id="MeshConfig">MeshConfig</h2>
 of mixer servers handle policy check calls, while another set of mixer
 servers handle telemetry calls.</p>
 
-<p>NOTE: The out-of-box istio configuration assumes the same server for
-both policy checks and telemetry (e.g., <em>istio-mixer:15004</em>). If
-policyCheckServer and telemetryServer have different values, the
-default Istio Grafana Dashboards will have to be reconfigured
-appropriately.</p>
-
 </td>
 </tr>
 <tr id="MeshConfig.disable_policy_checks">
 <td><code>disablePolicyChecks</code></td>
 <td><code>bool</code></td>
 <td>
-<p>Disable policy checks by the mixer service. Metrics will still be
-reported to the mixer for HTTP requests and TCP connections. Default
+<p>Disable policy checks by the mixer service. Default
 is false, i.e. mixer policy check is enabled by default.</p>
 
 </td>

From f31710f7c776ab99c536d029f0332fde58216895 Mon Sep 17 00:00:00 2001
From: Shriram Rajagopalan <shriram@us.ibm.com>
Date: Wed, 7 Feb 2018 14:47:12 -0500
Subject: [PATCH 3/5] nits

---
 mesh/v1alpha1/config.pb.go                | 133 +++++++++++-----------
 mesh/v1alpha1/config.proto                |   8 +-
 mesh/v1alpha1/istio.mesh.v1alpha1.pb.html |  10 +-
 3 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go
index 0615a089ca..7369236be9 100644
--- a/mesh/v1alpha1/config.pb.go
+++ b/mesh/v1alpha1/config.pb.go
@@ -304,17 +304,17 @@ func (m *ProxyConfig) GetConcurrency() int32 {
 type MeshConfig struct {
 	// Address of the server that will be used by the proxies for policy
 	// check calls (e.g. _istio-mixer:15004_). By using different names for
-	// policyCheckServer and telemetryServer, it is possible to have one set
+	// mixerCheckServer and mixerReportServer, it is possible to have one set
 	// of mixer servers handle policy check calls, while another set of mixer
 	// servers handle telemetry calls.
 	//
-	// NOTE: Omitting policyCheckServer while specifying telemetryServer is
+	// NOTE: Omitting mixerCheckServer while specifying mixerReportServer is
 	// equivalent to setting disablePolicyChecks to true.
-	PolicyCheckServer string `protobuf:"bytes,1,opt,name=policy_check_server,json=policyCheckServer" json:"policy_check_server,omitempty"`
+	MixerCheckServer string `protobuf:"bytes,1,opt,name=mixer_check_server,json=mixerCheckServer" json:"mixer_check_server,omitempty"`
 	// Address of the server that will be used by the proxies as an Istio
 	// telemetry sink (access logs, API/connection metrics)
 	// (e.g. _istio-mixer:15004_). By using different names for
-	// policyCheckServer and telemetryServer, it is possible to have one set
+	// mixerCheckServer and mixerReportServer, it is possible to have one set
 	// of mixer servers handle policy check calls, while another set of mixer
 	// servers handle telemetry calls.
 	TelemetryServer string `protobuf:"bytes,2,opt,name=telemetry_server,json=telemetryServer" json:"telemetry_server,omitempty"`
@@ -368,9 +368,9 @@ func (m *MeshConfig) String() string            { return proto.CompactTextString
 func (*MeshConfig) ProtoMessage()               {}
 func (*MeshConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
-func (m *MeshConfig) GetPolicyCheckServer() string {
+func (m *MeshConfig) GetMixerCheckServer() string {
 	if m != nil {
-		return m.PolicyCheckServer
+		return m.MixerCheckServer
 	}
 	return ""
 }
@@ -484,64 +484,65 @@ func init() {
 func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 942 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4d, 0x6f, 0xdb, 0x46,
-	0x10, 0x8d, 0xe2, 0x0f, 0xd9, 0x23, 0x8b, 0xa2, 0xe9, 0xd8, 0x61, 0x8c, 0xa2, 0x15, 0x5c, 0x34,
-	0x55, 0xdc, 0x82, 0x42, 0xdc, 0xf6, 0xd0, 0x4b, 0x51, 0x7f, 0x36, 0x06, 0x64, 0x5b, 0xa5, 0xe4,
-	0x4b, 0x2e, 0x8b, 0x35, 0xb9, 0x16, 0x17, 0x59, 0xee, 0x12, 0xbb, 0x4b, 0x37, 0xca, 0x3f, 0xeb,
-	0xaf, 0xe9, 0xb5, 0x3f, 0xa3, 0xd8, 0x0f, 0xc9, 0x6a, 0xa0, 0xc2, 0xe8, 0x51, 0x6f, 0xde, 0xcc,
-	0xec, 0x70, 0xde, 0x1b, 0xc1, 0x7e, 0x49, 0x54, 0xd1, 0x7f, 0x78, 0x8b, 0x59, 0x55, 0xe0, 0xb7,
-	0xfd, 0x4c, 0xf0, 0x7b, 0x3a, 0x49, 0x2a, 0x29, 0xb4, 0x88, 0x76, 0xa8, 0xd2, 0x54, 0x24, 0x86,
-	0x91, 0xcc, 0x18, 0xfb, 0x5f, 0x4e, 0x84, 0x98, 0x30, 0xd2, 0xb7, 0x94, 0xbb, 0xfa, 0xbe, 0x9f,
-	0xd7, 0x12, 0x6b, 0x2a, 0xb8, 0x4b, 0x3a, 0xf8, 0x6b, 0x1d, 0x5a, 0x43, 0x29, 0x3e, 0x4e, 0x4f,
-	0x6d, 0xa9, 0xe8, 0x2b, 0x68, 0xb9, 0xa2, 0xa8, 0xc2, 0xba, 0x88, 0x1b, 0xdd, 0x46, 0x6f, 0x33,
-	0x05, 0x07, 0x0d, 0xb1, 0x2e, 0x0c, 0xe1, 0x8e, 0x72, 0x2c, 0xa7, 0x8e, 0xf0, 0xdc, 0x11, 0x1c,
-	0x64, 0x09, 0xdf, 0x42, 0x47, 0x11, 0xf9, 0x40, 0x33, 0x82, 0x32, 0x56, 0x2b, 0x4d, 0x64, 0xbc,
-	0x62, 0x49, 0x81, 0x87, 0x4f, 0x1d, 0x1a, 0xfd, 0x0a, 0x41, 0x2e, 0x31, 0xe5, 0x68, 0xf6, 0xa4,
-	0x78, 0xb5, 0xdb, 0xe8, 0xb5, 0x8e, 0x5e, 0x25, 0xee, 0xcd, 0xc9, 0xec, 0xcd, 0xc9, 0x99, 0x27,
-	0xa4, 0x6d, 0x9b, 0x30, 0xfb, 0x19, 0x8d, 0x20, 0xae, 0xb0, 0x24, 0x5c, 0x23, 0x55, 0xd4, 0x3a,
-	0x17, 0x7f, 0x2c, 0xd4, 0x5a, 0x7b, 0xaa, 0xd6, 0x9e, 0x4b, 0x1d, 0xf9, 0xcc, 0x79, 0xd1, 0xef,
-	0x60, 0x3b, 0xa7, 0x2a, 0x13, 0x0f, 0x44, 0x4e, 0x11, 0xce, 0x73, 0x49, 0x94, 0x8a, 0xd7, 0xed,
-	0x04, 0xe1, 0x3c, 0x70, 0xec, 0xf0, 0xe8, 0x77, 0x78, 0xf9, 0x48, 0x96, 0xe4, 0x5e, 0x12, 0x55,
-	0xa0, 0x9c, 0x30, 0x3c, 0x8d, 0x9b, 0x4f, 0x3d, 0x60, 0x77, 0x9e, 0x99, 0xba, 0xc4, 0x33, 0x93,
-	0x17, 0x7d, 0x03, 0xc1, 0x27, 0x5a, 0x7d, 0xa0, 0x7c, 0xde, 0x7c, 0xc3, 0x36, 0x6f, 0x3b, 0x74,
-	0xd6, 0xf9, 0x04, 0x3a, 0x99, 0xe0, 0x9c, 0x64, 0x1a, 0x69, 0x5a, 0x12, 0x51, 0xeb, 0x78, 0xf3,
-	0xa9, 0x8e, 0x81, 0xcf, 0x18, 0xbb, 0x84, 0xe8, 0x7b, 0x88, 0x94, 0xc6, 0x5a, 0xe5, 0xa8, 0xce,
-	0xab, 0x79, 0x3b, 0x70, 0xb3, 0xba, 0xc8, 0x6d, 0x5e, 0xcd, 0x3a, 0xf6, 0x20, 0xac, 0x8c, 0x52,
-	0x10, 0xce, 0x4b, 0xca, 0x51, 0x25, 0xa4, 0x8e, 0x5b, 0xdd, 0x46, 0x6f, 0x2d, 0x0d, 0x2c, 0x7e,
-	0x6c, 0xe0, 0xa1, 0x90, 0xda, 0x7c, 0x42, 0xfc, 0x80, 0x29, 0xc3, 0x77, 0x94, 0x51, 0x3d, 0x45,
-	0x9f, 0x04, 0x27, 0xf1, 0x96, 0x2b, 0xbb, 0x18, 0x78, 0x2f, 0x38, 0x89, 0x72, 0x78, 0x95, 0x09,
-	0xae, 0xa5, 0x60, 0xa8, 0x62, 0x98, 0x13, 0x84, 0x6b, 0x5d, 0xa0, 0x4a, 0x30, 0x9a, 0x4d, 0xe3,
-	0x76, 0xb7, 0xd1, 0x0b, 0x8e, 0xde, 0x24, 0x4b, 0xa4, 0x9d, 0x1c, 0xd7, 0xba, 0x20, 0x5c, 0xd3,
-	0xcc, 0x0e, 0x37, 0xb4, 0x09, 0xe9, 0x9e, 0xaf, 0x35, 0x34, 0xa5, 0x0c, 0xc3, 0xe1, 0x66, 0xd4,
-	0xac, 0x56, 0x5a, 0x94, 0xc8, 0xcb, 0xfb, 0x9e, 0x32, 0x12, 0x07, 0xee, 0x4d, 0x2e, 0xe2, 0x1c,
-	0x70, 0x41, 0x19, 0x31, 0xa3, 0x9a, 0xf1, 0x11, 0xc7, 0x25, 0x41, 0x8c, 0xf0, 0x89, 0x2e, 0xe2,
-	0x8e, 0x1b, 0xd5, 0xe0, 0xd7, 0xb8, 0x24, 0x03, 0x8b, 0x46, 0x5d, 0xeb, 0x97, 0xac, 0x96, 0x92,
-	0xf0, 0x6c, 0x1a, 0x87, 0x96, 0xb4, 0x08, 0x1d, 0xfc, 0xd9, 0x04, 0xb8, 0x22, 0xaa, 0xf0, 0x06,
-	0x4b, 0x60, 0xc7, 0xcd, 0x86, 0xb2, 0x82, 0x64, 0x1f, 0x90, 0x31, 0x05, 0x91, 0xde, 0x68, 0xdb,
-	0x2e, 0x74, 0x6a, 0x22, 0x23, 0x1b, 0x88, 0xde, 0x40, 0xa8, 0x09, 0x23, 0x25, 0xd1, 0x72, 0x3a,
-	0x23, 0x3b, 0xd3, 0x75, 0xe6, 0xb8, 0xa7, 0x1e, 0x81, 0x91, 0x14, 0xbe, 0x63, 0x04, 0x2d, 0xb6,
-	0x50, 0xd6, 0x7f, 0x1b, 0xe9, 0x8e, 0x0f, 0x0e, 0x1f, 0x7b, 0xa8, 0xe8, 0x10, 0xb6, 0xdd, 0x52,
-	0x19, 0x55, 0x9a, 0xf8, 0xad, 0xae, 0xda, 0x29, 0x3a, 0x36, 0x30, 0xb0, 0xb8, 0x5d, 0xeb, 0x6b,
-	0x70, 0x10, 0x2a, 0xb4, 0xae, 0x1c, 0x73, 0xcd, 0x32, 0xdb, 0x16, 0x7e, 0xa7, 0x75, 0x65, 0x79,
-	0x4b, 0xa4, 0xb9, 0xfe, 0x7f, 0xa5, 0xf9, 0x35, 0xb4, 0x29, 0x9f, 0x18, 0xdd, 0xa1, 0x8c, 0x61,
-	0xa5, 0xac, 0x9d, 0x36, 0xd3, 0x2d, 0x0f, 0x9e, 0x1a, 0xcc, 0x9c, 0x9a, 0x19, 0xc9, 0xdf, 0x16,
-	0xef, 0x95, 0xc0, 0xc3, 0x23, 0x87, 0x46, 0x25, 0xbc, 0x9c, 0x57, 0x73, 0xfa, 0x60, 0x44, 0xa2,
-	0x52, 0xe4, 0xc4, 0x9a, 0x26, 0x38, 0xfa, 0x69, 0xa9, 0xc2, 0x1e, 0xd7, 0x96, 0x5c, 0xfa, 0xbe,
-	0xf3, 0xec, 0x2b, 0x91, 0x93, 0x74, 0x97, 0x2e, 0x83, 0xa3, 0x1b, 0x68, 0x2d, 0x8a, 0x18, 0x6c,
-	0x8b, 0xc3, 0xa7, 0x5a, 0x3c, 0xaa, 0xf5, 0xe4, 0x79, 0xdc, 0x48, 0x01, 0x3f, 0xaa, 0xf7, 0x1c,
-	0xb6, 0x65, 0xae, 0x3e, 0x3b, 0x30, 0xad, 0xa7, 0xbe, 0x69, 0x47, 0xe6, 0xea, 0xf3, 0xd3, 0x42,
-	0xb8, 0xd5, 0x87, 0x96, 0x38, 0xa3, 0x7c, 0x62, 0x4d, 0xb9, 0x91, 0xb6, 0x1d, 0x3a, 0x76, 0xa0,
-	0xd9, 0x33, 0xce, 0x32, 0xf3, 0xb1, 0x98, 0xf0, 0x46, 0x69, 0xbb, 0x13, 0xe4, 0xe0, 0x81, 0x70,
-	0x2e, 0xf9, 0x0d, 0x82, 0x9c, 0xdc, 0xe3, 0x9a, 0x69, 0x6f, 0x2a, 0xeb, 0xa7, 0xd6, 0x51, 0x77,
-	0xe9, 0xa4, 0x0b, 0xff, 0x32, 0x69, 0xdb, 0xe7, 0x79, 0x4f, 0xfc, 0x08, 0x7b, 0xa5, 0x66, 0x0a,
-	0x91, 0x8f, 0x19, 0xab, 0x73, 0x92, 0xcf, 0xb6, 0xa9, 0xe2, 0x4e, 0x77, 0xa5, 0xb7, 0x99, 0xbe,
-	0x30, 0xd1, 0x73, 0x1f, 0xf4, 0x3b, 0x55, 0x07, 0x3f, 0xc3, 0xee, 0xd2, 0xad, 0x44, 0x4d, 0x58,
-	0xb9, 0xb9, 0xb8, 0x08, 0x9f, 0x45, 0x2d, 0x68, 0x9e, 0x9d, 0x5f, 0x1c, 0xdf, 0x0e, 0xc6, 0x61,
-	0x23, 0x02, 0x58, 0x1f, 0x8d, 0xd3, 0xcb, 0xd3, 0x71, 0xf8, 0xfc, 0xe0, 0x35, 0xc0, 0xc2, 0x6d,
-	0xd8, 0x80, 0xd5, 0xeb, 0x9b, 0xeb, 0xf3, 0xf0, 0x59, 0x14, 0x00, 0x5c, 0xdd, 0x8e, 0x6f, 0x8f,
-	0x07, 0x68, 0x3c, 0x18, 0x85, 0x8d, 0xc3, 0x5f, 0xe0, 0xc5, 0xb2, 0x2b, 0xf3, 0xdf, 0x19, 0xd1,
-	0x16, 0x34, 0x2f, 0xaf, 0xdf, 0x9d, 0xa7, 0x97, 0xe3, 0xf0, 0xef, 0xe6, 0xc9, 0x17, 0xef, 0xf7,
-	0xdd, 0xa7, 0xa0, 0xa2, 0x8f, 0x2b, 0xda, 0xff, 0xd7, 0xbf, 0xf7, 0xdd, 0xba, 0x5d, 0xd9, 0x0f,
-	0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x30, 0x39, 0xa5, 0xd5, 0x07, 0x00, 0x00,
+	// 945 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdb, 0x6e, 0x1b, 0x37,
+	0x10, 0x8d, 0x7c, 0x93, 0x3d, 0xb2, 0x56, 0xeb, 0x4d, 0xec, 0x6c, 0x8c, 0xa2, 0x15, 0x5c, 0x34,
+	0x55, 0xdc, 0x40, 0x42, 0xdc, 0xf6, 0xa1, 0x2f, 0x45, 0x7d, 0x6d, 0x0c, 0xc8, 0x97, 0xae, 0xe4,
+	0x97, 0xbc, 0x10, 0xf4, 0x2e, 0xa5, 0x25, 0xc2, 0x25, 0x17, 0x24, 0xd7, 0xb5, 0xf2, 0x63, 0xfd,
+	0x9c, 0xbe, 0xf6, 0x33, 0x0a, 0x5e, 0x24, 0xab, 0x81, 0x0a, 0x21, 0x8f, 0x7b, 0xe6, 0xcc, 0x0c,
+	0x87, 0x73, 0x0e, 0x17, 0xf6, 0x0b, 0xa2, 0xf2, 0xde, 0xc3, 0x3b, 0xcc, 0xca, 0x1c, 0xbf, 0xeb,
+	0xa5, 0x82, 0x8f, 0xe8, 0xb8, 0x5b, 0x4a, 0xa1, 0x45, 0xf4, 0x9c, 0x2a, 0x4d, 0x45, 0xd7, 0x30,
+	0xba, 0x53, 0xc6, 0xfe, 0xd7, 0x63, 0x21, 0xc6, 0x8c, 0xf4, 0x2c, 0xe5, 0xbe, 0x1a, 0xf5, 0xb2,
+	0x4a, 0x62, 0x4d, 0x05, 0x77, 0x49, 0x07, 0x7f, 0x6f, 0x40, 0xe3, 0x56, 0x8a, 0xc7, 0xc9, 0xa9,
+	0x2d, 0x15, 0x7d, 0x03, 0x0d, 0x57, 0x14, 0x95, 0x58, 0xe7, 0x71, 0xad, 0x5d, 0xeb, 0x6c, 0x25,
+	0xe0, 0xa0, 0x5b, 0xac, 0x73, 0x43, 0xb8, 0xa7, 0x1c, 0xcb, 0x89, 0x23, 0xac, 0x38, 0x82, 0x83,
+	0x2c, 0xe1, 0x7b, 0x68, 0x29, 0x22, 0x1f, 0x68, 0x4a, 0x50, 0xca, 0x2a, 0xa5, 0x89, 0x8c, 0x57,
+	0x2d, 0x29, 0xf0, 0xf0, 0xa9, 0x43, 0xa3, 0xdf, 0x20, 0xc8, 0x24, 0xa6, 0x1c, 0x4d, 0x8f, 0x14,
+	0xaf, 0xb5, 0x6b, 0x9d, 0xc6, 0xd1, 0xab, 0xae, 0x3b, 0x73, 0x77, 0x7a, 0xe6, 0xee, 0x99, 0x27,
+	0x24, 0x4d, 0x9b, 0x30, 0xfd, 0x8c, 0x06, 0x10, 0x97, 0x58, 0x12, 0xae, 0x91, 0xca, 0x2b, 0x9d,
+	0x89, 0x3f, 0xe7, 0x6a, 0xad, 0x2f, 0xab, 0xb5, 0xe7, 0x52, 0x07, 0x3e, 0x73, 0x56, 0xf4, 0x07,
+	0xd8, 0xc9, 0xa8, 0x4a, 0xc5, 0x03, 0x91, 0x13, 0x84, 0xb3, 0x4c, 0x12, 0xa5, 0xe2, 0x0d, 0x3b,
+	0x41, 0x38, 0x0b, 0x1c, 0x3b, 0x3c, 0xfa, 0x03, 0x5e, 0x3e, 0x91, 0x25, 0x19, 0x49, 0xa2, 0x72,
+	0x94, 0x11, 0x86, 0x27, 0x71, 0x7d, 0xd9, 0x01, 0x76, 0x67, 0x99, 0x89, 0x4b, 0x3c, 0x33, 0x79,
+	0xd1, 0x77, 0x10, 0x7c, 0xa2, 0xe5, 0x47, 0xca, 0x67, 0xcd, 0x37, 0x6d, 0xf3, 0xa6, 0x43, 0xa7,
+	0x9d, 0x4f, 0xa0, 0x95, 0x0a, 0xce, 0x49, 0xaa, 0x91, 0xa6, 0x05, 0x11, 0x95, 0x8e, 0xb7, 0x96,
+	0x75, 0x0c, 0x7c, 0xc6, 0xd0, 0x25, 0x44, 0x6f, 0x21, 0x52, 0x1a, 0x6b, 0x95, 0xa1, 0x2a, 0x2b,
+	0x67, 0xed, 0xc0, 0xcd, 0xea, 0x22, 0x77, 0x59, 0x39, 0xed, 0xd8, 0x81, 0xb0, 0x34, 0x4a, 0x41,
+	0x38, 0x2b, 0x28, 0x47, 0xa5, 0x90, 0x3a, 0x6e, 0xb4, 0x6b, 0x9d, 0xf5, 0x24, 0xb0, 0xf8, 0xb1,
+	0x81, 0x6f, 0x85, 0xd4, 0xe6, 0x0a, 0xf1, 0x03, 0xa6, 0x0c, 0xdf, 0x53, 0x46, 0xf5, 0x04, 0x7d,
+	0x12, 0x9c, 0xc4, 0xdb, 0xae, 0xec, 0x7c, 0xe0, 0x83, 0xe0, 0x24, 0xca, 0xe0, 0x55, 0x2a, 0xb8,
+	0x96, 0x82, 0xa1, 0x92, 0x61, 0x4e, 0x10, 0xae, 0x74, 0x8e, 0x4a, 0xc1, 0x68, 0x3a, 0x89, 0x9b,
+	0xed, 0x5a, 0x27, 0x38, 0x7a, 0xd3, 0x5d, 0x20, 0xed, 0xee, 0x71, 0xa5, 0x73, 0xc2, 0x35, 0x4d,
+	0xed, 0x70, 0xb7, 0x36, 0x21, 0xd9, 0xf3, 0xb5, 0x6e, 0x4d, 0x29, 0xc3, 0x70, 0xb8, 0x19, 0x35,
+	0xad, 0x94, 0x16, 0x05, 0xf2, 0xf2, 0x1e, 0x51, 0x46, 0xe2, 0xc0, 0x9d, 0xc9, 0x45, 0x9c, 0x03,
+	0x2e, 0x28, 0x23, 0x66, 0x54, 0x33, 0x3e, 0xe2, 0xb8, 0x20, 0x88, 0x11, 0x3e, 0xd6, 0x79, 0xdc,
+	0x72, 0xa3, 0x1a, 0xfc, 0x1a, 0x17, 0xa4, 0x6f, 0xd1, 0xa8, 0x6d, 0xfd, 0x92, 0x56, 0x52, 0x12,
+	0x9e, 0x4e, 0xe2, 0xd0, 0x92, 0xe6, 0xa1, 0x83, 0xbf, 0xea, 0x00, 0x57, 0x44, 0xe5, 0xde, 0x60,
+	0x6f, 0x21, 0x2a, 0xe8, 0x23, 0x91, 0x28, 0xcd, 0x49, 0xfa, 0x11, 0x19, 0x4f, 0x10, 0xe9, 0x7d,
+	0x16, 0xda, 0xc8, 0xa9, 0x09, 0x0c, 0x2c, 0x1e, 0xbd, 0x81, 0x50, 0x13, 0x46, 0x0a, 0xa2, 0xe5,
+	0x64, 0xca, 0x75, 0x96, 0x6b, 0xcd, 0x70, 0x4f, 0x3d, 0x02, 0x23, 0x28, 0x7c, 0xcf, 0x88, 0xbf,
+	0x3c, 0xd7, 0x41, 0x59, 0xf7, 0x6d, 0x26, 0xcf, 0x7d, 0xd0, 0xdd, 0x87, 0xed, 0xa1, 0xa2, 0x43,
+	0xd8, 0x71, 0x2b, 0x65, 0x54, 0x69, 0xe2, 0x77, 0xba, 0x66, 0x67, 0x68, 0xd9, 0x40, 0xdf, 0xe2,
+	0x76, 0xa9, 0xaf, 0xc1, 0x41, 0x28, 0xd7, 0xba, 0x74, 0xcc, 0x75, 0xcb, 0x6c, 0x5a, 0xf8, 0xbd,
+	0xd6, 0xa5, 0xe5, 0x2d, 0x10, 0xe6, 0xc6, 0x97, 0x0a, 0xf3, 0x5b, 0x68, 0x52, 0x3e, 0x36, 0xaa,
+	0x43, 0x29, 0xc3, 0x4a, 0x59, 0x33, 0x6d, 0x25, 0xdb, 0x1e, 0x3c, 0x35, 0x98, 0x79, 0x68, 0xa6,
+	0x24, 0xff, 0xb2, 0x78, 0xa7, 0x04, 0x1e, 0x1e, 0x38, 0x34, 0x2a, 0xe0, 0xe5, 0xac, 0x9a, 0x53,
+	0x07, 0x23, 0x12, 0x15, 0x22, 0x23, 0xd6, 0x32, 0xc1, 0xd1, 0xcf, 0x0b, 0xf5, 0xf5, 0xb4, 0xb4,
+	0xee, 0xa5, 0xef, 0x3b, 0xcb, 0xbe, 0x12, 0x19, 0x49, 0x76, 0xe9, 0x22, 0x38, 0xba, 0x81, 0xc6,
+	0xbc, 0x84, 0xc1, 0xb6, 0x38, 0x5c, 0xd6, 0xe2, 0x49, 0xab, 0x27, 0x2b, 0x71, 0x2d, 0x01, 0xfc,
+	0xa4, 0xdd, 0x73, 0xd8, 0x91, 0x99, 0xfa, 0xec, 0x79, 0x69, 0x2c, 0xbb, 0xd3, 0x96, 0xcc, 0xd4,
+	0xe7, 0x0f, 0x0b, 0xe1, 0x56, 0x1f, 0x5a, 0xe2, 0x94, 0xf2, 0xb1, 0xb5, 0xe4, 0x66, 0xd2, 0x74,
+	0xe8, 0xd0, 0x81, 0x66, 0xcf, 0x38, 0x4d, 0xcd, 0x65, 0x31, 0xe1, 0x6d, 0xd2, 0x74, 0x0f, 0x90,
+	0x83, 0xfb, 0xc2, 0x79, 0xe4, 0x77, 0x08, 0x32, 0x32, 0xc2, 0x15, 0xd3, 0xde, 0x52, 0xd6, 0x4d,
+	0x8d, 0xa3, 0xf6, 0xc2, 0x49, 0xe7, 0xfe, 0x31, 0x49, 0xd3, 0xe7, 0x79, 0x47, 0xfc, 0x04, 0x7b,
+	0x85, 0x66, 0x0a, 0x91, 0xc7, 0x94, 0x55, 0x19, 0xc9, 0xa6, 0xdb, 0x54, 0x71, 0xab, 0xbd, 0xda,
+	0xd9, 0x4a, 0x5e, 0x98, 0xe8, 0xb9, 0x0f, 0xfa, 0x9d, 0xaa, 0x83, 0x5f, 0x60, 0x77, 0xe1, 0x56,
+	0xa2, 0x3a, 0xac, 0xde, 0x5c, 0x5c, 0x84, 0xcf, 0xa2, 0x06, 0xd4, 0xcf, 0xce, 0x2f, 0x8e, 0xef,
+	0xfa, 0xc3, 0xb0, 0x16, 0x01, 0x6c, 0x0c, 0x86, 0xc9, 0xe5, 0xe9, 0x30, 0x5c, 0x39, 0x78, 0x0d,
+	0x30, 0xf7, 0x32, 0x6c, 0xc2, 0xda, 0xf5, 0xcd, 0xf5, 0x79, 0xf8, 0x2c, 0x0a, 0x00, 0xae, 0xee,
+	0x86, 0x77, 0xc7, 0x7d, 0x34, 0xec, 0x0f, 0xc2, 0xda, 0xe1, 0xaf, 0xf0, 0x62, 0xd1, 0x1b, 0xf3,
+	0xff, 0x19, 0xd1, 0x36, 0xd4, 0x2f, 0xaf, 0xdf, 0x9f, 0x27, 0x97, 0xc3, 0xf0, 0x9f, 0xfa, 0xc9,
+	0x57, 0x1f, 0xf6, 0xdd, 0x55, 0x50, 0xd1, 0xc3, 0x25, 0xed, 0xfd, 0xe7, 0xdf, 0x7d, 0xbf, 0x61,
+	0x57, 0xf6, 0xe3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x80, 0x9f, 0xef, 0xd3, 0x07, 0x00,
+	0x00,
 }
diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto
index adf2a2d0d3..23fcb654e3 100644
--- a/mesh/v1alpha1/config.proto
+++ b/mesh/v1alpha1/config.proto
@@ -119,18 +119,18 @@ message ProxyConfig {
 message MeshConfig {
   // Address of the server that will be used by the proxies for policy
   // check calls (e.g. _istio-mixer:15004_). By using different names for
-  // policyCheckServer and telemetryServer, it is possible to have one set
+  // mixerCheckServer and mixerReportServer, it is possible to have one set
   // of mixer servers handle policy check calls, while another set of mixer
   // servers handle telemetry calls.
   //
-  // NOTE: Omitting policyCheckServer while specifying telemetryServer is
+  // NOTE: Omitting mixerCheckServer while specifying mixerReportServer is
   // equivalent to setting disablePolicyChecks to true.
-  string policy_check_server = 1;
+  string mixer_check_server = 1;
 
   // Address of the server that will be used by the proxies as an Istio
   // telemetry sink (access logs, API/connection metrics)
   // (e.g. _istio-mixer:15004_). By using different names for
-  // policyCheckServer and telemetryServer, it is possible to have one set
+  // mixerCheckServer and mixerReportServer, it is possible to have one set
   // of mixer servers handle policy check calls, while another set of mixer
   // servers handle telemetry calls.
   string telemetry_server = 2;
diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
index 547d3ab7e9..23b4b19f82 100644
--- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
+++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
@@ -60,17 +60,17 @@ <h2 id="MeshConfig">MeshConfig</h2>
 </tr>
 </thead>
 <tbody>
-<tr id="MeshConfig.policy_check_server">
-<td><code>policyCheckServer</code></td>
+<tr id="MeshConfig.mixer_check_server">
+<td><code>mixerCheckServer</code></td>
 <td><code>string</code></td>
 <td>
 <p>Address of the server that will be used by the proxies for policy
 check calls (e.g. <em>istio-mixer:15004</em>). By using different names for
-policyCheckServer and telemetryServer, it is possible to have one set
+mixerCheckServer and mixerReportServer, it is possible to have one set
 of mixer servers handle policy check calls, while another set of mixer
 servers handle telemetry calls.</p>
 
-<p>NOTE: Omitting policyCheckServer while specifying telemetryServer is
+<p>NOTE: Omitting mixerCheckServer while specifying mixerReportServer is
 equivalent to setting disablePolicyChecks to true.</p>
 
 </td>
@@ -82,7 +82,7 @@ <h2 id="MeshConfig">MeshConfig</h2>
 <p>Address of the server that will be used by the proxies as an Istio
 telemetry sink (access logs, API/connection metrics)
 (e.g. <em>istio-mixer:15004</em>). By using different names for
-policyCheckServer and telemetryServer, it is possible to have one set
+mixerCheckServer and mixerReportServer, it is possible to have one set
 of mixer servers handle policy check calls, while another set of mixer
 servers handle telemetry calls.</p>
 

From dcf8809cc3bd2a93735f75c719d9f203795ea823 Mon Sep 17 00:00:00 2001
From: Shriram Rajagopalan <shriram@us.ibm.com>
Date: Wed, 7 Feb 2018 16:43:30 -0500
Subject: [PATCH 4/5] nit

---
 mesh/v1alpha1/config.pb.go                | 124 +++++++++++-----------
 mesh/v1alpha1/config.proto                |   2 +-
 mesh/v1alpha1/istio.mesh.v1alpha1.pb.html |   4 +-
 3 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go
index 7369236be9..13a0f09750 100644
--- a/mesh/v1alpha1/config.pb.go
+++ b/mesh/v1alpha1/config.pb.go
@@ -317,7 +317,7 @@ type MeshConfig struct {
 	// mixerCheckServer and mixerReportServer, it is possible to have one set
 	// of mixer servers handle policy check calls, while another set of mixer
 	// servers handle telemetry calls.
-	TelemetryServer string `protobuf:"bytes,2,opt,name=telemetry_server,json=telemetryServer" json:"telemetry_server,omitempty"`
+	MixerReportServer string `protobuf:"bytes,2,opt,name=mixer_report_server,json=mixerReportServer" json:"mixer_report_server,omitempty"`
 	// Disable policy checks by the mixer service. Default
 	// is false, i.e. mixer policy check is enabled by default.
 	DisablePolicyChecks bool `protobuf:"varint,3,opt,name=disable_policy_checks,json=disablePolicyChecks" json:"disable_policy_checks,omitempty"`
@@ -375,9 +375,9 @@ func (m *MeshConfig) GetMixerCheckServer() string {
 	return ""
 }
 
-func (m *MeshConfig) GetTelemetryServer() string {
+func (m *MeshConfig) GetMixerReportServer() string {
 	if m != nil {
-		return m.TelemetryServer
+		return m.MixerReportServer
 	}
 	return ""
 }
@@ -485,64 +485,64 @@ func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptor0)
 
 var fileDescriptor0 = []byte{
 	// 945 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdb, 0x6e, 0x1b, 0x37,
-	0x10, 0x8d, 0x7c, 0x93, 0x3d, 0xb2, 0x56, 0xeb, 0x4d, 0xec, 0x6c, 0x8c, 0xa2, 0x15, 0x5c, 0x34,
-	0x55, 0xdc, 0x40, 0x42, 0xdc, 0xf6, 0xa1, 0x2f, 0x45, 0x7d, 0x6d, 0x0c, 0xc8, 0x97, 0xae, 0xe4,
-	0x97, 0xbc, 0x10, 0xf4, 0x2e, 0xa5, 0x25, 0xc2, 0x25, 0x17, 0x24, 0xd7, 0xb5, 0xf2, 0x63, 0xfd,
-	0x9c, 0xbe, 0xf6, 0x33, 0x0a, 0x5e, 0x24, 0xab, 0x81, 0x0a, 0x21, 0x8f, 0x7b, 0xe6, 0xcc, 0x0c,
-	0x87, 0x73, 0x0e, 0x17, 0xf6, 0x0b, 0xa2, 0xf2, 0xde, 0xc3, 0x3b, 0xcc, 0xca, 0x1c, 0xbf, 0xeb,
-	0xa5, 0x82, 0x8f, 0xe8, 0xb8, 0x5b, 0x4a, 0xa1, 0x45, 0xf4, 0x9c, 0x2a, 0x4d, 0x45, 0xd7, 0x30,
-	0xba, 0x53, 0xc6, 0xfe, 0xd7, 0x63, 0x21, 0xc6, 0x8c, 0xf4, 0x2c, 0xe5, 0xbe, 0x1a, 0xf5, 0xb2,
-	0x4a, 0x62, 0x4d, 0x05, 0x77, 0x49, 0x07, 0x7f, 0x6f, 0x40, 0xe3, 0x56, 0x8a, 0xc7, 0xc9, 0xa9,
-	0x2d, 0x15, 0x7d, 0x03, 0x0d, 0x57, 0x14, 0x95, 0x58, 0xe7, 0x71, 0xad, 0x5d, 0xeb, 0x6c, 0x25,
-	0xe0, 0xa0, 0x5b, 0xac, 0x73, 0x43, 0xb8, 0xa7, 0x1c, 0xcb, 0x89, 0x23, 0xac, 0x38, 0x82, 0x83,
-	0x2c, 0xe1, 0x7b, 0x68, 0x29, 0x22, 0x1f, 0x68, 0x4a, 0x50, 0xca, 0x2a, 0xa5, 0x89, 0x8c, 0x57,
-	0x2d, 0x29, 0xf0, 0xf0, 0xa9, 0x43, 0xa3, 0xdf, 0x20, 0xc8, 0x24, 0xa6, 0x1c, 0x4d, 0x8f, 0x14,
-	0xaf, 0xb5, 0x6b, 0x9d, 0xc6, 0xd1, 0xab, 0xae, 0x3b, 0x73, 0x77, 0x7a, 0xe6, 0xee, 0x99, 0x27,
-	0x24, 0x4d, 0x9b, 0x30, 0xfd, 0x8c, 0x06, 0x10, 0x97, 0x58, 0x12, 0xae, 0x91, 0xca, 0x2b, 0x9d,
-	0x89, 0x3f, 0xe7, 0x6a, 0xad, 0x2f, 0xab, 0xb5, 0xe7, 0x52, 0x07, 0x3e, 0x73, 0x56, 0xf4, 0x07,
-	0xd8, 0xc9, 0xa8, 0x4a, 0xc5, 0x03, 0x91, 0x13, 0x84, 0xb3, 0x4c, 0x12, 0xa5, 0xe2, 0x0d, 0x3b,
-	0x41, 0x38, 0x0b, 0x1c, 0x3b, 0x3c, 0xfa, 0x03, 0x5e, 0x3e, 0x91, 0x25, 0x19, 0x49, 0xa2, 0x72,
-	0x94, 0x11, 0x86, 0x27, 0x71, 0x7d, 0xd9, 0x01, 0x76, 0x67, 0x99, 0x89, 0x4b, 0x3c, 0x33, 0x79,
-	0xd1, 0x77, 0x10, 0x7c, 0xa2, 0xe5, 0x47, 0xca, 0x67, 0xcd, 0x37, 0x6d, 0xf3, 0xa6, 0x43, 0xa7,
-	0x9d, 0x4f, 0xa0, 0x95, 0x0a, 0xce, 0x49, 0xaa, 0x91, 0xa6, 0x05, 0x11, 0x95, 0x8e, 0xb7, 0x96,
-	0x75, 0x0c, 0x7c, 0xc6, 0xd0, 0x25, 0x44, 0x6f, 0x21, 0x52, 0x1a, 0x6b, 0x95, 0xa1, 0x2a, 0x2b,
-	0x67, 0xed, 0xc0, 0xcd, 0xea, 0x22, 0x77, 0x59, 0x39, 0xed, 0xd8, 0x81, 0xb0, 0x34, 0x4a, 0x41,
-	0x38, 0x2b, 0x28, 0x47, 0xa5, 0x90, 0x3a, 0x6e, 0xb4, 0x6b, 0x9d, 0xf5, 0x24, 0xb0, 0xf8, 0xb1,
-	0x81, 0x6f, 0x85, 0xd4, 0xe6, 0x0a, 0xf1, 0x03, 0xa6, 0x0c, 0xdf, 0x53, 0x46, 0xf5, 0x04, 0x7d,
-	0x12, 0x9c, 0xc4, 0xdb, 0xae, 0xec, 0x7c, 0xe0, 0x83, 0xe0, 0x24, 0xca, 0xe0, 0x55, 0x2a, 0xb8,
-	0x96, 0x82, 0xa1, 0x92, 0x61, 0x4e, 0x10, 0xae, 0x74, 0x8e, 0x4a, 0xc1, 0x68, 0x3a, 0x89, 0x9b,
-	0xed, 0x5a, 0x27, 0x38, 0x7a, 0xd3, 0x5d, 0x20, 0xed, 0xee, 0x71, 0xa5, 0x73, 0xc2, 0x35, 0x4d,
-	0xed, 0x70, 0xb7, 0x36, 0x21, 0xd9, 0xf3, 0xb5, 0x6e, 0x4d, 0x29, 0xc3, 0x70, 0xb8, 0x19, 0x35,
-	0xad, 0x94, 0x16, 0x05, 0xf2, 0xf2, 0x1e, 0x51, 0x46, 0xe2, 0xc0, 0x9d, 0xc9, 0x45, 0x9c, 0x03,
-	0x2e, 0x28, 0x23, 0x66, 0x54, 0x33, 0x3e, 0xe2, 0xb8, 0x20, 0x88, 0x11, 0x3e, 0xd6, 0x79, 0xdc,
-	0x72, 0xa3, 0x1a, 0xfc, 0x1a, 0x17, 0xa4, 0x6f, 0xd1, 0xa8, 0x6d, 0xfd, 0x92, 0x56, 0x52, 0x12,
-	0x9e, 0x4e, 0xe2, 0xd0, 0x92, 0xe6, 0xa1, 0x83, 0xbf, 0xea, 0x00, 0x57, 0x44, 0xe5, 0xde, 0x60,
-	0x6f, 0x21, 0x2a, 0xe8, 0x23, 0x91, 0x28, 0xcd, 0x49, 0xfa, 0x11, 0x19, 0x4f, 0x10, 0xe9, 0x7d,
-	0x16, 0xda, 0xc8, 0xa9, 0x09, 0x0c, 0x2c, 0x1e, 0xbd, 0x81, 0x50, 0x13, 0x46, 0x0a, 0xa2, 0xe5,
-	0x64, 0xca, 0x75, 0x96, 0x6b, 0xcd, 0x70, 0x4f, 0x3d, 0x02, 0x23, 0x28, 0x7c, 0xcf, 0x88, 0xbf,
-	0x3c, 0xd7, 0x41, 0x59, 0xf7, 0x6d, 0x26, 0xcf, 0x7d, 0xd0, 0xdd, 0x87, 0xed, 0xa1, 0xa2, 0x43,
-	0xd8, 0x71, 0x2b, 0x65, 0x54, 0x69, 0xe2, 0x77, 0xba, 0x66, 0x67, 0x68, 0xd9, 0x40, 0xdf, 0xe2,
-	0x76, 0xa9, 0xaf, 0xc1, 0x41, 0x28, 0xd7, 0xba, 0x74, 0xcc, 0x75, 0xcb, 0x6c, 0x5a, 0xf8, 0xbd,
-	0xd6, 0xa5, 0xe5, 0x2d, 0x10, 0xe6, 0xc6, 0x97, 0x0a, 0xf3, 0x5b, 0x68, 0x52, 0x3e, 0x36, 0xaa,
-	0x43, 0x29, 0xc3, 0x4a, 0x59, 0x33, 0x6d, 0x25, 0xdb, 0x1e, 0x3c, 0x35, 0x98, 0x79, 0x68, 0xa6,
-	0x24, 0xff, 0xb2, 0x78, 0xa7, 0x04, 0x1e, 0x1e, 0x38, 0x34, 0x2a, 0xe0, 0xe5, 0xac, 0x9a, 0x53,
-	0x07, 0x23, 0x12, 0x15, 0x22, 0x23, 0xd6, 0x32, 0xc1, 0xd1, 0xcf, 0x0b, 0xf5, 0xf5, 0xb4, 0xb4,
-	0xee, 0xa5, 0xef, 0x3b, 0xcb, 0xbe, 0x12, 0x19, 0x49, 0x76, 0xe9, 0x22, 0x38, 0xba, 0x81, 0xc6,
-	0xbc, 0x84, 0xc1, 0xb6, 0x38, 0x5c, 0xd6, 0xe2, 0x49, 0xab, 0x27, 0x2b, 0x71, 0x2d, 0x01, 0xfc,
-	0xa4, 0xdd, 0x73, 0xd8, 0x91, 0x99, 0xfa, 0xec, 0x79, 0x69, 0x2c, 0xbb, 0xd3, 0x96, 0xcc, 0xd4,
-	0xe7, 0x0f, 0x0b, 0xe1, 0x56, 0x1f, 0x5a, 0xe2, 0x94, 0xf2, 0xb1, 0xb5, 0xe4, 0x66, 0xd2, 0x74,
-	0xe8, 0xd0, 0x81, 0x66, 0xcf, 0x38, 0x4d, 0xcd, 0x65, 0x31, 0xe1, 0x6d, 0xd2, 0x74, 0x0f, 0x90,
-	0x83, 0xfb, 0xc2, 0x79, 0xe4, 0x77, 0x08, 0x32, 0x32, 0xc2, 0x15, 0xd3, 0xde, 0x52, 0xd6, 0x4d,
-	0x8d, 0xa3, 0xf6, 0xc2, 0x49, 0xe7, 0xfe, 0x31, 0x49, 0xd3, 0xe7, 0x79, 0x47, 0xfc, 0x04, 0x7b,
-	0x85, 0x66, 0x0a, 0x91, 0xc7, 0x94, 0x55, 0x19, 0xc9, 0xa6, 0xdb, 0x54, 0x71, 0xab, 0xbd, 0xda,
-	0xd9, 0x4a, 0x5e, 0x98, 0xe8, 0xb9, 0x0f, 0xfa, 0x9d, 0xaa, 0x83, 0x5f, 0x60, 0x77, 0xe1, 0x56,
-	0xa2, 0x3a, 0xac, 0xde, 0x5c, 0x5c, 0x84, 0xcf, 0xa2, 0x06, 0xd4, 0xcf, 0xce, 0x2f, 0x8e, 0xef,
-	0xfa, 0xc3, 0xb0, 0x16, 0x01, 0x6c, 0x0c, 0x86, 0xc9, 0xe5, 0xe9, 0x30, 0x5c, 0x39, 0x78, 0x0d,
-	0x30, 0xf7, 0x32, 0x6c, 0xc2, 0xda, 0xf5, 0xcd, 0xf5, 0x79, 0xf8, 0x2c, 0x0a, 0x00, 0xae, 0xee,
-	0x86, 0x77, 0xc7, 0x7d, 0x34, 0xec, 0x0f, 0xc2, 0xda, 0xe1, 0xaf, 0xf0, 0x62, 0xd1, 0x1b, 0xf3,
-	0xff, 0x19, 0xd1, 0x36, 0xd4, 0x2f, 0xaf, 0xdf, 0x9f, 0x27, 0x97, 0xc3, 0xf0, 0x9f, 0xfa, 0xc9,
-	0x57, 0x1f, 0xf6, 0xdd, 0x55, 0x50, 0xd1, 0xc3, 0x25, 0xed, 0xfd, 0xe7, 0xdf, 0x7d, 0xbf, 0x61,
-	0x57, 0xf6, 0xe3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x80, 0x9f, 0xef, 0xd3, 0x07, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4b, 0x6f, 0x1b, 0x37,
+	0x10, 0x8e, 0xfc, 0x92, 0x3d, 0xb2, 0x56, 0x32, 0x1d, 0x3b, 0x1b, 0xa3, 0x68, 0x05, 0x17, 0x4d,
+	0x55, 0x37, 0x90, 0x10, 0xb7, 0x3d, 0xf4, 0x52, 0xd4, 0xcf, 0xc6, 0x80, 0xfc, 0xe8, 0x4a, 0xbe,
+	0xe4, 0x42, 0xd0, 0xbb, 0xb4, 0x96, 0x08, 0x97, 0x5c, 0x90, 0x5c, 0xd7, 0xca, 0x6f, 0xeb, 0x7f,
+	0xe9, 0xb5, 0x3f, 0xa3, 0xe0, 0x43, 0xb2, 0x1a, 0xa8, 0x30, 0x7a, 0xdc, 0x6f, 0xbe, 0x99, 0xe1,
+	0x3c, 0xbe, 0x59, 0xd8, 0x2b, 0xa8, 0xce, 0xfb, 0x0f, 0xef, 0x08, 0x2f, 0x73, 0xf2, 0xae, 0x9f,
+	0x4a, 0x71, 0xcf, 0xc6, 0xbd, 0x52, 0x49, 0x23, 0xd1, 0x36, 0xd3, 0x86, 0xc9, 0x9e, 0x65, 0xf4,
+	0xa6, 0x8c, 0xbd, 0x2f, 0xc7, 0x52, 0x8e, 0x39, 0xed, 0x3b, 0xca, 0x5d, 0x75, 0xdf, 0xcf, 0x2a,
+	0x45, 0x0c, 0x93, 0xc2, 0x3b, 0xed, 0xff, 0xb5, 0x06, 0x8d, 0x1b, 0x25, 0x1f, 0x27, 0x27, 0x2e,
+	0x14, 0xfa, 0x0a, 0x1a, 0x3e, 0x28, 0x2e, 0x89, 0xc9, 0xe3, 0x5a, 0xa7, 0xd6, 0xdd, 0x48, 0xc0,
+	0x43, 0x37, 0xc4, 0xe4, 0x96, 0x70, 0xc7, 0x04, 0x51, 0x13, 0x4f, 0x58, 0xf2, 0x04, 0x0f, 0x39,
+	0xc2, 0xb7, 0xd0, 0xd2, 0x54, 0x3d, 0xb0, 0x94, 0xe2, 0x94, 0x57, 0xda, 0x50, 0x15, 0x2f, 0x3b,
+	0x52, 0x14, 0xe0, 0x13, 0x8f, 0xa2, 0x5f, 0x21, 0xca, 0x14, 0x61, 0x02, 0x4f, 0x9f, 0x14, 0xaf,
+	0x74, 0x6a, 0xdd, 0xc6, 0xe1, 0xeb, 0x9e, 0x7f, 0x73, 0x6f, 0xfa, 0xe6, 0xde, 0x69, 0x20, 0x24,
+	0x4d, 0xe7, 0x30, 0xfd, 0x44, 0x43, 0x88, 0x4b, 0xa2, 0xa8, 0x30, 0x58, 0xe7, 0x95, 0xc9, 0xe4,
+	0x1f, 0x73, 0xb1, 0x56, 0x9f, 0x8b, 0xb5, 0xeb, 0x5d, 0x87, 0xc1, 0x73, 0x16, 0xf4, 0x7b, 0xd8,
+	0xca, 0x98, 0x4e, 0xe5, 0x03, 0x55, 0x13, 0x4c, 0xb2, 0x4c, 0x51, 0xad, 0xe3, 0x35, 0x57, 0x41,
+	0x7b, 0x66, 0x38, 0xf2, 0x38, 0xfa, 0x1d, 0x5e, 0x3d, 0x91, 0x15, 0xbd, 0x57, 0x54, 0xe7, 0x38,
+	0xa3, 0x9c, 0x4c, 0xe2, 0xfa, 0x73, 0x0f, 0xd8, 0x99, 0x79, 0x26, 0xde, 0xf1, 0xd4, 0xfa, 0xa1,
+	0x6f, 0x20, 0xfa, 0xc4, 0xca, 0x8f, 0x4c, 0xcc, 0x92, 0xaf, 0xbb, 0xe4, 0x4d, 0x8f, 0x4e, 0x33,
+	0x1f, 0x43, 0x2b, 0x95, 0x42, 0xd0, 0xd4, 0x60, 0xc3, 0x0a, 0x2a, 0x2b, 0x13, 0x6f, 0x3c, 0x97,
+	0x31, 0x0a, 0x1e, 0x23, 0xef, 0x80, 0xde, 0x02, 0xd2, 0x86, 0x18, 0x9d, 0xe1, 0x2a, 0x2b, 0x67,
+	0xe9, 0xc0, 0xd7, 0xea, 0x2d, 0xb7, 0x59, 0x39, 0xcd, 0xd8, 0x85, 0x76, 0x69, 0x37, 0x05, 0x93,
+	0xac, 0x60, 0x02, 0x97, 0x52, 0x99, 0xb8, 0xd1, 0xa9, 0x75, 0x57, 0x93, 0xc8, 0xe1, 0x47, 0x16,
+	0xbe, 0x91, 0xca, 0xd8, 0x16, 0x92, 0x07, 0xc2, 0x38, 0xb9, 0x63, 0x9c, 0x99, 0x09, 0xfe, 0x24,
+	0x05, 0x8d, 0x37, 0x7d, 0xd8, 0x79, 0xc3, 0x07, 0x29, 0x28, 0xca, 0xe0, 0x75, 0x2a, 0x85, 0x51,
+	0x92, 0xe3, 0x92, 0x13, 0x41, 0x31, 0xa9, 0x4c, 0x8e, 0x4b, 0xc9, 0x59, 0x3a, 0x89, 0x9b, 0x9d,
+	0x5a, 0x37, 0x3a, 0xfc, 0xae, 0xb7, 0x60, 0xb5, 0x7b, 0x47, 0x95, 0xc9, 0xa9, 0x30, 0x2c, 0x75,
+	0xc5, 0xdd, 0x38, 0x87, 0x64, 0x37, 0xc4, 0xba, 0xb1, 0xa1, 0x2c, 0xc3, 0xe3, 0xb6, 0xd4, 0xb4,
+	0xd2, 0x46, 0x16, 0x38, 0xac, 0xf7, 0x3d, 0xe3, 0x34, 0x8e, 0xfc, 0x9b, 0xbc, 0xc5, 0x2b, 0xe0,
+	0x9c, 0x71, 0x6a, 0x4b, 0xb5, 0xe5, 0x63, 0x41, 0x0a, 0x8a, 0x39, 0x15, 0x63, 0x93, 0xc7, 0x2d,
+	0x5f, 0xaa, 0xc5, 0xaf, 0x48, 0x41, 0x07, 0x0e, 0x45, 0x1d, 0xa7, 0x97, 0xb4, 0x52, 0x8a, 0x8a,
+	0x74, 0x12, 0xb7, 0x1d, 0x69, 0x1e, 0xda, 0xff, 0xb3, 0x0e, 0x70, 0x49, 0x75, 0x1e, 0x04, 0xf6,
+	0x16, 0x50, 0xc1, 0x1e, 0xa9, 0xc2, 0x69, 0x4e, 0xd3, 0x8f, 0xd8, 0x6a, 0x82, 0xaa, 0xa0, 0xb3,
+	0xb6, 0xb3, 0x9c, 0x58, 0xc3, 0xd0, 0xe1, 0xa8, 0x07, 0xdb, 0x9e, 0xad, 0xa8, 0xed, 0xf7, 0x94,
+	0xee, 0x55, 0xb7, 0xe5, 0x4c, 0x89, 0xb3, 0x04, 0xfe, 0x21, 0xd8, 0xad, 0x22, 0x77, 0x9c, 0x86,
+	0x0e, 0xfa, 0x34, 0xda, 0x49, 0x70, 0x3d, 0xd9, 0x0e, 0x46, 0xdf, 0x14, 0x97, 0x48, 0xa3, 0x03,
+	0xd8, 0xf2, 0x73, 0xe5, 0x4c, 0x1b, 0x1a, 0x06, 0xbb, 0xe2, 0x0a, 0x69, 0x39, 0xc3, 0xc0, 0xe1,
+	0x6e, 0xb2, 0x6f, 0xc0, 0x43, 0x38, 0x37, 0xa6, 0xf4, 0xcc, 0x55, 0xc7, 0x6c, 0x3a, 0xf8, 0xbd,
+	0x31, 0xa5, 0xe3, 0x2d, 0xd8, 0xce, 0xb5, 0xff, 0xbb, 0x9d, 0x5f, 0x43, 0x93, 0x89, 0xb1, 0x5d,
+	0x3d, 0x9c, 0x72, 0xa2, 0xb5, 0x53, 0xd4, 0x46, 0xb2, 0x19, 0xc0, 0x13, 0x8b, 0xd9, 0x6b, 0x33,
+	0x25, 0x85, 0xf3, 0x12, 0xe4, 0x12, 0x05, 0x78, 0xe8, 0x51, 0x54, 0xc0, 0xab, 0x59, 0x34, 0xbf,
+	0x22, 0x9c, 0x2a, 0x5c, 0xc8, 0x8c, 0x3a, 0xdd, 0x44, 0x87, 0x3f, 0x2d, 0x5c, 0xb2, 0xa7, 0xc9,
+	0xf5, 0x2e, 0x42, 0xde, 0x99, 0xf7, 0xa5, 0xcc, 0x68, 0xb2, 0xc3, 0x16, 0xc1, 0xe8, 0x1a, 0x1a,
+	0xf3, 0x7b, 0x0c, 0x2e, 0xc5, 0xc1, 0x73, 0x29, 0x9e, 0x16, 0xf6, 0x78, 0x29, 0xae, 0x25, 0x40,
+	0x9e, 0x16, 0xf8, 0x0c, 0xb6, 0x54, 0xa6, 0x3f, 0xbb, 0x31, 0x8d, 0xe7, 0x7a, 0xda, 0x52, 0x99,
+	0xfe, 0xfc, 0xba, 0x50, 0xe1, 0xf6, 0xc3, 0x28, 0x92, 0x32, 0x31, 0x76, 0xba, 0x5c, 0x4f, 0x9a,
+	0x1e, 0x1d, 0x79, 0xd0, 0xce, 0x99, 0xa4, 0xa9, 0x6d, 0x16, 0x97, 0x41, 0x2b, 0x4d, 0x7f, 0x85,
+	0x3c, 0x3c, 0x90, 0x5e, 0x28, 0xbf, 0x41, 0x94, 0xd1, 0x7b, 0x52, 0x71, 0x13, 0x74, 0xe5, 0x24,
+	0xd5, 0x38, 0xec, 0x2c, 0xac, 0x74, 0xee, 0x47, 0x93, 0x34, 0x83, 0x5f, 0x90, 0xc5, 0x8f, 0xb0,
+	0x5b, 0x18, 0xae, 0x31, 0x7d, 0x4c, 0x79, 0x95, 0xd1, 0x6c, 0x3a, 0x4d, 0x1d, 0xb7, 0x3a, 0xcb,
+	0xdd, 0x8d, 0xe4, 0xa5, 0xb5, 0x9e, 0x05, 0x63, 0x98, 0xa9, 0xde, 0xff, 0x19, 0x76, 0x16, 0x4e,
+	0x05, 0xd5, 0x61, 0xf9, 0xfa, 0xfc, 0xbc, 0xfd, 0x02, 0x35, 0xa0, 0x7e, 0x7a, 0x76, 0x7e, 0x74,
+	0x3b, 0x18, 0xb5, 0x6b, 0x08, 0x60, 0x6d, 0x38, 0x4a, 0x2e, 0x4e, 0x46, 0xed, 0xa5, 0xfd, 0x37,
+	0x00, 0x73, 0xe7, 0x61, 0x1d, 0x56, 0xae, 0xae, 0xaf, 0xce, 0xda, 0x2f, 0x50, 0x04, 0x70, 0x79,
+	0x3b, 0xba, 0x3d, 0x1a, 0xe0, 0xd1, 0x60, 0xd8, 0xae, 0x1d, 0xfc, 0x02, 0x2f, 0x17, 0x1d, 0x9a,
+	0xff, 0xf6, 0x40, 0x9b, 0x50, 0xbf, 0xb8, 0x7a, 0x7f, 0x96, 0x5c, 0x8c, 0xda, 0x7f, 0xd7, 0x8f,
+	0xbf, 0xf8, 0xb0, 0xe7, 0x5b, 0xc1, 0x64, 0x9f, 0x94, 0xac, 0xff, 0xaf, 0x1f, 0xf8, 0xdd, 0x9a,
+	0x1b, 0xd9, 0x0f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x8b, 0xef, 0x38, 0x77, 0xd8, 0x07, 0x00,
 	0x00,
 }
diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto
index 23fcb654e3..80801e3ca3 100644
--- a/mesh/v1alpha1/config.proto
+++ b/mesh/v1alpha1/config.proto
@@ -133,7 +133,7 @@ message MeshConfig {
   // mixerCheckServer and mixerReportServer, it is possible to have one set
   // of mixer servers handle policy check calls, while another set of mixer
   // servers handle telemetry calls.
-  string telemetry_server = 2;
+  string mixer_report_server = 2;
 
   // Disable policy checks by the mixer service. Default
   // is false, i.e. mixer policy check is enabled by default.
diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
index 23b4b19f82..35f8bf12ba 100644
--- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
+++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
@@ -75,8 +75,8 @@ <h2 id="MeshConfig">MeshConfig</h2>
 
 </td>
 </tr>
-<tr id="MeshConfig.telemetry_server">
-<td><code>telemetryServer</code></td>
+<tr id="MeshConfig.mixer_report_server">
+<td><code>mixerReportServer</code></td>
 <td><code>string</code></td>
 <td>
 <p>Address of the server that will be used by the proxies as an Istio

From 5950d3ce11da07aa730f46ad1298258feef0a6bf Mon Sep 17 00:00:00 2001
From: Shriram Rajagopalan <shriram@us.ibm.com>
Date: Thu, 8 Feb 2018 15:29:30 -0500
Subject: [PATCH 5/5] backward compat

---
 mesh/v1alpha1/config.pb.go                | 130 ++++++++++++----------
 mesh/v1alpha1/config.proto                |   4 +
 mesh/v1alpha1/istio.mesh.v1alpha1.pb.html |   9 ++
 3 files changed, 83 insertions(+), 60 deletions(-)

diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go
index 13a0f09750..6113a1f6ef 100644
--- a/mesh/v1alpha1/config.pb.go
+++ b/mesh/v1alpha1/config.pb.go
@@ -361,6 +361,9 @@ type MeshConfig struct {
 	// DO NOT use this setting for services that are managed by Istio (i.e. using Istio sidecar).
 	// Instead, use service-level annotations to overwrite the authentication policy.
 	MtlsExcludedServices []string `protobuf:"bytes,15,rep,name=mtls_excluded_services,json=mtlsExcludedServices" json:"mtls_excluded_services,omitempty"`
+	// DEPRECATED. Mixer address. This option will be removed soon. Please
+	// use mixer_check_server and mixer_report_server.
+	MixerAddress string `protobuf:"bytes,16,opt,name=mixer_address,json=mixerAddress" json:"mixer_address,omitempty"`
 }
 
 func (m *MeshConfig) Reset()                    { *m = MeshConfig{} }
@@ -473,6 +476,13 @@ func (m *MeshConfig) GetMtlsExcludedServices() []string {
 	return nil
 }
 
+func (m *MeshConfig) GetMixerAddress() string {
+	if m != nil {
+		return m.MixerAddress
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*ProxyConfig)(nil), "istio.mesh.v1alpha1.ProxyConfig")
 	proto.RegisterType((*MeshConfig)(nil), "istio.mesh.v1alpha1.MeshConfig")
@@ -484,65 +494,65 @@ func init() {
 func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 945 bytes of a gzipped FileDescriptorProto
+	// 958 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4b, 0x6f, 0x1b, 0x37,
-	0x10, 0x8e, 0xfc, 0x92, 0x3d, 0xb2, 0x56, 0x32, 0x1d, 0x3b, 0x1b, 0xa3, 0x68, 0x05, 0x17, 0x4d,
-	0x55, 0x37, 0x90, 0x10, 0xb7, 0x3d, 0xf4, 0x52, 0xd4, 0xcf, 0xc6, 0x80, 0xfc, 0xe8, 0x4a, 0xbe,
-	0xe4, 0x42, 0xd0, 0xbb, 0xb4, 0x96, 0x08, 0x97, 0x5c, 0x90, 0x5c, 0xd7, 0xca, 0x6f, 0xeb, 0x7f,
-	0xe9, 0xb5, 0x3f, 0xa3, 0xe0, 0x43, 0xb2, 0x1a, 0xa8, 0x30, 0x7a, 0xdc, 0x6f, 0xbe, 0x99, 0xe1,
-	0x3c, 0xbe, 0x59, 0xd8, 0x2b, 0xa8, 0xce, 0xfb, 0x0f, 0xef, 0x08, 0x2f, 0x73, 0xf2, 0xae, 0x9f,
-	0x4a, 0x71, 0xcf, 0xc6, 0xbd, 0x52, 0x49, 0x23, 0xd1, 0x36, 0xd3, 0x86, 0xc9, 0x9e, 0x65, 0xf4,
-	0xa6, 0x8c, 0xbd, 0x2f, 0xc7, 0x52, 0x8e, 0x39, 0xed, 0x3b, 0xca, 0x5d, 0x75, 0xdf, 0xcf, 0x2a,
-	0x45, 0x0c, 0x93, 0xc2, 0x3b, 0xed, 0xff, 0xb5, 0x06, 0x8d, 0x1b, 0x25, 0x1f, 0x27, 0x27, 0x2e,
-	0x14, 0xfa, 0x0a, 0x1a, 0x3e, 0x28, 0x2e, 0x89, 0xc9, 0xe3, 0x5a, 0xa7, 0xd6, 0xdd, 0x48, 0xc0,
-	0x43, 0x37, 0xc4, 0xe4, 0x96, 0x70, 0xc7, 0x04, 0x51, 0x13, 0x4f, 0x58, 0xf2, 0x04, 0x0f, 0x39,
-	0xc2, 0xb7, 0xd0, 0xd2, 0x54, 0x3d, 0xb0, 0x94, 0xe2, 0x94, 0x57, 0xda, 0x50, 0x15, 0x2f, 0x3b,
-	0x52, 0x14, 0xe0, 0x13, 0x8f, 0xa2, 0x5f, 0x21, 0xca, 0x14, 0x61, 0x02, 0x4f, 0x9f, 0x14, 0xaf,
-	0x74, 0x6a, 0xdd, 0xc6, 0xe1, 0xeb, 0x9e, 0x7f, 0x73, 0x6f, 0xfa, 0xe6, 0xde, 0x69, 0x20, 0x24,
-	0x4d, 0xe7, 0x30, 0xfd, 0x44, 0x43, 0x88, 0x4b, 0xa2, 0xa8, 0x30, 0x58, 0xe7, 0x95, 0xc9, 0xe4,
-	0x1f, 0x73, 0xb1, 0x56, 0x9f, 0x8b, 0xb5, 0xeb, 0x5d, 0x87, 0xc1, 0x73, 0x16, 0xf4, 0x7b, 0xd8,
-	0xca, 0x98, 0x4e, 0xe5, 0x03, 0x55, 0x13, 0x4c, 0xb2, 0x4c, 0x51, 0xad, 0xe3, 0x35, 0x57, 0x41,
-	0x7b, 0x66, 0x38, 0xf2, 0x38, 0xfa, 0x1d, 0x5e, 0x3d, 0x91, 0x15, 0xbd, 0x57, 0x54, 0xe7, 0x38,
-	0xa3, 0x9c, 0x4c, 0xe2, 0xfa, 0x73, 0x0f, 0xd8, 0x99, 0x79, 0x26, 0xde, 0xf1, 0xd4, 0xfa, 0xa1,
-	0x6f, 0x20, 0xfa, 0xc4, 0xca, 0x8f, 0x4c, 0xcc, 0x92, 0xaf, 0xbb, 0xe4, 0x4d, 0x8f, 0x4e, 0x33,
-	0x1f, 0x43, 0x2b, 0x95, 0x42, 0xd0, 0xd4, 0x60, 0xc3, 0x0a, 0x2a, 0x2b, 0x13, 0x6f, 0x3c, 0x97,
-	0x31, 0x0a, 0x1e, 0x23, 0xef, 0x80, 0xde, 0x02, 0xd2, 0x86, 0x18, 0x9d, 0xe1, 0x2a, 0x2b, 0x67,
-	0xe9, 0xc0, 0xd7, 0xea, 0x2d, 0xb7, 0x59, 0x39, 0xcd, 0xd8, 0x85, 0x76, 0x69, 0x37, 0x05, 0x93,
-	0xac, 0x60, 0x02, 0x97, 0x52, 0x99, 0xb8, 0xd1, 0xa9, 0x75, 0x57, 0x93, 0xc8, 0xe1, 0x47, 0x16,
-	0xbe, 0x91, 0xca, 0xd8, 0x16, 0x92, 0x07, 0xc2, 0x38, 0xb9, 0x63, 0x9c, 0x99, 0x09, 0xfe, 0x24,
-	0x05, 0x8d, 0x37, 0x7d, 0xd8, 0x79, 0xc3, 0x07, 0x29, 0x28, 0xca, 0xe0, 0x75, 0x2a, 0x85, 0x51,
-	0x92, 0xe3, 0x92, 0x13, 0x41, 0x31, 0xa9, 0x4c, 0x8e, 0x4b, 0xc9, 0x59, 0x3a, 0x89, 0x9b, 0x9d,
-	0x5a, 0x37, 0x3a, 0xfc, 0xae, 0xb7, 0x60, 0xb5, 0x7b, 0x47, 0x95, 0xc9, 0xa9, 0x30, 0x2c, 0x75,
-	0xc5, 0xdd, 0x38, 0x87, 0x64, 0x37, 0xc4, 0xba, 0xb1, 0xa1, 0x2c, 0xc3, 0xe3, 0xb6, 0xd4, 0xb4,
-	0xd2, 0x46, 0x16, 0x38, 0xac, 0xf7, 0x3d, 0xe3, 0x34, 0x8e, 0xfc, 0x9b, 0xbc, 0xc5, 0x2b, 0xe0,
-	0x9c, 0x71, 0x6a, 0x4b, 0xb5, 0xe5, 0x63, 0x41, 0x0a, 0x8a, 0x39, 0x15, 0x63, 0x93, 0xc7, 0x2d,
-	0x5f, 0xaa, 0xc5, 0xaf, 0x48, 0x41, 0x07, 0x0e, 0x45, 0x1d, 0xa7, 0x97, 0xb4, 0x52, 0x8a, 0x8a,
-	0x74, 0x12, 0xb7, 0x1d, 0x69, 0x1e, 0xda, 0xff, 0xb3, 0x0e, 0x70, 0x49, 0x75, 0x1e, 0x04, 0xf6,
-	0x16, 0x50, 0xc1, 0x1e, 0xa9, 0xc2, 0x69, 0x4e, 0xd3, 0x8f, 0xd8, 0x6a, 0x82, 0xaa, 0xa0, 0xb3,
-	0xb6, 0xb3, 0x9c, 0x58, 0xc3, 0xd0, 0xe1, 0xa8, 0x07, 0xdb, 0x9e, 0xad, 0xa8, 0xed, 0xf7, 0x94,
-	0xee, 0x55, 0xb7, 0xe5, 0x4c, 0x89, 0xb3, 0x04, 0xfe, 0x21, 0xd8, 0xad, 0x22, 0x77, 0x9c, 0x86,
-	0x0e, 0xfa, 0x34, 0xda, 0x49, 0x70, 0x3d, 0xd9, 0x0e, 0x46, 0xdf, 0x14, 0x97, 0x48, 0xa3, 0x03,
-	0xd8, 0xf2, 0x73, 0xe5, 0x4c, 0x1b, 0x1a, 0x06, 0xbb, 0xe2, 0x0a, 0x69, 0x39, 0xc3, 0xc0, 0xe1,
-	0x6e, 0xb2, 0x6f, 0xc0, 0x43, 0x38, 0x37, 0xa6, 0xf4, 0xcc, 0x55, 0xc7, 0x6c, 0x3a, 0xf8, 0xbd,
-	0x31, 0xa5, 0xe3, 0x2d, 0xd8, 0xce, 0xb5, 0xff, 0xbb, 0x9d, 0x5f, 0x43, 0x93, 0x89, 0xb1, 0x5d,
-	0x3d, 0x9c, 0x72, 0xa2, 0xb5, 0x53, 0xd4, 0x46, 0xb2, 0x19, 0xc0, 0x13, 0x8b, 0xd9, 0x6b, 0x33,
-	0x25, 0x85, 0xf3, 0x12, 0xe4, 0x12, 0x05, 0x78, 0xe8, 0x51, 0x54, 0xc0, 0xab, 0x59, 0x34, 0xbf,
-	0x22, 0x9c, 0x2a, 0x5c, 0xc8, 0x8c, 0x3a, 0xdd, 0x44, 0x87, 0x3f, 0x2d, 0x5c, 0xb2, 0xa7, 0xc9,
-	0xf5, 0x2e, 0x42, 0xde, 0x99, 0xf7, 0xa5, 0xcc, 0x68, 0xb2, 0xc3, 0x16, 0xc1, 0xe8, 0x1a, 0x1a,
-	0xf3, 0x7b, 0x0c, 0x2e, 0xc5, 0xc1, 0x73, 0x29, 0x9e, 0x16, 0xf6, 0x78, 0x29, 0xae, 0x25, 0x40,
-	0x9e, 0x16, 0xf8, 0x0c, 0xb6, 0x54, 0xa6, 0x3f, 0xbb, 0x31, 0x8d, 0xe7, 0x7a, 0xda, 0x52, 0x99,
-	0xfe, 0xfc, 0xba, 0x50, 0xe1, 0xf6, 0xc3, 0x28, 0x92, 0x32, 0x31, 0x76, 0xba, 0x5c, 0x4f, 0x9a,
-	0x1e, 0x1d, 0x79, 0xd0, 0xce, 0x99, 0xa4, 0xa9, 0x6d, 0x16, 0x97, 0x41, 0x2b, 0x4d, 0x7f, 0x85,
-	0x3c, 0x3c, 0x90, 0x5e, 0x28, 0xbf, 0x41, 0x94, 0xd1, 0x7b, 0x52, 0x71, 0x13, 0x74, 0xe5, 0x24,
-	0xd5, 0x38, 0xec, 0x2c, 0xac, 0x74, 0xee, 0x47, 0x93, 0x34, 0x83, 0x5f, 0x90, 0xc5, 0x8f, 0xb0,
-	0x5b, 0x18, 0xae, 0x31, 0x7d, 0x4c, 0x79, 0x95, 0xd1, 0x6c, 0x3a, 0x4d, 0x1d, 0xb7, 0x3a, 0xcb,
-	0xdd, 0x8d, 0xe4, 0xa5, 0xb5, 0x9e, 0x05, 0x63, 0x98, 0xa9, 0xde, 0xff, 0x19, 0x76, 0x16, 0x4e,
-	0x05, 0xd5, 0x61, 0xf9, 0xfa, 0xfc, 0xbc, 0xfd, 0x02, 0x35, 0xa0, 0x7e, 0x7a, 0x76, 0x7e, 0x74,
-	0x3b, 0x18, 0xb5, 0x6b, 0x08, 0x60, 0x6d, 0x38, 0x4a, 0x2e, 0x4e, 0x46, 0xed, 0xa5, 0xfd, 0x37,
-	0x00, 0x73, 0xe7, 0x61, 0x1d, 0x56, 0xae, 0xae, 0xaf, 0xce, 0xda, 0x2f, 0x50, 0x04, 0x70, 0x79,
-	0x3b, 0xba, 0x3d, 0x1a, 0xe0, 0xd1, 0x60, 0xd8, 0xae, 0x1d, 0xfc, 0x02, 0x2f, 0x17, 0x1d, 0x9a,
-	0xff, 0xf6, 0x40, 0x9b, 0x50, 0xbf, 0xb8, 0x7a, 0x7f, 0x96, 0x5c, 0x8c, 0xda, 0x7f, 0xd7, 0x8f,
-	0xbf, 0xf8, 0xb0, 0xe7, 0x5b, 0xc1, 0x64, 0x9f, 0x94, 0xac, 0xff, 0xaf, 0x1f, 0xf8, 0xdd, 0x9a,
-	0x1b, 0xd9, 0x0f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x8b, 0xef, 0x38, 0x77, 0xd8, 0x07, 0x00,
-	0x00,
+	0x10, 0x8e, 0xfc, 0x92, 0x3d, 0xb2, 0x56, 0x6b, 0x3a, 0x76, 0x36, 0x46, 0xd1, 0x0a, 0x2e, 0x9a,
+	0xaa, 0x6e, 0x20, 0x21, 0x6e, 0x7b, 0xe8, 0xa5, 0xa8, 0x9f, 0x8d, 0x01, 0xf9, 0xd1, 0x95, 0x7c,
+	0xc9, 0x85, 0xa0, 0x77, 0x69, 0x2d, 0x11, 0x8a, 0x5c, 0x90, 0x5c, 0xd7, 0xca, 0x9f, 0x2d, 0x7a,
+	0xeb, 0xcf, 0x28, 0xf8, 0x90, 0xac, 0x06, 0x2a, 0x8c, 0x1e, 0xf5, 0xcd, 0x37, 0x33, 0x3b, 0x9c,
+	0xef, 0x1b, 0xc1, 0xde, 0x98, 0xea, 0xa2, 0xf7, 0xf0, 0x8e, 0xf0, 0xb2, 0x20, 0xef, 0x7a, 0x99,
+	0x14, 0xf7, 0x6c, 0xd4, 0x2d, 0x95, 0x34, 0x12, 0x6d, 0x33, 0x6d, 0x98, 0xec, 0x5a, 0x46, 0x77,
+	0xca, 0xd8, 0xfb, 0x72, 0x24, 0xe5, 0x88, 0xd3, 0x9e, 0xa3, 0xdc, 0x55, 0xf7, 0xbd, 0xbc, 0x52,
+	0xc4, 0x30, 0x29, 0x7c, 0xd2, 0xfe, 0x9f, 0x6b, 0xd0, 0xb8, 0x51, 0xf2, 0x71, 0x72, 0xe2, 0x4a,
+	0xa1, 0xaf, 0xa0, 0xe1, 0x8b, 0xe2, 0x92, 0x98, 0x22, 0xa9, 0xb5, 0x6b, 0x9d, 0x8d, 0x14, 0x3c,
+	0x74, 0x43, 0x4c, 0x61, 0x09, 0x77, 0x4c, 0x10, 0x35, 0xf1, 0x84, 0x25, 0x4f, 0xf0, 0x90, 0x23,
+	0x7c, 0x0b, 0x2d, 0x4d, 0xd5, 0x03, 0xcb, 0x28, 0xce, 0x78, 0xa5, 0x0d, 0x55, 0xc9, 0xb2, 0x23,
+	0x45, 0x01, 0x3e, 0xf1, 0x28, 0xfa, 0x15, 0xa2, 0x5c, 0x11, 0x26, 0xf0, 0xf4, 0x93, 0x92, 0x95,
+	0x76, 0xad, 0xd3, 0x38, 0x7c, 0xdd, 0xf5, 0xdf, 0xdc, 0x9d, 0x7e, 0x73, 0xf7, 0x34, 0x10, 0xd2,
+	0xa6, 0x4b, 0x98, 0xfe, 0x44, 0x03, 0x48, 0x4a, 0xa2, 0xa8, 0x30, 0x58, 0x17, 0x95, 0xc9, 0xe5,
+	0x1f, 0x73, 0xb5, 0x56, 0x9f, 0xab, 0xb5, 0xeb, 0x53, 0x07, 0x21, 0x73, 0x56, 0xf4, 0x7b, 0xd8,
+	0xca, 0x99, 0xce, 0xe4, 0x03, 0x55, 0x13, 0x4c, 0xf2, 0x5c, 0x51, 0xad, 0x93, 0x35, 0x37, 0x41,
+	0x3c, 0x0b, 0x1c, 0x79, 0x1c, 0xfd, 0x0e, 0xaf, 0x9e, 0xc8, 0x8a, 0xde, 0x2b, 0xaa, 0x0b, 0x9c,
+	0x53, 0x4e, 0x26, 0x49, 0xfd, 0xb9, 0x0f, 0xd8, 0x99, 0x65, 0xa6, 0x3e, 0xf1, 0xd4, 0xe6, 0xa1,
+	0x6f, 0x20, 0xfa, 0xc4, 0xca, 0x8f, 0x4c, 0xcc, 0x9a, 0xaf, 0xbb, 0xe6, 0x4d, 0x8f, 0x4e, 0x3b,
+	0x1f, 0x43, 0x2b, 0x93, 0x42, 0xd0, 0xcc, 0x60, 0xc3, 0xc6, 0x54, 0x56, 0x26, 0xd9, 0x78, 0xae,
+	0x63, 0x14, 0x32, 0x86, 0x3e, 0x01, 0xbd, 0x05, 0xa4, 0x0d, 0x31, 0x3a, 0xc7, 0x55, 0x5e, 0xce,
+	0xda, 0x81, 0x9f, 0xd5, 0x47, 0x6e, 0xf3, 0x72, 0xda, 0xb1, 0x03, 0x71, 0x69, 0x95, 0x82, 0x49,
+	0x3e, 0x66, 0x02, 0x97, 0x52, 0x99, 0xa4, 0xd1, 0xae, 0x75, 0x56, 0xd3, 0xc8, 0xe1, 0x47, 0x16,
+	0xbe, 0x91, 0xca, 0xd8, 0x27, 0x24, 0x0f, 0x84, 0x71, 0x72, 0xc7, 0x38, 0x33, 0x13, 0xfc, 0x49,
+	0x0a, 0x9a, 0x6c, 0xfa, 0xb2, 0xf3, 0x81, 0x0f, 0x52, 0x50, 0x94, 0xc3, 0xeb, 0x4c, 0x0a, 0xa3,
+	0x24, 0xc7, 0x25, 0x27, 0x82, 0x62, 0x52, 0x99, 0x02, 0x97, 0x92, 0xb3, 0x6c, 0x92, 0x34, 0xdb,
+	0xb5, 0x4e, 0x74, 0xf8, 0x5d, 0x77, 0x81, 0xb4, 0xbb, 0x47, 0x95, 0x29, 0xa8, 0x30, 0x2c, 0x73,
+	0xc3, 0xdd, 0xb8, 0x84, 0x74, 0x37, 0xd4, 0xba, 0xb1, 0xa5, 0x2c, 0xc3, 0xe3, 0x76, 0xd4, 0xac,
+	0xd2, 0x46, 0x8e, 0x71, 0x90, 0xf7, 0x3d, 0xe3, 0x34, 0x89, 0xfc, 0x37, 0xf9, 0x88, 0x77, 0xc0,
+	0x39, 0xe3, 0xd4, 0x8e, 0x6a, 0xc7, 0xc7, 0x82, 0x8c, 0x29, 0xe6, 0x54, 0x8c, 0x4c, 0x91, 0xb4,
+	0xfc, 0xa8, 0x16, 0xbf, 0x22, 0x63, 0xda, 0x77, 0x28, 0x6a, 0x3b, 0xbf, 0x64, 0x95, 0x52, 0x54,
+	0x64, 0x93, 0x24, 0x76, 0xa4, 0x79, 0x68, 0xff, 0xaf, 0x3a, 0xc0, 0x25, 0xd5, 0x45, 0x30, 0xd8,
+	0x5b, 0x40, 0x63, 0xf6, 0x48, 0x15, 0xce, 0x0a, 0x9a, 0x7d, 0xc4, 0xd6, 0x13, 0x54, 0x05, 0x9f,
+	0xc5, 0x2e, 0x72, 0x62, 0x03, 0x03, 0x87, 0xa3, 0x2e, 0x6c, 0x7b, 0xb6, 0xa2, 0xf6, 0xbd, 0xa7,
+	0x74, 0xef, 0xba, 0x2d, 0x17, 0x4a, 0x5d, 0x24, 0xf0, 0x0f, 0xc1, 0xaa, 0x8a, 0xdc, 0x71, 0x1a,
+	0x5e, 0xd0, 0xb7, 0xd1, 0xce, 0x82, 0xeb, 0xe9, 0x76, 0x08, 0xfa, 0x47, 0x71, 0x8d, 0x34, 0x3a,
+	0x80, 0x2d, 0xbf, 0x57, 0xce, 0xb4, 0xa1, 0x61, 0xb1, 0x2b, 0x6e, 0x90, 0x96, 0x0b, 0xf4, 0x1d,
+	0xee, 0x36, 0xfb, 0x06, 0x3c, 0x84, 0x0b, 0x63, 0x4a, 0xcf, 0x5c, 0x75, 0xcc, 0xa6, 0x83, 0xdf,
+	0x1b, 0x53, 0x3a, 0xde, 0x02, 0x75, 0xae, 0xfd, 0x5f, 0x75, 0x7e, 0x0d, 0x4d, 0x26, 0x46, 0x56,
+	0x7a, 0x38, 0xe3, 0x44, 0x6b, 0xe7, 0xa8, 0x8d, 0x74, 0x33, 0x80, 0x27, 0x16, 0xb3, 0xd7, 0x66,
+	0x4a, 0x0a, 0xe7, 0x25, 0xd8, 0x25, 0x0a, 0xf0, 0xc0, 0xa3, 0x68, 0x0c, 0xaf, 0x66, 0xd5, 0xbc,
+	0x44, 0x38, 0x55, 0x78, 0x2c, 0x73, 0xea, 0x7c, 0x13, 0x1d, 0xfe, 0xb4, 0x50, 0x64, 0x4f, 0x9b,
+	0xeb, 0x5e, 0x84, 0xbe, 0xb3, 0xec, 0x4b, 0x99, 0xd3, 0x74, 0x87, 0x2d, 0x82, 0xd1, 0x35, 0x34,
+	0xe6, 0x75, 0x0c, 0xae, 0xc5, 0xc1, 0x73, 0x2d, 0x9e, 0x04, 0x7b, 0xbc, 0x94, 0xd4, 0x52, 0x20,
+	0x4f, 0x02, 0x3e, 0x83, 0x2d, 0x95, 0xeb, 0xcf, 0x6e, 0x4c, 0xe3, 0xb9, 0x37, 0x6d, 0xa9, 0x5c,
+	0x7f, 0x7e, 0x5d, 0xa8, 0x70, 0xfa, 0x30, 0x8a, 0x64, 0x4c, 0x8c, 0x9c, 0x2f, 0xd7, 0xd3, 0xa6,
+	0x47, 0x87, 0x1e, 0xb4, 0x7b, 0x26, 0x59, 0x66, 0x1f, 0x8b, 0xcb, 0xe0, 0x95, 0xa6, 0xbf, 0x42,
+	0x1e, 0xee, 0x4b, 0x6f, 0x94, 0xdf, 0x20, 0xca, 0xe9, 0x3d, 0xa9, 0xb8, 0x09, 0xbe, 0x72, 0x96,
+	0x6a, 0x1c, 0xb6, 0x17, 0x4e, 0x3a, 0xf7, 0x47, 0x93, 0x36, 0x43, 0x5e, 0xb0, 0xc5, 0x8f, 0xb0,
+	0x3b, 0x36, 0x5c, 0x63, 0xfa, 0x98, 0xf1, 0x2a, 0xa7, 0xf9, 0x74, 0x9b, 0x3a, 0x69, 0xb5, 0x97,
+	0x3b, 0x1b, 0xe9, 0x4b, 0x1b, 0x3d, 0x0b, 0xc1, 0xb0, 0x53, 0x6d, 0x25, 0xe2, 0xed, 0x31, 0xbd,
+	0x5d, 0xb1, 0x97, 0x88, 0x03, 0xc3, 0xdd, 0xda, 0xff, 0x19, 0x76, 0x16, 0xae, 0x0e, 0xd5, 0x61,
+	0xf9, 0xfa, 0xfc, 0x3c, 0x7e, 0x81, 0x1a, 0x50, 0x3f, 0x3d, 0x3b, 0x3f, 0xba, 0xed, 0x0f, 0xe3,
+	0x1a, 0x02, 0x58, 0x1b, 0x0c, 0xd3, 0x8b, 0x93, 0x61, 0xbc, 0xb4, 0xff, 0x06, 0x60, 0xee, 0x86,
+	0xac, 0xc3, 0xca, 0xd5, 0xf5, 0xd5, 0x59, 0xfc, 0x02, 0x45, 0x00, 0x97, 0xb7, 0xc3, 0xdb, 0xa3,
+	0x3e, 0x1e, 0xf6, 0x07, 0x71, 0xed, 0xe0, 0x17, 0x78, 0xb9, 0xe8, 0x1a, 0xfd, 0x77, 0x06, 0xda,
+	0x84, 0xfa, 0xc5, 0xd5, 0xfb, 0xb3, 0xf4, 0x62, 0x18, 0xff, 0x5d, 0x3f, 0xfe, 0xe2, 0xc3, 0x9e,
+	0x7f, 0x2f, 0x26, 0x7b, 0xa4, 0x64, 0xbd, 0x7f, 0xfd, 0xcb, 0xdf, 0xad, 0xb9, 0xbd, 0xfe, 0xf0,
+	0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xde, 0xe8, 0x6d, 0xe0, 0xfd, 0x07, 0x00, 0x00,
 }
diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto
index 80801e3ca3..8dc99f665d 100644
--- a/mesh/v1alpha1/config.proto
+++ b/mesh/v1alpha1/config.proto
@@ -218,4 +218,8 @@ message MeshConfig {
   // DO NOT use this setting for services that are managed by Istio (i.e. using Istio sidecar).
   // Instead, use service-level annotations to overwrite the authentication policy.
   repeated string mtls_excluded_services = 15;
+
+  // DEPRECATED. Mixer address. This option will be removed soon. Please
+  // use mixer_check_server and mixer_report_server.
+  string mixer_address = 16;
 }
diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
index 35f8bf12ba..f6d80d17f8 100644
--- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
+++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
@@ -207,6 +207,15 @@ <h2 id="MeshConfig">MeshConfig</h2>
 DO NOT use this setting for services that are managed by Istio (i.e. using Istio sidecar).
 Instead, use service-level annotations to overwrite the authentication policy.</p>
 
+</td>
+</tr>
+<tr id="MeshConfig.mixer_address">
+<td><code>mixerAddress</code></td>
+<td><code>string</code></td>
+<td>
+<p>DEPRECATED. Mixer address. This option will be removed soon. Please
+use mixer<em>check</em>server and mixer<em>report</em>server.</p>
+
 </td>
 </tr>
 </tbody>