Skip to content

Commit

Permalink
Fix test fail caused by istio#8606
Browse files Browse the repository at this point in the history
  • Loading branch information
@yangminzhu
yangminzhu committed Sep 17, 2018
1 parent 6bf3e9e commit 241503d
Show file tree
Hide file tree
Showing 5 changed files with 252 additions and 120 deletions.
126 changes: 84 additions & 42 deletions istioctl/pkg/writer/envoy/clusters/testdata/clustermultihostsfiltered.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,34 @@
"portValue": 9080
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
{
"name": "cx_connect_fail"
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "HEALTHY"
}
Expand All @@ -35,20 +49,34 @@
"portValue": 9080
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
{
"name": "cx_connect_fail"
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "HEALTHY"
}
Expand All @@ -60,20 +88,34 @@
"portValue": 9080
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
{
"name": "cx_connect_fail"
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "HEALTHY"
}
Expand Down
114 changes: 78 additions & 36 deletions istioctl/pkg/writer/envoy/clusters/testdata/clusters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,20 +236,34 @@
"portValue": 9080
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
{
"name": "cx_connect_fail"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "HEALTHY"
}
Expand All @@ -261,20 +275,34 @@
"portValue": 9080
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
{
"name": "cx_connect_fail"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "HEALTHY"
}
Expand All @@ -286,20 +314,34 @@
"portValue": 9080
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
{
"name": "cx_connect_fail"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "HEALTHY"
}
Expand Down
Loading

0 comments on commit 241503d

Please sign in to comment.