From 336e6506942d1c4efac00414f9a4aef274060c07 Mon Sep 17 00:00:00 2001 From: Daming Date: Tue, 17 Mar 2020 13:37:44 +0800 Subject: [PATCH] [hotfix] Fix AlarmQuery query condition issue (#4529) * fix Alarm query condition issue * Update oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java Co-authored-by: kezhenxu94 Co-authored-by: kezhenxu94 --- .../oap/server/storage/plugin/influxdb/query/AlarmQuery.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java index c5fec30214..e964baf803 100644 --- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java +++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java @@ -34,10 +34,10 @@ import org.influxdb.dto.QueryResult; import org.influxdb.querybuilder.SelectQueryImpl; import org.influxdb.querybuilder.WhereQueryImpl; +import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.contains; import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.eq; import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.gte; import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.lte; -import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.regex; import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.select; @Slf4j @@ -64,7 +64,7 @@ public class AlarmQuery implements IAlarmQueryDAO { .and(lte(InfluxClient.TIME, InfluxClient.timeInterval(endTB))); } if (!Strings.isNullOrEmpty(keyword)) { - recallQuery.and(regex(AlarmRecord.ALARM_MESSAGE, keyword)); + recallQuery.and(contains(AlarmRecord.ALARM_MESSAGE, keyword.replaceAll("/", "\\\\/"))); } if (Objects.nonNull(scopeId)) { recallQuery.and(eq(AlarmRecord.SCOPE, scopeId)); -- GitLab