Merge pull request #224 from wanjunlei/master

preparing for release v2.4.0

CHANGLOG.md

@@ -1,3 +1,13 @@
+## v2.4.0 / 2023-09-20
+
+### FEATURES
+
+-  Support sending notifications to telegram(#210). @mangoGoForward
+
+### Enhancements
+
+- Supports regular expression matching in Receiver, Silence, and Router(#215). @wenchajun
+
 ## v2.3.0 / 2023-04-12
 
 ### Enhancements

README.md

@@ -82,17 +82,17 @@ We assume you already have a Kubernetes cluster (v1.16+). You can install one us
 
 ```shell
 # Deploy CRDs and the Notification Manager Operator:
-kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.3.0/bundle.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.4.0/bundle.yaml
 # Deploy default template:
-kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.3.0/template.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.4.0/template.yaml
 # Deploy built-in language packs.
-kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.3.0/zh-cn.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.4.0/zh-cn.yaml
 ```
 
 #### Install with helm
 
 ```shell
-helm install notification-manager --create-namespace -n kubesphere-monitoring-system https://github.com/kubesphere/notification-manager/releases/download/v2.3.0/notification-manager.tgz
+helm install notification-manager --create-namespace -n kubesphere-monitoring-system https://github.com/kubesphere/notification-manager/releases/download/v2.4.0/notification-manager.tgz
 ```
 
 ### Configure NotificationManager 
@@ -103,7 +103,7 @@ ensures a deployment meeting the resource requirements is running.
 We should create a NotificationManager CR first, skip this when using helm install.
 
 ```shell
-kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.3.0/notification_manager.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.4.0/notification_manager.yaml
 ```
 
 ### Configure sender

RELEASE.md

@@ -16,6 +16,7 @@ This page describes the release process and the currently planned schedule for u
 | v2.2.0         | 2023-01-06             | Gentleelephant (GitHub: @Gentleelephant) |
 | v2.3.0-rc.0    | 2023-02-07             | leiwanjun (GitHub: @leiwanjun)      |
 | v2.3.0         | 2023-04-12             | leiwanjun (GitHub: @leiwanjun)      |
+| v2.4.0         | 2023-09-20             | leiwanjun (GitHub: @leiwanjun)      |
 
 # How to cut a new release
 

helm/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 2.3.0
+appVersion: 2.4.0
 description: Notification Manager manages notifications in multi-tenant K8s environment. It receives alerts or notifications from different senders and then send notifications to various tenant receivers based on alerts/notifications' tenant label like "namespace". 
 name: notification-manager
-version: 2.3.0
+version: 2.4.0

helm/values.yaml

@@ -30,7 +30,7 @@ operator:
     operator:
       image:
         repo: kubesphere/notification-manager-operator
-        tag: v2.3.0
+        tag: v2.4.0
         pullPolicy: IfNotPresent
       resources:
         limits:
@@ -48,7 +48,7 @@ operator:
 notificationmanager:
   image:
     repo: kubesphere/notification-manager
-    tag: v2.3.0
+    tag: v2.4.0
     pullPolicy: IfNotPresent
   replicas: 1
   resources: