Add EventRule Content Filter.

cms/include/alibabacloud/cms/CmsClient.h

@@ -40,6 +40,8 @@
 #include "model/CreateGroupMonitoringAgentProcessResult.h"
 #include "model/CreateHostAvailabilityRequest.h"
 #include "model/CreateHostAvailabilityResult.h"
+#include "model/CreateInstantSiteMonitorRequest.h"
+#include "model/CreateInstantSiteMonitorResult.h"
 #include "model/CreateMetricRuleResourcesRequest.h"
 #include "model/CreateMetricRuleResourcesResult.h"
 #include "model/CreateMetricRuleTemplateRequest.h"
@@ -206,6 +208,8 @@
 #include "model/DescribeSiteMonitorISPCityListResult.h"
 #include "model/DescribeSiteMonitorListRequest.h"
 #include "model/DescribeSiteMonitorListResult.h"
+#include "model/DescribeSiteMonitorLogRequest.h"
+#include "model/DescribeSiteMonitorLogResult.h"
 #include "model/DescribeSiteMonitorQuotaRequest.h"
 #include "model/DescribeSiteMonitorQuotaResult.h"
 #include "model/DescribeSiteMonitorStatisticsRequest.h"
@@ -338,6 +342,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateHostAvailabilityResult> CreateHostAvailabilityOutcome;
 			typedef std::future<CreateHostAvailabilityOutcome> CreateHostAvailabilityOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::CreateHostAvailabilityRequest&, const CreateHostAvailabilityOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateHostAvailabilityAsyncHandler;
