Use this parameter to specify whether you want the operation to return metric alarms or composite alarms. If you omit this parameter, only metric alarms are returned.
", - "DescribeAlarmsInput$AlarmTypes": "Use this parameter to specify whether you want the operation to return metric alarms or composite alarms. If you omit this parameter, only metric alarms are returned.
" + "DescribeAlarmsInput$AlarmTypes": "Use this parameter to specify whether you want the operation to return metric alarms or composite alarms. If you omit this parameter, only metric alarms are returned, even if composite alarms exist in the account.
For example, if you omit this parameter or specify MetricAlarms, the operation returns only a list of metric alarms. It does not return any composite alarms, even if composite alarms exist in the account.
If you specify CompositeAlarms, the operation returns only a list of composite alarms, and does not return any metric alarms.
The percentile statistic for the metric. Specify a value between p0.0 and p100.
", "ExtendedStatistics$member": null, "MetricAlarm$ExtendedStatistic": "The percentile statistic for the metric associated with the alarm. Specify a value between p0.0 and p100.
", - "PutMetricAlarmInput$ExtendedStatistic": "The percentile statistic for the metric specified in MetricName. Specify a value between p0.0 and p100. When you call PutMetricAlarm and specify a MetricName, you must specify either Statistic or ExtendedStatistic, but not both.
The extended statistic for the metric specified in MetricName. When you call PutMetricAlarm and specify a MetricName, you must specify either Statistic or ExtendedStatistic but not both.
If you specify ExtendedStatistic, the following are valid values:
p90
tm90
tc90
ts90
wm90
IQM
PR(n:m) where n and m are values of the metric
TC(X%:X%) where X is between 10 and 90 inclusive.
TM(X%:X%) where X is between 10 and 90 inclusive.
TS(X%:X%) where X is between 10 and 90 inclusive.
WM(X%:X%) where X is between 10 and 90 inclusive.
For more information about these extended statistics, see CloudWatch statistics definitions.
" } }, "ExtendedStatistics": { @@ -893,7 +893,7 @@ "InsightRuleOrderBy": { "base": null, "refs": { - "GetInsightRuleReportInput$OrderBy": "Determines what statistic to use to rank the contributors. Valid values are SUM and MAXIMUM.
" + "GetInsightRuleReportInput$OrderBy": "Determines what statistic to use to rank the contributors. Valid values are Sum and Maximum.
A list of key-value pairs that you can associate with a managed Contributor Insights rule. You can associate as many as 50 tags with a rule. Tags can help you organize and categorize your resources. You also can use them to scope user permissions by granting a user permission to access or change only the resources that have certain tag values. To associate tags with a rule, you must have the cloudwatch:TagResource permission in addition to the cloudwatch:PutInsightRule permission. If you are using this operation to update an existing Contributor Insights rule, any tags that you specify in this parameter are ignored. To change the tags of an existing rule, use TagResource.
A list of key-value pairs to associate with the composite alarm. You can associate as many as 50 tags with an alarm.
Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only resources with certain tag values.
", "PutInsightRuleInput$Tags": "A list of key-value pairs to associate with the Contributor Insights rule. You can associate as many as 50 tags with a rule.
Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only the resources that have certain tag values.
To be able to associate tags with a rule, you must have the cloudwatch:TagResource permission in addition to the cloudwatch:PutInsightRule permission.
If you are using this operation to update an existing Contributor Insights rule, any tags you specify in this parameter are ignored. To change the tags of an existing rule, use TagResource.
", - "PutMetricAlarmInput$Tags": "A list of key-value pairs to associate with the alarm. You can associate as many as 50 tags with an alarm.
Tags can help you organize and categorize your resources. You can also use them to scope user permissions by granting a user permission to access or change only resources with certain tag values.
If you are using this operation to update an existing alarm, any tags you specify in this parameter are ignored. To change the tags of an existing alarm, use TagResource or UntagResource.
", + "PutMetricAlarmInput$Tags": "A list of key-value pairs to associate with the alarm. You can associate as many as 50 tags with an alarm. To be able to associate tags with the alarm when you create the alarm, you must have the cloudwatch:TagResource permission.
Tags can help you organize and categorize your resources. You can also use them to scope user permissions by granting a user permission to access or change only resources with certain tag values.
If you are using this operation to update an existing alarm, any tags you specify in this parameter are ignored. To change the tags of an existing alarm, use TagResource or UntagResource.
", "PutMetricStreamInput$Tags": "A list of key-value pairs to associate with the metric stream. You can associate as many as 50 tags with a metric stream.
Tags can help you organize and categorize your resources. You can also use them to scope user permissions by granting a user permission to access or change only resources with certain tag values.
You can use this parameter only when you are creating a new metric stream. If you are using this operation to update an existing metric stream, any tags you specify in this parameter are ignored. To change the tags of an existing metric stream, use TagResource or UntagResource.
", "TagResourceInput$Tags": "The list of key-value pairs to associate with the alarm.
" } diff --git a/models/apis/monitoring/2010-08-01/endpoint-rule-set-1.json b/models/apis/monitoring/2010-08-01/endpoint-rule-set-1.json index 94f8f398869..39504ccc876 100644 --- a/models/apis/monitoring/2010-08-01/endpoint-rule-set-1.json +++ b/models/apis/monitoring/2010-08-01/endpoint-rule-set-1.json @@ -58,52 +58,56 @@ "type": "error" }, { - "conditions": [], - "type": "tree", - "rules": [ + "conditions": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" + "ref": "UseDualStack" }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + true + ] } - ] + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { - "conditions": [], + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "isSet", + "fn": "aws.partition", "argv": [ { "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -111,13 +115,22 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "booleanEquals", "argv": [ { - "ref": "Region" - } - ], - "assign": "PartitionResult" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], "type": "tree", @@ -127,92 +140,83 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] }, { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://monitoring-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" + "endpoint": { + "url": "https://monitoring-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] } ], @@ -221,155 +225,115 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "stringEquals", "argv": [ - true, + "aws-us-gov", { "fn": "getAttr", "argv": [ { "ref": "PartitionResult" }, - "supportsFIPS" + "name" ] } ] } ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - "aws-us-gov", - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "name" - ] - } - ] - } - ], - "endpoint": { - "url": "https://monitoring.{Region}.amazonaws.com", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - }, - { - "conditions": [], - "endpoint": { - "url": "https://monitoring-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - } - ] + "endpoint": { + "url": "https://monitoring.{Region}.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" }, { "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" + "endpoint": { + "url": "https://monitoring-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://monitoring.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } - ] - }, - { - "conditions": [], + ], "type": "tree", "rules": [ { "conditions": [], "endpoint": { - "url": "https://monitoring.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://monitoring.{Region}.{PartitionResult#dualStackDnsSuffix}", "properties": {}, "headers": {} }, "type": "endpoint" } ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] + }, + { + "conditions": [], + "endpoint": { + "url": "https://monitoring.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/service/cloudwatch/api.go b/service/cloudwatch/api.go index a079c03307e..24f68910ba2 100644 --- a/service/cloudwatch/api.go +++ b/service/cloudwatch/api.go @@ -5654,7 +5654,14 @@ type DescribeAlarmsInput struct { // Use this parameter to specify whether you want the operation to return metric // alarms or composite alarms. If you omit this parameter, only metric alarms - // are returned. + // are returned, even if composite alarms exist in the account. + // + // For example, if you omit this parameter or specify MetricAlarms, the operation + // returns only a list of metric alarms. It does not return any composite alarms, + // even if composite alarms exist in the account. + // + // If you specify CompositeAlarms, the operation returns only a list of composite + // alarms, and does not return any metric alarms. AlarmTypes []*string `type:"list" enum:"AlarmType"` // If you use this parameter and specify the name of a composite alarm, the @@ -6677,7 +6684,7 @@ type GetInsightRuleReportInput struct { Metrics []*string `type:"list"` // Determines what statistic to use to rank the contributors. Valid values are - // SUM and MAXIMUM. + // Sum and Maximum. OrderBy *string `min:"1" type:"string"` // The period, in seconds, to use for the statistics in the InsightRuleMetricDatapoint @@ -11115,10 +11122,36 @@ type PutMetricAlarmInput struct { // EvaluationPeriods is a required field EvaluationPeriods *int64 `min:"1" type:"integer" required:"true"` - // The percentile statistic for the metric specified in MetricName. Specify - // a value between p0.0 and p100. When you call PutMetricAlarm and specify a - // MetricName, you must specify either Statistic or ExtendedStatistic, but not - // both. + // The extended statistic for the metric specified in MetricName. When you call + // PutMetricAlarm and specify a MetricName, you must specify either Statistic + // or ExtendedStatistic but not both. + // + // If you specify ExtendedStatistic, the following are valid values: + // + // * p90 + // + // * tm90 + // + // * tc90 + // + // * ts90 + // + // * wm90 + // + // * IQM + // + // * PR(n:m) where n and m are values of the metric + // + // * TC(X%:X%) where X is between 10 and 90 inclusive. + // + // * TM(X%:X%) where X is between 10 and 90 inclusive. + // + // * TS(X%:X%) where X is between 10 and 90 inclusive. + // + // * WM(X%:X%) where X is between 10 and 90 inclusive. + // + // For more information about these extended statistics, see CloudWatch statistics + // definitions (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Statistics-definitions.html). ExtendedStatistic *string `type:"string"` // The actions to execute when this alarm transitions to the INSUFFICIENT_DATA @@ -11252,7 +11285,8 @@ type PutMetricAlarmInput struct { Statistic *string `type:"string" enum:"Statistic"` // A list of key-value pairs to associate with the alarm. You can associate - // as many as 50 tags with an alarm. + // as many as 50 tags with an alarm. To be able to associate tags with the alarm + // when you create the alarm, you must have the cloudwatch:TagResource permission. // // Tags can help you organize and categorize your resources. You can also use // them to scope user permissions by granting a user permission to access or diff --git a/service/lexmodelsv2/api.go b/service/lexmodelsv2/api.go index 3f41b200f34..d938ed53441 100644 --- a/service/lexmodelsv2/api.go +++ b/service/lexmodelsv2/api.go @@ -20294,7 +20294,7 @@ type CustomVocabularyItem struct { // The weight assigned for the custom vocabulary item from the custom vocabulary // list. - Weight *int64 `locationName:"weight" min:"1" type:"integer"` + Weight *int64 `locationName:"weight" type:"integer"` } // String returns the string representation. @@ -20333,9 +20333,6 @@ func (s *CustomVocabularyItem) Validate() error { if s.Phrase != nil && len(*s.Phrase) < 1 { invalidParams.Add(request.NewErrParamMinLen("Phrase", 1)) } - if s.Weight != nil && *s.Weight < 1 { - invalidParams.Add(request.NewErrParamMinValue("Weight", 1)) - } if invalidParams.Len() > 0 { return invalidParams @@ -34016,7 +34013,7 @@ type NewCustomVocabularyItem struct { // The weight assigned to the new custom vocabulary item from the custom vocabulary // list. - Weight *int64 `locationName:"weight" min:"1" type:"integer"` + Weight *int64 `locationName:"weight" type:"integer"` } // String returns the string representation. @@ -34049,9 +34046,6 @@ func (s *NewCustomVocabularyItem) Validate() error { if s.Phrase != nil && len(*s.Phrase) < 1 { invalidParams.Add(request.NewErrParamMinLen("Phrase", 1)) } - if s.Weight != nil && *s.Weight < 1 { - invalidParams.Add(request.NewErrParamMinValue("Weight", 1)) - } if invalidParams.Len() > 0 { return invalidParams