report sample channel size

.github/workflows/n9e.yml

@@ -1,32 +1,26 @@
-name: Release
+name: Go
 
 on:
   push:
-    tags:
-      - 'v*'
-env:
-  GO_VERSION: 1.18
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
 
 jobs:
-  goreleaser:
+
+  build:
+    name: Build
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Source Code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Setup Go Environment
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ env.GO_VERSION }}
-      - uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v3
-        with:
-          version: latest
-          args: release --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Set up Go 1.17
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.17
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Build
+      run: make

.goreleaser.yaml

@@ -1,88 +0,0 @@
-before:
-  hooks:
-    # You may remove this if you don't use go modules.
-    - go mod tidy
-
-snapshot:
-  name_template: '{{ .Tag }}'
-checksum:
-  name_template: 'checksums.txt'
-changelog:
-  skip: true
-
-builds:
-  - id: build
-    hooks:
-      pre:
-       - ./fe.sh
-    main: ./src/
-    binary: n9e
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-    goarch:
-      - amd64
-      - arm64
-    ldflags:
-      - -s -w
-      - -X github.com/didi/nightingale/v5/src/pkg/version.VERSION={{ .Tag }}-{{.Commit}}
-
-archives:
-  - id: n9e
-    builds:
-      - build
-    format: tar.gz
-    format_overrides:
-      - goos: windows
-        format: zip
-    name_template: "n9e-v{{ .Version }}-{{ .Os }}-{{ .Arch }}"
-    wrap_in_directory: false
-    files:
-      - docker/*
-      - etc/*
-      - pub/*
-
-release:
-  github:
-    owner: ccfos
-    name: nightingale
-  name_template: "v{{ .Version }}"
-
-dockers:
-  - image_templates:
-      - flashcatcloud/nightingale:{{ .Version }}-amd64
-    goos: linux
-    goarch: amd64
-    ids:
-      - build
-    dockerfile: docker/Dockerfile.goreleaser
-    extra_files:
-      - pub
-    use: buildx
-    build_flag_templates:
-      - "--platform=linux/amd64"
-  - image_templates:
-      - flashcatcloud/nightingale:{{ .Version }}-arm64v8
-    goos: linux
-    goarch: arm64
-    ids:
-      - build
-    dockerfile: docker/Dockerfile.goreleaser
-    extra_files:
-      - pub
-    use: buildx
-    build_flag_templates:
-      - "--platform=linux/arm64/v8"
-
-docker_manifests:
-
-  - name_template: flashcatcloud/nightingale:{{ .Version }}
-    image_templates:
-      - flashcatcloud/nightingale:{{ .Version }}-amd64
-      - flashcatcloud/nightingale:{{ .Version }}-arm64v8
-
-  - name_template: flashcatcloud/nightingale:latest
-    image_templates:
-      - flashcatcloud/nightingale:{{ .Version }}-amd64
-      - flashcatcloud/nightingale:{{ .Version }}-arm64v8

docker/Dockerfile.goreleaser

@@ -1,14 +0,0 @@
-FROM --platform=$BUILDPLATFORM python:2
-
-
-WORKDIR /app
-ADD n9e /app
-ADD http://download.flashcat.cloud/wait /wait
-RUN mkdir -p /app/pub && chmod +x /wait
-ADD pub /app/pub/
-RUN chmod +x n9e
-
-EXPOSE 19000
-EXPOSE 18000
-
-CMD ["/app/n9e", "-h"]

fe.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-TAG=$(curl -sX GET https://api.github.com/repos/n9e/fe-v5/releases/latest   | awk '/tag_name/{print $4;exit}' FS='[""]')
-VERSION=$(echo $TAG | sed 's/v//g')
-
-curl -o n9e-fe-${VERSION}.tar.gz -L https://github.com/n9e/fe-v5/releases/download/${TAG}/n9e-fe-${VERSION}.tar.gz  
-
-tar zxvf n9e-fe-${VERSION}.tar.gz

src/server/engine/mute.go

@@ -30,9 +30,8 @@ func matchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int
 	if ts < mute.Btime || ts > mute.Etime {
 		return false
 	}
-	tg := event.TagsMap
-	tg["rulename"] = event.RuleName
-	return matchTags(tg, mute.ITags)
+
+	return matchTags(event.TagsMap, mute.ITags)
 }
 
 func matchTags(eventTagsMap map[string]string, itags []models.TagFilter) bool {

src/server/engine/worker.go

@@ -314,7 +314,6 @@ func (r RuleEval) judge(vectors []conv.Vector) {
 			TriggerTime: vectors[i].Timestamp,
 			TagsMap:     tagsMap,
 			GroupId:     r.rule.GroupId,
-			RuleName:    r.rule.Name,
 		}
 
 		bg := memsto.BusiGroupCache.GetByBusiGroupId(r.rule.GroupId)
@@ -322,7 +321,7 @@ func (r RuleEval) judge(vectors []conv.Vector) {
 			event.GroupName = bg.Name
 		}
 
-		// isMuted only need TriggerTime RuleName and TagsMap
+		// isMuted only need TriggerTime and TagsMap
 		if isMuted(event) {
 			logger.Infof("event_muted: rule_id=%d %s", r.rule.Id, vectors[i].Key)
 			continue

src/server/router/router.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"time"
 
 	"github.com/gin-contrib/pprof"
 	"github.com/gin-gonic/gin"
@@ -14,8 +13,6 @@ import (
 	"github.com/didi/nightingale/v5/src/pkg/aop"
 	"github.com/didi/nightingale/v5/src/server/config"
 	"github.com/didi/nightingale/v5/src/server/naming"
-
-	promstat "github.com/didi/nightingale/v5/src/server/stat"
 )
 
 func New(version string) *gin.Engine {
@@ -69,7 +66,7 @@ func configRoute(r *gin.Engine, version string) {
 	})
 
 	// use apiKey not basic auth
-	r.POST("/datadog/api/v1/series", stat(), datadogSeries)
+	r.POST("/datadog/api/v1/series", datadogSeries)
 	r.POST("/datadog/api/v1/check_run", datadogCheckRun)
 	r.GET("/datadog/api/v1/validate", datadogValidate)
 	r.POST("/datadog/api/v1/metadata", datadogMetadata)
@@ -80,10 +77,10 @@ func configRoute(r *gin.Engine, version string) {
 		r.Use(auth)
 	}
 
-	r.POST("/opentsdb/put", stat(), handleOpenTSDB)
-	r.POST("/openfalcon/push", stat(), falconPush)
-	r.POST("/prometheus/v1/write", stat(), remoteWrite)
-	r.POST("/prometheus/v1/query", stat(), queryPromql)
+	r.POST("/opentsdb/put", handleOpenTSDB)
+	r.POST("/openfalcon/push", falconPush)
+	r.POST("/prometheus/v1/write", remoteWrite)
+	r.POST("/prometheus/v1/query", queryPromql)
 
 	r.GET("/memory/alert-rule", alertRuleGet)
 	r.GET("/memory/idents", identsGets)
@@ -98,16 +95,3 @@ func configRoute(r *gin.Engine, version string) {
 	service := r.Group("/v1/n9e")
 	service.POST("/event", pushEventToQueue)
 }
-
-func stat() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		start := time.Now()
-		c.Next()
-
-		code := fmt.Sprintf("%d", c.Writer.Status())
-		method := c.Request.Method
-		labels := []string{code, c.FullPath(), method}
-
-		promstat.RequestDuration.WithLabelValues(labels...).Observe(time.Since(start).Seconds())
-	}
-}

src/server/stat/stat.go

@@ -57,28 +57,6 @@ var (
 		Name:      "sample_queue_size",
 		Help:      "The size of sample queue.",
 	}, []string{"cluster", "channel_number"})
-
-	// 一些重要的请求，比如接收数据的请求，应该统计一下延迟情况
-	RequestDuration = prometheus.NewHistogramVec(
-		prometheus.HistogramOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Buckets:   []float64{.01, .1, 1},
-			Name:      "http_request_duration_seconds",
-			Help:      "HTTP request latencies in seconds.",
-		}, []string{"code", "path", "method"},
-	)
-
-	// 发往后端TSDB，延迟如何
-	ForwardDuration = prometheus.NewHistogramVec(
-		prometheus.HistogramOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Buckets:   []float64{.1, 1, 10},
-			Name:      "forward_duration_seconds",
-			Help:      "Forward samples to TSDB. latencies in seconds.",
-		}, []string{"cluster", "channel_number"},
-	)
 )
 
 func Init() {
@@ -89,8 +67,5 @@ func Init() {
 		CounterSampleTotal,
 		CounterAlertsTotal,
 		GaugeAlertQueueSize,
-		GaugeSampleQueueSize,
-		RequestDuration,
-		ForwardDuration,
 	)
 }

src/server/writer/writer.go

@@ -155,11 +155,6 @@ func (ws *WritersType) StartConsumer(index int, ch chan *prompb.TimeSeries) {
 // post post series to TSDB
 // @Author: quzhihao
 func (ws *WritersType) post(index int, series []*prompb.TimeSeries) {
-	start := time.Now()
-	defer func() {
-		promstat.ForwardDuration.WithLabelValues(config.C.ClusterName, fmt.Sprint(index)).Observe(time.Since(start).Seconds())
-	}()
-
 	header := map[string]string{"hash": fmt.Sprintf("%s-%d", config.C.Heartbeat.Endpoint, index)}
 	if len(ws.backends) == 1 {
 		for key := range ws.backends {

src/webapi/prom/prom.go

@@ -87,9 +87,9 @@ type DSReply struct {
 			Settings struct {
 				PrometheusAddr  string `json:"prometheus.addr"`
 				PrometheusBasic struct {
-					PrometheusUser string `json:"prometheus.user"`
-					PrometheusPass string `json:"prometheus.password"`
-				} `json:"prometheus.basic"`
+					PrometheusUser string `json:"promethues.user"`
+					PrometheusPass string `json:"promethues.password"`
+				} `json:"promethues.basic"`
 				PrometheusTimeout int64 `json:"prometheus.timeout"`
 			} `json:"settings,omitempty"`
 		} `json:"items"`
@@ -137,7 +137,6 @@ func loadClustersFromAPI() {
 			logger.Errorf("read response body of %s fail: %v", url, err)
 			continue
 		}
-		logger.Debugf("curl %s success, response: %s", url, string(jsonBytes))
 
 		err = json.Unmarshal(jsonBytes, &reply)
 		if err != nil {