Increase detection frequency for availability monitoring.

CHANGELOG

@@ -1,3 +1,7 @@
+2021-06-08 Version: 1.36.770
+- Increase detection frequency for availability monitoring.
+- Add application group to query in batch according to group ID.
+
 2021-06-05 Version: 1.36.769
 - Supported new version of Ticket for Alibaba Cloud.
 

VERSION

@@ -1 +1 @@
-1.36.769
+1.36.770

cms/include/alibabacloud/cms/model/CreateHostAvailabilityRequest.h

@@ -58,6 +58,8 @@ namespace AlibabaCloud
 				void setTaskOptionHttpResponseCharset(const std::string& taskOptionHttpResponseCharset);
 				bool getTaskOptionHttpNegative()const;
 				void setTaskOptionHttpNegative(bool taskOptionHttpNegative);
+				int getTaskOptionInterval()const;
+				void setTaskOptionInterval(int taskOptionInterval);
 				int getAlertConfigNotifyType()const;
 				void setAlertConfigNotifyType(int alertConfigNotifyType);
 				std::string getTaskOptionTelnetOrPingHost()const;
@@ -91,6 +93,7 @@ namespace AlibabaCloud
 				int alertConfigSilenceTime_;
 				std::string taskOptionHttpResponseCharset_;
 				bool taskOptionHttpNegative_;
+				int taskOptionInterval_;
 				int alertConfigNotifyType_;
 				std::string taskOptionTelnetOrPingHost_;
 				std::string taskOptionHttpResponseMatchContent_;

cms/include/alibabacloud/cms/model/CreateSiteMonitorRequest.h

@@ -35,28 +35,34 @@ namespace AlibabaCloud
 				CreateSiteMonitorRequest();
 				~CreateSiteMonitorRequest();
 
+				std::string getTaskName()const;
+				void setTaskName(const std::string& taskName);
+				std::string getAlertIds()const;
+				void setAlertIds(const std::string& alertIds);
 				std::string getAddress()const;
 				void setAddress(const std::string& address);
 				std::string getTaskType()const;
 				void setTaskType(const std::string& taskType);
-				std::string getTaskName()const;
-				void setTaskName(const std::string& taskName);
+				long getEndTime()const;
+				void setEndTime(long endTime);
 				std::string getIspCities()const;
 				void setIspCities(const std::string& ispCities);
 				std::string getOptionsJson()const;
 				void setOptionsJson(const std::string& optionsJson);
-				std::string getAlertIds()const;
-				void setAlertIds(const std::string& alertIds);
+				std::string getIntervalUnit()const;
+				void setIntervalUnit(const std::string& intervalUnit);
 				std::string getInterval()const;
 				void setInterval(const std::string& interval);
 
             private:
+				std::string taskName_;
+				std::string alertIds_;
 				std::string address_;
 				std::string taskType_;
-				std::string taskName_;
+				long endTime_;
 				std::string ispCities_;
 				std::string optionsJson_;
-				std::string alertIds_;
+				std::string intervalUnit_;
 				std::string interval_;
 
 			};

cms/include/alibabacloud/cms/model/DescribeHostAvailabilityListResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 						std::string httpURI;
 						bool httpNegative;
 						std::string httpMethod;
+						int interval;
 					};
 					struct AlertConfig
 					{

cms/include/alibabacloud/cms/model/DescribeMetricRuleListResult.h

@@ -68,6 +68,7 @@ namespace AlibabaCloud
 					std::string noEffectiveInterval;
 					int silenceTime;
 					std::string contactGroups;
+					std::string groupBy;
 					std::string mailSubject;
 					std::string ruleId;
 					std::string sourceType;

cms/include/alibabacloud/cms/model/DescribeMonitorResourceQuotaAttributeResult.h

@@ -88,13 +88,20 @@ namespace AlibabaCloud
 						int quotaPackage;
 						int quotaLimit;
 					};
