Skip to content

Commit fc7700b

Browse files
author
BitsAdmin
committed
Merge 'cloudmonitor-Java-2018-01-01-online-1907-2025_12_03_14_14_28' into 'integration_2026-01-22_1106838080770'
feat: [development task] cloudmonitor-1907-Java (2054026) See merge request: !866
2 parents bf45692 + 55a8ae1 commit fc7700b

15 files changed

Lines changed: 1336 additions & 12 deletions

‎volcengine-java-sdk-cloudmonitor/src/main/java/com/volcengine/cloudmonitor/model/CreateRuleRequest.java‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ public AlertMethodsEnum read(final JsonReader jsonReader) throws IOException {
139139
@SerializedName("NotifyTemplates")
140140
private List<NotifyTemplateForCreateRuleInput> notifyTemplates = null;
141141

142+
@SerializedName("ObjectGroupId")
143+
private String objectGroupId = null;
144+
142145
@SerializedName("OriginalDimensions")
143146
private Map<String, List<String>> originalDimensions = null;
144147

@@ -572,6 +575,24 @@ public void setNotifyTemplates(List<NotifyTemplateForCreateRuleInput> notifyTemp
572575
this.notifyTemplates = notifyTemplates;
573576
}
574577

578+
public CreateRuleRequest objectGroupId(String objectGroupId) {
579+
this.objectGroupId = objectGroupId;
580+
return this;
581+
}
582+
583+
/**
584+
* Get objectGroupId
585+
* @return objectGroupId
586+
**/
587+
@Schema(description = "")
588+
public String getObjectGroupId() {
589+
return objectGroupId;
590+
}
591+
592+
public void setObjectGroupId(String objectGroupId) {
593+
this.objectGroupId = objectGroupId;
594+
}
595+
575596
public CreateRuleRequest originalDimensions(Map<String, List<String>> originalDimensions) {
576597
this.originalDimensions = originalDimensions;
577598
return this;
@@ -836,6 +857,7 @@ public boolean equals(java.lang.Object o) {
836857
Objects.equals(this.noData, createRuleRequest.noData) &&
837858
Objects.equals(this.notificationId, createRuleRequest.notificationId) &&
838859
Objects.equals(this.notifyTemplates, createRuleRequest.notifyTemplates) &&
860+
Objects.equals(this.objectGroupId, createRuleRequest.objectGroupId) &&
839861
Objects.equals(this.originalDimensions, createRuleRequest.originalDimensions) &&
840862
Objects.equals(this.projectName, createRuleRequest.projectName) &&
841863
Objects.equals(this.recoveryNotify, createRuleRequest.recoveryNotify) &&
@@ -851,7 +873,7 @@ public boolean equals(java.lang.Object o) {
851873

852874
@Override
853875
public int hashCode() {
854-
return Objects.hash(alertMethods, conditionOperator, conditions, contactGroupIds, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, level, levelConditions, multipleConditions, namespace, noData, notificationId, notifyTemplates, originalDimensions, projectName, recoveryNotify, regions, ruleName, ruleType, silenceTime, subNamespace, tags, webhook, webhookIds);
876+
return Objects.hash(alertMethods, conditionOperator, conditions, contactGroupIds, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, level, levelConditions, multipleConditions, namespace, noData, notificationId, notifyTemplates, objectGroupId, originalDimensions, projectName, recoveryNotify, regions, ruleName, ruleType, silenceTime, subNamespace, tags, webhook, webhookIds);
855877
}
856878

857879

@@ -877,6 +899,7 @@ public String toString() {
877899
sb.append(" noData: ").append(toIndentedString(noData)).append("\n");
878900
sb.append(" notificationId: ").append(toIndentedString(notificationId)).append("\n");
879901
sb.append(" notifyTemplates: ").append(toIndentedString(notifyTemplates)).append("\n");
902+
sb.append(" objectGroupId: ").append(toIndentedString(objectGroupId)).append("\n");
880903
sb.append(" originalDimensions: ").append(toIndentedString(originalDimensions)).append("\n");
881904
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
882905
sb.append(" recoveryNotify: ").append(toIndentedString(recoveryNotify)).append("\n");

‎volcengine-java-sdk-cloudmonitor/src/main/java/com/volcengine/cloudmonitor/model/DataForListRulesByIdsOutput.java‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.volcengine.cloudmonitor.model.ConvertTagForListRulesByIdsOutput;
2424
import com.volcengine.cloudmonitor.model.DimensionConditionsForListRulesByIdsOutput;
2525
import com.volcengine.cloudmonitor.model.LevelConditionForListRulesByIdsOutput;
26+
import com.volcengine.cloudmonitor.model.NoDataForListRulesByIdsOutput;
2627
import com.volcengine.cloudmonitor.model.NotifyTemplateForListRulesByIdsOutput;
2728
import com.volcengine.cloudmonitor.model.RecoveryNotifyForListRulesByIdsOutput;
2829
import io.swagger.v3.oas.annotations.media.Schema;
@@ -91,12 +92,18 @@ public class DataForListRulesByIdsOutput {
9192
@SerializedName("Namespace")
9293
private String namespace = null;
9394

95+
@SerializedName("NoData")
96+
private NoDataForListRulesByIdsOutput noData = null;
97+
9498
@SerializedName("NotificationId")
9599
private String notificationId = null;
96100

97101
@SerializedName("NotifyTemplates")
98102
private List<NotifyTemplateForListRulesByIdsOutput> notifyTemplates = null;
99103

104+
@SerializedName("ObjectGroupId")
105+
private String objectGroupId = null;
106+
100107
@SerializedName("OriginalDimensions")
101108
private Map<String, List<String>> originalDimensions = null;
102109

@@ -477,6 +484,25 @@ public void setNamespace(String namespace) {
477484
this.namespace = namespace;
478485
}
479486

487+
public DataForListRulesByIdsOutput noData(NoDataForListRulesByIdsOutput noData) {
488+
this.noData = noData;
489+
return this;
490+
}
491+
492+
/**
493+
* Get noData
494+
* @return noData
495+
**/
496+
@Valid
497+
@Schema(description = "")
498+
public NoDataForListRulesByIdsOutput getNoData() {
499+
return noData;
500+
}
501+
502+
public void setNoData(NoDataForListRulesByIdsOutput noData) {
503+
this.noData = noData;
504+
}
505+
480506
public DataForListRulesByIdsOutput notificationId(String notificationId) {
481507
this.notificationId = notificationId;
482508
return this;
@@ -522,6 +548,24 @@ public void setNotifyTemplates(List<NotifyTemplateForListRulesByIdsOutput> notif
522548
this.notifyTemplates = notifyTemplates;
523549
}
524550

551+
public DataForListRulesByIdsOutput objectGroupId(String objectGroupId) {
552+
this.objectGroupId = objectGroupId;
553+
return this;
554+
}
555+
556+
/**
557+
* Get objectGroupId
558+
* @return objectGroupId
559+
**/
560+
@Schema(description = "")
561+
public String getObjectGroupId() {
562+
return objectGroupId;
563+
}
564+
565+
public void setObjectGroupId(String objectGroupId) {
566+
this.objectGroupId = objectGroupId;
567+
}
568+
525569
public DataForListRulesByIdsOutput originalDimensions(Map<String, List<String>> originalDimensions) {
526570
this.originalDimensions = originalDimensions;
527571
return this;
@@ -818,8 +862,10 @@ public boolean equals(java.lang.Object o) {
818862
Objects.equals(this.levelConditions, dataForListRulesByIdsOutput.levelConditions) &&
819863
Objects.equals(this.multipleConditions, dataForListRulesByIdsOutput.multipleConditions) &&
820864
Objects.equals(this.namespace, dataForListRulesByIdsOutput.namespace) &&
865+
Objects.equals(this.noData, dataForListRulesByIdsOutput.noData) &&
821866
Objects.equals(this.notificationId, dataForListRulesByIdsOutput.notificationId) &&
822867
Objects.equals(this.notifyTemplates, dataForListRulesByIdsOutput.notifyTemplates) &&
868+
Objects.equals(this.objectGroupId, dataForListRulesByIdsOutput.objectGroupId) &&
823869
Objects.equals(this.originalDimensions, dataForListRulesByIdsOutput.originalDimensions) &&
824870
Objects.equals(this.projectName, dataForListRulesByIdsOutput.projectName) &&
825871
Objects.equals(this.recoveryNotify, dataForListRulesByIdsOutput.recoveryNotify) &&
@@ -837,7 +883,7 @@ public boolean equals(java.lang.Object o) {
837883

838884
@Override
839885
public int hashCode() {
840-
return Objects.hash(alertMethods, alertState, conditionOperator, conditions, contactGroupIds, createdAt, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, id, level, levelConditions, multipleConditions, namespace, notificationId, notifyTemplates, originalDimensions, projectName, recoveryNotify, regions, resourceType, ruleName, ruleType, silenceTime, subNamespace, tags, updatedAt, webHook, webhookIds);
886+
return Objects.hash(alertMethods, alertState, conditionOperator, conditions, contactGroupIds, createdAt, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, id, level, levelConditions, multipleConditions, namespace, noData, notificationId, notifyTemplates, objectGroupId, originalDimensions, projectName, recoveryNotify, regions, resourceType, ruleName, ruleType, silenceTime, subNamespace, tags, updatedAt, webHook, webhookIds);
841887
}
842888

843889

@@ -863,8 +909,10 @@ public String toString() {
863909
sb.append(" levelConditions: ").append(toIndentedString(levelConditions)).append("\n");
864910
sb.append(" multipleConditions: ").append(toIndentedString(multipleConditions)).append("\n");
865911
sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n");
912+
sb.append(" noData: ").append(toIndentedString(noData)).append("\n");
866913
sb.append(" notificationId: ").append(toIndentedString(notificationId)).append("\n");
867914
sb.append(" notifyTemplates: ").append(toIndentedString(notifyTemplates)).append("\n");
915+
sb.append(" objectGroupId: ").append(toIndentedString(objectGroupId)).append("\n");
868916
sb.append(" originalDimensions: ").append(toIndentedString(originalDimensions)).append("\n");
869917
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
870918
sb.append(" recoveryNotify: ").append(toIndentedString(recoveryNotify)).append("\n");

‎volcengine-java-sdk-cloudmonitor/src/main/java/com/volcengine/cloudmonitor/model/DataForListRulesOutput.java‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.volcengine.cloudmonitor.model.ConvertTagForListRulesOutput;
2424
import com.volcengine.cloudmonitor.model.DimensionConditionsForListRulesOutput;
2525
import com.volcengine.cloudmonitor.model.LevelConditionForListRulesOutput;
26+
import com.volcengine.cloudmonitor.model.NoDataForListRulesOutput;
2627
import com.volcengine.cloudmonitor.model.NotifyTemplateForListRulesOutput;
2728
import com.volcengine.cloudmonitor.model.RecoveryNotifyForListRulesOutput;
2829
import io.swagger.v3.oas.annotations.media.Schema;
@@ -91,12 +92,18 @@ public class DataForListRulesOutput {
9192
@SerializedName("Namespace")
9293
private String namespace = null;
9394

95+
@SerializedName("NoData")
96+
private NoDataForListRulesOutput noData = null;
97+
9498
@SerializedName("NotificationId")
9599
private String notificationId = null;
96100

97101
@SerializedName("NotifyTemplates")
98102
private List<NotifyTemplateForListRulesOutput> notifyTemplates = null;
99103

104+
@SerializedName("ObjectGroupId")
105+
private String objectGroupId = null;
106+
100107
@SerializedName("OriginalDimensions")
101108
private Map<String, List<String>> originalDimensions = null;
102109

@@ -477,6 +484,25 @@ public void setNamespace(String namespace) {
477484
this.namespace = namespace;
478485
}
479486

487+
public DataForListRulesOutput noData(NoDataForListRulesOutput noData) {
488+
this.noData = noData;
489+
return this;
490+
}
491+
492+
/**
493+
* Get noData
494+
* @return noData
495+
**/
496+
@Valid
497+
@Schema(description = "")
498+
public NoDataForListRulesOutput getNoData() {
499+
return noData;
500+
}
501+
502+
public void setNoData(NoDataForListRulesOutput noData) {
503+
this.noData = noData;
504+
}
505+
480506
public DataForListRulesOutput notificationId(String notificationId) {
481507
this.notificationId = notificationId;
482508
return this;
@@ -522,6 +548,24 @@ public void setNotifyTemplates(List<NotifyTemplateForListRulesOutput> notifyTemp
522548
this.notifyTemplates = notifyTemplates;
523549
}
524550

551+
public DataForListRulesOutput objectGroupId(String objectGroupId) {
552+
this.objectGroupId = objectGroupId;
553+
return this;
554+
}
555+
556+
/**
557+
* Get objectGroupId
558+
* @return objectGroupId
559+
**/
560+
@Schema(description = "")
561+
public String getObjectGroupId() {
562+
return objectGroupId;
563+
}
564+
565+
public void setObjectGroupId(String objectGroupId) {
566+
this.objectGroupId = objectGroupId;
567+
}
568+
525569
public DataForListRulesOutput originalDimensions(Map<String, List<String>> originalDimensions) {
526570
this.originalDimensions = originalDimensions;
527571
return this;
@@ -818,8 +862,10 @@ public boolean equals(java.lang.Object o) {
818862
Objects.equals(this.levelConditions, dataForListRulesOutput.levelConditions) &&
819863
Objects.equals(this.multipleConditions, dataForListRulesOutput.multipleConditions) &&
820864
Objects.equals(this.namespace, dataForListRulesOutput.namespace) &&
865+
Objects.equals(this.noData, dataForListRulesOutput.noData) &&
821866
Objects.equals(this.notificationId, dataForListRulesOutput.notificationId) &&
822867
Objects.equals(this.notifyTemplates, dataForListRulesOutput.notifyTemplates) &&
868+
Objects.equals(this.objectGroupId, dataForListRulesOutput.objectGroupId) &&
823869
Objects.equals(this.originalDimensions, dataForListRulesOutput.originalDimensions) &&
824870
Objects.equals(this.projectName, dataForListRulesOutput.projectName) &&
825871
Objects.equals(this.recoveryNotify, dataForListRulesOutput.recoveryNotify) &&
@@ -837,7 +883,7 @@ public boolean equals(java.lang.Object o) {
837883

838884
@Override
839885
public int hashCode() {
840-
return Objects.hash(alertMethods, alertState, conditionOperator, conditions, contactGroupIds, createdAt, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, id, level, levelConditions, multipleConditions, namespace, notificationId, notifyTemplates, originalDimensions, projectName, recoveryNotify, regions, resourceType, ruleName, ruleType, silenceTime, subNamespace, tags, updatedAt, webHook, webhookIds);
886+
return Objects.hash(alertMethods, alertState, conditionOperator, conditions, contactGroupIds, createdAt, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, id, level, levelConditions, multipleConditions, namespace, noData, notificationId, notifyTemplates, objectGroupId, originalDimensions, projectName, recoveryNotify, regions, resourceType, ruleName, ruleType, silenceTime, subNamespace, tags, updatedAt, webHook, webhookIds);
841887
}
842888

843889

@@ -863,8 +909,10 @@ public String toString() {
863909
sb.append(" levelConditions: ").append(toIndentedString(levelConditions)).append("\n");
864910
sb.append(" multipleConditions: ").append(toIndentedString(multipleConditions)).append("\n");
865911
sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n");
912+
sb.append(" noData: ").append(toIndentedString(noData)).append("\n");
866913
sb.append(" notificationId: ").append(toIndentedString(notificationId)).append("\n");
867914
sb.append(" notifyTemplates: ").append(toIndentedString(notifyTemplates)).append("\n");
915+
sb.append(" objectGroupId: ").append(toIndentedString(objectGroupId)).append("\n");
868916
sb.append(" originalDimensions: ").append(toIndentedString(originalDimensions)).append("\n");
869917
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
870918
sb.append(" recoveryNotify: ").append(toIndentedString(recoveryNotify)).append("\n");

0 commit comments

Comments
 (0)