From d63036fb1db2ee51c5c259779c713fcaccc2f470 Mon Sep 17 00:00:00 2001 From: Wangjunqi123 Date: Mon, 8 Jul 2024 14:21:02 +0800 Subject: [PATCH] server/service: Standardize parameter naming for query templates --- go.sum | 2 -- server/handler/searchHandle.go | 2 +- server/service/template/meta.go | 56 ++++++++++++++--------------- server/service/template/template.go | 8 ++--- 4 files changed, 33 insertions(+), 35 deletions(-) diff --git a/go.sum b/go.sum index cfbf277..fa812b3 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -gitee.com/openeuler/PilotGo/sdk v0.0.0-20240516011326-59b5a9af0526 h1:YODHEkVSFbXNAZVM7YgX7vkHYukDXUQ8Sk3Vj2SeZdg= -gitee.com/openeuler/PilotGo/sdk v0.0.0-20240516011326-59b5a9af0526/go.mod h1:zEVmY3l48/CvR2kIM3DJpD/jWTG1qkOxRoHJii/D0us= gitee.com/openeuler/PilotGo/sdk v0.0.0-20240612062829-11adb82d6774 h1:F7APS9ICH2CrzJOC4qe1XV0uskplbweQxm6vTx0d3cI= gitee.com/openeuler/PilotGo/sdk v0.0.0-20240612062829-11adb82d6774/go.mod h1:87giU5v2IkUx78GRfezNBHhDGqzlwhNICOVY+hUYSJM= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= diff --git a/server/handler/searchHandle.go b/server/handler/searchHandle.go index 1257ec1..497803f 100755 --- a/server/handler/searchHandle.go +++ b/server/handler/searchHandle.go @@ -42,7 +42,7 @@ func SearchByTemplateHandle(ctx *gin.Context) { } params := map[string]interface{}{} for k, v := range req_body.Params { - if strings.Contains(k, "query_range") { + if strings.Contains(k, "queryfield_range") { params[k] = global.GetTime_Timestamp2DateTime(int64(v.(float64))) continue } diff --git a/server/service/template/meta.go b/server/service/template/meta.go index 323e0b8..2df03fe 100755 --- a/server/service/template/meta.go +++ b/server/service/template/meta.go @@ -30,7 +30,7 @@ const ( "aggs": { "1-1": { "terms": { - "field": "{{aggs_field}}", + "field": "{{aggsfield}}", "order": { "_count": "desc" }, @@ -56,7 +56,7 @@ const ( "should": [ { "match": { - "data_stream.dataset": "{{query_data_stream_dataset}}" + "data_stream.dataset": "{{queryfield_datastream_dataset}}" } } ], @@ -67,8 +67,8 @@ const ( "range": { "@timestamp": { "format": "strict_date_optional_time", - "gte": "{{query_range_gte}}", - "lte": "{{query_range_lte}}" + "gte": "{{queryfield_range_gte}}", + "lte": "{{queryfield_range_lte}}" } } } @@ -79,10 +79,10 @@ const ( } }, "params": { - "query_data_stream_dataset": "system.syslog", - "query_range_gte": "2024-06-24T10:55:36.185Z", - "query_range_lte": "2024-06-24T11:00:36.185Z", - "aggs_field": "host.hostname", + "queryfield_datastream_dataset": "system.syslog", + "queryfield_range_gte": "2024-06-24T10:55:36.185Z", + "queryfield_range_lte": "2024-06-24T11:00:36.185Z", + "aggsfield": "host.hostname", "size": 0, "fixed_interval": "10s" } @@ -106,7 +106,7 @@ const ( "aggs": { "1-1": { "terms": { - "field": "{{aggs_1-1_field}}", + "field": "{{aggsfield}}", "order": { "_count": "desc" }, @@ -132,12 +132,12 @@ const ( "must": [ { "match": { - "data_stream.dataset": "{{query_data_stream_dataset}}" + "data_stream.dataset": "{{queryfield_data_stream_dataset}}" } }, { "term": { - "host.hostname": "{{hostname}}" + "host.hostname": "{{queryfield_hostname}}" } } ] @@ -147,8 +147,8 @@ const ( "range": { "@timestamp": { "format": "strict_date_optional_time", - "gte": "{{query_range_gte}}", - "lte": "{{query_range_lte}}" + "gte": "{{queryfield_range_gte}}", + "lte": "{{queryfield_range_lte}}" } } } @@ -159,11 +159,11 @@ const ( } }, "params": { - "query_data_stream_dataset": "system.syslog", - "query_range_gte": "2024-06-24T10:55:36.185Z", - "query_range_lte": "2024-06-24T11:00:36.185Z", - "aggs_1-1_field": "process.name", - "hostname": "wjq-pc", + "queryfield_data_stream_dataset": "system.syslog", + "queryfield_range_gte": "2024-06-24T10:55:36.185Z", + "queryfield_range_lte": "2024-06-24T11:00:36.185Z", + "aggsfield": "process.name", + "queryfield_hostname": "wjq-pc", "size": 0, "fixed_interval": "10s" } @@ -218,17 +218,17 @@ const ( "must": [ { "match": { - "data_stream.dataset": "{{query_data_stream_dataset}}" + "data_stream.dataset": "{{queryfield_datastream_dataset}}" } }, { "term": { - "host.hostname": "{{hostname}}" + "host.hostname": "{{queryfield_hostname}}" } }, { "term": { - "process.name": "{{processname}}" + "process.name": "{{queryfield_processname}}" } } ] @@ -238,8 +238,8 @@ const ( "range": { "@timestamp": { "format": "strict_date_optional_time", - "gte": "{{query_range_gte}}", - "lte": "{{query_range_lte}}" + "gte": "{{queryfield_range_gte}}", + "lte": "{{queryfield_range_lte}}" } } } @@ -250,11 +250,11 @@ const ( } }, "params": { - "query_data_stream_dataset": "system.syslog", - "query_range_gte": "2024-06-24T10:55:36.185Z", - "query_range_lte": "2024-06-24T11:00:36.185Z", - "hostname": "wjq-pc", - "processname": "systemd", + "queryfield_datastream_dataset": "system.syslog", + "queryfield_range_gte": "2024-06-24T10:55:36.185Z", + "queryfield_range_lte": "2024-06-24T11:00:36.185Z", + "queryfield_hostname": "wjq-pc", + "queryfield_processname": "systemd", "from": 0, "size": 10 } diff --git a/server/service/template/template.go b/server/service/template/template.go index 8d54697..c0453ad 100755 --- a/server/service/template/template.go +++ b/server/service/template/template.go @@ -6,7 +6,7 @@ import ( "gitee.com/openeuler/PilotGo-plugin-elk/server/elasticClient" "gitee.com/openeuler/PilotGo-plugin-elk/server/errormanager" "gitee.com/openeuler/PilotGo-plugin-elk/server/pluginclient" - "gitee.com/openeuler/PilotGo-plugin-elk/server/service/cluster" + "gitee.com/openeuler/PilotGo-plugin-elk/server/service/log" "github.com/pkg/errors" ) @@ -14,15 +14,15 @@ func init() { QueryTemplateMap = map[string]QueryTemplateMeta{ "log_clusterhost_timeaxis": { Text: DSL_log_clusterhost_timeaxis_template, - Func: cluster.ProcessLogTimeAxisData, + Func: log.ProcessLogTimeAxisData, }, "log_hostprocess_timeaxis": { Text: DSL_log_hostprocess_timeaxis_template, - Func: cluster.ProcessLogTimeAxisData, + Func: log.ProcessLogTimeAxisData, }, "log_stream": { Text: DSL_log_stream_template, - Func: cluster.ProcessLogStreamData, + Func: log.ProcessLogStreamData, }, } } -- Gitee