kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[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 <kezhenxu94@apache.org>
Co-authored-by: kezhenxu94 <kezhenxu94@163.com>
This commit is contained in:
Daming 2020-03-17 13:37:44 +08:00 committed by GitHub
parent c8187ccd41
commit 336e650694
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java
View File

@ -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));