ui improve

mylxsw · Jul 3, 2020 · fbbadcf · fbbadcf
1 parent 33d555a
commit fbbadcf
Show file tree

Hide file tree

Showing 6 changed files with 1,291 additions and 1,258 deletions.
diff --git a/api/static.go b/api/static.go
diff --git a/dashboard/src/components/MessageCard.vue b/dashboard/src/components/MessageCard.vue
@@ -8,7 +8,8 @@
             <div class="float-right" title="状态">
                 <b-badge v-if="message.status === 'pending'" variant="dark">准备中</b-badge>
                 <b-badge v-if="message.status === 'grouped'" variant="success">已分组</b-badge>
-                <b-badge v-if="message.status === 'canceled'" variant="danger">已取消</b-badge>
+                <b-badge v-if="message.status === 'canceled'" variant="danger">无规则，已取消</b-badge>
+                <b-badge v-if="message.status === 'expired'" variant="warning">匹配规则，已过期</b-badge>
             </div>
         </template>
 

diff --git a/dashboard/src/views/Messages.vue b/dashboard/src/views/Messages.vue
@@ -37,7 +37,8 @@
                     {value: null, text: '所有状态'},
                     {value: 'pending', text: '准备中'},
                     {value: 'grouped', text: '已分组'},
-                    {value: 'canceled', text: '已取消'},
+                    {value: 'canceled', text: '无规则，已取消'},
+                    {value: 'expired', text: '匹配规则，已过期'},
                 ],
                 messages: [],
                 cur: parseInt(this.$route.query.next !== undefined ? this.$route.query.next : 0),
@@ -77,7 +78,7 @@
                     this.search.origin = response.data.search.origin;
                     this.search.tags = response.data.search.tags;
                     this.search.meta = response.data.search.meta;
-                    this.search.status = response.data.search.status.length == 0 ? null : response.data.search.status[0];
+                    this.search.status = response.data.search.status.length === 0 ? null : response.data.search.status[0];
 
                     this.isBusy = false;
                 }).catch(error => {

diff --git a/dashboard/src/views/RuleEdit.vue b/dashboard/src/views/RuleEdit.vue
@@ -22,7 +22,7 @@
 
                         <b-form-group label-cols="2" id="rule_interval" label="报警周期*" label-for="rule_interval_input"
                                       :description="'当前：' + (parseInt(form.interval) === 0 ? 1 : form.interval) + ' 分钟，每隔 ' + (parseInt(form.interval) === 0 ? 1 : form.interval) + ' 分钟后触发一次报警'">
-                            <b-form-input id="rule_interval_input" type="range" min="1" max="1440" step="5"
+                            <b-form-input id="rule_interval_input" type="range" min="0" max="1440" step="5"
                                           v-model="form.interval" required/>
                         </b-form-group>
 
@@ -723,7 +723,6 @@
                 let requestData = {};
                 requestData.name = this.form.name;
                 requestData.description = this.form.description;
-                requestData.interval = this.form.interval * 60;
                 requestData.rule = this.form.rule;
                 requestData.tags = this.form.tags;
                 requestData.template = this.form.template;
@@ -733,6 +732,12 @@
                 });
                 requestData.status = this.form.status ? 'enabled' : 'disabled';
 
+                if (this.form.interval <= 0) {
+                    requestData.interval = 60;
+                } else {
+                    requestData.interval = this.form.interval * 60;
+                }
+
                 return requestData;
             },
         },

diff --git a/internal/job/aggregation.go b/internal/job/aggregation.go
@@ -41,7 +41,7 @@ func (a *AggregationJob) groupingMessages(msgRepo repository.MessageRepo, groupR
 	}
 
 	collectingGroups := make(map[primitive.ObjectID]repository.MessageGroup)
-	return msgRepo.Traverse(bson.M{"status": repository.MessageStatusPending}, func(msg repository.Message) error {
+	err = msgRepo.Traverse(bson.M{"status": repository.MessageStatusPending}, func(msg repository.Message) error {
 		for _, m := range matchers {
 			matched, err := m.Match(msg)
 			if err != nil {
@@ -79,6 +79,27 @@ func (a *AggregationJob) groupingMessages(msgRepo repository.MessageRepo, groupR
 			"status": msg.Status,
 		}).Debug("change message status")
 
+		return msgRepo.UpdateID(msg.ID, msg)
+	})
+	if err != nil {
+		return err
+	}
+
+	// 将能够与规则匹配的 Canceled 的 message 转换为 Expired
+	return msgRepo.Traverse(bson.M{"status": repository.MessageStatusCanceled}, func(msg repository.Message) error {
+		for _, m := range matchers {
+			matched, err := m.Match(msg)
+			if err != nil {
+				continue
+			}
+
+			// if the message matched a rule, update message's group_id and skip to next message
+			if matched {
+				msg.Status = repository.MessageStatusExpired
+				break
+			}
+		}
+
 		return msgRepo.UpdateID(msg.ID, msg)
 	})
 }

diff --git a/internal/repository/message.go b/internal/repository/message.go
@@ -14,6 +14,7 @@ const (
 	MessageStatusPending  MessageStatus = "pending"
 	MessageStatusGrouped  MessageStatus = "grouped"
 	MessageStatusCanceled MessageStatus = "canceled"
+	MessageStatusExpired  MessageStatus = "expired"
 )
 
 type Message struct {