Merge branch 'main' of github.com:m-cmp/mc-observability

m-cmp · Oct 14, 2024 · 5c9c638 · 5c9c638
2 parents ca118b2 + 379069c
commit 5c9c638
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/...agent/src/main/java/mcmp/mc/observability/mco11yagent/trigger/model/TriggerAlertInfo.java b/...agent/src/main/java/mcmp/mc/observability/mco11yagent/trigger/model/TriggerAlertInfo.java
@@ -26,7 +26,7 @@ public class TriggerAlertInfo {
     @JsonProperty("target_name")
     private String targetName;
 
-    @JsonProperty("metric")
+    @JsonProperty("measurement")
     private String metric;
 
     @JsonProperty("data")
@@ -49,7 +49,7 @@ public String getAlertMessage() {
         appendIfNotNull(sb, "ID", this.targetId);
         appendIfNotNull(sb, "Namespace ID", this.nsId);
         appendIfNotNull(sb, "Target Name", this.targetName);
-        appendIfNotNull(sb, "Metric", this.metric);
+        appendIfNotNull(sb, "Measurement", this.metric);
         appendIfNotNull(sb, "Level", this.level);
         appendIfNotNull(sb, "Threshold", this.threshold);
         appendIfNotNull(sb, "Occur Time", this.occurTime);

diff --git a/...ent/src/main/java/mcmp/mc/observability/mco11yagent/trigger/model/TriggerHistoryInfo.java b/...ent/src/main/java/mcmp/mc/observability/mco11yagent/trigger/model/TriggerHistoryInfo.java
@@ -31,7 +31,7 @@ public class TriggerHistoryInfo {
     private String targetId;
 
     @ApiModelProperty(value = "Trigger event target metric name")
-    @JsonProperty("metric")
+    @JsonProperty("measurement")
     private String metric;
 
     @ApiModelProperty(value = "Trigger event alarm details")

diff --git a/...main/java/mcmp/mc/observability/mco11yagent/trigger/model/dto/TriggerPolicyUpdateDto.java b/...main/java/mcmp/mc/observability/mco11yagent/trigger/model/dto/TriggerPolicyUpdateDto.java
@@ -27,7 +27,7 @@ public class TriggerPolicyUpdateDto {
     private String description;
 
     @ApiModelProperty(value = "Trigger target metric", example = "cpu")
-    @JsonProperty("metric")
+    @JsonProperty("measurement")
     private String metric;
 
     @ApiModelProperty(value = "Trigger target metric field", example = "usage_idle")

diff --git a/.../src/main/java/mcmp/mc/observability/mco11yagent/trigger/service/KapacitorApiService.java b/.../src/main/java/mcmp/mc/observability/mco11yagent/trigger/service/KapacitorApiService.java
@@ -1,7 +1,10 @@
 package mcmp.mc.observability.mco11yagent.trigger.service;
 
+import static mcmp.mc.observability.mco11yagent.trigger.enums.TaskStatus.*;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import mcmp.mc.observability.mco11yagent.trigger.enums.TaskStatus;
 import mcmp.mc.observability.mco11yagent.trigger.exception.TriggerResultCodeException;
 import mcmp.mc.observability.mco11yagent.monitoring.enums.ResultCode;
 import mcmp.mc.observability.mco11yagent.trigger.client.KapacitorClient;
@@ -87,7 +90,7 @@ public boolean updateTask(TriggerPolicyInfo policyInfo, ManageTriggerTargetStora
 
             updateTask(kapacitorUrl, kapacitorTaskId, updateTaskParam);
 
-            if(policyInfo.getStatus().equals("enabled")) {
+            if(policyInfo.getStatus().equals(ENABLED)) {
                 updateTask(kapacitorUrl, kapacitorTaskId, Collections.singletonMap("status", "disabled"));
                 updateTask(kapacitorUrl, kapacitorTaskId, Collections.singletonMap("status", "enabled"));
             }

diff --git a/...ain/java/mcmp/mc/observability/mco11yagent/trigger/service/TriggerPolicyAlertService.java b/...ain/java/mcmp/mc/observability/mco11yagent/trigger/service/TriggerPolicyAlertService.java
@@ -176,7 +176,7 @@ public void sendEmail(TriggerAlertInfo alertInfo) {
             context.setVariable("targetId", alertInfo.getTargetId());
             context.setVariable("nsId", alertInfo.getNsId());
             context.setVariable("targetName", alertInfo.getTargetName());
-            context.setVariable("metric", alertInfo.getMetric());
+            context.setVariable("measurement", alertInfo.getMetric());
             context.setVariable("level", alertInfo.getLevel());
             context.setVariable("threshold", alertInfo.getThreshold());
             context.setVariable("occurTime", alertInfo.getOccurTime());

diff --git a/java-module/mc-o11y-agent/src/main/resources/mailTemplate/TriggerAlertTemplate.html b/java-module/mc-o11y-agent/src/main/resources/mailTemplate/TriggerAlertTemplate.html
@@ -19,7 +19,7 @@
             <div style=" margin-top: 10px; text-align: center; align-content: center; justify-content: center">
                 <h3>M-CMP Trigger Event Alert</h3><br/>
                 [Alert :
-                <strong style="color:#006dff;font-weight: bold;" th:text="${metric}">metric</strong>
+                <strong style="color:#006dff;font-weight: bold;" th:text="${measurement}">measurement</strong>
                     alarm has been triggered in
                 <strong style="color:#006dff;font-weight: bold;" th:text="${policyName}">policyName</strong>
                     ]
@@ -44,8 +44,8 @@ <h3>M-CMP Trigger Event Alert</h3><br/>
                     <td style="border-bottom:1px solid #e7e9ee;color:#142337;background-color:#fefbf7;padding:10px 15px" th:text="${targetName}"></td>
                 </tr>
                 <tr>
-                    <th width="110" height="35" style="width:110px;height:35px;background-color:#fcf3e7;border-bottom:1px solid #e7e9ee;padding-left:15px;text-align:left;font-weight:normal;color:#142337">Metric</th>
-                    <td style="border-bottom:1px solid #e7e9ee;color:#142337;background-color:#fefbf7;padding:10px 15px" th:text="${metric}"></td>
+                    <th width="110" height="35" style="width:110px;height:35px;background-color:#fcf3e7;border-bottom:1px solid #e7e9ee;padding-left:15px;text-align:left;font-weight:normal;color:#142337">Measurement</th>
+                    <td style="border-bottom:1px solid #e7e9ee;color:#142337;background-color:#fefbf7;padding:10px 15px" th:text="${measurement}"></td>
                 </tr>
                 <tr>
                     <th width="110" height="35" style="width:110px;height:35px;background-color:#fcf3e7;border-bottom:1px solid #e7e9ee;padding-left:15px;text-align:left;font-weight:normal;color:#142337">Level</th>