Add Emon-Service support.

CHANGELOG

@@ -1,3 +1,7 @@
+2021-06-04 Version: 1.36.767
+- Add Emon-Service support.
+- Remove Deprecated Interfaces.
+
 2021-06-04 Version: 1.36.766
 - Supported multi attach feature for disk.
 

VERSION

@@ -1 +1 @@
-1.36.766
+1.36.767

elasticsearch/CMakeLists.txt

@@ -55,8 +55,6 @@ set(elasticsearch_public_header_model
 	include/alibabacloud/elasticsearch/model/CreateLogstashResult.h
 	include/alibabacloud/elasticsearch/model/CreatePipelinesRequest.h
 	include/alibabacloud/elasticsearch/model/CreatePipelinesResult.h
-	include/alibabacloud/elasticsearch/model/CreateProjectRequest.h
-	include/alibabacloud/elasticsearch/model/CreateProjectResult.h
 	include/alibabacloud/elasticsearch/model/CreateSnapshotRequest.h
 	include/alibabacloud/elasticsearch/model/CreateSnapshotResult.h
 	include/alibabacloud/elasticsearch/model/DeactivateZonesRequest.h
@@ -79,8 +77,6 @@ set(elasticsearch_public_header_model
 	include/alibabacloud/elasticsearch/model/DeleteLogstashResult.h
 	include/alibabacloud/elasticsearch/model/DeletePipelinesRequest.h
 	include/alibabacloud/elasticsearch/model/DeletePipelinesResult.h
-	include/alibabacloud/elasticsearch/model/DeleteProjectRequest.h
-	include/alibabacloud/elasticsearch/model/DeleteProjectResult.h
 	include/alibabacloud/elasticsearch/model/DeleteSnapshotRepoRequest.h
 	include/alibabacloud/elasticsearch/model/DeleteSnapshotRepoResult.h
 	include/alibabacloud/elasticsearch/model/DescribeAckOperatorRequest.h
@@ -127,6 +123,10 @@ set(elasticsearch_public_header_model
 	include/alibabacloud/elasticsearch/model/GetClusterDataInformationResult.h
 	include/alibabacloud/elasticsearch/model/GetElastictaskRequest.h
 	include/alibabacloud/elasticsearch/model/GetElastictaskResult.h
+	include/alibabacloud/elasticsearch/model/GetEmonGrafanaAlertsRequest.h
+	include/alibabacloud/elasticsearch/model/GetEmonGrafanaAlertsResult.h
+	include/alibabacloud/elasticsearch/model/GetEmonGrafanaDashboardsRequest.h
+	include/alibabacloud/elasticsearch/model/GetEmonGrafanaDashboardsResult.h
 	include/alibabacloud/elasticsearch/model/GetEmonMonitorDataRequest.h
 	include/alibabacloud/elasticsearch/model/GetEmonMonitorDataResult.h
 	include/alibabacloud/elasticsearch/model/GetRegionConfigurationRequest.h
@@ -231,6 +231,8 @@ set(elasticsearch_public_header_model
 	include/alibabacloud/elasticsearch/model/OpenDiagnosisResult.h
 	include/alibabacloud/elasticsearch/model/OpenHttpsRequest.h
 	include/alibabacloud/elasticsearch/model/OpenHttpsResult.h
+	include/alibabacloud/elasticsearch/model/PostEmonTryAlarmRuleRequest.h
+	include/alibabacloud/elasticsearch/model/PostEmonTryAlarmRuleResult.h
 	include/alibabacloud/elasticsearch/model/RecommendTemplatesRequest.h
 	include/alibabacloud/elasticsearch/model/RecommendTemplatesResult.h
 	include/alibabacloud/elasticsearch/model/ReinstallCollectorRequest.h
@@ -249,8 +251,6 @@ set(elasticsearch_public_header_model
 	include/alibabacloud/elasticsearch/model/ResumeElasticsearchTaskResult.h
 	include/alibabacloud/elasticsearch/model/ResumeLogstashTaskRequest.h
 	include/alibabacloud/elasticsearch/model/ResumeLogstashTaskResult.h
-	include/alibabacloud/elasticsearch/model/RollbackInstanceRequest.h
-	include/alibabacloud/elasticsearch/model/RollbackInstanceResult.h
 	include/alibabacloud/elasticsearch/model/RolloverDataStreamRequest.h
 	include/alibabacloud/elasticsearch/model/RolloverDataStreamResult.h
 	include/alibabacloud/elasticsearch/model/RunPipelinesRequest.h
@@ -392,8 +392,6 @@ set(elasticsearch_src
 	src/model/CreateLogstashResult.cc
 	src/model/CreatePipelinesRequest.cc
 	src/model/CreatePipelinesResult.cc
-	src/model/CreateProjectRequest.cc
-	src/model/CreateProjectResult.cc
 	src/model/CreateSnapshotRequest.cc
 	src/model/CreateSnapshotResult.cc
 	src/model/DeactivateZonesRequest.cc
@@ -416,8 +414,6 @@ set(elasticsearch_src
 	src/model/DeleteLogstashResult.cc
 	src/model/DeletePipelinesRequest.cc
 	src/model/DeletePipelinesResult.cc
-	src/model/DeleteProjectRequest.cc
-	src/model/DeleteProjectResult.cc
 	src/model/DeleteSnapshotRepoRequest.cc
 	src/model/DeleteSnapshotRepoResult.cc
 	src/model/DescribeAckOperatorRequest.cc
@@ -464,6 +460,10 @@ set(elasticsearch_src
 	src/model/GetClusterDataInformationResult.cc
 	src/model/GetElastictaskRequest.cc
 	src/model/GetElastictaskResult.cc
+	src/model/GetEmonGrafanaAlertsRequest.cc
+	src/model/GetEmonGrafanaAlertsResult.cc
+	src/model/GetEmonGrafanaDashboardsRequest.cc
+	src/model/GetEmonGrafanaDashboardsResult.cc
 	src/model/GetEmonMonitorDataRequest.cc
 	src/model/GetEmonMonitorDataResult.cc
 	src/model/GetRegionConfigurationRequest.cc
@@ -568,6 +568,8 @@ set(elasticsearch_src
 	src/model/OpenDiagnosisResult.cc
 	src/model/OpenHttpsRequest.cc
 	src/model/OpenHttpsResult.cc
+	src/model/PostEmonTryAlarmRuleRequest.cc
+	src/model/PostEmonTryAlarmRuleResult.cc
 	src/model/RecommendTemplatesRequest.cc
 	src/model/RecommendTemplatesResult.cc
 	src/model/ReinstallCollectorRequest.cc
@@ -586,8 +588,6 @@ set(elasticsearch_src
 	src/model/ResumeElasticsearchTaskResult.cc
 	src/model/ResumeLogstashTaskRequest.cc
 	src/model/ResumeLogstashTaskResult.cc
-	src/model/RollbackInstanceRequest.cc
-	src/model/RollbackInstanceResult.cc
 	src/model/RolloverDataStreamRequest.cc
 	src/model/RolloverDataStreamResult.cc
 	src/model/RunPipelinesRequest.cc

elasticsearch/include/alibabacloud/elasticsearch/ElasticsearchClient.h

@@ -56,8 +56,6 @@
 #include "model/CreateLogstashResult.h"
 #include "model/CreatePipelinesRequest.h"
 #include "model/CreatePipelinesResult.h"
-#include "model/CreateProjectRequest.h"
-#include "model/CreateProjectResult.h"
 #include "model/CreateSnapshotRequest.h"
 #include "model/CreateSnapshotResult.h"
 #include "model/DeactivateZonesRequest.h"
@@ -80,8 +78,6 @@
 #include "model/DeleteLogstashResult.h"
 #include "model/DeletePipelinesRequest.h"
 #include "model/DeletePipelinesResult.h"
-#include "model/DeleteProjectRequest.h"
-#include "model/DeleteProjectResult.h"
 #include "model/DeleteSnapshotRepoRequest.h"
 #include "model/DeleteSnapshotRepoResult.h"
 #include "model/DescribeAckOperatorRequest.h"
@@ -128,6 +124,10 @@
 #include "model/GetClusterDataInformationResult.h"
 #include "model/GetElastictaskRequest.h"
 #include "model/GetElastictaskResult.h"
+#include "model/GetEmonGrafanaAlertsRequest.h"
+#include "model/GetEmonGrafanaAlertsResult.h"
+#include "model/GetEmonGrafanaDashboardsRequest.h"
+#include "model/GetEmonGrafanaDashboardsResult.h"
 #include "model/GetEmonMonitorDataRequest.h"
 #include "model/GetEmonMonitorDataResult.h"
 #include "model/GetRegionConfigurationRequest.h"
@@ -232,6 +232,8 @@
 #include "model/OpenDiagnosisResult.h"
 #include "model/OpenHttpsRequest.h"
 #include "model/OpenHttpsResult.h"
+#include "model/PostEmonTryAlarmRuleRequest.h"
+#include "model/PostEmonTryAlarmRuleResult.h"
 #include "model/RecommendTemplatesRequest.h"
 #include "model/RecommendTemplatesResult.h"
 #include "model/ReinstallCollectorRequest.h"
@@ -250,8 +252,6 @@
 #include "model/ResumeElasticsearchTaskResult.h"
 #include "model/ResumeLogstashTaskRequest.h"
 #include "model/ResumeLogstashTaskResult.h"
-#include "model/RollbackInstanceRequest.h"
-#include "model/RollbackInstanceResult.h"
 #include "model/RolloverDataStreamRequest.h"
 #include "model/RolloverDataStreamResult.h"
 #include "model/RunPipelinesRequest.h"
@@ -416,9 +416,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreatePipelinesResult> CreatePipelinesOutcome;
 			typedef std::future<CreatePipelinesOutcome> CreatePipelinesOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::CreatePipelinesRequest&, const CreatePipelinesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreatePipelinesAsyncHandler;
-			typedef Outcome<Error, Model::CreateProjectResult> CreateProjectOutcome;
-			typedef std::future<CreateProjectOutcome> CreateProjectOutcomeCallable;
-			typedef std::function<void(const ElasticsearchClient*, const Model::CreateProjectRequest&, const CreateProjectOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateProjectAsyncHandler;
 			typedef Outcome<Error, Model::CreateSnapshotResult> CreateSnapshotOutcome;
 			typedef std::future<CreateSnapshotOutcome> CreateSnapshotOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::CreateSnapshotRequest&, const CreateSnapshotOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateSnapshotAsyncHandler;
@@ -452,9 +449,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeletePipelinesResult> DeletePipelinesOutcome;
 			typedef std::future<DeletePipelinesOutcome> DeletePipelinesOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::DeletePipelinesRequest&, const DeletePipelinesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeletePipelinesAsyncHandler;
-			typedef Outcome<Error, Model::DeleteProjectResult> DeleteProjectOutcome;
-			typedef std::future<DeleteProjectOutcome> DeleteProjectOutcomeCallable;
-			typedef std::function<void(const ElasticsearchClient*, const Model::DeleteProjectRequest&, const DeleteProjectOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteProjectAsyncHandler;
 			typedef Outcome<Error, Model::DeleteSnapshotRepoResult> DeleteSnapshotRepoOutcome;
 			typedef std::future<DeleteSnapshotRepoOutcome> DeleteSnapshotRepoOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::DeleteSnapshotRepoRequest&, const DeleteSnapshotRepoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteSnapshotRepoAsyncHandler;
@@ -524,6 +518,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::GetElastictaskResult> GetElastictaskOutcome;
 			typedef std::future<GetElastictaskOutcome> GetElastictaskOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::GetElastictaskRequest&, const GetElastictaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetElastictaskAsyncHandler;
+			typedef Outcome<Error, Model::GetEmonGrafanaAlertsResult> GetEmonGrafanaAlertsOutcome;
+			typedef std::future<GetEmonGrafanaAlertsOutcome> GetEmonGrafanaAlertsOutcomeCallable;
+			typedef std::function<void(const ElasticsearchClient*, const Model::GetEmonGrafanaAlertsRequest&, const GetEmonGrafanaAlertsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetEmonGrafanaAlertsAsyncHandler;
+			typedef Outcome<Error, Model::GetEmonGrafanaDashboardsResult> GetEmonGrafanaDashboardsOutcome;
+			typedef std::future<GetEmonGrafanaDashboardsOutcome> GetEmonGrafanaDashboardsOutcomeCallable;
+			typedef std::function<void(const ElasticsearchClient*, const Model::GetEmonGrafanaDashboardsRequest&, const GetEmonGrafanaDashboardsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetEmonGrafanaDashboardsAsyncHandler;
 			typedef Outcome<Error, Model::GetEmonMonitorDataResult> GetEmonMonitorDataOutcome;
 			typedef std::future<GetEmonMonitorDataOutcome> GetEmonMonitorDataOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::GetEmonMonitorDataRequest&, const GetEmonMonitorDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetEmonMonitorDataAsyncHandler;
@@ -680,6 +680,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::OpenHttpsResult> OpenHttpsOutcome;
 			typedef std::future<OpenHttpsOutcome> OpenHttpsOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::OpenHttpsRequest&, const OpenHttpsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> OpenHttpsAsyncHandler;
+			typedef Outcome<Error, Model::PostEmonTryAlarmRuleResult> PostEmonTryAlarmRuleOutcome;
+			typedef std::future<PostEmonTryAlarmRuleOutcome> PostEmonTryAlarmRuleOutcomeCallable;
+			typedef std::function<void(const ElasticsearchClient*, const Model::PostEmonTryAlarmRuleRequest&, const PostEmonTryAlarmRuleOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> PostEmonTryAlarmRuleAsyncHandler;
 			typedef Outcome<Error, Model::RecommendTemplatesResult> RecommendTemplatesOutcome;
 			typedef std::future<RecommendTemplatesOutcome> RecommendTemplatesOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::RecommendTemplatesRequest&, const RecommendTemplatesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> RecommendTemplatesAsyncHandler;
@@ -707,9 +710,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ResumeLogstashTaskResult> ResumeLogstashTaskOutcome;
 			typedef std::future<ResumeLogstashTaskOutcome> ResumeLogstashTaskOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::ResumeLogstashTaskRequest&, const ResumeLogstashTaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ResumeLogstashTaskAsyncHandler;
-			typedef Outcome<Error, Model::RollbackInstanceResult> RollbackInstanceOutcome;
-			typedef std::future<RollbackInstanceOutcome> RollbackInstanceOutcomeCallable;
-			typedef std::function<void(const ElasticsearchClient*, const Model::RollbackInstanceRequest&, const RollbackInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> RollbackInstanceAsyncHandler;
 			typedef Outcome<Error, Model::RolloverDataStreamResult> RolloverDataStreamOutcome;
 			typedef std::future<RolloverDataStreamOutcome> RolloverDataStreamOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::RolloverDataStreamRequest&, const RolloverDataStreamOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> RolloverDataStreamAsyncHandler;
@@ -922,9 +922,6 @@ namespace AlibabaCloud
 			CreatePipelinesOutcome createPipelines(const Model::CreatePipelinesRequest &request)const;
 			void createPipelinesAsync(const Model::CreatePipelinesRequest& request, const CreatePipelinesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreatePipelinesOutcomeCallable createPipelinesCallable(const Model::CreatePipelinesRequest& request) const;
-			CreateProjectOutcome createProject(const Model::CreateProjectRequest &request)const;
-			void createProjectAsync(const Model::CreateProjectRequest& request, const CreateProjectAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			CreateProjectOutcomeCallable createProjectCallable(const Model::CreateProjectRequest& request) const;
 			CreateSnapshotOutcome createSnapshot(const Model::CreateSnapshotRequest &request)const;
 			void createSnapshotAsync(const Model::CreateSnapshotRequest& request, const CreateSnapshotAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateSnapshotOutcomeCallable createSnapshotCallable(const Model::CreateSnapshotRequest& request) const;
@@ -958,9 +955,6 @@ namespace AlibabaCloud
 			DeletePipelinesOutcome deletePipelines(const Model::DeletePipelinesRequest &request)const;
 			void deletePipelinesAsync(const Model::DeletePipelinesRequest& request, const DeletePipelinesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeletePipelinesOutcomeCallable deletePipelinesCallable(const Model::DeletePipelinesRequest& request) const;
-			DeleteProjectOutcome deleteProject(const Model::DeleteProjectRequest &request)const;
-			void deleteProjectAsync(const Model::DeleteProjectRequest& request, const DeleteProjectAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DeleteProjectOutcomeCallable deleteProjectCallable(const Model::DeleteProjectRequest& request) const;
 			DeleteSnapshotRepoOutcome deleteSnapshotRepo(const Model::DeleteSnapshotRepoRequest &request)const;
 			void deleteSnapshotRepoAsync(const Model::DeleteSnapshotRepoRequest& request, const DeleteSnapshotRepoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteSnapshotRepoOutcomeCallable deleteSnapshotRepoCallable(const Model::DeleteSnapshotRepoRequest& request) const;
@@ -1030,6 +1024,12 @@ namespace AlibabaCloud
 			GetElastictaskOutcome getElastictask(const Model::GetElastictaskRequest &request)const;
 			void getElastictaskAsync(const Model::GetElastictaskRequest& request, const GetElastictaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetElastictaskOutcomeCallable getElastictaskCallable(const Model::GetElastictaskRequest& request) const;
+			GetEmonGrafanaAlertsOutcome getEmonGrafanaAlerts(const Model::GetEmonGrafanaAlertsRequest &request)const;
+			void getEmonGrafanaAlertsAsync(const Model::GetEmonGrafanaAlertsRequest& request, const GetEmonGrafanaAlertsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetEmonGrafanaAlertsOutcomeCallable getEmonGrafanaAlertsCallable(const Model::GetEmonGrafanaAlertsRequest& request) const;
+			GetEmonGrafanaDashboardsOutcome getEmonGrafanaDashboards(const Model::GetEmonGrafanaDashboardsRequest &request)const;
+			void getEmonGrafanaDashboardsAsync(const Model::GetEmonGrafanaDashboardsRequest& request, const GetEmonGrafanaDashboardsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetEmonGrafanaDashboardsOutcomeCallable getEmonGrafanaDashboardsCallable(const Model::GetEmonGrafanaDashboardsRequest& request) const;
 			GetEmonMonitorDataOutcome getEmonMonitorData(const Model::GetEmonMonitorDataRequest &request)const;
 			void getEmonMonitorDataAsync(const Model::GetEmonMonitorDataRequest& request, const GetEmonMonitorDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetEmonMonitorDataOutcomeCallable getEmonMonitorDataCallable(const Model::GetEmonMonitorDataRequest& request) const;
@@ -1186,6 +1186,9 @@ namespace AlibabaCloud
 			OpenHttpsOutcome openHttps(const Model::OpenHttpsRequest &request)const;
 			void openHttpsAsync(const Model::OpenHttpsRequest& request, const OpenHttpsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			OpenHttpsOutcomeCallable openHttpsCallable(const Model::OpenHttpsRequest& request) const;
+			PostEmonTryAlarmRuleOutcome postEmonTryAlarmRule(const Model::PostEmonTryAlarmRuleRequest &request)const;
+			void postEmonTryAlarmRuleAsync(const Model::PostEmonTryAlarmRuleRequest& request, const PostEmonTryAlarmRuleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			PostEmonTryAlarmRuleOutcomeCallable postEmonTryAlarmRuleCallable(const Model::PostEmonTryAlarmRuleRequest& request) const;
 			RecommendTemplatesOutcome recommendTemplates(const Model::RecommendTemplatesRequest &request)const;
 			void recommendTemplatesAsync(const Model::RecommendTemplatesRequest& request, const RecommendTemplatesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			RecommendTemplatesOutcomeCallable recommendTemplatesCallable(const Model::RecommendTemplatesRequest& request) const;
@@ -1213,9 +1216,6 @@ namespace AlibabaCloud
 			ResumeLogstashTaskOutcome resumeLogstashTask(const Model::ResumeLogstashTaskRequest &request)const;
 			void resumeLogstashTaskAsync(const Model::ResumeLogstashTaskRequest& request, const ResumeLogstashTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ResumeLogstashTaskOutcomeCallable resumeLogstashTaskCallable(const Model::ResumeLogstashTaskRequest& request) const;
-			RollbackInstanceOutcome rollbackInstance(const Model::RollbackInstanceRequest &request)const;
-			void rollbackInstanceAsync(const Model::RollbackInstanceRequest& request, const RollbackInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			RollbackInstanceOutcomeCallable rollbackInstanceCallable(const Model::RollbackInstanceRequest& request) const;
 			RolloverDataStreamOutcome rolloverDataStream(const Model::RolloverDataStreamRequest &request)const;
 			void rolloverDataStreamAsync(const Model::RolloverDataStreamRequest& request, const RolloverDataStreamAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			RolloverDataStreamOutcomeCallable rolloverDataStreamCallable(const Model::RolloverDataStreamRequest& request) const;

elasticsearch/include/alibabacloud/elasticsearch/model/CreateProjectRequest.h → elasticsearch/include/alibabacloud/elasticsearch/model/GetEmonGrafanaAlertsRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_CREATEPROJECTREQUEST_H_
-#define ALIBABACLOUD_ELASTICSEARCH_MODEL_CREATEPROJECTREQUEST_H_
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_GETEMONGRAFANAALERTSREQUEST_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_GETEMONGRAFANAALERTSREQUEST_H_
 
 #include <string>
 #include <vector>
@@ -28,21 +28,21 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ELASTICSEARCH_EXPORT CreateProjectRequest : public RoaServiceRequest
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT GetEmonGrafanaAlertsRequest : public RoaServiceRequest
 			{
 
 			public:
-				CreateProjectRequest();
-				~CreateProjectRequest();
+				GetEmonGrafanaAlertsRequest();
+				~GetEmonGrafanaAlertsRequest();
 
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
+				std::string getProjectId()const;
+				void setProjectId(const std::string& projectId);
 
             private:
-				std::string clientToken_;
+				std::string projectId_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_CREATEPROJECTREQUEST_H_
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_GETEMONGRAFANAALERTSREQUEST_H_

elasticsearch/include/alibabacloud/elasticsearch/model/CreateProjectResult.h → elasticsearch/include/alibabacloud/elasticsearch/model/GetEmonGrafanaAlertsResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_CREATEPROJECTRESULT_H_
-#define ALIBABACLOUD_ELASTICSEARCH_MODEL_CREATEPROJECTRESULT_H_
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_GETEMONGRAFANAALERTSRESULT_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_GETEMONGRAFANAALERTSRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,27 +29,27 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ELASTICSEARCH_EXPORT CreateProjectResult : public ServiceResult
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT GetEmonGrafanaAlertsResult : public ServiceResult
 			{
 			public:
-				struct Result
-				{
-					std::string id;
-				};
 
 
-				CreateProjectResult();
-				explicit CreateProjectResult(const std::string &payload);
-				~CreateProjectResult();
-				Result getResult()const;
+				GetEmonGrafanaAlertsResult();
+				explicit GetEmonGrafanaAlertsResult(const std::string &payload);
+				~GetEmonGrafanaAlertsResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+				bool getSuccess()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				Result result_;
+				std::string message_;
+				std::string code_;
+				bool success_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_CREATEPROJECTRESULT_H_
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_GETEMONGRAFANAALERTSRESULT_H_

elasticsearch/include/alibabacloud/elasticsearch/model/DeleteProjectRequest.h → elasticsearch/include/alibabacloud/elasticsearch/model/GetEmonGrafanaDashboardsRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_DELETEPROJECTREQUEST_H_
-#define ALIBABACLOUD_ELASTICSEARCH_MODEL_DELETEPROJECTREQUEST_H_
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_GETEMONGRAFANADASHBOARDSREQUEST_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_GETEMONGRAFANADASHBOARDSREQUEST_H_
 
 #include <string>
 #include <vector>
@@ -28,24 +28,21 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ELASTICSEARCH_EXPORT DeleteProjectRequest : public RoaServiceRequest
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT GetEmonGrafanaDashboardsRequest : public RoaServiceRequest
 			{
 
 			public:
-				DeleteProjectRequest();
-				~DeleteProjectRequest();
+				GetEmonGrafanaDashboardsRequest();
+				~GetEmonGrafanaDashboardsRequest();
 
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getId()const;
-				void setId(const std::string& id);
+				std::string getProjectId()const;
+				void setProjectId(const std::string& projectId);
 
             private:
-				std::string clientToken_;
-				std::string id_;
+				std::string projectId_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_DELETEPROJECTREQUEST_H_
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_GETEMONGRAFANADASHBOARDSREQUEST_H_

elasticsearch/include/alibabacloud/elasticsearch/model/GetEmonGrafanaDashboardsResult.h

@@ -0,0 +1,55 @@
+/*
+ * 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_ELASTICSEARCH_MODEL_GETEMONGRAFANADASHBOARDSRESULT_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_GETEMONGRAFANADASHBOARDSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT GetEmonGrafanaDashboardsResult : public ServiceResult
+			{
+			public:
+
+
+				GetEmonGrafanaDashboardsResult();
+				explicit GetEmonGrafanaDashboardsResult(const std::string &payload);
+				~GetEmonGrafanaDashboardsResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+				bool getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string code_;
+				bool success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_GETEMONGRAFANADASHBOARDSRESULT_H_

elasticsearch/include/alibabacloud/elasticsearch/model/ListInstanceRequest.h

@@ -39,8 +39,6 @@ namespace AlibabaCloud
 				void setDescription(const std::string& description);
 				std::string getInstanceCategory()const;
 				void setInstanceCategory(const std::string& instanceCategory);
-				std::string getOwnerId()const;
-				void setOwnerId(const std::string& ownerId);
 				std::string getTags()const;
 				void setTags(const std::string& tags);
 				std::string getResourceGroupId()const;
@@ -63,7 +61,6 @@ namespace AlibabaCloud
             private:
 				std::string description_;
 				std::string instanceCategory_;
-				std::string ownerId_;
 				std::string tags_;
 				std::string resourceGroupId_;
 				std::string instanceId_;

elasticsearch/include/alibabacloud/elasticsearch/model/ListInstanceResult.h

@@ -104,6 +104,7 @@ namespace AlibabaCloud
 					bool advancedDedicateMaster;
 					NodeSpec nodeSpec;
 					std::string paymentType;
+					std::string postpaidServiceStatus;
 					ClientNodeConfiguration clientNodeConfiguration;
 				};
 

elasticsearch/include/alibabacloud/elasticsearch/model/RollbackInstanceRequest.h → elasticsearch/include/alibabacloud/elasticsearch/model/PostEmonTryAlarmRuleRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_ROLLBACKINSTANCEREQUEST_H_
-#define ALIBABACLOUD_ELASTICSEARCH_MODEL_ROLLBACKINSTANCEREQUEST_H_
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_POSTEMONTRYALARMRULEREQUEST_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_POSTEMONTRYALARMRULEREQUEST_H_
 
 #include <string>
 #include <vector>
@@ -28,24 +28,24 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ELASTICSEARCH_EXPORT RollbackInstanceRequest : public RoaServiceRequest
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT PostEmonTryAlarmRuleRequest : public RoaServiceRequest
 			{
 
 			public:
-				RollbackInstanceRequest();
-				~RollbackInstanceRequest();
+				PostEmonTryAlarmRuleRequest();
+				~PostEmonTryAlarmRuleRequest();
 
-				std::string getInstanceId()const;
-				void setInstanceId(const std::string& instanceId);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
+				std::string getAlarmGroupId()const;
+				void setAlarmGroupId(const std::string& alarmGroupId);
+				std::string getProjectId()const;
+				void setProjectId(const std::string& projectId);
 
             private:
-				std::string instanceId_;
-				std::string clientToken_;
+				std::string alarmGroupId_;
+				std::string projectId_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_ROLLBACKINSTANCEREQUEST_H_
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_POSTEMONTRYALARMRULEREQUEST_H_

elasticsearch/include/alibabacloud/elasticsearch/model/DeleteProjectResult.h → elasticsearch/include/alibabacloud/elasticsearch/model/PostEmonTryAlarmRuleResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_DELETEPROJECTRESULT_H_
-#define ALIBABACLOUD_ELASTICSEARCH_MODEL_DELETEPROJECTRESULT_H_
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_POSTEMONTRYALARMRULERESULT_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_POSTEMONTRYALARMRULERESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,21 +29,27 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ELASTICSEARCH_EXPORT DeleteProjectResult : public ServiceResult
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT PostEmonTryAlarmRuleResult : public ServiceResult
 			{
 			public:
 
 
-				DeleteProjectResult();
-				explicit DeleteProjectResult(const std::string &payload);
-				~DeleteProjectResult();
+				PostEmonTryAlarmRuleResult();
+				explicit PostEmonTryAlarmRuleResult(const std::string &payload);
+				~PostEmonTryAlarmRuleResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+				bool getSuccess()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::string message_;
+				std::string code_;
+				bool success_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_DELETEPROJECTRESULT_H_
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_POSTEMONTRYALARMRULERESULT_H_

elasticsearch/include/alibabacloud/elasticsearch/model/RollbackInstanceResult.h

@@ -1,77 +0,0 @@
-/*
- * 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_ELASTICSEARCH_MODEL_ROLLBACKINSTANCERESULT_H_
-#define ALIBABACLOUD_ELASTICSEARCH_MODEL_ROLLBACKINSTANCERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Elasticsearch
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ELASTICSEARCH_EXPORT RollbackInstanceResult : public ServiceResult
-			{
-			public:
-				struct Result
-				{
-					struct NodeSpec
-					{
-						std::string spec;
-						int disk;
-					};
-					struct NetworkConfig
-					{
-						std::string type;
-						std::string vpcId;
-						std::string vswitchId;
-						std::string vsArea;
-					};
-					std::string status;
-					std::string description;
-					std::string instanceId;
-					NodeSpec nodeSpec;
-					std::string createdAt;
-					NetworkConfig networkConfig;
-					std::string paymentType;
-					std::string domain;
-					int nodeAmount;
-					std::string esVersion;
-					std::string updatedAt;
-				};
-
-
-				RollbackInstanceResult();
-				explicit RollbackInstanceResult(const std::string &payload);
-				~RollbackInstanceResult();
-				Result getResult()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				Result result_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_ROLLBACKINSTANCERESULT_H_

elasticsearch/src/ElasticsearchClient.cc

@@ -663,42 +663,6 @@ ElasticsearchClient::CreatePipelinesOutcomeCallable ElasticsearchClient::createP
 	return task->get_future();
 }
 
-ElasticsearchClient::CreateProjectOutcome ElasticsearchClient::createProject(const CreateProjectRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return CreateProjectOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return CreateProjectOutcome(CreateProjectResult(outcome.result()));
-	else
-		return CreateProjectOutcome(outcome.error());
-}
-
-void ElasticsearchClient::createProjectAsync(const CreateProjectRequest& request, const CreateProjectAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, createProject(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-ElasticsearchClient::CreateProjectOutcomeCallable ElasticsearchClient::createProjectCallable(const CreateProjectRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<CreateProjectOutcome()>>(
-			[this, request]()
-			{
-			return this->createProject(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 ElasticsearchClient::CreateSnapshotOutcome ElasticsearchClient::createSnapshot(const CreateSnapshotRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1095,42 +1059,6 @@ ElasticsearchClient::DeletePipelinesOutcomeCallable ElasticsearchClient::deleteP
 	return task->get_future();
 }
 
-ElasticsearchClient::DeleteProjectOutcome ElasticsearchClient::deleteProject(const DeleteProjectRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DeleteProjectOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DeleteProjectOutcome(DeleteProjectResult(outcome.result()));
-	else
-		return DeleteProjectOutcome(outcome.error());
-}
-
-void ElasticsearchClient::deleteProjectAsync(const DeleteProjectRequest& request, const DeleteProjectAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, deleteProject(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-ElasticsearchClient::DeleteProjectOutcomeCallable ElasticsearchClient::deleteProjectCallable(const DeleteProjectRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DeleteProjectOutcome()>>(
-			[this, request]()
-			{
-			return this->deleteProject(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 ElasticsearchClient::DeleteSnapshotRepoOutcome ElasticsearchClient::deleteSnapshotRepo(const DeleteSnapshotRepoRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1959,6 +1887,78 @@ ElasticsearchClient::GetElastictaskOutcomeCallable ElasticsearchClient::getElast
 	return task->get_future();
 }
 
+ElasticsearchClient::GetEmonGrafanaAlertsOutcome ElasticsearchClient::getEmonGrafanaAlerts(const GetEmonGrafanaAlertsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetEmonGrafanaAlertsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetEmonGrafanaAlertsOutcome(GetEmonGrafanaAlertsResult(outcome.result()));
+	else
+		return GetEmonGrafanaAlertsOutcome(outcome.error());
+}
+
+void ElasticsearchClient::getEmonGrafanaAlertsAsync(const GetEmonGrafanaAlertsRequest& request, const GetEmonGrafanaAlertsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getEmonGrafanaAlerts(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ElasticsearchClient::GetEmonGrafanaAlertsOutcomeCallable ElasticsearchClient::getEmonGrafanaAlertsCallable(const GetEmonGrafanaAlertsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetEmonGrafanaAlertsOutcome()>>(
+			[this, request]()
+			{
+			return this->getEmonGrafanaAlerts(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+ElasticsearchClient::GetEmonGrafanaDashboardsOutcome ElasticsearchClient::getEmonGrafanaDashboards(const GetEmonGrafanaDashboardsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetEmonGrafanaDashboardsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetEmonGrafanaDashboardsOutcome(GetEmonGrafanaDashboardsResult(outcome.result()));
+	else
+		return GetEmonGrafanaDashboardsOutcome(outcome.error());
+}
+
+void ElasticsearchClient::getEmonGrafanaDashboardsAsync(const GetEmonGrafanaDashboardsRequest& request, const GetEmonGrafanaDashboardsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getEmonGrafanaDashboards(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ElasticsearchClient::GetEmonGrafanaDashboardsOutcomeCallable ElasticsearchClient::getEmonGrafanaDashboardsCallable(const GetEmonGrafanaDashboardsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetEmonGrafanaDashboardsOutcome()>>(
+			[this, request]()
+			{
+			return this->getEmonGrafanaDashboards(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ElasticsearchClient::GetEmonMonitorDataOutcome ElasticsearchClient::getEmonMonitorData(const GetEmonMonitorDataRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -3831,6 +3831,42 @@ ElasticsearchClient::OpenHttpsOutcomeCallable ElasticsearchClient::openHttpsCall
 	return task->get_future();
 }
 
+ElasticsearchClient::PostEmonTryAlarmRuleOutcome ElasticsearchClient::postEmonTryAlarmRule(const PostEmonTryAlarmRuleRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return PostEmonTryAlarmRuleOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return PostEmonTryAlarmRuleOutcome(PostEmonTryAlarmRuleResult(outcome.result()));
+	else
+		return PostEmonTryAlarmRuleOutcome(outcome.error());
+}
+
+void ElasticsearchClient::postEmonTryAlarmRuleAsync(const PostEmonTryAlarmRuleRequest& request, const PostEmonTryAlarmRuleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, postEmonTryAlarmRule(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ElasticsearchClient::PostEmonTryAlarmRuleOutcomeCallable ElasticsearchClient::postEmonTryAlarmRuleCallable(const PostEmonTryAlarmRuleRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<PostEmonTryAlarmRuleOutcome()>>(
+			[this, request]()
+			{
+			return this->postEmonTryAlarmRule(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ElasticsearchClient::RecommendTemplatesOutcome ElasticsearchClient::recommendTemplates(const RecommendTemplatesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -4155,42 +4191,6 @@ ElasticsearchClient::ResumeLogstashTaskOutcomeCallable ElasticsearchClient::resu
 	return task->get_future();
 }
 
-ElasticsearchClient::RollbackInstanceOutcome ElasticsearchClient::rollbackInstance(const RollbackInstanceRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return RollbackInstanceOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return RollbackInstanceOutcome(RollbackInstanceResult(outcome.result()));
-	else
-		return RollbackInstanceOutcome(outcome.error());
-}
-
-void ElasticsearchClient::rollbackInstanceAsync(const RollbackInstanceRequest& request, const RollbackInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, rollbackInstance(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-ElasticsearchClient::RollbackInstanceOutcomeCallable ElasticsearchClient::rollbackInstanceCallable(const RollbackInstanceRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<RollbackInstanceOutcome()>>(
-			[this, request]()
-			{
-			return this->rollbackInstance(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 ElasticsearchClient::RolloverDataStreamOutcome ElasticsearchClient::rolloverDataStream(const RolloverDataStreamRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

elasticsearch/src/model/DeleteProjectRequest.cc

@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-#include <alibabacloud/elasticsearch/model/DeleteProjectRequest.h>
-
-using AlibabaCloud::Elasticsearch::Model::DeleteProjectRequest;
-
-DeleteProjectRequest::DeleteProjectRequest() :
-	RoaServiceRequest("elasticsearch", "2017-06-13")
-{
-	setResourcePath("/openapi/projects/[Id]");
-	setMethod(HttpRequest::Method::Delete);
-}
-
-DeleteProjectRequest::~DeleteProjectRequest()
-{}
-
-std::string DeleteProjectRequest::getClientToken()const
-{
-	return clientToken_;
-}
-
-void DeleteProjectRequest::setClientToken(const std::string& clientToken)
-{
-	clientToken_ = clientToken;
-	setParameter("ClientToken", clientToken);
-}
-
-std::string DeleteProjectRequest::getId()const
-{
-	return id_;
-}
-
-void DeleteProjectRequest::setId(const std::string& id)
-{
-	id_ = id;
-	setParameter("Id", id);
-}
-

elasticsearch/src/model/CreateProjectRequest.cc → elasticsearch/src/model/GetEmonGrafanaAlertsRequest.cc

@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-#include <alibabacloud/elasticsearch/model/CreateProjectRequest.h>
+#include <alibabacloud/elasticsearch/model/GetEmonGrafanaAlertsRequest.h>
 
-using AlibabaCloud::Elasticsearch::Model::CreateProjectRequest;
+using AlibabaCloud::Elasticsearch::Model::GetEmonGrafanaAlertsRequest;
 
-CreateProjectRequest::CreateProjectRequest() :
+GetEmonGrafanaAlertsRequest::GetEmonGrafanaAlertsRequest() :
 	RoaServiceRequest("elasticsearch", "2017-06-13")
 {
-	setResourcePath("/openapi/projects");
-	setMethod(HttpRequest::Method::Post);
+	setResourcePath("/openapi/emon/projects/[ProjectId]/grafana/proxy/api/alerts");
+	setMethod(HttpRequest::Method::Get);
 }
 
-CreateProjectRequest::~CreateProjectRequest()
+GetEmonGrafanaAlertsRequest::~GetEmonGrafanaAlertsRequest()
 {}
 
-std::string CreateProjectRequest::getClientToken()const
+std::string GetEmonGrafanaAlertsRequest::getProjectId()const
 {
-	return clientToken_;
+	return projectId_;
 }
 
-void CreateProjectRequest::setClientToken(const std::string& clientToken)
+void GetEmonGrafanaAlertsRequest::setProjectId(const std::string& projectId)
 {
-	clientToken_ = clientToken;
-	setParameter("ClientToken", clientToken);
+	projectId_ = projectId;
+	setParameter("ProjectId", projectId);
 }
 

elasticsearch/src/model/CreateProjectResult.cc → elasticsearch/src/model/GetEmonGrafanaAlertsResult.cc

@@ -14,39 +14,52 @@
  * limitations under the License.
  */
 
-#include <alibabacloud/elasticsearch/model/CreateProjectResult.h>
+#include <alibabacloud/elasticsearch/model/GetEmonGrafanaAlertsResult.h>
 #include <json/json.h>
 
 using namespace AlibabaCloud::Elasticsearch;
 using namespace AlibabaCloud::Elasticsearch::Model;
 
-CreateProjectResult::CreateProjectResult() :
+GetEmonGrafanaAlertsResult::GetEmonGrafanaAlertsResult() :
 	ServiceResult()
 {}
 
-CreateProjectResult::CreateProjectResult(const std::string &payload) :
+GetEmonGrafanaAlertsResult::GetEmonGrafanaAlertsResult(const std::string &payload) :
 	ServiceResult()
 {
 	parse(payload);
 }
 
-CreateProjectResult::~CreateProjectResult()
+GetEmonGrafanaAlertsResult::~GetEmonGrafanaAlertsResult()
 {}
 
-void CreateProjectResult::parse(const std::string &payload)
+void GetEmonGrafanaAlertsResult::parse(const std::string &payload)
 {
 	Json::Reader reader;
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto resultNode = value["Result"];
-	if(!resultNode["id"].isNull())
-		result_.id = resultNode["id"].asString();
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
 
 }
 
-CreateProjectResult::Result CreateProjectResult::getResult()const
+std::string GetEmonGrafanaAlertsResult::getMessage()const
 {
-	return result_;
+	return message_;
+}
+
+std::string GetEmonGrafanaAlertsResult::getCode()const
+{
+	return code_;
+}
+
+bool GetEmonGrafanaAlertsResult::getSuccess()const
+{
+	return success_;
 }
 

elasticsearch/src/model/GetEmonGrafanaDashboardsRequest.cc

@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+#include <alibabacloud/elasticsearch/model/GetEmonGrafanaDashboardsRequest.h>
+
+using AlibabaCloud::Elasticsearch::Model::GetEmonGrafanaDashboardsRequest;
+
+GetEmonGrafanaDashboardsRequest::GetEmonGrafanaDashboardsRequest() :
+	RoaServiceRequest("elasticsearch", "2017-06-13")
+{
+	setResourcePath("/openapi/emon/projects/[ProjectId]/grafana/proxy/api/search");
+	setMethod(HttpRequest::Method::Get);
+}
+
+GetEmonGrafanaDashboardsRequest::~GetEmonGrafanaDashboardsRequest()
+{}
+
+std::string GetEmonGrafanaDashboardsRequest::getProjectId()const
+{
+	return projectId_;
+}
+
+void GetEmonGrafanaDashboardsRequest::setProjectId(const std::string& projectId)
+{
+	projectId_ = projectId;
+	setParameter("ProjectId", projectId);
+}
+

elasticsearch/src/model/GetEmonGrafanaDashboardsResult.cc

@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+#include <alibabacloud/elasticsearch/model/GetEmonGrafanaDashboardsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Elasticsearch;
+using namespace AlibabaCloud::Elasticsearch::Model;
+
+GetEmonGrafanaDashboardsResult::GetEmonGrafanaDashboardsResult() :
+	ServiceResult()
+{}
+
+GetEmonGrafanaDashboardsResult::GetEmonGrafanaDashboardsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GetEmonGrafanaDashboardsResult::~GetEmonGrafanaDashboardsResult()
+{}
+
+void GetEmonGrafanaDashboardsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
+
+}
+
+std::string GetEmonGrafanaDashboardsResult::getMessage()const
+{
+	return message_;
+}
+
+std::string GetEmonGrafanaDashboardsResult::getCode()const
+{
+	return code_;
+}
+
+bool GetEmonGrafanaDashboardsResult::getSuccess()const
+{
+	return success_;
+}
+

elasticsearch/src/model/ListInstanceRequest.cc

@@ -50,17 +50,6 @@ void ListInstanceRequest::setInstanceCategory(const std::string& instanceCategor
 	setParameter("InstanceCategory", instanceCategory);
 }
 
-std::string ListInstanceRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void ListInstanceRequest::setOwnerId(const std::string& ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", ownerId);
-}
-
 std::string ListInstanceRequest::getTags()const
 {
 	return tags_;

elasticsearch/src/model/ListInstanceResult.cc

@@ -65,6 +65,8 @@ void ListInstanceResult::parse(const std::string &payload)
 			resultObject.status = valueResultInstance["status"].asString();
 		if(!valueResultInstance["updatedAt"].isNull())
 			resultObject.updatedAt = valueResultInstance["updatedAt"].asString();
+		if(!valueResultInstance["postpaidServiceStatus"].isNull())
+			resultObject.postpaidServiceStatus = valueResultInstance["postpaidServiceStatus"].asString();
 		auto alltagsNode = valueResultInstance["tags"]["Tag"];
 		for (auto valueResultInstancetagsTag : alltagsNode)
 		{

elasticsearch/src/model/PostEmonTryAlarmRuleRequest.cc

@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+#include <alibabacloud/elasticsearch/model/PostEmonTryAlarmRuleRequest.h>
+
+using AlibabaCloud::Elasticsearch::Model::PostEmonTryAlarmRuleRequest;
+
+PostEmonTryAlarmRuleRequest::PostEmonTryAlarmRuleRequest() :
+	RoaServiceRequest("elasticsearch", "2017-06-13")
+{
+	setResourcePath("/openapi/emon/projects/[ProjectId]/alarm-groups/[AlarmGroupId]/alarm-rules/_test");
+	setMethod(HttpRequest::Method::Post);
+}
+
+PostEmonTryAlarmRuleRequest::~PostEmonTryAlarmRuleRequest()
+{}
+
+std::string PostEmonTryAlarmRuleRequest::getAlarmGroupId()const
+{
+	return alarmGroupId_;
+}
+
+void PostEmonTryAlarmRuleRequest::setAlarmGroupId(const std::string& alarmGroupId)
+{
+	alarmGroupId_ = alarmGroupId;
+	setParameter("AlarmGroupId", alarmGroupId);
+}
+
+std::string PostEmonTryAlarmRuleRequest::getProjectId()const
+{
+	return projectId_;
+}
+
+void PostEmonTryAlarmRuleRequest::setProjectId(const std::string& projectId)
+{
+	projectId_ = projectId;
+	setParameter("ProjectId", projectId);
+}
+

elasticsearch/src/model/DeleteProjectResult.cc → elasticsearch/src/model/PostEmonTryAlarmRuleResult.cc

@@ -14,31 +14,52 @@
  * limitations under the License.
  */
 
-#include <alibabacloud/elasticsearch/model/DeleteProjectResult.h>
+#include <alibabacloud/elasticsearch/model/PostEmonTryAlarmRuleResult.h>
 #include <json/json.h>
 
 using namespace AlibabaCloud::Elasticsearch;
 using namespace AlibabaCloud::Elasticsearch::Model;
 
-DeleteProjectResult::DeleteProjectResult() :
+PostEmonTryAlarmRuleResult::PostEmonTryAlarmRuleResult() :
 	ServiceResult()
 {}
 
-DeleteProjectResult::DeleteProjectResult(const std::string &payload) :
+PostEmonTryAlarmRuleResult::PostEmonTryAlarmRuleResult(const std::string &payload) :
 	ServiceResult()
 {
 	parse(payload);
 }
 
-DeleteProjectResult::~DeleteProjectResult()
+PostEmonTryAlarmRuleResult::~PostEmonTryAlarmRuleResult()
 {}
 
-void DeleteProjectResult::parse(const std::string &payload)
+void PostEmonTryAlarmRuleResult::parse(const std::string &payload)
 {
 	Json::Reader reader;
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
 
 }
 
+std::string PostEmonTryAlarmRuleResult::getMessage()const
+{
+	return message_;
+}
+
+std::string PostEmonTryAlarmRuleResult::getCode()const
+{
+	return code_;
+}
+
+bool PostEmonTryAlarmRuleResult::getSuccess()const
+{
+	return success_;
+}
+

elasticsearch/src/model/RollbackInstanceRequest.cc

@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-#include <alibabacloud/elasticsearch/model/RollbackInstanceRequest.h>
-
-using AlibabaCloud::Elasticsearch::Model::RollbackInstanceRequest;
-
-RollbackInstanceRequest::RollbackInstanceRequest() :
-	RoaServiceRequest("elasticsearch", "2017-06-13")
-{
-	setResourcePath("/openapi/instances/[InstanceId]/actions/rollback");
-	setMethod(HttpRequest::Method::Post);
-}
-
-RollbackInstanceRequest::~RollbackInstanceRequest()
-{}
-
-std::string RollbackInstanceRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void RollbackInstanceRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setParameter("InstanceId", instanceId);
-}
-
-std::string RollbackInstanceRequest::getClientToken()const
-{
-	return clientToken_;
-}
-
-void RollbackInstanceRequest::setClientToken(const std::string& clientToken)
-{
-	clientToken_ = clientToken;
-	setParameter("ClientToken", clientToken);
-}
-

elasticsearch/src/model/RollbackInstanceResult.cc

@@ -1,82 +0,0 @@
-/*
- * 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.
- */
-
-#include <alibabacloud/elasticsearch/model/RollbackInstanceResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Elasticsearch;
-using namespace AlibabaCloud::Elasticsearch::Model;
-
-RollbackInstanceResult::RollbackInstanceResult() :
-	ServiceResult()
-{}
-
-RollbackInstanceResult::RollbackInstanceResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-RollbackInstanceResult::~RollbackInstanceResult()
-{}
-
-void RollbackInstanceResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto resultNode = value["Result"];
-	if(!resultNode["instanceId"].isNull())
-		result_.instanceId = resultNode["instanceId"].asString();
-	if(!resultNode["domain"].isNull())
-		result_.domain = resultNode["domain"].asString();
-	if(!resultNode["description"].isNull())
-		result_.description = resultNode["description"].asString();
-	if(!resultNode["nodeAmount"].isNull())
-		result_.nodeAmount = std::stoi(resultNode["nodeAmount"].asString());
-	if(!resultNode["paymentType"].isNull())
-		result_.paymentType = resultNode["paymentType"].asString();
-	if(!resultNode["status"].isNull())
-		result_.status = resultNode["status"].asString();
-	if(!resultNode["esVersion"].isNull())
-		result_.esVersion = resultNode["esVersion"].asString();
-	if(!resultNode["createdAt"].isNull())
-		result_.createdAt = resultNode["createdAt"].asString();
-	if(!resultNode["updatedAt"].isNull())
-		result_.updatedAt = resultNode["updatedAt"].asString();
-	auto nodeSpecNode = resultNode["nodeSpec"];
-	if(!nodeSpecNode["spec"].isNull())
-		result_.nodeSpec.spec = nodeSpecNode["spec"].asString();
-	if(!nodeSpecNode["disk"].isNull())
-		result_.nodeSpec.disk = std::stoi(nodeSpecNode["disk"].asString());
-	auto networkConfigNode = resultNode["networkConfig"];
-	if(!networkConfigNode["type"].isNull())
-		result_.networkConfig.type = networkConfigNode["type"].asString();
-	if(!networkConfigNode["vpcId"].isNull())
-		result_.networkConfig.vpcId = networkConfigNode["vpcId"].asString();
-	if(!networkConfigNode["vswitchId"].isNull())
-		result_.networkConfig.vswitchId = networkConfigNode["vswitchId"].asString();
-	if(!networkConfigNode["vsArea"].isNull())
-		result_.networkConfig.vsArea = networkConfigNode["vsArea"].asString();
-
-}
-
-RollbackInstanceResult::Result RollbackInstanceResult::getResult()const
-{
-	return result_;
-}
-