From 325d767e8eb4a5a6811a13a9d25bfa4d911e62b3 Mon Sep 17 00:00:00 2001
From: Jianyuan Jiang <sdojjy@qq.com>
Date: Wed, 27 Nov 2024 11:18:47 +0800
Subject: [PATCH] alert(ticdc): fix ticdc alert rules (#11191)

close pingcap/tiflow#11190
---
 cdc/api/v2/api_helpers.go            | 3 ---
 metrics/alertmanager/ticdc.rules.yml | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/cdc/api/v2/api_helpers.go b/cdc/api/v2/api_helpers.go
index 05b93b6e643..d99bb9dc1bb 100644
--- a/cdc/api/v2/api_helpers.go
+++ b/cdc/api/v2/api_helpers.go
@@ -231,9 +231,6 @@ func (APIV2HelpersImpl) verifyCreateChangefeedConfig(
 		return nil, errors.Cause(err)
 	}
 	if !replicaCfg.ForceReplicate && !cfg.ReplicaConfig.IgnoreIneligibleTable {
-		if err != nil {
-			return nil, err
-		}
 		if len(ineligibleTables) != 0 {
 			return nil, cerror.ErrTableIneligible.GenWithStackByArgs(ineligibleTables)
 		}
diff --git a/metrics/alertmanager/ticdc.rules.yml b/metrics/alertmanager/ticdc.rules.yml
index 03002763237..09b444602b6 100644
--- a/metrics/alertmanager/ticdc.rules.yml
+++ b/metrics/alertmanager/ticdc.rules.yml
@@ -88,17 +88,17 @@ groups:
       summary: cdc processor exits with error
 
   - alert: ticdc_changefeed_meet_error
-    expr: (max_over_time(ticdc_owner_status[1m]) == 1) > 0
+    expr: (max_over_time(ticdc_owner_status[1m]) == 1 or max_over_time(ticdc_owner_status[1m]) == 6) > 0
     for: 1m
     labels:
       env: ENV_LABELS_ENV
       level: warning
-      expr: (max_over_time(ticdc_owner_status[1m]) == 1) > 0
+      expr: (max_over_time(ticdc_owner_status[1m]) == 1 or max_over_time(ticdc_owner_status[1m]) == 6) > 0
     annotations:
       description: 'cluster: ENV_LABELS_ENV, instance: {{ $labels.instance }}, values: {{ $value }}'
       value: '{{ $value }}'
       summary: cdc changefeed meet error
-  
+
   # tikv related alter rules
   - alert: tikv_cdc_min_resolved_ts_no_change_for_1m
     expr: changes(tikv_cdc_min_resolved_ts[1m]) < 1 and ON (instance) tikv_cdc_region_resolve_status{status="resolved"} > 0 and ON (instance) tikv_cdc_captured_region_total > 0
@@ -134,4 +134,4 @@ groups:
     annotations:
       description: 'cluster: ENV_LABELS_ENV, instance: {{ $labels.instance }}, values:{{ $value }}'
       value: '{{ $value }}'
-      summary: TiCDC heap memory usage is over 10 GB
\ No newline at end of file
+      summary: TiCDC heap memory usage is over 10 GB