feat(notify): add clusterID to notify message

Signed-off-by: Feng Kun <[email protected]>
tkestack · May 30, 2020 · 7914fd8 · 7914fd8
1 parent 749851a
commit 7914fd8
Show file tree

Hide file tree

Showing 9 changed files with 188 additions and 119 deletions.
diff --git a/api/notify/types.go b/api/notify/types.go
@@ -423,6 +423,8 @@ type MessageSpec struct {
  AlarmPolicyType string
  // +optional
  ReceiverChannelName string
+ // +optional
+ ClusterID string
 }
 
 // MessageStatus represents information about the status of a message.

diff --git a/api/notify/v1/conversion.go b/api/notify/v1/conversion.go
@@ -139,7 +139,8 @@ func AddFieldLabelConversionsForMessage(scheme *runtime.Scheme) error {
  "metadata.name",
  "spec.alarmPolicyName",
  "spec.alarmPolicyType",
- "spec.receiverChannelName":
+ "spec.receiverChannelName",
+ "spec.clusterID":
  return label, value, nil
  default:
  return "", "", fmt.Errorf("field label not supported: %s", label)

diff --git a/api/notify/v1/generated.pb.go b/api/notify/v1/generated.pb.go
diff --git a/api/notify/v1/generated.proto b/api/notify/v1/generated.proto
diff --git a/api/notify/v1/types.go b/api/notify/v1/types.go
@@ -423,6 +423,8 @@ type MessageSpec struct {
  AlarmPolicyType string `json:"alarmPolicyType,omitempty" protobuf:"bytes,10,opt,name=alarmPolicyType"`
  // +optional
  ReceiverChannelName string `json:"receiverChannelName,omitempty" protobuf:"bytes,11,opt,name=receiverChannelName"`
+ // +optional
+ ClusterID string `json:"clusterID,omitempty" protobuf:"bytes,12,opt,name=clusterID"`
 }
 
 // MessageStatus represents information about the status of a message.

diff --git a/api/notify/v1/zz_generated.conversion.go b/api/notify/v1/zz_generated.conversion.go
diff --git a/api/openapi/zz_generated.openapi.go b/api/openapi/zz_generated.openapi.go
diff --git a/pkg/notify/controller/messagerequest/controller.go b/pkg/notify/controller/messagerequest/controller.go
@@ -299,6 +299,7 @@ type sentMessage struct {
  alarmPolicyName string
  alarmPolicyType string
  receiverChannelName string
+ clusterID string
 }
 
 func (c *Controller) sendMessage(ctx context.Context, messageRequest *v1.MessageRequest) (sentMessages []sentMessage, failedReceiverErrors map[string]string) {
@@ -359,13 +360,17 @@ func (c *Controller) sendMessage(ctx context.Context, messageRequest *v1.Message
  var (
  alarmPolicyName string
  alarmPolicyType string
+ clusterID string
  )
  if v, ok := messageRequest.Spec.Variables["alarmPolicyName"]; ok {
  alarmPolicyName = v
  }
  if v, ok := messageRequest.Spec.Variables["alarmPolicyType"]; ok {
  alarmPolicyType = v
  }
+ if v, ok := messageRequest.Spec.Variables["clusterID"]; ok {
+ clusterID = v
+ }
  if channel.Spec.Webhook != nil && template.Spec.Text != nil {
  content, err := webhook.Send(channel.Spec.Webhook, template.Spec.Text, receivers, messageRequest.Spec.Variables)
  if err != nil {
@@ -380,6 +385,7 @@ func (c *Controller) sendMessage(ctx context.Context, messageRequest *v1.Message
  alarmPolicyName: alarmPolicyName,
  alarmPolicyType: alarmPolicyType,
  receiverChannelName: channel.Name,
+ clusterID: clusterID,
  })
  return
  }
@@ -412,6 +418,7 @@ func (c *Controller) sendMessage(ctx context.Context, messageRequest *v1.Message
  alarmPolicyName: alarmPolicyName,
  alarmPolicyType: alarmPolicyType,
  receiverChannelName: channel.Name,
+ clusterID: clusterID,
  })
  }
  if template.Spec.Wechat != nil {
@@ -440,6 +447,7 @@ func (c *Controller) sendMessage(ctx context.Context, messageRequest *v1.Message
  alarmPolicyName: alarmPolicyName,
  alarmPolicyType: alarmPolicyType,
  receiverChannelName: channel.Name,
+ clusterID: clusterID,
  })
  }
  if template.Spec.Text != nil {
@@ -468,6 +476,7 @@ func (c *Controller) sendMessage(ctx context.Context, messageRequest *v1.Message
  alarmPolicyName: alarmPolicyName,
  alarmPolicyType: alarmPolicyType,
  receiverChannelName: channel.Name,
+ clusterID: clusterID,
  })
  }
  if templateCount == 0 {
@@ -495,6 +504,7 @@ func (c *Controller) archiveMessage(ctx context.Context, messageRequest *v1.Mess
  AlarmPolicyName: sentMessage.alarmPolicyName,
  AlarmPolicyType: sentMessage.alarmPolicyType,
  ReceiverChannelName: sentMessage.receiverChannelName,
+ ClusterID: sentMessage.clusterID,
  },
  Status: v1.MessageStatus{
  Phase: v1.MessageUnread,

diff --git a/pkg/notify/registry/message/strategy.go b/pkg/notify/registry/message/strategy.go
@@ -141,6 +141,7 @@ func MatchMessage(label labels.Selector, field fields.Selector) storage.Selectio
  "spec.alarmPolicyName",
  "spec.alarmPolicyType",
  "spec.receiverChannelName",
+ "spec.clusterID",
  },
  }
 }
@@ -157,6 +158,7 @@ func ToSelectableFields(message *notify.Message) fields.Set {
  "spec.alarmPolicyName": message.Spec.AlarmPolicyName,
  "spec.alarmPolicyType": message.Spec.AlarmPolicyType,
  "spec.receiverChannelName": message.Spec.ReceiverChannelName,
+ "spec.clusterID": message.Spec.ClusterID,
  }
  return genericregistry.MergeFieldsSets(objectMetaFieldsSet, specificFieldsSet)
 }