+					struct EnterpriseQuota
+					{
+						std::string instanceId;
+						std::string suitInfo;
+					};
 					SiteMonitorOperatorProbe siteMonitorOperatorProbe;
 					std::string instanceId;
+					LogMonitor logMonitor;
+					std::string cRMType;
+					EnterpriseQuota enterpriseQuota;
 					Phone phone;
 					std::string suitInfo;
 					SiteMonitorTask siteMonitorTask;
 					SMS sMS;
-					LogMonitor logMonitor;
 					Api api;
 					SiteMonitorEcsProbe siteMonitorEcsProbe;
 					std::string expireTime;

cms/include/alibabacloud/cms/model/DescribeSiteMonitorAttributeResult.h

@@ -66,6 +66,7 @@ namespace AlibabaCloud
 					OptionJson optionJson;
 					std::string taskId;
 					std::string address;
+					std::string endTime;
 					std::string taskName;
 					std::string taskType;
 					std::vector<IspCity> ispCities;

cms/include/alibabacloud/cms/model/DescribeSiteMonitorListResult.h

@@ -46,6 +46,7 @@ namespace AlibabaCloud
 						std::string expect_value;
 						std::string http_method;
 						long time_out;
+						std::string group_id;
 						std::string header;
 						std::string response_content;
 						std::string username;
@@ -58,6 +59,7 @@ namespace AlibabaCloud
 					};
 					std::string taskId;
 					std::string address;
+					std::string endTime;
 					OptionsJson optionsJson;
 					std::string taskName;
 					std::string taskType;

cms/include/alibabacloud/cms/model/ModifyHostAvailabilityRequest.h

@@ -58,6 +58,8 @@ namespace AlibabaCloud
 				void setTaskOptionHttpResponseCharset(const std::string& taskOptionHttpResponseCharset);
 				bool getTaskOptionHttpNegative()const;
 				void setTaskOptionHttpNegative(bool taskOptionHttpNegative);
+				int getTaskOptionInterval()const;
+				void setTaskOptionInterval(int taskOptionInterval);
 				int getAlertConfigNotifyType()const;
 				void setAlertConfigNotifyType(int alertConfigNotifyType);
 				std::string getTaskOptionTelnetOrPingHost()const;
@@ -91,6 +93,7 @@ namespace AlibabaCloud
 				int alertConfigSilenceTime_;
 				std::string taskOptionHttpResponseCharset_;
 				bool taskOptionHttpNegative_;
+				int taskOptionInterval_;
 				int alertConfigNotifyType_;
 				std::string taskOptionTelnetOrPingHost_;
 				std::string taskOptionHttpResponseMatchContent_;

cms/include/alibabacloud/cms/model/ModifySiteMonitorRequest.h

@@ -45,6 +45,8 @@ namespace AlibabaCloud
 				void setOptionsJson(const std::string& optionsJson);
 				std::string getAlertIds()const;
 				void setAlertIds(const std::string& alertIds);
+				std::string getIntervalUnit()const;
+				void setIntervalUnit(const std::string& intervalUnit);
 				std::string getInterval()const;
 				void setInterval(const std::string& interval);
 				std::string getTaskId()const;
@@ -56,6 +58,7 @@ namespace AlibabaCloud
 				std::string ispCities_;
 				std::string optionsJson_;
 				std::string alertIds_;
+				std::string intervalUnit_;
 				std::string interval_;
 				std::string taskId_;
 

cms/include/alibabacloud/cms/model/PutResourceMetricRuleRequest.h

@@ -69,6 +69,8 @@ namespace AlibabaCloud
 				void setResources(const std::string& resources);
 				int getEscalationsInfoTimes()const;
 				void setEscalationsInfoTimes(int escalationsInfoTimes);
+				std::string getGroupBy()const;
+				void setGroupBy(const std::string& groupBy);
 				int getEscalationsCriticalTimes()const;
 				void setEscalationsCriticalTimes(int escalationsCriticalTimes);
 				std::string getEscalationsWarnStatistics()const;
