ARMS SDK Auto Released By qikai.yangqikai,Version：1.32.1

Signed-off-by: yixiong.jxy <yixiong.jxy@alibaba-inc.com>

ChangeLog.txt

@@ -1,3 +1,6 @@
+2018-10-16 Version: 1.32.1
+1, This version add MetricQuery interface to support retcode and apm metric query.
+
 2018-10-16 Version: 1.32.0
 1, Delete deprecated and unusable apis : AddIpRange, UnbindIpRange, BindIpRange, DescribeIntranetAttributeKb, DescribeIpRanges, ModifyIntranetBandwidthKb, DescribeEventDetail, CheckAutoSnapshotPolicy, CheckDiskEnableAutoSnapshotValidation, DescribeAutoSnapshotPolicy
 2, Add instance topology api DescribeInstanceTopology

services/arms/arms_query_data_set.go

@@ -76,47 +76,49 @@ func (client *Client) ARMSQueryDataSetWithCallback(request *ARMSQueryDataSetRequ
 // ARMSQueryDataSetRequest is the request struct for api ARMSQueryDataSet
 type ARMSQueryDataSetRequest struct {
 	*requests.RpcRequest
-	DatasetId     requests.Integer                `position:"Query" name:"DatasetId"`
-	IntervalInSec requests.Integer                `position:"Query" name:"IntervalInSec"`
-	DateStr       requests.Integer                `position:"Query" name:"DateStr"`
+	DateStr       string                          `position:"Query" name:"DateStr"`
 	MinTime       requests.Integer                `position:"Query" name:"MinTime"`
+	ReduceTail    requests.Boolean                `position:"Query" name:"ReduceTail"`
 	MaxTime       requests.Integer                `position:"Query" name:"MaxTime"`
-	Dimensions    *[]ARMSQueryDataSetDimensions   `position:"Query" name:"Dimensions"  type:"Repeated"`
+	OptionalDims  *[]ARMSQueryDataSetOptionalDims `position:"Query" name:"OptionalDims"  type:"Repeated"`
 	Measures      *[]string                       `position:"Query" name:"Measures"  type:"Repeated"`
+	IntervalInSec requests.Integer                `position:"Query" name:"IntervalInSec"`
 	IsDrillDown   requests.Boolean                `position:"Query" name:"IsDrillDown"`
+	HungryMode    requests.Boolean                `position:"Query" name:"HungryMode"`
+	SecurityToken string                          `position:"Query" name:"SecurityToken"`
 	OrderByKey    string                          `position:"Query" name:"OrderByKey"`
 	Limit         requests.Integer                `position:"Query" name:"Limit"`
-	ReduceTail    requests.Boolean                `position:"Query" name:"ReduceTail"`
-	HungryMode    requests.Boolean                `position:"Query" name:"HungryMode"`
 	RequiredDims  *[]ARMSQueryDataSetRequiredDims `position:"Query" name:"RequiredDims"  type:"Repeated"`
-	OptionalDims  *[]ARMSQueryDataSetOptionalDims `position:"Query" name:"OptionalDims"  type:"Repeated"`
+	DatasetId     requests.Integer                `position:"Query" name:"DatasetId"`
+	Dimensions    *[]ARMSQueryDataSetDimensions   `position:"Query" name:"Dimensions"  type:"Repeated"`
 }
 
-// ARMSQueryDataSetDimensions is a repeated param struct in ARMSQueryDataSetRequest
-type ARMSQueryDataSetDimensions struct {
-	Key   string `name:"Key"`
-	Value string `name:"Value"`
+// ARMSQueryDataSetOptionalDims is a repeated param struct in ARMSQueryDataSetRequest
+type ARMSQueryDataSetOptionalDims struct {
 	Type  string `name:"Type"`
+	Value string `name:"Value"`
+	Key   string `name:"Key"`
 }
 
 // ARMSQueryDataSetRequiredDims is a repeated param struct in ARMSQueryDataSetRequest
 type ARMSQueryDataSetRequiredDims struct {
-	Key   string `name:"Key"`
-	Value string `name:"Value"`
 	Type  string `name:"Type"`
+	Value string `name:"Value"`
+	Key   string `name:"Key"`
 }
 
-// ARMSQueryDataSetOptionalDims is a repeated param struct in ARMSQueryDataSetRequest
-type ARMSQueryDataSetOptionalDims struct {
-	Key   string `name:"Key"`
-	Value string `name:"Value"`
+// ARMSQueryDataSetDimensions is a repeated param struct in ARMSQueryDataSetRequest
+type ARMSQueryDataSetDimensions struct {
 	Type  string `name:"Type"`
+	Value string `name:"Value"`
+	Key   string `name:"Key"`
 }
 
 // ARMSQueryDataSetResponse is the response struct for api ARMSQueryDataSet
 type ARMSQueryDataSetResponse struct {
 	*responses.BaseResponse
-	Data string `json:"Data" xml:"Data"`
+	Data      string `json:"Data" xml:"Data"`
+	RequestId string `json:"RequestId" xml:"RequestId"`
 }
 
 // CreateARMSQueryDataSetRequest creates a request to invoke ARMSQueryDataSet API
@@ -124,7 +126,7 @@ func CreateARMSQueryDataSetRequest() (request *ARMSQueryDataSetRequest) {
 	request = &ARMSQueryDataSetRequest{
 		RpcRequest: &requests.RpcRequest{},
 	}
-	request.InitWithApiInfo("ARMS", "2016-11-25", "ARMSQueryDataSet", "", "")
+	request.InitWithApiInfo("ARMS", "2018-10-15", "ARMSQueryDataSet", "", "")
 	return
 }
 

services/arms/metric_query.go

@@ -0,0 +1,120 @@
+package arms
+
+//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.
+//
+// Code generated by Alibaba Cloud SDK Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+import (
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
+)
+
+// MetricQuery invokes the arms.MetricQuery API synchronously
+// api document: https://help.aliyun.com/api/arms/metricquery.html
+func (client *Client) MetricQuery(request *MetricQueryRequest) (response *MetricQueryResponse, err error) {
+	response = CreateMetricQueryResponse()
+	err = client.DoAction(request, response)
+	return
+}
+
+// MetricQueryWithChan invokes the arms.MetricQuery API asynchronously
+// api document: https://help.aliyun.com/api/arms/metricquery.html
+// asynchronous document: https://help.aliyun.com/document_detail/66220.html
+func (client *Client) MetricQueryWithChan(request *MetricQueryRequest) (<-chan *MetricQueryResponse, <-chan error) {
+	responseChan := make(chan *MetricQueryResponse, 1)
+	errChan := make(chan error, 1)
+	err := client.AddAsyncTask(func() {
+		defer close(responseChan)
+		defer close(errChan)
+		response, err := client.MetricQuery(request)
+		if err != nil {
+			errChan <- err
+		} else {
+			responseChan <- response
+		}
+	})
+	if err != nil {
+		errChan <- err
+		close(responseChan)
+		close(errChan)
+	}
+	return responseChan, errChan
+}
+
+// MetricQueryWithCallback invokes the arms.MetricQuery API asynchronously
+// api document: https://help.aliyun.com/api/arms/metricquery.html
+// asynchronous document: https://help.aliyun.com/document_detail/66220.html
+func (client *Client) MetricQueryWithCallback(request *MetricQueryRequest, callback func(response *MetricQueryResponse, err error)) <-chan int {
+	result := make(chan int, 1)
+	err := client.AddAsyncTask(func() {
+		var response *MetricQueryResponse
+		var err error
+		defer close(result)
+		response, err = client.MetricQuery(request)
+		callback(response, err)
+		result <- 1
+	})
+	if err != nil {
+		defer close(result)
+		callback(nil, err)
+		result <- 0
+	}
+	return result
+}
+
+// MetricQueryRequest is the request struct for api MetricQuery
+type MetricQueryRequest struct {
+	*requests.RpcRequest
+	IintervalInSec requests.Integer      `position:"Query" name:"IintervalInSec"`
+	Measures       *[]string             `position:"Query" name:"Measures"  type:"Repeated"`
+	Metric         string                `position:"Query" name:"Metric"`
+	SecurityToken  string                `position:"Query" name:"SecurityToken"`
+	Limit          requests.Integer      `position:"Query" name:"Limit"`
+	EndTime        requests.Integer      `position:"Query" name:"EndTime"`
+	OrderBy        string                `position:"Query" name:"OrderBy"`
+	StartTime      requests.Integer      `position:"Query" name:"StartTime"`
+	Filters        *[]MetricQueryFilters `position:"Query" name:"Filters"  type:"Repeated"`
+	Dimensions     *[]string             `position:"Query" name:"Dimensions"  type:"Repeated"`
+	Order          string                `position:"Query" name:"Order"`
+}
+
+// MetricQueryFilters is a repeated param struct in MetricQueryRequest
+type MetricQueryFilters struct {
+	Value string `name:"Value"`
+	Key   string `name:"Key"`
+}
+
+// MetricQueryResponse is the response struct for api MetricQuery
+type MetricQueryResponse struct {
+	*responses.BaseResponse
+	Data      string `json:"Data" xml:"Data"`
+	RequestId string `json:"RequestId" xml:"RequestId"`
+}
+
+// CreateMetricQueryRequest creates a request to invoke MetricQuery API
+func CreateMetricQueryRequest() (request *MetricQueryRequest) {
+	request = &MetricQueryRequest{
+		RpcRequest: &requests.RpcRequest{},
+	}
+	request.InitWithApiInfo("ARMS", "2018-10-15", "MetricQuery", "", "")
+	return
+}
+
+// CreateMetricQueryResponse creates a response to parse from MetricQuery response
+func CreateMetricQueryResponse() (response *MetricQueryResponse) {
+	response = &MetricQueryResponse{
+		BaseResponse: &responses.BaseResponse{},
+	}
+	return
+}

services/arms/where_in_dim_query.go

@@ -1,122 +0,0 @@
-package arms
-
-//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.
-//
-// Code generated by Alibaba Cloud SDK Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is regenerated.
-
-import (
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
-)
-
-// WhereInDimQuery invokes the arms.WhereInDimQuery API synchronously
-// api document: https://help.aliyun.com/api/arms/whereindimquery.html
-func (client *Client) WhereInDimQuery(request *WhereInDimQueryRequest) (response *WhereInDimQueryResponse, err error) {
-	response = CreateWhereInDimQueryResponse()
-	err = client.DoAction(request, response)
-	return
-}
-
-// WhereInDimQueryWithChan invokes the arms.WhereInDimQuery API asynchronously
-// api document: https://help.aliyun.com/api/arms/whereindimquery.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) WhereInDimQueryWithChan(request *WhereInDimQueryRequest) (<-chan *WhereInDimQueryResponse, <-chan error) {
-	responseChan := make(chan *WhereInDimQueryResponse, 1)
-	errChan := make(chan error, 1)
-	err := client.AddAsyncTask(func() {
-		defer close(responseChan)
-		defer close(errChan)
-		response, err := client.WhereInDimQuery(request)
-		if err != nil {
-			errChan <- err
-		} else {
-			responseChan <- response
-		}
-	})
-	if err != nil {
-		errChan <- err
-		close(responseChan)
-		close(errChan)
-	}
-	return responseChan, errChan
-}
-
-// WhereInDimQueryWithCallback invokes the arms.WhereInDimQuery API asynchronously
-// api document: https://help.aliyun.com/api/arms/whereindimquery.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) WhereInDimQueryWithCallback(request *WhereInDimQueryRequest, callback func(response *WhereInDimQueryResponse, err error)) <-chan int {
-	result := make(chan int, 1)
-	err := client.AddAsyncTask(func() {
-		var response *WhereInDimQueryResponse
-		var err error
-		defer close(result)
-		response, err = client.WhereInDimQuery(request)
-		callback(response, err)
-		result <- 1
-	})
-	if err != nil {
-		defer close(result)
-		callback(nil, err)
-		result <- 0
-	}
-	return result
-}
-
-// WhereInDimQueryRequest is the request struct for api WhereInDimQuery
-type WhereInDimQueryRequest struct {
-	*requests.RpcRequest
-	DatasetId     requests.Integer             `position:"Query" name:"DatasetId"`
-	IntervalInSec requests.Integer             `position:"Query" name:"IntervalInSec"`
-	DateStr       string                       `position:"Query" name:"DateStr"`
-	MinTime       requests.Integer             `position:"Query" name:"MinTime"`
-	MaxTime       requests.Integer             `position:"Query" name:"MaxTime"`
-	Dimensions    *[]WhereInDimQueryDimensions `position:"Query" name:"Dimensions"  type:"Repeated"`
-	WhereInKey    string                       `position:"Query" name:"WhereInKey"`
-	WhereInValues *[]string                    `position:"Query" name:"WhereInValues"  type:"Repeated"`
-	Measures      *[]string                    `position:"Query" name:"Measures"  type:"Repeated"`
-	IsDrillDown   requests.Boolean             `position:"Query" name:"IsDrillDown"`
-	OrderByKey    string                       `position:"Query" name:"OrderByKey"`
-	Limit         requests.Integer             `position:"Query" name:"Limit"`
-	ReduceTail    requests.Boolean             `position:"Query" name:"ReduceTail"`
-}
-
-// WhereInDimQueryDimensions is a repeated param struct in WhereInDimQueryRequest
-type WhereInDimQueryDimensions struct {
-	Key   string `name:"Key"`
-	Value string `name:"Value"`
-	Type  string `name:"Type"`
-}
-
-// WhereInDimQueryResponse is the response struct for api WhereInDimQuery
-type WhereInDimQueryResponse struct {
-	*responses.BaseResponse
-	Data string `json:"Data" xml:"Data"`
-}
-
-// CreateWhereInDimQueryRequest creates a request to invoke WhereInDimQuery API
-func CreateWhereInDimQueryRequest() (request *WhereInDimQueryRequest) {
-	request = &WhereInDimQueryRequest{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	request.InitWithApiInfo("ARMS", "2016-11-25", "WhereInDimQuery", "", "")
-	return
-}
-
-// CreateWhereInDimQueryResponse creates a response to parse from WhereInDimQuery response
-func CreateWhereInDimQueryResponse() (response *WhereInDimQueryResponse) {
-	response = &WhereInDimQueryResponse{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	return
-}