From 5acc6f73b26f3b253b368f398f14867bb953d592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=84=E6=BD=AD?= Date: Fri, 7 Jun 2024 17:24:19 +0800 Subject: [PATCH] fix prometheus stats (#1031) --- .../patches/istio/20240607-fix-stats.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 istio/1.12/patches/istio/20240607-fix-stats.patch diff --git a/istio/1.12/patches/istio/20240607-fix-stats.patch b/istio/1.12/patches/istio/20240607-fix-stats.patch new file mode 100644 index 000000000..e9da24440 --- /dev/null +++ b/istio/1.12/patches/istio/20240607-fix-stats.patch @@ -0,0 +1,21 @@ +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-06-07 16:50:21.000000000 +0800 ++++ istio-new/tools/packaging/common/envoy_bootstrap.json 2024-06-07 16:47:42.000000000 +0800 +@@ -38,7 +38,7 @@ + "stats_tags": [ + { + "tag_name": "cluster_name", +- "regex": "^cluster\\.((.+?(\\..+?\\.svc\\.cluster\\.local)?)\\.)" ++ "regex": "^cluster\\.((.*?)\\.)(http1\\.|http2\\.|health_check\\.|zone\\.|external\\.|circuit_breakers\\.|[^\\.]+$)" + }, + { + "tag_name": "tcp_prefix", +@@ -58,7 +58,7 @@ + }, + { + "tag_name": "http_conn_manager_prefix", +- "regex": "^http\\.(((?:[_.[:digit:]]*|[_\\[\\]aAbBcCdDeEfF[:digit:]]*))\\.)" ++ "regex": "^http\\.(((outbound_([0-9]{1,3}\\.{0,1}){4}_\\d{0,5})|([^\\.]+))\\.)" + }, + { + "tag_name": "listener_address",