From 06a30edcf82b6ff44177348e27adb6f19c049770 Mon Sep 17 00:00:00 2001
From: Zexi Li <zexi.li@qq.com>
Date: Tue, 20 Oct 2020 13:19:49 +0800
Subject: [PATCH] fix: monitor commonalert not detach alert resource

---
 pkg/monitor/alertresourcedrivers/node.go | 4 ++++
 pkg/monitor/models/commonalert.go        | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/monitor/alertresourcedrivers/node.go b/pkg/monitor/alertresourcedrivers/node.go
index 2b42a038d4..0b86af91d2 100644
--- a/pkg/monitor/alertresourcedrivers/node.go
+++ b/pkg/monitor/alertresourcedrivers/node.go
@@ -40,6 +40,10 @@ func (drvF *nodeDriverF) IsEvalMatched(input monitor.EvalMatch) bool {
 	if !hasResType {
 		return false
 	}
+	_, hasHostType := tags[hostconsts.TELEGRAF_TAG_KEY_HOST_TYPE]
+	if !hasHostType {
+		return false
+	}
 	_, hasHost := tags[NODE_TAG_HOST_KEY]
 	if !hasHost {
 		return false
diff --git a/pkg/monitor/models/commonalert.go b/pkg/monitor/models/commonalert.go
index a9e4be6424..46813bde77 100644
--- a/pkg/monitor/models/commonalert.go
+++ b/pkg/monitor/models/commonalert.go
@@ -782,9 +782,9 @@ func (alert *SCommonAlert) CustomizeDelete(
 	err := alert.customizeDeleteNotis(ctx, userCred, query, data)
 	if err != nil {
 		alert.SetStatus(userCred, monitor.ALERT_STATUS_DELETE_FAIL, "")
-
+		return errors.Wrap(err, "customizeDeleteNotis")
 	}
-	return err
+	return alert.SAlert.CustomizeDelete(ctx, userCred, query, data)
 }
 
 func (alert *SCommonAlert) customizeDeleteNotis(