@@ -104,6 +106,7 @@ namespace AlibabaCloud
 				std::string escalationsCriticalStatistics_;
 				std::string resources_;
 				int escalationsInfoTimes_;
+				std::string groupBy_;
 				int escalationsCriticalTimes_;
 				std::string escalationsWarnStatistics_;
 				std::string escalationsInfoThreshold_;

cms/src/model/CreateHostAvailabilityRequest.cc

@@ -112,6 +112,17 @@ void CreateHostAvailabilityRequest::setTaskOptionHttpNegative(bool taskOptionHtt
 	setParameter("TaskOptionHttpNegative", taskOptionHttpNegative ? "true" : "false");
 }
 
+int CreateHostAvailabilityRequest::getTaskOptionInterval()const
+{
+	return taskOptionInterval_;
+}
+
+void CreateHostAvailabilityRequest::setTaskOptionInterval(int taskOptionInterval)
+{
+	taskOptionInterval_ = taskOptionInterval;
+	setParameter("TaskOptionInterval", std::to_string(taskOptionInterval));
+}
+
 int CreateHostAvailabilityRequest::getAlertConfigNotifyType()const
 {
 	return alertConfigNotifyType_;

cms/src/model/CreateSiteMonitorRequest.cc

@@ -27,6 +27,28 @@ CreateSiteMonitorRequest::CreateSiteMonitorRequest() :
 CreateSiteMonitorRequest::~CreateSiteMonitorRequest()
 {}
 
+std::string CreateSiteMonitorRequest::getTaskName()const
+{
+	return taskName_;
+}
+
+void CreateSiteMonitorRequest::setTaskName(const std::string& taskName)
+{
+	taskName_ = taskName;
+	setParameter("TaskName", taskName);
+}
+
+std::string CreateSiteMonitorRequest::getAlertIds()const
+{
+	return alertIds_;
+}
+
+void CreateSiteMonitorRequest::setAlertIds(const std::string& alertIds)
+{
+	alertIds_ = alertIds;
+	setParameter("AlertIds", alertIds);
+}
+
 std::string CreateSiteMonitorRequest::getAddress()const
 {
 	return address_;
@@ -49,15 +71,15 @@ void CreateSiteMonitorRequest::setTaskType(const std::string& taskType)
 	setParameter("TaskType", taskType);
 }
 
-std::string CreateSiteMonitorRequest::getTaskName()const
+long CreateSiteMonitorRequest::getEndTime()const
 {
-	return taskName_;
+	return endTime_;
 }
 
-void CreateSiteMonitorRequest::setTaskName(const std::string& taskName)
+void CreateSiteMonitorRequest::setEndTime(long endTime)
 {
-	taskName_ = taskName;
-	setParameter("TaskName", taskName);
+	endTime_ = endTime;
+	setParameter("EndTime", std::to_string(endTime));
 }
 
 std::string CreateSiteMonitorRequest::getIspCities()const
@@ -82,15 +104,15 @@ void CreateSiteMonitorRequest::setOptionsJson(const std::string& optionsJson)
 	setParameter("OptionsJson", optionsJson);
 }
 
-std::string CreateSiteMonitorRequest::getAlertIds()const
+std::string CreateSiteMonitorRequest::getIntervalUnit()const
 {
-	return alertIds_;
+	return intervalUnit_;
 }
 
-void CreateSiteMonitorRequest::setAlertIds(const std::string& alertIds)
+void CreateSiteMonitorRequest::setIntervalUnit(const std::string& intervalUnit)
 {
-	alertIds_ = alertIds;
-	setParameter("AlertIds", alertIds);
+	intervalUnit_ = intervalUnit;
+	setParameter("IntervalUnit", intervalUnit);
 }
 
 std::string CreateSiteMonitorRequest::getInterval()const

cms/src/model/DescribeHostAvailabilityListResult.cc

