未验证 提交 336e6506 编写于 作者: D Daming 提交者: GitHub

[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: Nkezhenxu94 <kezhenxu94@apache.org>
Co-authored-by: Nkezhenxu94 <kezhenxu94@163.com>
上级 c8187ccd
......@@ -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));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册