feat: trace 检索新增视图配置接口 --story=122594569

bkmonitor/packages/apm_web/trace/constants.py

@@ -28,52 +28,57 @@ class OperatorEnum:
     """操作符枚举"""
 
     EQ = {"operator": "equal", "label": "=", "placeholder": _("请选择或直接输入，Enter分隔")}
-    EQ_WILDCARD = {
-        "operator": "equal",
-        "label": "=",
-        "placeholder": _("请选择或直接输入，Enter分隔"),
-        "wildcard_operator": "like",
-    }
     NE = {"operator": "not_equal", "label": "!=", "placeholder": _("请选择或直接输入，Enter分隔")}
-    NE_WILDCARD = {
-        "operator": "not_equal",
-        "label": "!=",
-        "placeholder": _("请选择或直接输入，Enter分隔"),
-        "wildcard_operator": "like",
-    }
-
     EXISTS = {"operator": "exists", "label": _("存在"), "placeholder": _("确认字段已存在")}
     NOT_EXISTS = {"operator": "not exists", "label": _("不存在"), "placeholder": _("确认字段不存在")}
     INCLUDE = {"operator": "like", "label": _("包含"), "placeholder": _("请选择或直接输入，Enter分隔")}
+    CONTAINS_MATCH_PHRASE = {
+        "operator": "equal",
+        "label": _("包含"),
+        "placeholder": _("请选择或直接输入，Enter分隔"),
+        "options": [
+            {"label": _("使用通配符"), "name": "is_wildcard", "default": False},
+            {
+                "label": _("组间关系"),
+                "name": "group_relation",
+                "default": "OR",
+                "children": [
+                    {"label": "AND", "value": "AND"},
+                    {"label": "OR", "value": "OR"},
+                ],
+            },
+        ],
+    }
 
 
 OPERATORS = {
     "keyword": [
-        OperatorEnum.EQ_WILDCARD,
-        OperatorEnum.NE_WILDCARD,
+        OperatorEnum.EQ,
+        OperatorEnum.NE,
         OperatorEnum.EXISTS,
         OperatorEnum.NOT_EXISTS,
         OperatorEnum.INCLUDE,
     ],
     "text": [
+        OperatorEnum.CONTAINS_MATCH_PHRASE,
         OperatorEnum.EXISTS,
         OperatorEnum.NOT_EXISTS,
     ],
     "integer": [
-        OperatorEnum.EQ_WILDCARD,
-        OperatorEnum.NE_WILDCARD,
+        OperatorEnum.EQ,
+        OperatorEnum.NE,
         OperatorEnum.EXISTS,
         OperatorEnum.NOT_EXISTS,
     ],
     "long": [
-        OperatorEnum.EQ_WILDCARD,
-        OperatorEnum.NE_WILDCARD,
+        OperatorEnum.EQ,
+        OperatorEnum.NE,
         OperatorEnum.EXISTS,
         OperatorEnum.NOT_EXISTS,
     ],
     "double": [
-        OperatorEnum.EQ_WILDCARD,
-        OperatorEnum.NE_WILDCARD,
+        OperatorEnum.EQ,
+        OperatorEnum.NE,
         OperatorEnum.EXISTS,
         OperatorEnum.NOT_EXISTS,
     ],

bkmonitor/packages/apm_web/trace/resources.py

@@ -32,6 +32,7 @@
 from apm_web.models.trace import TraceComparison
 from apm_web.trace.serializers import (
     BaseTraceRequestSerializer,
+    GetFieldsOptionValuesRequestSerializer,
     QuerySerializer,
     QueryStatisticsSerializer,
     SpanIdInputSerializer,
@@ -1093,21 +1094,7 @@ def perform_request(self, validated_request_data):
 class GetFieldsOptionValuesResource(Resource):
     """获取指定字段列表的候选项值"""
 
-    class RequestSerializer(serializers.Serializer):
-        class FilterSerializer(serializers.Serializer):
-            key = serializers.CharField(label="字段名")
-            operator = serializers.CharField(label="操作符")
-            value = serializers.ListField(child=serializers.CharField(), label="值列表")
-
-        bk_biz_id = serializers.IntegerField()
-        app_name = serializers.CharField(label="应用名称")
-        start_time = serializers.IntegerField()
-        end_time = serializers.IntegerField()
-        fields = serializers.ListField(child=serializers.CharField(), label="查询字段列表")
-        limit = serializers.IntegerField(label="查询条数", default=10)
-        filters = serializers.ListField(child=FilterSerializer(), label="过滤条件列表", allow_empty=True)
-        query_string = serializers.CharField(label="查询字符串", allow_blank=True)
-        mode = serializers.ChoiceField(label="查询视角", choices=QueryMode.choices(), default="span")
+    RequestSerializer = GetFieldsOptionValuesRequestSerializer
 
     @using_cache(CacheType.APM(60 * 1))
     def perform_request(self, validated_request_data):

bkmonitor/packages/apm_web/trace/serializers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Tencent is pleased to support the open source community by making 蓝鲸智云 - 监控平台 (BlueKing - Monitor) available.
 Copyright (C) 2017-2022 THL A29 Limited, a Tencent company. All rights reserved.
@@ -8,6 +7,7 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
+
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
@@ -71,6 +71,7 @@ class Meta:
 class FilterSerializer(serializers.Serializer):
     key = serializers.CharField(label="查询键")
     operator = serializers.CharField(label="操作符")
+    options = serializers.DictField(label="操作符选项", required=False)
     value = serializers.ListSerializer(label="查询值", child=serializers.CharField(allow_blank=True), allow_empty=True)
 
 
@@ -91,7 +92,9 @@ class QueryStatisticsSerializer(serializers.Serializer):
     class FilterSerializer(serializers.Serializer):
         key = serializers.CharField(label="查询键")
         operator = serializers.CharField(label="操作符")
-        value = serializers.ListSerializer(label="查询值", child=serializers.CharField(allow_blank=True), allow_empty=True)
+        value = serializers.ListSerializer(
+            label="查询值", child=serializers.CharField(allow_blank=True), allow_empty=True
+        )
 
     bk_biz_id = serializers.IntegerField(label="业务ID")
     app_name = serializers.CharField(label="应用名称")
@@ -124,6 +127,11 @@ class BaseTraceFilterSerializer(serializers.Serializer):
     end_time = serializers.IntegerField(label="结束时间")
 
 
+class GetFieldsOptionValuesRequestSerializer(BaseTraceRequestSerializer, BaseTraceFilterSerializer):
+    fields = serializers.ListField(child=serializers.CharField(), label="查询字段列表")
+    limit = serializers.IntegerField(label="查询条数", required=False, default=10)
+
+
 class TraceFieldsTopkRequestSerializer(BaseTraceRequestSerializer, BaseTraceFilterSerializer):
     fields = serializers.ListField(child=serializers.CharField(), label="查询字段列表")
     limit = serializers.IntegerField(label="数量限制", required=False, default=5)