diff --git a/VERSION b/VERSION index 403a31f9a..993984b62 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1973 \ No newline at end of file +1.36.1974 \ No newline at end of file diff --git a/arms/include/alibabacloud/arms/model/CreateOrUpdateSilencePolicyRequest.h b/arms/include/alibabacloud/arms/model/CreateOrUpdateSilencePolicyRequest.h index 6f2be8cba..08291bdae 100644 --- a/arms/include/alibabacloud/arms/model/CreateOrUpdateSilencePolicyRequest.h +++ b/arms/include/alibabacloud/arms/model/CreateOrUpdateSilencePolicyRequest.h @@ -34,8 +34,12 @@ public: void setProxyUserId(const std::string &proxyUserId); std::string getMatchingRules() const; void setMatchingRules(const std::string &matchingRules); + std::string getTimeSlots() const; + void setTimeSlots(const std::string &timeSlots); std::string getAreaCodes() const; void setAreaCodes(const std::string &areaCodes); + std::string getEffectiveTimeType() const; + void setEffectiveTimeType(const std::string &effectiveTimeType); std::string getRegionId() const; void setRegionId(const std::string ®ionId); std::string getName() const; @@ -44,15 +48,20 @@ public: void setId(long id); std::string getState() const; void setState(const std::string &state); + std::string getTimePeriod() const; + void setTimePeriod(const std::string &timePeriod); private: std::string proxyUserId_; std::string matchingRules_; + std::string timeSlots_; std::string areaCodes_; + std::string effectiveTimeType_; std::string regionId_; std::string name_; long id_; std::string state_; + std::string timePeriod_; }; } // namespace Model } // namespace ARMS diff --git a/arms/include/alibabacloud/arms/model/CreateOrUpdateSilencePolicyResult.h b/arms/include/alibabacloud/arms/model/CreateOrUpdateSilencePolicyResult.h index cee7eac1d..f74fc334f 100644 --- a/arms/include/alibabacloud/arms/model/CreateOrUpdateSilencePolicyResult.h +++ b/arms/include/alibabacloud/arms/model/CreateOrUpdateSilencePolicyResult.h @@ -44,9 +44,12 @@ namespace AlibabaCloud }; std::vector matchingConditions; }; + std::string effectiveTimeType; std::string state; + std::string timePeriod; std::vector matchingRules; long id; + std::string timeSlots; std::string name; }; diff --git a/arms/include/alibabacloud/arms/model/GetPrometheusInstanceResult.h b/arms/include/alibabacloud/arms/model/GetPrometheusInstanceResult.h index ea8c76137..af047b407 100644 --- a/arms/include/alibabacloud/arms/model/GetPrometheusInstanceResult.h +++ b/arms/include/alibabacloud/arms/model/GetPrometheusInstanceResult.h @@ -40,13 +40,13 @@ namespace AlibabaCloud std::string tagValue; }; int archiveDuration; + std::vector supportAuthTypes; std::string resourceGroupId; std::string remoteReadIntraUrl; std::string product; std::string remoteWriteIntraUrl; std::string subClustersJson; std::string httpApiInterUrl; - std::vector surpportAuthTypes; std::string remoteReadInterUrl; std::string pushGatewayInterUrl; std::string clusterName; diff --git a/arms/include/alibabacloud/arms/model/ListSilencePoliciesResult.h b/arms/include/alibabacloud/arms/model/ListSilencePoliciesResult.h index 3758324e5..9c44651fc 100644 --- a/arms/include/alibabacloud/arms/model/ListSilencePoliciesResult.h +++ b/arms/include/alibabacloud/arms/model/ListSilencePoliciesResult.h @@ -46,9 +46,12 @@ namespace AlibabaCloud }; std::vector matchingConditions; }; + std::string effectiveTimeType; std::string state; + std::string timePeriod; std::vector matchingRules; long id; + std::string timeSlots; std::string name; }; long size; diff --git a/arms/src/model/CreateOrUpdateSilencePolicyRequest.cc b/arms/src/model/CreateOrUpdateSilencePolicyRequest.cc index 9c9960bcf..85eb9d7bf 100644 --- a/arms/src/model/CreateOrUpdateSilencePolicyRequest.cc +++ b/arms/src/model/CreateOrUpdateSilencePolicyRequest.cc @@ -43,6 +43,15 @@ void CreateOrUpdateSilencePolicyRequest::setMatchingRules(const std::string &mat setBodyParameter(std::string("MatchingRules"), matchingRules); } +std::string CreateOrUpdateSilencePolicyRequest::getTimeSlots() const { + return timeSlots_; +} + +void CreateOrUpdateSilencePolicyRequest::setTimeSlots(const std::string &timeSlots) { + timeSlots_ = timeSlots; + setParameter(std::string("TimeSlots"), timeSlots); +} + std::string CreateOrUpdateSilencePolicyRequest::getAreaCodes() const { return areaCodes_; } @@ -52,6 +61,15 @@ void CreateOrUpdateSilencePolicyRequest::setAreaCodes(const std::string &areaCod setBodyParameter(std::string("AreaCodes"), areaCodes); } +std::string CreateOrUpdateSilencePolicyRequest::getEffectiveTimeType() const { + return effectiveTimeType_; +} + +void CreateOrUpdateSilencePolicyRequest::setEffectiveTimeType(const std::string &effectiveTimeType) { + effectiveTimeType_ = effectiveTimeType; + setParameter(std::string("EffectiveTimeType"), effectiveTimeType); +} + std::string CreateOrUpdateSilencePolicyRequest::getRegionId() const { return regionId_; } @@ -88,3 +106,12 @@ void CreateOrUpdateSilencePolicyRequest::setState(const std::string &state) { setBodyParameter(std::string("State"), state); } +std::string CreateOrUpdateSilencePolicyRequest::getTimePeriod() const { + return timePeriod_; +} + +void CreateOrUpdateSilencePolicyRequest::setTimePeriod(const std::string &timePeriod) { + timePeriod_ = timePeriod; + setParameter(std::string("TimePeriod"), timePeriod); +} + diff --git a/arms/src/model/CreateOrUpdateSilencePolicyResult.cc b/arms/src/model/CreateOrUpdateSilencePolicyResult.cc index 2d7dc7b1d..a9b133b94 100644 --- a/arms/src/model/CreateOrUpdateSilencePolicyResult.cc +++ b/arms/src/model/CreateOrUpdateSilencePolicyResult.cc @@ -46,6 +46,12 @@ void CreateOrUpdateSilencePolicyResult::parse(const std::string &payload) silencePolicy_.name = silencePolicyNode["Name"].asString(); if(!silencePolicyNode["State"].isNull()) silencePolicy_.state = silencePolicyNode["State"].asString(); + if(!silencePolicyNode["EffectiveTimeType"].isNull()) + silencePolicy_.effectiveTimeType = silencePolicyNode["EffectiveTimeType"].asString(); + if(!silencePolicyNode["TimePeriod"].isNull()) + silencePolicy_.timePeriod = silencePolicyNode["TimePeriod"].asString(); + if(!silencePolicyNode["TimeSlots"].isNull()) + silencePolicy_.timeSlots = silencePolicyNode["TimeSlots"].asString(); auto allMatchingRulesNode = silencePolicyNode["MatchingRules"]["matchingRulesItem"]; for (auto silencePolicyNodeMatchingRulesmatchingRulesItem : allMatchingRulesNode) { diff --git a/arms/src/model/GetPrometheusInstanceResult.cc b/arms/src/model/GetPrometheusInstanceResult.cc index 1940c5eaa..13f4732f4 100644 --- a/arms/src/model/GetPrometheusInstanceResult.cc +++ b/arms/src/model/GetPrometheusInstanceResult.cc @@ -106,9 +106,9 @@ void GetPrometheusInstanceResult::parse(const std::string &payload) tagsItemObject.tagValue = dataNodeTagstagsItem["TagValue"].asString(); data_.tags.push_back(tagsItemObject); } - auto allSurpportAuthTypes = dataNode["SurpportAuthTypes"]["SurpportAuthType"]; - for (auto value : allSurpportAuthTypes) - data_.surpportAuthTypes.push_back(value.asString()); + auto allSupportAuthTypes = dataNode["SupportAuthTypes"]["SupportAuthType"]; + for (auto value : allSupportAuthTypes) + data_.supportAuthTypes.push_back(value.asString()); if(!value["Message"].isNull()) message_ = value["Message"].asString(); if(!value["Code"].isNull()) diff --git a/arms/src/model/ListSilencePoliciesResult.cc b/arms/src/model/ListSilencePoliciesResult.cc index 3136d5e2a..5102a2e8a 100644 --- a/arms/src/model/ListSilencePoliciesResult.cc +++ b/arms/src/model/ListSilencePoliciesResult.cc @@ -56,6 +56,12 @@ void ListSilencePoliciesResult::parse(const std::string &payload) policiesObject.name = pageBeanNodeSilencePoliciespolicies["Name"].asString(); if(!pageBeanNodeSilencePoliciespolicies["State"].isNull()) policiesObject.state = pageBeanNodeSilencePoliciespolicies["State"].asString(); + if(!pageBeanNodeSilencePoliciespolicies["TimeSlots"].isNull()) + policiesObject.timeSlots = pageBeanNodeSilencePoliciespolicies["TimeSlots"].asString(); + if(!pageBeanNodeSilencePoliciespolicies["TimePeriod"].isNull()) + policiesObject.timePeriod = pageBeanNodeSilencePoliciespolicies["TimePeriod"].asString(); + if(!pageBeanNodeSilencePoliciespolicies["EffectiveTimeType"].isNull()) + policiesObject.effectiveTimeType = pageBeanNodeSilencePoliciespolicies["EffectiveTimeType"].asString(); auto allMatchingRulesNode = pageBeanNodeSilencePoliciespolicies["MatchingRules"]["matchingRulesItem"]; for (auto pageBeanNodeSilencePoliciespoliciesMatchingRulesmatchingRulesItem : allMatchingRulesNode) {