+			typedef Outcome<Error, Model::CreateInstantSiteMonitorResult> CreateInstantSiteMonitorOutcome;
+			typedef std::future<CreateInstantSiteMonitorOutcome> CreateInstantSiteMonitorOutcomeCallable;
+			typedef std::function<void(const CmsClient*, const Model::CreateInstantSiteMonitorRequest&, const CreateInstantSiteMonitorOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateInstantSiteMonitorAsyncHandler;
 			typedef Outcome<Error, Model::CreateMetricRuleResourcesResult> CreateMetricRuleResourcesOutcome;
 			typedef std::future<CreateMetricRuleResourcesOutcome> CreateMetricRuleResourcesOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::CreateMetricRuleResourcesRequest&, const CreateMetricRuleResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateMetricRuleResourcesAsyncHandler;
@@ -587,6 +594,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeSiteMonitorListResult> DescribeSiteMonitorListOutcome;
 			typedef std::future<DescribeSiteMonitorListOutcome> DescribeSiteMonitorListOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::DescribeSiteMonitorListRequest&, const DescribeSiteMonitorListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSiteMonitorListAsyncHandler;
+			typedef Outcome<Error, Model::DescribeSiteMonitorLogResult> DescribeSiteMonitorLogOutcome;
+			typedef std::future<DescribeSiteMonitorLogOutcome> DescribeSiteMonitorLogOutcomeCallable;
+			typedef std::function<void(const CmsClient*, const Model::DescribeSiteMonitorLogRequest&, const DescribeSiteMonitorLogOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSiteMonitorLogAsyncHandler;
 			typedef Outcome<Error, Model::DescribeSiteMonitorQuotaResult> DescribeSiteMonitorQuotaOutcome;
 			typedef std::future<DescribeSiteMonitorQuotaOutcome> DescribeSiteMonitorQuotaOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::DescribeSiteMonitorQuotaRequest&, const DescribeSiteMonitorQuotaOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSiteMonitorQuotaAsyncHandler;
@@ -763,6 +773,9 @@ namespace AlibabaCloud
 			CreateHostAvailabilityOutcome createHostAvailability(const Model::CreateHostAvailabilityRequest &request)const;
 			void createHostAvailabilityAsync(const Model::CreateHostAvailabilityRequest& request, const CreateHostAvailabilityAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateHostAvailabilityOutcomeCallable createHostAvailabilityCallable(const Model::CreateHostAvailabilityRequest& request) const;
+			CreateInstantSiteMonitorOutcome createInstantSiteMonitor(const Model::CreateInstantSiteMonitorRequest &request)const;
+			void createInstantSiteMonitorAsync(const Model::CreateInstantSiteMonitorRequest& request, const CreateInstantSiteMonitorAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateInstantSiteMonitorOutcomeCallable createInstantSiteMonitorCallable(const Model::CreateInstantSiteMonitorRequest& request) const;
 			CreateMetricRuleResourcesOutcome createMetricRuleResources(const Model::CreateMetricRuleResourcesRequest &request)const;
 			void createMetricRuleResourcesAsync(const Model::CreateMetricRuleResourcesRequest& request, const CreateMetricRuleResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateMetricRuleResourcesOutcomeCallable createMetricRuleResourcesCallable(const Model::CreateMetricRuleResourcesRequest& request) const;
@@ -1012,6 +1025,9 @@ namespace AlibabaCloud
 			DescribeSiteMonitorListOutcome describeSiteMonitorList(const Model::DescribeSiteMonitorListRequest &request)const;
 			void describeSiteMonitorListAsync(const Model::DescribeSiteMonitorListRequest& request, const DescribeSiteMonitorListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeSiteMonitorListOutcomeCallable describeSiteMonitorListCallable(const Model::DescribeSiteMonitorListRequest& request) const;
+			DescribeSiteMonitorLogOutcome describeSiteMonitorLog(const Model::DescribeSiteMonitorLogRequest &request)const;
+			void describeSiteMonitorLogAsync(const Model::DescribeSiteMonitorLogRequest& request, const DescribeSiteMonitorLogAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeSiteMonitorLogOutcomeCallable describeSiteMonitorLogCallable(const Model::DescribeSiteMonitorLogRequest& request) const;
 			DescribeSiteMonitorQuotaOutcome describeSiteMonitorQuota(const Model::DescribeSiteMonitorQuotaRequest &request)const;
 			void describeSiteMonitorQuotaAsync(const Model::DescribeSiteMonitorQuotaRequest& request, const DescribeSiteMonitorQuotaAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeSiteMonitorQuotaOutcomeCallable describeSiteMonitorQuotaCallable(const Model::DescribeSiteMonitorQuotaRequest& request) const;

cms/include/alibabacloud/cms/model/CreateInstantSiteMonitorRequest.h

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_CMS_MODEL_CREATEINSTANTSITEMONITORREQUEST_H_
+#define ALIBABACLOUD_CMS_MODEL_CREATEINSTANTSITEMONITORREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT CreateInstantSiteMonitorRequest : public RpcServiceRequest
+			{
+
+			public:
+				CreateInstantSiteMonitorRequest();
+				~CreateInstantSiteMonitorRequest();
+
+				int getRandomIspCity()const;
+				void setRandomIspCity(int randomIspCity);
+				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);
+				std::string getIspCities()const;
+				void setIspCities(const std::string& ispCities);
+				std::string getOptionsJson()const;
+				void setOptionsJson(const std::string& optionsJson);
+
+            private:
+				int randomIspCity_;
+				std::string address_;
+				std::string taskType_;
+				std::string taskName_;
+				std::string ispCities_;
+				std::string optionsJson_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_CREATEINSTANTSITEMONITORREQUEST_H_

cms/include/alibabacloud/cms/model/CreateInstantSiteMonitorResult.h

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_CMS_MODEL_CREATEINSTANTSITEMONITORRESULT_H_
+#define ALIBABACLOUD_CMS_MODEL_CREATEINSTANTSITEMONITORRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT CreateInstantSiteMonitorResult : public ServiceResult
+			{
+			public:
+				struct CreateResultListItem
+				{
+					std::string taskId;
+					std::string taskName;
+				};
+
+
+				CreateInstantSiteMonitorResult();
+				explicit CreateInstantSiteMonitorResult(const std::string &payload);
+				~CreateInstantSiteMonitorResult();
+				std::string getMessage()const;
+				std::vector<CreateResultListItem> getCreateResultList()const;
+				std::string getCode()const;
+				std::string getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::vector<CreateResultListItem> createResultList_;
+				std::string code_;
+				std::string success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_CREATEINSTANTSITEMONITORRESULT_H_

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

@@ -81,28 +81,48 @@ namespace AlibabaCloud
 						std::string expressionListJoin;
 						std::vector<ExpressionListItem> expressionList;
 					};
+					struct Prometheus
+					{
+						struct AnnotationsItem
+						{
+							std::string value;
+							std::string key;
+						};
+						std::vector<AnnotationsItem> annotations;
+						std::string promQL;
+						long times;
+						std::string level;
+					};
+					struct LabelsItem
+					{
+						std::string value;
+						std::string key;
+					};
 					std::string groupName;
-					int silenceTime;
-					std::string contactGroups;
 					std::string noEffectiveInterval;
-					std::string groupBy;
+					std::string options;
 					std::string mailSubject;
 					std::string sourceType;
 					std::string ruleId;
+					Prometheus prometheus;
+					std::string metricName;
+					CompositeExpression compositeExpression;
+					std::string ruleName;
+					int silenceTime;
+					std::string contactGroups;
+					std::string groupBy;
 					std::string period;
 					std::string dimensions;
+					std::vector<Alarm::LabelsItem> labels;
 					std::string _namespace;
 					std::string effectiveInterval;
 					std::string noDataPolicy;
 					std::string alertState;
 					std::string groupId;
-					std::string metricName;
 					Escalations escalations;
 					bool enableState;
-					CompositeExpression compositeExpression;
 					std::string webhook;
 					std::string resources;
-					std::string ruleName;
 				};
 
 

cms/include/alibabacloud/cms/model/DescribeSiteMonitorLogRequest.h

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_CMS_MODEL_DESCRIBESITEMONITORLOGREQUEST_H_
+#define ALIBABACLOUD_CMS_MODEL_DESCRIBESITEMONITORLOGREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT DescribeSiteMonitorLogRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeSiteMonitorLogRequest();
+				~DescribeSiteMonitorLogRequest();
+
+				std::string getCity()const;
+				void setCity(const std::string& city);
+				std::string getIsp()const;
+				void setIsp(const std::string& isp);
+				std::string getStartTime()const;
+				void setStartTime(const std::string& startTime);
+				std::string getTaskIds()const;
+				void setTaskIds(const std::string& taskIds);
+				std::string getNextToken()const;
+				void setNextToken(const std::string& nextToken);
+				std::string getMetricName()const;
+				void setMetricName(const std::string& metricName);
+				int getLength()const;
+				void setLength(int length);
+				std::string getEndTime()const;
+				void setEndTime(const std::string& endTime);
+				std::string getFilter()const;
+				void setFilter(const std::string& filter);
+				std::string getDimensions()const;
+				void setDimensions(const std::string& dimensions);
+
+            private:
+				std::string city_;
+				std::string isp_;
+				std::string startTime_;
+				std::string taskIds_;
+				std::string nextToken_;
+				std::string metricName_;
+				int length_;
+				std::string endTime_;
+				std::string filter_;
+				std::string dimensions_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_DESCRIBESITEMONITORLOGREQUEST_H_

cms/include/alibabacloud/cms/model/DescribeSiteMonitorLogResult.h

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_CMS_MODEL_DESCRIBESITEMONITORLOGRESULT_H_
+#define ALIBABACLOUD_CMS_MODEL_DESCRIBESITEMONITORLOGRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT DescribeSiteMonitorLogResult : public ServiceResult
+			{
+			public:
+
+
+				DescribeSiteMonitorLogResult();
+				explicit DescribeSiteMonitorLogResult(const std::string &payload);
+				~DescribeSiteMonitorLogResult();
+				std::string getNextToken()const;
+				std::string getMessage()const;
+				std::string getData()const;
+				std::string getCode()const;
+				std::string getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string nextToken_;
+				std::string message_;
+				std::string data_;
+				std::string code_;
+				std::string success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_DESCRIBESITEMONITORLOGRESULT_H_

cms/include/alibabacloud/cms/model/PutEventRuleRequest.h

@@ -34,6 +34,7 @@ namespace AlibabaCloud
 				struct EventPattern
 				{
 					std::vector<std::string> levelList;
+					Struct keywordFilter;
 					std::string product;
 					std::vector<std::string> statusList;
 					std::vector<std::string> nameList;

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

@@ -41,26 +41,20 @@ namespace AlibabaCloud
 				void setEscalationsWarnComparisonOperator(const std::string& escalationsWarnComparisonOperator);
 				std::string getRuleName()const;
 				void setRuleName(const std::string& ruleName);
-				std::string getEscalationsInfoStatistics()const;
-				void setEscalationsInfoStatistics(const std::string& escalationsInfoStatistics);
 				std::string getEffectiveInterval()const;
 				void setEffectiveInterval(const std::string& effectiveInterval);
-				std::string getEscalationsInfoComparisonOperator()const;
-				void setEscalationsInfoComparisonOperator(const std::string& escalationsInfoComparisonOperator);
 				std::string getNoDataPolicy()const;
 				void setNoDataPolicy(const std::string& noDataPolicy);
 				std::string getNoEffectiveInterval()const;
 				void setNoEffectiveInterval(const std::string& noEffectiveInterval);
 				std::string getEmailSubject()const;
 				void setEmailSubject(const std::string& emailSubject);
-				int getSilenceTime()const;
-				void setSilenceTime(int silenceTime);
+				std::string getOptions()const;
+				void setOptions(const std::string& options);
 				std::string getMetricName()const;
 				void setMetricName(const std::string& metricName);
 				int getEscalationsWarnTimes()const;
 				void setEscalationsWarnTimes(int escalationsWarnTimes);
-				Struct getCompositeExpression()const;
-				void setCompositeExpression(const Struct& compositeExpression);
 				std::string getPeriod()const;
 				void setPeriod(const std::string& period);
 				std::string getEscalationsWarnThreshold()const;
@@ -71,14 +65,32 @@ namespace AlibabaCloud
 				void setEscalationsCriticalStatistics(const std::string& escalationsCriticalStatistics);
 				std::string getGroupId()const;
 				void setGroupId(const std::string& groupId);
+				std::string getGroupName()const;
+				void setGroupName(const std::string& groupName);
+				Array getLabels()const;
+				void setLabels(const Array& labels);
+				std::string getInterval()const;
+				void setInterval(const std::string& interval);
+				std::string getRuleId()const;
+				void setRuleId(const std::string& ruleId);
+				std::string getEscalationsCriticalThreshold()const;
+				void setEscalationsCriticalThreshold(const std::string& escalationsCriticalThreshold);
+				std::string getEscalationsInfoStatistics()const;
+				void setEscalationsInfoStatistics(const std::string& escalationsInfoStatistics);
+				std::string getEscalationsInfoComparisonOperator()const;
+				void setEscalationsInfoComparisonOperator(const std::string& escalationsInfoComparisonOperator);
+				int getSilenceTime()const;
+				void setSilenceTime(int silenceTime);
+				Struct getPrometheus()const;
+				void setPrometheus(const Struct& prometheus);
+				Struct getCompositeExpression()const;
+				void setCompositeExpression(const Struct& compositeExpression);
 				std::string getResources()const;
 				void setResources(const std::string& resources);
 				int getEscalationsInfoTimes()const;
 				void setEscalationsInfoTimes(int escalationsInfoTimes);
 				std::string getGroupBy()const;
 				void setGroupBy(const std::string& groupBy);
-				std::string getGroupName()const;
-				void setGroupName(const std::string& groupName);
 				int getEscalationsCriticalTimes()const;
 				void setEscalationsCriticalTimes(int escalationsCriticalTimes);
 				std::string getEscalationsWarnStatistics()const;
@@ -87,46 +99,43 @@ namespace AlibabaCloud
 				void setEscalationsInfoThreshold(const std::string& escalationsInfoThreshold);
 				std::string get_Namespace()const;
 				void set_Namespace(const std::string& _namespace);
-				std::string getInterval()const;
-				void setInterval(const std::string& interval);
-				std::string getRuleId()const;
-				void setRuleId(const std::string& ruleId);
 				std::string getEscalationsCriticalComparisonOperator()const;
 				void setEscalationsCriticalComparisonOperator(const std::string& escalationsCriticalComparisonOperator);
-				std::string getEscalationsCriticalThreshold()const;
-				void setEscalationsCriticalThreshold(const std::string& escalationsCriticalThreshold);
 
             private:
 				std::string webhook_;
 				std::string escalationsWarnComparisonOperator_;
 				std::string ruleName_;
-				std::string escalationsInfoStatistics_;
 				std::string effectiveInterval_;
-				std::string escalationsInfoComparisonOperator_;
 				std::string noDataPolicy_;
 				std::string noEffectiveInterval_;
 				std::string emailSubject_;
-				int silenceTime_;
+				std::string options_;
 				std::string metricName_;
 				int escalationsWarnTimes_;
-				Struct compositeExpression_;
 				std::string period_;
 				std::string escalationsWarnThreshold_;
 				std::string contactGroups_;
 				std::string escalationsCriticalStatistics_;
 				std::string groupId_;
+				std::string groupName_;
+				Array labels_;
+				std::string interval_;
+				std::string ruleId_;
+				std::string escalationsCriticalThreshold_;
+				std::string escalationsInfoStatistics_;
+				std::string escalationsInfoComparisonOperator_;
+				int silenceTime_;
+				Struct prometheus_;
+				Struct compositeExpression_;
 				std::string resources_;
 				int escalationsInfoTimes_;
 				std::string groupBy_;
-				std::string groupName_;
 				int escalationsCriticalTimes_;
 				std::string escalationsWarnStatistics_;
 				std::string escalationsInfoThreshold_;
 				std::string _namespace_;
-				std::string interval_;
-				std::string ruleId_;
 				std::string escalationsCriticalComparisonOperator_;
-				std::string escalationsCriticalThreshold_;
 
 			};
 		}