@@ -72,6 +72,8 @@ void DescribeHostAvailabilityListResult::parse(const std::string &payload)
 			taskListObject.taskOption.httpMethod = taskOptionNode["HttpMethod"].asString();
 		if(!taskOptionNode["HttpNegative"].isNull())
 			taskListObject.taskOption.httpNegative = taskOptionNode["HttpNegative"].asString() == "true";
+		if(!taskOptionNode["Interval"].isNull())
+			taskListObject.taskOption.interval = std::stoi(taskOptionNode["Interval"].asString());
 		auto alertConfigNode = value["AlertConfig"];
 		if(!alertConfigNode["NotifyType"].isNull())
 			taskListObject.alertConfig.notifyType = std::stoi(alertConfigNode["NotifyType"].asString());

cms/src/model/DescribeMetricRuleListResult.cc

@@ -79,6 +79,8 @@ void DescribeMetricRuleListResult::parse(const std::string &payload)
 			alarmsObject.dimensions = valueAlarmsAlarm["Dimensions"].asString();
 		if(!valueAlarmsAlarm["SourceType"].isNull())
 			alarmsObject.sourceType = valueAlarmsAlarm["SourceType"].asString();
+		if(!valueAlarmsAlarm["GroupBy"].isNull())
+			alarmsObject.groupBy = valueAlarmsAlarm["GroupBy"].asString();
 		auto escalationsNode = value["Escalations"];
 		auto infoNode = escalationsNode["Info"];
 		if(!infoNode["ComparisonOperator"].isNull())

cms/src/model/DescribeMonitorResourceQuotaAttributeResult.cc

