Optimize the alarm tenant matching mechanism

Signed-off-by: wanjunlei <wanjunlei@kubesphere.io>

Author: wanjunlei

pkg/constants/constants.go

@@ -38,6 +38,11 @@ const (
 	AlertMessage   = "message"
 	AlertSummary   = "summary"
 	AlertSummaryCN = "summaryCn"
+	RuleLevel      = "rule_level"
+
+	RuleLevelGlobal    = "global"
+	RuleLevelCluster   = "cluster"
+	RuleLevelNamespace = "namespace"
 
 	ReceiverName = "receiver"
 

pkg/controller/controller.go

@@ -14,11 +14,6 @@ import (
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
-	"github.com/kubesphere/notification-manager/apis/v2beta2"
-	"github.com/kubesphere/notification-manager/pkg/constants"
-	"github.com/kubesphere/notification-manager/pkg/internal"
-	"github.com/kubesphere/notification-manager/pkg/template"
-	"github.com/kubesphere/notification-manager/pkg/utils"
 	"github.com/modern-go/reflect2"
 	v1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
@@ -31,6 +26,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	kconfig "sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/yaml"
+
+	"github.com/kubesphere/notification-manager/apis/v2beta2"
+	"github.com/kubesphere/notification-manager/pkg/constants"
+	"github.com/kubesphere/notification-manager/pkg/internal"
+	"github.com/kubesphere/notification-manager/pkg/template"
+	"github.com/kubesphere/notification-manager/pkg/utils"
 )
 
 const (

pkg/route/router.go

@@ -7,19 +7,20 @@ import (
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
+	"github.com/modern-go/reflect2"
+
 	"github.com/kubesphere/notification-manager/apis/v2beta2"
 	"github.com/kubesphere/notification-manager/pkg/constants"
 	"github.com/kubesphere/notification-manager/pkg/controller"
 	"github.com/kubesphere/notification-manager/pkg/internal"
 	"github.com/kubesphere/notification-manager/pkg/stage"
 	"github.com/kubesphere/notification-manager/pkg/template"
 	"github.com/kubesphere/notification-manager/pkg/utils"
-	"github.com/modern-go/reflect2"
 )
 
 const (
-	RouterPolicyAll = "All"
-	RouterFirst     = "RouterFirst"
+	RouterFirst = "RouterFirst"
+	RouterOnly  = "RouterOnly"
 )
 
 type routeStage struct {
@@ -56,9 +57,14 @@ func (s *routeStage) Exec(ctx context.Context, l log.Logger, data interface{}) (
 	// Grouping alerts by cluster and namespace
 	alertMap := make(map[string][]*template.Alert)
 	for _, alert := range input {
-		ns := alert.Labels[constants.Namespace]
-		cluster := alert.Labels[constants.Cluster]
-		key := fmt.Sprintf("%s|%s", cluster, ns)
+		key := ""
+		rl := alert.Labels[constants.RuleLevel]
+		if rl == constants.RuleLevelNamespace {
+			ns := alert.Labels[constants.Namespace]
+			cluster := alert.Labels[constants.Cluster]
+			key = fmt.Sprintf("%s|%s", cluster, ns)
+		}
+
 		as := alertMap[key]
 		as = append(as, alert)
 		alertMap[key] = as
@@ -67,18 +73,19 @@ func (s *routeStage) Exec(ctx context.Context, l log.Logger, data interface{}) (
 	m := make(map[string]*packet)
 	routePolicy := s.notifierCtl.GetRoutePolicy()
 	for key, alerts := range alertMap {
-		flag := false
-		pair := strings.Split(key, "|")
-		cluster := pair[0]
-		ns := pair[1]
 		var tenantRcvs []internal.Receiver
+		if routePolicy != RouterOnly {
+			pair := strings.Split(key, "|")
+			cluster := pair[0]
+			ns := ""
+			if len(pair) > 1 {
+				ns = pair[1]
+			}
+			tenantRcvs = s.notifierCtl.RcvsFromNs(cluster, &ns)
+		}
 		for _, alert := range alerts {
 			rcvs := s.rcvsFromRouter(alert, routers)
-			if routePolicy == RouterPolicyAll || (routePolicy == RouterFirst && len(rcvs) == 0) {
-				if len(tenantRcvs) == 0 && !flag {
-					tenantRcvs = s.notifierCtl.RcvsFromNs(cluster, &ns)
-					flag = true
-				}
+			if !(routePolicy == RouterFirst && len(rcvs) != 0) {
 				rcvs = append(rcvs, tenantRcvs...)
 			}
 

sidecar/kubesphere/4.0.0/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a Apache license
 # that can be found in the LICENSE file.
 
-IMG ?= kubesphere/notification-tenant-sidecar:v4.0.2
+IMG ?= kubesphere/notification-tenant-sidecar:v4.2.0
 AMD64 ?= -amd64
 
 all: docker-build

sidecar/kubesphere/4.0.0/backend.go

@@ -119,9 +119,9 @@ func getTenantInfoFromCluster(cluster string, users []string) (map[string][]stri
 					ResourceAttributes: &iamv1beta1.ResourceAttributes{
 						Namespace: namespace,
 						Verb:      "get",
-						Group:     "notification.kubesphere.io",
-						Version:   "v2beta2",
-						Resource:  "receivenotification",
+						Group:     "",
+						Version:   "v1",
+						Resource:  "pods",
 					},
 					NonResourceAttributes: nil,
 					User:                  user,       // "X-Remote-User" request header