diff --git a/CHANGELOG b/CHANGELOG index 690f42acc..eb6c2b65d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-07-31 Version: 1.36.547 +- Edit GetStack api. + 2020-07-30 Version: 1.36.546 - Add Smart Cloudauth API. diff --git a/VERSION b/VERSION index 9bf93c444..624954b19 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.546 \ No newline at end of file +1.36.547 \ No newline at end of file diff --git a/arms/include/alibabacloud/arms/model/DeleteTraceAppRequest.h b/arms/include/alibabacloud/arms/model/DeleteTraceAppRequest.h index 957357e77..14ecf0e2a 100644 --- a/arms/include/alibabacloud/arms/model/DeleteTraceAppRequest.h +++ b/arms/include/alibabacloud/arms/model/DeleteTraceAppRequest.h @@ -39,12 +39,15 @@ namespace AlibabaCloud void setRegionId(const std::string& regionId); std::string getAppId()const; void setAppId(const std::string& appId); + std::string getPid()const; + void setPid(const std::string& pid); std::string getType()const; void setType(const std::string& type); private: std::string regionId_; std::string appId_; + std::string pid_; std::string type_; }; diff --git a/arms/include/alibabacloud/arms/model/GetStackRequest.h b/arms/include/alibabacloud/arms/model/GetStackRequest.h index 908287194..2bef1633d 100644 --- a/arms/include/alibabacloud/arms/model/GetStackRequest.h +++ b/arms/include/alibabacloud/arms/model/GetStackRequest.h @@ -41,11 +41,14 @@ namespace AlibabaCloud void setRegionId(const std::string& regionId); std::string getRpcID()const; void setRpcID(const std::string& rpcID); + std::string getPid()const; + void setPid(const std::string& pid); private: std::string traceID_; std::string regionId_; std::string rpcID_; + std::string pid_; }; } diff --git a/arms/include/alibabacloud/arms/model/GetStackResult.h b/arms/include/alibabacloud/arms/model/GetStackResult.h index 2b1a6c0ee..b68c25049 100644 --- a/arms/include/alibabacloud/arms/model/GetStackResult.h +++ b/arms/include/alibabacloud/arms/model/GetStackResult.h @@ -34,14 +34,14 @@ namespace AlibabaCloud public: struct StackInfoItem { - struct ExtInfoItem + struct ExtInfo { std::string type; std::string info; }; std::string line; std::string serviceName; - std::vector extInfo; + ExtInfo extInfo; std::string rpcId; long startTime; long duration; diff --git a/arms/include/alibabacloud/arms/model/ImportCustomAlertRulesRequest.h b/arms/include/alibabacloud/arms/model/ImportCustomAlertRulesRequest.h index 3e9167aa3..59ccd9b0f 100644 --- a/arms/include/alibabacloud/arms/model/ImportCustomAlertRulesRequest.h +++ b/arms/include/alibabacloud/arms/model/ImportCustomAlertRulesRequest.h @@ -41,17 +41,17 @@ namespace AlibabaCloud void setRegionId(const std::string& regionId); std::string getContactGroupIds()const; void setContactGroupIds(const std::string& contactGroupIds); + std::string getTemplateAlertConfig()const; + void setTemplateAlertConfig(const std::string& templateAlertConfig); std::string getProxyUserId()const; void setProxyUserId(const std::string& proxyUserId); - std::string getTemplageAlertConfig()const; - void setTemplageAlertConfig(const std::string& templageAlertConfig); private: bool isAutoStart_; std::string regionId_; std::string contactGroupIds_; + std::string templateAlertConfig_; std::string proxyUserId_; - std::string templageAlertConfig_; }; } diff --git a/arms/include/alibabacloud/arms/model/SearchAlertRulesResult.h b/arms/include/alibabacloud/arms/model/SearchAlertRulesResult.h index 2e3745fa6..49302e8d8 100644 --- a/arms/include/alibabacloud/arms/model/SearchAlertRulesResult.h +++ b/arms/include/alibabacloud/arms/model/SearchAlertRulesResult.h @@ -40,6 +40,8 @@ namespace AlibabaCloud { std::string alarmContentTemplate; std::string alarmContentSubTitle; + std::string content; + std::string subTitle; }; struct AlertRule { @@ -80,11 +82,14 @@ namespace AlibabaCloud MetricParam metricParam; int alertVersion; long taskId; + std::string contactGroupIds; std::string config; long createTime; std::vector alertWays; + std::string title; std::string taskStatus; AlarmContext alarmContext; + std::vector alertWay; int alertType; std::string contactGroupIdList; Notice notice; diff --git a/arms/src/model/DeleteTraceAppRequest.cc b/arms/src/model/DeleteTraceAppRequest.cc index 69ce93580..a3ed2687e 100644 --- a/arms/src/model/DeleteTraceAppRequest.cc +++ b/arms/src/model/DeleteTraceAppRequest.cc @@ -49,6 +49,17 @@ void DeleteTraceAppRequest::setAppId(const std::string& appId) setParameter("AppId", appId); } +std::string DeleteTraceAppRequest::getPid()const +{ + return pid_; +} + +void DeleteTraceAppRequest::setPid(const std::string& pid) +{ + pid_ = pid; + setParameter("Pid", pid); +} + std::string DeleteTraceAppRequest::getType()const { return type_; diff --git a/arms/src/model/GetStackRequest.cc b/arms/src/model/GetStackRequest.cc index 14a89d7c4..629a71999 100644 --- a/arms/src/model/GetStackRequest.cc +++ b/arms/src/model/GetStackRequest.cc @@ -60,3 +60,14 @@ void GetStackRequest::setRpcID(const std::string& rpcID) setParameter("RpcID", rpcID); } +std::string GetStackRequest::getPid()const +{ + return pid_; +} + +void GetStackRequest::setPid(const std::string& pid) +{ + pid_ = pid; + setParameter("Pid", pid); +} + diff --git a/arms/src/model/GetStackResult.cc b/arms/src/model/GetStackResult.cc index 48f281e28..373ecea63 100644 --- a/arms/src/model/GetStackResult.cc +++ b/arms/src/model/GetStackResult.cc @@ -57,16 +57,11 @@ void GetStackResult::parse(const std::string &payload) stackInfoObject.exception = valueStackInfoStackInfoItem["Exception"].asString(); if(!valueStackInfoStackInfoItem["Line"].isNull()) stackInfoObject.line = valueStackInfoStackInfoItem["Line"].asString(); - auto allExtInfoNode = allStackInfoNode["ExtInfo"]["ExtInfoItem"]; - for (auto allStackInfoNodeExtInfoExtInfoItem : allExtInfoNode) - { - StackInfoItem::ExtInfoItem extInfoObject; - if(!allStackInfoNodeExtInfoExtInfoItem["Type"].isNull()) - extInfoObject.type = allStackInfoNodeExtInfoExtInfoItem["Type"].asString(); - if(!allStackInfoNodeExtInfoExtInfoItem["Info"].isNull()) - extInfoObject.info = allStackInfoNodeExtInfoExtInfoItem["Info"].asString(); - stackInfoObject.extInfo.push_back(extInfoObject); - } + auto extInfoNode = value["ExtInfo"]; + if(!extInfoNode["Type"].isNull()) + stackInfoObject.extInfo.type = extInfoNode["Type"].asString(); + if(!extInfoNode["Info"].isNull()) + stackInfoObject.extInfo.info = extInfoNode["Info"].asString(); stackInfo_.push_back(stackInfoObject); } diff --git a/arms/src/model/ImportCustomAlertRulesRequest.cc b/arms/src/model/ImportCustomAlertRulesRequest.cc index 4ecf50a58..a543501fc 100644 --- a/arms/src/model/ImportCustomAlertRulesRequest.cc +++ b/arms/src/model/ImportCustomAlertRulesRequest.cc @@ -60,6 +60,17 @@ void ImportCustomAlertRulesRequest::setContactGroupIds(const std::string& contac setParameter("ContactGroupIds", contactGroupIds); } +std::string ImportCustomAlertRulesRequest::getTemplateAlertConfig()const +{ + return templateAlertConfig_; +} + +void ImportCustomAlertRulesRequest::setTemplateAlertConfig(const std::string& templateAlertConfig) +{ + templateAlertConfig_ = templateAlertConfig; + setParameter("TemplateAlertConfig", templateAlertConfig); +} + std::string ImportCustomAlertRulesRequest::getProxyUserId()const { return proxyUserId_; @@ -71,14 +82,3 @@ void ImportCustomAlertRulesRequest::setProxyUserId(const std::string& proxyUserI setParameter("ProxyUserId", proxyUserId); } -std::string ImportCustomAlertRulesRequest::getTemplageAlertConfig()const -{ - return templageAlertConfig_; -} - -void ImportCustomAlertRulesRequest::setTemplageAlertConfig(const std::string& templageAlertConfig) -{ - templageAlertConfig_ = templageAlertConfig; - setParameter("TemplageAlertConfig", templageAlertConfig); -} - diff --git a/arms/src/model/SearchAlertRulesResult.cc b/arms/src/model/SearchAlertRulesResult.cc index b868421fa..38580e396 100644 --- a/arms/src/model/SearchAlertRulesResult.cc +++ b/arms/src/model/SearchAlertRulesResult.cc @@ -78,11 +78,19 @@ void SearchAlertRulesResult::parse(const std::string &payload) alertRuleEntityObject.updateTime = std::stol(pageBeanNodeAlertRulesAlertRuleEntity["UpdateTime"].asString()); if(!pageBeanNodeAlertRulesAlertRuleEntity["UserId"].isNull()) alertRuleEntityObject.userId = pageBeanNodeAlertRulesAlertRuleEntity["UserId"].asString(); + if(!pageBeanNodeAlertRulesAlertRuleEntity["Title"].isNull()) + alertRuleEntityObject.title = pageBeanNodeAlertRulesAlertRuleEntity["Title"].asString(); + if(!pageBeanNodeAlertRulesAlertRuleEntity["ContactGroupIds"].isNull()) + alertRuleEntityObject.contactGroupIds = pageBeanNodeAlertRulesAlertRuleEntity["ContactGroupIds"].asString(); auto alarmContextNode = value["AlarmContext"]; if(!alarmContextNode["AlarmContentTemplate"].isNull()) alertRuleEntityObject.alarmContext.alarmContentTemplate = alarmContextNode["AlarmContentTemplate"].asString(); if(!alarmContextNode["AlarmContentSubTitle"].isNull()) alertRuleEntityObject.alarmContext.alarmContentSubTitle = alarmContextNode["AlarmContentSubTitle"].asString(); + if(!alarmContextNode["Content"].isNull()) + alertRuleEntityObject.alarmContext.content = alarmContextNode["Content"].asString(); + if(!alarmContextNode["SubTitle"].isNull()) + alertRuleEntityObject.alarmContext.subTitle = alarmContextNode["SubTitle"].asString(); auto alertRuleNode = value["AlertRule"]; if(!alertRuleNode["Operator"].isNull()) alertRuleEntityObject.alertRule._operator = alertRuleNode["Operator"].asString(); @@ -137,6 +145,9 @@ void SearchAlertRulesResult::parse(const std::string &payload) auto allAlertWays = value["AlertWays"]["AlertWay"]; for (auto value : allAlertWays) alertRuleEntityObject.alertWays.push_back(value.asString()); + auto allAlertWay = value["AlertWay"]["AlertWay"]; + for (auto value : allAlertWay) + alertRuleEntityObject.alertWay.push_back(value.asString()); pageBean_.alertRules.push_back(alertRuleEntityObject); }