From 35d8df254d5d27c36ddb24d791cdf34346624428 Mon Sep 17 00:00:00 2001
From: "data-plane-api(CircleCI)" <data-plane-api@users.noreply.github.com>
Date: Thu, 20 Feb 2020 17:58:38 +0000
Subject: [PATCH] export locality to host_status in Admin/ cluster dump
 (#10109)

Signed-off-by: Xin Zhuang <stevenzzz@google.com>

Mirrored from https://github.com/envoyproxy/envoy @ b9260b363769f94e160d9405b26a981c5394de02
---
 envoy/admin/v2alpha/clusters.proto | 6 +++++-
 envoy/admin/v3/clusters.proto      | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/envoy/admin/v2alpha/clusters.proto b/envoy/admin/v2alpha/clusters.proto
index af3e9aa2..4a05a40f 100644
--- a/envoy/admin/v2alpha/clusters.proto
+++ b/envoy/admin/v2alpha/clusters.proto
@@ -4,6 +4,7 @@ package envoy.admin.v2alpha;
 
 import "envoy/admin/v2alpha/metrics.proto";
 import "envoy/api/v2/core/address.proto";
+import "envoy/api/v2/core/base.proto";
 import "envoy/api/v2/core/health_check.proto";
 import "envoy/type/percent.proto";
 
@@ -70,7 +71,7 @@ message ClusterStatus {
 }
 
 // Current state of a particular host.
-// [#next-free-field: 9]
+// [#next-free-field: 10]
 message HostStatus {
   // Address of this host.
   api.v2.core.Address address = 1;
@@ -118,6 +119,9 @@ message HostStatus {
   // success rate or the cluster did not have enough hosts to run through success rate outlier
   // ejection.
   type.Percent local_origin_success_rate = 8;
+
+  // locality of the host.
+  api.v2.core.Locality locality = 9;
 }
 
 // Health status for a host.
diff --git a/envoy/admin/v3/clusters.proto b/envoy/admin/v3/clusters.proto
index 7f8bd74f..47f8df08 100644
--- a/envoy/admin/v3/clusters.proto
+++ b/envoy/admin/v3/clusters.proto
@@ -4,6 +4,7 @@ package envoy.admin.v3;
 
 import "envoy/admin/v3/metrics.proto";
 import "envoy/config/core/v3/address.proto";
+import "envoy/config/core/v3/base.proto";
 import "envoy/config/core/v3/health_check.proto";
 import "envoy/type/v3/percent.proto";
 
@@ -76,7 +77,7 @@ message ClusterStatus {
 }
 
 // Current state of a particular host.
-// [#next-free-field: 9]
+// [#next-free-field: 10]
 message HostStatus {
   option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.HostStatus";
 
@@ -126,6 +127,9 @@ message HostStatus {
   // success rate or the cluster did not have enough hosts to run through success rate outlier
   // ejection.
   type.v3.Percent local_origin_success_rate = 8;
+
+  // locality of the host.
+  config.core.v3.Locality locality = 9;
 }
 
 // Health status for a host.