@@ -44,6 +44,8 @@ void DescribeMonitorResourceQuotaAttributeResult::parse(const std::string &paylo
 		resourceQuota_.expireTime = resourceQuotaNode["ExpireTime"].asString();
 	if(!resourceQuotaNode["SuitInfo"].isNull())
 		resourceQuota_.suitInfo = resourceQuotaNode["SuitInfo"].asString();
+	if(!resourceQuotaNode["CRMType"].isNull())
+		resourceQuota_.cRMType = resourceQuotaNode["CRMType"].asString();
 	if(!resourceQuotaNode["InstanceId"].isNull())
 		resourceQuota_.instanceId = resourceQuotaNode["InstanceId"].asString();
 	auto siteMonitorEcsProbeNode = resourceQuotaNode["SiteMonitorEcsProbe"];
@@ -109,6 +111,11 @@ void DescribeMonitorResourceQuotaAttributeResult::parse(const std::string &paylo
 		resourceQuota_.phone.quotaPackage = std::stoi(phoneNode["QuotaPackage"].asString());
 	if(!phoneNode["QuotaUsed"].isNull())
 		resourceQuota_.phone.quotaUsed = std::stoi(phoneNode["QuotaUsed"].asString());
+	auto enterpriseQuotaNode = resourceQuotaNode["EnterpriseQuota"];
+	if(!enterpriseQuotaNode["SuitInfo"].isNull())
+		resourceQuota_.enterpriseQuota.suitInfo = enterpriseQuotaNode["SuitInfo"].asString();
+	if(!enterpriseQuotaNode["InstanceId"].isNull())
+		resourceQuota_.enterpriseQuota.instanceId = enterpriseQuotaNode["InstanceId"].asString();
 	if(!value["Code"].isNull())
 		code_ = value["Code"].asString();
 	if(!value["Message"].isNull())

cms/src/model/DescribeSiteMonitorAttributeResult.cc

@@ -90,6 +90,8 @@ void DescribeSiteMonitorAttributeResult::parse(const std::string &payload)
 		siteMonitors_.interval = siteMonitorsNode["Interval"].asString();
 	if(!siteMonitorsNode["TaskId"].isNull())
 		siteMonitors_.taskId = siteMonitorsNode["TaskId"].asString();
+	if(!siteMonitorsNode["EndTime"].isNull())
+		siteMonitors_.endTime = siteMonitorsNode["EndTime"].asString();
 	auto allIspCitiesNode = siteMonitorsNode["IspCities"]["IspCity"];
 	for (auto siteMonitorsNodeIspCitiesIspCity : allIspCitiesNode)
 	{

cms/src/model/DescribeSiteMonitorListResult.cc

@@ -59,11 +59,15 @@ void DescribeSiteMonitorListResult::parse(const std::string &payload)
 			siteMonitorsObject.interval = valueSiteMonitorsSiteMonitor["Interval"].asString();
 		if(!valueSiteMonitorsSiteMonitor["UpdateTime"].isNull())
 			siteMonitorsObject.updateTime = valueSiteMonitorsSiteMonitor["UpdateTime"].asString();
+		if(!valueSiteMonitorsSiteMonitor["EndTime"].isNull())
+			siteMonitorsObject.endTime = valueSiteMonitorsSiteMonitor["EndTime"].asString();
 		auto optionsJsonNode = value["OptionsJson"];
 		if(!optionsJsonNode["dns_type"].isNull())
 			siteMonitorsObject.optionsJson.dns_type = optionsJsonNode["dns_type"].asString();
 		if(!optionsJsonNode["dns_server"].isNull())
 			siteMonitorsObject.optionsJson.dns_server = optionsJsonNode["dns_server"].asString();
+		if(!optionsJsonNode["group_id"].isNull())
+			siteMonitorsObject.optionsJson.group_id = optionsJsonNode["group_id"].asString();
 		if(!optionsJsonNode["expect_value"].isNull())
 			siteMonitorsObject.optionsJson.expect_value = optionsJsonNode["expect_value"].asString();
 		if(!optionsJsonNode["http_method"].isNull())

cms/src/model/ModifyHostAvailabilityRequest.cc

@@ -112,6 +112,17 @@ void ModifyHostAvailabilityRequest::setTaskOptionHttpNegative(bool taskOptionHtt
 	setParameter("TaskOptionHttpNegative", taskOptionHttpNegative ? "true" : "false");
 }
 
+int ModifyHostAvailabilityRequest::getTaskOptionInterval()const
+{
+	return taskOptionInterval_;
+}
+
+void ModifyHostAvailabilityRequest::setTaskOptionInterval(int taskOptionInterval)
+{
+	taskOptionInterval_ = taskOptionInterval;
+	setParameter("TaskOptionInterval", std::to_string(taskOptionInterval));
+}
+
 int ModifyHostAvailabilityRequest::getAlertConfigNotifyType()const
 {
 	return alertConfigNotifyType_;

cms/src/model/ModifySiteMonitorRequest.cc

@@ -82,6 +82,17 @@ void ModifySiteMonitorRequest::setAlertIds(const std::string& alertIds)
 	setParameter("AlertIds", alertIds);
 }
 
+std::string ModifySiteMonitorRequest::getIntervalUnit()const
+{
+	return intervalUnit_;
+}
+
+void ModifySiteMonitorRequest::setIntervalUnit(const std::string& intervalUnit)
+{
+	intervalUnit_ = intervalUnit;
+	setParameter("IntervalUnit", intervalUnit);
+}
+
 std::string ModifySiteMonitorRequest::getInterval()const
 {
 	return interval_;

cms/src/model/PutResourceMetricRuleRequest.cc

@@ -214,6 +214,17 @@ void PutResourceMetricRuleRequest::setEscalationsInfoTimes(int escalationsInfoTi
 	setParameter("EscalationsInfoTimes", std::to_string(escalationsInfoTimes));
 }
 
+std::string PutResourceMetricRuleRequest::getGroupBy()const
+{
+	return groupBy_;
+}
+
+void PutResourceMetricRuleRequest::setGroupBy(const std::string& groupBy)
+{
+	groupBy_ = groupBy;
+	setParameter("GroupBy", groupBy);
+}
+
 int PutResourceMetricRuleRequest::getEscalationsCriticalTimes()const
 {
 	return escalationsCriticalTimes_;