Skip to content

Commit 14cf542

Browse files
author
BitsAdmin
committed
Merge branch 'volc_observe-Java-2018-01-01-online-971-2025_02_17_15_39_36' into 'integration_2025-02-20_759260291074'
feat: [development task] Volc_Observe-971-Java (1027515) See merge request iaasng/volcengine-java-sdk!385
2 parents b66bec7 + 4a651a1 commit 14cf542

File tree

8 files changed

+744
-4
lines changed

8 files changed

+744
-4
lines changed

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

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.gson.stream.JsonWriter;
2222
import com.volcengine.volcobserve.model.ConditionForCreateRuleInput;
2323
import com.volcengine.volcobserve.model.DimensionConditionsForCreateRuleInput;
24+
import com.volcengine.volcobserve.model.LevelConditionForCreateRuleInput;
2425
import com.volcengine.volcobserve.model.NoDataForCreateRuleInput;
2526
import com.volcengine.volcobserve.model.RecoveryNotifyForCreateRuleInput;
2627
import io.swagger.v3.oas.annotations.media.Schema;
@@ -118,6 +119,9 @@ public AlertMethodsEnum read(final JsonReader jsonReader) throws IOException {
118119
@SerializedName("Level")
119120
private String level = null;
120121

122+
@SerializedName("LevelConditions")
123+
private List<LevelConditionForCreateRuleInput> levelConditions = null;
124+
121125
@SerializedName("MultipleConditions")
122126
private Boolean multipleConditions = null;
123127

@@ -127,6 +131,9 @@ public AlertMethodsEnum read(final JsonReader jsonReader) throws IOException {
127131
@SerializedName("NoData")
128132
private NoDataForCreateRuleInput noData = null;
129133

134+
@SerializedName("NotificationId")
135+
private String notificationId = null;
136+
130137
@SerializedName("OriginalDimensions")
131138
private Map<String, List<String>> originalDimensions = null;
132139

@@ -429,6 +436,33 @@ public void setLevel(String level) {
429436
this.level = level;
430437
}
431438

439+
public CreateRuleRequest levelConditions(List<LevelConditionForCreateRuleInput> levelConditions) {
440+
this.levelConditions = levelConditions;
441+
return this;
442+
}
443+
444+
public CreateRuleRequest addLevelConditionsItem(LevelConditionForCreateRuleInput levelConditionsItem) {
445+
if (this.levelConditions == null) {
446+
this.levelConditions = new ArrayList<LevelConditionForCreateRuleInput>();
447+
}
448+
this.levelConditions.add(levelConditionsItem);
449+
return this;
450+
}
451+
452+
/**
453+
* Get levelConditions
454+
* @return levelConditions
455+
**/
456+
@Valid
457+
@Schema(description = "")
458+
public List<LevelConditionForCreateRuleInput> getLevelConditions() {
459+
return levelConditions;
460+
}
461+
462+
public void setLevelConditions(List<LevelConditionForCreateRuleInput> levelConditions) {
463+
this.levelConditions = levelConditions;
464+
}
465+
432466
public CreateRuleRequest multipleConditions(Boolean multipleConditions) {
433467
this.multipleConditions = multipleConditions;
434468
return this;
@@ -485,6 +519,24 @@ public void setNoData(NoDataForCreateRuleInput noData) {
485519
this.noData = noData;
486520
}
487521

522+
public CreateRuleRequest notificationId(String notificationId) {
523+
this.notificationId = notificationId;
524+
return this;
525+
}
526+
527+
/**
528+
* Get notificationId
529+
* @return notificationId
530+
**/
531+
@Schema(description = "")
532+
public String getNotificationId() {
533+
return notificationId;
534+
}
535+
536+
public void setNotificationId(String notificationId) {
537+
this.notificationId = notificationId;
538+
}
539+
488540
public CreateRuleRequest originalDimensions(Map<String, List<String>> originalDimensions) {
489541
this.originalDimensions = originalDimensions;
490542
return this;
@@ -716,9 +768,11 @@ public boolean equals(java.lang.Object o) {
716768
Objects.equals(this.enableState, createRuleRequest.enableState) &&
717769
Objects.equals(this.evaluationCount, createRuleRequest.evaluationCount) &&
718770
Objects.equals(this.level, createRuleRequest.level) &&
771+
Objects.equals(this.levelConditions, createRuleRequest.levelConditions) &&
719772
Objects.equals(this.multipleConditions, createRuleRequest.multipleConditions) &&
720773
Objects.equals(this.namespace, createRuleRequest.namespace) &&
721774
Objects.equals(this.noData, createRuleRequest.noData) &&
775+
Objects.equals(this.notificationId, createRuleRequest.notificationId) &&
722776
Objects.equals(this.originalDimensions, createRuleRequest.originalDimensions) &&
723777
Objects.equals(this.projectName, createRuleRequest.projectName) &&
724778
Objects.equals(this.recoveryNotify, createRuleRequest.recoveryNotify) &&
@@ -733,7 +787,7 @@ public boolean equals(java.lang.Object o) {
733787

734788
@Override
735789
public int hashCode() {
736-
return Objects.hash(alertMethods, conditionOperator, conditions, contactGroupIds, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, level, multipleConditions, namespace, noData, originalDimensions, projectName, recoveryNotify, regions, ruleName, ruleType, silenceTime, subNamespace, webhook, webhookIds);
790+
return Objects.hash(alertMethods, conditionOperator, conditions, contactGroupIds, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, level, levelConditions, multipleConditions, namespace, noData, notificationId, originalDimensions, projectName, recoveryNotify, regions, ruleName, ruleType, silenceTime, subNamespace, webhook, webhookIds);
737791
}
738792

739793

@@ -753,9 +807,11 @@ public String toString() {
753807
sb.append(" enableState: ").append(toIndentedString(enableState)).append("\n");
754808
sb.append(" evaluationCount: ").append(toIndentedString(evaluationCount)).append("\n");
755809
sb.append(" level: ").append(toIndentedString(level)).append("\n");
810+
sb.append(" levelConditions: ").append(toIndentedString(levelConditions)).append("\n");
756811
sb.append(" multipleConditions: ").append(toIndentedString(multipleConditions)).append("\n");
757812
sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n");
758813
sb.append(" noData: ").append(toIndentedString(noData)).append("\n");
814+
sb.append(" notificationId: ").append(toIndentedString(notificationId)).append("\n");
759815
sb.append(" originalDimensions: ").append(toIndentedString(originalDimensions)).append("\n");
760816
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
761817
sb.append(" recoveryNotify: ").append(toIndentedString(recoveryNotify)).append("\n");

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

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.gson.stream.JsonWriter;
2222
import com.volcengine.volcobserve.model.ConditionForListRulesByIdsOutput;
2323
import com.volcengine.volcobserve.model.DimensionConditionsForListRulesByIdsOutput;
24+
import com.volcengine.volcobserve.model.LevelConditionForListRulesByIdsOutput;
2425
import com.volcengine.volcobserve.model.RecoveryNotifyForListRulesByIdsOutput;
2526
import io.swagger.v3.oas.annotations.media.Schema;
2627
import java.io.IOException;
@@ -79,12 +80,18 @@ public class DataForListRulesByIdsOutput {
7980
@SerializedName("Level")
8081
private String level = null;
8182

83+
@SerializedName("LevelConditions")
84+
private List<LevelConditionForListRulesByIdsOutput> levelConditions = null;
85+
8286
@SerializedName("MultipleConditions")
8387
private Boolean multipleConditions = null;
8488

8589
@SerializedName("Namespace")
8690
private String namespace = null;
8791

92+
@SerializedName("NotificationId")
93+
private String notificationId = null;
94+
8895
@SerializedName("OriginalDimensions")
8996
private Map<String, List<String>> originalDimensions = null;
9097

@@ -396,6 +403,33 @@ public void setLevel(String level) {
396403
this.level = level;
397404
}
398405

406+
public DataForListRulesByIdsOutput levelConditions(List<LevelConditionForListRulesByIdsOutput> levelConditions) {
407+
this.levelConditions = levelConditions;
408+
return this;
409+
}
410+
411+
public DataForListRulesByIdsOutput addLevelConditionsItem(LevelConditionForListRulesByIdsOutput levelConditionsItem) {
412+
if (this.levelConditions == null) {
413+
this.levelConditions = new ArrayList<LevelConditionForListRulesByIdsOutput>();
414+
}
415+
this.levelConditions.add(levelConditionsItem);
416+
return this;
417+
}
418+
419+
/**
420+
* Get levelConditions
421+
* @return levelConditions
422+
**/
423+
@Valid
424+
@Schema(description = "")
425+
public List<LevelConditionForListRulesByIdsOutput> getLevelConditions() {
426+
return levelConditions;
427+
}
428+
429+
public void setLevelConditions(List<LevelConditionForListRulesByIdsOutput> levelConditions) {
430+
this.levelConditions = levelConditions;
431+
}
432+
399433
public DataForListRulesByIdsOutput multipleConditions(Boolean multipleConditions) {
400434
this.multipleConditions = multipleConditions;
401435
return this;
@@ -432,6 +466,24 @@ public void setNamespace(String namespace) {
432466
this.namespace = namespace;
433467
}
434468

469+
public DataForListRulesByIdsOutput notificationId(String notificationId) {
470+
this.notificationId = notificationId;
471+
return this;
472+
}
473+
474+
/**
475+
* Get notificationId
476+
* @return notificationId
477+
**/
478+
@Schema(description = "")
479+
public String getNotificationId() {
480+
return notificationId;
481+
}
482+
483+
public void setNotificationId(String notificationId) {
484+
this.notificationId = notificationId;
485+
}
486+
435487
public DataForListRulesByIdsOutput originalDimensions(Map<String, List<String>> originalDimensions) {
436488
this.originalDimensions = originalDimensions;
437489
return this;
@@ -680,8 +732,10 @@ public boolean equals(java.lang.Object o) {
680732
Objects.equals(this.evaluationCount, dataForListRulesByIdsOutput.evaluationCount) &&
681733
Objects.equals(this.id, dataForListRulesByIdsOutput.id) &&
682734
Objects.equals(this.level, dataForListRulesByIdsOutput.level) &&
735+
Objects.equals(this.levelConditions, dataForListRulesByIdsOutput.levelConditions) &&
683736
Objects.equals(this.multipleConditions, dataForListRulesByIdsOutput.multipleConditions) &&
684737
Objects.equals(this.namespace, dataForListRulesByIdsOutput.namespace) &&
738+
Objects.equals(this.notificationId, dataForListRulesByIdsOutput.notificationId) &&
685739
Objects.equals(this.originalDimensions, dataForListRulesByIdsOutput.originalDimensions) &&
686740
Objects.equals(this.projectName, dataForListRulesByIdsOutput.projectName) &&
687741
Objects.equals(this.recoveryNotify, dataForListRulesByIdsOutput.recoveryNotify) &&
@@ -697,7 +751,7 @@ public boolean equals(java.lang.Object o) {
697751

698752
@Override
699753
public int hashCode() {
700-
return Objects.hash(alertMethods, alertState, conditionOperator, conditions, contactGroupIds, createdAt, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, id, level, multipleConditions, namespace, originalDimensions, projectName, recoveryNotify, regions, ruleName, ruleType, silenceTime, subNamespace, updatedAt, webHook, webhookIds);
754+
return Objects.hash(alertMethods, alertState, conditionOperator, conditions, contactGroupIds, createdAt, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, id, level, levelConditions, multipleConditions, namespace, notificationId, originalDimensions, projectName, recoveryNotify, regions, ruleName, ruleType, silenceTime, subNamespace, updatedAt, webHook, webhookIds);
701755
}
702756

703757

@@ -720,8 +774,10 @@ public String toString() {
720774
sb.append(" evaluationCount: ").append(toIndentedString(evaluationCount)).append("\n");
721775
sb.append(" id: ").append(toIndentedString(id)).append("\n");
722776
sb.append(" level: ").append(toIndentedString(level)).append("\n");
777+
sb.append(" levelConditions: ").append(toIndentedString(levelConditions)).append("\n");
723778
sb.append(" multipleConditions: ").append(toIndentedString(multipleConditions)).append("\n");
724779
sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n");
780+
sb.append(" notificationId: ").append(toIndentedString(notificationId)).append("\n");
725781
sb.append(" originalDimensions: ").append(toIndentedString(originalDimensions)).append("\n");
726782
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
727783
sb.append(" recoveryNotify: ").append(toIndentedString(recoveryNotify)).append("\n");

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

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.gson.stream.JsonWriter;
2222
import com.volcengine.volcobserve.model.ConditionForListRulesOutput;
2323
import com.volcengine.volcobserve.model.DimensionConditionsForListRulesOutput;
24+
import com.volcengine.volcobserve.model.LevelConditionForListRulesOutput;
2425
import com.volcengine.volcobserve.model.RecoveryNotifyForListRulesOutput;
2526
import io.swagger.v3.oas.annotations.media.Schema;
2627
import java.io.IOException;
@@ -79,12 +80,18 @@ public class DataForListRulesOutput {
7980
@SerializedName("Level")
8081
private String level = null;
8182

83+
@SerializedName("LevelConditions")
84+
private List<LevelConditionForListRulesOutput> levelConditions = null;
85+
8286
@SerializedName("MultipleConditions")
8387
private Boolean multipleConditions = null;
8488

8589
@SerializedName("Namespace")
8690
private String namespace = null;
8791

92+
@SerializedName("NotificationId")
93+
private String notificationId = null;
94+
8895
@SerializedName("OriginalDimensions")
8996
private Map<String, List<String>> originalDimensions = null;
9097

@@ -396,6 +403,33 @@ public void setLevel(String level) {
396403
this.level = level;
397404
}
398405

406+
public DataForListRulesOutput levelConditions(List<LevelConditionForListRulesOutput> levelConditions) {
407+
this.levelConditions = levelConditions;
408+
return this;
409+
}
410+
411+
public DataForListRulesOutput addLevelConditionsItem(LevelConditionForListRulesOutput levelConditionsItem) {
412+
if (this.levelConditions == null) {
413+
this.levelConditions = new ArrayList<LevelConditionForListRulesOutput>();
414+
}
415+
this.levelConditions.add(levelConditionsItem);
416+
return this;
417+
}
418+
419+
/**
420+
* Get levelConditions
421+
* @return levelConditions
422+
**/
423+
@Valid
424+
@Schema(description = "")
425+
public List<LevelConditionForListRulesOutput> getLevelConditions() {
426+
return levelConditions;
427+
}
428+
429+
public void setLevelConditions(List<LevelConditionForListRulesOutput> levelConditions) {
430+
this.levelConditions = levelConditions;
431+
}
432+
399433
public DataForListRulesOutput multipleConditions(Boolean multipleConditions) {
400434
this.multipleConditions = multipleConditions;
401435
return this;
@@ -432,6 +466,24 @@ public void setNamespace(String namespace) {
432466
this.namespace = namespace;
433467
}
434468

469+
public DataForListRulesOutput notificationId(String notificationId) {
470+
this.notificationId = notificationId;
471+
return this;
472+
}
473+
474+
/**
475+
* Get notificationId
476+
* @return notificationId
477+
**/
478+
@Schema(description = "")
479+
public String getNotificationId() {
480+
return notificationId;
481+
}
482+
483+
public void setNotificationId(String notificationId) {
484+
this.notificationId = notificationId;
485+
}
486+
435487
public DataForListRulesOutput originalDimensions(Map<String, List<String>> originalDimensions) {
436488
this.originalDimensions = originalDimensions;
437489
return this;
@@ -680,8 +732,10 @@ public boolean equals(java.lang.Object o) {
680732
Objects.equals(this.evaluationCount, dataForListRulesOutput.evaluationCount) &&
681733
Objects.equals(this.id, dataForListRulesOutput.id) &&
682734
Objects.equals(this.level, dataForListRulesOutput.level) &&
735+
Objects.equals(this.levelConditions, dataForListRulesOutput.levelConditions) &&
683736
Objects.equals(this.multipleConditions, dataForListRulesOutput.multipleConditions) &&
684737
Objects.equals(this.namespace, dataForListRulesOutput.namespace) &&
738+
Objects.equals(this.notificationId, dataForListRulesOutput.notificationId) &&
685739
Objects.equals(this.originalDimensions, dataForListRulesOutput.originalDimensions) &&
686740
Objects.equals(this.projectName, dataForListRulesOutput.projectName) &&
687741
Objects.equals(this.recoveryNotify, dataForListRulesOutput.recoveryNotify) &&
@@ -697,7 +751,7 @@ public boolean equals(java.lang.Object o) {
697751

698752
@Override
699753
public int hashCode() {
700-
return Objects.hash(alertMethods, alertState, conditionOperator, conditions, contactGroupIds, createdAt, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, id, level, multipleConditions, namespace, originalDimensions, projectName, recoveryNotify, regions, ruleName, ruleType, silenceTime, subNamespace, updatedAt, webHook, webhookIds);
754+
return Objects.hash(alertMethods, alertState, conditionOperator, conditions, contactGroupIds, createdAt, description, dimensionConditions, effectEndAt, effectStartAt, enableState, evaluationCount, id, level, levelConditions, multipleConditions, namespace, notificationId, originalDimensions, projectName, recoveryNotify, regions, ruleName, ruleType, silenceTime, subNamespace, updatedAt, webHook, webhookIds);
701755
}
702756

703757

@@ -720,8 +774,10 @@ public String toString() {
720774
sb.append(" evaluationCount: ").append(toIndentedString(evaluationCount)).append("\n");
721775
sb.append(" id: ").append(toIndentedString(id)).append("\n");
722776
sb.append(" level: ").append(toIndentedString(level)).append("\n");
777+
sb.append(" levelConditions: ").append(toIndentedString(levelConditions)).append("\n");
723778
sb.append(" multipleConditions: ").append(toIndentedString(multipleConditions)).append("\n");
724779
sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n");
780+
sb.append(" notificationId: ").append(toIndentedString(notificationId)).append("\n");
725781
sb.append(" originalDimensions: ").append(toIndentedString(originalDimensions)).append("\n");
726782
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
727783
sb.append(" recoveryNotify: ").append(toIndentedString(recoveryNotify)).append("\n");

0 commit comments

Comments
 (0)