From b44d845918c32c2a4f7c74d681e610c3c3a78c05 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Wed, 21 Jul 2021 03:55:11 +0000 Subject: [PATCH] Fix the return SDK of describealertloglist API. --- CHANGELOG | 3 +++ VERSION | 2 +- .../cms/model/DescribeAlertLogListResult.h | 11 +++++++++- ...scribeAlertingMetricRuleResourcesRequest.h | 3 +++ .../model/DescribeDynamicTagRuleListRequest.h | 6 +++++ ...escribeMetricRuleTemplateAttributeResult.h | 3 +++ .../cms/model/DescribeMonitorGroupsRequest.h | 6 +++++ .../DescribeSiteMonitorAttributeResult.h | 5 +++++ cms/src/model/DescribeAlertLogListResult.cc | 21 +++++++++++++++--- ...cribeAlertingMetricRuleResourcesRequest.cc | 11 ++++++++++ .../DescribeDynamicTagRuleListRequest.cc | 22 +++++++++++++++++++ ...scribeMetricRuleTemplateAttributeResult.cc | 6 +++++ cms/src/model/DescribeMonitorGroupsRequest.cc | 22 +++++++++++++++++++ .../DescribeSiteMonitorAttributeResult.cc | 10 +++++++++ 14 files changed, 126 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d7119e507..a4cf4ca60 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2021-07-21 Version: 1.36.822 +- Fix the return SDK of describealertloglist API. + 2021-07-21 Version: 1.36.821 - Support HealthCheckMethod for HTTP and HTTPS listener. diff --git a/VERSION b/VERSION index d363d42bf..76e43f6a8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.821 \ No newline at end of file +1.36.822 \ No newline at end of file diff --git a/cms/include/alibabacloud/cms/model/DescribeAlertLogListResult.h b/cms/include/alibabacloud/cms/model/DescribeAlertLogListResult.h index 5359e6e1b..44fb6eb93 100644 --- a/cms/include/alibabacloud/cms/model/DescribeAlertLogListResult.h +++ b/cms/include/alibabacloud/cms/model/DescribeAlertLogListResult.h @@ -50,6 +50,12 @@ namespace AlibabaCloud std::string value; std::string key; }; + struct WebhookListItem + { + std::string message; + std::string code; + std::string url; + }; std::string groupName; std::vector contactALIIWWList; std::string message; @@ -63,8 +69,10 @@ namespace AlibabaCloud std::vector contactGroups; std::vector dingdingWebhookList; std::string instanceId; + std::string blackListName; std::vector dimensions; std::string levelChange; + std::string blackListUUID; std::vector contactOnCallList; std::string _namespace; std::vector contactDingList; @@ -73,7 +81,8 @@ namespace AlibabaCloud std::string alertTime; std::string groupId; std::string instanceName; - std::vector webhookList; + std::vector webhookList; + std::string blackListDetail; std::vector contactMailList; std::string level; }; diff --git a/cms/include/alibabacloud/cms/model/DescribeAlertingMetricRuleResourcesRequest.h b/cms/include/alibabacloud/cms/model/DescribeAlertingMetricRuleResourcesRequest.h index 1324e11a3..dd4768780 100644 --- a/cms/include/alibabacloud/cms/model/DescribeAlertingMetricRuleResourcesRequest.h +++ b/cms/include/alibabacloud/cms/model/DescribeAlertingMetricRuleResourcesRequest.h @@ -45,6 +45,8 @@ namespace AlibabaCloud void setPage(int page); std::string getRuleId()const; void setRuleId(const std::string& ruleId); + std::string getDimensions()const; + void setDimensions(const std::string& dimensions); private: std::string groupId_; @@ -52,6 +54,7 @@ namespace AlibabaCloud std::string _namespace_; int page_; std::string ruleId_; + std::string dimensions_; }; } diff --git a/cms/include/alibabacloud/cms/model/DescribeDynamicTagRuleListRequest.h b/cms/include/alibabacloud/cms/model/DescribeDynamicTagRuleListRequest.h index d0cf62e3b..1f1ba49fb 100644 --- a/cms/include/alibabacloud/cms/model/DescribeDynamicTagRuleListRequest.h +++ b/cms/include/alibabacloud/cms/model/DescribeDynamicTagRuleListRequest.h @@ -35,17 +35,23 @@ namespace AlibabaCloud DescribeDynamicTagRuleListRequest(); ~DescribeDynamicTagRuleListRequest(); + std::string getTagValue()const; + void setTagValue(const std::string& tagValue); std::string getPageNumber()const; void setPageNumber(const std::string& pageNumber); std::string getPageSize()const; void setPageSize(const std::string& pageSize); std::string getTagKey()const; void setTagKey(const std::string& tagKey); + std::string getTagRegionId()const; + void setTagRegionId(const std::string& tagRegionId); private: + std::string tagValue_; std::string pageNumber_; std::string pageSize_; std::string tagKey_; + std::string tagRegionId_; }; } diff --git a/cms/include/alibabacloud/cms/model/DescribeMetricRuleTemplateAttributeResult.h b/cms/include/alibabacloud/cms/model/DescribeMetricRuleTemplateAttributeResult.h index 2c7ac8502..6354a6075 100644 --- a/cms/include/alibabacloud/cms/model/DescribeMetricRuleTemplateAttributeResult.h +++ b/cms/include/alibabacloud/cms/model/DescribeMetricRuleTemplateAttributeResult.h @@ -72,9 +72,12 @@ namespace AlibabaCloud std::string selector; }; std::vector alertTemplates; + std::string hostAvailabilityTemplates; std::string description; + std::string systemEventTemplates; std::string restVersion; std::string templateId; + std::string processMonitorTemplates; std::string name; }; diff --git a/cms/include/alibabacloud/cms/model/DescribeMonitorGroupsRequest.h b/cms/include/alibabacloud/cms/model/DescribeMonitorGroupsRequest.h index 1ef4f805b..f56dbdf99 100644 --- a/cms/include/alibabacloud/cms/model/DescribeMonitorGroupsRequest.h +++ b/cms/include/alibabacloud/cms/model/DescribeMonitorGroupsRequest.h @@ -53,10 +53,14 @@ namespace AlibabaCloud void setPageNumber(int pageNumber); std::string getResourceGroupId()const; void setResourceGroupId(const std::string& resourceGroupId); + std::string getGroupFounderTagKey()const; + void setGroupFounderTagKey(const std::string& groupFounderTagKey); int getPageSize()const; void setPageSize(int pageSize); std::vector getTag()const; void setTag(const std::vector& tag); + std::string getGroupFounderTagValue()const; + void setGroupFounderTagValue(const std::string& groupFounderTagValue); std::string getKeyword()const; void setKeyword(const std::string& keyword); std::string getGroupId()const; @@ -75,8 +79,10 @@ namespace AlibabaCloud std::string type_; int pageNumber_; std::string resourceGroupId_; + std::string groupFounderTagKey_; int pageSize_; std::vector tag_; + std::string groupFounderTagValue_; std::string keyword_; std::string groupId_; std::string groupName_; diff --git a/cms/include/alibabacloud/cms/model/DescribeSiteMonitorAttributeResult.h b/cms/include/alibabacloud/cms/model/DescribeSiteMonitorAttributeResult.h index ce836a62e..d81be19f3 100644 --- a/cms/include/alibabacloud/cms/model/DescribeSiteMonitorAttributeResult.h +++ b/cms/include/alibabacloud/cms/model/DescribeSiteMonitorAttributeResult.h @@ -38,14 +38,19 @@ namespace AlibabaCloud { std::string cookie; int ping_num; + std::string ipv6_task; + bool proxy_protocol; + bool unfollow_redirect; long traceroute; float failure_rate; int port; int match_rule; + std::string acceptable_response_code; std::string response_format; std::string expect_value; std::string http_method; long time_out; + bool cert_verify; std::string header; std::string response_content; std::string username; diff --git a/cms/src/model/DescribeAlertLogListResult.cc b/cms/src/model/DescribeAlertLogListResult.cc index f1729312d..264e7e0dc 100644 --- a/cms/src/model/DescribeAlertLogListResult.cc +++ b/cms/src/model/DescribeAlertLogListResult.cc @@ -73,6 +73,12 @@ void DescribeAlertLogListResult::parse(const std::string &payload) alertLogListObject.alertTime = valueAlertLogListAlarm["AlertTime"].asString(); if(!valueAlertLogListAlarm["Message"].isNull()) alertLogListObject.message = valueAlertLogListAlarm["Message"].asString(); + if(!valueAlertLogListAlarm["BlackListUUID"].isNull()) + alertLogListObject.blackListUUID = valueAlertLogListAlarm["BlackListUUID"].asString(); + if(!valueAlertLogListAlarm["BlackListName"].isNull()) + alertLogListObject.blackListName = valueAlertLogListAlarm["BlackListName"].asString(); + if(!valueAlertLogListAlarm["BlackListDetail"].isNull()) + alertLogListObject.blackListDetail = valueAlertLogListAlarm["BlackListDetail"].asString(); auto allExtendedInfoNode = valueAlertLogListAlarm["ExtendedInfo"]["ExtInfo"]; for (auto valueAlertLogListAlarmExtendedInfoExtInfo : allExtendedInfoNode) { @@ -93,6 +99,18 @@ void DescribeAlertLogListResult::parse(const std::string &payload) dimensionsObject.value = valueAlertLogListAlarmDimensionsDimensionsItem["Value"].asString(); alertLogListObject.dimensions.push_back(dimensionsObject); } + auto allWebhookListNode = valueAlertLogListAlarm["WebhookList"]["WebhookListItem"]; + for (auto valueAlertLogListAlarmWebhookListWebhookListItem : allWebhookListNode) + { + Alarm::WebhookListItem webhookListObject; + if(!valueAlertLogListAlarmWebhookListWebhookListItem["url"].isNull()) + webhookListObject.url = valueAlertLogListAlarmWebhookListWebhookListItem["url"].asString(); + if(!valueAlertLogListAlarmWebhookListWebhookListItem["code"].isNull()) + webhookListObject.code = valueAlertLogListAlarmWebhookListWebhookListItem["code"].asString(); + if(!valueAlertLogListAlarmWebhookListWebhookListItem["message"].isNull()) + webhookListObject.message = valueAlertLogListAlarmWebhookListWebhookListItem["message"].asString(); + alertLogListObject.webhookList.push_back(webhookListObject); + } auto escalationNode = value["Escalation"]; if(!escalationNode["Times"].isNull()) alertLogListObject.escalation.times = std::stoi(escalationNode["Times"].asString()); @@ -103,9 +121,6 @@ void DescribeAlertLogListResult::parse(const std::string &payload) auto allContactGroups = value["ContactGroups"]["ContactGroup"]; for (auto value : allContactGroups) alertLogListObject.contactGroups.push_back(value.asString()); - auto allWebhookList = value["WebhookList"]["WebhookList"]; - for (auto value : allWebhookList) - alertLogListObject.webhookList.push_back(value.asString()); auto allContactALIIWWList = value["ContactALIIWWList"]["ContactALIIMs"]; for (auto value : allContactALIIWWList) alertLogListObject.contactALIIWWList.push_back(value.asString()); diff --git a/cms/src/model/DescribeAlertingMetricRuleResourcesRequest.cc b/cms/src/model/DescribeAlertingMetricRuleResourcesRequest.cc index ce13cbb68..ef4b7d9f8 100644 --- a/cms/src/model/DescribeAlertingMetricRuleResourcesRequest.cc +++ b/cms/src/model/DescribeAlertingMetricRuleResourcesRequest.cc @@ -82,3 +82,14 @@ void DescribeAlertingMetricRuleResourcesRequest::setRuleId(const std::string& ru setParameter("RuleId", ruleId); } +std::string DescribeAlertingMetricRuleResourcesRequest::getDimensions()const +{ + return dimensions_; +} + +void DescribeAlertingMetricRuleResourcesRequest::setDimensions(const std::string& dimensions) +{ + dimensions_ = dimensions; + setParameter("Dimensions", dimensions); +} + diff --git a/cms/src/model/DescribeDynamicTagRuleListRequest.cc b/cms/src/model/DescribeDynamicTagRuleListRequest.cc index fb47b0b2f..8a1e36143 100644 --- a/cms/src/model/DescribeDynamicTagRuleListRequest.cc +++ b/cms/src/model/DescribeDynamicTagRuleListRequest.cc @@ -27,6 +27,17 @@ DescribeDynamicTagRuleListRequest::DescribeDynamicTagRuleListRequest() : DescribeDynamicTagRuleListRequest::~DescribeDynamicTagRuleListRequest() {} +std::string DescribeDynamicTagRuleListRequest::getTagValue()const +{ + return tagValue_; +} + +void DescribeDynamicTagRuleListRequest::setTagValue(const std::string& tagValue) +{ + tagValue_ = tagValue; + setParameter("TagValue", tagValue); +} + std::string DescribeDynamicTagRuleListRequest::getPageNumber()const { return pageNumber_; @@ -60,3 +71,14 @@ void DescribeDynamicTagRuleListRequest::setTagKey(const std::string& tagKey) setParameter("TagKey", tagKey); } +std::string DescribeDynamicTagRuleListRequest::getTagRegionId()const +{ + return tagRegionId_; +} + +void DescribeDynamicTagRuleListRequest::setTagRegionId(const std::string& tagRegionId) +{ + tagRegionId_ = tagRegionId; + setParameter("TagRegionId", tagRegionId); +} + diff --git a/cms/src/model/DescribeMetricRuleTemplateAttributeResult.cc b/cms/src/model/DescribeMetricRuleTemplateAttributeResult.cc index 7578ffd74..769b715d3 100644 --- a/cms/src/model/DescribeMetricRuleTemplateAttributeResult.cc +++ b/cms/src/model/DescribeMetricRuleTemplateAttributeResult.cc @@ -48,6 +48,12 @@ void DescribeMetricRuleTemplateAttributeResult::parse(const std::string &payload resource_.restVersion = resourceNode["RestVersion"].asString(); if(!resourceNode["Description"].isNull()) resource_.description = resourceNode["Description"].asString(); + if(!resourceNode["SystemEventTemplates"].isNull()) + resource_.systemEventTemplates = resourceNode["SystemEventTemplates"].asString(); + if(!resourceNode["ProcessMonitorTemplates"].isNull()) + resource_.processMonitorTemplates = resourceNode["ProcessMonitorTemplates"].asString(); + if(!resourceNode["HostAvailabilityTemplates"].isNull()) + resource_.hostAvailabilityTemplates = resourceNode["HostAvailabilityTemplates"].asString(); auto allAlertTemplatesNode = resourceNode["AlertTemplates"]["AlertTemplate"]; for (auto resourceNodeAlertTemplatesAlertTemplate : allAlertTemplatesNode) { diff --git a/cms/src/model/DescribeMonitorGroupsRequest.cc b/cms/src/model/DescribeMonitorGroupsRequest.cc index c22b6e8b5..b94c1dd3b 100644 --- a/cms/src/model/DescribeMonitorGroupsRequest.cc +++ b/cms/src/model/DescribeMonitorGroupsRequest.cc @@ -93,6 +93,17 @@ void DescribeMonitorGroupsRequest::setResourceGroupId(const std::string& resourc setParameter("ResourceGroupId", resourceGroupId); } +std::string DescribeMonitorGroupsRequest::getGroupFounderTagKey()const +{ + return groupFounderTagKey_; +} + +void DescribeMonitorGroupsRequest::setGroupFounderTagKey(const std::string& groupFounderTagKey) +{ + groupFounderTagKey_ = groupFounderTagKey; + setParameter("GroupFounderTagKey", groupFounderTagKey); +} + int DescribeMonitorGroupsRequest::getPageSize()const { return pageSize_; @@ -120,6 +131,17 @@ void DescribeMonitorGroupsRequest::setTag(const std::vector& tag) } } +std::string DescribeMonitorGroupsRequest::getGroupFounderTagValue()const +{ + return groupFounderTagValue_; +} + +void DescribeMonitorGroupsRequest::setGroupFounderTagValue(const std::string& groupFounderTagValue) +{ + groupFounderTagValue_ = groupFounderTagValue; + setParameter("GroupFounderTagValue", groupFounderTagValue); +} + std::string DescribeMonitorGroupsRequest::getKeyword()const { return keyword_; diff --git a/cms/src/model/DescribeSiteMonitorAttributeResult.cc b/cms/src/model/DescribeSiteMonitorAttributeResult.cc index ac28444a1..ae1145758 100644 --- a/cms/src/model/DescribeSiteMonitorAttributeResult.cc +++ b/cms/src/model/DescribeSiteMonitorAttributeResult.cc @@ -145,6 +145,16 @@ void DescribeSiteMonitorAttributeResult::parse(const std::string &payload) siteMonitors_.optionJson.authentication = std::stoi(optionJsonNode["authentication"].asString()); if(!optionJsonNode["traceroute"].isNull()) siteMonitors_.optionJson.traceroute = std::stol(optionJsonNode["traceroute"].asString()); + if(!optionJsonNode["cert_verify"].isNull()) + siteMonitors_.optionJson.cert_verify = optionJsonNode["cert_verify"].asString() == "true"; + if(!optionJsonNode["unfollow_redirect"].isNull()) + siteMonitors_.optionJson.unfollow_redirect = optionJsonNode["unfollow_redirect"].asString() == "true"; + if(!optionJsonNode["proxy_protocol"].isNull()) + siteMonitors_.optionJson.proxy_protocol = optionJsonNode["proxy_protocol"].asString() == "true"; + if(!optionJsonNode["acceptable_response_code"].isNull()) + siteMonitors_.optionJson.acceptable_response_code = optionJsonNode["acceptable_response_code"].asString(); + if(!optionJsonNode["ipv6_task"].isNull()) + siteMonitors_.optionJson.ipv6_task = optionJsonNode["ipv6_task"].asString(); if(!value["Code"].isNull()) code_ = value["Code"].asString(); if(!value["Message"].isNull())