fix: postgres init bug (#2370)

alert/eval/eval.go

@@ -20,7 +20,6 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/hash"
 	"github.com/ccfos/nightingale/v6/pkg/parser"
 	promsdk "github.com/ccfos/nightingale/v6/pkg/prom"
-	promql2 "github.com/ccfos/nightingale/v6/pkg/promql"
 	"github.com/ccfos/nightingale/v6/pkg/unit"
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/ccfos/nightingale/v6/tdengine"
@@ -60,10 +59,6 @@ const (
 	QUERY_DATA      = "query_data"
 )
 
-const (
-	JoinMark = "@@"
-)
-
 type JoinType string
 
 const (
@@ -381,7 +376,7 @@ func (arw *AlertRuleWorker) VarFillingAfterQuery(query models.PromQuery, readerC
 			}
 			seqVals := getSamples(value)
 			// 得到参数变量的所有组合
-			paramPermutation, err := arw.getParamPermutation(param, ParamKeys, varToLabel, query.PromQl, readerClient)
+			paramPermutation, err := arw.getParamPermutation(param, ParamKeys)
 			if err != nil {
 				logger.Errorf("rule_eval:%s, paramPermutation error:%v", arw.Key(), err)
 				continue
@@ -396,8 +391,8 @@ func (arw *AlertRuleWorker) VarFillingAfterQuery(query models.PromQuery, readerC
 					curRealQuery = fillVar(curRealQuery, paramKey, val)
 				}
 
-				if _, ok := paramPermutation[strings.Join(cur, JoinMark)]; ok {
-					anomalyPointsMap[strings.Join(cur, JoinMark)] = models.AnomalyPoint{
+				if _, ok := paramPermutation[strings.Join(cur, "-")]; ok {
+					anomalyPointsMap[strings.Join(cur, "-")] = models.AnomalyPoint{
 						Key:       seqVals[i].Metric.String(),
 						Timestamp: seqVals[i].Timestamp.Unix(),
 						Value:     float64(seqVals[i].Value),
@@ -406,7 +401,7 @@ func (arw *AlertRuleWorker) VarFillingAfterQuery(query models.PromQuery, readerC
 						Query:     curRealQuery,
 					}
 					// 生成异常点后，删除该参数组合
-					delete(paramPermutation, strings.Join(cur, JoinMark))
+					delete(paramPermutation, strings.Join(cur, "-"))
 				}
 			}
 
@@ -502,7 +497,7 @@ func removeVal(promql string) string {
 }
 
 // 获取参数变量的所有组合
-func (arw *AlertRuleWorker) getParamPermutation(paramVal map[string]models.ParamQuery, paramKeys []string, varToLabel map[string]string, originPromql string, readerClient promsdk.API) (map[string]struct{}, error) {
+func (arw *AlertRuleWorker) getParamPermutation(paramVal map[string]models.ParamQuery, paramKeys []string) (map[string]struct{}, error) {
 
 	// 参数变量查询，得到参数变量值
 	paramMap := make(map[string][]string)
@@ -534,15 +529,7 @@ func (arw *AlertRuleWorker) getParamPermutation(paramVal map[string]models.Param
 			if err != nil {
 				logger.Errorf("query:%s fail to unmarshalling into string slice, error:%v", paramQuery.Query, err)
 			}
-			if len(query) == 0 {
-				paramsKeyAllLabel, err := getParamKeyAllLabel(varToLabel[paramKey], originPromql, readerClient)
-				if err != nil {
-					logger.Errorf("rule_eval:%s, fail to getParamKeyAllLabel, error:%v", arw.Key(), paramQuery.Query, err)
-				}
-				params = paramsKeyAllLabel
-			} else {
-				params = query
-			}
+			params = query
 		default:
 			return nil, fmt.Errorf("unknown param type: %s", paramQuery.ParamType)
 		}
@@ -560,63 +547,12 @@ func (arw *AlertRuleWorker) getParamPermutation(paramVal map[string]models.Param
 
 	res := make(map[string]struct{})
 	for i := range permutation {
-		res[strings.Join(permutation[i], JoinMark)] = struct{}{}
+		res[strings.Join(permutation[i], "@@")] = struct{}{}
 	}
 
 	return res, nil
 }
 
-func getParamKeyAllLabel(paramKey string, promql string, client promsdk.API) ([]string, error) {
-	labels, metricName, err := promql2.GetLabelsAndMetricNameWithReplace(promql, "$")
-	if err != nil {
-		return nil, fmt.Errorf("promql:%s, get labels error:%v", promql, err)
-	}
-	labelstrs := make([]string, 0)
-	for _, label := range labels {
-		if strings.HasPrefix(label.Value, "$") {
-			continue
-		}
-		labelstrs = append(labelstrs, label.Name+label.Op+label.Value)
-	}
-	pr := metricName + "{" + strings.Join(labelstrs, ",") + "}"
-
-	value, _, err := client.Query(context.Background(), pr, time.Now())
-	if err != nil {
-		return nil, fmt.Errorf("promql: %s query error: %v", pr, err)
-	}
-	labelValuesMap := make(map[string]struct{})
-
-	switch value.Type() {
-	case model.ValVector:
-		vector := value.(model.Vector)
-		for _, sample := range vector {
-			for labelName, labelValue := range sample.Metric {
-				// 只处理ParamKeys中指定的label
-				if string(labelName) == paramKey {
-					labelValuesMap[string(labelValue)] = struct{}{}
-				}
-			}
-		}
-	case model.ValMatrix:
-		matrix := value.(model.Matrix)
-		for _, series := range matrix {
-			for labelName, labelValue := range series.Metric {
-				// 只处理ParamKeys中指定的label
-				if string(labelName) == paramKey {
-					labelValuesMap[string(labelValue)] = struct{}{}
-				}
-			}
-		}
-	}
-
-	result := make([]string, 0)
-	for labelValue, _ := range labelValuesMap {
-		result = append(result, labelValue)
-	}
-
-	return result, nil
-}
-
 func (arw *AlertRuleWorker) getHostIdents(paramQuery models.ParamQuery) ([]string, error) {
 	var params []string
 	q, _ := json.Marshal(paramQuery.Query)
@@ -1294,7 +1230,6 @@ func GetQueryRefAndUnit(query interface{}) (string, string, error) {
 // 再查询得到满足值变量的所有结果加入异常点列表
 // 参数变量的值不满足的组合，需要覆盖上层筛选中产生的异常点
 func (arw *AlertRuleWorker) VarFillingBeforeQuery(query models.PromQuery, readerClient promsdk.API) []models.AnomalyPoint {
-	varToLabel := ExtractVarMapping(query.PromQl)
 	// 存储异常点的 map，key 为参数变量的组合，可以实现子筛选对上一层筛选的覆盖
 	anomalyPointsMap := sync.Map{}
 	// 统一变量配置格式
@@ -1337,7 +1272,7 @@ func (arw *AlertRuleWorker) VarFillingBeforeQuery(query models.PromQuery, reader
 				curPromql = strings.Replace(curPromql, fmt.Sprintf("$%s", key), val, -1)
 			}
 			// 得到参数变量的所有组合
-			paramPermutation, err := arw.getParamPermutation(param, ParamKeys, varToLabel, query.PromQl, readerClient)
+			paramPermutation, err := arw.getParamPermutation(param, ParamKeys)
 			if err != nil {
 				logger.Errorf("rule_eval:%s, paramPermutation error:%v", arw.Key(), err)
 				continue
@@ -1346,7 +1281,7 @@ func (arw *AlertRuleWorker) VarFillingBeforeQuery(query models.PromQuery, reader
 			keyToPromql := make(map[string]string)
 			for paramPermutationKeys, _ := range paramPermutation {
 				realPromql := curPromql
-				split := strings.Split(paramPermutationKeys, JoinMark)
+				split := strings.Split(paramPermutationKeys, "@@")
 				for j := range ParamKeys {
 					realPromql = fillVar(realPromql, ParamKeys[j], split[j])
 				}

alert/process/process.go

@@ -2,7 +2,6 @@ package process
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"html/template"
 	"sort"
@@ -216,6 +215,7 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 	event.Callbacks = p.rule.Callbacks
 	event.CallbacksJSON = p.rule.CallbacksJSON
 	event.Annotations = p.rule.Annotations
+	event.AnnotationsJSON = make(map[string]string)
 	event.RuleConfig = p.rule.RuleConfig
 	event.RuleConfigJson = p.rule.RuleConfigJson
 	event.Severity = anomalyPoint.Severity
@@ -224,11 +224,6 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 	event.RecoverConfig = anomalyPoint.RecoverConfig
 	event.RuleHash = ruleHash
 
-	if err := json.Unmarshal([]byte(p.rule.Annotations), &event.AnnotationsJSON); err != nil {
-		event.AnnotationsJSON = make(map[string]string) // 解析失败时使用空 map
-		logger.Warningf("unmarshal annotations json failed: %v, rule: %d", err, p.rule.Id)
-	}
-
 	if p.target != "" {
 		if pt, exist := p.TargetCache.Get(p.target); exist {
 			pt.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(pt.GroupIds)

center/router/router.go

@@ -322,11 +322,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/share-charts", rt.chartShareGets)
 		pages.POST("/share-charts", rt.auth(), rt.chartShareAdd)
 
-		pages.POST("/dashboard-annotations", rt.auth(), rt.user(), rt.perm("/dashboards/put"), rt.dashAnnotationAdd)
-		pages.GET("/dashboard-annotations", rt.dashAnnotationGets)
-		pages.PUT("/dashboard-annotation/:id", rt.auth(), rt.user(), rt.perm("/dashboards/put"), rt.dashAnnotationPut)
-		pages.DELETE("/dashboard-annotation/:id", rt.auth(), rt.user(), rt.perm("/dashboards/del"), rt.dashAnnotationDel)
-
 		// pages.GET("/alert-rules/builtin/alerts-cates", rt.auth(), rt.user(), rt.builtinAlertCateGets)
 		// pages.GET("/alert-rules/builtin/list", rt.auth(), rt.user(), rt.builtinAlertRules)
 		pages.GET("/alert-rules/callbacks", rt.auth(), rt.user(), rt.alertRuleCallbacks)
@@ -484,7 +479,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.PUT("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/built-in-components/put"), rt.builtinPayloadsPut)
 		pages.DELETE("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/built-in-components/del"), rt.builtinPayloadsDel)
 		pages.GET("/builtin-payload", rt.auth(), rt.user(), rt.builtinPayloadsGetByUUIDOrID)
-
 	}
 
 	r.GET("/api/n9e/versions", func(c *gin.Context) {

center/router/router_builtin_componet.go

@@ -36,9 +36,8 @@ func (rt *Router) builtinComponentsAdd(c *gin.Context) {
 
 func (rt *Router) builtinComponentsGets(c *gin.Context) {
 	query := ginx.QueryStr(c, "query", "")
-	disabled := ginx.QueryInt(c, "disabled", -1)
 
-	bc, err := models.BuiltinComponentGets(rt.Ctx, query, disabled)
+	bc, err := models.BuiltinComponentGets(rt.Ctx, query)
 	ginx.Dangerous(err)
 
 	ginx.NewRender(c).Data(bc, nil)

center/router/router_dash_annotation.go

@@ -1,99 +0,0 @@
-package router
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-)
-
-func checkAnnotationPermission(c *gin.Context, ctx *ctx.Context, dashboardId int64) {
-	dashboard, err := models.BoardGetByID(ctx, dashboardId)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, "failed to get dashboard: %v", err)
-	}
-
-	if dashboard == nil {
-		ginx.Bomb(http.StatusNotFound, "dashboard not found")
-	}
-
-	bg := BusiGroup(ctx, dashboard.GroupId)
-	me := c.MustGet("user").(*models.User)
-	can, err := me.CanDoBusiGroup(ctx, bg, "rw")
-	ginx.Dangerous(err)
-
-	if !can {
-		ginx.Bomb(http.StatusForbidden, "forbidden")
-	}
-}
-
-func (rt *Router) dashAnnotationAdd(c *gin.Context) {
-	var f models.DashAnnotation
-	ginx.BindJSON(c, &f)
-
-	username := c.MustGet("username").(string)
-	now := time.Now().Unix()
-
-	checkAnnotationPermission(c, rt.Ctx, f.DashboardId)
-
-	f.CreateBy = username
-	f.CreateAt = now
-	f.UpdateBy = username
-	f.UpdateAt = now
-
-	ginx.NewRender(c).Data(f.Id, f.Add(rt.Ctx))
-}
-
-func (rt *Router) dashAnnotationGets(c *gin.Context) {
-	dashboardId := ginx.QueryInt64(c, "dashboard_id")
-	from := ginx.QueryInt64(c, "from")
-	to := ginx.QueryInt64(c, "to")
-	limit := ginx.QueryInt(c, "limit", 100)
-
-	lst, err := models.DashAnnotationGets(rt.Ctx, dashboardId, from, to, limit)
-	ginx.NewRender(c).Data(lst, err)
-}
-
-func (rt *Router) dashAnnotationPut(c *gin.Context) {
-	var f models.DashAnnotation
-	ginx.BindJSON(c, &f)
-
-	id := ginx.UrlParamInt64(c, "id")
-	annotation, err := getAnnotationById(rt.Ctx, id)
-	ginx.Dangerous(err)
-
-	checkAnnotationPermission(c, rt.Ctx, annotation.DashboardId)
-
-	f.Id = id
-	f.UpdateAt = time.Now().Unix()
-	f.UpdateBy = c.MustGet("username").(string)
-
-	ginx.NewRender(c).Message(f.Update(rt.Ctx))
-}
-
-func (rt *Router) dashAnnotationDel(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-
-	annotation, err := getAnnotationById(rt.Ctx, id)
-	ginx.Dangerous(err)
-	checkAnnotationPermission(c, rt.Ctx, annotation.DashboardId)
-
-	ginx.NewRender(c).Message(models.DashAnnotationDel(rt.Ctx, id))
-}
-
-// 可以提取获取注释的通用方法
-func getAnnotationById(ctx *ctx.Context, id int64) (*models.DashAnnotation, error) {
-	annotation, err := models.DashAnnotationGet(ctx, "id=?", id)
-	if err != nil {
-		return nil, err
-	}
-	if annotation == nil {
-		return nil, fmt.Errorf("annotation not found")
-	}
-	return annotation, nil
-}

center/router/router_mw.go

@@ -130,9 +130,9 @@ func (rt *Router) User() gin.HandlerFunc {
 
 func (rt *Router) user() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		username := c.MustGet("username").(string)
+		userid := c.MustGet("userid").(int64)
 
-		user, err := models.UserGetByUsername(rt.Ctx, username)
+		user, err := models.UserGetById(rt.Ctx, userid)
 		if err != nil {
 			ginx.Bomb(http.StatusUnauthorized, "unauthorized")
 		}

center/router/router_target.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/storage"
 
 	"github.com/gin-gonic/gin"
@@ -273,9 +272,11 @@ func (rt *Router) validateTags(tags []string) error {
 }
 
 func (rt *Router) addTagsToTarget(target *models.Target, tags []string) error {
+	hostTagsMap := target.GetHostTagsMap()
 	for _, tag := range tags {
 		tagKey := strings.Split(tag, "=")[0]
-		if _, exist := target.TagsMap[tagKey]; exist {
+		if _, ok := hostTagsMap[tagKey]; ok ||
+			strings.Contains(target.Tags, tagKey+"=") {
 			return fmt.Errorf("duplicate tagkey(%s)", tagKey)
 		}
 	}
@@ -400,22 +401,6 @@ type targetBgidsForm struct {
 	Action  string   `json:"action"` // add del reset
 }
 
-func haveNeverGroupedIdent(ctx *ctx.Context, idents []string) (bool, error) {
-	for _, ident := range idents {
-		bgids, err := models.TargetGroupIdsGetByIdent(ctx, ident)
-		if err != nil {
-			return false, err
-		}
-		
-		if len(bgids) <= 0 {
-			return true, nil
-		}	
-	}
-
-	return false, nil
-}
-
-
 func (rt *Router) targetBindBgids(c *gin.Context) {
 	var f targetBgidsForm
 	var err error
@@ -458,15 +443,11 @@ func (rt *Router) targetBindBgids(c *gin.Context) {
 				ginx.Bomb(http.StatusForbidden, "No permission. You are not admin of BG(%s)", bg.Name)
 			}
 		}
-		isNeverGrouped, checkErr := haveNeverGroupedIdent(rt.Ctx, f.Idents)
-		ginx.Dangerous(checkErr)
 
-		if isNeverGrouped {
-			can, err := user.CheckPerm(rt.Ctx, "/targets/bind")
-			ginx.Dangerous(err)
-			if !can {
-				ginx.Bomb(http.StatusForbidden, "No permission. Only admin can assign BG")
-			}
+		can, err := user.CheckPerm(rt.Ctx, "/targets/bind")
+		ginx.Dangerous(err)
+		if !can {
+			ginx.Bomb(http.StatusForbidden, "No permission. Only admin can assign BG")
 		}
 	}
 

docker/compose-postgres/initsql_for_postgres/a-n9e-for-Postgres.sql

@@ -790,7 +790,6 @@ CREATE TABLE es_index_pattern (
     time_field varchar(128) not null default '@timestamp',
     allow_hide_system_indices smallint not null default 0,
     fields_format varchar(4096) not null default '',
-    cross_cluster_enabled int not null default 0,
     create_at bigint default '0',
     create_by varchar(64) default '',
     update_at bigint default '0',
@@ -860,7 +859,6 @@ CREATE TABLE builtin_components (
   ident VARCHAR(191) NOT NULL,
   logo VARCHAR(191) NOT NULL,
   readme TEXT NOT NULL,
-  disabled INT NOT NULL DEFAULT 0,
   created_at BIGINT NOT NULL DEFAULT 0,
   created_by VARCHAR(191) NOT NULL DEFAULT '',
   updated_at BIGINT NOT NULL DEFAULT 0,
@@ -887,20 +885,4 @@ CREATE TABLE builtin_payloads (
 CREATE INDEX idx_component ON builtin_payloads (component);
 CREATE INDEX idx_builtin_payloads_name ON builtin_payloads (name);
 CREATE INDEX idx_cate ON builtin_payloads (cate);
-CREATE INDEX idx_type ON builtin_payloads (type);
-
-
-CREATE TABLE dash_annotation (
-    id bigserial PRIMARY KEY,
-    dashboard_id bigint not null,
-    panel_id varchar(191) not null,
-    tags text,
-    description text,
-    config text,
-    time_start bigint not null default 0,
-    time_end bigint not null default 0,
-    create_at bigint not null default 0,
-    create_by varchar(64) not null default '',
-    update_at bigint not null default 0,
-    update_by varchar(64) not null default ''
-);
+CREATE INDEX idx_type ON builtin_payloads (type);

docker/initsql/a-n9e.sql

@@ -531,7 +531,6 @@ CREATE TABLE `builtin_components` (
   `created_by` varchar(191) NOT NULL DEFAULT '' COMMENT '''creator''',
   `updated_at` bigint NOT NULL DEFAULT 0 COMMENT '''update time''',
   `updated_by` varchar(191) NOT NULL DEFAULT '' COMMENT '''updater''',
-  `disabled` int NOT NULL DEFAULT 0 COMMENT '''is disabled or not''',
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_ident` (`ident`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -694,7 +693,6 @@ CREATE TABLE `es_index_pattern` (
     `time_field` varchar(128) not null default '@timestamp',
     `allow_hide_system_indices` tinyint(1) not null default 0,
     `fields_format` varchar(4096) not null default '',
-    `cross_cluster_enabled` int not null default 0,
     `create_at` bigint default '0',
     `create_by` varchar(64) default '',
     `update_at` bigint default '0',
@@ -747,24 +745,6 @@ CREATE TABLE `target_busi_group` (
   UNIQUE KEY `idx_target_group` (`target_ident`,`group_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-
-CREATE TABLE `dash_annotation` (
-    `id` bigint unsigned not null auto_increment,
-    `dashboard_id` bigint not null comment 'dashboard id',
-    `panel_id` varchar(191) not null comment 'panel id',
-    `tags` text comment 'tags array json string',
-    `description` text comment 'annotation description',
-    `config` text comment 'annotation config',
-    `time_start` bigint not null default 0 comment 'start timestamp',
-    `time_end` bigint not null default 0 comment 'end timestamp',
-    `create_at` bigint not null default 0 comment 'create time',
-    `create_by` varchar(64) not null default '' comment 'creator',
-    `update_at` bigint not null default 0 comment 'update time',
-    `update_by` varchar(64) not null default '' comment 'updater',
-    PRIMARY KEY (`id`),
-    KEY `idx_dashboard_id` (`dashboard_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
 CREATE TABLE `task_meta`
 (
     `id`          bigint unsigned NOT NULL AUTO_INCREMENT,

docker/migratesql/migrate.sql

@@ -125,26 +125,3 @@ ALTER TABLE alert_subscribe MODIFY COLUMN busi_groups varchar(4096);
 /* v8.0.0-beta.1 2024-12-13 */
 ALTER TABLE `alert_rule` ADD COLUMN `cron_pattern` VARCHAR(64);
 ALTER TABLE `builtin_components` MODIFY COLUMN `logo` mediumtext COMMENT '''logo of component''';
-
-/* v8.0.0-beta.2 2024-12-26 */
-ALTER TABLE `es_index_pattern` ADD COLUMN `cross_cluster_enabled` int not null default 0;
-
-/* v8.0.0-beta.3 2024-01-03 */
-ALTER TABLE `builtin_components` ADD COLUMN `disabled` INT NOT NULL DEFAULT 0 COMMENT 'is disabled or not';
-        
-CREATE TABLE `dash_annotation` (
-    `id` bigint unsigned not null auto_increment,
-    `dashboard_id` bigint not null comment 'dashboard id',
-    `panel_id` varchar(191) not null comment 'panel id',
-    `tags` text comment 'tags array json string',
-    `description` text comment 'annotation description',
-    `config` text comment 'annotation config',
-    `time_start` bigint not null default 0 comment 'start timestamp',
-    `time_end` bigint not null default 0 comment 'end timestamp',
-    `create_at` bigint not null default 0 comment 'create time',
-    `create_by` varchar(64) not null default '' comment 'creator',
-    `update_at` bigint not null default 0 comment 'update time',
-    `update_by` varchar(64) not null default '' comment 'updater',
-    PRIMARY KEY (`id`),
-    KEY `idx_dashboard_id` (`dashboard_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

docker/sqlite.sql

@@ -630,7 +630,6 @@ CREATE TABLE `es_index_pattern` (
     `time_field` varchar(128) not null default '@timestamp',
     `allow_hide_system_indices` tinyint(1) not null default 0,
     `fields_format` varchar(4096) not null default '',
-    `cross_cluster_enabled` int not null default 0,
     `create_at` bigint default '0',
     `create_by` varchar(64) default '',
     `update_at` bigint default '0',
@@ -684,22 +683,6 @@ CREATE TABLE `target_busi_group` (
 
 CREATE UNIQUE INDEX idx_target_busi_group ON target_busi_group (target_ident, group_id);
 
-
-CREATE TABLE `dash_annotation` (
-    `id` integer primary key autoincrement,
-    `dashboard_id` bigint not null,
-    `panel_id` varchar(191) not null,
-    `tags` text,
-    `description` text,
-    `config` text,
-    `time_start` bigint not null default 0,
-    `time_end` bigint not null default 0,
-    `create_at` bigint not null default 0,
-    `create_by` varchar(64) not null default '',
-    `update_at` bigint not null default 0,
-    `update_by` varchar(64) not null default ''
-);
-
 CREATE TABLE `task_meta`
 (
     `id`          integer primary key autoincrement,

go.mod

@@ -4,7 +4,6 @@ go 1.22
 
 require (
 	github.com/BurntSushi/toml v0.3.1
-	github.com/VictoriaMetrics/metricsql v0.81.1
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
@@ -48,7 +47,6 @@ require (
 )
 
 require (
-	github.com/VictoriaMetrics/metrics v1.34.0 // indirect
 	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/glebarez/go-sqlite v1.21.2 // indirect
@@ -56,8 +54,6 @@ require (
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/valyala/fastrand v1.1.0 // indirect
-	github.com/valyala/histogram v1.2.0 // indirect
 	github.com/yuin/gopher-lua v1.1.1 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	modernc.org/libc v1.22.5 // indirect

go.sum

@@ -13,10 +13,6 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
-github.com/VictoriaMetrics/metrics v1.34.0 h1:0i8k/gdOJdSoZB4Z9pikVnVQXfhcIvnG7M7h2WaQW2w=
-github.com/VictoriaMetrics/metrics v1.34.0/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8=
-github.com/VictoriaMetrics/metricsql v0.81.1 h1:1gpqI3Mwru1tCM8nZiKxBG0P+DNkjlRwLhRPII3cuho=
-github.com/VictoriaMetrics/metricsql v0.81.1/go.mod h1:1g4hdCwlbJZ851PU9VN65xy9Rdlzupo6fx3SNZ8Z64U=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
@@ -351,10 +347,6 @@ github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8=
-github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ=
-github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ=
-github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -457,8 +449,6 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=

memsto/notify_config.go

@@ -8,14 +8,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/ccfos/nightingale/v6/pkg/tplx"
+
+	"github.com/BurntSushi/toml"
 	"github.com/ccfos/nightingale/v6/alert/aconf"
 	"github.com/ccfos/nightingale/v6/dumper"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/poster"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
-
-	"github.com/BurntSushi/toml"
 	"github.com/toolkits/pkg/logger"
 )
 
@@ -115,18 +114,13 @@ func (w *NotifyConfigCacheType) syncNotifyConfigs() error {
 			}
 
 			if webhooks[i].Client == nil {
-				transport := &http.Transport{
-					TLSClientConfig: &tls.Config{InsecureSkipVerify: webhooks[i].SkipVerify},
-				}
-				if poster.UseProxy(webhooks[i].Url) {
-					transport.Proxy = http.ProxyFromEnvironment
-				}
 				webhooks[i].Client = &http.Client{
-					Timeout:   time.Second * time.Duration(webhooks[i].Timeout),
-					Transport: transport,
+					Timeout: time.Second * time.Duration(webhooks[i].Timeout),
+					Transport: &http.Transport{
+						TLSClientConfig: &tls.Config{InsecureSkipVerify: webhooks[i].SkipVerify},
+					},
 				}
 			}
-
 			newWebhooks[webhooks[i].Url] = webhooks[i]
 		}
 

models/builtin_component.go

@@ -14,7 +14,6 @@ type BuiltinComponent struct {
 	Ident     string `json:"ident" gorm:"type:varchar(191);not null;uniqueIndex:idx_ident,sort:asc"`
 	Logo      string `json:"logo" gorm:"type:mediumtext;comment:'logo of component'"`
 	Readme    string `json:"readme" gorm:"type:text;not null;comment:'readme of component'"`
-	Disabled  int    `json:"disabled" gorm:"type:int;not null;default:0;comment:'is disabled or not'"`
 	CreatedAt int64  `json:"created_at" gorm:"type:bigint;not null;default:0;comment:'create time'"`
 	CreatedBy string `json:"created_by" gorm:"type:varchar(191);not null;default:'';comment:'creator'"`
 	UpdatedAt int64  `json:"updated_at" gorm:"type:bigint;not null;default:0;comment:'update time'"`
@@ -26,17 +25,12 @@ type PostgresBuiltinComponent struct {
 	Ident     string `json:"ident" gorm:"type:varchar(191);not null;uniqueIndex:idx_ident,sort:asc;comment:'identifier of component'"`
 	Logo      string `json:"logo" gorm:"type:text;comment:'logo of component'"`
 	Readme    string `json:"readme" gorm:"type:text;not null;comment:'readme of component'"`
-	Disabled  int    `json:"disabled" gorm:"type:int;not null;default:0;comment:'is disabled or not'"`
 	CreatedAt int64  `json:"created_at" gorm:"type:bigint;not null;default:0;comment:'create time'"`
 	CreatedBy string `json:"created_by" gorm:"type:varchar(191);not null;default:'';comment:'creator'"`
 	UpdatedAt int64  `json:"updated_at" gorm:"type:bigint;not null;default:0;comment:'update time'"`
 	UpdatedBy string `json:"updated_by" gorm:"type:varchar(191);not null;default:'';comment:'updater'"`
 }
 
-func (bc *PostgresBuiltinComponent) TableName() string {
-	return "builtin_components"
-}
-
 func (bc *BuiltinComponent) TableName() string {
 	return "builtin_components"
 }
@@ -103,15 +97,12 @@ func BuiltinComponentDels(ctx *ctx.Context, ids []int64) error {
 	return DB(ctx).Where("id in ?", ids).Delete(new(BuiltinComponent)).Error
 }
 
-func BuiltinComponentGets(ctx *ctx.Context, query string, disabled int) ([]*BuiltinComponent, error) {
+func BuiltinComponentGets(ctx *ctx.Context, query string) ([]*BuiltinComponent, error) {
 	session := DB(ctx)
 	if query != "" {
 		queryPattern := "%" + query + "%"
 		session = session.Where("ident LIKE ?", queryPattern)
 	}
-	if disabled == 0 || disabled == 1 {
-		session = session.Where("disabled = ?", disabled)
-	}
 
 	var lst []*BuiltinComponent
 

models/builtin_payload.go

@@ -168,7 +168,7 @@ func BuiltinPayloadComponents(ctx *ctx.Context, typ, cate string) (string, error
 func InitBuiltinPayloads(ctx *ctx.Context) error {
 	var lst []*BuiltinPayload
 
-	components, err := BuiltinComponentGets(ctx, "", -1)
+	components, err := BuiltinComponentGets(ctx, "")
 	if err != nil {
 		return err
 	}

models/dash_annotation.go

@@ -1,89 +0,0 @@
-package models
-
-import (
-	"encoding/json"
-
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-)
-
-type DashAnnotation struct {
-	Id          int64    `json:"id" gorm:"primaryKey"`
-	DashboardId int64    `json:"dashboard_id"`
-	PanelId     string   `json:"panel_id"`
-	Tags        string   `json:"-"`
-	TagsJSON    []string `json:"tags" gorm:"-"`
-	Description string   `json:"description"`
-	Config      string   `json:"config"`
-	TimeStart   int64    `json:"time_start"`
-	TimeEnd     int64    `json:"time_end"`
-	CreateAt    int64    `json:"create_at"`
-	CreateBy    string   `json:"create_by"`
-	UpdateAt    int64    `json:"update_at"`
-	UpdateBy    string   `json:"update_by"`
-}
-
-func (da *DashAnnotation) TableName() string {
-	return "dash_annotation"
-}
-
-func (da *DashAnnotation) DB2FE() error {
-	return json.Unmarshal([]byte(da.Tags), &da.TagsJSON)
-}
-
-func (da *DashAnnotation) FE2DB() error {
-	b, err := json.Marshal(da.TagsJSON)
-	if err != nil {
-		return err
-	}
-	da.Tags = string(b)
-	return nil
-}
-
-func (da *DashAnnotation) Add(ctx *ctx.Context) error {
-	if err := da.FE2DB(); err != nil {
-		return err
-	}
-	return Insert(ctx, da)
-}
-
-func (da *DashAnnotation) Update(ctx *ctx.Context) error {
-	if err := da.FE2DB(); err != nil {
-		return err
-	}
-	return DB(ctx).Model(da).Select("dashboard_id", "panel_id", "tags", "description", "config", "time_start", "time_end", "update_at", "update_by").Updates(da).Error
-}
-
-func DashAnnotationDel(ctx *ctx.Context, id int64) error {
-	return DB(ctx).Where("id = ?", id).Delete(&DashAnnotation{}).Error
-}
-
-func DashAnnotationGet(ctx *ctx.Context, where string, args ...interface{}) (*DashAnnotation, error) {
-	var lst []*DashAnnotation
-	err := DB(ctx).Where(where, args...).Find(&lst).Error
-	if err != nil {
-		return nil, err
-	}
-
-	if len(lst) == 0 {
-		return nil, nil
-	}
-
-	err = lst[0].DB2FE()
-	return lst[0], err
-}
-
-func DashAnnotationGets(ctx *ctx.Context, dashboardId int64, from, to int64, limit int) ([]DashAnnotation, error) {
-	session := DB(ctx).Where("dashboard_id = ? AND time_start <= ? AND time_end >= ?", dashboardId, to, from)
-
-	var lst []DashAnnotation
-	err := session.Order("id").Limit(limit).Find(&lst).Error
-	if err != nil {
-		return nil, err
-	}
-
-	for i := 0; i < len(lst); i++ {
-		lst[i].DB2FE()
-	}
-
-	return lst, nil
-}

models/es_index_pattern.go

@@ -20,7 +20,6 @@ type EsIndexPattern struct {
 	CreateBy                   string `json:"create_by"`
 	UpdateAt                   int64  `json:"update_at"`
 	UpdateBy                   string `json:"update_by"`
-	CrossClusterEnabled        int    `json:"cross_cluster_enabled"`
 }
 
 func (t *EsIndexPattern) TableName() string {

models/migrate/migrate.go

@@ -67,7 +67,7 @@ func MigrateTables(db *gorm.DB) error {
 		&TaskRecord{}, &ChartShare{}, &Target{}, &Configs{}, &Datasource{}, &NotifyTpl{},
 		&Board{}, &BoardBusigroup{}, &Users{}, &SsoConfig{}, &models.BuiltinMetric{},
 		&models.MetricFilter{}, &models.NotificaitonRecord{},
-		&models.TargetBusiGroup{}, &EsIndexPatternMigrate{}, &DashAnnotation{}}
+		&models.TargetBusiGroup{}}
 
 	if isPostgres(db) {
 		dts = append(dts, &models.PostgresBuiltinComponent{})
@@ -319,30 +319,3 @@ type TaskHostDoing struct {
 func (TaskHostDoing) TableName() string {
 	return "task_host_doing"
 }
-
-type EsIndexPatternMigrate struct {
-	CrossClusterEnabled int `gorm:"column:cross_cluster_enabled;type:int;default:0"`
-}
-
-func (EsIndexPatternMigrate) TableName() string {
-	return "es_index_pattern"
-}
-
-type DashAnnotation struct {
-	Id          int64  `gorm:"column:id;primaryKey;autoIncrement"`
-	DashboardId int64  `gorm:"column:dashboard_id;not null"`
-	PanelId     string `gorm:"column:panel_id;type:varchar(191);not null"`
-	Tags        string `gorm:"column:tags;type:text"`
-	Description string `gorm:"column:description;type:text"`
-	Config      string `gorm:"column:config;type:text"`
-	TimeStart   int64  `gorm:"column:time_start;not null;default:0"`
-	TimeEnd     int64  `gorm:"column:time_end;not null;default:0"`
-	CreateAt    int64  `gorm:"column:create_at;not null;default:0"`
-	CreateBy    string `gorm:"column:create_by;type:varchar(64);not null;default:''"`
-	UpdateAt    int64  `gorm:"column:update_at;not null;default:0"`
-	UpdateBy    string `gorm:"column:update_by;type:varchar(64);not null;default:''"`
-}
-
-func (DashAnnotation) TableName() string {
-	return "dash_annotation"
-}

pkg/poster/post.go

@@ -63,7 +63,7 @@ func GetByUrl[T any](url string, cfg conf.CenterApi) (T, error) {
 		Timeout: time.Duration(cfg.Timeout) * time.Millisecond,
 	}
 
-	if UseProxy(url) {
+	if useProxy(url) {
 		client.Transport = ProxyTransporter
 	}
 
@@ -147,7 +147,7 @@ func PostByUrl[T any](url string, cfg conf.CenterApi, v interface{}) (t T, err e
 		Timeout: time.Duration(cfg.Timeout) * time.Millisecond,
 	}
 
-	if UseProxy(url) {
+	if useProxy(url) {
 		client.Transport = ProxyTransporter
 	}
 
@@ -195,7 +195,7 @@ var ProxyTransporter = &http.Transport{
 	Proxy: http.ProxyFromEnvironment,
 }
 
-func UseProxy(url string) bool {
+func useProxy(url string) bool {
 	// N9E_PROXY_URL=oapi.dingtalk.com,feishu.com
 	patterns := os.Getenv("N9E_PROXY_URL")
 	if patterns != "" {
@@ -228,7 +228,7 @@ func PostJSON(url string, timeout time.Duration, v interface{}, retries ...int)
 		Timeout: timeout,
 	}
 
-	if UseProxy(url) {
+	if useProxy(url) {
 		client.Transport = ProxyTransporter
 	}
 

pkg/promql/parser.go

@@ -1,181 +0,0 @@
-package promql
-
-import (
-	"regexp"
-	"strings"
-
-	"github.com/VictoriaMetrics/metricsql"
-	"github.com/prometheus/prometheus/promql/parser"
-)
-
-func SplitBinaryOp(code string) ([]string, error) {
-	var lst []string
-	expr, err := metricsql.Parse(code)
-
-	if err != nil {
-		return lst, err
-	}
-
-	m := make(map[string]struct{})
-	ParseExpr(expr, false, m)
-	for k := range m {
-		lst = append(lst, k)
-	}
-
-	return lst, nil
-}
-
-func GetMetric(ql string) (map[string]string, error) {
-	metrics := make(map[string]string)
-	expr, err := parser.ParseExpr(ql)
-	if err != nil {
-		return metrics, err
-	}
-
-	selectors := parser.ExtractSelectors(expr)
-	for i := 0; i < len(selectors); i++ {
-		var metric string
-		var labels []string
-		for j := 0; j < len(selectors[i]); j++ {
-			if selectors[i][j].Name == "__name__" {
-				metric = selectors[i][j].Value
-			} else {
-				labels = append(labels, selectors[i][j].Name+selectors[i][j].Type.String()+"\""+selectors[i][j].Value+"\"")
-			}
-		}
-
-		if len(labels) != 0 {
-			metrics[metric] = metric + "{" + strings.Join(labels, ",") + "}"
-		} else {
-			metrics[metric] = metric
-		}
-	}
-	return metrics, nil
-}
-
-// GetLabels 解析PromQL查询并返回其中的所有标签和它们的值。
-func GetLabels(ql string) (map[string]string, error) {
-	labels := make(map[string]string)
-
-	// 解析PromQL表达式
-	expr, err := parser.ParseExpr(ql)
-	if err != nil {
-		return labels, err
-	}
-
-	// 提取所有的选择器
-	selectors := parser.ExtractSelectors(expr)
-	for _, selector := range selectors {
-		for _, labelMatcher := range selector {
-			if labelMatcher.Name != "__name__" {
-				labels[labelMatcher.Name] = labelMatcher.Value
-			}
-		}
-	}
-
-	return labels, nil
-}
-
-func GetLabelsAndMetricName(ql string) (map[string]string, string, error) {
-	labels := make(map[string]string)
-	metricName := ""
-
-	// 解析PromQL表达式
-	expr, err := parser.ParseExpr(ql)
-	if err != nil {
-		return labels, metricName, err
-	}
-
-	// 提取所有的选择器
-	selectors := parser.ExtractSelectors(expr)
-	for _, selector := range selectors {
-		for _, labelMatcher := range selector {
-			if labelMatcher.Name != "__name__" {
-				labels[labelMatcher.Name] = labelMatcher.Value
-			} else {
-				metricName = labelMatcher.Value
-			}
-		}
-	}
-
-	return labels, metricName, nil
-}
-
-type Label struct {
-	Name  string
-	Value string
-	Op    string
-}
-
-func GetLabelsAndMetricNameWithReplace(ql string, rep string) (map[string]Label, string, error) {
-	labels := make(map[string]Label)
-	metricName := ""
-
-	ql = strings.ReplaceAll(ql, rep, "____")
-	ql = removeBrackets(ql)
-	// 解析PromQL表达式
-	expr, err := parser.ParseExpr(ql)
-	if err != nil {
-		return labels, metricName, err
-	}
-
-	// 提取所有的选择器
-	selectors := parser.ExtractSelectors(expr)
-	for _, selector := range selectors {
-		for _, labelMatcher := range selector {
-			labelMatcher.Value = strings.ReplaceAll(labelMatcher.Value, "____", rep)
-			if labelMatcher.Name != "__name__" {
-				label := Label{
-					Name:  labelMatcher.Name,
-					Value: labelMatcher.Value,
-					Op:    labelMatcher.Type.String(),
-				}
-				labels[labelMatcher.Name] = label
-			} else {
-				if strings.Contains(labelMatcher.Value, "$") {
-					continue
-				}
-				metricName = labelMatcher.Value
-			}
-		}
-	}
-
-	return labels, metricName, nil
-}
-
-func GetFirstMetric(ql string) (string, error) {
-	var metric string
-	expr, err := parser.ParseExpr(ql)
-	if err != nil {
-		return metric, err
-	}
-
-	selectors := parser.ExtractSelectors(expr)
-	for i := 0; i < len(selectors); i++ {
-		for j := 0; j < len(selectors[i]); j++ {
-			if selectors[i][j].Name == "__name__" {
-				metric = selectors[i][j].Value
-				return metric, nil
-			}
-		}
-	}
-	return metric, nil
-}
-
-func removeBrackets(promql string) string {
-	if strings.Contains(promql, "_over_time") || strings.Contains(promql, "rate") || strings.Contains(promql, "increase") ||
-		strings.Contains(promql, "predict_linear") || strings.Contains(promql, "resets") ||
-		strings.Contains(promql, "changes") || strings.Contains(promql, "holt_winters") ||
-		strings.Contains(promql, "delta") || strings.Contains(promql, "deriv") {
-		return promql
-	}
-
-	if !strings.Contains(promql, "[") {
-		return promql
-	}
-
-	// 使用正则表达式匹配 [xx] 形式的内容，xx 可以是任何字符序列
-	re := regexp.MustCompile(`\[[^\]]*\]`)
-	// 删除匹配到的内容
-	return re.ReplaceAllString(promql, "")
-}

pkg/promql/perser_test.go

@@ -1,218 +0,0 @@
-package promql
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestGetMetric(t *testing.T) {
-	tests := []struct {
-		name    string
-		ql      string
-		want    map[string]string
-		wantErr error
-	}{
-		{
-			name:    "Valid query with labels",
-			ql:      "metric_name{label1=\"value1\",label2=\"value2\"}",
-			want:    map[string]string{"metric_name": "metric_name{label1=\"value1\",label2=\"value2\"}"},
-			wantErr: nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := GetMetric(tt.ql)
-			if err != tt.wantErr && err != nil {
-				t.Errorf("GetMetric() error = %v, wantErr %v ql:%s", err, tt.wantErr, tt.ql)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("GetMetric() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestGetLabels(t *testing.T) {
-	tests := []struct {
-		name    string
-		ql      string
-		want    map[string]string
-		wantErr bool
-	}{
-		{
-			name: "Valid query with multiple labels",
-			ql:   "metric_name{label1=\"value1\", label2=\"value2\"} > 3",
-			want: map[string]string{"label1": "value1", "label2": "value2"},
-		},
-		{
-			name: "Valid query with multiple labels",
-			ql:   "metric_name{label1=\"$value1\", label2=\"$value2\"} > 3",
-			want: map[string]string{"label1": "$value1", "label2": "$value2"},
-		},
-		{
-			name: "Query without labels",
-			ql:   "metric_name",
-			want: map[string]string{},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := GetLabels(tt.ql)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("GetLabels() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("GetLabels() = %v, want %v ql:%s", got, tt.want, tt.ql)
-			}
-		})
-	}
-}
-
-func TestGetLabelsAndMetricNameWithReplace(t *testing.T) {
-	// 定义测试案例
-	tests := []struct {
-		name               string
-		ql                 string
-		rep                string
-		expectedLabels     map[string]Label
-		expectedMetricName string
-		expectError        bool
-	}{
-		{
-			name: "正常情况",
-			ql:   `(snmp_arista_system_cpuuse{ent_descr="$ent_descr"} / 100 > $cpu_high_threshold[1m])`,
-			rep:  "$",
-			expectedLabels: map[string]Label{
-				"ent_descr": {Name: "ent_descr", Value: "$ent_descr", Op: "="},
-			},
-			expectedMetricName: "snmp_arista_system_cpuuse",
-			expectError:        false,
-		},
-		{
-			name: "正常情况",
-			ql:   `rate(snmp_interface_incoming{agent_host='$agent_host',ifname='$ifname'}[2m]) * 8 / 10^9 > snmp_interface_speed{agent_host='$agent_host',ifname='$ifname'}/ 10^3 *  $traffic_in and snmp_interface_speed{agent_host='$agent_host',ifname='$ifname'} > 0`,
-			rep:  "$",
-			expectedLabels: map[string]Label{
-				"agent_host": {Name: "agent_host", Value: "$agent_host", Op: "="},
-				"ifname":     {Name: "ifname", Value: "$ifname", Op: "="},
-			},
-			expectedMetricName: "snmp_interface_speed",
-			expectError:        false,
-		},
-		{
-			name: "正常情况",
-			ql:   `rate(snmp_interface_incoming{agent_host='$agent_host',ifname='$ifname'}[2m]) * 8 / 10^9 > snmp_interface_speed{agent_host='$agent_host',ifname='$ifname'}/ 10^3 *  $traffic_in`,
-			rep:  "$",
-			expectedLabels: map[string]Label{
-				"agent_host": {Name: "agent_host", Value: "$agent_host", Op: "="},
-				"ifname":     {Name: "ifname", Value: "$ifname", Op: "="},
-			},
-			expectedMetricName: "snmp_interface_speed",
-			expectError:        false,
-		},
-		{
-			name: "正常情况",
-			ql:   `rate(snmp_interface_incoming{agent_host='$agent_host',ifname='$ifname'}[2m]) * 8 / 10^9 > 10`,
-			rep:  "$",
-			expectedLabels: map[string]Label{
-				"agent_host": {Name: "agent_host", Value: "$agent_host", Op: "="},
-				"ifname":     {Name: "ifname", Value: "$ifname", Op: "="},
-			},
-			expectedMetricName: "snmp_interface_incoming",
-			expectError:        false,
-		},
-		{
-			name: "带有替换字符",
-			ql:   `rate(snmp_interface_outgoing{Role=~'ZRT.*',agent_host='$agent_host',ifname='$ifname'}[2m]) * 8 / 10^9 > snmp_interface_speed{Role=~'ZRT.*',agent_host='$agent_host',ifname='$ifname'}/ 10^3 * $outgoing_warning and snmp_interface_speed{Role=~'ZRT.*',agent_host='$agent_host',ifname='$ifname'} > 0`,
-			rep:  "$",
-			expectedLabels: map[string]Label{
-				"agent_host": {Name: "agent_host", Value: "$agent_host", Op: "="},
-				"ifname":     {Name: "ifname", Value: "$ifname", Op: "="},
-				"Role":       {Name: "Role", Value: "ZRT.*", Op: "=~"},
-			},
-			expectedMetricName: "snmp_interface_speed",
-			expectError:        false,
-		},
-		// 更多测试案例...
-		{
-			name:               "告警规则支持变量",
-			ql:                 `mem{test1="$test1", test2="$test2", test3="test3"} > $val`,
-			rep:                "$",
-			expectedLabels:     map[string]Label{},
-			expectedMetricName: "snmp_interface_speed",
-			expectError:        false,
-		},
-	}
-
-	// 运行测试案例
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			labels, metricName, err := GetLabelsAndMetricNameWithReplace(tc.ql, tc.rep)
-
-			if (err != nil) != tc.expectError {
-				t.Errorf("ql:%s 测试 '%v' 发生错误: %v, 期望的错误状态: %v", tc.ql, tc.name, err, tc.expectError)
-			}
-
-			if !reflect.DeepEqual(labels, tc.expectedLabels) {
-				t.Errorf("ql:%s 测试 '%v' 返回的标签不匹配: got %v, want %v", tc.ql, tc.name, labels, tc.expectedLabels)
-			}
-
-			if metricName != tc.expectedMetricName {
-				t.Errorf("ql:%s 测试 '%v' 返回的度量名称不匹配: got %s, want %s", tc.ql, tc.name, metricName, tc.expectedMetricName)
-			}
-		})
-	}
-}
-
-func TestSplitBinaryOp(t *testing.T) {
-	tests := []struct {
-		name    string
-		code    string
-		want    []string
-		wantErr bool
-	}{
-		{
-			name: "valid binary operation with spaces",
-			code: "cpu_usage  +  memory_usage",
-			want: []string{"cpu_usage + memory_usage"},
-		},
-		{
-			name: "12",
-			code: "cpu_usage > 0 and memory_usage>0",
-			want: []string{"cpu_usage", "memory_usage"},
-		},
-		{
-			name: "12",
-			code: "cpu_usage +1> 0",
-			want: []string{"cpu_usage + 1"},
-		},
-		{
-			name: "valid complex binary operation",
-			code: "(cpu_usage + memory_usage) / 2",
-			want: []string{"(cpu_usage + memory_usage) / 2"},
-		},
-		{
-			name:    "invalid binary operation",
-			code:    "cpu_usage + ",
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := SplitBinaryOp(tt.code)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("SplitBinaryOp() code:%s error = %v, wantErr %v", tt.code, err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("SplitBinaryOp() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

pkg/promql/promql.go

@@ -1,104 +0,0 @@
-package promql
-
-import (
-	"github.com/VictoriaMetrics/metricsql"
-)
-
-// copy from https://github.com/laixintao/promqlpy/blob/main/go/promql/promql.go
-// ModifierExpr represents MetricsQL modifier such as `<op> (...)`
-type ModifierExpr struct {
-	// Op is modifier operation.
-	Op string `json:"op"`
-
-	// Args contains modifier args from parens.
-	Args []string `json:"args"`
-}
-
-type Expression struct {
-	// if true, all fields are set
-	// if false, then it's a normal expression, only `code` is set
-	IsBinaryOp bool `json:"is_binary_op"`
-
-	Left  *Expression `json:"left"`
-	Right *Expression `json:"right"`
-	Op    string      `json:"op"`
-	// GroupModifier contains modifier such as "on" or "ignoring".
-	GroupModifier ModifierExpr `json:"group_modifier"`
-	// JoinModifier contains modifier such as "group_left" or "group_right".
-	JoinModifier ModifierExpr `json:"join_modifier"`
-
-	Code string `json:"code"`
-}
-
-var compareOps = map[string]bool{
-	"==": true,
-	"!=": true,
-	">":  true,
-	"<":  true,
-	">=": true,
-	"<=": true,
-}
-
-var logicalOps = map[string]bool{
-	"and":    true,
-	"or":     true,
-	"unless": true,
-}
-
-// if `mustBeExpression` is true, means that the last level is compareOps
-// or ready.
-// example:
-// (a > 10) > b
-// result: a > 10 is expression, compare to b
-func ParseExpr(expr metricsql.Expr, mustBeExpression bool, m map[string]struct{}) *Expression {
-
-	// I am sure it is a normal expression!
-	if mustBeExpression {
-		return &Expression{
-			Code:       string(expr.AppendString(nil)),
-			IsBinaryOp: false,
-		}
-	}
-
-	if bop, ok := expr.(*metricsql.BinaryOpExpr); ok {
-
-		if logicalOps[bop.Op] {
-
-			return &Expression{
-				Left:          ParseExpr(bop.Left, false, m),
-				Right:         ParseExpr(bop.Right, false, m),
-				GroupModifier: ModifierExpr(bop.GroupModifier),
-				JoinModifier:  ModifierExpr(bop.JoinModifier),
-				Op:            bop.Op,
-				Code:          string(bop.AppendString(nil)),
-				IsBinaryOp:    true,
-			}
-		}
-
-		if compareOps[bop.Op] {
-			m[string(bop.Left.AppendString(nil))] = struct{}{}
-
-			return &Expression{
-				Left:          ParseExpr(bop.Left, true, m),
-				Right:         ParseExpr(bop.Right, true, m),
-				GroupModifier: ModifierExpr(bop.GroupModifier),
-				JoinModifier:  ModifierExpr(bop.JoinModifier),
-				Op:            bop.Op,
-				Code:          string(bop.AppendString(nil)),
-				IsBinaryOp:    true,
-			}
-
-		}
-	}
-
-	if len(m) == 0 {
-		m[string(expr.AppendString(nil))] = struct{}{}
-	}
-
-	// treat +,-,* etc still as normal expression
-	// default: just return the literal code as it is
-	return &Expression{
-		Code:       string(expr.AppendString(nil)),
-		IsBinaryOp: false,
-	}
-}

pushgw/router/router_remotewrite.go

@@ -114,7 +114,7 @@ func (rt *Router) remoteWrite(c *gin.Context) {
 
 	var (
 		ignoreIdent = ginx.QueryBool(c, "ignore_ident", false)
-		ignoreHost  = ginx.QueryBool(c, "ignore_host", true) // 默认值改成 true，要不然答疑成本太高。发版的时候通知 telegraf 用户，让他们设置 ignore_host=false
+		ignoreHost  = ginx.QueryBool(c, "ignore_host", false)
 		ids         = make(map[string]struct{})
 	)