From a49ce988b49fcb4ea50e3e55e05f437789fce4f4 Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Mon, 27 Jul 2020 10:45:41 +0800 Subject: [PATCH] Support regular expression in labelFilter (#5174) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 吴晟 Wu Sheng --- .../core/metric/promethues/PrometheusMetricConverter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/metric/promethues/PrometheusMetricConverter.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/metric/promethues/PrometheusMetricConverter.java index fc7631c3a..8e50f5090 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/metric/promethues/PrometheusMetricConverter.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/metric/promethues/PrometheusMetricConverter.java @@ -118,7 +118,8 @@ public class PrometheusMetricConverter { return true; } return rule._3.getLabelFilter().stream() - .allMatch(matchRule -> matchRule.getOptions().contains(metric.getLabels().get(matchRule.getKey()))); + .allMatch(matchRule -> matchRule.getOptions().stream() + .anyMatch(metric.getLabels().get(matchRule.getKey())::matches)); }) .map(rule -> Tuple.of(rule._1, rule._2, rule._3, metric)) )