From 7db9344badaafb6f817475009be3413d601648e1 Mon Sep 17 00:00:00 2001 From: silenceqi Date: Thu, 16 Jan 2025 11:11:53 +0800 Subject: [PATCH] fix: lint eror (#82) --- core/security/validate.go | 1 - model/alerting/rule_test.go | 2 +- modules/agent/api/elasticsearch.go | 1 - modules/elastic/api/host.go | 1 - modules/elastic/api/manage.go | 1 - modules/elastic/api/v1/cluster_overview.go | 1 - modules/elastic/api/v1/manage.go | 1 - modules/elastic/api/v1/node_overview.go | 1 - plugin/api/insight/metadata.go | 2 +- plugin/managed/server/instance.go | 1 - 10 files changed, 2 insertions(+), 10 deletions(-) diff --git a/core/security/validate.go b/core/security/validate.go index 490d6c05..be6d2e6f 100644 --- a/core/security/validate.go +++ b/core/security/validate.go @@ -43,7 +43,6 @@ import ( type EsRequest struct { Doc string `json:"doc"` Privilege string `json:"privilege"` - ClusterRequest IndexRequest } diff --git a/model/alerting/rule_test.go b/model/alerting/rule_test.go index 10d2daf2..1ab1bd07 100644 --- a/model/alerting/rule_test.go +++ b/model/alerting/rule_test.go @@ -85,7 +85,7 @@ func TestCreateRule(t *testing.T) { Metrics: Metric{ Metric: insight.Metric{ - Groups: []insight.MetricGroupItem{{"metadata.labels.cluster_id", 10}, {"metadata.labels.node_id", 10}}, + Groups: []insight.MetricGroupItem{{Field: "metadata.labels.cluster_id", Limit: 10}, {Field: "metadata.labels.node_id", Limit: 10}}, Items: []insight.MetricItem{ {Name: "a", Field: "payload.elasticsearch.node_stats.fs.total.free_in_bytes", Statistic: "min"}, {Name: "b", Field: "payload.elasticsearch.node_stats.fs.total.total_in_bytes", Statistic: "max"}, diff --git a/modules/agent/api/elasticsearch.go b/modules/agent/api/elasticsearch.go index 2f212d3d..4fe062ef 100644 --- a/modules/agent/api/elasticsearch.go +++ b/modules/agent/api/elasticsearch.go @@ -424,7 +424,6 @@ func (h *APIHandler) autoEnrollESNode(w http.ResponseWriter, req *http.Request, if autoEnrollRunning.Load() { panic(errors.New("auto_enroll is already running in background")) - return } autoEnrollRunning.Swap(true) diff --git a/modules/elastic/api/host.go b/modules/elastic/api/host.go index 39264493..13173686 100644 --- a/modules/elastic/api/host.go +++ b/modules/elastic/api/host.go @@ -468,7 +468,6 @@ func (h *APIHandler) FetchHostInfo(w http.ResponseWriter, req *http.Request, ps bucketSize, min, max, err := h.GetMetricRangeAndBucketSize(req, "", "", 15) if err != nil { panic(err) - return } networkInMetricItem := newMetricItem("network_in_rate", 1, SystemGroupKey) networkInMetricItem.AddAxi("network_rate", "group1", common.PositionLeft, "bytes", "0.[0]", "0.[0]", 5, true) diff --git a/modules/elastic/api/manage.go b/modules/elastic/api/manage.go index 2e4e0fd3..48d31915 100644 --- a/modules/elastic/api/manage.go +++ b/modules/elastic/api/manage.go @@ -554,7 +554,6 @@ func (h *APIHandler) HandleClusterMetricsAction(w http.ResponseWriter, req *http bucketSize, min, max, err := h.GetMetricRangeAndBucketSize(req, id, metricType, 90) if err != nil { panic(err) - return } var metrics map[string]*common.MetricItem if bucketSize <= 60 { diff --git a/modules/elastic/api/v1/cluster_overview.go b/modules/elastic/api/v1/cluster_overview.go index 9c0865d4..73dc0044 100644 --- a/modules/elastic/api/v1/cluster_overview.go +++ b/modules/elastic/api/v1/cluster_overview.go @@ -113,7 +113,6 @@ func (h *APIHandler) FetchClusterInfo(w http.ResponseWriter, req *http.Request, bucketSize, min, max, err := h.GetMetricRangeAndBucketSize(req, clusterIDs[0], MetricTypeIndexStats, 15) if err != nil { panic(err) - return } query := util.MapStr{} diff --git a/modules/elastic/api/v1/manage.go b/modules/elastic/api/v1/manage.go index 56d58dac..c06652d9 100644 --- a/modules/elastic/api/v1/manage.go +++ b/modules/elastic/api/v1/manage.go @@ -522,7 +522,6 @@ func (h *APIHandler) HandleClusterMetricsAction(w http.ResponseWriter, req *http bucketSize, min, max, err := h.GetMetricRangeAndBucketSize(req, id, metricType, 90) if err != nil { panic(err) - return } timeout := h.GetParameterOrDefault(req, "timeout", "60s") diff --git a/modules/elastic/api/v1/node_overview.go b/modules/elastic/api/v1/node_overview.go index d13c2383..65a5c8a8 100644 --- a/modules/elastic/api/v1/node_overview.go +++ b/modules/elastic/api/v1/node_overview.go @@ -308,7 +308,6 @@ func (h *APIHandler) FetchNodeInfo(w http.ResponseWriter, req *http.Request, ps bucketSize, min, max, err := h.GetMetricRangeAndBucketSize(req, clusterID, MetricTypeNodeStats, 15) if err != nil { panic(err) - return } // ็ดขๅผ•้€Ÿ็Ž‡ indexMetric := newMetricItem("indexing", 1, OperationGroupKey) diff --git a/plugin/api/insight/metadata.go b/plugin/api/insight/metadata.go index cb6af1ff..93c83d1c 100644 --- a/plugin/api/insight/metadata.go +++ b/plugin/api/insight/metadata.go @@ -466,7 +466,7 @@ func getMetadataByIndexPattern(clusterID, indexPattern, timeField string, filter }} if seriesType == "column" || seriesType == "pie" { seriesItem.Metric.Groups = []insight.MetricGroupItem{ - {aggField.Name, 10}, + {Field: aggField.Name, Limit: 10}, } } fieldVis := insight.Visualization{ diff --git a/plugin/managed/server/instance.go b/plugin/managed/server/instance.go index 5959bf09..df414fe6 100644 --- a/plugin/managed/server/instance.go +++ b/plugin/managed/server/instance.go @@ -163,7 +163,6 @@ func (h *APIHandler) createInstance(w http.ResponseWriter, req *http.Request, ps obj.Name = res.Name } obj.Application = res.Application - res.Network = res.Network exists, err := orm.Get(obj) if err != nil && err != elastic.ErrNotFound {