diff --git a/istio/1.12/patches/istio/20240521-optimize-bootstrap.patch b/istio/1.12/patches/istio/20240521-optimize-bootstrap.patch new file mode 100644 index 0000000000..79ea8bdc8b --- /dev/null +++ b/istio/1.12/patches/istio/20240521-optimize-bootstrap.patch @@ -0,0 +1,83 @@ +diff -Naur istio/tools/packaging/common/envoy_bootstrap.json istio-new/tools/packaging/common/envoy_bootstrap.json +--- istio/tools/packaging/common/envoy_bootstrap.json 2024-05-21 23:46:21.000000000 +0800 ++++ istio-new/tools/packaging/common/envoy_bootstrap.json 2024-05-21 23:47:54.000000000 +0800 +@@ -37,55 +37,15 @@ + "use_all_default_tags": false, + "stats_tags": [ + { +- "tag_name": "phase", +- "regex": "(_phase=([a-z_]+))" +- }, +- { +- "tag_name": "ruleid", +- "regex": "(_ruleid=([0-9]+))" +- }, +- { +- "tag_name": "route", +- "regex": "^vhost\\..*?\\.route\\.([^\\.]+\\.)upstream" +- }, +- { +- "tag_name": "ecds_name", +- "regex": "extension_config_discovery\\.(.*?\\.)[^\\.]+$" +- }, +- { +- "tag_name": "rds_name", +- "regex": "rds\\.(.*?\\.)[^\\.]+$" +- }, +- { +- "tag_name": "sds_name", +- "regex": "sds\\.(.*?\\.)[^\\.]+$" +- }, +- { +- "tag_name": "vhost", +- "regex": "^vhost\\.((.*?)\\.)(vcluster|route)" +- }, +- { +- "tag_name": "vcluster", +- "regex": "vcluster\\.((.*?)\\.)upstream" +- }, +- { +- "tag_name": "dest_zone", +- "regex": "zone\\.[^\\.]+\\.([^\\.]+\\.)" +- }, +- { +- "tag_name": "from_zone", +- "regex": "zone\\.([^\\.]+\\.)" +- }, +- { + "tag_name": "cluster_name", +- "regex": "^cluster\\.((.*?)\\.)(http1\\.|http2\\.|health_check\\.|zone\\.|external\\.|circuit_breakers\\.|[^\\.]+$)" ++ "regex": "^cluster\\.((.+?(\\..+?\\.svc\\.cluster\\.local)?)\\.)" + }, + { + "tag_name": "tcp_prefix", + "regex": "^tcp\\.((.*?)\\.)\\w+?$" + }, + { +- "regex": "(response_code=\\.=(.+?);\\.;)|_rq(_(\\.d{3}))$", ++ "regex": "_rq(_(\\d{3}))$", + "tag_name": "response_code" + }, + { +@@ -98,7 +58,7 @@ + }, + { + "tag_name": "http_conn_manager_prefix", +- "regex": "^http\\.(((outbound_([0-9]{1,3}\\.{0,1}){4}_\\d{0,5})|([^\\.]+))\\.)" ++ "regex": "^http\\.(((?:[_.[:digit:]]*|[_\\[\\]aAbBcCdDeEfF[:digit:]]*))\\.)" + }, + { + "tag_name": "listener_address", +@@ -108,12 +68,6 @@ + "tag_name": "mongo_prefix", + "regex": "^mongo\\.(.+?)\\.(collection|cmd|cx_|op_|delays_|decoding_)(.*?)$" + }, +- {{- range $a, $tag := .extraStatTags }} +- { +- "regex": "({{ $tag }}=\\.=(.*?);\\.;)", +- "tag_name": "{{ $tag }}" +- }, +- {{- end }} + { + "regex": "(cache\\.(.+?)\\.)", + "tag_name": "cache"