feat: alert config

pkg/cmd/alert/add_receiver.go

@@ -77,10 +77,13 @@ var (
 
 type baseOptions struct {
 	genericiooptions.IOStreams
-	alertConfigMap   *corev1.ConfigMap
-	webhookConfigMap *corev1.ConfigMap
-	client           kubernetes.Interface
-	Factory          cmdutil.Factory
+	alertConfigMap      *corev1.ConfigMap
+	webhookConfigMap    *corev1.ConfigMap
+	client              kubernetes.Interface
+	Factory             cmdutil.Factory
+	AlertConfigMapKey   apitypes.NamespacedName
+	AlertConfigFileName string
+	NoAdapter           bool
 }
 
 type AddReceiverOptions struct {
@@ -165,8 +168,17 @@ func (o *baseOptions) complete() error {
 		return err
 	}
 
+	if len(o.AlertConfigFileName) == 0 {
+		o.AlertConfigFileName = alertConfigFileName
+	}
+	if len(o.AlertConfigMapKey.Name) == 0 {
+		o.AlertConfigMapKey.Name = alertConfigmapName
+	}
+	if len(o.AlertConfigMapKey.Namespace) == 0 {
+		o.AlertConfigMapKey.Namespace = namespace
+	}
 	// get alertmanager configmap
-	o.alertConfigMap, err = o.client.CoreV1().ConfigMaps(namespace).Get(ctx, alertConfigmapName, metav1.GetOptions{})
+	o.alertConfigMap, err = o.client.CoreV1().ConfigMaps(o.AlertConfigMapKey.Namespace).Get(ctx, o.AlertConfigMapKey.Name, metav1.GetOptions{})
 	if err != nil {
 		return err
 	}
@@ -228,7 +240,7 @@ func (o *AddReceiverOptions) checkEmails() error {
 	}
 
 	errMsg := "SMTP %sis not configured, if you want to add email receiver, please use `kbcli alert config-smtpserver` configure it first"
-	data, err := getConfigData(o.alertConfigMap, alertConfigFileName)
+	data, err := getConfigData(o.alertConfigMap, o.AlertConfigFileName)
 	if err != nil {
 		return err
 	}
@@ -352,7 +364,7 @@ func (o *AddReceiverOptions) buildRoute() {
 
 // addReceiver adds receiver to alertmanager config
 func (o *AddReceiverOptions) addReceiver() error {
-	data, err := getConfigData(o.alertConfigMap, alertConfigFileName)
+	data, err := getConfigData(o.alertConfigMap, o.AlertConfigFileName)
 	if err != nil {
 		return err
 	}
@@ -372,7 +384,7 @@ func (o *AddReceiverOptions) addReceiver() error {
 	data["route"].(map[string]interface{})["routes"] = routes
 
 	// update alertmanager configmap
-	return updateConfig(o.client, o.alertConfigMap, alertConfigFileName, data)
+	return updateConfig(o.client, o.alertConfigMap, o.AlertConfigFileName, data)
 }
 
 func (o *AddReceiverOptions) addWebhookReceivers() error {
@@ -412,11 +424,12 @@ func (o *AddReceiverOptions) buildWebhook() ([]*webhookConfig, error) {
 				if valid, err := urlIsValid(v); !valid {
 					return nil, fmt.Errorf("invalid webhook url: %s, %v", v, err)
 				}
-				w.URL = getWebhookAdaptorURL(o.Name, o.webhookConfigMap.Namespace)
-				webhookType := getWebhookType(v)
-				if webhookType == unknownWebhookType {
-					return nil, fmt.Errorf("invalid webhook url: %s, failed to prase the webhook type", v)
+				if o.NoAdapter {
+					w.URL = v
+				} else {
+					w.URL = getWebhookAdaptorURL(o.Name, o.webhookConfigMap.Namespace)
 				}
+				webhookType := getWebhookType(v)
 				waReceiver.Type = string(webhookType)
 				waReceiver.Params.URL = v
 			case webhookToken:

pkg/cmd/alert/add_receiver_test.go

@@ -127,6 +127,7 @@ var _ = Describe("add receiver", func() {
 		baseOptions := mockBaseOptions(s)
 		o.alertConfigMap = baseOptions.alertConfigMap
 		o.InputName = []string{}
+		o.AlertConfigFileName = alertConfigFileName
 		Expect(o.validate()).Should(Succeed())
 	})
 
@@ -164,6 +165,7 @@ var _ = Describe("add receiver", func() {
 		o.baseOptions.webhookConfigMap = webhookAdaptorCM
 		o.client = testing.FakeClientSet(alertCM, webhookAdaptorCM)
 		o.Name = "receiver-test"
+		o.AlertConfigFileName = alertConfigFileName
 		Expect(o.addReceiver()).Should(Succeed())
 		Expect(o.addWebhookReceivers()).Should(Succeed())
 	})

pkg/cmd/alert/config_smtpserver.go

@@ -87,7 +87,7 @@ func (o *configSMTPServerOptions) validate() error {
 }
 
 func (o *configSMTPServerOptions) run() error {
-	data, err := getConfigData(o.alertConfigMap, alertConfigFileName)
+	data, err := getConfigData(o.alertConfigMap, o.AlertConfigFileName)
 	if err != nil {
 		return err
 	}
@@ -105,5 +105,5 @@ func (o *configSMTPServerOptions) run() error {
 	data["global"] = global
 
 	// update global config
-	return updateConfig(o.client, o.alertConfigMap, alertConfigFileName, data)
+	return updateConfig(o.client, o.alertConfigMap, o.AlertConfigFileName, data)
 }

pkg/cmd/alert/config_smtpserver_test.go

@@ -103,6 +103,7 @@ var _ = Describe("config smtpserver", func() {
 		o.smtpAuthPassword = "123456abc"
 		o.smtpAuthIdentity = "[email protected]"
 		o.client = testing.FakeClientSet(o.alertConfigMap, o.webhookConfigMap)
+		o.AlertConfigFileName = alertConfigFileName
 		Expect(o.validate()).Should(Succeed())
 		Expect(o.run()).Should(Succeed())
 	})

pkg/cmd/alert/delete_receiver.go

@@ -82,7 +82,7 @@ func (o *deleteReceiverOptions) run() error {
 }
 
 func (o *deleteReceiverOptions) deleteReceiver() error {
-	data, err := getConfigData(o.alertConfigMap, alertConfigFileName)
+	data, err := getConfigData(o.alertConfigMap, o.AlertConfigFileName)
 	if err != nil {
 		return err
 	}
@@ -125,7 +125,7 @@ func (o *deleteReceiverOptions) deleteReceiver() error {
 
 	data["receivers"] = newReceivers
 	data["route"].(map[string]interface{})["routes"] = newRoutes
-	return updateConfig(o.client, o.alertConfigMap, alertConfigFileName, data)
+	return updateConfig(o.client, o.alertConfigMap, o.AlertConfigFileName, data)
 }
 
 func (o *deleteReceiverOptions) deleteWebhookReceivers() error {

pkg/cmd/alert/delete_receiver_test.go

@@ -59,6 +59,7 @@ var _ = Describe("alert", func() {
 		o := &deleteReceiverOptions{baseOptions: mockBaseOptions(s)}
 		o.client = testing.FakeClientSet(o.baseOptions.alertConfigMap, o.baseOptions.webhookConfigMap)
 		o.names = []string{"receiver-7pb52"}
+		o.AlertConfigFileName = alertConfigFileName
 		Expect(o.run()).Should(Succeed())
 	})
 })

pkg/cmd/alert/list_receivers.go

@@ -58,7 +58,7 @@ func newListReceiversCmd(f cmdutil.Factory, streams genericiooptions.IOStreams)
 }
 
 func (o *listReceiversOptions) run() error {
-	data, err := getConfigData(o.alertConfigMap, alertConfigFileName)
+	data, err := getConfigData(o.alertConfigMap, o.AlertConfigFileName)
 	if err != nil {
 		return err
 	}

pkg/cmd/alert/list_receivers_test.go

@@ -52,6 +52,7 @@ var _ = Describe("alert", func() {
 	It("run", func() {
 		o := &listReceiversOptions{baseOptions: mockBaseOptions(s)}
 		o.client = testing.FakeClientSet(o.baseOptions.alertConfigMap, o.baseOptions.webhookConfigMap)
+		o.AlertConfigFileName = alertConfigFileName
 		Expect(o.run()).Should(Succeed())
 	})
 })

pkg/cmd/alert/list_smtpserver.go

@@ -54,7 +54,7 @@ func newListSMTPServerCmd(f cmdutil.Factory, streams genericiooptions.IOStreams)
 }
 
 func (o *listSMTPServerOptions) run() error {
-	data, err := getConfigData(o.alertConfigMap, alertConfigFileName)
+	data, err := getConfigData(o.alertConfigMap, o.AlertConfigFileName)
 	if err != nil {
 		return err
 	}

pkg/cmd/alert/list_smtpserver_test.go

@@ -52,6 +52,7 @@ var _ = Describe("list smtpserver", func() {
 	It("run", func() {
 		o := &listSMTPServerOptions{baseOptions: mockBaseOptions(s)}
 		o.client = testing.FakeClientSet(o.baseOptions.alertConfigMap, o.baseOptions.webhookConfigMap)
+		o.AlertConfigFileName = alertConfigFileName
 		Expect(o.run()).Should(Succeed())
 	})
 })